修改一些细节

Classes/QQ/SinaInterface_Objc.mm

@@ -45,11 +45,8 @@ static SinaInterface_Objc *instance = nil;
 {
     WBAuthorizeRequest *request = [WBAuthorizeRequest request];
     request.redirectURI = kSinaAppRedirectURI;
-    request.scope = @"invitation_write,all";
+//    request.scope = @"invitation_write,all";
-////    request.
-////    request.scope = @"direct_messages_write,invitation_write,follow_app_official_microblog";
     [WeiboSDK sendRequest:request];
-//    [WBHttpRequest requestWithURL:@"https://api.weibo.com/oauth2/authorize" httpMethod:@"GET" params:[[NSDictionary alloc] initWithObjectsAndKeys:kSinaAppKey,@"client_id", kSinaAppKey,@"redirect_uri",@"all",@"scope", nil] delegate:self];
 }
 -(void)inviteUser:(const char *)uid
 {
@@ -113,8 +110,6 @@ static SinaInterface_Objc *instance = nil;
         NSString* url = [dic objectForKey:@"avatar_large"];
         GameShare_Data::shareData()->setUserUrl([url UTF8String]);
         GameShare_Data::shareData()->setUserName([name UTF8String]);
-        NSString *message = [NSString stringWithFormat:@"2/users/show.json : name=%@,url=%@",name,url];
-        NSLog(message);
         
         cocos2d::CCNotificationCenter::sharedNotificationCenter()->postNotification(kSinaLoginSuccess, NULL);
     }
