lzx 5 days ago
parent
commit
e209e6bb10

+ 1 - 1
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.44737035
+    - _Alpha: 0.85893416
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

+ 1 - 1
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.14463997
+    - _Alpha: 0.49063802
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

+ 2 - 2
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.512872
+    - _Alpha: 0.22046483
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: -0.11778742
+    - _MainTexOffsetU: 0.18773782
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

+ 12 - 7
Assets/Res/UI/DivineSence/BossInfoHeadWidget.prefab

@@ -76,14 +76,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_touxiang
+  _icon_name: icon_tx9001
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9e80b9096dfe61447bc63e8e18bff28f, type: 3}
   packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: dfb4c3d9c19aa8c5a48b193f37a82226
+    packName: touxiang
+    packgJsonPath: /Art/UIAssets/TextrueJson\touxiang.txt
+    packgSpritePath: Assets/Res/UIAtlas/touxiang.spriteatlasv2
+    lasetJsonGUID: 9f489260271d2445d53e6b538583f005
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -127,7 +127,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 391.09186, y: 5.4057236}
+  m_AnchoredPosition: {x: 391.09186, y: 5.4057007}
   m_SizeDelta: {x: 104, y: 104}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4049818242548623024
@@ -200,6 +200,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Boss
+    gameObject: {fileID: 1953072881066838063}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &3964832250591165952
 GameObject:

+ 6 - 6
Assets/Res/UI/DivineSence/ComBatFrontWidget.prefab

@@ -165,14 +165,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_touxiang
+  _icon_name: icon_tx9002
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9e80b9096dfe61447bc63e8e18bff28f, type: 3}
   packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: dfb4c3d9c19aa8c5a48b193f37a82226
+    packName: touxiang
+    packgJsonPath: /Art/UIAssets/TextrueJson\touxiang.txt
+    packgSpritePath: Assets/Res/UIAtlas/touxiang.spriteatlasv2
+    lasetJsonGUID: 9f489260271d2445d53e6b538583f005
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

+ 1 - 1
Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 108, y: 96.45}
+  m_SizeDelta: {x: 0, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

+ 1 - 1
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -4000,7 +4000,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_touxiang
+  _icon_name: dec_daoyoutx
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
   packInfo:

+ 3 - 3
Assets/Scripts/GameUI/UI/ComBatFrontPanel/ComBatFrontWidget.cs

@@ -35,8 +35,8 @@ namespace Fort23.Mono
             _combatHero = combatHeroInfo;
 
             Text_Name.text = LanguageManager.Instance.Text(combatHeroInfo.modelConfig.name);
-            
-            
+
+            Icon_Boss.icon_name = _combatHero.modelConfig.headicon;
             // //玩家等级
             // if (groupConfig.GroupMonsterLevel == null || groupConfig.GroupMonsterLevel[i] == -1)
             // {
@@ -64,7 +64,7 @@ namespace Fort23.Mono
         {
             Text_Name.text = PlayerManager.Instance.PlayerName;
 
-
+            Icon_Boss.icon_name = "icon_tx101";
             Text_Jingjie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +

+ 24 - 23
Assets/Scripts/GameUI/UI/DivineSence/BossInfoHeadWidget.cs

@@ -1,30 +1,31 @@
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "BossInfoHeadWidget"  )]
-	public partial class BossInfoHeadWidget : ItemWidgetBasic
-	{
-		public CombatHeroInfo _combatHero;
-		private void Init()
-		{
+    [UIBinding(prefab = "BossInfoHeadWidget")]
+    public partial class BossInfoHeadWidget : ItemWidgetBasic
+    {
+        public CombatHeroInfo _combatHero;
 
-		}
-		public override void AddEvent()
-		{
+        private void Init()
+        {
+        }
 
-		}
-		public override void DelEvent()
-		{
+        public override void AddEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
-			base.AddButtonEvent();
-		}
+        public override void DelEvent()
+        {
+        }
 
-		public void CustomInit(CombatHeroInfo combatHeroInfo)
-		{
-			_combatHero = combatHeroInfo;
-		}
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+        }
 
-	}
-}
+        public void CustomInit(CombatHeroInfo combatHeroInfo)
+        {
+            _combatHero = combatHeroInfo;
+            Icon_Boss.icon_name = _combatHero.modelConfig.headicon;
+        }
+    }
+}

+ 40 - 0
Assets/Scripts/GameUI/UI/DivineSence/BossInfoHeadWidgetData.cs

@@ -0,0 +1,40 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class BossInfoHeadWidget 
+	{
+	  #region 自定义数据 
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private MyImage _Icon_Boss;
+	  public MyImage Icon_Boss
+	   {
+	   get{
+	      if (_Icon_Boss == null)
+	       {
+	         _Icon_Boss  = GetUIUnit<MyImage>("Icon_Boss"); 
+	       }
+	      return _Icon_Boss;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/DivineSence/BossInfoHeadWidgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: C3kb5C2oBX4OxqD2qTPCZEq+yHzMxALUOqTuw5ibI14/jjuGq7PyAuQDdsBd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: