diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 69e969623..5b5e28fd9 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -4354,7 +4354,7 @@ "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], - "DefaultHero": 102611, + "DefaultHero": 102612, "ChoseHero": [], "DisableHero": [], "LockSlots": [], @@ -4393,7 +4393,7 @@ "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], - "DefaultHero": 102621, + "DefaultHero": 102622, "ChoseHero": [], "DisableHero": [], "LockSlots": [], @@ -4432,7 +4432,7 @@ "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], - "DefaultHero": 102631, + "DefaultHero": 102632, "ChoseHero": [], "DisableHero": [], "LockSlots": [], @@ -4471,7 +4471,7 @@ "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], - "DefaultHero": 102641, + "DefaultHero": 102642, "ChoseHero": [], "DisableHero": [], "LockSlots": [], @@ -4510,7 +4510,7 @@ "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], - "DefaultHero": 102651, + "DefaultHero": 102652, "ChoseHero": [], "DisableHero": [], "LockSlots": [], diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 951fc6935..81346c0df 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -5038,7 +5038,8 @@ }, "value": 3, "filter": [ - 1 + 1, + 3 ], "filter2": [ "页签id", @@ -5959,7 +5960,8 @@ }, "value": 5, "filter": [ - 1 + 1, + 5 ], "filter2": [ "剧情ID", @@ -6929,7 +6931,8 @@ }, "value": 5, "filter": [ - 1 + 1, + 5 ], "filter2": [ "页签id", @@ -7417,7 +7420,8 @@ }, "value": 10, "filter": [ - 1 + 1, + 10 ], "filter2": [ "页签id", @@ -8006,7 +8010,8 @@ }, "value": 10, "filter": [ - 2 + 2, + 20 ], "filter2": [ "页签id", diff --git a/bin/json/game_global.json b/bin/json/game_global.json index d585e7299..81c9959d3 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -808,6 +808,7 @@ "pvp_endtime": 3, "pvp_maintenancetime": 2, "pvp_integraltool": "pvpintegral", - "sx_returnspeed": 0.15 + "sx_returnspeed": 0.15, + "puggsy_buy": 2001 } ] \ No newline at end of file diff --git a/bin/json/game_huntingopentime.json b/bin/json/game_huntingopentime.json index c61107ce0..9de249d6f 100644 --- a/bin/json/game_huntingopentime.json +++ b/bin/json/game_huntingopentime.json @@ -43,7 +43,7 @@ "key": "hunting_opentime_opentimetext_2", "text": "开启时间:周一,周三,周五,周日" }, - "bg": "fb_pt_hl", + "bg": "hl_img_bg", "icon": "hkz_wftj_sl04", "bossIcon": "gl_img_55001" }, diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index 9ad526a0b..807d69e14 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -88,5 +88,15 @@ "n": 60 } ] + }, + { + "index": "362", + "var": [ + { + "a": "per", + "t": "16010104", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index 66a7fa551..746cfdd78 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -489,17 +489,31 @@ "text": "这里是博克岛。维京人的领地。
而我们维京人的族长,在这里,发起了新的改革……" } }, + { + "scene": "MainLineScene", + "subScene": "12002", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "title": { + "key": "loading_Sheet1_title_36", + "text": "「伊路向前」" + }, + "prompt": { + "key": "loading_Sheet1_prompt_36", + "text": "原始人的生活原本丰富而安稳,但如今小伊似乎有一些新的想法。" + } + }, { "scene": "LoginScene", "subScene": "", "image": "ld_mh_bg_zc02", "icon": "loading_icon_fc", "title": { - "key": "loading_Sheet1_title_36", + "key": "loading_Sheet1_title_37", "text": "「中轴城」" }, "prompt": { - "key": "loading_Sheet1_prompt_36", + "key": "loading_Sheet1_prompt_37", "text": "终极之战后,月中人陷入沉睡,为了更好地守护月之大陆,守护者们把力量集中起来,建立了中轴城。
这是一座用火球煮咖啡,用扫描仪复制魔法卷轴的神奇城市,坐落于月之大陆的中心,是世界文明交流的枢纽。" } }, @@ -509,11 +523,11 @@ "image": "ld_mh_bg_sd", "icon": "loading_icon_jgsd", "title": { - "key": "loading_Sheet1_title_37", + "key": "loading_Sheet1_title_38", "text": "「商队列车」" }, "prompt": { - "key": "loading_Sheet1_prompt_37", + "key": "loading_Sheet1_prompt_38", "text": "星辰之下,飞驰的列车在各区间自由穿梭着。" } }, @@ -522,20 +536,6 @@ "subScene": "", "image": "ld_mh_bg_fc", "icon": "loading_icon_fc", - "title": { - "key": "loading_Sheet1_title_38", - "text": "「石阵秘境」" - }, - "prompt": { - "key": "loading_Sheet1_prompt_38", - "text": "走出这里其实很简单,只要先右拐再前进再右拐再左拐……不好意思,是先右拐两次……不,不对,好像是先左拐?呃,算了,给骇客蛛发消息吧……" - } - }, - { - "scene": "StonehengeScene2", - "subScene": "", - "image": "ld_mh_bg_fc", - "icon": "loading_icon_fc", "title": { "key": "loading_Sheet1_title_39", "text": "「石阵秘境」" @@ -546,7 +546,7 @@ } }, { - "scene": "StonehengeScene3", + "scene": "StonehengeScene2", "subScene": "", "image": "ld_mh_bg_fc", "icon": "loading_icon_fc", @@ -560,7 +560,7 @@ } }, { - "scene": "StonehengeScene4", + "scene": "StonehengeScene3", "subScene": "", "image": "ld_mh_bg_fc", "icon": "loading_icon_fc", @@ -572,5 +572,19 @@ "key": "loading_Sheet1_prompt_41", "text": "走出这里其实很简单,只要先右拐再前进再右拐再左拐……不好意思,是先右拐两次……不,不对,好像是先左拐?呃,算了,给骇客蛛发消息吧……" } + }, + { + "scene": "StonehengeScene4", + "subScene": "", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "title": { + "key": "loading_Sheet1_title_42", + "text": "「石阵秘境」" + }, + "prompt": { + "key": "loading_Sheet1_prompt_42", + "text": "走出这里其实很简单,只要先右拐再前进再右拐再左拐……不好意思,是先右拐两次……不,不对,好像是先左拐?呃,算了,给骇客蛛发消息吧……" + } } ] \ No newline at end of file diff --git a/bin/json/game_playerinfor_barrage.json b/bin/json/game_playerinfor_barrage.json index cb9d7085e..49202dc92 100644 --- a/bin/json/game_playerinfor_barrage.json +++ b/bin/json/game_playerinfor_barrage.json @@ -9,7 +9,7 @@ "text": "这好像不是熊猫?" }, "time": 90, - "speed": 12124 + "speed": 10080 }, { "id": "2", @@ -20,8 +20,8 @@ "key": "playerinfor_barrage_2", "text": "看起来像个画家。" }, - "time": 322, - "speed": 11499 + "time": 223, + "speed": 7791 }, { "id": "3", @@ -32,8 +32,8 @@ "key": "playerinfor_barrage_3", "text": "为什么会觉得是熊猫啊?" }, - "time": 427, - "speed": 8430 + "time": 415, + "speed": 8397 }, { "id": "4", @@ -44,8 +44,8 @@ "key": "playerinfor_barrage_4", "text": "从石头里蹦出来的人?怎么感觉有点熟悉……" }, - "time": 661, - "speed": 8707 + "time": 575, + "speed": 9162 }, { "id": "5", @@ -56,8 +56,8 @@ "key": "playerinfor_barrage_5", "text": "你可能是听说过从石头里蹦出来的猴子。" }, - "time": 768, - "speed": 12416 + "time": 709, + "speed": 7943 }, { "id": "6", @@ -68,8 +68,8 @@ "key": "playerinfor_barrage_6", "text": "你是从石头里蹦出来的?!" }, - "time": 869, - "speed": 12155 + "time": 894, + "speed": 9842 }, { "id": "7", @@ -80,8 +80,8 @@ "key": "playerinfor_barrage_7", "text": "不!那不是我!" }, - "time": 1097, - "speed": 12574 + "time": 1098, + "speed": 11034 }, { "id": "8", @@ -92,8 +92,8 @@ "key": "playerinfor_barrage_8", "text": "哦,传承之人……" }, - "time": 1199, - "speed": 10322 + "time": 1230, + "speed": 8619 }, { "id": "9", @@ -104,8 +104,8 @@ "key": "playerinfor_barrage_9", "text": "月光能量都汇集在他身上了!" }, - "time": 1415, - "speed": 8219 + "time": 1374, + "speed": 10631 }, { "id": "10", @@ -116,8 +116,8 @@ "key": "playerinfor_barrage_10", "text": "那应该不会爆炸吧?" }, - "time": 1619, - "speed": 8309 + "time": 1569, + "speed": 7183 }, { "id": "11", @@ -128,8 +128,8 @@ "key": "playerinfor_barrage_11", "text": "阿宝,你为什么站那么远?" }, - "time": 1786, - "speed": 11466 + "time": 1774, + "speed": 12959 }, { "id": "312", @@ -141,7 +141,7 @@ "text": "哦!那是什么?" }, "time": 90, - "speed": 12304 + "speed": 11287 }, { "id": "313", @@ -152,8 +152,8 @@ "key": "playerinfor_barrage_313", "text": "我有种被她注视的感觉……" }, - "time": 286, - "speed": 9332 + "time": 277, + "speed": 8670 }, { "id": "314", @@ -164,8 +164,8 @@ "key": "playerinfor_barrage_314", "text": "好像是一种叫做“照相”的魔法……" }, - "time": 426, - "speed": 9093 + "time": 446, + "speed": 9631 }, { "id": "315", @@ -176,8 +176,8 @@ "key": "playerinfor_barrage_315", "text": "我看这魔法不是很疼。" }, - "time": 635, - "speed": 11823 + "time": 630, + "speed": 10499 }, { "id": "316", @@ -188,8 +188,8 @@ "key": "playerinfor_barrage_316", "text": "据说它的作用是封印灵魂?" }, - "time": 825, - "speed": 12174 + "time": 762, + "speed": 9107 }, { "id": "317", @@ -200,8 +200,8 @@ "key": "playerinfor_barrage_317", "text": "月中人的传承居然这么可怕?!" }, - "time": 969, - "speed": 12599 + "time": 888, + "speed": 12822 }, { "id": "318", @@ -212,8 +212,8 @@ "key": "playerinfor_barrage_318", "text": "哦!你们真是够了!" }, - "time": 1103, - "speed": 8799 + "time": 1000, + "speed": 10927 }, { "id": "319", @@ -224,8 +224,8 @@ "key": "playerinfor_barrage_319", "text": "照相不是魔法!也不能封印灵魂!" }, - "time": 1232, - "speed": 8349 + "time": 1187, + "speed": 12386 }, { "id": "320", @@ -236,8 +236,8 @@ "key": "playerinfor_barrage_320", "text": "那她是在干什么?" }, - "time": 1448, - "speed": 7055 + "time": 1420, + "speed": 12063 }, { "id": "321", @@ -248,8 +248,8 @@ "key": "playerinfor_barrage_321", "text": "……别问。" }, - "time": 1576, - "speed": 12474 + "time": 1549, + "speed": 7769 }, { "id": "322", @@ -260,8 +260,8 @@ "key": "playerinfor_barrage_322", "text": "那可以教我吗?" }, - "time": 1810, - "speed": 10859 + "time": 1744, + "speed": 10521 }, { "id": "323", @@ -272,8 +272,8 @@ "key": "playerinfor_barrage_323", "text": "我也想学。" }, - "time": 1977, - "speed": 8454 + "time": 1975, + "speed": 12186 }, { "id": "324", @@ -284,7 +284,7 @@ "key": "playerinfor_barrage_324", "text": "要不你们问问这个传承者?" }, - "time": 2163, - "speed": 8357 + "time": 2170, + "speed": 10406 } ] \ No newline at end of file diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json index fc3ad27a1..d2da1f6d4 100644 --- a/bin/json/game_playerinfor_overview.json +++ b/bin/json/game_playerinfor_overview.json @@ -16,7 +16,7 @@ "mainq": "Person/10000/10000M_q.prefab", "name": { "key": "playerinfor_playerinfor_overview_name_1", - "text": "陈旧服饰" + "text": "阿宝" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_1", @@ -40,7 +40,7 @@ "mainq": "Person/10000/10000M_q.prefab", "name": { "key": "playerinfor_playerinfor_overview_name_2", - "text": "陈旧服饰" + "text": "白人男-默认皮肤" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_2", @@ -64,7 +64,55 @@ "mainq": "Person/10000/10000W_q.prefab", "name": { "key": "playerinfor_playerinfor_overview_name_3", - "text": "陈旧服饰" + "text": "白人女-默认皮肤" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_3", + "text": "" + } + }, + { + "id": "16010104", + "translate": 1, + "sex": 1, + "type": 1, + "icon": "tx_js_25001", + "playerhead": "tx_js_25001", + "tujing": [ + 107 + ], + "url": "", + "tips": 10000, + "resources": "Person/10000/25001M.prefab", + "pvpAnimator": "Person/10000/10000_MPvp.controller", + "mainq": "Person/10000/10000M_q.prefab", + "name": { + "key": "playerinfor_playerinfor_overview_name_4", + "text": "白人男-测试皮肤" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_2", + "text": "" + } + }, + { + "id": "16010104", + "translate": 1, + "sex": 2, + "type": 1, + "icon": "tx_js_25001", + "playerhead": "tx_js_25001", + "tujing": [ + 107 + ], + "url": "", + "tips": 10000, + "resources": "Person/10000/25001M.prefab", + "pvpAnimator": "Person/10000/10000_WPvp.controller", + "mainq": "Person/10000/10000W_q.prefab", + "name": { + "key": "playerinfor_playerinfor_overview_name_5", + "text": "白人女-测试皮肤" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_3", @@ -87,8 +135,8 @@ "pvpAnimator": "Person/10001/10001_MPvp.controller", "mainq": "Person/10000/10000M_q.prefab", "name": { - "key": "playerinfor_playerinfor_overview_name_4", - "text": "陈旧服饰" + "key": "playerinfor_playerinfor_overview_name_6", + "text": "黑人男-默认皮肤" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_4", @@ -111,8 +159,8 @@ "pvpAnimator": "Person/10001/10001_WPvp.controller", "mainq": "Person/10000/10000W_q.prefab", "name": { - "key": "playerinfor_playerinfor_overview_name_5", - "text": "陈旧服饰" + "key": "playerinfor_playerinfor_overview_name_7", + "text": "黑人女-默认皮肤" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_5", @@ -135,8 +183,8 @@ "pvpAnimator": "Person/10002/10002_MPvp.controller", "mainq": "Person/10000/10000M_q.prefab", "name": { - "key": "playerinfor_playerinfor_overview_name_6", - "text": "陈旧服饰" + "key": "playerinfor_playerinfor_overview_name_8", + "text": "黄人男-默认皮肤" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_6", @@ -159,8 +207,8 @@ "pvpAnimator": "Person/10002/10002_WPvp.controller", "mainq": "Person/10000/10000W_q.prefab", "name": { - "key": "playerinfor_playerinfor_overview_name_7", - "text": "陈旧服饰" + "key": "playerinfor_playerinfor_overview_name_9", + "text": "黄人女-默认皮肤" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_7", @@ -183,8 +231,8 @@ "pvpAnimator": "", "mainq": "", "name": { - "key": "playerinfor_playerinfor_overview_name_8", - "text": "陈述观念" + "key": "playerinfor_playerinfor_overview_name_10", + "text": "男角色默认动作" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_8", @@ -207,8 +255,8 @@ "pvpAnimator": "", "mainq": "", "name": { - "key": "playerinfor_playerinfor_overview_name_9", - "text": "讲解原理" + "key": "playerinfor_playerinfor_overview_name_11", + "text": "女角色默认动作" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_9", @@ -231,8 +279,8 @@ "pvpAnimator": "", "mainq": "", "name": { - "key": "playerinfor_playerinfor_overview_name_10", - "text": "虚无星空" + "key": "playerinfor_playerinfor_overview_name_12", + "text": "男角色默认背景" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_10", @@ -255,8 +303,8 @@ "pvpAnimator": "", "mainq": "", "name": { - "key": "playerinfor_playerinfor_overview_name_11", - "text": "虚无星空" + "key": "playerinfor_playerinfor_overview_name_13", + "text": "女角色默认背景" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_11", @@ -279,7 +327,7 @@ "pvpAnimator": "", "mainq": "", "name": { - "key": "playerinfor_playerinfor_overview_name_12", + "key": "playerinfor_playerinfor_overview_name_14", "text": "翠绿竹林" }, "txt": { @@ -303,7 +351,7 @@ "pvpAnimator": "", "mainq": "", "name": { - "key": "playerinfor_playerinfor_overview_name_13", + "key": "playerinfor_playerinfor_overview_name_15", "text": "清凉夏日" }, "txt": { @@ -327,7 +375,7 @@ "pvpAnimator": "", "mainq": "", "name": { - "key": "playerinfor_playerinfor_overview_name_14", + "key": "playerinfor_playerinfor_overview_name_16", "text": "童话世界" }, "txt": { @@ -351,7 +399,7 @@ "pvpAnimator": "", "mainq": "", "name": { - "key": "playerinfor_playerinfor_overview_name_15", + "key": "playerinfor_playerinfor_overview_name_17", "text": "深入龙穴" }, "txt": { diff --git a/bin/json/game_puggsyfight.json b/bin/json/game_puggsyfight.json index 3829423b0..839c227e1 100644 --- a/bin/json/game_puggsyfight.json +++ b/bin/json/game_puggsyfight.json @@ -2,11 +2,11 @@ { "boss_id": 810301, "boss_name": { - "key": "guild_guild_boss_boss_name_1", + "key": "puggsy_puggsy_fight_boss_name_1", "text": "胡德先生" }, "boss_text": { - "key": "guild_guild_boss_boss_name_1", + "key": "puggsy_puggsy_fight_boss_text_1", "text": "他是一名懦弱的战士" }, "BattleReadyID": 20111001, @@ -23,11 +23,11 @@ { "boss_id": 810302, "boss_name": { - "key": "guild_guild_boss_boss_name_2", + "key": "puggsy_puggsy_fight_boss_name_2", "text": "胡德先生" }, "boss_text": { - "key": "guild_guild_boss_boss_name_2", + "key": "puggsy_puggsy_fight_boss_text_2", "text": "他是一名懦弱的战士" }, "BattleReadyID": 20111001, @@ -44,11 +44,11 @@ { "boss_id": 810303, "boss_name": { - "key": "guild_guild_boss_boss_name_3", + "key": "puggsy_puggsy_fight_boss_name_3", "text": "胡德先生" }, "boss_text": { - "key": "guild_guild_boss_boss_name_3", + "key": "puggsy_puggsy_fight_boss_text_3", "text": "他是一名懦弱的战士" }, "BattleReadyID": 20111001, @@ -65,11 +65,11 @@ { "boss_id": 810304, "boss_name": { - "key": "guild_guild_boss_boss_name_4", + "key": "puggsy_puggsy_fight_boss_name_4", "text": "胡德先生" }, "boss_text": { - "key": "guild_guild_boss_boss_name_4", + "key": "puggsy_puggsy_fight_boss_text_4", "text": "他是一名懦弱的战士" }, "BattleReadyID": 20111001, @@ -86,11 +86,11 @@ { "boss_id": 810305, "boss_name": { - "key": "guild_guild_boss_boss_name_5", + "key": "puggsy_puggsy_fight_boss_name_5", "text": "胡德先生" }, "boss_text": { - "key": "guild_guild_boss_boss_name_5", + "key": "puggsy_puggsy_fight_boss_text_5", "text": "他是一名懦弱的战士" }, "BattleReadyID": 20111001, @@ -107,11 +107,11 @@ { "boss_id": 810306, "boss_name": { - "key": "guild_guild_boss_boss_name_6", + "key": "puggsy_puggsy_fight_boss_name_6", "text": "胡德先生" }, "boss_text": { - "key": "guild_guild_boss_boss_name_6", + "key": "puggsy_puggsy_fight_boss_text_6", "text": "他是一名懦弱的战士" }, "BattleReadyID": 20111001, diff --git a/bin/json/game_puggsyisland.json b/bin/json/game_puggsyisland.json index 8f2364905..cbe081a59 100644 --- a/bin/json/game_puggsyisland.json +++ b/bin/json/game_puggsyisland.json @@ -17,7 +17,11 @@ "text": "航行抵达伯克岛" }, "scene": 10011, - "png": [] + "png": [ + "item_treasure", + "item_treasure", + "item_treasure" + ] }, { "node_id": 2, @@ -37,7 +41,11 @@ "text": "航行抵达战栗海岸" }, "scene": 10011, - "png": [] + "png": [ + "item_treasure", + "item_treasure", + "item_treasure" + ] }, { "node_id": 3, @@ -57,7 +65,11 @@ "text": "航行抵达西西伯利亚" }, "scene": 10011, - "png": [] + "png": [ + "item_treasure", + "item_treasure", + "item_treasure" + ] }, { "node_id": 4, @@ -77,7 +89,11 @@ "text": "航行抵达巴尔干半岛" }, "scene": 10011, - "png": [] + "png": [ + "item_treasure", + "item_treasure", + "item_treasure" + ] }, { "node_id": 5, @@ -97,7 +113,11 @@ "text": "航行抵达新加坡海峡" }, "scene": 10011, - "png": [] + "png": [ + "item_treasure", + "item_treasure", + "item_treasure" + ] }, { "node_id": 6, @@ -117,6 +137,10 @@ "text": "航行抵达马奇洛" }, "scene": 10011, - "png": [] + "png": [ + "item_treasure", + "item_treasure", + "item_treasure" + ] } ] \ No newline at end of file diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index 424ead1cc..333e1e63f 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -1,9 +1,13 @@ [ { - "id": 10, + "id": 9, "name": { - "key": "worldtask_world_all_name_1", - "text": "章节1:预言之声" + "key": "worldtask_world_all_name_0", + "text": "预言之声" + }, + "titlename": { + "key": "worldtask_world_all_titlename_0", + "text": "序章" }, "task_icon": "", "task_txt": { @@ -19,16 +23,43 @@ ] }, { - "id": 20, + "id": 10, "name": { - "key": "worldtask_world_all_name_2", - "text": "章节2:大龙归来" + "key": "worldtask_world_all_name_1", + "text": "极北营救" + }, + "titlename": { + "key": "worldtask_world_all_titlename_1", + "text": "第一章" }, "task_icon": "", "task_txt": { "key": "worldtask_world_all_task_txt_2", "text": "完成所有任务有可以领取额外奖励" }, + "reword": [ + { + "a": "item", + "t": "10000001", + "n": 5 + } + ] + }, + { + "id": 20, + "name": { + "key": "worldtask_world_all_name_2", + "text": "原石危机" + }, + "titlename": { + "key": "worldtask_world_all_titlename_2", + "text": "第二章" + }, + "task_icon": "", + "task_txt": { + "key": "worldtask_world_all_task_txt_3", + "text": "完成所有任务有可以领取额外奖励" + }, "reword": [ { "a": "item", @@ -41,11 +72,15 @@ "id": 30, "name": { "key": "worldtask_world_all_name_3", - "text": "章节3:小偷与大盗" + "text": "小偷与大盗" + }, + "titlename": { + "key": "worldtask_world_all_titlename_3", + "text": "第三章" }, "task_icon": "", "task_txt": { - "key": "worldtask_world_all_task_txt_3", + "key": "worldtask_world_all_task_txt_4", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -60,11 +95,15 @@ "id": 40, "name": { "key": "worldtask_world_all_name_4", - "text": "章节4:交易所风波(上)" + "text": "黑市风波" + }, + "titlename": { + "key": "worldtask_world_all_titlename_4", + "text": "第四章" }, "task_icon": "", "task_txt": { - "key": "worldtask_world_all_task_txt_4", + "key": "worldtask_world_all_task_txt_5", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -81,9 +120,13 @@ "key": "worldtask_world_all_name_5", "text": "章节5:交易所风波(下)" }, + "titlename": { + "key": "worldtask_world_all_titlename_5", + "text": "第五章" + }, "task_icon": "", "task_txt": { - "key": "worldtask_world_all_task_txt_5", + "key": "worldtask_world_all_task_txt_6", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -100,6 +143,10 @@ "key": "worldtask_world_all_name_6", "text": "酋长蜕变" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "rw_img_xlgs", "task_txt": { "key": "", @@ -113,6 +160,10 @@ "key": "worldtask_world_all_name_7", "text": "\"伊\"路向前" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "rw_img_fkysr", "task_txt": { "key": "", @@ -126,6 +177,10 @@ "key": "worldtask_world_all_name_8", "text": "坏蛋艺术家" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "rw_img_hdlm", "task_txt": { "key": "", @@ -139,6 +194,10 @@ "key": "worldtask_world_all_name_42", "text": "隐藏" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -152,6 +211,10 @@ "key": "worldtask_world_all_name_9", "text": "日常测试1" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -165,6 +228,10 @@ "key": "worldtask_world_all_name_10", "text": "日常测试2" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -178,6 +245,10 @@ "key": "worldtask_world_all_name_11", "text": "日常测试3" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -191,6 +262,10 @@ "key": "worldtask_world_all_name_12", "text": "日常测试4" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -204,6 +279,10 @@ "key": "worldtask_world_all_name_13", "text": "日常测试5" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -217,6 +296,10 @@ "key": "worldtask_world_all_name_14", "text": "日常测试6" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -230,6 +313,10 @@ "key": "worldtask_world_all_name_15", "text": "日常测试7" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -243,6 +330,10 @@ "key": "worldtask_world_all_name_16", "text": "日常测试8" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -256,6 +347,10 @@ "key": "worldtask_world_all_name_17", "text": "日常测试9" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -269,6 +364,10 @@ "key": "worldtask_world_all_name_18", "text": "日常测试10" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -282,6 +381,10 @@ "key": "worldtask_world_all_name_19", "text": "日常测试11" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -295,6 +398,10 @@ "key": "worldtask_world_all_name_20", "text": "日常测试12" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -308,6 +415,10 @@ "key": "worldtask_world_all_name_21", "text": "日常测试13" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -321,6 +432,10 @@ "key": "worldtask_world_all_name_22", "text": "日常测试14" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -334,6 +449,10 @@ "key": "worldtask_world_all_name_23", "text": "日常测试15" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -347,6 +466,10 @@ "key": "worldtask_world_all_name_24", "text": "日常测试16" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -360,6 +483,10 @@ "key": "worldtask_world_all_name_25", "text": "日常测试17" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -373,6 +500,10 @@ "key": "worldtask_world_all_name_26", "text": "日常测试18" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -386,6 +517,10 @@ "key": "worldtask_world_all_name_27", "text": "日常测试19" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -399,6 +534,10 @@ "key": "worldtask_world_all_name_28", "text": "日常测试20" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -412,6 +551,10 @@ "key": "worldtask_world_all_name_29", "text": "日常测试21" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -425,6 +568,10 @@ "key": "worldtask_world_all_name_30", "text": "日常测试22" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -438,6 +585,10 @@ "key": "worldtask_world_all_name_31", "text": "日常测试23" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -451,6 +602,10 @@ "key": "worldtask_world_all_name_32", "text": "日常测试24" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -464,6 +619,10 @@ "key": "worldtask_world_all_name_33", "text": "日常测试25" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -477,6 +636,10 @@ "key": "worldtask_world_all_name_34", "text": "日常测试26" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -490,6 +653,10 @@ "key": "worldtask_world_all_name_35", "text": "日常测试27" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -503,6 +670,10 @@ "key": "worldtask_world_all_name_36", "text": "日常测试28" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -516,6 +687,10 @@ "key": "worldtask_world_all_name_37", "text": "日常测试29" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -529,6 +704,10 @@ "key": "worldtask_world_all_name_38", "text": "日常测试30" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -542,6 +721,10 @@ "key": "worldtask_world_all_name_39", "text": "日常测试31" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -555,6 +738,10 @@ "key": "worldtask_world_all_name_40", "text": "日常测试32" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", @@ -568,6 +755,10 @@ "key": "worldtask_world_all_name_41", "text": "日常测试33" }, + "titlename": { + "key": "", + "text": "" + }, "task_icon": "", "task_txt": { "key": "", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 4b4355d3f..15828a27e 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -6,7 +6,7 @@ "lockend": 999, "ontxe": 0, "id_after": 20011, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25001", @@ -66,7 +66,7 @@ "lockend": 999, "ontxe": 20010, "id_after": 20012, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25001", @@ -109,7 +109,7 @@ "lockend": 999, "ontxe": 20011, "id_after": 20020, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25001", @@ -178,7 +178,7 @@ "lockend": 999, "ontxe": 20012, "id_after": 20030, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25002", @@ -237,7 +237,7 @@ "lockend": 999, "ontxe": 20020, "id_after": 20031, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25003", @@ -292,7 +292,7 @@ "lockend": 999, "ontxe": 20030, "id_after": 20032, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25005", @@ -344,7 +344,7 @@ "lockend": 999, "ontxe": 20031, "id_after": 20033, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25005", @@ -398,7 +398,7 @@ "lockend": 999, "ontxe": 20032, "id_after": 20034, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25005", @@ -455,7 +455,7 @@ "lockend": 999, "ontxe": 20033, "id_after": 20035, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25005", @@ -514,7 +514,7 @@ "lockend": 999, "ontxe": 20034, "id_after": 20042, - "group": 10, + "group": 9, "exgroup": 210, "des": 2, "icon": "25005", diff --git a/modules/island/api_refresheroshop.go b/modules/island/api_refresheroshop.go index f1f8277a1..b8c63e191 100644 --- a/modules/island/api_refresheroshop.go +++ b/modules/island/api_refresheroshop.go @@ -3,6 +3,7 @@ package island import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" ) // 参数校验 @@ -14,14 +15,15 @@ func (this *apiComp) RefresHeroShopCheck(session comm.IUserSession, req *pb.IsLa //刷新商店 func (this *apiComp) RefresHeroShop(session comm.IUserSession, req *pb.IsLandRefresHeroShopReq) (errdata *pb.ErrorData) { var ( + need []*cfg.Gameatn info *pb.DBIsland cards []string - err error + + err error ) if errdata = this.RefresHeroShopCheck(session, req); errdata != nil { return } - if info, err = this.module.model.getmodel(session.GetUserId()); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -30,6 +32,22 @@ func (this *apiComp) RefresHeroShop(session comm.IUserSession, req *pb.IsLandRef return } info.Refreshed++ + pricekey := this.module.ModuleTools.GetGlobalConf().PuggsyBuy + if res, err := this.module.ModuleTools.GetPriceGroupCost(pricekey, info.Refreshed); len(res) > 0 { + need = append(need, res...) + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + + if errdata = this.module.ConsumeRes(session, need, true); errdata != nil { + return + } + if cards, err = this.module.hero.GetRandomCardByCardPool(session.GetUserId(), 5); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/sys/configure/structs/Game.WorldAllData.go b/sys/configure/structs/Game.WorldAllData.go index a26b66c5c..3c98a5f10 100644 --- a/sys/configure/structs/Game.WorldAllData.go +++ b/sys/configure/structs/Game.WorldAllData.go @@ -13,6 +13,7 @@ import "errors" type GameWorldAllData struct { Id int32 Name string + Titlename string TaskIcon string TaskTxt string Reword []*Gameatn @@ -27,6 +28,7 @@ func (*GameWorldAllData) GetTypeId() int32 { func (_v *GameWorldAllData)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["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _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["titlename"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Titlename error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Titlename, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.TaskIcon, _ok_ = _buf["task_icon"].(string); !_ok_ { err = errors.New("task_icon error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index d0b392629..3543f7dd8 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -294,6 +294,7 @@ type GameGlobalData struct { PvpMaintenancetime int32 PvpIntegraltool string SxReturnspeed float32 + PuggsyBuy int32 } const TypeId_GameGlobalData = 477542761 @@ -1119,6 +1120,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_maintenancetime"].(float64); !_ok_ { err = errors.New("pvp_maintenancetime error"); return }; _v.PvpMaintenancetime = int32(_tempNum_) } { var _ok_ bool; if _v.PvpIntegraltool, _ok_ = _buf["pvp_integraltool"].(string); !_ok_ { err = errors.New("pvp_integraltool error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sx_returnspeed"].(float64); !_ok_ { err = errors.New("sx_returnspeed error"); return }; _v.SxReturnspeed = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["puggsy_buy"].(float64); !_ok_ { err = errors.New("puggsy_buy error"); return }; _v.PuggsyBuy = int32(_tempNum_) } return }