@@ -124,22 +119,18 @@ static SinaInterface_Objc *instance = nil;
 {
     if ([response isKindOfClass:WBSendMessageToWeiboResponse.class])
     {
-        NSString *title = @"发送结果";
+
-        NSString *message = [NSString stringWithFormat:@"响应状态: %d\n响应UserInfo数据: %@\n原请求UserInfo数据: %@",
-                             response.statusCode, response.userInfo, response.requestUserInfo];
     }
     else if ([response isKindOfClass:WBAuthorizeResponse.class])
     {
         if (response.statusCode == WeiboSDKResponseStatusCodeSuccess) {
-            NSString *title = @"认证结果";
+//            NSString *message = [NSString stringWithFormat:@"响应状态: %d\nresponse.userId: %@\nresponse.accessToken: %@\n响应UserInfo数据: %@\n原请求UserInfo数据: %@",
-            NSString *message = [NSString stringWithFormat:@"响应状态: %d\nresponse.userId: %@\nresponse.accessToken: %@\n响应UserInfo数据: %@\n原请求UserInfo数据: %@",
+//                                 response.statusCode,
-                                 response.statusCode,
+//                                 [(WBAuthorizeResponse *)response userID],
-                                 [(WBAuthorizeResponse *)response userID],
+//                                 [(WBAuthorizeResponse *)response accessToken],
-                                 [(WBAuthorizeResponse *)response accessToken],
+//                                 response.userInfo,
-                                 response.userInfo,
+//                                 response.requestUserInfo];
-                                 response.requestUserInfo];
+//            NSLog(message);
-            NSLog(message);
-//            GameShare_Global::shareGlobal()->sinaID = [[(WBAuthorizeResponse *)response userID] UTF8String];
             CPlayerInfoMan::sharedInstance().getPlayerInfo().strSina = [[(WBAuthorizeResponse *)response userID] UTF8String];
             GameShare_Data::shareData()->setSinaId([[(WBAuthorizeResponse *)response userID] UTF8String], [[(WBAuthorizeResponse *)response accessToken] UTF8String], [[(WBAuthorizeResponse *)response expirationDate] timeIntervalSince1970] );
             

Classes/Scene_GameList.cpp

@@ -304,5 +304,5 @@ void Scene_GameList::onEnter()
 void Scene_GameList::onEnterTransitionDidFinish()
 {
     CCLayer::onEnterTransitionDidFinish();
-	CItemMan::sharedInstance().RequestGetPackItem();
+//	CItemMan::sharedInstance().RequestGetPackItem();
 }

Classes/Scene_Welcome.cpp

@@ -49,11 +49,8 @@ void Scene_Welcome::onEnter()
 #endif
     
     
-    CCSize visibleSize = CCDirector::sharedDirector()->getVisibleSize();
 
-    
+
-//    UIImageView* logoImg = dynamic_cast<UIImageView*>(ul->getWidgetByName("Logo"));
-//    logoImg->setPosition(ccp(logoImg->getPosition().x,visibleSize.height-200));
     
     //设置是否显示其他登陆按钮.
     if (GameShare_Data::shareData()->getUserUUID() != "") {
@@ -87,7 +84,7 @@ void Scene_Welcome::onEnter()
 void Scene_Welcome::onEnterTransitionDidFinish()
 {
 //    GameShare_NetSystem::ShareNetSystem()->NetSystem_HTTPRequest("http://raw.github.com/minggo/AssetsManagerTest/master/version","0");
-    requestLoadData();
+//    requestLoadData();
 	//requestLoadData();
 }
 bool Scene_Welcome::init()
@@ -123,11 +120,11 @@ bool Scene_Welcome::init()
     CCNotificationCenter::sharedNotificationCenter()->addObserver(this, callfuncO_selector(Scene_Welcome::sinaLoginSuccess), kSinaLoginSuccess, NULL);
     CCNotificationCenter::sharedNotificationCenter()->addObserver(this, callfuncO_selector(Scene_Welcome::loginFail), kLoginFail, NULL);
     
-    for (int i = 1; i <= 5; i++) {
+//    for (int i = 1; i <= 5; i++) {
-        CCString str;
+//        CCString str;
-        str.initWithFormat("medal600001_%d", i);
+//        str.initWithFormat("medal600001_%d", i);
-        CCUserDefault::sharedUserDefault() -> setIntegerForKey(str.getCString(), 0);
+//        CCUserDefault::sharedUserDefault() -> setIntegerForKey(str.getCString(), 0);
-    }
+//    }
    
     CCSize visibleSize = CCDirector::sharedDirector()->getVisibleSize();
     
@@ -183,7 +180,7 @@ void Scene_Welcome::setBtnState(bool isLogin)
         qqLoginBtn->setTouchEnabled(false);
         sinaLoginBtn->setTouchEnabled(true);
         qqLoginBtn->setVisible(false);
-        sinaLoginBtn->setVisible(true);
+        sinaLoginBtn->setVisible(false);
         noLoginBtn->setTextures("./CocoStudioResources/btn_17.png", "./CocoStudioResources/btn_17.png", "");
         noLoginBtn->setPosition(ccp(visibleSize.width/2, noLoginBtn->getPosition().y));
     }
@@ -239,25 +236,13 @@ void Scene_Welcome::startGameSinaLogin(cocos2d::CCObject *object)
 }
 void Scene_Welcome::startGameNoLogin(cocos2d::CCObject *object){
     
-//    ((UIButton*)object)->setTouchEnable(false);
+
-  //  GameShare_Global::shareGlobal()->loginType = LoginType_Tourist;
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
-//    UILayer *ul1 = UILayer::create();
+
-//    this -> addChild(ul1);
-//    std::string str = GameShare_Data::shareData()->getUserUUID();
-//    UILabel *label = UILabel::create();
-//    label ->setText(str.c_str());
-//    label -> setPosition(ccp(350, 400));
-//    label -> setColor(ccBLACK);
-//    label -> setScale(2);
-//    ul -> addWidget(label);
-    
-//    label -> runAction(CCSequence::create(CCDelayTime::create(3), CCRemoveSelf::create(),NULL));
 
     if (GameShare_Data::shareData()->getUserUUID() != "") {
         
         CPlayerInfoMan::sharedInstance().setLoginPreson(false);
-        //requestLoadData();
         CPlayerInfoMan::sharedInstance().getPlayerInfo().strUuId = GameShare_Data::shareData()->getUserUUID();
         CPlayerInfoMan::sharedInstance().RequestPlayerInfo();
         SinaInterface::shareInstant()->getFriend();

proj.ios/Info.plist

@@ -10,20 +10,8 @@
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 	<string>Icon-57.png</string>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>Icon.png</string>
-		<string>Icon@2x.png</string>
-		<string>Icon-57.png</string>
-		<string>Icon-114.png</string>
-		<string>Icon-72.png</string>
-		<string>Icon-144.png</string>
-		<string>Icon-76.png</string>
-		<string>Icon-120.png</string>
-		<string>Icon-152.png</string>
-	</array>
 	<key>CFBundleIdentifier</key>
-	<string>com.rt.FISH4iPhone</string>
+	<string>com.rt.FISH4iPhone199</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

proj.ios/OnceAgain.xcodeproj/project.xcworkspace/xcshareddata/OnceAgain.xccheckout

@@ -10,29 +10,29 @@
 	<string>OnceAgain</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>00DDD28F-4FB7-4B09-B829-43A327AE9554</key>
+		<key>E2DFE2902FAC09B32DD2A28E7C818049B1496B1E</key>
 		<string>https://github.com/wu736139669/SmallGame_Cocos2dx.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>proj.ios/OnceAgain.xcodeproj/project.xcworkspace</string>
+	<string>proj.ios/OnceAgain.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>00DDD28F-4FB7-4B09-B829-43A327AE9554</key>
+		<key>E2DFE2902FAC09B32DD2A28E7C818049B1496B1E</key>
 		<string>../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>https://github.com/wu736139669/SmallGame_Cocos2dx.git</string>
 	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
+	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>00DDD28F-4FB7-4B09-B829-43A327AE9554</string>
+	<string>E2DFE2902FAC09B32DD2A28E7C818049B1496B1E</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>00DDD28F-4FB7-4B09-B829-43A327AE9554</string>
+			<string>E2DFE2902FAC09B32DD2A28E7C818049B1496B1E</string>
 			<key>IDESourceControlWCCName</key>
 			<string>SmallGame_Cocos2dx</string>
 		</dict>

proj.ios/OnceAgain.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/OnceAgain test.xcscheme

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0500"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "04AF62951907603B00616ED8"
-               BuildableName = "OnceAgain copy.app"
-               BlueprintName = "OnceAgain test"
-               ReferencedContainer = "container:OnceAgain.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "04AF62951907603B00616ED8"
-            BuildableName = "OnceAgain copy.app"
-            BlueprintName = "OnceAgain test"
-            ReferencedContainer = "container:OnceAgain.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "04AF62951907603B00616ED8"
-            BuildableName = "OnceAgain copy.app"
-            BlueprintName = "OnceAgain test"
-            ReferencedContainer = "container:OnceAgain.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "04AF62951907603B00616ED8"
-            BuildableName = "OnceAgain copy.app"
-            BlueprintName = "OnceAgain test"
-            ReferencedContainer = "container:OnceAgain.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

proj.ios/OnceAgain.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -4,13 +4,10 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>OnceAgain test.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
 		<key>OnceAgain.xcscheme</key>
 		<dict>
+			<key>isShown</key>
+			<true/>
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>

proj.ios/OnceAgain/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,97 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-57.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-114.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "50x50",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "50x50",
+      "scale" : "2x"
+    },
+    {
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "filename" : "Icon-72.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "filename" : "Icon-144.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

proj.ios/OnceAgain/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -0,0 +1,94 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default.png",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default-568h@2x.png",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default@2x.png",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default-568h@2x.png",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}