puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
CloudJ 2023-06-01 20:46:11 +08:00
commit 9286537e65
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lua/app/common/sdk_manager.lua
View File

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

4
lua/app/module/battle/battle_const.lua
View File

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

6
lua/app/module/battle/controller/battle_controller.lua
View File

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

2
lua/app/module/maincity/maincity_manager.lua
View File

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

8
lua/app/ui/main_city/cell/bottom_btn_cell.lua
View File

@ -24,7 +24,13 @@ function BottomBtnCell:refresh(desc, selected, showAni)
end end
function BottomBtnCell:addClickListener(func) 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 end
function BottomBtnCell:getCurLocalPosX() function BottomBtnCell:getCurLocalPosX()