Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua

@@ -152,10 +152,10 @@ end
 --获取单个英雄装备数据
 function this.GetSingleHeroSingleEquipData(_equipid, _heroDid)
     _equipid = tonumber(_equipid)
-    if this.equipDatas[_equipid] and this.equipDatas[_equipid].upHeroDidList and this.equipDatas[_equipid].upHeroDidList[_heroDid] then
-        return this.equipDatas[_equipid]
-    elseif HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) > 0 and HarmonyManager.IsInfo(_heroDid) then
+    if HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) > 0 and HarmonyManager.IsInfo(_heroDid) then
         return HarmonyManager.equipDatas[_equipid]--.upHeroDidList[_heroDid]
+    elseif this.equipDatas[_equipid] and this.equipDatas[_equipid].upHeroDidList and this.equipDatas[_equipid].upHeroDidList[_heroDid] then
+        return this.equipDatas[_equipid]
     else
         return nil
     end

Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua

@@ -116,10 +116,11 @@ end
 
 function this.UpdateHongMengDataAdditions(hongmengAdditions)
     this.hongmengAdditions = hongmengAdditions
-    -- for i = 1, #this.hongmengAdditions do
-    --     print(this.hongmengAdditions[i].heroTid)
-    --     print(this.hongmengAdditions[i].value)
-    -- end
+    for i = 1, #this.hongmengAdditions do
+        -- LogGreen("this.hongmengAdditions[i].heroTid:"..this.hongmengAdditions[i].heroTid)
+        -- LogGreen("this.hongmengAdditions[i].value:"..this.hongmengAdditions[i].value)
+        -- LogGreen("this.hongmengAdditions[i].additionType:"..this.hongmengAdditions[i].additionType)
+    end
     --LogGreen("hongmengAdditions        "..#this.hongmengAdditions)
     for i = 1, #this.hongmengAdditions do
        
@@ -416,9 +417,8 @@ function this.GetSingleAdditions(type)
     if this.hongmengAdditions  then
         -- body
         for i = 1, #this.hongmengAdditions do
-            if this.hongmengAdditions[i].additionType  == type then
-               
-                
+            if this.hongmengAdditions[i].additionType  == type then  
+                --LogGreen("this.hongmengAdditions[i].additionType:"..this.hongmengAdditions[i].additionType.."       this.hongmengAdditions[i].value :"..this.hongmengAdditions[i].value )
                return this.hongmengAdditions[i].value 
             end
         end

Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua

@@ -3074,11 +3074,11 @@ function this.GetHeroIsUpEquip(heroDid)
             equipIdAndWarPower.warPower = 0
             lackEquips[i] = equipIdAndWarPower
         end
-
         -- 有装备的位置赋值装备id及战力
-        if heroData.equipIdList and #heroData.equipIdList > 1 then
+        if heroData.equipIdList and #heroData.equipIdList > 0 then
             for i = 1, #heroData.equipIdList do
                 if not heroData.equipIdList[i] then
+                    
                 else
                     local curEquipConFigData =
                         EquipManager.GetSingleHeroSingleEquipData(heroData.equipIdList[i], heroDid)
@@ -3093,13 +3093,11 @@ function this.GetHeroIsUpEquip(heroDid)
             end
         end
 
-
         --有同系  且未在英雄身上的装备
         local equips = BagManager.GetEquipDataByEquipPosition(heroData.heroConfig.Profession)
 
         for _, v in ipairs(equips) do
             if EquipManager.GetSingleHeroSingleEquipData(v.id, heroDid) then
-                --英雄已经装备了这个装备
             else
                 local equipConfigData = equipConfig[v.id]
                 local pos = equipConfigData.Position
@@ -3109,7 +3107,7 @@ function this.GetHeroIsUpEquip(heroDid)
                         lackEquips[pos].id = v.id
                         lackEquips[pos].warPower = EquipManager.CalculateWarForce(v.id)
                     else
-                        local nextEquipWarPower = EquipManager.CalculateWarForce(v.id)
+                        local nextEquipWarPower = EquipManager.CalculateWarForce(v.id)                 
                         if nextEquipWarPower > lackEquips[pos].warPower then
                             lackEquips[pos].id = v.id
                             lackEquips[pos].warPower = EquipManager.CalculateWarForce(v.id)

Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua

@@ -50,8 +50,8 @@ local _ViewConfig = {
         formationType = FormationTypeDef.JUMPSERVER_HIGHTLADDER,
         tip = "罗浮争锋阵容:",
         btnType = {
-            {name = "挑战", func = 6},
-            {name = "切磋", func = 7},
+            -- {name = "挑战", func = 6},
+            {name = "切磋", func = 6},
         }
     },
 }
@@ -172,7 +172,6 @@ function PlayerInfoPopup:OnOpen(playerId, viewType,serverName)
         [4] = this.RemoveFromBlackList,
         [5] = this.GoToBlack,
         [6] = this.JumpServerBattle,
