商店解锁优化 功夫塔任务

bin/json/game_annulartask_library.json

@@ -5,7 +5,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1130,
-    "itemwt": 400,
+    "itemwt": 1000,
     "min": 0
   },
   {
@@ -14,7 +14,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1180,
-    "itemwt": 300,
+    "itemwt": 0,
     "min": 0
   },
   {
@@ -23,7 +23,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1290,
-    "itemwt": 300,
+    "itemwt": 0,
     "min": 0
   },
   {
@@ -32,7 +32,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1020,
-    "itemwt": 400,
+    "itemwt": 1000,
     "min": 0
   },
   {
@@ -41,7 +41,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1190,
-    "itemwt": 300,
+    "itemwt": 0,
     "min": 0
   },
   {
@@ -50,7 +50,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1300,
-    "itemwt": 300,
+    "itemwt": 0,
     "min": 0
   },
   {
@@ -59,7 +59,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1200,
-    "itemwt": 400,
+    "itemwt": 1000,
     "min": 0
   },
   {
@@ -68,7 +68,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1260,
-    "itemwt": 300,
+    "itemwt": 0,
     "min": 0
   },
   {
@@ -77,7 +77,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1310,
-    "itemwt": 300,
+    "itemwt": 0,
     "min": 0
   },
   {
@@ -86,7 +86,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1210,
-    "itemwt": 300,
+    "itemwt": 0,
     "min": 0
   },
   {
@@ -95,7 +95,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1110,
-    "itemwt": 100,
+    "itemwt": 1000,
     "min": 0
   },
   {
@@ -104,7 +104,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1320,
-    "itemwt": 300,
+    "itemwt": 0,
     "min": 0
   },
   {
@@ -113,7 +113,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1220,
-    "itemwt": 500,
+    "itemwt": 0,
     "min": 0
   },
   {
@@ -122,7 +122,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1330,
-    "itemwt": 500,
+    "itemwt": 1000,
     "min": 0
   }
 ]

bin/json/game_mainshopitem.json

