Merge branch 'dev' of 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/battle/battle_const.lua

@@ -730,6 +730,10 @@ BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = {
     [BattleConst.SKILL_TYPE.CHANGE_ELEMENT_TYPE] = true,
 }
 
+BattleConst.NO_EFFECT_GRID_SKILL_TYPE = {
+    [BattleConst.SKILL_TYPE.CHANGE_AROUND] = true
+}
+
 BattleConst.SKILL_METHOD_TYPE = {
     ON_ENTER = 1,
     ON_FINAL = 2,

lua/app/module/battle/controller/battle_controller.lua

@@ -1022,8 +1022,10 @@ function BattleController:calculateCurElimination(onlyCheck)
         if info.isSkill then
             randomPosList, influenceElementTypeMap = self:dealSkillElement(info.timeIdx + skillTime, self.breakedMap, self.sequenceMap, self.aniSequence, self.boomGridIds, onlyCheck)
             local aniUnit = self.aniSequence[i]
-            aniUnit.rangeList = skillEntity:getBoardRange()
-            aniUnit.randomPosList = randomPosList
+            if not BattleConst.NO_EFFECT_GRID_SKILL_TYPE[skillEntity:getSkillType()] then
+                aniUnit.rangeList = skillEntity:getBoardRange()
+                aniUnit.randomPosList = randomPosList
+            end
             break
         end
     end

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()

lua/app/ui/main_city/cell/bottom_btn_cell.lua

@@ -24,7 +24,13 @@ function BottomBtnCell:refresh(desc, selected, showAni)
 end
 
 function BottomBtnCell:addClickListener(func)
-    self:getBaseObject():addClickListener(func, GConst.CLICK_SOUND.NORMAL)
+    self:getBaseObject():addClickListener(function()
+        local audioPath = AudioManager.CLICK_ID[GConst.CLICK_SOUND.NORMAL]
+        if audioPath then
+            AudioManager:playEffect(audioPath)
+        end
+        func()
+    end, GConst.CLICK_SOUND.NONE)
 end
 
 function BottomBtnCell:getCurLocalPosX()