فهرست منبع

修改事件表

lzx 3 هفته پیش
والد
کامیت
7bdd76a7ed

+ 154 - 60
Assets/Res/Config/EventConditionConfig.json

@@ -11,7 +11,11 @@
         1002,
         1003
       ],
-      "optionPara2": null
+      "optionPara2": [
+        198,
+        199
+      ],
+      "ResultOptions": null
     },
     {
       "ID": 1002,
@@ -23,34 +27,52 @@
       "optionPara1": [
         702
       ],
-      "optionPara2": null,
+      "ResultOptions": 1004
+    },
+    {
+      "ID": 1003,
+      "LanID": [
+        179
+      ],
+      "ConditionType": null,
+      "optionType": 1,
+      "optionPara1": [
+        1005
+      ],
+      "optionPara2": [
+        200
+      ],
+      "ResultOptions": null
+    },
+    {
+      "ID": 1004,
+      "LanID": [
+        180
+      ],
+      "ConditionType": null,
+      "optionType": 3,
       "PrizeIDs": [
         1002
       ],
       "PrizeNums": [
         100
       ],
-      "ResultLanID": [
-        180
-      ]
+      "ResultOptions": null
     },
     {
-      "ID": 1003,
+      "ID": 1005,
       "LanID": [
-        179
+        181
       ],
       "ConditionType": null,
       "optionType": 3,
-      "optionPara2": null,
       "PrizeIDs": [
         1010
       ],
       "PrizeNums": [
         50
       ],
-      "ResultLanID": [
-        181
-      ]
+      "ResultOptions": null
     },
     {
       "ID": 1010,
@@ -63,7 +85,11 @@
         1011,
         1012
       ],
-      "optionPara2": null
+      "optionPara2": [
+        201,
+        202
+      ],
+      "ResultOptions": null
     },
     {
       "ID": 1011,
@@ -76,12 +102,17 @@
         1014,
         1015
       ],
-      "optionPara2": null
+      "optionPara2": [
+        203,
+        204
+      ],
+      "ResultOptions": null
     },
     {
       "ID": 1012,
       "LanID": [
-        184
+        184,
+        187
       ],
       "ConditionType": 1,
       "ConditionPara": [
@@ -89,16 +120,13 @@
         1
       ],
       "optionType": 3,
-      "optionPara2": null,
       "PrizeIDs": [
         1016
       ],
       "PrizeNums": [
         10
       ],
-      "ResultLanID": [
-        187
-      ]
+      "ResultOptions": null
     },
     {
       "ID": 1014,
@@ -114,34 +142,38 @@
       "optionPara1": [
         100005
       ],
-      "optionPara2": null,
-      "PrizeIDs": [
-        1016
-      ],
-      "PrizeNums": [
-        200
-      ],
-      "ResultLanID": [
-        188
-      ]
+      "ResultOptions": 1016
     },
     {
       "ID": 1015,
       "LanID": [
-        186
+        186,
+        189
       ],
       "ConditionType": null,
       "optionType": 3,
-      "optionPara2": null,
       "PrizeIDs": [
         1002
       ],
       "PrizeNums": [
         1000
       ],
-      "ResultLanID": [
-        189
-      ]
+      "ResultOptions": null
+    },
+    {
+      "ID": 1016,
+      "LanID": [
+        188
+      ],
+      "ConditionType": null,
+      "optionType": null,
+      "PrizeIDs": [
+        1016
+      ],
+      "PrizeNums": [
+        200
+      ],
+      "ResultOptions": null
     },
     {
       "ID": 1020,
@@ -154,7 +186,11 @@
         1021,
         1022
       ],
-      "optionPara2": null
+      "optionPara2": [
+        201,
+        202
+      ],
+      "ResultOptions": null
     },
     {
       "ID": 1021,
@@ -166,17 +202,13 @@
       "optionPara1": [
         100004
       ],
-      "optionPara2": null,
       "PrizeIDs": [
         1002
       ],
       "PrizeNums": [
         10
       ],
-      "ResultOptions": [
-        1024,
-        1025
-      ]
+      "ResultOptions": 1026
     },
     {
       "ID": 1022,
@@ -189,24 +221,19 @@
         1
       ],
       "optionType": 3,
