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

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

Assets/Res/Config/EventConfig.json

@@ -7,7 +7,9 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 3,
@@ -41,7 +43,9 @@
         1013,
         1014,
         1015,
-        1016
+        1016,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 3,
@@ -72,7 +76,8 @@
         1023,
         1024,
         1025,
-        1026
+        1026,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 2,
@@ -100,10 +105,12 @@
     {
       "ID": 4,
       "EventLinksId": [
-        1030
+        1030,
+        100,
+        102
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -128,10 +135,12 @@
     {
       "ID": 5,
       "EventLinksId": [
-        1040
+        1040,
+        100,
+        102
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -153,10 +162,12 @@
     {
       "ID": 6,
       "EventLinksId": [
-        1050
+        1050,
+        100,
+        102
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -178,10 +189,12 @@
     {
       "ID": 7,
       "EventLinksId": [
-        1060
+        1060,
+        100,
+        102
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -204,10 +217,12 @@
       "ID": 11,
       "EventLinksId": [
         1101,
-        1102
+        1102,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -231,10 +246,12 @@
       "EventLinksId": [
         1201,
         1202,
-        1203
+        1203,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -259,10 +276,12 @@
         1301,
         1302,
         1303,
-        1304
+        1304,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -285,10 +304,12 @@
       "ID": 14,
       "EventLinksId": [
         1401,
-        1402
+        1402,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -311,10 +332,12 @@
       "ID": 15,
       "EventLinksId": [
         1501,
-        1502
+        1502,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -339,7 +362,8 @@
         1000101,
         1000102,
         1000103,
-        1000104
+        1000104,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -366,7 +390,8 @@
       "EventLinksId": [
         1000201,
         1000202,
-        1000203
+        1000203,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -399,7 +424,8 @@
         1000306,
         1000307,
         1000308,
-        1000309
+        1000309,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -427,7 +453,8 @@
         1000401,
         1000402,
         1000403,
-        1000404
+        1000404,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -465,7 +492,8 @@
         1000511,
         1000512,
         1000513,
-        1000514
+        1000514,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -495,7 +523,8 @@
         1000603,
         1000604,
         1000605,
-        1000606
+        1000606,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -524,7 +553,8 @@
         1000702,
         1000703,
         1000704,
-        1000705
+        1000705,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -562,7 +592,8 @@
         1000811,
         1000812,
         1000813,
-        1000814
+        1000814,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -589,7 +620,8 @@
       "EventLinksId": [
         1000901,
         1000902,
-        1000903
+        1000903,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -614,7 +646,8 @@
     {
       "ID": 10010,
       "EventLinksId": [
-        1001001
+        1001001,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -639,7 +672,8 @@
     {
       "ID": 10011,
       "EventLinksId": [
-        1001101
+        1001101,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -675,7 +709,8 @@
         1001209,
         1001210,
         1001211,
-        1001212
+        1001212,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -715,7 +750,8 @@
         1001313,
         1001314,
         1001315,
-        1001316
+        1001316,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -747,7 +783,8 @@
         1001405,
         1001406,
         1001407,
-        1001408
+        1001408,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -779,7 +816,8 @@
         1001505,
         1001506,
         1001507,
-        1001508
+        1001508,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -816,7 +854,8 @@
         1001610,
         1001611,
         1001612,
-        1001613
+        1001613,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -850,7 +889,8 @@
         1001707,
         1001708,
         1001709,
-        1001710
+        1001710,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -890,7 +930,12 @@
         1001813,
         1001814,
         1001815,
-        1001816
+        1001816,
+        1001817,
+        1001818,
+        1001819,
+        1001820,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -916,7 +961,8 @@
       "ID": 10019,
       "EventLinksId": [
         1001901,
-        1001902
+        1001902,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -944,7 +990,8 @@
         1002001,
         1002002,
         1002003,
-        1002004
+        1002004,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -980,7 +1027,8 @@
         1002109,
         1002110,
         1002111,
-        1002112
+        1002112,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1007,7 +1055,8 @@
       "EventLinksId": [
         1002201,
         1002202,
-        1002203
+        1002203,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1043,7 +1092,8 @@
         1002309,
         1002310,
         1002311,
-        1002312
+        1002312,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1074,7 +1124,8 @@
         1002404,
         1002405,
         1002406,
-        1002407
+        1002407,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1107,7 +1158,8 @@
         1002506,
         1002507,
         1002508,
-        1002509
+        1002509,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1131,6 +1183,9 @@
     },
     {
       "ID": 10026,
+      "EventLinksId": [
+        102
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -1153,6 +1208,9 @@
     },
     {
       "ID": 10027,
+      "EventLinksId": [
+        102
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -1180,7 +1238,9 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 4,
@@ -1205,7 +1265,9 @@
     {
       "ID": 1011,
       "EventLinksId": [
-        101101
+        101101,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1230,7 +1292,9 @@
     {
       "ID": 1012,
       "EventLinksId": [
-        101201
+        101201,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1255,7 +1319,9 @@
     {
       "ID": 1013,
       "EventLinksId": [
-        101301
+        101301,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1280,7 +1346,9 @@
     {
       "ID": 1014,
       "EventLinksId": [
-        101401
+        101401,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1306,7 +1374,9 @@
       "ID": 1015,
       "EventLinksId": [
         101501,
-        101502
+        101502,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1332,7 +1402,9 @@
       "ID": 1016,
       "EventLinksId": [
         101601,
-        101602
+        101602,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1357,7 +1429,9 @@
     {
       "ID": 1017,
       "EventLinksId": [
-        101701
+        101701,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1388,7 +1462,9 @@
         101801,
         101802,
         101803,
-        101804
+        101804,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1415,7 +1491,9 @@
       "EventLinksId": [
         101901,
         101902,
-        101903
+        101903,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1441,7 +1519,9 @@
       "ID": 1020,
       "EventLinksId": [
         102001,
-        102002
+        102002,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1468,16 +1548,15 @@
       "EventLinksId": [
         102101,
         102102,
-        102103
+        102103,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeNums": [
-        1
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
@@ -1496,16 +1575,15 @@
         102204,
         102205,
         102206,
-        102207
+        102207,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeNums": [
-        1
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
@@ -1520,7 +1598,9 @@
       "EventLinksId": [
         102301,
         102302,
-        102303
+        102303,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1541,7 +1621,9 @@
       "EventLinksId": [
         102401,
         102402,
-        102403
+        102403,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1562,7 +1644,9 @@
       "EventLinksId": [
         102501,
         102502,
-        102503
+        102503,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1582,7 +1666,9 @@
       "ID": 1026,
       "EventLinksId": [
         102601,
-        102602
+        102602,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1608,7 +1694,9 @@
       "ID": 1027,
       "EventLinksId": [
         102701,
-        102702
+        102702,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1637,7 +1725,9 @@
         102802,
         102803,
         102804,
-        102805
+        102805,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1669,7 +1759,9 @@
         102905,
         102906,
         102907,
-        102908
+        102908,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1700,7 +1792,9 @@
         103004,
         103005,
         103006,
-        103007
+        103007,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1729,7 +1823,9 @@
         103102,
         103103,
         103104,
-        103105
+        103105,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1758,7 +1854,8 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        102
       ],
       "EventTriggerType": 5,
       "EventTag": null,
@@ -1789,7 +1886,8 @@
         1013,
         1014,
         1015,
-        1016
+        1016,
+        102
       ],
       "EventTriggerType": 5,
       "EventTag": null,
@@ -1818,7 +1916,8 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        102
       ],
       "EventTriggerType": 5,
       "EventTag": null,
@@ -1847,7 +1946,8 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 3,
@@ -1878,7 +1978,8 @@
         1013,
         1014,
         1015,
-        1016
+        1016,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 3,
@@ -1908,7 +2009,8 @@
         9005,
         9006,
         9007,
-        9008
+        9008,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 5,
@@ -1932,6 +2034,9 @@
     },
     {
       "ID": 9025,
+      "EventLinksId": [
+        102
+      ],
       "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
@@ -1955,7 +2060,8 @@
     {
       "ID": 9014,
       "EventLinksId": [
-        9014
+        9014,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 3,
@@ -1980,7 +2086,8 @@
     {
       "ID": 9031,
       "EventLinksId": [
-        9031
+        9031,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 3,
@@ -2004,6 +2111,10 @@
     },
     {
       "ID": 30001,
+      "EventLinksId": [
+        100,
+        102
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
       "EventType": 1,
@@ -2020,6 +2131,10 @@
     },
     {
       "ID": 30002,
+      "EventLinksId": [
+        100,
+        102
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
       "EventType": 1,
@@ -2037,7 +2152,9 @@
     {
       "ID": 30003,
       "EventLinksId": [
-        3000301
+        3000301,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2056,7 +2173,9 @@
     {
       "ID": 30004,
       "EventLinksId": [
-        3000401
+        3000401,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2075,7 +2194,9 @@
     {
       "ID": 30005,
       "EventLinksId": [
-        3000501
+        3000501,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2094,7 +2215,9 @@
     {
       "ID": 30006,
       "EventLinksId": [
-        3000601
+        3000601,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2113,7 +2236,9 @@
     {
       "ID": 30007,
       "EventLinksId": [
-        3000701
+        3000701,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2132,7 +2257,9 @@
     {
       "ID": 30008,
       "EventLinksId": [
-        3000801
+        3000801,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2152,7 +2279,9 @@
       "ID": 30009,
       "EventLinksId": [
         3000901,
-        3000902
+        3000902,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2177,7 +2306,9 @@
     {
       "ID": 30010,
       "EventLinksId": [
-        3001001
+        3001001,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2206,7 +2337,9 @@
       "ID": 30011,
       "EventLinksId": [
         3001101,
-        3001102
+        3001102,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2249,7 +2382,8 @@
         500116,
         500117,
         500118,
-        500119
+        500119,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 5,
@@ -2289,7 +2423,8 @@
         500213,
         500214,
         500215,
-        500216
+        500216,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 5,
@@ -2336,7 +2471,8 @@
         500317,
         500318,
         500319,
-        500320
+        500320,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 2,

Assets/Res/Config/EventLinkConfig.json

@@ -2255,6 +2255,7 @@
       "EventID": 10012,
       "optionType": 1,
       "optionPara1": [
+        1001206,
         1001206
       ],
       "optionPara2": [
@@ -2863,7 +2864,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2238
+        3190
       ],
       "DialogueType": null,
       "EventID": 10015,
@@ -2881,7 +2882,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2239
+        3191
       ],
       "DialogueType": null,
       "EventID": 10015,
@@ -2899,7 +2900,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2240
+        3192
       ],
       "DialogueType": null,
       "EventID": 10015,
@@ -2908,7 +2909,7 @@
         1001504
       ],
       "optionPara2": [
-        2241
+        3193
       ],
       "ResultType": null
     },
@@ -3088,7 +3089,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        2244
+        3186
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -3106,7 +3107,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2245
+        3187
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -3124,7 +3125,7 @@
       "PreShowPar": null,
       "NPCID": 100,
       "LanID": [
-        2246
+        3188
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -3142,7 +3143,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2247
+        3189
       ],
       "DialogueType": null,
       "EventID": 10016,

Assets/Res/Config/ItemConfig.json

@@ -769,7 +769,7 @@
       "associateID": 4,
       "associateVlaue": [
         11001,
-        3101
+        10001
       ],
       "sort": null,
       "itemDesc2": null
@@ -798,7 +798,7 @@
       "associateID": 4,
       "associateVlaue": [
         11002,
-        3102
+        10002
       ],
       "sort": null,
       "itemDesc2": null
@@ -827,7 +827,7 @@
       "associateID": 4,
       "associateVlaue": [
         11003,
-        3201
+        10003
       ],
       "sort": null,
       "itemDesc2": null
@@ -856,7 +856,7 @@
       "associateID": 4,
       "associateVlaue": [
         11004,
-        3202
+        10004
       ],
       "sort": null,
       "itemDesc2": null
@@ -885,7 +885,7 @@
       "associateID": 4,
       "associateVlaue": [
         11005,
-        3203
+        10005
       ],
       "sort": null,
       "itemDesc2": null
@@ -914,7 +914,7 @@
       "associateID": 4,
       "associateVlaue": [
         11006,
-        3301
+        10006
       ],
       "sort": null,
       "itemDesc2": null
@@ -943,7 +943,7 @@
       "associateID": 4,
       "associateVlaue": [
         11007,
-        3302
+        10007
       ],
       "sort": null,
       "itemDesc2": null
@@ -972,7 +972,7 @@
       "associateID": 4,
       "associateVlaue": [
         11008,
-        3401
+        10008
       ],
       "sort": null,
       "itemDesc2": null
@@ -1001,7 +1001,7 @@
       "associateID": 4,
       "associateVlaue": [
         11009,
-        3402
+        10009
       ],
       "sort": null,
       "itemDesc2": null
@@ -1030,7 +1030,7 @@
       "associateID": 4,
       "associateVlaue": [
         11010,
-        3501
+        10010
       ],
       "sort": null,
       "itemDesc2": null
@@ -1059,7 +1059,7 @@
       "associateID": 4,
       "associateVlaue": [
         11011,
-        3502
+        10011
       ],
       "sort": null,
       "itemDesc2": null

Assets/Res/Config/LanguageChineseConfig.json

@@ -8950,19 +8950,19 @@
     },
     {
       "ID": 2238,
-      "txt": "今天的风有点不对，开来昨日你在后山的动静不小呀，山那头怕是要来些不速之客。"
+      "txt": "（回到屋前，看到许由又在烧水，煮茶，和上次一样）"
     },
     {
       "ID": 2239,
-      "txt": "你才帮我弄好灵草种子和灵田，别让妖兽给毁了。"
+      "txt": "来，喝茶。"
     },
     {
       "ID": 2240,
-      "txt": "你去走一趟。"
+      "txt": "（心中默念...这个精英妖兽，可费我一些功夫，怎么又是茶？）"
     },
     {
       "ID": 2241,
-      "txt": "好的......"
+      "txt": "（你没说话，默默喝下）"
     },
     {
       "ID": 2242,
@@ -8982,7 +8982,7 @@
     },
     {
       "ID": 2246,
-      "txt": "（低声）……前辈，我做了怎么多事，一次比一次难。为何每次都让我喝茶？前辈可是希望我去处理？"
+      "txt": "前辈可是希望我去处理？"
     },
     {
       "ID": 2247,
@@ -12739,6 +12739,38 @@
     {
       "ID": 3185,
       "txt": "击败结界兽"
+    },
+    {
+      "ID": 3186,
+      "txt": "（你回到屋前，略显疲惫，许由依然在烧水，煮茶）"
+    },
+    {
+      "ID": 3187,
+      "txt": "（不动声色，递茶）喝吧。"
+    },
+    {
+      "ID": 3188,
+      "txt": "（低声）……前辈，我做了怎么多事，一次比一次难。为何每次都让我喝茶？"
+    },
+    {
+      "ID": 3189,
+      "txt": "哈哈哈，小友.你赢得越来越多，喝得却越来越不甘心。"
+    },
+    {
+      "ID": 3190,
+      "txt": "今天的风有点不对，开来昨日你在后山的动静不小呀，山那头怕是要来些不速之客。"
+    },
+    {
+      "ID": 3191,
+      "txt": "你才帮我弄好灵草种子和灵田，别让妖兽给毁了。"
+    },
+    {
+      "ID": 3192,
+      "txt": "你去走一趟。"
+    },
+    {
+      "ID": 3193,
+      "txt": "好的......"
     }
   ]
 }

Assets/Res/Config/ShopConfig.json

@@ -108,6 +108,78 @@
       "pageSortNum": 6,
       "continueTime": -1
     },
+    {
+      "ID": 7,
+      "shopName": 268,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ],
+      "shopGroup": 1,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 7,
+      "pageSortNum": 7,
+      "continueTime": -1
+    },
+    {
+      "ID": 8,
+      "shopName": 269,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Demo_Gem04"
+      ],
+      "shopGroup": 1,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 8,
+      "pageSortNum": 8,
+      "continueTime": -1
+    },
+    {
+      "ID": 9,
+      "shopName": 270,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_GradeBadge_Master"
+      ],
+      "shopGroup": 1,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 9,
+      "pageSortNum": 9,
+      "continueTime": -1
+    },
+    {
+      "ID": 10,
+      "shopName": 271,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_GradeBadge_Challenger"
+      ],
+      "shopGroup": 1,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 10,
+      "pageSortNum": 10,
+      "continueTime": -1
+    },
     {
       "ID": 101,
       "shopName": 300,

Assets/Res/Config/ShopItemConfig.json

@@ -7,7 +7,7 @@
         1001
       ],
       "itemCount": [
-        9999
+        999999
       ],
       "costItemId": 1001,
       "price": 0,
@@ -67,7 +67,7 @@
         1005
       ],
       "itemCount": [
-        9999
+        99999
       ],
       "costItemId": 1001,
       "price": 1,
@@ -82,7 +82,67 @@
         1006
       ],
       "itemCount": [
-        9999
+        99999
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 7,
+      "giftID": "",
+      "itemId": [
+        1301
+      ],
+      "itemCount": [
+        999
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 8,
+      "giftID": "",
+      "itemId": [
+        1302
+      ],
+      "itemCount": [
+        999
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 9,
+      "giftID": "",
+      "itemId": [
+        1303
+      ],
+      "itemCount": [
+        999
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 10,
+      "giftID": "",
+      "itemId": [
+        1304
+      ],
+      "itemCount": [
+        999
       ],
       "costItemId": 1001,
       "price": 1,