From 85b38d50994b82d92fdccf347a0786fae542822b Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 19 May 2023 10:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=B8=81=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=88=86=E5=8F=91=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_caravancity.json  | 73 +++++++++++++-------------
 bin/json/game_caravanevent.json |  2 +-
 bin/json/game_caravanlv.json    | 78 ++++++++++++++--------------
 bin/json/game_caravanthing.json | 24 ++++-----
 bin/json/game_mainstage.json    | 90 +--------------------------------
 bin/json/game_worldtask.json    | 14 ++---
 6 files changed, 99 insertions(+), 182 deletions(-)

diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json
index 94949a06d..34e65eed9 100644
--- a/bin/json/game_caravancity.json
+++ b/bin/json/game_caravancity.json
@@ -2,7 +2,8 @@
   {
     "id": 101,
     "citylink": [
-      102
+      102,
+      104
     ],
     "cityticket": [
       {
@@ -18,15 +19,15 @@
     "citymainlock": 11001,
     "cityman": 34006,
     "cityname": {
-      "key": "caravan_caravan_event_cityname_1",
+      "key": "asd",
       "text": "死湾"
     },
     "cityinformation": {
-      "key": "caravan_caravan_event_cityinformation_1",
+      "key": "asd",
       "text": "常年游荡在死湾的商人，这一区域或许只有他才敢在这里做生意。"
     },
     "citytxt": {
-      "key": "caravan_caravan_event_citytxt_1",
+      "key": "asd",
       "text": "死湾长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。"
     },
     "citytype": 1,
@@ -37,13 +38,13 @@
       4,
       6
     ],
-    "specialnum": 50000,
+    "specialnum": 500,
     "exspecial": [
       2,
       5
     ],
-    "exspecialnum": 200000,
-    "Orspecial": 100000,
+    "exspecialnum": 1500,
+    "Orspecial": 1000,
     "checktime": 180,
     "cityeventpro": 50000,
     "cityevent": [
@@ -70,15 +71,15 @@
     "citymainlock": 11001,
     "cityman": 24004,
     "cityname": {
-      "key": "caravan_caravan_event_cityname_2",
+      "key": "asd",
       "text": "乱冢"
     },
     "cityinformation": {
-      "key": "caravan_caravan_event_cityinformation_2",
+      "key": "asd",
       "text": "常年游荡在乱冢的商人，这一区域或许只有他才敢在这里做生意。"
     },
     "citytxt": {
-      "key": "caravan_caravan_event_citytxt_2",
+      "key": "asd",
       "text": "乱冢长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。"
     },
     "citytype": 1,
@@ -89,13 +90,13 @@
       5,
       6
     ],
-    "specialnum": 50000,
+    "specialnum": 500,
     "exspecial": [
       1,
       2
     ],
-    "exspecialnum": 200000,
-    "Orspecial": 100000,
+    "exspecialnum": 1600,
+    "Orspecial": 1000,
     "checktime": 180,
     "cityeventpro": 100000,
     "cityevent": [
@@ -105,7 +106,9 @@
   {
     "id": 103,
     "citylink": [
-      102
+      102,
+      105,
+      104
     ],
     "cityticket": [
       {
@@ -121,15 +124,15 @@
     "citymainlock": 11001,
     "cityman": 25001,
     "cityname": {
-      "key": "caravan_caravan_event_cityname_3",
+      "key": "asd",
       "text": "陌城"
     },
     "cityinformation": {
-      "key": "caravan_caravan_event_cityinformation_3",
+      "key": "asd",
       "text": "常年游荡在陌城的商人，这一区域或许只有他才敢在这里做生意。"
     },
     "citytxt": {
-      "key": "caravan_caravan_event_citytxt_3",
+      "key": "asd",
       "text": "陌城长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。"
     },
     "citytype": 1,
@@ -140,13 +143,13 @@
       4,
       6
     ],
-    "specialnum": 50000,
+    "specialnum": 500,
     "exspecial": [
       1,
       5
     ],
-    "exspecialnum": 200000,
-    "Orspecial": 100000,
+    "exspecialnum": 1700,
+    "Orspecial": 1000,
     "checktime": 180,
     "cityeventpro": 50000,
     "cityevent": [
@@ -157,7 +160,8 @@
     "id": 104,
     "citylink": [
       101,
-      103
+      103,
+      105
     ],
     "cityticket": [
       {
@@ -173,15 +177,15 @@
     "citymainlock": 11001,
     "cityman": 45001,
     "cityname": {
-      "key": "caravan_caravan_event_cityname_4",
+      "key": "asd",
       "text": "暗窟"
     },
     "cityinformation": {
-      "key": "caravan_caravan_event_cityinformation_4",
+      "key": "asd",
       "text": "常年游荡在暗窟的商人，这一区域或许只有他才敢在这里做生意。"
     },
     "citytxt": {
-      "key": "caravan_caravan_event_citytxt_4",
+      "key": "asd",
       "text": "暗窟长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。"
     },
     "citytype": 1,
@@ -192,13 +196,13 @@
       4,
       5
     ],
-    "specialnum": 50000,
+    "specialnum": 500,
     "exspecial": [
       3,
       6
     ],
-    "exspecialnum": 200000,
-    "Orspecial": 100000,
+    "exspecialnum": 1800,
+    "Orspecial": 1000,
     "checktime": 180,
     "cityeventpro": 100000,
     "cityevent": [
@@ -208,7 +212,8 @@
   {
     "id": 105,
     "citylink": [
-      104
+      104,
+      103
     ],
     "cityticket": [
       {
@@ -224,15 +229,15 @@
     "citymainlock": 11001,
     "cityman": 14007,
     "cityname": {
-      "key": "caravan_caravan_event_cityname_5",
+      "key": "asd",
       "text": "腐宴"
     },
     "cityinformation": {
-      "key": "caravan_caravan_event_cityinformation_5",
+      "key": "asd",
       "text": "常年游荡在腐宴的商人，这一区域或许只有他才敢在这里做生意。"
     },
     "citytxt": {
-      "key": "caravan_caravan_event_citytxt_5",
+      "key": "asd",
       "text": "腐宴长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。"
     },
     "citytype": 1,
@@ -243,13 +248,13 @@
       4,
       6
     ],
-    "specialnum": 50000,
+    "specialnum": 500,
     "exspecial": [
       2,
       5
     ],
-    "exspecialnum": 200000,
-    "Orspecial": 100000,
+    "exspecialnum": 1900,
+    "Orspecial": 1000,
     "checktime": 180,
     "cityeventpro": 50000,
     "cityevent": [
diff --git a/bin/json/game_caravanevent.json b/bin/json/game_caravanevent.json
index 26fba1d9c..8d4b2a713 100644
--- a/bin/json/game_caravanevent.json
+++ b/bin/json/game_caravanevent.json
@@ -8,7 +8,7 @@
     "cityabnormal": 103,
     "worldtask": 210,
     "traintips": {
-      "key": "caravan_caravan_event_traintips_1",
+      "key": "asdsad",
       "text": "列车上来了外人，这个人看上去有很急切的事情，我们必须先解决这个再离开这里。"
     },
     "trainstory": 888,
diff --git a/bin/json/game_caravanlv.json b/bin/json/game_caravanlv.json
index f31656176..c145a6708 100644
--- a/bin/json/game_caravanlv.json
+++ b/bin/json/game_caravanlv.json
@@ -10,9 +10,9 @@
       "n": 40
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 1000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10000
     },
     "bargainpro": 10000,
     "bargainnum": 1,
@@ -29,9 +29,9 @@
       "n": 45
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 2000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10001
     },
     "bargainpro": 12000,
     "bargainnum": 1,
@@ -54,9 +54,9 @@
       "n": 50
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 3000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10002
     },
     "bargainpro": 14000,
     "bargainnum": 1,
@@ -79,9 +79,9 @@
       "n": 55
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 4000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10003
     },
     "bargainpro": 16000,
     "bargainnum": 2,
@@ -104,9 +104,9 @@
       "n": 60
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 5000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10004
     },
     "bargainpro": 20000,
     "bargainnum": 2,
@@ -129,9 +129,9 @@
       "n": 65
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 6000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10005
     },
     "bargainpro": 25000,
     "bargainnum": 2,
@@ -154,9 +154,9 @@
       "n": 70
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 7000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10006
     },
     "bargainpro": 30000,
     "bargainnum": 3,
@@ -179,9 +179,9 @@
       "n": 75
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 8000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10007
     },
     "bargainpro": 35000,
     "bargainnum": 3,
@@ -204,9 +204,9 @@
       "n": 80
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 9000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10008
     },
     "bargainpro": 40000,
     "bargainnum": 3,
@@ -229,9 +229,9 @@
       "n": 85
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 10000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10009
     },
     "bargainpro": 45000,
     "bargainnum": 4,
@@ -254,9 +254,9 @@
       "n": 90
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 11000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10010
     },
     "bargainpro": 50000,
     "bargainnum": 4,