@@ -1,8 +1,7 @@
 [
   {
-    "key": 1,
+    "key": 11001001,
     "shopid": 11001,
-    "id": 110001,
     "itemsell": [
       {
         "a": "item",
@@ -21,9 +20,8 @@
     "unlock": 0
   },
   {
-    "key": 2,
+    "key": 11001002,
     "shopid": 11001,
-    "id": 110002,
     "itemsell": [
       {
         "a": "item",
@@ -42,9 +40,8 @@
     "unlock": 0
   },
   {
-    "key": 3,
+    "key": 11001003,
     "shopid": 11001,
-    "id": 110003,
     "itemsell": [
       {
         "a": "item",
@@ -63,9 +60,8 @@
     "unlock": 0
   },
   {
-    "key": 4,
+    "key": 11001004,
     "shopid": 11001,
-    "id": 110004,
     "itemsell": [
       {
         "a": "item",
@@ -84,9 +80,8 @@
     "unlock": 0
   },
   {
-    "key": 5,
+    "key": 11001005,
     "shopid": 11001,
-    "id": 110005,
     "itemsell": [
       {
         "a": "item",
@@ -105,9 +100,8 @@
     "unlock": 0
   },
   {
-    "key": 6,
+    "key": 11001006,
     "shopid": 11001,
-    "id": 110006,
     "itemsell": [
       {
         "a": "item",
@@ -126,9 +120,8 @@
     "unlock": 0
   },
   {
-    "key": 7,
+    "key": 11001007,
     "shopid": 11001,
-    "id": 110007,
     "itemsell": [
       {
         "a": "item",
@@ -147,9 +140,8 @@
     "unlock": 11001001
   },
   {
-    "key": 8,
+    "key": 11001008,
     "shopid": 11001,
-    "id": 110008,
     "itemsell": [
       {
         "a": "item",

bin/json/game_trendchose.json

@@ -14,7 +14,7 @@
     },
     "chosetype": 1,
     "chosenum": 1,
-    "startstory": 0,
+    "startstory": 10000400,
     "constory": 0,
     "get": [],
     "aginstory": 0,
@@ -37,7 +37,7 @@
     },
     "chosetype": 1,
     "chosenum": 2,
-    "startstory": 0,
+    "startstory": 10000400,
     "constory": 0,
     "get": [],
     "aginstory": 0,
@@ -60,7 +60,7 @@
     },
     "chosetype": 1,
     "chosenum": 3,
-    "startstory": 0,
+    "startstory": 10000400,
     "constory": 0,
     "get": [],
     "aginstory": 0,
@@ -83,7 +83,7 @@
     },
     "chosetype": 1,
     "chosenum": 4,
-    "startstory": 0,
+    "startstory": 10000400,
     "constory": 0,
     "get": [],
     "aginstory": 0,
@@ -106,7 +106,7 @@
     },
     "chosetype": 1,
     "chosenum": 5,
-    "startstory": 0,
+    "startstory": 10000400,
     "constory": 0,
     "get": [],
     "aginstory": 0,
@@ -128,8 +128,8 @@
       "text": "考试选项6"
     },
     "chosetype": 1,
-    "chosenum": 6,
+    "chosenum": 1,
-    "startstory": 0,
+    "startstory": 10000400,
     "constory": 0,
     "get": [],
     "aginstory": 0,
@@ -151,8 +151,8 @@
       "text": "考试选项7"
     },
     "chosetype": 1,
-    "chosenum": 7,
+    "chosenum": 2,
-    "startstory": 0,
+    "startstory": 10000400,
     "constory": 0,
     "get": [],
     "aginstory": 0,
@@ -175,12 +175,12 @@
     },
     "chosetype": 2,
     "chosenum": 0,
-    "startstory": 10000010,
+    "startstory": 10000291,
-    "constory": 10000020,
+    "constory": 10000292,
     "get": [
       1001
     ],
-    "aginstory": 12980,
+    "aginstory": 0,
     "lose": [],
     "jump": 0,
     "num": 0
@@ -200,12 +200,12 @@
     },
     "chosetype": 2,
     "chosenum": 0,
-    "startstory": 10000010,
+    "startstory": 10000311,
-    "constory": 10000020,
+    "constory": 10000312,
     "get": [
-      1001
+      1002
     ],
-    "aginstory": 12980,
+    "aginstory": 0,
     "lose": [],
     "jump": 0,
     "num": 0
@@ -225,12 +225,12 @@
     },
     "chosetype": 2,
     "chosenum": 0,
-    "startstory": 10000010,
+    "startstory": 10000331,
-    "constory": 10000020,
+    "constory": 10000332,
     "get": [
-      1001
+      1003
     ],
-    "aginstory": 12980,
+    "aginstory": 0,
     "lose": [],
     "jump": 0,
     "num": 0
@@ -250,12 +250,12 @@
     },
     "chosetype": 2,
     "chosenum": 0,
-    "startstory": 10000010,
+    "startstory": 10000351,
-    "constory": 10000020,
+    "constory": 10000352,
     "get": [
-      1001
+      1004
     ],
-    "aginstory": 12980,
+    "aginstory": 0,
     "lose": [],
     "jump": 0,
     "num": 0
@@ -275,12 +275,12 @@
     },
     "chosetype": 2,
     "chosenum": 0,
-    "startstory": 10000010,
+    "startstory": 10000371,
-    "constory": 10000020,
+    "constory": 10000372,
     "get": [
-      1001
+      1005
     ],
-    "aginstory": 12980,
+    "aginstory": 0,
     "lose": [],
     "jump": 0,
     "num": 0

bin/json/game_worlddeal.json

@@ -16,5 +16,77 @@
       }
     ],
     "buy": 1
+  },
+  {
+    "id": 1002,
+    "item": [
+      {
+        "a": "item",
+        "t": "14020009",
+        "n": 1
+      }
+    ],
+    "money": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 100000
+      }
+    ],
+    "buy": 1
+  },
+  {
+    "id": 1003,
+    "item": [
+      {
+        "a": "item",
+        "t": "14020009",
+        "n": 1
+      }
+    ],
+    "money": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 100000
+      }
+    ],
+    "buy": 1
+  },
+  {
+    "id": 1004,
+    "item": [
+      {
+        "a": "item",
+        "t": "14020009",
+        "n": 1
+      }
+    ],
+    "money": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 100000
+      }
+    ],
+    "buy": 1
+  },
+  {
+    "id": 1005,
+    "item": [
+      {
+        "a": "item",
+        "t": "14020009",
+        "n": 1
+      }
+    ],
+    "money": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 100000
+      }
+    ],
+    "buy": 1
   }
 ]

