【山河社稷图】编队加职能调副关卡恭喜获得背景层级

2021-05-18 15:17:05 +08:00 · 2021-05-18 15:17:05 +08:00 · c27ddeb2a4
parent 433bcf9ddb
commit c27ddeb2a4
4 changed files with 71 additions and 68 deletions
--- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
@ -4554,7 +4554,7 @@ ParticleSystem:
 --- !u!199 &199787422305027156
 ParticleSystemRenderer:
  serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
@ -9203,7 +9203,7 @@ ParticleSystem:
 --- !u!199 &199651780022285358
 ParticleSystemRenderer:
  serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
@ -10518,8 +10518,8 @@ RectTransform:
  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: 58.624115, y: -59.044212}
-  m_SizeDelta: {x: 32, y: 40}
+  m_AnchoredPosition: {x: 60, y: -55}
+  m_SizeDelta: {x: 42, y: 42}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4859152802894432561
 CanvasRenderer:
@ -20854,6 +20854,11 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
@ -20869,21 +20874,16 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
    - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_IsActive
@ -21024,6 +21024,11 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
@ -21039,21 +21044,16 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
    - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_IsActive
@ -21194,6 +21194,11 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
@ -21209,21 +21214,16 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
    - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_IsActive
@ -21364,6 +21364,11 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
@ -21379,21 +21384,16 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
    - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_IsActive
@ -21534,6 +21534,11 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
@ -21549,21 +21554,16 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
    - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_IsActive
@ -21704,6 +21704,11 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
@ -21719,21 +21724,16 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
-      objectReference: {fileID: 0}
    - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_IsActive
--- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
@ -635,6 +635,8 @@ function this.SingleHeroDataShow(_go, _heroData)
    local icon=Util.GetGameObject(go, "icon"):GetComponent("Image")
    local lv= Util.GetGameObject(go, "lv/Text"):GetComponent("Text")
    local pro= Util.GetGameObject(go, "proIcon"):GetComponent("Image")
+    local pos= Util.GetGameObject(go, "posIcon"):GetComponent("Image")
+    Util.GetGameObject(go, "posIcon"):SetActive(this.curFormationIndex == FormationTypeDef.FIGHT_LEVEL)
    local starGrid = Util.GetGameObject(go, "star")
    local yuanImage = Util.GetGameObject(go, "yuanImage")
    local choosedObj = Util.GetGameObject(go, "choosed")
@ -654,6 +656,7 @@ function this.SingleHeroDataShow(_go, _heroData)
    end
   
    pro.sprite= Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
+    pos.sprite = Util.LoadSprite(heroData.professionIcon)
    SetHeroStars(starGrid, heroData.star,1,Vector2.New(30,30),-8)
    --血量显示
    local curHeroHpVal = FormationManager.GetFormationHeroHp(this.curFormationIndex,_heroData.dynamicId)
--- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
@ -161,10 +161,10 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
    end
    heroData.profession = _configData.Profession
    heroData.ProfessionResourceId = _configData.ProfessionResourceId
-    if GetJobSpriteStrByJobNum(_configData.Profession) then
-        heroData.professionIcon = GetJobSpriteStrByJobNum(_configData.Profession)
+    if GetHeroPosStr(_configData.Profession) then
+        heroData.professionIcon = GetHeroPosStr(_configData.Profession)--GetJobSpriteStrByJobNum(_configData.Profession)
    else
-        heroData.professionIcon = GetJobSpriteStrByJobNum(1)
+        heroData.professionIcon = GetHeroPosStr(1)--GetJobSpriteStrByJobNum(1)
    end
    heroData.name = GetLanguageStrById(_configData.ReadingName)
    heroData.property = _configData.PropertyName
--- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
@ -312,7 +312,7 @@ function this.ShowBattleResultByFightLevelAssistantType(drop)
                        this:ClosePanel()
                        -- Game.GlobalEvent:DispatchEvent(GameEvent.FightLevel.MainLevelInfoRefresh)
                    end
-                end)
+                end,nil,true,true)
            elseif curBattlefightLevelData.state == 1 then
                UIManager.OpenPanel(UIName.RewardItemPopup,HardStageFightResponseMsg.drop, 1,function(isBackBattle)--isBackBattle  true时 为回放不走回调
                    if not isBackBattle then