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-05 20:17:16 +08:00
commit 9e8ff9a083
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/game.lua
View File

@ -401,6 +401,10 @@ if NOT_PUBLISH then
end end
if (Input.GetKeyDown(KeyCode.RightArrow) or Input.GetKeyDown(KeyCode.LeftArrow)) and Input.GetKey(KeyCode.LeftControl) then if (Input.GetKeyDown(KeyCode.RightArrow) or Input.GetKeyDown(KeyCode.LeftArrow)) and Input.GetKey(KeyCode.LeftControl) then
if not ModuleManager.DevToolManager.set_board_info then
Logger.logHighlight("请先去gm面板设置浏览的棋盘信息!")
return
end
local configName = ModuleManager.DevToolManager.set_board_info.config local configName = ModuleManager.DevToolManager.set_board_info.config
local idx = ModuleManager.DevToolManager.set_board_info.idx or 0 local idx = ModuleManager.DevToolManager.set_board_info.idx or 0
if not configName then if not configName then

5
lua/app/ui/battle/battle_skill_select_comp.lua
View File

@ -20,7 +20,7 @@ end
function BattleSkillSelectComp:_display() function BattleSkillSelectComp:_display()
local uiMap = self:getUIMap() local uiMap = self:getUIMap()
local bg2 = uiMap["battle_select_skill_comp.bg_2"] local bg2 = uiMap["battle_select_skill_comp.bg_2"]
bg2:setVisible(self.onlyCommonSkill) bg2:setActive(self.onlyCommonSkill)
local bg = uiMap["battle_select_skill_comp.bg_1"] local bg = uiMap["battle_select_skill_comp.bg_1"]
if ModuleManager.BattleManager.battleController then if ModuleManager.BattleManager.battleController then
bg:setVisible(false) bg:setVisible(false)
@ -58,13 +58,16 @@ function BattleSkillSelectComp:_addListeners()
self.canvasGroup = uiMap["battle_select_skill_comp.skill_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) self.canvasGroup = uiMap["battle_select_skill_comp.skill_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP)
self.canvasGroup.alpha = 1 self.canvasGroup.alpha = 1
self.bg = uiMap["battle_select_skill_comp.bg_1"] self.bg = uiMap["battle_select_skill_comp.bg_1"]
self.bg2 = uiMap["battle_select_skill_comp.bg_2"]
uiMap["battle_select_skill_comp.look_btn"]:addTouchListener(function(eventType, x, y) uiMap["battle_select_skill_comp.look_btn"]:addTouchListener(function(eventType, x, y)
if eventType == GConst.TOUCH_EVENT.DOWN or eventType == GConst.TOUCH_EVENT.DRAG then if eventType == GConst.TOUCH_EVENT.DOWN or eventType == GConst.TOUCH_EVENT.DRAG then
self.canvasGroup.alpha = 0.3 self.canvasGroup.alpha = 0.3
self.bg:setVisible(false) self.bg:setVisible(false)
self.bg2:setVisible(false)
else else
self.canvasGroup.alpha = 1 self.canvasGroup.alpha = 1
self.bg:setVisible(true) self.bg:setVisible(true)
self.bg2:setVisible(true)
end end
end) end)
end end