From 80619b8e94b875b09b353a4ffc34edb689d033f1 Mon Sep 17 00:00:00 2001 From: chenxi Date: Thu, 1 Jun 2023 18:09:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/sdk_manager.lua | 6 +++--- lua/app/module/maincity/maincity_manager.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/app/common/sdk_manager.lua b/lua/app/common/sdk_manager.lua index 06d0f15d..81305466 100644 --- a/lua/app/common/sdk_manager.lua +++ b/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() diff --git a/lua/app/module/maincity/maincity_manager.lua b/lua/app/module/maincity/maincity_manager.lua index 3bad2657..8276f98f 100644 --- a/lua/app/module/maincity/maincity_manager.lua +++ b/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() From bab3e8218e2199daf8084c34a75bce0391256ab1 Mon Sep 17 00:00:00 2001 From: chenxi Date: Thu, 1 Jun 2023 18:15:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/sdk_manager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/common/sdk_manager.lua b/lua/app/common/sdk_manager.lua index 81305466..e3861481 100644 --- a/lua/app/common/sdk_manager.lua +++ b/lua/app/common/sdk_manager.lua @@ -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 From 143f67c2f35343da0e03ebc27d16e40600eb8502 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 1 Jun 2023 18:18:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=89=B9=E6=95=88=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 4 ++++ lua/app/module/battle/controller/battle_controller.lua | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 07bbffa5..ff266fa9 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/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, diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 2d9fee35..3fda483c 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/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 From 58e5bbc33d76fcb650a0eeb72e0d66500e7d26e9 Mon Sep 17 00:00:00 2001 From: chenxi Date: Thu, 1 Jun 2023 20:34:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=9F=B3=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/cell/bottom_btn_cell.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/main_city/cell/bottom_btn_cell.lua b/lua/app/ui/main_city/cell/bottom_btn_cell.lua index 19231612..613db94b 100644 --- a/lua/app/ui/main_city/cell/bottom_btn_cell.lua +++ b/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()