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.5207902
+    - _Alpha: 0.9895201
     - _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.2276597
+    - _Alpha: 0.9541826
     - _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.2213437
+    - _Alpha: 0.16708773
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.18670607
+    - _MainTexOffsetU: 0.25332355
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 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:

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2700,7 +2700,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 77
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y

Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -38,7 +38,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 115.51595, y: -23.732}
-  m_SizeDelta: {x: 57, y: 46.2139}
+  m_SizeDelta: {x: 0, y: 46.2139}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5356034030161481726
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -327,7 +327,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3509861318896561903
 RectTransform:
   m_ObjectHideFlags: 0
@@ -341,11 +341,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2894239996624351365}
-  m_Father: {fileID: 6694772361877173011}
+  m_Father: {fileID: 6870355629153732168}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 292, y: -661.39}
+  m_AnchoredPosition: {x: 225, y: -312}
   m_SizeDelta: {x: 184.1, y: 51.8}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1203846129011065506
@@ -2104,7 +2104,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 214, y: 211}
+  m_AnchoredPosition: {x: 214, y: 284}
   m_SizeDelta: {x: 142.5, y: 47}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3966226649241584167
@@ -3174,7 +3174,6 @@ RectTransform:
   - {fileID: 50435170631078031}
   - {fileID: 6870355629153732168}
   - {fileID: 6565763541845300463}
-  - {fileID: 3509861318896561903}
   - {fileID: 4244019806394961563}
   - {fileID: 38430995020534155}
   - {fileID: 3727605509090450065}
@@ -5966,6 +5965,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4487645842108660236}
+  - {fileID: 3509861318896561903}
   - {fileID: 626305634221636739}
   - {fileID: 4539129630901987991}
   - {fileID: 4735643001707298055}

Assets/Scripts/GameUI/UI/ComBatFrontPanel/ComBatFrontWidget.cs

@@ -35,6 +35,23 @@ namespace Fort23.Mono
             _combatHero = combatHeroInfo;
 
             Text_Name.text = LanguageManager.Instance.Text(combatHeroInfo.modelConfig.name);
+            
+            
+            // //玩家等级
+            // if (groupConfig.GroupMonsterLevel == null || groupConfig.GroupMonsterLevel[i] == -1)
+            // {
+            //     MonsterPowerUpConfig heroPowerUpConfig =
+            //         ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);
+            //
+            //     combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+            // }
+            // else
+            // {
+            //     MonsterPowerUpConfig heroPowerUpConfig =
+            //         ConfigComponent.Instance.Get<MonsterPowerUpConfig>(groupConfig.GroupMonsterLevel[i]);
+            //
+            //     combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+            // }
 
             Text_Jingjie.text =
                 LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -400,8 +400,8 @@ namespace Fort23.Mono
         private void UpdateSaixuanBtnState()
         {
             Btn_Jin.transform.IsGray((type2 != 1 && type2 != 0) || type1 == 2);
-            Btn_Mu.transform.IsGray((type2 != 2 && type2 != 0) || type1 == 2);
-            Btn_Shui.transform.IsGray((type2 != 4 && type2 != 0) || type1 == 2);
+            Btn_Mu.transform.IsGray((type2 != 4 && type2 != 0) || type1 == 2);
+            Btn_Shui.transform.IsGray((type2 != 2 && type2 != 0) || type1 == 2);
             Btn_Huo.transform.IsGray((type2 != 8 && type2 != 0) || type1 == 2);
             Btn_Tu.transform.IsGray((type2 != 16 && type2 != 0) || type1 == 2);
         }
@@ -579,8 +579,9 @@ namespace Fort23.Mono
         List<List<int>> indexList = new List<List<int>>()
         {
             new List<int>() { 9, 8, 7 }, //金
-            new List<int>() { 7, 6, 5 }, //木
-            new List<int>() { 1, 0, 9 }, //水
+            new List<int>() { 1, 0, 9 }, //木
+            new List<int>() { 7, 6, 5 }, //水
+          
             new List<int>() { 5, 4, 3 }, //火
             new List<int>() { 7, 6, 5 }, //土
             new List<int>() { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, //辅助

Assets/Scripts/GameUI/UI/CombatPanel/SkillWidget.cs

@@ -139,15 +139,15 @@ namespace Fort23.Mono
                     csc.ChangeState(1);
                     break;
             }
-
-            if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillConfigId))
-            {
-                redDotComType01.CustomInit(2, skillConfigId);
-            }
-            else
-            {
-                redDotComType01.CustomInit(2, null);
-            }
+            redDotComType01.CustomInit(2, skillConfigId);
+            // if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillConfigId))
+            // {
+            //     redDotComType01.CustomInit(2, skillConfigId);
+            // }
+            // else
+            // {
+            //     redDotComType01.CustomInit(2, null);
+            // }
 
          
         }

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1.cs

@@ -9,6 +9,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "ItemWidgetType1")]
     public partial class ItemWidgetType1 : UIComponent
     {
+        private Color32 color;
+
         private void Init()
         {
         }
@@ -46,7 +48,16 @@ namespace Fort23.Mono
             }
 
 
-            Text_Count.text = $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/{count}";
+            if (count > PlayerManager.Instance.BagController.GetItemCount(id))
+            {
+                Text_Count.text =
+                    $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/<color=red>{count}</color>";
+            }
+            else
+            {
+                Text_Count.text = $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/{count}";
+            }
+
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
         }

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -118,7 +118,7 @@ namespace Fort23.Mono
                 SentimentEffectConfig sentimentEffectConfig =
                     ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
 
-                if (PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId,
+                if (!PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId,
                         sentimentEffectConfig.upConstCount))
                 {
                     ItemSourcePanel.OpenPanel(sentimentEffectConfig.upConstItemId);