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.5842372
+    - _Alpha: 0.49184418
     - _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.30885887
+    - _Alpha: 0.19341296
     - _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.48192543
+    - _Alpha: 0.22744322
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: -0.08704239
+    - _MainTexOffsetU: 0.17958128
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -3695,8 +3695,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 133.15, y: 0.000024796}
-  m_SizeDelta: {x: 98.1467, y: 79.3136}
+  m_AnchoredPosition: {x: 284.23294, y: 0.000024796}
+  m_SizeDelta: {x: 249.2296, y: 79.3136}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5997908688825554679
 CanvasRenderer:

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

@@ -256,13 +256,13 @@ namespace Fort23.Mono
                     return;
                 }
 
-                if (type2 == 2)
+                if (type2 == 4)
                 {
                     type2 = 0;
                 }
                 else
                 {
-                    type2 = 2;
+                    type2 = 4;
                 }
 
                 Sort(type1, type2);
@@ -274,13 +274,13 @@ namespace Fort23.Mono
                     return;
                 }
 
-                if (type2 == 4)
+                if (type2 == 2)
                 {
                     type2 = 0;
                 }
                 else
                 {
-                    type2 = 4;
+                    type2 = 2;
                 }
 
                 Sort(type1, type2);

Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanel.cs

@@ -79,7 +79,8 @@ namespace Fort23.Mono
                 Text_Level.text = faBaoInfo.FabaoPowerupConfig.ID + "级";
                 Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name);
                 Text_Power.text = $"强度：{faBaoInfo.qiangDu}";
-                Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec), faBaoInfo.effectValue);
+                Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
+                    faBaoInfo.effectValue);
 
                 Text_ItemDesc.text = LanguageManager.Instance.Text(_itemInfo.config.itemDesc);
 
@@ -121,17 +122,25 @@ namespace Fort23.Mono
 
             faBaoSkillWidgets.Clear();
 
-            List<FabaoPowerupConfig> fabaoPowerupConfigs = ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().ToList();
+            List<FabaoPowerupConfig> fabaoPowerupConfigs =
+                ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().ToList();
 
-            var fanappower = fabaoPowerupConfigs.GroupBy(f => f.SkillLevel).Select(g => new { config = g.OrderBy(f => f.ID).FirstOrDefault() }).ToList();
+            var fanappower = fabaoPowerupConfigs.GroupBy(f => f.SkillLevel)
+                .Select(g => new { config = g.OrderBy(f => f.ID).FirstOrDefault() }).ToList();
 
             foreach (var powerupConfigse in fanappower)
             {
+                if (powerupConfigse.config.ID == 1)
+                {
+                    continue;
+                }
+
                 AccountFileInfo.FaBaoData faBaoData = new AccountFileInfo.FaBaoData();
                 faBaoData.id = currentFaBaoInfo.FaBaoData.id;
                 faBaoData.level = powerupConfigse.config.ID;
                 FaBaoInfo _faBaoInfo = new FaBaoInfo(faBaoData);
-                FaBaoSkillWidget faBaoSkillWidget = await UIManager.Instance.CreateGComponent<FaBaoSkillWidget>(null, SkillContent);
+                FaBaoSkillWidget faBaoSkillWidget =
+                    await UIManager.Instance.CreateGComponent<FaBaoSkillWidget>(null, SkillContent);
                 faBaoSkillWidget.CustomInit(currentFaBaoInfo, _faBaoInfo);
                 faBaoSkillWidgets.Add(faBaoSkillWidget);
             }
@@ -142,7 +151,8 @@ namespace Fort23.Mono
             string t = "";
             foreach (var keyValuePair in faBaoInfo.attriButedIC)
             {
-                t = $"{GetAttributeName(keyValuePair.Key)} : {currentFaBaoInfo.attriButedIC[keyValuePair.Key].ToString()}\n";
+                t =
+                    $"{GetAttributeName(keyValuePair.Key)} : {currentFaBaoInfo.attriButedIC[keyValuePair.Key].ToString()}\n";
             }
 
             Text_ShuXingJiaCheng.text = t;
@@ -166,7 +176,8 @@ namespace Fort23.Mono
 
         public async static CTask<FaBaoDetailsPanel> OpenPanel(ItemInfo faBaoInfo)
         {
-            FaBaoDetailsPanel selectFaBaoPanel = await UIManager.Instance.LoadAndOpenPanel<FaBaoDetailsPanel>(null, UILayer.Top);
+            FaBaoDetailsPanel selectFaBaoPanel =
+                await UIManager.Instance.LoadAndOpenPanel<FaBaoDetailsPanel>(null, UILayer.Top);
             selectFaBaoPanel.CustomInit(faBaoInfo);
             return selectFaBaoPanel;
         }