修改bug

Assets/Res/Config/DaoyouConfig.json.meta → Assets/Res/Config/DaoyouLevelupConfig.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Bngc4Xn4W3oiKbVaQvthvCTNWljVTB26ceIQ92Qff5X5RZgzKkagTJRr2lan
+guid: CnlJsiOlVir6o2mdXw/iFV2O8EfI1Gn8Ie+4jrg8a9aPWc1sdDjR82Vpm/TO
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Res/Config/DaoyouModelConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3wWtCn/An+taUL7eshNtaN/8hZXn5GBKnEO+qmts63SCFPCgTjCwNFZrFPW
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/EventConfig.json

@@ -14,9 +14,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
-      "EventConditionId": [
-        0
-      ],
+      "EventConditionId": 0,
       "EventValue": [
         0
       ],
@@ -40,9 +38,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
-      "EventConditionId": [
-        0
-      ],
+      "EventConditionId": 0,
       "EventValue": [
         0
       ],
@@ -66,9 +62,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
-      "EventConditionId": [
-        0
-      ],
+      "EventConditionId": 0,
       "EventValue": [
         0
       ],
@@ -86,9 +80,7 @@
       "EventType": 2,
       "Score": 1,
       "EventQuality": 1,
-      "EventConditionId": [
-        0
-      ],
+      "EventConditionId": 0,
       "EventValue": [
         0
       ],
@@ -106,9 +98,7 @@
       "EventType": 2,
       "Score": 1,
       "EventQuality": 1,
-      "EventConditionId": [
-        0
-      ],
+      "EventConditionId": 0,
       "EventValue": [
         0
       ],
@@ -126,9 +116,7 @@
       "EventType": 2,
       "Score": 1,
       "EventQuality": 1,
-      "EventConditionId": [
-        0
-      ],
+      "EventConditionId": 0,
       "EventValue": [
         0
       ],
@@ -146,9 +134,7 @@
       "EventType": 2,
       "Score": 1,
       "EventQuality": 1,
-      "EventConditionId": [
-        0
-      ],
+      "EventConditionId": 0,
       "EventValue": [
         0
       ],
@@ -166,6 +152,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -180,6 +167,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -194,6 +182,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -208,6 +197,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -222,6 +212,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -236,6 +227,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1906,
       "Description": 1914
@@ -250,6 +242,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1907,
       "Description": 1915
@@ -264,6 +257,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1908,
       "Description": 1916
@@ -278,6 +272,7 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 1,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1909,
       "Description": 1917

Assets/Res/Config/EventLinkConfig.json

@@ -278,10 +278,7 @@
       "PrizeNums": [
         10
       ],
-      "ResultType": 1,
-      "ResultOptions": [
-        1016
-      ]
+      "ResultType": null
     },
     {
       "ID": 1024,
@@ -324,10 +321,7 @@
       "PrizeNums": [
         1000
       ],
-      "ResultType": 1,
-      "ResultOptions": [
-        1002
-      ]
+      "ResultType": null
     },
     {
       "ID": 1026,

Assets/Res/Config/LanguageChineseConfig.json

@@ -830,11 +830,11 @@
     },
     {
       "ID": 208,
-      "txt": ""
+      "txt": "事件10001：一只[怪物1]袭击了你，准备迎战"
     },
     {
       "ID": 209,
-      "txt": ""
+      "txt": "你击败了怪物，并从它身上吸取了一些修为"
     },
     {
       "ID": 210,

Assets/Res/UI/DivineSence/ShengShiEventWidget.prefab

@@ -154,7 +154,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxDuration: 0.3
   isUpdate: 0
-  currTime: 0.3848319
+  currTime: 0.30510476
   GrpupInfos:
   - Foldout: 1
     isActive: 1

Assets/Scripts/GameData/ExcelConfig/DaoyouConfig.cs.meta → Assets/Scripts/GameData/ExcelConfig/DaoyouLevelupConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Cn0WtyKvAH88ynl+fRHg5tm7r9JpM+wzmAqEgvv6sCVMpsEBZ203fMS8cjVt
+guid: XSgdsHiqUSnKl1vKY3tXG10SnmPb6HsFC/dLwU/MM7mhpuI5bWwofTJfTF7R
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/GameData/ExcelConfig/DaoyouModelConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: BnlKvC3+ByqAG5HxxDAVh3FL0Gq0ydXvIff8d5vqlZQ7aIzi9AaqfFVhcJ86
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -59,7 +59,7 @@ public int EventQuality;
 		/// <summary>
 		///触发条件类型 只能配处于什么状态和数值，不能配变化的数值
 		/// </summary>
-public int[] EventConditionId;
+public int EventConditionId;
 
 
 		/// <summary>

Assets/Scripts/GameUI/EventManager/EventHelper.cs

@@ -11,37 +11,45 @@ public static class EventHelper
     {
         string result = String.Empty;
         EventLinkConfig eventCondition = ConfigComponent.Instance.Get<EventLinkConfig>(eventConfigId);
-        AccountFileInfo.EventLinkData eventLinkData = AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(e => e.eventLinkId == eventConfigId);
+        AccountFileInfo.EventLinkData eventLinkData =
+            AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(e => e.eventLinkId == eventConfigId);
 
         int fishCount = eventLinkData == null ? 0 : eventLinkData.fishCount;
         switch (eventCondition.ConditionType)
         {
             case 1:
-                // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-                result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage,fishCount, eventCondition.finishCount.ToString() + "个");
+                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
+                result =
+                    $"需要拥有{LanguageManager.Instance.Text(itemConfig.itemName)} {fishCount}/{eventCondition.finishCount}";
+                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage,fishCount, eventCondition.finishCount.ToString() + "个");
 
                 break;
             case 3:
-                HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(eventCondition.ConditionPara[0]);
+                HeroPowerUpConfig heroPowerUpConfig =
+                    ConfigComponent.Instance.Get<HeroPowerUpConfig>(eventCondition.ConditionPara[0]);
                 string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
                                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
                                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
 
-                result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, jingjie);
+                result =
+                    $"需要达到境界{jingjie}";
+                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, jingjie);
                 break;
 
             case 5:
