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

Assets/Res/Config/SkillConfig.json

@@ -5754,7 +5754,7 @@
       "icon": "icon_s2008",
       "scriptName": "S2008",
       "IDGroup": 2008,
-      "timelineName": "",
+      "timelineName": "2008_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 2,
@@ -5783,7 +5783,7 @@
       "icon": "icon_s2008",
       "scriptName": "S2008",
       "IDGroup": 2008,
-      "timelineName": "",
+      "timelineName": "2008_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 2,
@@ -5821,7 +5821,7 @@
       "icon": "icon_s2008",
       "scriptName": "S2008",
       "IDGroup": 2008,
-      "timelineName": "",
+      "timelineName": "2008_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 2,
@@ -5859,7 +5859,7 @@
       "icon": "icon_s2008",
       "scriptName": "S2008",
       "IDGroup": 2008,
-      "timelineName": "",
+      "timelineName": "2008_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 2,
@@ -5897,7 +5897,7 @@
       "icon": "icon_s2008",
       "scriptName": "S2008",
       "IDGroup": 2008,
-      "timelineName": "",
+      "timelineName": "2008_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 2,
@@ -5935,7 +5935,7 @@
       "icon": "icon_s2008",
       "scriptName": "S2008",
       "IDGroup": 2008,
-      "timelineName": "",
+      "timelineName": "2008_timeline_TD",
       "cd": 1.0,
       "addcd": 0.0,
       "SkillType": 2,

Assets/Res/UI/CombatPanel.prefab

@@ -30,13 +30,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6344764065321965081}
   - {fileID: 4862212743383639915}
   - {fileID: 7940440888945818258}
   - {fileID: 355393275312567652}
-  - {fileID: 2396994004867754637}
+  - {fileID: 6344764065321965081}
   - {fileID: 3575128956283294460}
-  - {fileID: 6110338263307245602}
   - {fileID: 7797822685459092781}
   m_Father: {fileID: 943568758315423495}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -129,8 +127,8 @@ RectTransform:
   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: -125, y: 0}
-  m_SizeDelta: {x: 251, y: 16}
+  m_AnchoredPosition: {x: -121.000015, y: 0}
+  m_SizeDelta: {x: 242, y: 16}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2476763573105345597
 CanvasRenderer:
@@ -6113,8 +6111,8 @@ RectTransform:
   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: -125, y: 0}
-  m_SizeDelta: {x: 250, y: 13}
+  m_AnchoredPosition: {x: -121.000015, y: 0}
+  m_SizeDelta: {x: 241, y: 13}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4080208271281497370
 CanvasRenderer:
@@ -6811,7 +6809,9 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2396994004867754637}
+  - {fileID: 6110338263307245602}
   m_Father: {fileID: 7814751738232836672}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -6994,7 +6994,7 @@ RectTransform:
   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: 172.01, y: 17.7}
+  m_AnchoredPosition: {x: 163.85, y: 17.7}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6266451616475677771
@@ -7445,11 +7445,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7814751738232836672}
+  m_Father: {fileID: 3575128956283294460}
   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: -52.100014, y: 36}
+  m_AnchoredPosition: {x: -0, y: 0}
   m_SizeDelta: {x: 68, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4963023395715097639
@@ -7690,11 +7690,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7814751738232836672}
+  m_Father: {fileID: 3575128956283294460}
   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: -55.500008, y: 37.1}
+  m_AnchoredPosition: {x: -3.4000015, y: 1.0999985}
   m_SizeDelta: {x: 50, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2407304736381725406
@@ -8959,7 +8959,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 6c810ed1e00febb606e0f2b27d925fd9
-  imageH: 0
+  imageH: 30
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -9317,7 +9317,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -27.2, y: 4.98}
-  m_SizeDelta: {x: 250, y: 15}
+  m_SizeDelta: {x: 242, y: 15}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6934183408135190191
 CanvasRenderer:
@@ -9741,7 +9741,7 @@ RectTransform:
   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: 1170, y: 2532}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab

@@ -124,8 +124,8 @@ RectTransform:
   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.0025177002, y: 0}
-  m_SizeDelta: {x: 750, y: 62.687}
+  m_AnchoredPosition: {x: 0, y: -41}
+  m_SizeDelta: {x: 640.2407, y: 161.3113}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5710891575198841785
 CanvasRenderer:
@@ -157,10 +157,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 35
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -576,7 +576,7 @@ RectTransform:
   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: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

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

@@ -156,7 +156,7 @@ namespace Fort23.Mono
         {
             playerHeroHpWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroHpWidget>(PlayerHpWidget, null);
-            playerHeroHpWidget.size = 250;
+            playerHeroHpWidget.size = 241;
             playerHeroHpWidget.shieldSize = 100;
             playerHeroHpWidget.isFollowTarget = false;
             playerHeroHpWidget.Init(CombatController.currActiveCombat.playerHeroEntity);

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -218,8 +218,8 @@ namespace Fort23.Mono
             if (itemConfig.quality == 3)
             {
                 QualityCsc.ChangeState(0);
-                
-                Text_Quality.text = LanguageManager.Instance.Text(10795);
+                Text_Quality.text = LanguageManager.Instance.Text(10797);
+              
             }
             else if (itemConfig.quality == 4)
             {
@@ -229,7 +229,7 @@ namespace Fort23.Mono
             else if (itemConfig.quality == 5)
             {
                 QualityCsc.ChangeState(2);
-                Text_Quality.text = LanguageManager.Instance.Text(10797);
+                Text_Quality.text = LanguageManager.Instance.Text(10795);
             }
 
             // skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanel.cs

@@ -36,12 +36,19 @@ namespace Fort23.Mono
                 Icon_Dj.gameObject.SetActive(true);
             }
 
-            Text_Xw.text = LanguageManager.Instance.Text(10792,xw);
+            //扣除失败后的经验
+            float failbl = xw == 0
+                ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce
+                : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * xw * 0.01f);
+            int failXw = (int)(PlayerManager.Instance.myHero.powerUpConfig.levelUpExp * failbl * 0.01f);
+
+            Text_Xw.text = LanguageManager.Instance.Text(10792, failXw);
         }
 
         public static async CTask<HeroBreakthroughFailPanel> OpenPanel(int type, int xw)
         {
-            HeroBreakthroughFailPanel heroBreakthroughFailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughFailPanel>(null, UILayer.Top,isShowBG:true);
+            HeroBreakthroughFailPanel heroBreakthroughFailPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughFailPanel>(null, UILayer.Top, isShowBG: true);
             heroBreakthroughFailPanel.CustomInit(type, xw);
             return heroBreakthroughFailPanel;
         }

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

@@ -245,7 +245,7 @@ namespace Fort23.Mono
         {
             if (isBj)
             {
-                if (currentFaBaoInfo != selectedFaBaoInfo && selectedFaBaoInfo != null)
+                if (currentFaBaoInfo != selectedFaBaoInfo && selectedFaBaoInfo != null && currentFaBaoInfo != null)
                 {
                     if (currentFaBaoInfo == null ||
                         selectedFaBaoInfo.FabaoPowerupConfig.ID > currentFaBaoInfo.FabaoPowerupConfig.ID)