diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 64c781b914..a5c5dc0bd2 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -383,7 +383,7 @@ Language = { [10382] = GetLanguageStrById("对方已不在你的好友列表中,无法发送消息"), [10383] = GetLanguageStrById("%s元"), [10384] = GetLanguageStrById("未找到符合条件的节点"), - [10385] = GetLanguageStrById("装备合成"), + [10385] = GetLanguageStrById("神装升星"), [10386] = GetLanguageStrById("宝物合成"), [10387] = GetLanguageStrById("魂印合成"), [10388] = GetLanguageStrById("是否要将【"), diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua index 8423780c4a..6b08fb03cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua @@ -134,13 +134,14 @@ function this.ShowGoldNum0() end function this:OnShow(...) - curIndex = 1 + curIndex = 5 sortingOrder =0 needGoldNum=0 this.TabCtrl = TabBox.New() this.TabCtrl:SetTabAdapter(this.TabAdapter) this.TabCtrl:SetChangeTabCallBack(this.SwitchView) this.TabCtrl:Init(this.tabBox, _TabData,curIndex) + this.tabBox.gameObject:SetActive(false) end local sortingOrder = 0 function this:OnSortingOrderChange(_sortingOrder) diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index b3efd458c9..6166a11488 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -422,12 +422,12 @@ function this.GetAllGodEquips() local starEquips2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.EquipConfig, "Quality", 8) local equips = {} for i = 1, #starEquips do - if starEquips[i].Star and starEquips[i].Star > 0 and starEquips[i].Star ~= 1 then --最低等级的装备 合成不了 + if starEquips[i].Star and starEquips[i].Star > 0 and starEquips[i].Star ~= 18 then --最低等级的装备 合成不了 table.insert(equips, starEquips[i]) end end for i = 1, #starEquips2 do - if starEquips2[i].Star and starEquips2[i].Star > 0 and starEquips2[i].Star ~= 1 then --最低等级的装备 合成不了 + if starEquips2[i].Star and starEquips2[i].Star > 0 and starEquips2[i].Star ~= 18 then --最低等级的装备 合成不了 table.insert(equips, starEquips2[i]) end end