bin/json/game_worldtask.json

@@ -5719,15 +5719,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_138",
-      "text": "完成一次考试1"
+      "text": "梅林的试炼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_138",
-      "text": "完成一次考试1"
+      "text": "梅林的试炼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_138",
-      "text": "完成一次考试1"
+      "text": "梅林的试炼"
     },
     "get_item": [],
     "trigger": 0,
@@ -5772,15 +5772,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_139",
-      "text": "完成一次考试2"
+      "text": "梅林的试炼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_139",
-      "text": "完成一次考试2"
+      "text": "梅林的试炼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_139",
-      "text": "完成一次考试2"
+      "text": "梅林的试炼"
     },
     "get_item": [],
     "trigger": 0,
@@ -5825,15 +5825,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_140",
-      "text": "完成一次考试3"
+      "text": "梅林的试炼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_140",
-      "text": "完成一次考试3"
+      "text": "梅林的试炼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_140",
-      "text": "完成一次考试3"
+      "text": "梅林的试炼"
     },
     "get_item": [],
     "trigger": 0,
@@ -5878,15 +5878,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_141",
-      "text": "完成一次考试4"
+      "text": "梅林的试炼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_141",
-      "text": "完成一次考试4"
+      "text": "梅林的试炼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_141",
-      "text": "完成一次考试4"
+      "text": "梅林的试炼"
     },
     "get_item": [],
     "trigger": 0,
@@ -5931,15 +5931,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_142",
-      "text": "完成一次考试5"
+      "text": "梅林的试炼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_142",
-      "text": "完成一次考试5"
+      "text": "梅林的试炼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_142",
-      "text": "完成一次考试5"
+      "text": "梅林的试炼"
     },
     "get_item": [],
     "trigger": 0,
@@ -5984,15 +5984,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_143",
-      "text": "完成一次考试6"
+      "text": "梅林的试炼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_143",
-      "text": "完成一次考试6"
+      "text": "梅林的试炼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_143",
-      "text": "完成一次考试6"
+      "text": "梅林的试炼"
     },
     "get_item": [],
     "trigger": 0,
@@ -6037,15 +6037,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_144",
-      "text": "完成一次考试7"
+      "text": "梅林的试炼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_144",
-      "text": "完成一次考试7"
+      "text": "梅林的试炼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_144",
-      "text": "完成一次考试7"
+      "text": "梅林的试炼"
     },
     "get_item": [],
     "trigger": 0,
@@ -6090,15 +6090,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_145",
-      "text": "烤乳猪1"
+      "text": "贫嘴驴的烦恼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_145",
-      "text": "烤乳猪1"
+      "text": "贫嘴驴的烦恼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_145",
-      "text": "烤乳猪1"
+      "text": "贫嘴驴的烦恼"
     },
     "get_item": [],
     "trigger": 0,
@@ -6143,15 +6143,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_146",
-      "text": "烤乳猪2"
+      "text": "亚丝翠的烦恼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_146",
-      "text": "烤乳猪2"
+      "text": "亚丝翠的烦恼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_146",
-      "text": "烤乳猪2"
+      "text": "亚丝翠的烦恼"
     },
     "get_item": [],
     "trigger": 0,
@@ -6196,15 +6196,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_147",
-      "text": "烤乳猪3"
+      "text": "姜饼人的烦恼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_147",
-      "text": "烤乳猪3"
+      "text": "姜饼人的烦恼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_147",
-      "text": "烤乳猪3"
+      "text": "姜饼人的烦恼"
     },
     "get_item": [],
     "trigger": 0,
@@ -6249,15 +6249,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_148",
-      "text": "烤乳猪4"
+      "text": "平先生的烦恼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_148",
-      "text": "烤乳猪4"
+      "text": "平先生的烦恼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_148",
-      "text": "烤乳猪4"
+      "text": "平先生的烦恼"
     },
     "get_item": [],
     "trigger": 0,
@@ -6302,15 +6302,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_149",
-      "text": "烤乳猪5"
+      "text": "匹诺曹的烦恼"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_149",
-      "text": "烤乳猪5"
+      "text": "匹诺曹的烦恼"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_149",
-      "text": "烤乳猪5"
+      "text": "匹诺曹的烦恼"
     },
     "get_item": [],
     "trigger": 0,
