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

Assets/Res/Config/SkillConfig.json

@@ -21,10 +21,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {
@@ -48,10 +44,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {
@@ -75,10 +67,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {
@@ -102,10 +90,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {
@@ -129,10 +113,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {
@@ -156,10 +136,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {
@@ -183,10 +159,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {
@@ -210,10 +182,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {
@@ -237,10 +205,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {
@@ -264,10 +228,6 @@
       "intensifierIndex": [
         2,
         3
-      ],
-      "GrowupNumType": [
-        3,
-        1
       ]
     },
     {

Assets/Res/Config/SkillPowerupConfig.json

@@ -3,362 +3,302 @@
     {
       "ID": 1,
       "MainPower": 100,
-      "SkillPower1": 100.0,
-      "SkillPower2": 100
+      "SkillPower1": 100.0
     },
     {
       "ID": 2,
       "MainPower": 120,
-      "SkillPower1": 110.0,
-      "SkillPower2": 110
+      "SkillPower1": 110.0
     },
     {
       "ID": 3,
       "MainPower": 140,
-      "SkillPower1": 120.0,
-      "SkillPower2": 120
+      "SkillPower1": 120.0
     },
     {
       "ID": 4,
       "MainPower": 160,
-      "SkillPower1": 130.0,
-      "SkillPower2": 130
+      "SkillPower1": 130.0
     },
     {
       "ID": 5,
       "MainPower": 180,
-      "SkillPower1": 140.0,
-      "SkillPower2": 140
+      "SkillPower1": 140.0
     },
     {
       "ID": 6,
       "MainPower": 200,
-      "SkillPower1": 150.0,
-      "SkillPower2": 150
+      "SkillPower1": 150.0
     },
     {
       "ID": 7,
       "MainPower": 220,
-      "SkillPower1": 160.0,
-      "SkillPower2": 160
+      "SkillPower1": 160.0
     },
     {
       "ID": 8,
       "MainPower": 240,
-      "SkillPower1": 170.0,
-      "SkillPower2": 170
+      "SkillPower1": 170.0
     },
     {
       "ID": 9,
       "MainPower": 260,
-      "SkillPower1": 180.0,
-      "SkillPower2": 180
+      "SkillPower1": 180.0
     },
     {
       "ID": 10,
       "MainPower": 280,
-      "SkillPower1": 190.0,
-      "SkillPower2": 190
+      "SkillPower1": 190.0
     },
     {
       "ID": 11,
       "MainPower": 300,
-      "SkillPower1": 200.0,
-      "SkillPower2": 200
+      "SkillPower1": 200.0
     },
     {
       "ID": 12,
       "MainPower": 320,
-      "SkillPower1": 210.0,
-      "SkillPower2": 210
+      "SkillPower1": 210.0
     },
     {
       "ID": 13,
       "MainPower": 340,
-      "SkillPower1": 220.0,
-      "SkillPower2": 220
+      "SkillPower1": 220.0
     },
     {
       "ID": 14,
       "MainPower": 360,
-      "SkillPower1": 230.0,
-      "SkillPower2": 230
+      "SkillPower1": 230.0
     },
     {
       "ID": 15,
       "MainPower": 380,
-      "SkillPower1": 240.0,
-      "SkillPower2": 240
+      "SkillPower1": 240.0
     },
     {
       "ID": 16,
       "MainPower": 400,
-      "SkillPower1": 250.0,
-      "SkillPower2": 250
+      "SkillPower1": 250.0
     },
     {
       "ID": 17,
       "MainPower": 420,
-      "SkillPower1": 260.0,
-      "SkillPower2": 260
+      "SkillPower1": 260.0
     },
     {
       "ID": 18,
       "MainPower": 440,
-      "SkillPower1": 270.0,
-      "SkillPower2": 270
+      "SkillPower1": 270.0
     },
     {
       "ID": 19,
       "MainPower": 460,
-      "SkillPower1": 280.0,
-      "SkillPower2": 280
+      "SkillPower1": 280.0
     },
     {
       "ID": 20,
       "MainPower": 480,
-      "SkillPower1": 290.0,
-      "SkillPower2": 290
+      "SkillPower1": 290.0
     },
     {
       "ID": 21,
       "MainPower": 500,
-      "SkillPower1": 300.0,
-      "SkillPower2": 300
+      "SkillPower1": 300.0
     },
     {
       "ID": 22,
       "MainPower": 520,
-      "SkillPower1": 310.0,
-      "SkillPower2": 310
+      "SkillPower1": 310.0
     },
     {
       "ID": 23,
       "MainPower": 540,
-      "SkillPower1": 320.0,
-      "SkillPower2": 320
+      "SkillPower1": 320.0
     },
     {
       "ID": 24,
       "MainPower": 560,
-      "SkillPower1": 330.0,
-      "SkillPower2": 330
+      "SkillPower1": 330.0
     },
     {
       "ID": 25,
       "MainPower": 580,
-      "SkillPower1": 340.0,
-      "SkillPower2": 340
+      "SkillPower1": 340.0
     },
     {
       "ID": 26,
       "MainPower": 600,
-      "SkillPower1": 350.0,
-      "SkillPower2": 350
+      "SkillPower1": 350.0
     },
     {
       "ID": 27,
       "MainPower": 620,
-      "SkillPower1": 360.0,
-      "SkillPower2": 360
+      "SkillPower1": 360.0
     },
     {
       "ID": 28,
       "MainPower": 640,
-      "SkillPower1": 370.0,
-      "SkillPower2": 370
+      "SkillPower1": 370.0
     },
     {
       "ID": 29,
       "MainPower": 660,
-      "SkillPower1": 380.0,
-      "SkillPower2": 380
+      "SkillPower1": 380.0
     },
     {
       "ID": 30,
       "MainPower": 680,
-      "SkillPower1": 390.0,
-      "SkillPower2": 390
+      "SkillPower1": 390.0
     },
     {
       "ID": 31,
       "MainPower": 700,
-      "SkillPower1": 400.0,
-      "SkillPower2": 400
+      "SkillPower1": 400.0
     },
     {
       "ID": 32,
       "MainPower": 720,
-      "SkillPower1": 410.0,
-      "SkillPower2": 410
+      "SkillPower1": 410.0
     },
     {
       "ID": 33,
       "MainPower": 740,
-      "SkillPower1": 420.0,
-      "SkillPower2": 420
+      "SkillPower1": 420.0
     },
     {
       "ID": 34,
       "MainPower": 760,
-      "SkillPower1": 430.0,
-      "SkillPower2": 430
+      "SkillPower1": 430.0
     },
     {
       "ID": 35,
       "MainPower": 780,
-      "SkillPower1": 440.0,
-      "SkillPower2": 440
+      "SkillPower1": 440.0
     },
     {
       "ID": 36,
       "MainPower": 800,
-      "SkillPower1": 450.0,
-      "SkillPower2": 450
+      "SkillPower1": 450.0
     },
     {
       "ID": 37,
       "MainPower": 820,
-      "SkillPower1": 460.0,
-      "SkillPower2": 460
+      "SkillPower1": 460.0
     },
     {
       "ID": 38,
       "MainPower": 840,
-      "SkillPower1": 470.0,
-      "SkillPower2": 470
+      "SkillPower1": 470.0
     },
     {
       "ID": 39,
       "MainPower": 860,
-      "SkillPower1": 480.0,
-      "SkillPower2": 480
+      "SkillPower1": 480.0
     },
     {
       "ID": 40,
       "MainPower": 880,
-      "SkillPower1": 490.0,
-      "SkillPower2": 490
+      "SkillPower1": 490.0
     },
     {
       "ID": 41,
       "MainPower": 900,
-      "SkillPower1": 500.0,
-      "SkillPower2": 500
+      "SkillPower1": 500.0
     },
     {
       "ID": 42,
       "MainPower": 920,
-      "SkillPower1": 510.0,
-      "SkillPower2": 510
+      "SkillPower1": 510.0
     },
     {
       "ID": 43,
       "MainPower": 940,
-      "SkillPower1": 520.0,
-      "SkillPower2": 520
+      "SkillPower1": 520.0
     },
     {
       "ID": 44,
       "MainPower": 960,
-      "SkillPower1": 530.0,
-      "SkillPower2": 530
+      "SkillPower1": 530.0
     },
     {
       "ID": 45,
       "MainPower": 980,
-      "SkillPower1": 540.0,
-      "SkillPower2": 540
+      "SkillPower1": 540.0
     },
     {
       "ID": 46,
       "MainPower": 1000,
-      "SkillPower1": 550.0,
-      "SkillPower2": 550
+      "SkillPower1": 550.0
     },
     {
       "ID": 47,
       "MainPower": 1020,
-      "SkillPower1": 560.0,
-      "SkillPower2": 560
+      "SkillPower1": 560.0
     },
     {
       "ID": 48,
       "MainPower": 1040,
-      "SkillPower1": 570.0,
-      "SkillPower2": 570
+      "SkillPower1": 570.0
     },
     {
       "ID": 49,
       "MainPower": 1060,
-      "SkillPower1": 580.0,
-      "SkillPower2": 580
+      "SkillPower1": 580.0
     },
     {
       "ID": 50,
       "MainPower": 1080,
-      "SkillPower1": 590.0,
-      "SkillPower2": 590
+      "SkillPower1": 590.0
     },
     {
       "ID": 51,
       "MainPower": 1100,
-      "SkillPower1": 600.0,
-      "SkillPower2": 600
+      "SkillPower1": 600.0
     },
     {
       "ID": 52,
       "MainPower": 1120,
-      "SkillPower1": 610.0,
-      "SkillPower2": 610
+      "SkillPower1": 610.0
     },
     {
       "ID": 53,
       "MainPower": 1140,
-      "SkillPower1": 620.0,
-      "SkillPower2": 620
+      "SkillPower1": 620.0
     },
     {
       "ID": 54,
       "MainPower": 1160,
-      "SkillPower1": 630.0,
-      "SkillPower2": 630
+      "SkillPower1": 630.0
     },
     {
       "ID": 55,
       "MainPower": 1180,
-      "SkillPower1": 640.0,
-      "SkillPower2": 640
+      "SkillPower1": 640.0
     },
     {
       "ID": 56,
       "MainPower": 1200,
-      "SkillPower1": 650.0,
-      "SkillPower2": 650
+      "SkillPower1": 650.0
     },
     {
       "ID": 57,
       "MainPower": 1220,
-      "SkillPower1": 660.0,
-      "SkillPower2": 660
+      "SkillPower1": 660.0
     },
     {
       "ID": 58,
       "MainPower": 1240,
-      "SkillPower1": 670.0,
-      "SkillPower2": 670
+      "SkillPower1": 670.0
     },
     {
       "ID": 59,
       "MainPower": 1260,
-      "SkillPower1": 680.0,
-      "SkillPower2": 680
+      "SkillPower1": 680.0
     },
     {
       "ID": 60,
       "MainPower": 1280,
-      "SkillPower1": 690.0,
-      "SkillPower2": 690
+      "SkillPower1": 690.0
     }
   ]
 }

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -244,6 +244,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Dialgue
+    gameObject: {fileID: 3275273584098972649}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &6013513864245940534
 GameObject:

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -98,12 +98,6 @@ public float[] effectValue;
 public int[] intensifierIndex;
 
 
-		/// <summary>
-		///该值成长时取 1=百分比 2=固定值 3=1+2
-		/// </summary>
-public int[] GrowupNumType;
-
-
 		/// <summary>
 		///属性ID表内对应 101=生命百分比 102=攻击百分比 103=防御百分比 
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -32,12 +32,6 @@ public int MainPower;
 public float SkillPower1;
 
 
-		/// <summary>
-		///标准强度固定值
-		/// </summary>
-public int SkillPower2;
-
-
 	}
 
 }

Assets/Scripts/GameLogic/EventManager/EventSystemManager.cs

@@ -43,15 +43,20 @@ public class EventSystemManager : Singleton<EventSystemManager>
         if (timer > 1)
         {
             timer = 0;
-            AccountFileInfo.Instance.playerData.divineSensePoint += 3;
-            EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
-            AccountFileInfo.Instance.SavePlayerData();
+            HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(1);
+            if (AccountFileInfo.Instance.playerData.divineSensePoint < heroPowerUpConfig.ShenshiMax)
+            {
+                AccountFileInfo.Instance.playerData.divineSensePoint += 3;
+                EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
+                AccountFileInfo.Instance.SavePlayerData();
+            }
         }
     }
 
     public List<AccountFileInfo.EventList> UseDivinesense(int bigMapId)
     {
         DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
+        HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(1);
         int count = AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
         if (count <= 0)
         {
@@ -59,8 +64,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
             return null;
         }
 
-        AccountFileInfo.Instance.playerData.divineSenseexp += AccountFileInfo.Instance.playerData.divineSensePoint;
-        AccountFileInfo.Instance.playerData.divineSensePoint = 0;
+        int maxCount = heroPowerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+        count = count + AccountFileInfo.Instance.playerData.eventList.Count > maxCount ? maxCount - AccountFileInfo.Instance.playerData.eventList.Count : count;
+
+        int xiaoHao = count * PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+
+        AccountFileInfo.Instance.playerData.divineSenseexp += xiaoHao;
+        AccountFileInfo.Instance.playerData.divineSensePoint -= xiaoHao;
         EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
         // 神识升级逻辑
         UpDivinesense();
@@ -303,7 +313,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         AccountFileInfo.Instance.playerData.events.Add(eventData);
 
         if (AccountFileInfo.Instance.playerData.senceExplorationProgress < 100)
-            AccountFileInfo.Instance.playerData.senceExplorationProgress += 5;
+            AccountFileInfo.Instance.playerData.senceExplorationProgress += 1;
 
 
         AccountFileInfo.Instance.playerData.eventList.Remove(CurrentEventList);

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

@@ -29,6 +29,8 @@ namespace Fort23.Mono
 
         private void Button_onClick()
         {
+            if (EventSystemManager.Instance.isTriggerEvent)
+                return;
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
             EventSystemManager.Instance.TriggerEvent(eventList);
         }

Assets/Scripts/GameUI/UI/DialoguePanel/DialogueOptionWidget.cs

@@ -3,6 +3,8 @@ using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.UI;
 
 namespace Fort23.Mono
 {
@@ -37,6 +39,9 @@ namespace Fort23.Mono
             int index = mainEventConditionConfig.optionPara1.ToList().IndexOf(eventConditionConfig.ID);
             Text_desc.text = LanguageManager.Instance.Text(mainEventConditionConfig.optionPara2[index]);
             this.callback = callback;
+           
+             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_desc.GetComponent<RectTransform>());
+             LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
         }
     }
 }

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -6,6 +6,7 @@ using Fort23.UTool;
 using UnityEngine;
 using System;
 using Fort23.Core;
+using UnityEngine.UI;
 
 namespace Fort23.Mono
 {
@@ -157,6 +158,8 @@ namespace Fort23.Mono
                     _skipTyping = false;
                     break;
             }
+
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
         }
 
         private async void ShowOptions()
@@ -172,6 +175,8 @@ namespace Fort23.Mono
                     await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
                 dialogueOptionWidget.CustomInit(op, eventConditionConfig.ID, SelectOption);
             }
+
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
         }
 
         private void SelectOption(DialogueOptionWidget obj)
@@ -212,6 +217,7 @@ namespace Fort23.Mono
                             ShowOptions();
                         }
                     }
+
                     // StartShowMassge();
                     // ShowNextIcon();
                     return;

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs

@@ -63,6 +63,17 @@ namespace Fort23.Mono
 	      return _OptionRoot;
 	     }
 	   }
+	  private RectTransform _Dialgue;
+	  public RectTransform Dialgue
+	   {
+	   get{
+	      if (_Dialgue == null)
+	       {
+	         _Dialgue  = GetUIUnit<RectTransform>("Dialgue"); 
+	       }
+	      return _Dialgue;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{