From 5d2edfd33b3340e188eb73e161bbf375304a167e Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Tue, 8 Aug 2023 15:43:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=89=A7=E6=83=85=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_coin.json | 22 + bin/json/game_global.json | 3 +- bin/json/game_heroupstorychapter.json | 34 +- bin/json/game_item.json | 135 +++++- bin/json/game_lottery.json | 272 +++++------ bin/json/game_shopcentercontrol.json | 136 +++--- bin/json/game_shopcentersubmeter.json | 432 +++++++++++++++--- modules/storyline/api_Info.go | 2 +- modules/storyline/api_complete.go | 35 +- modules/storyline/api_turnon.go | 84 ++++ modules/storyline/configure.go | 18 +- pb/storyline_db.pb.go | 6 +- pb/storyline_msg.pb.go | 272 ++++++++--- .../structs/Game.HeroupstoryChapterData.go | 17 +- .../structs/Game.ShopCenterControlData.go | 4 + .../structs/Game.ShopCenterSubmeterData.go | 4 + sys/configure/structs/game.globalData.go | 2 + 17 files changed, 1097 insertions(+), 381 deletions(-) create mode 100644 modules/storyline/api_turnon.go diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index ca0fedeef..de06924f5 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -328,5 +328,27 @@ "key": "item_coin_intr2_15", "text": "“多么精致的东西啊！人类居然把这么美丽的东西扔进垃圾桶里。“一位不愿透露姓名的巨怪说道。" } + }, + { + "key": "integral", + "keyint": 16, + "name": { + "key": "item_coin_name_16", + "text": "充值积分" + }, + "color": 5, + "effects": "", + "access": [ + 158 + ], + "img": "attr_integral", + "intr": { + "key": "item_coin_intr_16", + "text": "用于在巨怪商队内进行消费的货币。巨怪们并不会使用常规意义的黄金宝石之类的货币，反倒是小型又量产的人类工艺品更受他们青睐。" + }, + "intr2": { + "key": "item_coin_intr2_16", + "text": "“多么精致的东西啊！人类居然把这么美丽的东西扔进垃圾桶里。“一位不愿透露姓名的巨怪说道。" + } } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 9ea75576d..64e89e3d8 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -801,6 +801,7 @@ 50 ], "venturegifts_draw": "23000001", - "gift_buy": 1002 + "gift_buy": 1002, + "herostorycd": 48 } ] \ No newline at end of file diff --git a/bin/json/game_heroupstorychapter.json b/bin/json/game_heroupstorychapter.json index 0901828c9..027a808e5 100644 --- a/bin/json/game_heroupstorychapter.json +++ b/bin/json/game_heroupstorychapter.json @@ -4,7 +4,7 @@ "hero": 25001, "chapter": 1001, "onlevel": 0, - "onlevelstory": 0, + "onlevelstory": [], "level": 101, "levellink": [ 102 @@ -33,7 +33,7 @@ "hero": 25001, "chapter": 1001, "onlevel": 1, - "onlevelstory": 0, + "onlevelstory": [], "level": 102, "levellink": [ 101, @@ -64,7 +64,7 @@ "hero": 25001, "chapter": 1001, "onlevel": 2, - "onlevelstory": 0, + "onlevelstory": [], "level": 103, "levellink": [ 102, @@ -94,7 +94,7 @@ "hero": 25001, "chapter": 1001, "onlevel": 3, - "onlevelstory": 0, + "onlevelstory": [], "level": 104, "levellink": [ 102, @@ -118,7 +118,7 @@ "hero": 25001, "chapter": 1001, "onlevel": 4, - "onlevelstory": 0, + "onlevelstory": [], "level": 105, "levellink": [ 104 @@ -147,7 +147,7 @@ "hero": 25001, "chapter": 1002, "onlevel": 5, - "onlevelstory": 0, + "onlevelstory": [], "level": 101, "levellink": [ 102 @@ -176,7 +176,7 @@ "hero": 25001, "chapter": 1002, "onlevel": 6, - "onlevelstory": 0, + "onlevelstory": [], "level": 102, "levellink": [ 101, @@ -207,7 +207,7 @@ "hero": 25001, "chapter": 1002, "onlevel": 7, - "onlevelstory": 0, + "onlevelstory": [], "level": 103, "levellink": [ 102, @@ -237,7 +237,7 @@ "hero": 25001, "chapter": 1002, "onlevel": 8, - "onlevelstory": 0, + "onlevelstory": [], "level": 104, "levellink": [ 102, @@ -261,7 +261,7 @@ "hero": 25001, "chapter": 1002, "onlevel": 9, - "onlevelstory": 0, + "onlevelstory": [], "level": 105, "levellink": [ 104 @@ -290,7 +290,7 @@ "hero": 25001, "chapter": 1003, "onlevel": 10, - "onlevelstory": 0, + "onlevelstory": [], "level": 101, "levellink": [ 102 @@ -319,7 +319,7 @@ "hero": 25001, "chapter": 1003, "onlevel": 11, - "onlevelstory": 0, + "onlevelstory": [], "level": 102, "levellink": [ 101, @@ -350,7 +350,7 @@ "hero": 25001, "chapter": 1003, "onlevel": 12, - "onlevelstory": 0, + "onlevelstory": [], "level": 103, "levellink": [ 102, @@ -380,7 +380,7 @@ "hero": 25001, "chapter": 1003, "onlevel": 13, - "onlevelstory": 0, + "onlevelstory": [], "level": 104, "levellink": [ 102, @@ -410,7 +410,7 @@ "hero": 25001, "chapter": 1003, "onlevel": 14, - "onlevelstory": 0, + "onlevelstory": [], "level": 105, "levellink": [ 104 @@ -439,7 +439,7 @@ "hero": 25001, "chapter": 1004, "onlevel": 15, - "onlevelstory": 0, + "onlevelstory": [], "level": 101, "levellink": [ 102 @@ -468,7 +468,7 @@ "hero": 25001, "chapter": 1004, "onlevel": 16, - "onlevelstory": 0, + "onlevelstory": [], "level": 102, "levellink": [ 101 diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 97810e592..80da55d4c 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -16886,9 +16886,132 @@ ] }, { - "id": "10000039", + "id": "23000002", "name": { "key": "item_item_name_386", + "text": "拼图碎片" + }, + "usetype": 2, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 9999, + "img": "wp_icon_jjcq", + "intr": { + "key": "item_item_intr_395", + "text": "可用于拼图游戏中完成拼图游戏" + }, + "describe": { + "key": "", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ] + }, + { + "id": "23000003", + "name": { + "key": "item_item_name_387", + "text": "云朵固化剂" + }, + "usetype": 2, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 9999, + "img": "wp_icon_jjcq", + "intr": { + "key": "item_item_intr_396", + "text": "可用于云上行走游戏中" + }, + "describe": { + "key": "", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": "23000004", + "name": { + "key": "item_item_name_388", + "text": "挖掘次数" + }, + "usetype": 2, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 9999, + "img": "wp_icon_jjcq", + "intr": { + "key": "item_item_intr_397", + "text": "可用于黄金矿工游戏中" + }, + "describe": { + "key": "", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": "10000039", + "name": { + "key": "item_item_name_389", "text": "石阵秘境宝箱钥匙" }, "usetype": 1, @@ -16911,7 +17034,7 @@ "upper_limit": 999, "img": "item_10000035", "intr": { - "key": "item_item_intr_395", + "key": "item_item_intr_398", "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。" }, "describe": { @@ -16929,7 +17052,7 @@ { "id": "17110001", "name": { - "key": "item_item_name_387", + "key": "item_item_name_390", "text": "3种族招募卡自选箱" }, "usetype": 4, @@ -16952,7 +17075,7 @@ "upper_limit": 999, "img": "", "intr": { - "key": "item_item_intr_396", + "key": "item_item_intr_399", "text": "可以从中自由选择3种阵营招募卷的宝箱" }, "describe": { @@ -16970,7 +17093,7 @@ { "id": "17040001", "name": { - "key": "item_item_name_388", + "key": "item_item_name_391", "text": "4星无极套装宝箱" }, "usetype": 5, @@ -16995,7 +17118,7 @@ "upper_limit": 99, "img": "item_17030001", "intr": { - "key": "item_item_intr_397", + "key": "item_item_intr_400", "text": "开启后，可以获得一套4星装备。" }, "describe": { diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json index 58e1e4e50..47130bbd1 100644 --- a/bin/json/game_lottery.json +++ b/bin/json/game_lottery.json @@ -1023,8 +1023,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 27, - "max": 27, + "min": 24, + "max": 24, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1071,8 +1071,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 32, - "max": 32, + "min": 29, + "max": 29, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1119,8 +1119,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 18, - "max": 18, + "min": 13, + "max": 13, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1191,8 +1191,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 21, - "max": 21, + "min": 16, + "max": 16, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1263,8 +1263,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 26, - "max": 26, + "min": 17, + "max": 17, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1335,8 +1335,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 31, - "max": 31, + "min": 18, + "max": 18, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1407,8 +1407,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 15, - "max": 15, + "min": 16, + "max": 16, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1455,8 +1455,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 4, - "max": 4, + "min": 3, + "max": 3, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1551,8 +1551,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 5, - "max": 5, + "min": 4, + "max": 4, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1599,8 +1599,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 13, - "max": 13, + "min": 11, + "max": 11, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1647,8 +1647,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 6, - "max": 6, + "min": 5, + "max": 5, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1695,8 +1695,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 16, - "max": 16, + "min": 13, + "max": 13, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1743,8 +1743,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 7, - "max": 7, + "min": 6, + "max": 6, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1791,8 +1791,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 17, - "max": 17, + "min": 15, + "max": 15, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1839,8 +1839,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 8, - "max": 8, + "min": 7, + "max": 7, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1887,8 +1887,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 16, - "max": 16, + "min": 18, + "max": 18, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1935,8 +1935,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 10, - "max": 10, + "min": 8, + "max": 8, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -1983,8 +1983,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 27, - "max": 27, + "min": 24, + "max": 24, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2031,8 +2031,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 32, - "max": 32, + "min": 29, + "max": 29, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2079,8 +2079,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 18, - "max": 18, + "min": 13, + "max": 13, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2151,8 +2151,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 21, - "max": 21, + "min": 16, + "max": 16, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2223,8 +2223,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 26, - "max": 26, + "min": 17, + "max": 17, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2295,8 +2295,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 31, - "max": 31, + "min": 18, + "max": 18, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2367,8 +2367,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 15, - "max": 15, + "min": 16, + "max": 16, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2415,8 +2415,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 4, - "max": 4, + "min": 3, + "max": 3, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2511,8 +2511,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 5, - "max": 5, + "min": 4, + "max": 4, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2559,8 +2559,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 13, - "max": 13, + "min": 11, + "max": 11, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2607,8 +2607,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 6, - "max": 6, + "min": 5, + "max": 5, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2655,8 +2655,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 16, - "max": 16, + "min": 13, + "max": 13, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2703,8 +2703,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 7, - "max": 7, + "min": 6, + "max": 6, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2751,8 +2751,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 17, - "max": 17, + "min": 15, + "max": 15, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2799,8 +2799,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 8, - "max": 8, + "min": 7, + "max": 7, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2847,8 +2847,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 16, - "max": 16, + "min": 18, + "max": 18, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2895,8 +2895,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 10, - "max": 10, + "min": 8, + "max": 8, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2943,8 +2943,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 27, - "max": 27, + "min": 24, + "max": 24, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -2991,8 +2991,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 32, - "max": 32, + "min": 29, + "max": 29, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3039,8 +3039,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 18, - "max": 18, + "min": 13, + "max": 13, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3111,8 +3111,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 21, - "max": 21, + "min": 16, + "max": 16, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3183,8 +3183,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 26, - "max": 26, + "min": 17, + "max": 17, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3255,8 +3255,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 31, - "max": 31, + "min": 18, + "max": 18, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3327,8 +3327,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 15, - "max": 15, + "min": 16, + "max": 16, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3375,8 +3375,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 4, - "max": 4, + "min": 3, + "max": 3, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3471,8 +3471,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 5, - "max": 5, + "min": 4, + "max": 4, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3519,8 +3519,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 13, - "max": 13, + "min": 11, + "max": 11, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3567,8 +3567,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 6, - "max": 6, + "min": 5, + "max": 5, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3615,8 +3615,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 16, - "max": 16, + "min": 13, + "max": 13, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3663,8 +3663,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 7, - "max": 7, + "min": 6, + "max": 6, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3711,8 +3711,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 17, - "max": 17, + "min": 15, + "max": 15, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3759,8 +3759,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 8, - "max": 8, + "min": 7, + "max": 7, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3807,8 +3807,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 16, - "max": 16, + "min": 18, + "max": 18, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3855,8 +3855,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 10, - "max": 10, + "min": 8, + "max": 8, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3903,8 +3903,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 27, - "max": 27, + "min": 24, + "max": 24, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3951,8 +3951,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 32, - "max": 32, + "min": 29, + "max": 29, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -3999,8 +3999,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 18, - "max": 18, + "min": 13, + "max": 13, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4071,8 +4071,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 21, - "max": 21, + "min": 16, + "max": 16, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4143,8 +4143,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 26, - "max": 26, + "min": 17, + "max": 17, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4215,8 +4215,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 31, - "max": 31, + "min": 18, + "max": 18, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4287,8 +4287,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 15, - "max": 15, + "min": 16, + "max": 16, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4335,8 +4335,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 4, - "max": 4, + "min": 3, + "max": 3, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4431,8 +4431,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 5, - "max": 5, + "min": 4, + "max": 4, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4479,8 +4479,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 13, - "max": 13, + "min": 11, + "max": 11, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4527,8 +4527,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 6, - "max": 6, + "min": 5, + "max": 5, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4575,8 +4575,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 16, - "max": 16, + "min": 13, + "max": 13, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4623,8 +4623,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 7, - "max": 7, + "min": 6, + "max": 6, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4671,8 +4671,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 17, - "max": 17, + "min": 15, + "max": 15, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4719,8 +4719,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 8, - "max": 8, + "min": 7, + "max": 7, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4767,8 +4767,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 16, - "max": 16, + "min": 18, + "max": 18, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, @@ -4815,8 +4815,8 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 10, - "max": 10, + "min": 8, + "max": 8, "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, diff --git a/bin/json/game_shopcentercontrol.json b/bin/json/game_shopcentercontrol.json index ed734f7d5..dbb7b5931 100644 --- a/bin/json/game_shopcentercontrol.json +++ b/bin/json/game_shopcentercontrol.json @@ -1,15 +1,20 @@ [ { "id": 10001, + "pagetext": { + "key": "supermarket_overall_pagetext_1", + "text": "冒险基金" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3000% bonus!", + "key": "supermarket_overall_text_1", "text": "冒险基金-普通" }, "type": 1, "index": 1, + "banner": "hd_jj_pt", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3000% bonus!", - "text": "购买礼包并通关所有简单模式主线，总计可获得超值1200%奖励！" + "key": "supermarket_overall_slogan_1", + "text": "[color=#ffffff]购买礼包并通关所有简单模式主线[/color]
总计可获得超值[color=#2bb496][size=62]3000%[/size][/color]奖励！" }, "point": "passcheck_3", "props": [], @@ -23,14 +28,19 @@ }, { "id": 10002, + "pagetext": { + "key": "supermarket_overall_pagetext_2", + "text": "冒险基金" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3001% bonus!", + "key": "supermarket_overall_text_2", "text": "冒险基金-困难" }, "type": 1, "index": 2, + "banner": "hd_jj_kn", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3001% bonus!", + "key": "supermarket_overall_slogan_2", "text": "购买礼包并通关所有困难模式主线，总计可获得超值1200%奖励！" }, "point": "passcheck_4", @@ -45,14 +55,19 @@ }, { "id": 10003, + "pagetext": { + "key": "supermarket_overall_pagetext_3", + "text": "冒险基金" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3002% bonus!", + "key": "supermarket_overall_text_3", "text": "冒险基金-地狱" }, "type": 1, "index": 3, + "banner": "hd_jj_dy", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3002% bonus!", + "key": "supermarket_overall_slogan_3", "text": "购买礼包并通关所有地狱模式主线，总计可获得超值1200%奖励！" }, "point": "passcheck_5", @@ -67,14 +82,19 @@ }, { "id": 10004, + "pagetext": { + "key": "supermarket_overall_pagetext_4", + "text": "等级基金" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3003% bonus!", + "key": "supermarket_overall_text_4", "text": "等级基金" }, "type": 2, "index": 0, + "banner": "hd_jj_kn", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3003% bonus!", + "key": "supermarket_overall_slogan_4", "text": "购买礼包并达到相应的守护者等级，总计可获得超值1800%奖励！" }, "point": "passcheck_6", @@ -89,14 +109,19 @@ }, { "id": 10005, + "pagetext": { + "key": "supermarket_overall_pagetext_5", + "text": "限时基金-体力" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3004% bonus!", + "key": "supermarket_overall_text_5", "text": "限时基金-体力" }, "type": 3, "index": 0, + "banner": "hd_jj_dy", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3004% bonus!", + "key": "supermarket_overall_slogan_5", "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！" }, "point": "passcheck_7", @@ -111,14 +136,19 @@ }, { "id": 10006, + "pagetext": { + "key": "supermarket_overall_pagetext_6", + "text": "限时基金-招募" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3005% bonus!", + "key": "supermarket_overall_text_6", "text": "限时基金-招募" }, "type": 4, "index": 0, + "banner": "hd_jj_kn", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3005% bonus!", + "key": "supermarket_overall_slogan_6", "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！" }, "point": "passcheck_8", @@ -133,14 +163,19 @@ }, { "id": 10007, + "pagetext": { + "key": "supermarket_overall_pagetext_7", + "text": "限时基金-经验" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3006% bonus!", + "key": "supermarket_overall_text_7", "text": "限时基金-经验" }, "type": 5, "index": 0, + "banner": "hd_jj_pt", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3006% bonus!", + "key": "supermarket_overall_slogan_7", "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！" }, "point": "passcheck_9", @@ -155,14 +190,19 @@ }, { "id": 10008, + "pagetext": { + "key": "supermarket_overall_pagetext_8", + "text": "首充礼包" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3007% bonus!", + "key": "supermarket_overall_text_8", "text": "首充礼包1" }, "type": 6, "index": 1, + "banner": "hd_jj_pt", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3007% bonus!", + "key": "supermarket_overall_slogan_8", "text": "购买首充礼包，累计返利4888%" }, "point": "passcheck_10", @@ -183,14 +223,19 @@ }, { "id": 10009, + "pagetext": { + "key": "supermarket_overall_pagetext_9", + "text": "首充礼包" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3008% bonus!", + "key": "supermarket_overall_text_9", "text": "首充礼包2" }, "type": 6, "index": 2, + "banner": "hd_jj_kn", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3008% bonus!", + "key": "supermarket_overall_slogan_9", "text": "购买首充礼包，累计返利1688%" }, "point": "passcheck_11", @@ -211,14 +256,19 @@ }, { "id": 10010, + "pagetext": { + "key": "supermarket_overall_pagetext_10", + "text": "首充礼包" + }, "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3009% bonus!", + "key": "supermarket_overall_text_10", "text": "首充礼包3" }, "type": 6, "index": 3, + "banner": "hd_jj_dy", "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3009% bonus!", + "key": "supermarket_overall_slogan_10", "text": "购买首充礼包，累计返利1088%" }, "point": "passcheck_12", @@ -236,49 +286,5 @@ "times": 0, "duration": 0, "loop": 0 - }, - { - "id": 10011, - "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3010% bonus!", - "text": "限时礼包1" - }, - "type": 7, - "index": 1, - "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3008% bonus!", - "text": "超值返利1688%" - }, - "point": "passcheck_10", - "props": [], - "restriction": 1, - "lv": 1, - "on": 0, - "time": 0, - "times": 0, - "duration": 0, - "loop": 0 - }, - { - "id": 10012, - "text": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3011% bonus!", - "text": "限时礼包2" - }, - "type": 7, - "index": 2, - "slogan": { - "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3009% bonus!", - "text": "超值返利1688%" - }, - "point": "passcheck_11", - "props": [], - "restriction": 1, - "lv": 1, - "on": 0, - "time": 0, - "times": 0, - "duration": 0, - "loop": 0 } ] \ No newline at end of file diff --git a/bin/json/game_shopcentersubmeter.json b/bin/json/game_shopcentersubmeter.json index 7d22545c8..b3965f5c5 100644 --- a/bin/json/game_shopcentersubmeter.json +++ b/bin/json/game_shopcentersubmeter.json @@ -2,253 +2,541 @@ { "id": 100001, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 1 + "position": 1, + "title": { + "key": "supermarket_submeter_title_1", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_1", + "text": "通过冒险之旅某一关" + } }, { "id": 100002, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 2 + "position": 2, + "title": { + "key": "supermarket_submeter_title_2", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_2", + "text": "通过冒险之旅某一关" + } }, { "id": 100003, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 3 + "position": 3, + "title": { + "key": "supermarket_submeter_title_3", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_3", + "text": "通过冒险之旅某一关" + } }, { "id": 100004, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 4 + "position": 4, + "title": { + "key": "supermarket_submeter_title_4", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_4", + "text": "通过冒险之旅某一关" + } }, { "id": 100005, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 5 + "position": 5, + "title": { + "key": "supermarket_submeter_title_5", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_5", + "text": "通过冒险之旅某一关" + } }, { "id": 100006, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 6 + "position": 6, + "title": { + "key": "supermarket_submeter_title_6", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_6", + "text": "通过冒险之旅某一关" + } }, { "id": 100007, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 7 + "position": 7, + "title": { + "key": "supermarket_submeter_title_7", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_7", + "text": "通过冒险之旅某一关" + } }, { "id": 100008, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 8 + "position": 8, + "title": { + "key": "supermarket_submeter_title_8", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_8", + "text": "通过冒险之旅某一关" + } }, { "id": 100009, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 9 + "position": 9, + "title": { + "key": "supermarket_submeter_title_9", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_9", + "text": "通过冒险之旅某一关" + } }, { "id": 100010, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 10 + "position": 10, + "title": { + "key": "supermarket_submeter_title_10", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_10", + "text": "通过冒险之旅某一关" + } }, { "id": 100011, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 11 + "position": 11, + "title": { + "key": "supermarket_submeter_title_11", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_11", + "text": "通过冒险之旅某一关" + } }, { "id": 100012, "index": 1, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001001, - "position": 12 + "position": 12, + "title": { + "key": "supermarket_submeter_title_12", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_12", + "text": "通过冒险之旅某一关" + } }, { "id": 100013, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 1 + "position": 1, + "title": { + "key": "supermarket_submeter_title_13", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_13", + "text": "通过冒险之旅某一关" + } }, { "id": 100014, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 2 + "position": 2, + "title": { + "key": "supermarket_submeter_title_14", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_14", + "text": "通过冒险之旅某一关" + } }, { "id": 100015, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 3 + "position": 3, + "title": { + "key": "supermarket_submeter_title_15", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_15", + "text": "通过冒险之旅某一关" + } }, { "id": 100016, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 4 + "position": 4, + "title": { + "key": "supermarket_submeter_title_16", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_16", + "text": "通过冒险之旅某一关" + } }, { "id": 100017, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 5 + "position": 5, + "title": { + "key": "supermarket_submeter_title_17", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_17", + "text": "通过冒险之旅某一关" + } }, { "id": 100018, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 6 + "position": 6, + "title": { + "key": "supermarket_submeter_title_18", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_18", + "text": "通过冒险之旅某一关" + } }, { "id": 100019, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 7 + "position": 7, + "title": { + "key": "supermarket_submeter_title_19", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_19", + "text": "通过冒险之旅某一关" + } }, { "id": 100020, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 8 + "position": 8, + "title": { + "key": "supermarket_submeter_title_20", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_20", + "text": "通过冒险之旅某一关" + } }, { "id": 100021, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 9 + "position": 9, + "title": { + "key": "supermarket_submeter_title_21", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_21", + "text": "通过冒险之旅某一关" + } }, { "id": 100022, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 10 + "position": 10, + "title": { + "key": "supermarket_submeter_title_22", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_22", + "text": "通过冒险之旅某一关" + } }, { "id": 100023, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 11 + "position": 11, + "title": { + "key": "supermarket_submeter_title_23", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_23", + "text": "通过冒险之旅某一关" + } }, { "id": 100024, "index": 2, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001002, - "position": 12 + "position": 12, + "title": { + "key": "supermarket_submeter_title_24", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_24", + "text": "通过冒险之旅某一关" + } }, { "id": 100025, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 1 + "position": 1, + "title": { + "key": "supermarket_submeter_title_25", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_25", + "text": "通过冒险之旅某一关" + } }, { "id": 100026, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 2 + "position": 2, + "title": { + "key": "supermarket_submeter_title_26", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_26", + "text": "通过冒险之旅某一关" + } }, { "id": 100027, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 3 + "position": 3, + "title": { + "key": "supermarket_submeter_title_27", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_27", + "text": "通过冒险之旅某一关" + } }, { "id": 100028, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 4 + "position": 4, + "title": { + "key": "supermarket_submeter_title_28", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_28", + "text": "通过冒险之旅某一关" + } }, { "id": 100029, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 5 + "position": 5, + "title": { + "key": "supermarket_submeter_title_29", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_29", + "text": "通过冒险之旅某一关" + } }, { "id": 100030, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 6 + "position": 6, + "title": { + "key": "supermarket_submeter_title_30", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_30", + "text": "通过冒险之旅某一关" + } }, { "id": 100031, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 7 + "position": 7, + "title": { + "key": "supermarket_submeter_title_31", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_31", + "text": "通过冒险之旅某一关" + } }, { "id": 100032, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 8 + "position": 8, + "title": { + "key": "supermarket_submeter_title_32", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_32", + "text": "通过冒险之旅某一关" + } }, { "id": 100033, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 9 + "position": 9, + "title": { + "key": "supermarket_submeter_title_33", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_33", + "text": "通过冒险之旅某一关" + } }, { "id": 100034, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 10 + "position": 10, + "title": { + "key": "supermarket_submeter_title_34", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_34", + "text": "通过冒险之旅某一关" + } }, { "id": 100035, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 11 + "position": 11, + "title": { + "key": "supermarket_submeter_title_35", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_35", + "text": "通过冒险之旅某一关" + } }, { "id": 100036, "index": 3, - "mianlevel": 20080, + "mianlevel": 1100209, "group": 22001003, - "position": 12 + "position": 12, + "title": { + "key": "supermarket_submeter_title_36", + "text": "冒险之旅" + }, + "desc": { + "key": "supermarket_submeter_desc_36", + "text": "通过冒险之旅某一关" + } } ] \ No newline at end of file diff --git a/modules/storyline/api_Info.go b/modules/storyline/api_Info.go index ccaeaf605..09fa5a998 100644 --- a/modules/storyline/api_Info.go +++ b/modules/storyline/api_Info.go @@ -30,6 +30,6 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.StorylineInfoReq) ( return } - session.SendMsg(string(this.module.GetType()), "info", &pb.StorylineInfoResp{Item: info.Item}) + session.SendMsg(string(this.module.GetType()), "info", &pb.StorylineInfoResp{Info: info}) return } diff --git a/modules/storyline/api_complete.go b/modules/storyline/api_complete.go index a410b54ba..fa43b30a7 100644 --- a/modules/storyline/api_complete.go +++ b/modules/storyline/api_complete.go @@ -46,6 +46,34 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.StorylineComple return } + if item, ok = info.Item[conf.Hero]; !ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("no activation hero:%d", conf.Hero), + } + return + } + //前置判断 + if conf.Onlevel != 0 && item.Level[conf.Onlevel] == 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("%d onlevel no Complete", req.Level), + } + return + } + + //前置判断 + if len(conf.Onlevelstory) == 2 && item.Level[conf.Onlevelstory[0]] == conf.Onlevelstory[1] { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("%d onlevel no Complete", req.Level), + } + return + } + if item.Level[req.Level] != 0 { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, @@ -55,13 +83,6 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.StorylineComple return } - if item, ok = info.Item[conf.Hero]; !ok { - info.Item[conf.Hero] = &pb.DBStorylineItem{ - Id: conf.Hero, - Level: make(map[int32]int32), - } - item = info.Item[conf.Hero] - } if conf.Leveltype == 1 { //剧情关卡 item.Level[req.Level] = req.Story } else if conf.Leveltype == 2 { //战斗管卡 diff --git a/modules/storyline/api_turnon.go b/modules/storyline/api_turnon.go new file mode 100644 index 000000000..4216f7aa2 --- /dev/null +++ b/modules/storyline/api_turnon.go @@ -0,0 +1,84 @@ +package storyline + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" + "time" +) + +// 参数校验 +func (this *apiComp) TurnonCheck(session comm.IUserSession, req *pb.StorylineTurnonReq) (errdata *pb.ErrorData) { + + return +} + +// /获取自己的排行榜信息 +func (this *apiComp) Turnon(session comm.IUserSession, req *pb.StorylineTurnonReq) (errdata *pb.ErrorData) { + var ( + conf *cfg.GameHeroupstoryData + info *pb.DBStoryline + opentime time.Time + isprotect bool + err error + ) + if errdata = this.TurnonCheck(session, req); errdata != nil { + return + } + + if conf, err = this.module.configure.getGameHeroupstoryById(req.Heroid); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + loc, _ := time.LoadLocation("Local") + if opentime, err = time.ParseInLocation("2006-01-02 15:04:05", conf.Opentime, loc); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigurationException, + Title: pb.ErrorCode_ConfigurationException.ToString(), + Message: err.Error(), + } + return + } + //判断是否在保护期内 + if !configure.Now().After(opentime.Add(time.Hour * 24 * time.Duration(conf.Newheroday))) { + isprotect = true + } + + if info, err = this.module.modeltask.getUserDTasks(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + + if !isprotect && !configure.Now().After(time.Unix(info.Cd, 0)) { //不在保护期内 且cd中 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: "in cd", + } + return + } + + info.Item[req.Heroid] = &pb.DBStorylineItem{ + Id: req.Heroid, + Level: make(map[int32]int32), + } + + if !isprotect { //不在守护期内 + info.Cd = configure.Now().Add(time.Duration(this.module.ModuleTools.GetGlobalConf().Herostorycd) * time.Hour).Unix() + } + this.module.modeltask.Change(session.GetUserId(), map[string]interface{}{ + "cd": info.Cd, + "item": info.Item, + }) + session.SendMsg(string(this.module.GetType()), "info", &pb.StorylineTurnonResp{Heroid: req.Heroid, Info: info}) + return +} diff --git a/modules/storyline/configure.go b/modules/storyline/configure.go index 9bc72a389..621e0560c 100644 --- a/modules/storyline/configure.go +++ b/modules/storyline/configure.go @@ -30,7 +30,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp game_heroupstorybattle: cfg.NewGameHeroupstoryBattle, game_heroupstorychapter: cfg.NewGameHeroupstoryChapter, }) - // configure.RegisterConfigure(game_venturegiftstask, cfg.NewGameVenturegiftsTask, this.updateconfigure) return } @@ -46,6 +45,23 @@ func (this *configureComp) getGameHeroupstory() (confs []*cfg.GameHeroupstoryDat return } +func (this *configureComp) getGameHeroupstoryById(id int32) (conf *cfg.GameHeroupstoryData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_heroupstory); err != nil { + return + } else { + if conf, ok = v.(*cfg.GameHeroupstory).GetDataMap()[id]; !ok { + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_heroupstory, id) + this.module.Errorf("err:%v", err) + return + } + } + return +} + func (this *configureComp) getGameHeroupstoryChapter(id int32) (conf *cfg.GameHeroupstoryChapterData, err error) { var ( v interface{} diff --git a/pb/storyline_db.pb.go b/pb/storyline_db.pb.go index 9f7269b16..9dbdc73ad 100644 --- a/pb/storyline_db.pb.go +++ b/pb/storyline_db.pb.go @@ -27,7 +27,7 @@ type DBStoryline struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` - Cd int32 `protobuf:"varint,3,opt,name=cd,proto3" json:"cd"` //cd + Cd int64 `protobuf:"varint,3,opt,name=cd,proto3" json:"cd"` //cd 结束时间 Item map[int32]*DBStorylineItem `protobuf:"bytes,4,rep,name=item,proto3" json:"item" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //英雄关卡信息 } @@ -77,7 +77,7 @@ func (x *DBStoryline) GetUid() string { return "" } -func (x *DBStoryline) GetCd() int32 { +func (x *DBStoryline) GetCd() int64 { if x != nil { return x.Cd } @@ -154,7 +154,7 @@ var file_storyline_storyline_db_proto_rawDesc = []byte{ 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, - 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x63, 0x64, + 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x2a, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x1a, 0x49, 0x0a, 0x09, diff --git a/pb/storyline_msg.pb.go b/pb/storyline_msg.pb.go index 8979d5af9..6bb9d3b9f 100644 --- a/pb/storyline_msg.pb.go +++ b/pb/storyline_msg.pb.go @@ -65,7 +65,7 @@ type StorylineInfoResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Item map[int32]*DBStorylineItem `protobuf:"bytes,1,rep,name=item,proto3" json:"item" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //英雄关卡信息 + Info *DBStoryline `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //英雄关卡信息 } func (x *StorylineInfoResp) Reset() { @@ -100,9 +100,113 @@ func (*StorylineInfoResp) Descriptor() ([]byte, []int) { return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{1} } -func (x *StorylineInfoResp) GetItem() map[int32]*DBStorylineItem { +func (x *StorylineInfoResp) GetInfo() *DBStoryline { if x != nil { - return x.Item + return x.Info + } + return nil +} + +//开启剧情 请求 +type StorylineTurnonReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Heroid int32 `protobuf:"varint,1,opt,name=heroid,proto3" json:"heroid"` +} + +func (x *StorylineTurnonReq) Reset() { + *x = StorylineTurnonReq{} + if protoimpl.UnsafeEnabled { + mi := &file_storyline_storyline_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StorylineTurnonReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StorylineTurnonReq) ProtoMessage() {} + +func (x *StorylineTurnonReq) ProtoReflect() protoreflect.Message { + mi := &file_storyline_storyline_msg_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use StorylineTurnonReq.ProtoReflect.Descriptor instead. +func (*StorylineTurnonReq) Descriptor() ([]byte, []int) { + return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *StorylineTurnonReq) GetHeroid() int32 { + if x != nil { + return x.Heroid + } + return 0 +} + +//开启剧情 请求 +type StorylineTurnonResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Heroid int32 `protobuf:"varint,1,opt,name=heroid,proto3" json:"heroid"` + Info *DBStoryline `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` //英雄关卡信息 +} + +func (x *StorylineTurnonResp) Reset() { + *x = StorylineTurnonResp{} + if protoimpl.UnsafeEnabled { + mi := &file_storyline_storyline_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StorylineTurnonResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StorylineTurnonResp) ProtoMessage() {} + +func (x *StorylineTurnonResp) ProtoReflect() protoreflect.Message { + mi := &file_storyline_storyline_msg_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use StorylineTurnonResp.ProtoReflect.Descriptor instead. +func (*StorylineTurnonResp) Descriptor() ([]byte, []int) { + return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *StorylineTurnonResp) GetHeroid() int32 { + if x != nil { + return x.Heroid + } + return 0 +} + +func (x *StorylineTurnonResp) GetInfo() *DBStoryline { + if x != nil { + return x.Info } return nil } @@ -120,7 +224,7 @@ type StorylineBattleReq struct { func (x *StorylineBattleReq) Reset() { *x = StorylineBattleReq{} if protoimpl.UnsafeEnabled { - mi := &file_storyline_storyline_msg_proto_msgTypes[2] + mi := &file_storyline_storyline_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -133,7 +237,7 @@ func (x *StorylineBattleReq) String() string { func (*StorylineBattleReq) ProtoMessage() {} func (x *StorylineBattleReq) ProtoReflect() protoreflect.Message { - mi := &file_storyline_storyline_msg_proto_msgTypes[2] + mi := &file_storyline_storyline_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -146,7 +250,7 @@ func (x *StorylineBattleReq) ProtoReflect() protoreflect.Message { // Deprecated: Use StorylineBattleReq.ProtoReflect.Descriptor instead. func (*StorylineBattleReq) Descriptor() ([]byte, []int) { - return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{2} + return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{4} } func (x *StorylineBattleReq) GetLevel() int32 { @@ -176,7 +280,7 @@ type StorylineBattleResp struct { func (x *StorylineBattleResp) Reset() { *x = StorylineBattleResp{} if protoimpl.UnsafeEnabled { - mi := &file_storyline_storyline_msg_proto_msgTypes[3] + mi := &file_storyline_storyline_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -189,7 +293,7 @@ func (x *StorylineBattleResp) String() string { func (*StorylineBattleResp) ProtoMessage() {} func (x *StorylineBattleResp) ProtoReflect() protoreflect.Message { - mi := &file_storyline_storyline_msg_proto_msgTypes[3] + mi := &file_storyline_storyline_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -202,7 +306,7 @@ func (x *StorylineBattleResp) ProtoReflect() protoreflect.Message { // Deprecated: Use StorylineBattleResp.ProtoReflect.Descriptor instead. func (*StorylineBattleResp) Descriptor() ([]byte, []int) { - return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{3} + return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{5} } func (x *StorylineBattleResp) GetLevel() int32 { @@ -233,7 +337,7 @@ type StorylineCompleteReq struct { func (x *StorylineCompleteReq) Reset() { *x = StorylineCompleteReq{} if protoimpl.UnsafeEnabled { - mi := &file_storyline_storyline_msg_proto_msgTypes[4] + mi := &file_storyline_storyline_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -246,7 +350,7 @@ func (x *StorylineCompleteReq) String() string { func (*StorylineCompleteReq) ProtoMessage() {} func (x *StorylineCompleteReq) ProtoReflect() protoreflect.Message { - mi := &file_storyline_storyline_msg_proto_msgTypes[4] + mi := &file_storyline_storyline_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -259,7 +363,7 @@ func (x *StorylineCompleteReq) ProtoReflect() protoreflect.Message { // Deprecated: Use StorylineCompleteReq.ProtoReflect.Descriptor instead. func (*StorylineCompleteReq) Descriptor() ([]byte, []int) { - return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{4} + return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{6} } func (x *StorylineCompleteReq) GetLevel() int32 { @@ -297,7 +401,7 @@ type StorylineCompleteResp struct { func (x *StorylineCompleteResp) Reset() { *x = StorylineCompleteResp{} if protoimpl.UnsafeEnabled { - mi := &file_storyline_storyline_msg_proto_msgTypes[5] + mi := &file_storyline_storyline_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -310,7 +414,7 @@ func (x *StorylineCompleteResp) String() string { func (*StorylineCompleteResp) ProtoMessage() {} func (x *StorylineCompleteResp) ProtoReflect() protoreflect.Message { - mi := &file_storyline_storyline_msg_proto_msgTypes[5] + mi := &file_storyline_storyline_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -323,7 +427,7 @@ func (x *StorylineCompleteResp) ProtoReflect() protoreflect.Message { // Deprecated: Use StorylineCompleteResp.ProtoReflect.Descriptor instead. func (*StorylineCompleteResp) Descriptor() ([]byte, []int) { - return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{5} + return file_storyline_storyline_msg_proto_rawDescGZIP(), []int{7} } func (x *StorylineCompleteResp) GetLevel() int32 { @@ -357,40 +461,43 @@ var file_storyline_storyline_msg_proto_rawDesc = []byte{ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x90, 0x01, 0x0a, 0x11, 0x53, 0x74, 0x6f, 0x72, 0x79, - 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x04, - 0x69, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x53, 0x74, 0x6f, - 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x49, - 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x1a, 0x49, - 0x0a, 0x09, 0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, - 0x42, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x54, 0x0a, 0x12, 0x53, 0x74, 0x6f, - 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, - 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, - 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, - 0x4c, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x04, - 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x69, 0x0a, - 0x14, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, - 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x73, - 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, - 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, - 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x66, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x72, - 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x21, 0x0a, - 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, - 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, + 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x69, + 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x53, 0x74, + 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2c, 0x0a, + 0x12, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x6f, 0x6e, + 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x4f, 0x0a, 0x13, 0x53, + 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x6f, 0x6e, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, + 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, + 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x54, 0x0a, 0x12, + 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x22, 0x4c, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, + 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, + 0x22, 0x69, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, + 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, + 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x14, + 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, + 0x74, 0x6f, 0x72, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, + 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x66, 0x0a, 0x15, 0x53, + 0x74, 0x6f, 0x72, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, + 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -405,28 +512,29 @@ func file_storyline_storyline_msg_proto_rawDescGZIP() []byte { return file_storyline_storyline_msg_proto_rawDescData } -var file_storyline_storyline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_storyline_storyline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_storyline_storyline_msg_proto_goTypes = []interface{}{ (*StorylineInfoReq)(nil), // 0: StorylineInfoReq (*StorylineInfoResp)(nil), // 1: StorylineInfoResp - (*StorylineBattleReq)(nil), // 2: StorylineBattleReq - (*StorylineBattleResp)(nil), // 3: StorylineBattleResp - (*StorylineCompleteReq)(nil), // 4: StorylineCompleteReq - (*StorylineCompleteResp)(nil), // 5: StorylineCompleteResp - nil, // 6: StorylineInfoResp.ItemEntry - (*BattleFormation)(nil), // 7: BattleFormation - (*BattleInfo)(nil), // 8: BattleInfo - (*BattleReport)(nil), // 9: BattleReport - (*UserAssets)(nil), // 10: UserAssets - (*DBStorylineItem)(nil), // 11: DBStorylineItem + (*StorylineTurnonReq)(nil), // 2: StorylineTurnonReq + (*StorylineTurnonResp)(nil), // 3: StorylineTurnonResp + (*StorylineBattleReq)(nil), // 4: StorylineBattleReq + (*StorylineBattleResp)(nil), // 5: StorylineBattleResp + (*StorylineCompleteReq)(nil), // 6: StorylineCompleteReq + (*StorylineCompleteResp)(nil), // 7: StorylineCompleteResp + (*DBStoryline)(nil), // 8: DBStoryline + (*BattleFormation)(nil), // 9: BattleFormation + (*BattleInfo)(nil), // 10: BattleInfo + (*BattleReport)(nil), // 11: BattleReport + (*UserAssets)(nil), // 12: UserAssets } var file_storyline_storyline_msg_proto_depIdxs = []int32{ - 6, // 0: StorylineInfoResp.item:type_name -> StorylineInfoResp.ItemEntry - 7, // 1: StorylineBattleReq.battle:type_name -> BattleFormation - 8, // 2: StorylineBattleResp.info:type_name -> BattleInfo - 9, // 3: StorylineCompleteReq.report:type_name -> BattleReport - 10, // 4: StorylineCompleteResp.award:type_name -> UserAssets - 11, // 5: StorylineInfoResp.ItemEntry.value:type_name -> DBStorylineItem + 8, // 0: StorylineInfoResp.info:type_name -> DBStoryline + 8, // 1: StorylineTurnonResp.info:type_name -> DBStoryline + 9, // 2: StorylineBattleReq.battle:type_name -> BattleFormation + 10, // 3: StorylineBattleResp.info:type_name -> BattleInfo + 11, // 4: StorylineCompleteReq.report:type_name -> BattleReport + 12, // 5: StorylineCompleteResp.award:type_name -> UserAssets 6, // [6:6] is the sub-list for method output_type 6, // [6:6] is the sub-list for method input_type 6, // [6:6] is the sub-list for extension type_name @@ -468,7 +576,7 @@ func file_storyline_storyline_msg_proto_init() { } } file_storyline_storyline_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StorylineBattleReq); i { + switch v := v.(*StorylineTurnonReq); i { case 0: return &v.state case 1: @@ -480,7 +588,7 @@ func file_storyline_storyline_msg_proto_init() { } } file_storyline_storyline_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StorylineBattleResp); i { + switch v := v.(*StorylineTurnonResp); i { case 0: return &v.state case 1: @@ -492,7 +600,7 @@ func file_storyline_storyline_msg_proto_init() { } } file_storyline_storyline_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StorylineCompleteReq); i { + switch v := v.(*StorylineBattleReq); i { case 0: return &v.state case 1: @@ -504,6 +612,30 @@ func file_storyline_storyline_msg_proto_init() { } } file_storyline_storyline_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StorylineBattleResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_storyline_storyline_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StorylineCompleteReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_storyline_storyline_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StorylineCompleteResp); i { case 0: return &v.state @@ -522,7 +654,7 @@ func file_storyline_storyline_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_storyline_storyline_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.HeroupstoryChapterData.go b/sys/configure/structs/Game.HeroupstoryChapterData.go index d01e879c1..b645fea46 100644 --- a/sys/configure/structs/Game.HeroupstoryChapterData.go +++ b/sys/configure/structs/Game.HeroupstoryChapterData.go @@ -15,7 +15,7 @@ type GameHeroupstoryChapterData struct { Hero int32 Chapter int32 Onlevel int32 - Onlevelstory int32 + Onlevelstory []int32 Level int32 Levellink []int32 Leveltype int32 @@ -40,7 +40,20 @@ func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (e { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevel"].(float64); !_ok_ { err = errors.New("onlevel error"); return }; _v.Onlevel = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevelstory"].(float64); !_ok_ { err = errors.New("onlevelstory error"); return }; _v.Onlevelstory = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["onlevelstory"].([]interface{}); !_ok_ { err = errors.New("onlevelstory error"); return } + + _v.Onlevelstory = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Onlevelstory = append(_v.Onlevelstory, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.ShopCenterControlData.go b/sys/configure/structs/Game.ShopCenterControlData.go index 02483e746..0b655ccb7 100644 --- a/sys/configure/structs/Game.ShopCenterControlData.go +++ b/sys/configure/structs/Game.ShopCenterControlData.go @@ -12,9 +12,11 @@ import "errors" type GameShopCenterControlData struct { Id int32 + Pagetext string Text string Type int32 Index int32 + Banner string Slogan string Point string Props []*Gameatn @@ -35,9 +37,11 @@ func (*GameShopCenterControlData) GetTypeId() int32 { func (_v *GameShopCenterControlData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["pagetext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Pagetext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Pagetext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Text error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Text, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) } + { var _ok_ bool; if _v.Banner, _ok_ = _buf["banner"].(string); !_ok_ { err = errors.New("banner error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["slogan"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Slogan error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Slogan, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } } { diff --git a/sys/configure/structs/Game.ShopCenterSubmeterData.go b/sys/configure/structs/Game.ShopCenterSubmeterData.go index 9a7edcbc2..e5a18a08c 100644 --- a/sys/configure/structs/Game.ShopCenterSubmeterData.go +++ b/sys/configure/structs/Game.ShopCenterSubmeterData.go @@ -16,6 +16,8 @@ type GameShopCenterSubmeterData struct { Mianlevel int32 Group int32 Position int32 + Title string + Desc string } const TypeId_GameShopCenterSubmeterData = -611304294 @@ -30,6 +32,8 @@ func (_v *GameShopCenterSubmeterData)Deserialize(_buf map[string]interface{}) (e { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mianlevel"].(float64); !_ok_ { err = errors.New("mianlevel error"); return }; _v.Mianlevel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["position"].(float64); !_ok_ { err = errors.New("position error"); return }; _v.Position = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 6eafd26ac..24dc6a735 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -255,6 +255,7 @@ type GameGlobalData struct { CompassAngleOffsets []int32 VenturegiftsDraw string GiftBuy int32 + Herostorycd int32 } const TypeId_GameGlobalData = 477542761 @@ -1067,6 +1068,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.VenturegiftsDraw, _ok_ = _buf["venturegifts_draw"].(string); !_ok_ { err = errors.New("venturegifts_draw error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gift_buy"].(float64); !_ok_ { err = errors.New("gift_buy error"); return }; _v.GiftBuy = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["herostorycd"].(float64); !_ok_ { err = errors.New("herostorycd error"); return }; _v.Herostorycd = int32(_tempNum_) } return }