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

# Conflicts:
#	Assets/Res/Config/EventConditionConfig.json   resolved by origin/master(远端) version

Assets/Res/Config/DropConfig.json

@@ -1,153 +1,25 @@
 {
   "configList": [
     {
-      "ID": 10001,
+      "ID": 1001,
       "dropGroupID": [
-        10001
+        1001
       ],
-      "dropType": 2
+      "dropType": 3
     },
     {
-      "ID": 10002,
+      "ID": 1002,
       "dropGroupID": [
-        10002
+        1002
       ],
-      "dropType": 2
+      "dropType": 3
     },
     {
-      "ID": 10003,
+      "ID": 1003,
       "dropGroupID": [
-        10003
+        1003
       ],
-      "dropType": 2
-    },
-    {
-      "ID": 10004,
-      "dropGroupID": [
-        40001
-      ],
-      "dropType": 1
-    },
-    {
-      "ID": 10005,
-      "dropGroupID": [
-        40002
-      ],
-      "dropType": 1
-    },
-    {
-      "ID": 10006,
-      "dropGroupID": [
-        40003
-      ],
-      "dropType": 1
-    },
-    {
-      "ID": 10007,
-      "dropGroupID": [
-        40004
-      ],
-      "dropType": 2
-    },
-    {
-      "ID": 10008,
-      "dropGroupID": [
-        40005
-      ],
-      "dropType": 2
-    },
-    {
-      "ID": 10009,
-      "dropGroupID": [
-        40019,
-        40020
-      ],
-      "dropType": 2
-    },
-    {
-      "ID": 10010,
-      "dropGroupID": [
-        40021,
-        40022
-      ],
-      "dropType": 2
-    },
-    {
-      "ID": 10011,
-      "dropGroupID": [
-        41001,
-        41002,
-        41003,
-        41004,
-        41005,
-        41006
-      ],
-      "dropType": 2
-    },
-    {
-      "ID": 10012,
-      "dropGroupID": [
-        41007,
-        41008,
-        41009,
-        41010,
-        41011,
-        41012
-      ],
-      "dropType": 2
-    },
-    {
-      "ID": 10013,
-      "dropGroupID": [
-        41013,
-        41014,
-        41015,
-        41016,
-        41017,
-        41018
-      ],
-      "dropType": 2
-    },
-    {
-      "ID": 10014,
-      "dropGroupID": [
-        42001,
-        42002,
-        42003,
-        42004,
-        42005
-      ],
-      "dropType": 2
-    },
-    {
-      "ID": 20001,
-      "dropGroupID": [
-        501004,
-        501005,
-        501006,
-        501007,
-        141008,
-        141009,
-        141010,
-        141011,
-        141012,
-        141013,
-        141014,
-        141015,
-        141016,
-        141017,
-        141018,
-        141019,
-        141020,
-        141021,
-        141022,
-        141023,
-        141024,
-        141025,
-        141026,
-        141027
-      ],
-      "dropType": 2
+      "dropType": 3
     }
   ]
 }

Assets/Res/Config/EventConditionConfig.json

@@ -1,5 +1,13 @@
 {
   "configList": [
+    {
+      "ID": 100,
+      "LanID": [
+        216
+      ],
+      "ConditionType": null,
+      "optionType": null
+    },
     {
       "ID": 1001,
       "LanID": [
@@ -14,8 +22,7 @@
       "optionPara2": [
         198,
         199
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1002,
@@ -27,7 +34,10 @@
       "optionPara1": [
         100001
       ],
-      "ResultOptions": 1004
+      "ResultOptions": [
+        1004,
+        100
+      ]
     },
     {
       "ID": 1003,
@@ -41,8 +51,7 @@
       ],
       "optionPara2": [
         200
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1004,
@@ -56,8 +65,7 @@
       ],
       "PrizeNums": [
         100
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1005,
@@ -71,8 +79,7 @@
       ],
       "PrizeNums": [
         50
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1010,
@@ -88,8 +95,7 @@
       "optionPara2": [
         201,
         202
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1011,
@@ -105,8 +111,7 @@
       "optionPara2": [
         203,
         204
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1012,
@@ -121,8 +126,7 @@
       ],
       "PrizeNums": [
         10
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1014,
@@ -134,7 +138,10 @@
       "optionPara1": [
         100001
       ],
-      "ResultOptions": 1016
+      "ResultOptions": [
+        1016,
+        100
+      ]
     },
     {
       "ID": 1015,
@@ -149,8 +156,7 @@
       ],
       "PrizeNums": [
         1000
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1016,
@@ -164,8 +170,7 @@
       ],
       "PrizeNums": [
         200
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1020,
@@ -181,8 +186,7 @@
       "optionPara2": [
         201,
         202
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 1021,
@@ -200,7 +204,10 @@
       "PrizeNums": [
         10
       ],
-      "ResultOptions": 1026
+      "ResultOptions": [
+        1026,
+        100
+      ]
     },
     {
       "ID": 1022,
@@ -215,7 +222,9 @@
       "PrizeNums": [
         10
       ],
-      "ResultOptions": 1016
+      "ResultOptions": [
+        1016
+      ]
     },
     {
       "ID": 1024,
@@ -234,7 +243,10 @@
       "PrizeNums": [
         200
       ],
-      "ResultOptions": 1016
+      "ResultOptions": [
+        1016,
+        100
+      ]
     },
     {
       "ID": 1025,
@@ -250,7 +262,9 @@
       "PrizeNums": [
         1000
       ],
-      "ResultOptions": 1002
+      "ResultOptions": [
+        1002
+      ]
     },
     {
       "ID": 1026,
@@ -266,8 +280,7 @@
       "optionPara2": [
         205,
         206
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 10001,
@@ -279,7 +292,10 @@
       "optionPara1": [
         100003
       ],
-      "ResultOptions": 10002
+      "ResultOptions": [
+        10002,
+        100
+      ]
     },
     {
       "ID": 10002,
@@ -293,8 +309,7 @@
       ],
       "PrizeNums": [
         10
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 10003,
@@ -309,8 +324,7 @@
       ],
       "PrizeNums": [
         10
-      ],
-      "ResultOptions": null
+      ]
     },
     {
       "ID": 10004,
@@ -327,8 +341,7 @@
       ],
       "PrizeNums": [
         10
-      ],
-      "ResultOptions": null
+      ]
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -859,6 +859,10 @@
     {
       "ID": 215,
       "txt": "原本郁闷的心情，突然变的好了起来，哈哈~"
+    },
+    {
+      "ID": 216,
+      "txt": "你被怪物击败了，事件结束。"
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs

@@ -71,7 +71,7 @@ public int[] PrizeNums;
 		/// <summary>
 		///事件结局后提供的选项
 		/// </summary>
-public int ResultOptions;
+public int[] ResultOptions;
 
 
 	}

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -74,6 +74,12 @@ public float HudunFactor;
 public int defK;
 
 
+		/// <summary>
+		///神识上限
+		/// </summary>
+public int ShenshiMax;
+
+
 		/// <summary>
 		///对应HeroModel表的下标和等级 0,1 表示1位置的1级 1,1 表示2位置的1级 1,2 表示3位置的2级
 		/// </summary>