【车迟斗法】冲突解决
parent
c1aa2626bc
commit
1d65116a84
|
@ -16,11 +16,8 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||||
this.timer = Timer.New()
|
this.timer = Timer.New()
|
||||||
local challengeNum = 0
|
local challengeNum = 0
|
||||||
local lootNum = 0
|
local lootNum = 0
|
||||||
<<<<<<< HEAD
|
|
||||||
local isPlayAnim = true
|
local isPlayAnim = true
|
||||||
local bossNum = 0
|
local bossNum = 0
|
||||||
=======
|
|
||||||
>>>>>>> a064d83bf... 【车迟斗法】boss轮转
|
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function GuildCarDelayMainPanel:InitComponent()
|
function GuildCarDelayMainPanel:InitComponent()
|
||||||
this.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot")
|
this.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot")
|
||||||
|
|
Loading…
Reference in New Issue