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

# Conflicts:
#	Excel2Json/Excel/Sentiment.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/EventLinkConfig.json

@@ -56,7 +56,7 @@
         177
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 1,
       "optionPara1": [
         1002,
@@ -79,7 +79,7 @@
         178
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -101,7 +101,7 @@
         179
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 1,
       "optionPara1": [
         1005
@@ -122,7 +122,7 @@
         180
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -143,7 +143,7 @@
         181
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -164,7 +164,7 @@
         182
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 1,
       "optionPara1": [
         1011,
@@ -187,7 +187,7 @@
         183
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 1,
       "optionPara1": [
         1014,
@@ -211,7 +211,7 @@
         187
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -232,7 +232,7 @@
         185
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -255,7 +255,7 @@
         189
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -276,7 +276,7 @@
         188
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": null,
       "PrizeIDs": [
         1001
@@ -443,7 +443,7 @@
         221
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 4,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -464,7 +464,7 @@
         222
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 5,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -485,7 +485,7 @@
         223
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 6,
       "optionType": 3,
       "PrizeIDs": [
         1002,
@@ -508,7 +508,7 @@
         224
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 7,
       "optionType": null,
       "ResultType": null
     },
@@ -524,14 +524,10 @@
       ],
       "DialogueType": null,
       "EventID": 11,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
-      "ResultType": 2,
+      "optionType": null,
+      "ResultType": 1,
       "ResultOptions": [
-        1102,
-        100
+        1102
       ]
     },
     {
@@ -555,6 +551,27 @@
       ],
       "ResultType": null
     },
+    {
+      "ID": 1103,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        209
+      ],
+      "DialogueType": null,
+      "EventID": 11,
+      "optionType": 3,
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        3000
+      ],
+      "ResultType": null
+    },
     {
       "ID": 1201,
       "conciseEventMessage": null,

Assets/Res/Config/GameConstantConfig.json

@@ -35,7 +35,11 @@
         120,
         240
       ],
-      "RefreshRelevanceEventProbability": 50
+      "RefreshRelevanceEventProbability": 50,
+      "shenshiRecoverSpeed": [
+        12.0,
+        1.0
+      ]
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -98,6 +98,12 @@ public int[] DaoyouguajiDuration;
 public int RefreshRelevanceEventProbability;
 
 
+		/// <summary>
+		///神识恢复速率 每{0}秒恢复{1}点
+		/// </summary>
+public float[] shenshiRecoverSpeed;
+
+
 	}
 
 }