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

Assets/Res/Config/SkillConfig.json

@@ -5762,7 +5762,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        120.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -5791,7 +5791,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        130.0
+        90.0
       ],
       "intensifierIndex": [
         2
@@ -5829,7 +5829,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        140.0
+        100.0
       ],
       "intensifierIndex": [
         2
@@ -5867,7 +5867,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        150.0
+        110.0
       ],
       "intensifierIndex": [
         2
@@ -5905,7 +5905,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        160.0
+        120.0
       ],
       "intensifierIndex": [
         2
@@ -5943,7 +5943,7 @@
       "effectUpK": 100,
       "effectValue": [
         2.0,
-        170.0,
+        130.0,
         1.0
       ],
       "intensifierIndex": [
@@ -14757,7 +14757,7 @@
       "level": 1,
       "effectUpK": 100,
       "effectValue": [
-        300.0
+        100.0
       ],
       "intensifierIndex": [
         1
@@ -14781,7 +14781,7 @@
       "level": 2,
       "effectUpK": 100,
       "effectValue": [
-        400.0
+        120.0
       ],
       "intensifierIndex": [
         1
@@ -14805,7 +14805,7 @@
       "level": 3,
       "effectUpK": 100,
       "effectValue": [
-        500.0
+        140.0
       ],
       "intensifierIndex": [
         1
@@ -14829,7 +14829,7 @@
       "level": 4,
       "effectUpK": 100,
       "effectValue": [
-        600.0
+        160.0
       ],
       "intensifierIndex": [
         1
@@ -14853,7 +14853,7 @@
       "level": 5,
       "effectUpK": 100,
       "effectValue": [
-        700.0
+        180.0
       ],
       "intensifierIndex": [
         1
@@ -14877,7 +14877,7 @@
       "level": 6,
       "effectUpK": 100,
       "effectValue": [
-        800.0
+        200.0
       ],
       "intensifierIndex": [
         1

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -1367,7 +1367,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: 197.0892, y: -53}
+  m_AnchoredPosition: {x: 197.0892, y: -38}
   m_SizeDelta: {x: 394.1784, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8219955351092879517

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/GameLogic/Combat/Skill/SkillBasic.cs

@@ -583,7 +583,7 @@ namespace GameLogic.Combat.Skill
         public void TimeLineTrigger(string groupName, ILifetCycleHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic, TriggerData triggerData, ISkillFeatures skillFeatures)
         {
-            if (targetEntity == null || _isDis)
+            if (targetEntity == null || _isDis||CombatHeroEntity==null||CombatHeroEntity.CurrCombatHeroInfo==null)
             {
                 return;
             }

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -618,7 +618,7 @@ public class PlayerManager : Singleton<PlayerManager>
         {
             int miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + exitMiao;
             miao = miao >= gameConstantConfig.qiankundaiMaxTime
-                ?  gameConstantConfig.qiankundaiMaxTime - miao
+                ? gameConstantConfig.qiankundaiMaxTime - miao
                 : miao;
             for (int i = 0; i < miao; i++)
             {
@@ -637,11 +637,21 @@ public class PlayerManager : Singleton<PlayerManager>
             {
                 float todayResidueShenShi = gameConstantConfig.shenshiPointRecSPD[0] -
                                             AccountFileInfo.Instance.playerData.todayDivineSensePoint;
+                todayResidueShenShi =
+                    AccountFileInfo.Instance.playerData.divineSensePoint + todayResidueShenShi >
+                    heroPowerUpConfig.ShenshiMax
+                        ? AccountFileInfo.Instance.playerData.divineSensePoint + todayResidueShenShi -
+                          heroPowerUpConfig.ShenshiMax
+                        : todayResidueShenShi;
 
                 miao = (int)(todayResidueShenShi / gameConstantConfig.shenshiPointRecSPD[1]);
 
+                miao = miao > exitMiao ? exitMiao : miao;
+
                 float todayResidue = gameConstantConfig.shenshiPointRecSPD[1] * miao;
-                todayResidue = todayResidue > heroPowerUpConfig.ShenshiMax ? heroPowerUpConfig.ShenshiMax : todayResidue;
+                todayResidue = todayResidue > heroPowerUpConfig.ShenshiMax
+                    ? heroPowerUpConfig.ShenshiMax
+                    : todayResidue;
                 AccountFileInfo.Instance.playerData.todayDivineSensePoint += todayResidue;
                 AccountFileInfo.Instance.playerData.divineSensePoint += todayResidue;
             }
@@ -650,7 +660,10 @@ public class PlayerManager : Singleton<PlayerManager>
             if (residueExitMiao > 0)
             {
                 float todaySs2 = gameConstantConfig.shenshiPointRecSPD[2] * residueExitMiao;
-                todaySs2 = todaySs2 > heroPowerUpConfig.ShenshiMax ? heroPowerUpConfig.ShenshiMax : todaySs2;
+                float allShenshi = todaySs2 + AccountFileInfo.Instance.playerData.divineSensePoint;
+                todaySs2 = allShenshi > heroPowerUpConfig.ShenshiMax
+                    ? allShenshi - heroPowerUpConfig.ShenshiMax
+                    : todaySs2;
                 AccountFileInfo.Instance.playerData.divineSensePoint += todaySs2;
             }
         }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -48,7 +48,7 @@ namespace Fort23.Mono
                 HelpTipPanel.OpenTipMessagePanel(10791);
             });
             
-            Btn_SendGift.onClick.AddListener(() =>
+            Btn_SongLiHelp.onClick.AddListener(() =>
             {
                 HelpTipPanel.OpenTipMessagePanel(10790);
             });
@@ -323,7 +323,16 @@ namespace Fort23.Mono
             Text_CurrentName.text = LanguageManager.Instance.Text(currentDaoyouLevelupConfig.name);
             Text_CurrentLevel.text = daoYouData.favorabilityLv.ToString();
             Slider_LeveUp.maxValue = currentDaoyouLevelupConfig.exp;
-            Text_Exp.text = $"{daoYouData.exp}/{currentDaoyouLevelupConfig.exp}";
+            if (daoYouData.favorabilityLv >= _daoYouLevelWidgets.Count)
+            {
+                Text_Exp.text = $"{daoYouData.exp}/MAX";
+            }
+            else
+            {
+                Text_Exp.text = $"{daoYouData.exp}/{currentDaoyouLevelupConfig.exp}";
+            }
+
+          
             Slider_LeveUp.value = daoYouData.exp;
 
             if (_daoyouModelConfig.PreferGiftID != null)