-      "optionPara2": null,
       "PrizeIDs": [
         1016
       ],
       "PrizeNums": [
         10
       ],
-      "ResultOptions": [
-        1016
-      ],
-      "ResultLanID": [
-        195
-      ]
+      "ResultOptions": 1016
     },
     {
       "ID": 1024,
       "LanID": [
-        193
+        193,
+        196
       ],
       "ConditionType": 2,
       "ConditionPara": [
@@ -217,40 +244,107 @@
       "optionPara1": [
         100005
       ],
-      "optionPara2": null,
       "PrizeIDs": [
         1016
       ],
       "PrizeNums": [
         200
       ],
-      "ResultOptions": [
-        1016
-      ],
-      "ResultLanID": [
-        196
-      ]
+      "ResultOptions": 1016
     },
     {
       "ID": 1025,
       "LanID": [
-        194
+        194,
+        197
       ],
       "ConditionType": null,
       "optionType": 3,
-      "optionPara2": null,
       "PrizeIDs": [
         1002
       ],
       "PrizeNums": [
         1000
       ],
-      "ResultOptions": [
+      "ResultOptions": 1002
+    },
+    {
+      "ID": 1026,
+      "LanID": [
+        207
+      ],
+      "ConditionType": null,
+      "optionType": 1,
+      "optionPara1": [
+        1024,
+        1025
+      ],
+      "optionPara2": [
+        205,
+        206
+      ],
+      "ResultOptions": null
+    },
+    {
+      "ID": 10001,
+      "LanID": [
+        208
+      ],
+      "ConditionType": null,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultOptions": 10002
+    },
+    {
+      "ID": 10002,
+      "LanID": [
+        209
+      ],
+      "ConditionType": null,
+      "optionType": 3,
+      "PrizeIDs": [
         1002
       ],
-      "ResultLanID": [
-        197
-      ]
+      "PrizeNums": [
+        10
+      ],
+      "ResultOptions": null
+    },
+    {
+      "ID": 10003,
+      "LanID": [
+        210,
+        211
+      ],
+      "ConditionType": null,
+      "optionType": 3,
+      "PrizeIDs": [
+        1002
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "ResultOptions": null
+    },
+    {
+      "ID": 10004,
+      "LanID": [
+        212,
+        213,
+        214,
+        215
+      ],
+      "ConditionType": null,
+      "optionType": 3,
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultOptions": null
     }
   ]
 }

+ 21 - 0
Assets/Res/Config/EventConfig.json

@@ -38,6 +38,27 @@
         0
       ],
       "Description": 176
+    },
+    {
+      "ID": 11,
+      "EventType": 10001,
+      "EventTriggerType": 2,
+      "EventQuality": null,
+      "Description": null
+    },
+    {
+      "ID": 12,
+      "EventType": 10003,
+      "EventTriggerType": 2,
+      "EventQuality": null,
+      "Description": null
+    },
+    {
+      "ID": 13,
+      "EventType": 10004,
+      "EventTriggerType": 2,
+      "EventQuality": null,
+      "Description": null
     }
   ]
 }

+ 63 - 3
Assets/Res/Config/LanguageChineseConfig.json