@@ -6355,15 +6355,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_150",
-      "text": "寻找所有宝箱1"
+      "text": "波比的失物找回"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_150",
-      "text": "寻找所有宝箱1"
+      "text": "波比的失物找回"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_150",
-      "text": "寻找所有宝箱1"
+      "text": "波比的失物找回"
     },
     "get_item": [],
     "trigger": 1,
@@ -6408,15 +6408,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_151",
-      "text": "寻找所有宝箱2"
+      "text": "希卡普的失物找回"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_151",
-      "text": "寻找所有宝箱2"
+      "text": "希卡普的失物找回"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_151",
-      "text": "寻找所有宝箱2"
+      "text": "希卡普的失物找回"
     },
     "get_item": [],
     "trigger": 1,
@@ -6461,15 +6461,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_152",
-      "text": "寻找所有宝箱3"
+      "text": "菲欧娜的失物找回"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_152",
-      "text": "寻找所有宝箱3"
+      "text": "菲欧娜的失物找回"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_152",
-      "text": "寻找所有宝箱3"
+      "text": "菲欧娜的失物找回"
     },
     "get_item": [],
     "trigger": 1,
@@ -6514,15 +6514,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_153",
-      "text": "寻找所有宝箱4"
+      "text": "戈伯的失物找回"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_153",
-      "text": "寻找所有宝箱4"
+      "text": "戈伯的失物找回"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_153",
-      "text": "寻找所有宝箱4"
+      "text": "戈伯的失物找回"
     },
     "get_item": [],
     "trigger": 1,
@@ -6567,15 +6567,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_154",
-      "text": "寻找所有宝箱5"
+      "text": "阿比盖尔的失物找回"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_154",
-      "text": "寻找所有宝箱5"
+      "text": "阿比盖尔的失物找回"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_154",
-      "text": "寻找所有宝箱5"
+      "text": "阿比盖尔的失物找回"
     },
     "get_item": [],
     "trigger": 1,
@@ -6938,15 +6938,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_161",
-      "text": "检查所有可疑点1"
+      "text": "邦尼兔的请求"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_161",
-      "text": "检查所有可疑点1"
+      "text": "邦尼兔的请求"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_161",
-      "text": "检查所有可疑点1"
+      "text": "邦尼兔的请求"
     },
     "get_item": [],
     "trigger": 0,
@@ -6991,15 +6991,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_162",
-      "text": "检查所有可疑点2"
+      "text": "菲欧娜的请求"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_162",
-      "text": "检查所有可疑点2"
+      "text": "菲欧娜的请求"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_162",
-      "text": "检查所有可疑点2"
+      "text": "菲欧娜的请求"
     },
     "get_item": [],
     "trigger": 0,
@@ -7044,15 +7044,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_163",
-      "text": "检查所有可疑点3"
+      "text": "戈伯的请求"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_163",
-      "text": "检查所有可疑点3"
+      "text": "戈伯的请求"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_163",
-      "text": "检查所有可疑点3"
+      "text": "戈伯的请求"
     },
     "get_item": [],
     "trigger": 0,
@@ -7097,15 +7097,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_164",
-      "text": "检查所有可疑点4"
+      "text": "平先生的请求"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_164",
-      "text": "检查所有可疑点4"
+      "text": "平先生的请求"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_164",
-      "text": "检查所有可疑点4"
+      "text": "平先生的请求"
     },
     "get_item": [],
     "trigger": 0,
@@ -7150,15 +7150,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_165",
-      "text": "检查所有可疑点5"
+      "text": "骇客蛛的请求"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_165",
-      "text": "检查所有可疑点5"
+      "text": "骇客蛛的请求"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_165",
-      "text": "检查所有可疑点5"
+      "text": "骇客蛛的请求"
     },
     "get_item": [],
     "trigger": 0,
@@ -7203,15 +7203,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_166",
-      "text": "1号连环第1个"
+      "text": "阿宝的心事"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_166",
-      "text": "1号连环第1个"
+      "text": "阿宝的心事"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_166",
-      "text": "1号连环第1个"
+      "text": "阿宝的心事"
     },
     "get_item": [],
     "trigger": 0,
