大闹天宫添加神魂等级

2021-12-06 17:47:14 +08:00 · 2021-12-06 17:47:14 +08:00 · d9f71e2f48
parent b35bb40ff9
commit d9f71e2f48
6 changed files with 129 additions and 73 deletions
--- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
@ -34152,6 +34152,8 @@ GameObject:
  m_Component:
  - component: {fileID: 677725578348167058}
  - component: {fileID: 7379619952752895271}
+  - component: {fileID: 4411509635042639406}
+  - component: {fileID: 5245989454281854074}
  m_Layer: 5
  m_Name: demons
  m_TagString: Untagged
@ -34201,6 +34203,43 @@ MonoBehaviour:
  m_ChildForceExpandHeight: 1
  m_ChildControlWidth: 0
  m_ChildControlHeight: 0
+--- !u!222 &4411509635042639406
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5820207918186583478}
+  m_CullTransparentMesh: 0
+--- !u!114 &5245989454281854074
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5820207918186583478}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
 --- !u!1 &5821728262193760155
 GameObject:
  m_ObjectHideFlags: 0
@ -62307,27 +62346,32 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031819195525549, 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: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819916146513, 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
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
@ -62337,11 +62381,6 @@ 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}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &3225531421799583520 stripped
@ -63237,27 +63276,32 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031819195525549, 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: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819916146513, 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
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
@ -63267,11 +63311,6 @@ 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}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &7238953302705786463 stripped
@ -63527,27 +63566,32 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031819195525549, 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: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819916146513, 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
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
@ -63557,11 +63601,6 @@ 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}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &8646068175394664958 stripped
@ -63692,27 +63731,32 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031819195525549, 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: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819916146513, 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
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
@ -63722,11 +63766,6 @@ 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}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &8637026968703866189 stripped
@ -64492,27 +64531,32 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031819195525549, 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: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819916146513, 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
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
@ -64522,11 +64566,6 @@ 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}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &5398174965527698585 stripped
@ -64907,27 +64946,32 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2320031819195525549, 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: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
    - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819916146513, 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
      value: -16.999998
      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 3.2600002
@ -64937,11 +64981,6 @@ 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}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &5689749072929729188 stripped
--- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
@ -599,6 +599,7 @@ EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD = protobuf.FieldDescriptor();
 EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
 EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD = protobuf.FieldDescriptor();
 EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD = protobuf.FieldDescriptor();
+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
 EXPEDITIONTEAMINFO = protobuf.Descriptor();
 EXPEDITIONTEAMINFO_HERO_FIELD = protobuf.FieldDescriptor();
 EXPEDITIONTEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
@ -6544,11 +6545,21 @@ EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.default_value = 0
 EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.type = 5
 EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.cpp_type = 1

+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.name = "godSoulLv"
+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.full_name = ".rpc.protocols.ExpeditionSimpleBossInfo.godSoulLv"
+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.number = 6
+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.index = 5
+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.label = 1
+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.has_default_value = false
+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.default_value = 0
+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.type = 5
+EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.cpp_type = 1
+
 EXPEDITIONSIMPLEBOSSINFO.name = "ExpeditionSimpleBossInfo"
 EXPEDITIONSIMPLEBOSSINFO.full_name = ".rpc.protocols.ExpeditionSimpleBossInfo"
 EXPEDITIONSIMPLEBOSSINFO.nested_types = {}
 EXPEDITIONSIMPLEBOSSINFO.enum_types = {}
-EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD, EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD}
+EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD, EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD, EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD}
 EXPEDITIONSIMPLEBOSSINFO.is_extendable = false
 EXPEDITIONSIMPLEBOSSINFO.extensions = {}
 EXPEDITIONTEAMINFO_HERO_FIELD.name = "hero"
--- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
@ -35,13 +35,15 @@ function this.InitExpeditionData(msg)
        singleNodeInfo.state = nodeInfo.state--节点状态 0未开启 1未通过 2未领取圣物 3已完成
        singleNodeInfo.bossTeaminfo = {}--节点队伍信息
        singleNodeInfo.bossTeaminfo.hero = {}--节点队伍信息  英雄
-        -- --LogGreen("-----||||服务端初始化节点信息          "..singleNodeInfo.sortId.."          "..singleNodeInfo.state.."     "..singleNodeInfo.lay )
+        --LogGreen("-----||||服务端初始化节点信息          "..singleNodeInfo.sortId.."          "..singleNodeInfo.state.."     "..singleNodeInfo.lay )
        if nodeInfo.bossTeaminfo then
            if nodeInfo.bossTeaminfo.hero and #nodeInfo.bossTeaminfo.hero > 0 then
                for k = 1, #nodeInfo.bossTeaminfo.hero do
                    local singleHero = {}
                    singleHero.heroTid = nodeInfo.bossTeaminfo.hero[k].heroTid
                    singleHero.star = nodeInfo.bossTeaminfo.hero[k].star
+                    singleHero.godSoulLv = nodeInfo.bossTeaminfo.hero[k].godSoulLv
+                    --LogGreen("singleHero.godSoulLv:"..tostring(singleHero.godSoulLv).."         singleHero.heroTid:"..singleHero.heroTid) 
                    singleHero.level = nodeInfo.bossTeaminfo.hero[k].level
                    singleHero.remainHp = nodeInfo.bossTeaminfo.hero[k].remainHp
                    singleHero.position = nodeInfo.bossTeaminfo.hero[k].position
@ -223,6 +225,8 @@ function this.UpdateNodeValue(nodeInfo)
                                local singleHero = {}
                                singleHero.heroTid = nodeInfo.bossTeaminfo.hero[k].heroTid
                                singleHero.star = nodeInfo.bossTeaminfo.hero[k].star
+                                singleHero.godSoulLv = nodeInfo.bossTeaminfo.hero[k].godSoulLv
+                                --LogGreen("singleHero.godSoulLv:"..tostring(singleHero.godSoulLv) .."         singleHero.heroTid:"..singleHero.heroTid) 
                                singleHero.level = nodeInfo.bossTeaminfo.hero[k].level
                                singleHero.remainHp = nodeInfo.bossTeaminfo.hero[k].remainHp
                                singleHero.position = nodeInfo.bossTeaminfo.hero[k].position
--- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
@ -42,9 +42,6 @@ function ExpeditionMonsterInfoPopup:InitComponent()
    for i=1,#contentScripts do
        contentPrefabs[i]=Util.GetGameObject(this.contents,contentScripts[i].panelName)
    end
-
-
-
 end

 --绑定事件（用于子类重写）
--- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua
@ -179,7 +179,12 @@ function this.SetCardSingleData(o,monsterId, _pos)
    fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[monsterId.star])

    pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
-    SetCardStars(starGrid,monsterId.star)
+    local star,starType = GetStarOrGodSoulLv(1,monsterId)
+    if starType == 3 then
+        fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006")
+    end
+    SetCardStars(starGrid,star,starType)
+    Util.SetParticleSortLayer(starGrid, sortingOrder + 1)
    if monsterId.star > 9 then
        Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
    else
--- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua
@ -71,7 +71,6 @@ function this:OnShow(_parent,...)
    local args = {...}
    monsterData = args[1]
    type = args[2]
-    --LogGreen("type       "..type)
    fun = args[3]
    this.titleText.text=Language[10564]
    if type == 1 then
@ -125,6 +124,7 @@ function this:FormationAdapter(msg)
            Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = SubString2(GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName),6) 
            local star,starType = GetStarOrGodSoulLv(1,curData.hero)
            SetHeroStars(this.spLoader, starGrid, star,starType)
+            Util.SetParticleSortLayer(starGrid,sortingOrder + 1)
            proImage.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(demonData.PropertyName))
            --posImage.sprite = this.spLoader:LoadSprite(GetJobSpriteStrByJobNum(demonData.Profession))
            roleLevel.text = curData.hero.level