Merge remote-tracking branch 'origin/master'

Assets/Res/Config/EventLinkConfig.json

@@ -14807,14 +14807,17 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 106,
-      "LanID": [
-        6073
-      ],
+      "NPCID": 100,
       "DialogueType": 0,
       "EventID": 6043,
       "step": 1,
-      "optionType": 0,
+      "optionType": 1,
+      "optionPara1": [
+        604302
+      ],
+      "optionPara2": [
+        6073
+      ],
       "ResultType": 1,
       "ResultOptions": [
         604302

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/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)