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

2021-09-27 17:02:59 +08:00 · 2021-09-27 17:02:59 +08:00 · a4ee19a351
parent 5939c5b2f8 854f2df748
commit a4ee19a351
11 changed files with 71641 additions and 41 deletions
--- a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab
--- a/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantGongmingPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantGongmingPopup.prefab
@ -764,6 +764,7 @@ RectTransform:
  - {fileID: 9169902103495551306}
  - {fileID: 4869340032853470271}
  - {fileID: 4096853268367997150}
+  - {fileID: 6474655450653005156}
  m_Father: {fileID: 1662743993144903840}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4949,6 +4950,86 @@ MonoBehaviour:
  m_FillClockwise: 1
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
+--- !u!1 &7160478407521422271
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6474655450653005156}
+  - component: {fileID: 1834093620742243404}
+  - component: {fileID: 3510528440869017411}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6474655450653005156
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7160478407521422271}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1662670759670463908}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -0, y: -619.6}
+  m_SizeDelta: {x: 384.31, y: 64.41}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1834093620742243404
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7160478407521422271}
+  m_CullTransparentMesh: 0
+--- !u!114 &3510528440869017411
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7160478407521422271}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.052750587, g: 0.9339623, b: 0.030838395, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 50
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u56DB\u79CD\u5FC3\u6CD5\u5168\u90E8\u8FDB\u9636\u81F3\u76F8\u540C\u9636\u6570\u65F6\u6FC0\u6D3B\u5FC3\u6CD5\u5171\u9E23"
+  LanguageIndex: 0
 --- !u!1 &7200124988758997953
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
@ -8353,8 +8353,8 @@ local passivityList = {
        end
        role.Event:AddEvent(BattleEventName.RoleTurnStart,onRoleTurnStart,nil,nil,role)
    end,
-    --直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害
-    -- a[float]
+    --直接伤害击杀目标溢出伤害的[a]%将对当前生命绝对值[b]的目标造成伤害
+    -- a[float],b[int]
    [353]=function(role,args,id,judge)
        local f1 = args[1]
        local type = args[2] or 0
--- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua
@ -28,6 +28,7 @@ local bagPosEquips = {}
 local needGoldNum = 0
 local needOtherNum=0
 local otherId=1258
+local allGo = {}
 function this:InitComponent(gameObject)
    this.spLoader = SpriteLoader.New()
    this.tabBox = Util.GetGameObject(gameObject, "CompoundPanel_Equip/TabBox")
@ -107,6 +108,9 @@ end
 local sortingOrder = 0
 function this:OnSortingOrderChange(_sortingOrder)
    sortingOrder = _sortingOrder
+    for i, v in pairs(allGo) do
+        Util.AddParticleSortLayer(v, _sortingOrder - sortingOrder )
+   end
 end
 function this.OnClickTabBtn(_curIndex)
    curIndex = _curIndex
@ -205,6 +209,8 @@ function this.ShowTitleEquipData(_go,_itemData,curEquipStarsConfig)
    Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(curEquipStarsConfig.Quality))
    Util.GetGameObject(_go.transform,"icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[_itemData.Id].ResourceID))
    Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text = GetLanguageStrById(itemConfig[_itemData.Id].Name)
+    local effect=Util.GetGameObject(_go.transform,"UI_effect_WuCai_Kuang")
+    effect:SetActive(curEquipStarsConfig.Quality>=7)
    --Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=_itemData.Name
    SetHeroStars(this.spLoader, Util.GetGameObject(_go.transform, "star"), curEquipStarsConfig.Stars,1,nil,-15)
    Util.AddClick(Util.GetGameObject(_go.transform,"icon"), function()
@ -217,9 +223,14 @@ function this.ShowTitleEquipData(_go,_itemData,curEquipStarsConfig)
 end

 function this.SingleItemDataShow(_go,_itemData,curEquipStarsConfig)
+    if not allGo[_go] then
+        allGo[_go] = _go
+        Util.AddParticleSortLayer(_go, sortingOrder)
+    end
    Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(curEquipStarsConfig.Quality))
    Util.GetGameObject(_go.transform,"icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[_itemData.Id].ResourceID))
    Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=SubString2(GetLanguageStrById(_itemData.Name),8) 
+    Util.GetGameObject(_go.transform,"UI_effect_WuCai_Kuang"):SetActive(curEquipStarsConfig.Quality>=7)
    SetHeroStars(this.spLoader, Util.GetGameObject(_go.transform, "star"), curEquipStarsConfig.Stars,1,nil,-15)
    local choosed =Util.GetGameObject(_go.transform, "choosed")
    choosed:SetActive(curSelectEquip.Id == _itemData .Id)
@ -416,6 +427,7 @@ end
 function this:OnDestroy()
    this.spLoader:Destroy()
    needGoldNum=0
+    allGo = {}
 end

 return this
--- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
@ -81,12 +81,21 @@ function this.UpdateFormation(msg)

        for j = 1, #team.teamHeroInfos do
            local teamHeroInfo = team.teamHeroInfos[j]
+            -- TODO: 四灵试炼编队特殊处理
+            if team.teamId == FormationTypeDef.FourElement_PEOPLE 
+            or team.teamId == FormationTypeDef.FourElement_MAGIC 
+            or team.teamId == FormationTypeDef.FourElement_BUDDHIST 
+            or team.teamId == FormationTypeDef.FourElement_TAOIST then
            if HeroManager.GetSingleHeroData(teamHeroInfo.heroId) then
                table.insert(oTeam.teamHeroInfos, teamHeroInfo)
                HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1)
            else
                isRefresh = true
            end
+            else
+                table.insert(oTeam.teamHeroInfos, teamHeroInfo)
+                HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1)
+            end
        end
        oTeam.teamPokemonInfos = {}
        this.formationList[team.teamId] = oTeam
--- a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
@ -1024,8 +1024,8 @@ function this.GetMapTeamPower()
                Log("heroData is not exist! error Did:" .. curFormation[i].heroId)
                return
            end
-
-            if curFormation[i].allProVal[2] > 0 then
+            local hp = FormationManager.GetFormationHeroHp(FormationTypeDef.FORMATION_ENDLESS_MAP, curFormation[i].heroId)
+            if hp and hp > 0 then
                powerNum = powerNum + HeroPowerManager.GetHeroPower(heroData.dynamicId)
            end
        end
--- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua
@ -69,7 +69,7 @@ end
 function this.Init(pos,num)
    local u, v = Map_Pos2UV(pos)
    --(角色身上的数据, 主要是位置信息)
-    this.leaderMapData = TileMapView.GetMapData()
+    this.leaderMapData = TileMapView.GetMapData():GetMapData(u, v)
    MapManager.curMapBornPos = Map_UV2Pos(this.leaderMapData.u, this.leaderMapData.v)

    -- LogRed("NUM"..num)
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@ -1756,7 +1756,7 @@ function this.RequestUserForceChange(teamId, func)
        if func then
            func()
        end
-    end)
+    end,true)
 end

 ----------------------------------------------
--- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
@ -156,7 +156,7 @@ function this.ShowBattleResultByEndless()
                if m_battlePanel then
                    m_battlePanel:ClosePanel()
                end
-                self:ClosePanel()
+                this:ClosePanel()
                Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
            end,0, true, true)
        end)
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
@ -47,7 +47,7 @@ function RoleEquipChangePopup:InitComponent()
            this.equipPanel[i].powerUPorDown1=Util.GetGameObject(this.equipPanel[i].equipInfo,"powerUPorDown")
            this.equipPanel[i].bg1Star=Util.GetGameObject(this.equipPanel[i].equipInfo,"star")
            this.equipPanel[i].proGrid = Util.GetGameObject(this.equipPanel[i].equipInfo,"proGrid")
-
+            this.equipPanel[i].effect = Util.GetGameObject(this.equipPanel[i].equipInfo,"UI_effect_WuCai_Kuang")
            this.equipPanel[i].curEquipTypeText=Util.GetGameObject(this.equipPanel[i].proGrid,"equipTypeText"):GetComponent("Text")
            this.equipPanel[i].curEquipLvText=Util.GetGameObject(this.equipPanel[i].proGrid,"equipLvText")
            this.equipPanel[i].curEquipLvText:SetActive(false)
@ -217,7 +217,7 @@ function this.SetEquipData(index,data,equipConfigData,itemConfigData)
    this.equipPanel[index].powerNum1.text=EquipManager.CalculateWarForce(data.id)
    EquipManager.SetEquipStarShow(this.spLoader, this.equipPanel[index].bg1Star,data.id)
    this.equipPanel[index].desc.text= GetLanguageStrById(itemConfigData.ItemDescribe) 
-   
+    this.equipPanel[index].effect:SetActive(equipConfigData.Quality>=7)
    this.equipPanel[index].qualityText.text= GetStringByEquipQua(equipConfigData.Quality,GetQuaStringByEquipQua(equipConfigData.Quality))
    this.equipPanel[index].curEquipName.text=GetStringByEquipQua(equipConfigData.Quality,GetLanguageStrById(equipConfigData.Name))
    this.equipPanel[index].curEquipFrame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(equipConfigData.Quality))