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

This commit is contained in:
chenxi 2023-04-20 20:53:29 +08:00
commit 9ac4b10ba2

View File

@ -140,8 +140,6 @@ end
function GridCell:resetTranform() function GridCell:resetTranform()
local uiMap = self:getUIMap() local uiMap = self:getUIMap()
uiMap["grid_cell.touch_node"]:setAnchoredPosition(0, 0)
uiMap["grid_cell.touch_node"]:setLocalScale(1, 1, 1)
uiMap["grid_cell.touch_node.ani_node"]:setAnchoredPosition(0, 0) uiMap["grid_cell.touch_node.ani_node"]:setAnchoredPosition(0, 0)
uiMap["grid_cell.touch_node.ani_node"]:setLocalScale(1, 1, 1) uiMap["grid_cell.touch_node.ani_node"]:setLocalScale(1, 1, 1)
end end
@ -149,7 +147,7 @@ end
function GridCell:showAni() function GridCell:showAni()
local uiMap = self:getUIMap() local uiMap = self:getUIMap()
if not self.aniComp then if not self.aniComp then
self.aniComp = uiMap["grid_cell.touch_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR) self.aniComp = uiMap["grid_cell.touch_node.ani_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR)
end end
-- CS.UnityEngine.Animator.StringToHash("idle") 结果是-601574123 -- CS.UnityEngine.Animator.StringToHash("idle") 结果是-601574123
self.aniComp.enabled = true self.aniComp.enabled = true
@ -159,7 +157,7 @@ end
function GridCell:hideAni() function GridCell:hideAni()
local uiMap = self:getUIMap() local uiMap = self:getUIMap()
if not self.aniComp then if not self.aniComp then
self.aniComp = uiMap["grid_cell.touch_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR) self.aniComp = uiMap["grid_cell.touch_node.ani_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR)
end end
self.aniComp.enabled = false self.aniComp.enabled = false
self:resetTranform() self:resetTranform()