diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua index 2883088a5b..ab3562b845 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua @@ -16,11 +16,8 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), this.timer = Timer.New() local challengeNum = 0 local lootNum = 0 -<<<<<<< HEAD local isPlayAnim = true local bossNum = 0 -======= ->>>>>>> a064d83bf... 【车迟斗法】boss轮转 --初始化组件(用于子类重写) function GuildCarDelayMainPanel:InitComponent() this.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot")