Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.005366751
+    - _Alpha: 0.9256576
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.7075048
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.20340419
+    - _Alpha: 0.32599068
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20804214
+    - _MainTexOffsetU: 0.07113081
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -30,15 +30,16 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2896655462721008753}
   - {fileID: 9201402782951942412}
+  - {fileID: 5727707923846954762}
+  - {fileID: 2896655462721008753}
   - {fileID: 2569128129379278262}
   m_Father: {fileID: 0}
   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: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 2670}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7897761964867798499
 MonoBehaviour:
@@ -123,6 +124,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: BackgroundComRoot
+    gameObject: {fileID: 5727707923846954762}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1269031383078709346
 GameObject:
@@ -2297,7 +2303,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2896655462721008753
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2338,7 +2344,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.69411767}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2399,6 +2405,51 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7305190763264252453
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5727707923846954762}
+  - component: {fileID: 9014541910258728495}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: BackgroundComRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5727707923846954762
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7305190763264252453}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9014541910258728495
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7305190763264252453}
+  m_CullTransparentMesh: 1
 --- !u!1 &7488814943693437896
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameUI/UI/BackgroundCom.cs

@@ -29,6 +29,8 @@ namespace Fort23.Mono
         }
         
         
+        
+        
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs

@@ -14,6 +14,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "BossInfoPanel")]
     public partial class BossInfoPanel : UIPanel
     {
+        private BackgroundCom _backgroundCom;
         private bool isOk;
 
         private LevelbattleConfig levelbattleConfig;
@@ -37,6 +38,13 @@ namespace Fort23.Mono
         {
         }
 
+        protected async override CTask ProOpen()
+        {
+            _backgroundCom = await UIManager.Instance.CreateGComponent<BackgroundCom>(null, root: BackgroundComRoot);
+            await base.ProOpen();
+            return;
+        }
+
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
@@ -80,8 +88,18 @@ namespace Fort23.Mono
                 //玩家等级
                 if (groupConfig.GroupMonsterLevel == null || groupConfig.GroupMonsterLevel[i] == -1)
                 {
-                    MonsterPowerUpConfig heroPowerUpConfig =
-                        ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);
+                    MonsterPowerUpConfig heroPowerUpConfig = default;
+                    if (eventList == null)
+                    {
+                        heroPowerUpConfig =
+                            ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero
+                                .powerUpConfig.ID);
+                    }
+                    else
+                    {
+                        heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);
+                    }
+
 
                     combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
                 }
@@ -100,19 +118,8 @@ namespace Fort23.Mono
                 bossInfoHeadWidget.OnClick = OnClick;
                 BossInfoHeadWidgets.Add(bossInfoHeadWidget);
             }
-            // foreach (var i in groupConfig.GroupMonster)
-            // {
-            //    
-            //   
-            // }
-
-            // heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
-            // heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
-            //
-            // CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
-            // combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+
             BossInfoHeadWidgets[0].OnPointerClick();
-            // UpdateInfo(2,BossInfoHeadWidgets[0]);
         }
 
         private void OnClick(ItemWidgetBasic obj)
@@ -270,6 +277,8 @@ namespace Fort23.Mono
 
         public async override CTask Close()
         {
+            UIManager.Instance.DormancyGComponent(_backgroundCom);
+            _backgroundCom = null;
             foreach (var faBaoWidget in gongFaWidgetType2s)
             {
                 UIManager.Instance.DormancyGComponent(faBaoWidget);
@@ -292,9 +301,7 @@ namespace Fort23.Mono
         public async static CTask OpenPanel(int levebattleId, AccountFileInfo.EventList CurrentEventList)
         {
             BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top,
-                uiData: new object[] { levebattleId, CurrentEventList, }, isShowBG: true);
-            // bossInfoPanel.CustomInit(levebattleId, result);
-            // return await result;
+                uiData: new object[] { levebattleId, CurrentEventList, });
         }
     }
 }

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanelData.cs

@@ -162,6 +162,17 @@ namespace Fort23.Mono
 	      return _BossInfoHeadRoot;
 	     }
 	   }
+	  private RectTransform _BackgroundComRoot;
+	  public RectTransform BackgroundComRoot
+	   {
+	   get{
+	      if (_BackgroundComRoot == null)
+	       {
+	         _BackgroundComRoot  = GetUIUnit<RectTransform>("BackgroundComRoot"); 
+	       }
+	      return _BackgroundComRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{