-        [7] = this.JumpServerCrossBattle,
     }
 end
 
@@ -339,6 +338,7 @@ function this.FormationAdapter(teamInfo)
         end
     end
     local len=#teamInfo.PokemonInfos
+    LogError("长度："..len)
     if len>0 then
         -- this.bgImg.sizeDelta=Vector2.New(900,1024)
         this.pokemonObj:SetActive(true)
@@ -416,6 +416,7 @@ function this.RefreshBtnShow()
         return
     end
     -- 判断该界面类型是否有按钮显示
+    LogYellow("this._ViewType           "..this._ViewType.."         "..tostring(not JumpServerManager.GetCurPersonInfo()))
     if not this._Config or not this._Config.btnType or isNpc  then--or (this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER and not JumpServerManager.GetCurPersonInfo())
         this.boxLine:SetActive(false)
         this.btnBox:SetActive(false)
@@ -432,12 +433,6 @@ function this.RefreshBtnShow()
     this.btnBox:SetActive(true)
     for index, btn in ipairs(this.btnList) do
         btn:SetActive(btnType[index] ~= nil)
-        --罗浮争锋时 挑战阶段显示两个按钮 挑战 和 切磋 其他阶段显示  切磋
-        if this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER and JumpServerManager.GetHightLadderDatastage() ==  JumpServer_Stage.Attack then
-            this.btnList[1]:SetActive(true)
-        else
-            this.btnList[1]:SetActive(false)
-        end
         if btnType[index] then
             Util.GetGameObject(btn, "Text"):GetComponent("Text").text = btnType[index].name
             Util.AddOnceClick(btn, function()
@@ -497,35 +492,30 @@ function this.BeatHim()
     this:ClosePanel()
     UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.PLAY, this._PlayerData)
 end
-
 -- 跨服天梯
 function this.JumpServerBattle()
-    this:ClosePanel()
-    local JoinRank = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).JoinRank
-    if not JumpServerManager.GetHightLadderDataEnterable() then
-        PopupTipPanel.ShowTip("本服千战逐胜台前"..JoinRank.."名可以参加")
-        return
-    end
-    local JumpPanel = UIManager.GetOpenPanel(UIName.JumpServerHightLadderPanel)
-    if not JumpPanel then return end
-    local curData = JumpServerManager.GetCurPersonInfo()
-    if not curData then return end  
-    this:ClosePanel()
-    JumpPanel.BuyVipFun(1,1,function()
-        --直接战斗
-        JumpServerManager.StarFightHightLadder(curData,0,function(msg)
-            PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM, 1)--更新特权
-            JumpPanel = UIManager.GetOpenPanel(UIName.JumpServerHightLadderPanel)
-            JumpPanel.RefreshBuyNum()
-            JumpPanel.OnShowPanel()
-            JumpServerManager.SetCurPersonInfo(nil)
-        end)
-    end)
-end
--- 跨服天梯
-function this.JumpServerCrossBattle()
     this:ClosePanel()
     UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER,true, this._PlayerData)
+    -- local JoinRank = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).JoinRank
+    -- if not JumpServerManager.GetHightLadderDataEnterable() then
+    --     PopupTipPanel.ShowTip("本服千战逐胜台前"..JoinRank.."名可以参加")
+    --     return
+    -- end
+    -- local JumpPanel = UIManager.GetOpenPanel(UIName.JumpServerHightLadderPanel)
+    -- if not JumpPanel then return end
+    -- local curData = JumpServerManager.GetCurPersonInfo()
+    -- if not curData then return end  
+    -- this:ClosePanel()
+    -- JumpPanel.BuyVipFun(1,1,function()
+    --     --直接战斗
+    --     JumpServerManager.StarFightHightLadder(curData,0,function(msg)
+    --         PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM, 1)--更新特权
+    --         JumpPanel = UIManager.GetOpenPanel(UIName.JumpServerHightLadderPanel)
+    --         JumpPanel.RefreshBuyNum()
+    --         JumpPanel.OnShowPanel()
+    --         JumpServerManager.SetCurPersonInfo(nil)
+    --     end)
+    -- end)
 end
 --界面关闭时调用（用于子类重写）
 function PlayerInfoPopup:OnClose()

Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua

@@ -608,9 +608,9 @@ function this.ShowHeroEquip()
             Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite =
             this.spLoader:LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName))
             --鸿蒙阵 共享数据判断
-            if HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1  then
+            if HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1 and curEquipTreasureDatas[i].equipType == 1 then
                 Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
-            elseif HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 then
+            elseif HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 and curEquipTreasureDatas[i].equipType == 2 then
                 Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
             else
                 Util.GetGameObject(go.transform, "HongMenging"):SetActive(false)