@@ -790,15 +790,75 @@
     },
     {
       "ID": 198,
-      "txt": "0"
+      "txt": "趁它虚弱赶紧除掉它!"
     },
     {
       "ID": 199,
-      "txt": "0"
+      "txt": "你不忍见它受苦,选择帮它减轻痛苦。"
     },
     {
       "ID": 200,
-      "txt": "0"
+      "txt": "终结它"
+    },
+    {
+      "ID": 201,
+      "txt": "去看看"
+    },
+    {
+      "ID": 202,
+      "txt": "(需拥有法宝凝神珠)听起来都是鸡毛蒜皮的小摩擦,你选择祭出凝神珠化解他们的怨气。"
+    },
+    {
+      "ID": 203,
+      "txt": "你顿时杀心四起,决定杀了贼寇,救出轿中之人"
+    },
+    {
+      "ID": 204,
+      "txt": "盗贼们个个双眼杀的通红,你决定来个渔翁得利。"
+    },
+    {
+      "ID": 205,
+      "txt": "选择正面迎战山贼头领(困难)"
+    },
+    {
+      "ID": 206,
+      "txt": "你决定避开山贼头领的视线,来个渔翁得利。"
+    },
+    {
+      "ID": 207,
+      "txt": "你将山贼们打的落花流水,成功吸引了山贼头子的注意。"
+    },
+    {
+      "ID": 208,
+      "txt": "一头略有修为的熊精袭击了你,准备迎战"
+    },
+    {
+      "ID": 209,
+      "txt": "你击败了熊精,并从它身上吸取了一些修为"
+    },
+    {
+      "ID": 210,
+      "txt": "你偶遇一处仙气四溢无人生活的洞穴"
+    },
+    {
+      "ID": 211,
+      "txt": "你在洞中吐纳休养生息,获得了一些修为"
+    },
+    {
+      "ID": 212,
+      "txt": "你在飞行途中不慎滑倒"
+    },
+    {
+      "ID": 213,
+      "txt": "原来是脚下有一块圆润的石头"
+    },
+    {
+      "ID": 214,
+      "txt": "你拾起来一看,居然是难得的天材地宝"
+    },
+    {
+      "ID": 215,
+      "txt": "原本郁闷的心情,突然变的好了起来,哈哈~"
     }
   ]
 }

+ 38 - 46
Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs

@@ -1,88 +1,80 @@
-// Auto Generated Code By excel2json
-// Generate From Excel\EventConfig.xlsx. SheetName: EventConditionConfig
+// Auto Generated Code By excel2json
+// Generate From Excel\EventConfig.xlsx. SheetName: EventConditionConfig
 
-using System;
+using System;
 using Fort23.GameData;
-
+
 namespace Excel2Json
-{
-	[Config(prefab = "EventConditionConfig.json")]
-	public partial class EventConditionConfigHolder : ConfigHolder<EventConditionConfig>
-	{
-	}
-
-
-	[Serializable]
-	public struct EventConditionConfig : IConfig
-	{
-		public int GetID() {return ID;} 
+{
+	[Config(prefab = "EventConditionConfig.json")]
+	public partial class EventConditionConfigHolder : ConfigHolder<EventConditionConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct EventConditionConfig : IConfig
	{
+		public int GetID() {return ID;} 
 		/// <summary>
 		///条件ID
 		/// </summary>
 public int ID;
-
-
+
+
 		/// <summary>
 		///文本语言表ID
 		/// </summary>
 public int[] LanID;
-
-
+
+
 		/// <summary>
 		///条件判断类型
 		/// </summary>
 public int ConditionType;
-
-
+
+
 		/// <summary>
 		///条件判断数值
 		/// </summary>
 public int[] ConditionPara;
-
-
+
+
 		/// <summary>
 		///事件类型 1=提供选项 2=进入战斗 3=获得奖励
 		/// </summary>
 public int optionType;
-
-
+
+
 		/// <summary>
 		///事件常量1 1=事件IDs 2=战斗ID 3=
 		/// </summary>
 public int[] optionPara1;
-
-
+
+
 		/// <summary>
 		///事件常量2 1=事件文本 2= 3=
 		/// </summary>
 public int[] optionPara2;
-
-
+
+
 		/// <summary>
 		///事件结局奖励
 		/// </summary>
 public int[] PrizeIDs;
-
-
+
+
 		/// <summary>
 		///事件结局奖励数量
 		/// </summary>
 public int[] PrizeNums;
-
-
+
+
 		/// <summary>
 		///事件结局后提供的选项
 		/// </summary>
-public int[] ResultOptions;
-
-
-		/// <summary>
-		///事件结局文本
-		/// </summary>
-public int[] ResultLanID;
-
-
-	}
-
-}
-// End of Auto Generated Code
+public int ResultOptions;
+
+
+	}
+
+}
+// End of Auto Generated Code

BIN
Excel2Json/Excel/EventConfig.xlsx