@@ -279,9 +279,9 @@
       "n": 95
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 12000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10011
     },
     "bargainpro": 55000,
     "bargainnum": 4,
@@ -304,9 +304,9 @@
       "n": 100
     },
     "moneynumtop": {
-      "a": "item",
-      "t": "141001",
-      "n": 13000
+      "a": "attr",
+      "t": "merchantmoney",
+      "n": 10012
     },
     "bargainpro": 60000,
     "bargainnum": 5,
diff --git a/bin/json/game_caravanthing.json b/bin/json/game_caravanthing.json
index 752f2309d..5a885c71c 100644
--- a/bin/json/game_caravanthing.json
+++ b/bin/json/game_caravanthing.json
@@ -2,11 +2,11 @@
   {
     "id": 1,
     "goodsname": {
-      "key": "caravan_caravan_event_goodsname_1",
+      "key": "asdsad",
       "text": "番茄"
     },
     "goodsinfor": {
-      "key": "caravan_caravan_event_goodsinfor_1",
+      "key": "asdsad",
       "text": "这是一个番茄"
     },
     "goodsicon": "fanqie_c",
@@ -41,11 +41,11 @@
   {
     "id": 2,
     "goodsname": {
-      "key": "caravan_caravan_event_goodsname_2",
+      "key": "asdsad",
       "text": "苹果"
     },
     "goodsinfor": {
-      "key": "caravan_caravan_event_goodsinfor_2",
+      "key": "asdsad",
       "text": "这是一个苹果"
     },
     "goodsicon": "fanqie_c",
@@ -80,11 +80,11 @@
   {
     "id": 3,
     "goodsname": {
-      "key": "caravan_caravan_event_goodsname_3",
+      "key": "asdsad",
       "text": "手机"
     },
     "goodsinfor": {
-      "key": "caravan_caravan_event_goodsinfor_3",
+      "key": "asdsad",
       "text": "这是一个手机"
     },
     "goodsicon": "fanqie_c",
@@ -119,11 +119,11 @@
   {
     "id": 4,
     "goodsname": {
-      "key": "caravan_caravan_event_goodsname_4",
+      "key": "asdsad",
       "text": "干果"
     },
     "goodsinfor": {
-      "key": "caravan_caravan_event_goodsinfor_4",
+      "key": "asdsad",
       "text": "这是一个干果"
     },
     "goodsicon": "fanqie_c",
@@ -158,11 +158,11 @@
   {
     "id": 5,
     "goodsname": {
-      "key": "caravan_caravan_event_goodsname_5",
+      "key": "asdsad",
       "text": "干果"
     },
     "goodsinfor": {
-      "key": "caravan_caravan_event_goodsinfor_5",
+      "key": "asdsad",
       "text": "这是一个干果"
     },
     "goodsicon": "fanqie_c",
@@ -197,11 +197,11 @@
   {
     "id": 6,
     "goodsname": {
-      "key": "caravan_caravan_event_goodsname_6",
+      "key": "asdsad",
       "text": "干果"
     },
     "goodsinfor": {
-      "key": "caravan_caravan_event_goodsinfor_6",
+      "key": "asdsad",
       "text": "这是一个干果"
     },
     "goodsicon": "fanqie_c",
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 95c7f02af..854b5cc6f 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -434,98 +434,10 @@
       1
     ]
   },
-  {
-    "id": 1100106,
-    "chapterid": 11001,
-    "previoustage": 1100105,
-    "Episodetype": 1,
-    "openlevel": 1,
-    "Episodelocation": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "EditorStage": 0,
-    "detailwindow": "effect_chezhan",
-    "frontstoryid": 636,
-    "afterstoryid": 637,
-    "mainlineName": {
-      "key": "mainchapter_main_stage_mainlineName_6",
-      "text": "1-6"
-    },
-    "title": {
-      "key": "mainchapter_main_stage_title_6",
-      "text": "第6关：猩猩怪山洞"
-    },
-    "desc": {
-      "key": "mainchapter_main_stage_desc_6",
-      "text": "原来猩猩怪意外获得月光原石，这才导致地质突变，一群人进入抢夺月光原石的混战。"
-    },
-    "exp": 800,
-    "hero_exp": 3150,
-    "ps_consume": [
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 5
-      }
-    ],
-    "ps_mg": [
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 1
-      }
-    ],
-    "firstaward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 18140
-      },
-      {
-        "a": "item",
-        "t": "600004",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "exp",
-        "n": 1000
-      }
-    ],
-    "commonaward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 18140
-      }
-    ],
-    "BattleReadyID": 122,
-    "FormatList": [
-      101061
-    ],
-    "captainId": 550025,
-    "star": [
-      1,
-      1,
-      1
-    ],
-    "star_type": [
-      1,
-      2,
-      2
-    ],
-    "star_value": [
-      0,
-      2,
-      1
-    ]
-  },
   {
     "id": 1100201,
     "chapterid": 11002,
-    "previoustage": 1100106,
+    "previoustage": 1100105,
     "Episodetype": 1,
     "openlevel": 1,
     "Episodelocation": {
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 90570065b..95ecbc3c3 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -114,7 +114,7 @@
       "text": "相信或不相信，能做到或不能做到，守护者与你，命运的齿轮早已开始转动……"
     },
     "completetask": [
-      174
+      0
     ],
     "deliver_npctxt": {
       "key": "worldtask_world_task_deliver_npctxt_3",
@@ -344,13 +344,13 @@
       "text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……"
     },
     "completetask": [
-      304
+      0
     ],
     "deliver_npctxt": {
       "key": "worldtask_world_task_deliver_npctxt_8",
       "text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……"
     },
-    "deliver_npc": 10081,
+    "deliver_npc": 0,
     "auto_accept": 0,
     "reword": [
       {
@@ -784,13 +784,13 @@
       "text": "戈伯在他的铁匠铺里干活，但我现在需要去找他聊聊。"
     },
     "completetask": [
-      308
+      0
     ],
     "deliver_npctxt": {
       "key": "worldtask_world_task_deliver_npctxt_18",
       "text": "戈伯在他的铁匠铺里干活，但我现在需要去找他聊聊。"
     },
-    "deliver_npc": 70023,
+    "deliver_npc": 0,
     "auto_accept": 0,
     "reword": [
       {
@@ -872,13 +872,13 @@
       "text": "任务完成了，是时候去找戈伯聊聊了。"
     },
     "completetask": [
-      309
+      0
     ],
     "deliver_npctxt": {
       "key": "worldtask_world_task_deliver_npctxt_20",
       "text": "任务完成了，是时候去找戈伯聊聊了。"
     },
-    "deliver_npc": 70033,
+    "deliver_npc": 0,
     "auto_accept": 0,
     "reword": [
       {