-                result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-
+                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
+                result =
+                    $"需要完成战斗{eventCondition.ConditionPara[0]} {fishCount}/{eventCondition.finishCount}";
                 break;
             case 6:
 
-                // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-                result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-
+                ItemConfig itemConfig1 = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
+                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
+                result =
+                    $"需要获得{LanguageManager.Instance.Text(itemConfig1.itemName)} {fishCount}/{eventCondition.finishCount}";
                 break;
             default:
-                result =LanguageManager.Instance.Text(eventCondition.conciseEventMessage);
+                // result =LanguageManager.Instance.Text(eventCondition.conciseEventMessage);
                 break;
         }
 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -578,7 +578,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
         {
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
-            if (eventConfig.EventType == 4)
+            if (eventConfig.EventTriggerType == 4)
             {
                 return eventList;
             }

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

@@ -32,7 +32,7 @@ namespace Fort23.Mono
         {
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
-            UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
+            // UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
             EventSystemManager.Instance.TriggerEvent(eventList);
         }
 
@@ -44,12 +44,12 @@ namespace Fort23.Mono
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             Text_Name.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
 
-            EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-            string desc = String.Empty;
+            // EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
+            // string desc = String.Empty;
             // if (conditionConfig.LanID == null)
-            {
-                desc = EventHelper.GetTaskMessage(randomEventConfig.EventLinksId[0]);
-            }
+            // {
+            //     desc = EventHelper.GetTaskMessage(randomEventConfig.EventLinksId[0]);
+            // }
             // else
             // {
             //     desc = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
@@ -59,8 +59,8 @@ namespace Fort23.Mono
             //         desc += "...";
             //     }
             // }
- 
-            Massge.text = LanguageManager.Instance.Text(desc);
+            Massge.text = LanguageManager.Instance.Text(randomEventConfig.Description);
+            // Massge.text = LanguageManager.Instance.Text(desc);
         }
     }
 }

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -40,7 +40,7 @@ namespace Fort23.Mono
 			randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
 			Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
 			EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-			// Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
+			Text_EventDesc.text = LanguageManager.Instance.Text(randomEventConfig.Description);
 
 		}
 		

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3.cs

@@ -50,8 +50,8 @@ namespace Fort23.Mono
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
             EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-            Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
-
+            // Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
+            Text_EventDesc.text = LanguageManager.Instance.Text(randomEventConfig.Description);
             if (conditionConfig.optionType == 3)
             {
                 List<ItemInfo> itemInfos = new List<ItemInfo>();

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -116,9 +116,10 @@ namespace Fort23.Mono
 
 
             Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
-            Text_Jingjie.text = LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+            Text_Jingjie.text =
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
 
 
             Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
@@ -128,9 +129,11 @@ namespace Fort23.Mono
 
         public void ChangeMap(IEventData e)
         {
-            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(PlayerManager.Instance.CurrentPlaces.id);
+            PlacesConfig placesConfig =
+                ConfigComponent.Instance.Get<PlacesConfig>(PlayerManager.Instance.CurrentPlaces.id);
 
-            Text_ExplorationProgress.text = $"{LanguageManager.Instance.Text(placesConfig.placeName)}   {PlayerManager.Instance.CurrentPlaces.progress}%";
+            Text_ExplorationProgress.text =
+                $"{LanguageManager.Instance.Text(placesConfig.placeName)}   {PlayerManager.Instance.CurrentPlaces.progress}%";
             Slider_Map.value = PlayerManager.Instance.CurrentPlaces.progress;
         }
 
@@ -156,12 +159,10 @@ namespace Fort23.Mono
 
         public async void CreatShengShiEvent()
         {
-            int count = AccountFileInfo.Instance.playerData.eventList.Count >= 1 ? 1 : AccountFileInfo.Instance.playerData.eventList.Count;
-
-            if (count >= 1)
+            AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
+            eventList = eventList == null ? AccountFileInfo.Instance.playerData.eventList[0] : eventList;
+            if (eventList != null)
             {
-                AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
-                eventList = eventList == null ? AccountFileInfo.Instance.playerData.eventList[0] : eventList;
                 if (shengShiEventWidget == null)
                 {
                     shengShiEventWidget =
@@ -170,6 +171,11 @@ namespace Fort23.Mono
 
                 shengShiEventWidget.InitShengShiEventWidget(eventList);
             }
+            else
+            {
+                UIManager.Instance.DormancyGComponent(shengShiEventWidget);
+                shengShiEventWidget = null;
+            }
         }