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

Assets/Res/Config/EventLinkConfig.json

@@ -3070,9 +3070,6 @@
       "NPCID": 0,
       "DialogueType": 0,
       "EventID": 10010,
-      "ConditionId": [
-        36
-      ],
       "optionType": 2,
       "optionPara1": [
         1003
@@ -21072,10 +21069,7 @@
       "DialogueType": 0,
       "EventID": 9147,
       "optionType": 0,
-      "ResultType": 3,
-      "ResultOptions": [
-        101
-      ]
+      "ResultType": 0
     },
     {
       "ID": 914801,
@@ -21151,10 +21145,7 @@
       "DialogueType": 0,
       "EventID": 9148,
       "optionType": 0,
-      "ResultType": 3,
-      "ResultOptions": [
-        101
-      ]
+      "ResultType": 0
     },
     {
       "ID": 914901,
@@ -21190,7 +21181,7 @@
       "optionPara1": [
         914903,
         914903,
-        914903
+        914904
       ],
       "optionPara2": [
         6552,
@@ -21233,10 +21224,7 @@
       "DialogueType": 0,
       "EventID": 9149,
       "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        101
-      ]
+      "ResultType": 0
     },
     {
       "ID": 914905,
@@ -21944,7 +21932,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 147,
+      "NPCID": 148,
       "LanID": [
         6614
       ],

Assets/Res/Config/ShopItemConfig.json

@@ -1820,37 +1820,14 @@
     {
       "ID": 601,
       "giftID": "",
-      "itemId": [
-        1701
-      ],
-      "itemCount": [
-        1
-      ],
-      "costItemId": 1002,
-      "price": 1,
-      "oldPrice": 1,
-      "buyCount": 10,
-      "maxBuyCount": -1,
-      "shopItemGroup": 6,
-      "continueTime": -1,
-      "shopName": 0,
-      "shopDesc": 0,
-      "shopShowTemplate": 3,
-      "shopShowTemplateParm": [
-        "icon_Gem_Star_Blue"
-      ]
-    },
-    {
-      "ID": 602,
-      "giftID": "",
       "itemId": [
         1702
       ],
       "itemCount": [
         1
       ],
-      "costItemId": 0,
-      "price": 1,
+      "costItemId": 1004,
+      "price": 200,
       "oldPrice": 1,
       "buyCount": 5,
       "maxBuyCount": -1,