diff --git a/bin/json/game_chatsystem.json b/bin/json/game_chatsystem.json index 9384cae0b..49e13bf6b 100644 --- a/bin/json/game_chatsystem.json +++ b/bin/json/game_chatsystem.json @@ -86,7 +86,7 @@ "datatype": 3, "text": { "key": "chat_system_text_5", - "text": "【全服】%v 经过不懈的努力,将 %v 强化至+13!" + "text": "【全服】{0} 经过不懈的努力,将{1}强化至+13!" }, "data": 13, "data2": 0, @@ -101,7 +101,7 @@ "datatype": 3, "text": { "key": "chat_system_text_6", - "text": "【全服】%v 经过不懈的努力,将 %v 强化至+14!" + "text": "【全服】{0} 经过不懈的努力,将{1}强化至+14!" }, "data": 14, "data2": 0, @@ -116,7 +116,7 @@ "datatype": 3, "text": { "key": "chat_system_text_7", - "text": "【全服】%v 经过不懈的努力,将 %v 强化至+15!" + "text": "【全服】{0} 经过不懈的努力,将 {1} 强化至+15!" }, "data": 15, "data2": 0, @@ -131,7 +131,7 @@ "datatype": 4, "text": { "key": "chat_system_text_8", - "text": "【全服】%v 突破爬塔100层!" + "text": "【全服】{0} 突破爬塔100层!" }, "data": 100, "data2": 0, @@ -161,7 +161,7 @@ "datatype": 1, "text": { "key": "chat_system_text_10", - "text": "【传闻】%v通关了赛季塔50层!" + "text": "【传闻】{0}通关了赛季塔50层!" }, "data": 50, "data2": 0, @@ -176,7 +176,7 @@ "datatype": 3, "text": { "key": "chat_system_text_11", - "text": "【传闻】%v已经%v培养至60级!" + "text": "【传闻】{0}已经{1}培养至60级!" }, "data": 60, "data2": 0, @@ -191,7 +191,7 @@ "datatype": 3, "text": { "key": "chat_system_text_12", - "text": "【传闻】%v已经%v培养至6星!" + "text": "【传闻】{0}已经{1}培养至6星!" }, "data": 5, "data2": 0, @@ -206,7 +206,7 @@ "datatype": 3, "text": { "key": "chat_system_text_13", - "text": "【传闻】%v已经%v技能培养至满级!" + "text": "【传闻】{0}已经{1}技能培养至满级!" }, "data": 5, "data2": 0, @@ -221,7 +221,7 @@ "datatype": 3, "text": { "key": "chat_system_text_14", - "text": "【传闻】%v已经%v回响至满级!" + "text": "【传闻】{0}已经{1}回响至满级!" }, "data": 5, "data2": 0, @@ -236,7 +236,7 @@ "datatype": 3, "text": { "key": "chat_system_text_15", - "text": "【传闻】%v已经%v觉醒至满级!" + "text": "【传闻】{0}已经{1}觉醒至满级!" }, "data": 5, "data2": 0, @@ -251,7 +251,7 @@ "datatype": 1, "text": { "key": "chat_system_text_16", - "text": "【传闻】%v已经达到了60级!" + "text": "【传闻】{0}已经达到了60级!" }, "data": 60, "data2": 0, @@ -266,7 +266,7 @@ "datatype": 3, "text": { "key": "chat_system_text_17", - "text": "【传闻】%v在招募中获得了v%!" + "text": "【传闻】{0}在招募中获得了{1}!" }, "data": 5, "data2": 0, @@ -281,7 +281,7 @@ "datatype": 1, "text": { "key": "chat_system_text_18", - "text": "【传闻】%v通关了维京远征火焰泰坦难度10!" + "text": "【传闻】{0}通关了维京远征火焰泰坦难度10!" }, "data": 10, "data2": 1, @@ -296,7 +296,7 @@ "datatype": 1, "text": { "key": "chat_system_text_19", - "text": "【传闻】%v通关了维京远征冰霜泰坦难度10!" + "text": "【传闻】{0}通关了维京远征冰霜泰坦难度10!" }, "data": 10, "data2": 2, @@ -311,7 +311,7 @@ "datatype": 1, "text": { "key": "chat_system_text_20", - "text": "【传闻】%v通关了维京远征森林泰坦难度10!" + "text": "【传闻】{0}通关了维京远征森林泰坦难度10!" }, "data": 10, "data2": 3, @@ -326,7 +326,7 @@ "datatype": 1, "text": { "key": "chat_system_text_21", - "text": "【传闻】%v通关了维京远征冰霜泰坦(武器)难度10!" + "text": "【传闻】{0}通关了维京远征冰霜泰坦(武器)难度10!" }, "data": 10, "data2": 11, @@ -341,7 +341,7 @@ "datatype": 1, "text": { "key": "chat_system_text_22", - "text": "【传闻】%v通关了维京远征森林泰坦(饰品)难度10!" + "text": "【传闻】{0}通关了维京远征森林泰坦(饰品)难度10!" }, "data": 10, "data2": 12, @@ -356,7 +356,7 @@ "datatype": 1, "text": { "key": "chat_system_text_23", - "text": "【传闻】%v通关了狩猎巨型猩猩难度10!" + "text": "【传闻】{0}通关了狩猎巨型猩猩难度10!" }, "data": 10, "data2": 1, @@ -371,7 +371,7 @@ "datatype": 1, "text": { "key": "chat_system_text_24", - "text": "【传闻】%v通关了狩猎火龙难度10!" + "text": "【传闻】{0}通关了狩猎火龙难度10!" }, "data": 10, "data2": 2, @@ -386,7 +386,7 @@ "datatype": 1, "text": { "key": "chat_system_text_25", - "text": "【传闻】%v通关了狩猎大厨难度10!" + "text": "【传闻】{0}通关了狩猎大厨难度10!" }, "data": 10, "data2": 3, @@ -401,7 +401,7 @@ "datatype": 1, "text": { "key": "chat_system_text_26", - "text": "【传闻】%v通关了狩猎太空海星难度10!" + "text": "【传闻】{0}通关了狩猎太空海星难度10!" }, "data": 10, "data2": 4, diff --git a/bin/json/game_global.json b/bin/json/game_global.json index f0d5076b5..e001d8ba6 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -220,6 +220,48 @@ "t": "18000004", "n": 1 }, + "Arena_buy": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 + }, + { + "a": "attr", + "t": "diamond", + "n": 400 + }, + { + "a": "attr", + "t": "diamond", + "n": 600 + }, + { + "a": "attr", + "t": "diamond", + "n": 800 + }, + { + "a": "attr", + "t": "diamond", + "n": 1000 + }, + { + "a": "attr", + "t": "diamond", + "n": 1200 + }, + { + "a": "attr", + "t": "diamond", + "n": 1400 + } + ], "VikingExpedition_RecoveryTime": 144, "cops_RecoveryTime": 300, "cops_InitialNum": 60, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index f66055a90..ed9fef189 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -11648,7 +11648,7 @@ "decompose_deplete": [], "decompose_get": [], "access": [ - 156 + 10014 ], "use_skip": 107, "upper_limit": 0, diff --git a/bin/json/game_itemlink.json b/bin/json/game_itemlink.json index 3466bd131..d03700a75 100644 --- a/bin/json/game_itemlink.json +++ b/bin/json/game_itemlink.json @@ -271,5 +271,18 @@ }, "jumpid": 904, "icon": "ty_qp_jy" + }, + { + "id": 10014, + "title": { + "key": "itemlink_itemlink_title_12", + "text": "竞技场" + }, + "desc": { + "key": "itemlink_itemlink_desc_12", + "text": "竞技场" + }, + "jumpid": 10014, + "icon": "ty_qp_jjc" } ] \ No newline at end of file diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json index 8ff25c954..71bd02617 100644 --- a/bin/json/game_navigation.json +++ b/bin/json/game_navigation.json @@ -9,7 +9,7 @@ "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_Sheet1_functionname_1", - "text": "商人" + "text": "商铺" }, "npcName": [ "功能入口-商人" diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 93a1dd76d..fb365ef42 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -99,8 +99,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100108 } ], "wkqbx": 2, @@ -283,8 +283,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100408 } ], "wkqbx": 0, @@ -674,8 +674,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100308 } ], "wkqbx": 0, @@ -743,8 +743,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100304 } ], "wkqbx": 0, @@ -835,8 +835,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100304 } ], "wkqbx": 0, @@ -1483,8 +1483,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100404 } ], "wkqbx": 1, @@ -1604,8 +1604,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100204 } ], "wkqbx": 0, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 1fda54305..20fd3fe13 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -11829,7 +11829,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -11852,7 +11852,7 @@ "Argu": [ 1, 4, - 2000 + 3500 ], "FollowSK": [], "SucFollowSK": [], @@ -12377,7 +12377,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -12400,7 +12400,7 @@ "Argu": [ 1, 4, - 2200 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -12449,7 +12449,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -12472,7 +12472,7 @@ "Argu": [ 1, 4, - 2200 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -12521,7 +12521,7 @@ "Argu": [ 1, 4, - 1000 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -12570,7 +12570,7 @@ "Argu": [ 1, 4, - 2800 + 4000 ], "FollowSK": [], "SucFollowSK": [ @@ -12619,7 +12619,7 @@ "Argu": [ 1, 4, - 1000 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -12665,7 +12665,7 @@ "Argu": [ 1, 4, - 1000 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -12735,7 +12735,7 @@ "Argu": [ 1, 4, - 2500 + 3000 ], "FollowSK": [], "SucFollowSK": [ @@ -28890,7 +28890,7 @@ "Argu": [ 390001401, 1000, - 1, + 2, 2 ], "FollowSK": [], @@ -32227,7 +32227,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -32250,7 +32250,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -32273,7 +32273,7 @@ "Argu": [ 1, 4, - 1000 + 2500 ], "FollowSK": [ 251012212 @@ -32322,7 +32322,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251013112 @@ -32371,7 +32371,7 @@ "Argu": [ 1, 4, - 1800 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -32443,7 +32443,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251014112 @@ -32510,7 +32510,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -32644,7 +32644,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251011112 @@ -32693,7 +32693,7 @@ "Argu": [ 1, 4, - 1000 + 3500 ], "FollowSK": [], "SucFollowSK": [], @@ -32719,7 +32719,7 @@ "Argu": [ 1, 4, - 1000 + 3500 ], "FollowSK": [ 244003112 @@ -36486,7 +36486,7 @@ "Argu": [ 1, 4, - 500 + 1200 ], "FollowSK": [ 253002112 @@ -36532,7 +36532,7 @@ "Argu": [ 1, 4, - 1800 + 4000 ], "FollowSK": [], "SucFollowSK": [ @@ -36602,7 +36602,7 @@ "Argu": [ 1, 4, - 1200 + 3000 ], "FollowSK": [ 244002112 @@ -37155,7 +37155,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251015112 @@ -37225,7 +37225,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -37295,7 +37295,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251018112 @@ -37344,7 +37344,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251019112 @@ -37582,7 +37582,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251024112 @@ -37631,7 +37631,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251025112 @@ -37680,7 +37680,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251026112 @@ -37753,7 +37753,7 @@ "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [ 251028112