@@ -7249,22 +7249,22 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 100290,
-    "id_after": 100310,
+    "id_after": 0,
     "group": 1290,
     "exgroup": 110,
     "des": 1,
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_167",
-      "text": "1号连环第2个"
+      "text": "寻找平先生"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_167",
-      "text": "1号连环第2个"
+      "text": "寻找平先生"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_167",
-      "text": "1号连环第2个"
+      "text": "寻找平先生"
     },
     "get_item": [],
     "trigger": 0,
@@ -7296,59 +7296,6 @@
     ],
     "module": []
   },
-  {
-    "key": 100310,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 100300,
-    "id_after": 0,
-    "group": 1290,
-    "exgroup": 110,
-    "des": 1,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_168",
-      "text": "1号连环第3个"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_168",
-      "text": "1号连环第3个"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_168",
-      "text": "1号连环第3个"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 60310,
-    "completetask": [
-      50000041
-    ],
-    "deliver_npc": 60318,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 1,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 5000
-      },
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      }
-    ],
-    "module": []
-  },
   {
     "key": 100320,
     "opencond": "",
@@ -7362,15 +7309,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_169",
-      "text": "2号连环第1个"
+      "text": "阿宝的想法"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_169",
-      "text": "2号连环第1个"
+      "text": "阿宝的想法"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_169",
-      "text": "2号连环第1个"
+      "text": "阿宝的想法"
     },
     "get_item": [],
     "trigger": 0,
@@ -7408,22 +7355,22 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 100320,
-    "id_after": 100340,
+    "id_after": 0,
     "group": 1300,
     "exgroup": 110,
     "des": 1,
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_170",
-      "text": "2号连环第2个"
+      "text": "寻找金猴"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_170",
-      "text": "2号连环第2个"
+      "text": "寻找金猴"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_170",
-      "text": "2号连环第2个"
+      "text": "寻找金猴"
     },
     "get_item": [],
     "trigger": 0,
@@ -7455,59 +7402,6 @@
     ],
     "module": []
   },
-  {
-    "key": 100340,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 100330,
-    "id_after": 0,
-    "group": 1300,
-    "exgroup": 110,
-    "des": 1,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_171",
-      "text": "2号连环第3个"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_171",
-      "text": "2号连环第3个"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_171",
-      "text": "2号连环第3个"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 60340,
-    "completetask": [
-      50000044
-    ],
-    "deliver_npc": 60348,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 1,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 5000
-      },
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      }
-    ],
-    "module": []
-  },
   {
     "key": 100350,
     "opencond": "",
@@ -7521,15 +7415,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_172",
-      "text": "3号连环第1个"
+      "text": "菲欧娜的心事"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_172",
-      "text": "3号连环第1个"
+      "text": "菲欧娜的心事"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_172",
-      "text": "3号连环第1个"
+      "text": "菲欧娜的心事"
     },
     "get_item": [],
     "trigger": 0,
@@ -7567,22 +7461,22 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 100350,
-    "id_after": 100370,
+    "id_after": 0,
     "group": 1310,
     "exgroup": 110,
     "des": 1,
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_173",
-      "text": "3号连环第2个"
+      "text": "寻找姜饼人"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_173",
-      "text": "3号连环第2个"
+      "text": "寻找姜饼人"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_173",
-      "text": "3号连环第2个"
+      "text": "寻找姜饼人"
     },
     "get_item": [],
     "trigger": 0,
@@ -7614,81 +7508,28 @@
     ],
     "module": []
   },
-  {
-    "key": 100370,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 100360,
-    "id_after": 0,
-    "group": 1310,
-    "exgroup": 110,
-    "des": 1,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_174",
-      "text": "3号连环第3个"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_174",
-      "text": "3号连环第3个"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_174",
-      "text": "3号连环第3个"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 60370,
-    "completetask": [
-      50000047
-    ],
-    "deliver_npc": 60378,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 1,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 5000
-      },
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      }
-    ],
-    "module": []
-  },
   {
     "key": 100380,
     "opencond": "",
     "lock": 1,
     "lockend": 999,
     "ontxe": 0,
-    "id_after": 100390,
+    "id_after": 0,
     "group": 1320,
     "exgroup": 110,
     "des": 1,
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_175",
-      "text": "4号连环第1个"
+      "text": "黛安狐的心事"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_175",
-      "text": "4号连环第1个"
+      "text": "黛安狐的心事"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_175",
-      "text": "4号连环第1个"
+      "text": "黛安狐的心事"
     },
     "get_item": [],
     "trigger": 0,
