diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index 5c059d803b..e89c2283d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -401,23 +401,32 @@ function this.GetEquipRewardList(equiplist) end function this.GetMinEquipStar(equiplist) - -- body + -- body ,equipConfig[equiplist[i]],equipConfig[equiplist[i]].Star if #equiplist == 0 then -- body return 0 end local _list = {} + + --print(#equiplist," 1111 @@@@@@@@@") for i = 1, #equiplist do -- body - _list[i] = equipConfig[equiplist[i]] + table.insert(_list,equipConfig[tonumber(equiplist[i])]) + + --print("执行程序s",equiplist[i],equipConfig[ tonumber(equiplist[i])].Name,equipConfig) end + +-- print(#_list," 1.5 @@@@@@@@@") +-- print(LengthOfTable(_list)," 2222 @@@@@@@@@") local _minStar = 999 + for i = 1, #_list do -- body if _minStar > _list[i].Star then -- body _minStar = _list[i].Star - end + end + --print(_list[i].Star," !!!!!!!!!!") end return _minStar end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua index 6d4f679c75..b5ec89896f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua @@ -141,8 +141,12 @@ function HongMengUnLoadPanel:SetTextTwo(go,data) end function HongMengUnLoadPanel:SetText(go,_data) - - + -- local dataRock = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]) + -- local HunSoul = 0 + -- if dataRock.type == "魂宝" then + + -- else + -- end for i = 1, #dataAdditon do if dataAdditon[i].additionType == 1 then if HarmonyManager.hongmengTablet>=HarmonyManager.TowerStartLimit then diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 024a882dfb..c941c1e707 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -67,6 +67,8 @@ local mainDynamicActivityIcon = { [15] = "r_zjm_huodongicon-suoxiangpimi", ----所向披靡 [16] = "r_zjm_huodongicon-xialuxiangfeng", ----狭路相逢 [17] = "r_zjm_huodongicon-tongqiangtiebi", ----铜墙铁壁 + [18] = "r_zjm_huodongicon-tongqiangtiebi", + [19] = "r_zjm_huodongicon-tongqiangtiebi", } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos} @@ -1489,6 +1491,7 @@ function this.TimeFormat() if dynamicAct then if isRefeshIcon then local curindex = GlobalActConfig[dynamicAct].ShowArt + print(curindex," ",mainDynamicActivityIcon[curindex]) Util.GetGameObject(this.btnDynamicActivity,"Image"):GetComponent("Image").sprite = Util.LoadSprite(mainDynamicActivityIcon[curindex]) isRefeshIcon = false end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua index 566ccf00f5..5f8fb53a86 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua @@ -13,7 +13,7 @@ EquipTreasureData.__get__.lv = function(self) local temp_lv = HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) local isMing = HarmonyManager.IsInfo(self.upHeroDid) --LogPink("self.upHeroDid "..self.upHeroDid.." "..tostring(isMing)) - if temp_lv > 0 and isMing then + if temp_lv > 0 and isMing and temp_lv > self._lv then local curlvEen = jewelConfig[self.id].Max[1] local endLv = temp_lv > curlvEen and curlvEen or temp_lv --LogPink(" curlvEen "..endLv) @@ -27,7 +27,7 @@ EquipTreasureData.__get__.lv = function(self) local temp_lv = HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) local isMing = HarmonyManager.IsInfo(self.upHeroDid) --LogPink("self.upHeroDid "..self.upHeroDid.." "..tostring(isMing)) - if temp_lv > 0 and isMing then + if temp_lv > 0 and isMing and temp_lv > self._lv then local curlvEen = jewelConfig[self.id].Max[1] -- LogGreen("curlvEen "..curlvEen.." temp_lv "..temp_lv) local endLv = temp_lv > curlvEen and curlvEen or temp_lv