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

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

Assets/Res/Config/DivineSenseConfig.json

@@ -11,7 +11,7 @@
         0.0
       ],
       "exp": 400,
-      "MaxNum": 2
+      "MaxNum": 4
     },
     {
       "ID": 2,
@@ -24,7 +24,7 @@
         0.0
       ],
       "exp": 900,
-      "MaxNum": 3
+      "MaxNum": 5
     },
     {
       "ID": 3,
@@ -37,7 +37,7 @@
         0.0
       ],
       "exp": 1200,
-      "MaxNum": 4
+      "MaxNum": 6
     },
     {
       "ID": 4,
@@ -50,7 +50,7 @@
         0.0
       ],
       "exp": 2000,
-      "MaxNum": 5
+      "MaxNum": 7
     },
     {
       "ID": 5,
@@ -63,7 +63,7 @@
         0.0
       ],
       "exp": 2400,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 6,
@@ -76,7 +76,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 7,
@@ -89,7 +89,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 8,
@@ -102,7 +102,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 9,
@@ -115,7 +115,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 10,
@@ -128,7 +128,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 11,
@@ -141,7 +141,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 12,
@@ -154,7 +154,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 13,
@@ -167,7 +167,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 14,
@@ -180,7 +180,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 15,
@@ -193,7 +193,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 16,
@@ -206,7 +206,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 17,
@@ -219,7 +219,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 18,
@@ -232,7 +232,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 19,
@@ -245,7 +245,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 20,
@@ -258,7 +258,7 @@
         0.0
       ],
       "exp": 3000000,
-      "MaxNum": 6
+      "MaxNum": 8
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -6438,6 +6438,7 @@
         915003,
         915004,
         915005,
+        915006,
         102,
         103
       ],
@@ -6475,6 +6476,7 @@
         915106,
         915107,
         915108,
+        915109,
         102,
         103
       ],
@@ -6512,6 +6514,7 @@
         915206,
         915207,
         915208,
+        915209,
         102,
         103
       ],
@@ -6557,6 +6560,7 @@
         915308,
         915309,
         915310,
+        915311,
         102,
         103
       ],

Assets/Res/Config/EventLinkConfig.json

@@ -1334,7 +1334,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 1,
+      "optionType": 0,
       "optionPara1": [
         9004,
         9006
@@ -1358,7 +1358,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 2,
+      "optionType": 0,
       "optionPara1": [
         100001
       ],
@@ -1451,7 +1451,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 1,
+      "optionType": 0,
       "optionPara1": [
         9026
       ],
@@ -1473,7 +1473,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 0,
+      "optionType": 1,
       "ResultType": 0,
       "ResultOptions": [
         9014
@@ -1505,7 +1505,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 2,
+      "optionType": 0,
       "optionPara1": [
         100001
       ],
@@ -3472,7 +3472,10 @@
       "DialogueType": 0,
       "EventID": 10011,
       "step": 5,
-      "optionType": 0,
+      "optionType": 1,
+      "optionPara1": [
+        1001106
+      ],
       "optionPara2": [
         5258
       ],
@@ -6383,7 +6386,7 @@
       "DialogueType": 0,
       "EventID": 10025,
       "step": 7,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         20001
       ],
@@ -7336,7 +7339,7 @@
       "ConditionId": [
         27
       ],
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1003
       ],
@@ -9620,10 +9623,7 @@
       "DialogueType": 0,
       "EventID": 30009,
       "step": 1,
-      "optionType": 2,
-      "optionPara1": [
-        10001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1301
       ],
@@ -9711,7 +9711,7 @@
       "DialogueType": 0,
       "EventID": 1018,
       "step": 3,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1202
       ],
@@ -9736,7 +9736,7 @@
       "DialogueType": 0,
       "EventID": 1018,
       "step": 4,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1201
       ],
@@ -9843,10 +9843,7 @@
       "DialogueType": 0,
       "EventID": 1020,
       "step": 2,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1203
       ],
@@ -9916,7 +9913,7 @@
       "ConditionId": [
         19
       ],
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1203
       ],
@@ -9938,10 +9935,7 @@
       "DialogueType": 0,
       "EventID": 30010,
       "step": 1,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10134,7 +10128,7 @@
       "ConditionId": [
         20
       ],
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10200,10 +10194,7 @@
       "DialogueType": 0,
       "EventID": 1024,
       "step": 2,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10229,7 +10220,7 @@
       "DialogueType": 0,
       "EventID": 1024,
       "step": 3,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10279,10 +10270,7 @@
       "DialogueType": 0,
       "EventID": 1025,
       "step": 2,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10506,10 +10494,7 @@
       "DialogueType": 0,
       "EventID": 1028,
       "step": 5,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -11371,7 +11356,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        30017