@@ -7720,112 +7561,6 @@
     ],
     "module": []
   },
-  {
-    "key": 100390,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 100380,
-    "id_after": 100400,
-    "group": 1320,
-    "exgroup": 110,
-    "des": 1,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_176",
-      "text": "4号连环第2个"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_176",
-      "text": "4号连环第2个"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_176",
-      "text": "4号连环第2个"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 60390,
-    "completetask": [
-      50000049
-    ],
-    "deliver_npc": 60398,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 1,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 5000
-      },
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 100400,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 100390,
-    "id_after": 0,
-    "group": 1320,
-    "exgroup": 110,
-    "des": 1,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_177",
-      "text": "4号连环第3个"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_177",
-      "text": "4号连环第3个"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_177",
-      "text": "4号连环第3个"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 60400,
-    "completetask": [
-      50000050
-    ],
-    "deliver_npc": 60408,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 1,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 5000
-      },
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      }
-    ],
-    "module": []
-  },
   {
     "key": 100410,
     "opencond": "",
@@ -7839,15 +7574,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_178",
-      "text": "5号连环第1个"
+      "text": "菲欧娜有事相求"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_178",
-      "text": "5号连环第1个"
+      "text": "菲欧娜有事相求"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_178",
-      "text": "5号连环第1个"
+      "text": "菲欧娜有事相求"
     },
     "get_item": [],
     "trigger": 0,
@@ -7885,22 +7620,22 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 100410,
-    "id_after": 100430,
+    "id_after": 0,
     "group": 1330,
     "exgroup": 110,
     "des": 1,
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_179",
-      "text": "5号连环第2个"
+      "text": "去看看靴子猫"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_179",
-      "text": "5号连环第2个"
+      "text": "去看看靴子猫"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_179",
-      "text": "5号连环第2个"
+      "text": "去看看靴子猫"
     },
     "get_item": [],
     "trigger": 0,
@@ -7931,58 +7666,5 @@
       }
     ],
     "module": []
-  },
-  {
-    "key": 100430,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 100420,
-    "id_after": 0,
-    "group": 1330,
-    "exgroup": 110,
-    "des": 1,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_180",
-      "text": "5号连环第3个"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_180",
-      "text": "5号连环第3个"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_180",
-      "text": "5号连环第3个"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 60430,
-    "completetask": [
-      50000053
-    ],
-    "deliver_npc": 60438,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 1,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 5000
-      },
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      }
-    ],
-    "module": []
   }
 ]

modules/mainline/api_shop.go

