diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 2aa6d1f398..4f5663bb71 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2567,6 +2567,7 @@ ItemBaseType = { Gem = 9, --命石 GodPrint = 10, --神印 TurnsCard=11,--变身卡 + Talisman = 12, --法宝 } --探宝类型 TreasureType={ diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua index 340c69407b..42e3d5a19e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua @@ -19,6 +19,8 @@ function GongMingResultTips:InitComponent() self.upStarSkillTextPreHun = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre3/content") self.upStarSkillTextPreSoul = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre4/content") self.upStarSkillTextPreFa = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre5/content") + self.upStarSkillTextPreFa1 = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre5") + self.upStarSkillTextPreFa1:SetActive(false) self.upStarOpenSkill =Util.GetGameObject(self.transform, "bg/upStarOpenSkill/Mask") end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua index 3b87b84721..b89f7a883f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua @@ -21,7 +21,8 @@ function HongMengUnLoadPanel:InitComponent() this.ItemOne = Util.GetGameObject(self.transform,"grid/Item") this.ItemTwo = Util.GetGameObject(self.transform,"grid/Item1") - + Util.GetGameObject(self.transform,"titleBg/Text (6)"):SetActive(false) + Util.GetGameObject(self.transform,"titleBg/Image (10)"):SetActive(false) end @@ -163,7 +164,7 @@ function HongMengUnLoadPanel:SetTextTwo(go,data) else Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format(Language[10086]) end - + Util.GetGameObject(go.transform,"TextFa"):SetActive(false) -- Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.talismanList) end @@ -272,7 +273,7 @@ function HongMengUnLoadPanel:SetText(go,_data) else Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format(Language[10086]) end - + Util.GetGameObject(go.transform,"TextFa"):SetActive(false) end end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index 73193c2dc3..01ddbdc1e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -82,10 +82,10 @@ function RoleTalismanPanelV2:BindEvent() end) --进阶按钮 Util.AddClick(this.advanceBtn, function() - if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then - PopupTipPanel.ShowTip(Language[12184]) - return - end + -- if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then + -- PopupTipPanel.ShowTip(Language[12184]) + -- return + -- end if curHeroData.talismanList