+        3016
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -22685,13 +22670,10 @@
       "optionPara2": [
         1
       ],
-      "PrizeIDs": [
-        1402
-      ],
-      "PrizeNums": [
-        1
-      ],
-      "ResultType": 0
+      "ResultType": 1,
+      "ResultOptions": [
+        915006
+      ]
     },
     {
       "ID": 915004,
@@ -22706,7 +22688,7 @@
       "DialogueType": 0,
       "EventID": 9150,
       "step": 4,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -22734,6 +22716,25 @@
       "optionType": 0,
       "ResultType": 0
     },
+    {
+      "ID": 915006,
+      "conciseEventMessage": 6565,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 9150,
+      "step": 6,
+      "optionType": 3,
+      "PrizeIDs": [
+        1402
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 0
+    },
     {
       "ID": 915101,
       "conciseEventMessage": 6574,
@@ -22856,13 +22857,10 @@
       "optionPara2": [
         100
       ],
-      "PrizeIDs": [
-        23200
-      ],
-      "PrizeNums": [
-        1
-      ],
-      "ResultType": 0
+      "ResultType": 1,
+      "ResultOptions": [
+        915109
+      ]
     },
     {
       "ID": 915107,
@@ -22896,7 +22894,7 @@
       "DialogueType": 0,
       "EventID": 9151,
       "step": 8,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -22905,6 +22903,25 @@
       ],
       "ResultType": 0
     },
+    {
+      "ID": 915109,
+      "conciseEventMessage": 0,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 9151,
+      "step": 9,
+      "optionType": 3,
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 0
+    },
     {
       "ID": 915201,
       "conciseEventMessage": 6586,
@@ -22985,7 +23002,7 @@
       "DialogueType": 0,
       "EventID": 9152,
       "step": 4,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -23074,6 +23091,22 @@
       "optionPara2": [
         100
       ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915209
+      ]
+    },
+    {
+      "ID": 915209,
+      "conciseEventMessage": 0,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 9152,
+      "step": 9,
+      "optionType": 3,
       "PrizeIDs": [
         23200
       ],
@@ -23169,15 +23202,9 @@
       "optionPara2": [
         100
       ],
-      "PrizeIDs": [
-        23200
-      ],
-      "PrizeNums": [
-        1
-      ],
       "ResultType": 1,
       "ResultOptions": [
-        915305
+        915311
       ]
     },
     {
@@ -23288,7 +23315,7 @@
       "DialogueType": 0,
       "EventID": 9153,
       "step": 10,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -23297,6 +23324,25 @@
       ],
       "ResultType": 0
     },
+    {
+      "ID": 915311,
+      "conciseEventMessage": 0,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 9153,
+      "step": 11,
+      "optionType": 3,
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 0
+    },
     {
       "ID": 915401,
       "conciseEventMessage": 6612,
@@ -23386,7 +23432,7 @@
       "DialogueType": 0,
       "EventID": 9154,
       "step": 5,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],

Assets/Res/Config/GameConstantConfig.json

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

Assets/Res/Config/GroupConfig.json

@@ -394,6 +394,15 @@
         9001
       ]
     },
+    {
+      "ID": 3016,
+      "GroupMonsterLevel": [
+        80
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
     {
       "ID": 10001,
       "GroupMonsterLevel": [

Assets/Res/Config/LanguageChineseConfig.json

@@ -17054,7 +17054,7 @@
     },
     {
       "ID": 5004,
-      "txt": "失败了怎么多次，这次一定要突破心魔。"
+      "txt": "失败了这么多次，这次一定要突破心魔。"
     },
     {
       "ID": 5005,
@@ -38787,6 +38787,46 @@
     {
       "ID": 10437,
       "txt": "道友未解锁！"
+    },
+    {
+      "ID": 10438,
+      "txt": "0"
+    },
+    {
+      "ID": 10439,
+      "txt": "0"
+    },
+    {
+      "ID": 10440,
+      "txt": "0"
+    },
+    {
+      "ID": 10441,
+      "txt": "0"
+    },
+    {
+      "ID": 10442,
+      "txt": "0"
+    },
+    {
+      "ID": 10443,
+      "txt": "0"
+    },
+    {
+      "ID": 10444,
+      "txt": "0"
+    },
+    {
+      "ID": 10445,
+      "txt": "0"
+    },
+    {
+      "ID": 10446,
+      "txt": "0"
+    },
+    {
+      "ID": 10447,
+      "txt": "0"
     }
   ]
 }

Assets/Res/Config/LevelbattleConfig.json

@@ -340,6 +340,16 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 3016,
+      "Group": [
+        3016
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 10001,
       "Group": [