@@ -18,6 +18,7 @@ func (this *apiComp) Shop(session comm.IUserSession, req *pb.MainlineShopReq) (e
 		err      error
 		shopinfo []*cfg.GameMainShopItemData
 		condiIds []int32
+		bchange  bool
 	)
 	errdata = this.ShopCheck(session, req)
 	if errdata != nil {
@@ -41,14 +42,17 @@ func (this *apiComp) Shop(session comm.IUserSession, req *pb.MainlineShopReq) (e
 	if data, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err == nil {
 		for pos, v := range data {
 			if int32(v.State) == 1 { // 记录解锁的数据
-				shopid := shopinfo[pos].Shopid
+				key := shopinfo[pos].Key
-				if _, ok := info.Unlock[shopid]; !ok {
+				if _, ok := info.Unlock[key]; !ok {
-					info.Unlock[shopid] = 1
+					info.Unlock[key] = 1
+					bchange = true
 				}
 			}
 		}
 	}
-	this.module.modelShop.updateMainlineShopData(session.GetUserId(), info)
+	if bchange {
+		this.module.modelShop.updateMainlineShopData(session.GetUserId(), info)
+	}
 	session.SendMsg(string(this.module.GetType()), "shop", &pb.MainlineShopResp{
 		Info: info,
 	})

modules/mainline/module.go

@@ -169,11 +169,11 @@ func (this *Mainline) BuriedsNotify(session comm.IUserSession, conds []*pb.ConIP
 
 		info.Unlock = make(map[int32]int32)
 		for _, v1 := range shopinfo {
-			if _, ok := info.Unlock[v1.Id]; !ok {
+			if _, ok := info.Unlock[v1.Key]; !ok {
 				for _, v := range conds {
 					if int32(v.State) == 1 && v.Conid == v1.Unlock { // 记录解锁的数据
-						info.Unlock[v1.Id] = 1
+						info.Unlock[v1.Key] = 1
-						szChange = append(szChange, v1.Id)
+						szChange = append(szChange, v1.Key)
 					}
 				}
 			}

modules/robot/configure.go

@@ -1,12 +1,14 @@
 package robot
 
 import (
+	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/core/cbase"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
+	"sync"
 )
 
 const (
@@ -24,11 +26,14 @@ const (
 	// gamesearchitembox   = "game_searchitembox.json"
 	// game_worlddeal      = "game_worlddeal.json"
 	// game_worldrd        = "game_worldrd.json"
+	game_pagoda = "game_pagoda.json"
 )
 
 type configureComp struct {
 	cbase.ModuleCompBase
-	module *RobotModule
+	module     *RobotModule
+	hlock      sync.RWMutex
+	_mapPagoda map[int32]*cfg.GamePagodaData
 }
 
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
@@ -40,6 +45,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	configure.RegisterConfigure(game_mainstage, cfg.NewGameMainStage, nil)
 	configure.RegisterConfigure(game_equip, cfg.NewGameEquip, nil)
 	configure.RegisterConfigure(game_equipintensify, cfg.NewGameEquipIntensify, nil)
+	configure.RegisterConfigure(game_pagoda, cfg.NewGamePagoda, this.LoadPagoda)
 	return
 }
 
@@ -80,3 +86,26 @@ func (this *configureComp) getGameWorldBattleData(confId int32) (conf *cfg.GameW
 	}
 	return
 }
+func (this *configureComp) LoadPagoda() {
+	if v, err := configure.GetConfigure(game_pagoda); err == nil {
+		if configure, ok := v.(*cfg.GamePagoda); ok {
+			this.hlock.Lock()
+			defer this.hlock.Unlock()
+			this._mapPagoda = make(map[int32]*cfg.GamePagodaData)
+			for _, value := range configure.GetDataList() {
+				key := value.Tab<<16 + value.LayerNum
+				this._mapPagoda[key] = value
+			}
+			return
+		}
+	}
+	return
+}
+
+func (this *configureComp) GetPagodaConfBytab(tab int32, ly int32) (data *cfg.GamePagoda, err error) {
+	if _, ok := this._mapPagoda[tab<<16+ly]; ok {
+		return
+	}
+	err = comm.NewNotFoundConfErr("pagoda", game_pagoda, fmt.Errorf("tab %d ,ly %d not found", tab, ly))
+	return
+}

modules/robot/modulerobot_mainline.go

@@ -87,9 +87,10 @@ func (this *ModuleRobot_MainLine) DoTask(robot IRobot, taskconf *cfg.GameWorldTa
 			)
 			heromodule = robot.GetModule(comm.ModuleHero).(*ModuleRobot_Hero)
 			heros = heromodule.getbattlehero()
-			if resp, errdata = robot.SendTaskMessage(taskconf.Key, condconf.Id, "mainline", "challenge", &pb.MainlineChallengeReq{Level: conf.Id, Battle: &pb.BattleFormation{
+			if resp, errdata = robot.SendTaskMessage(taskconf.Key, condconf.Id, "mainline", "challenge",
-				Format: heros,
+				&pb.MainlineChallengeReq{Level: conf.Id, Battle: &pb.BattleFormation{
-			}}); errdata != nil {
+					Format: heros,
+				}}); errdata != nil {
 				err = errors.New(errdata.Message)
 				return
 			}

modules/robot/modulerobot_pagoda.go

@@ -2,8 +2,10 @@ package robot
 
 import (
 	"errors"
+	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 
 	"google.golang.org/protobuf/proto"
@@ -21,10 +23,6 @@ func (this *ModuleRobot_Pagoda) Init() (err error) {
 //接收到消息
 func (this *ModuleRobot_Pagoda) Receive(robot IRobot, stype string, message proto.Message) (err error) {
 	switch stype {
-	case "challengeover":
-		//resp := message.(*pb.PagodaChallengeOverResp)
-
-		break
 	case "getlist":
 		resp := message.(*pb.PagodaGetListResp)
 		this.pagoda = resp.Data
@@ -43,19 +41,7 @@ func (this *ModuleRobot_Pagoda) DoPipeline(robot IRobot) (err error) {
 		err = errors.New(errdata.Message)
 		return
 	}
-	//创角
-	if _, errdata = robot.SendMessage("pagoda", "challengeover", &pb.PagodaChallengeOverReq{
-		Cid:    1,
-		Report: &pb.BattleReport{},
-	}); errdata != nil {
-		if errdata.Code == pb.ErrorCode_RoleCreated { //已创角
-			err = nil
-		} else {
-			err = errors.New(errdata.Message)
-		}
 
-		return
-	}
 	return
 }
 
@@ -74,6 +60,9 @@ func (this *ModuleRobot_Pagoda) DoTask(robot IRobot, taskconf *cfg.GameWorldTask
 			heros      []string
 			resp       proto.Message
 		)
+		if conf, err = this.getPagodaData(condconf.Filter[0], this.pagoda.Data[condconf.Filter[0]]+1); err != nil { // 参数有误
+			return
+		}
 		heromodule = robot.GetModule(comm.ModuleHero).(*ModuleRobot_Hero)
 		heros = heromodule.getbattlehero()
 		if resp, errdata = robot.SendTaskMessage(taskconf.Key, condconf.Id, "pagoda", "challenge", &pb.PagodaChallengeReq{
@@ -97,3 +86,21 @@ func (this *ModuleRobot_Pagoda) DoTask(robot IRobot, taskconf *cfg.GameWorldTask
 	}
 	return
 }
+
+// 获取爬塔的配置
+func (this *ModuleRobot_Pagoda) getPagodaData(tab int32, lv int32) (conf *cfg.GamePagodaData, err error) {
+	var (
+		v interface{}
+	)
+	if v, err = configure.GetConfigure(game_pagoda); err != nil {
+		return
+	} else {
+		for _, conf = range v.(*cfg.GamePagoda).GetDataList() {
+			if conf.Tab == tab && conf.LayerNum == lv {
+				return
+			}
+		}
+	}
+	err = comm.NewNotFoundConfErr("robot", game_buriedcondi, fmt.Sprintf("tab:%d,lv:%d", tab, lv))
+	return
+}

sys/configure/structs/Game.MainShopItemData.go

@@ -13,7 +13,6 @@ import "errors"
 type GameMainShopItemData struct {
     Key int32
     Shopid int32
-    Id int32
     Itemsell []*Gameatn
     Need []*Gameatn
     Bugtime int32
@@ -29,7 +28,6 @@ func (*GameMainShopItemData) GetTypeId() int32 {
 func (_v *GameMainShopItemData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["shopid"].(float64); !_ok_ { err = errors.New("shopid error"); return }; _v.Shopid = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool

sys/configure/structs/game.skillBuffData.go

@@ -27,6 +27,7 @@ type GameSkillBuffData struct {
     OverlayTimes byte
     SameID bool
     Golbalbufficon string
+    ForbidFloat int32
     BuffIcon string
     Buffeffect string
     Buffpos string
@@ -107,6 +108,7 @@ func (_v *GameSkillBuffData)Deserialize(_buf map[string]interface{}) (err error)
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["OverlayTimes"].(float64); !_ok_ { err = errors.New("OverlayTimes error"); return }; _v.OverlayTimes = byte(_tempNum_) }
     { var _ok_ bool; if _v.SameID, _ok_ = _buf["SameID"].(bool); !_ok_ { err = errors.New("SameID error"); return } }
     { var _ok_ bool; if _v.Golbalbufficon, _ok_ = _buf["golbalbufficon"].(string); !_ok_ { err = errors.New("golbalbufficon error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["forbidFloat"].(float64); !_ok_ { err = errors.New("forbidFloat error"); return }; _v.ForbidFloat = int32(_tempNum_) }
     { var _ok_ bool; if _v.BuffIcon, _ok_ = _buf["buffIcon"].(string); !_ok_ { err = errors.New("buffIcon error"); return } }
     { var _ok_ bool; if _v.Buffeffect, _ok_ = _buf["buffeffect"].(string); !_ok_ { err = errors.New("buffeffect error"); return } }
     { var _ok_ bool; if _v.Buffpos, _ok_ = _buf["buffpos"].(string); !_ok_ { err = errors.New("buffpos error"); return } }