Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

lua/app/common/sdk_manager.lua

@@ -65,9 +65,9 @@ function SDKManager:init()
 
 	-- lazy init
 	local SDKMgr = CS.BF.BFMain.Instance.SDKMgr
-	-- self:initPay()
-	-- self:initPayListener()
-	-- self:initAdsListener()
+	self:initPay()
+	self:initPayListener()
+	self:initAdsListener()
 
 	-- 拿到firebasetoken
 	-- self:initFireBaseToken()
@@ -330,7 +330,6 @@ function SDKManager:adRewradAd(noReport)
 	Logger.logHighlight("-------------------")
 	ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_WATCH_AD)
 	if not noReport then
-		-- DataManager.PlayerData:addAdCount()
 		-- BIReport:postAdEvent()
 	end
 end
@@ -372,6 +371,7 @@ function SDKManager:login(callback, loginType)
         end
         self.isLogining = true
         self:_login(function(code, msg)
+			Logger.log("login finish:%s %s", code, msg)
             if code == SDKManager.BF_LOGIN_RESULT.Success then
                 if not msg then
                     self.isLogining = false

lua/app/module/maincity/maincity_manager.lua

@@ -21,8 +21,8 @@ function MaincityManager:firstEnterMainCity()
 	else
 		BIReport:postGameLoginFinish()
 		self:showMainCityUI(true)
-		-- SDKManager:doUncompletePay()
 	end
+	SDKManager:doUncompletePay()
 end
 
 function MaincityManager:changeMainCityLeftSideBarOpenOrClose()