diff --git a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua index 608ea34470..c86a03ae2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua @@ -17,6 +17,7 @@ function TaSuiLingXiao:InitComponent() self.scrollItem = Util.GetGameObject(self.gameObject, "SkillList") self.sortingOrder = 0 self.itemsGrid = {} + self.itemList = {} end --绑定事件(用于子类重写) @@ -71,6 +72,7 @@ function TaSuiLingXiao:Refresh() self.actData = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao) TaSuiLingXiao:ShowLive() TaSuiLingXiao:SetTime() + TaSuiLingXiao:ShowSkillList() end function TaSuiLingXiao:ShowLive() @@ -81,33 +83,34 @@ function TaSuiLingXiao:ShowLive() end self.configData = ConfigManager.GetConfigData(ConfigName.NewHeroConfig,self.actData.activityId) local imgName = GetResourcePath(ConfigManager.GetConfigData(ConfigName.HeroConfig,self.configData.HeroId).Live) - self.LiveObj = poolManager:LoadLive(imgName,self.liveRoot.transform, Vector3.one, Vector2.New(configData.Size[2],configData.Size[3])) - self.liveRoot:GetComponent("RectTransform").localScale = Vector3.one*configData.Size[1] + self.LiveObj = poolManager:LoadLive(imgName,self.liveRoot.transform, Vector3.one, Vector2.New(self.configData.Size[2],self.configData.Size[3])) + self.liveRoot:GetComponent("RectTransform").localScale = Vector3.one*self.configData.Size[1] end function TaSuiLingXiao:ShowSkillList() - if not self.itemsGrid then - self.itemsGrid = {} + if not self.itemList then + self.itemList = {} end - for k,v in ipairs(self.itemsGrid) do + for k,v in ipairs(self.itemList) do v.gameObject:SetActive(false) end - for i = 1,#self.configData.PassiveSkill do + for i = 1,#self.configData.Skill do local skillData = {} - local skill = self.configData.PassiveSkill[i] + local skill = self.configData.Skill[i] if not self.itemList[i] then self.itemList[i] = newObject(self.skillPre) self.itemList[i].transform:SetParent(self.scrollItem.transform) self.itemList[i].transform.localScale = Vector3.one self.itemList[i].transform.localPosition = Vector3.zero end - if self.configData.PassiveSkill[i][1] == 1 then - skillData = skillConfig[self.configData.PassiveSkill[i][2]] - elseif self.configData.PassiveSkill[i][1] == 2 then - skillData = passiveSkillConfig[self.configData.PassiveSkill[i][2]] + if self.configData.Skill[i][1] == 1 then + skillData = skillConfig[self.configData.Skill[i][2]] + elseif self.configData.Skill[i][1] == 2 then + skillData = passiveSkillConfig[self.configData.Skill[i][2]] end self.itemList[i]:GetComponent("Image").sprite = Util.LoadSprite(artConfig[skillData.Icon].Name) + self.itemList[i]:SetActive(true) end end @@ -147,6 +150,7 @@ function TaSuiLingXiao:OnDestroy() end self.sortingOrder = 0 self.itemsGrid = {} + self.itemList = {} end function TaSuiLingXiao:OnHide()