From d20aa7838515280b3729f7e6c738679ba974fd68 Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 5 Jun 2023 14:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localization_global_const.lua | 3 + lua/app/config/mall_gold.lua | 31 ++++++-- lua/app/config/skill.lua | 65 +++++------------ lua/app/config/strings/cn/global.lua | 3 + lua/app/config/strings/en/item.lua | 43 ++++++++--- lua/app/config/strings/ja/item.lua | 72 +++++++++---------- lua/app/config/task.lua | 10 --- lua/app/config/tutorial.lua | 3 +- lua/app/ui/shop/box_level_ui.lua | 2 +- lua/app/ui/shop/gift_pop_ui.lua | 4 +- 10 files changed, 124 insertions(+), 112 deletions(-) diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 4e2251d1..e5b1cae7 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -206,6 +206,9 @@ local LocalizationGlobalConst = BIND_ACCOUNT_FAILED = "BIND_ACCOUNT_FAILED", CHANGE_ACCOUNT_FAILED = "CHANGE_ACCOUNT_FAILED", SUMMON_SKIP = "SUMMON_SKIP", + CHANGE_ACCOUNT_FAILED_2 = "CHANGE_ACCOUNT_FAILED_2", + MAIL_COUNTDOWN = "MAIL_COUNTDOWN", + SHOP_DESC_37 = "SHOP_DESC_37", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/mall_gold.lua b/lua/app/config/mall_gold.lua index f3aa28f1..230169a6 100644 --- a/lua/app/config/mall_gold.lua +++ b/lua/app/config/mall_gold.lua @@ -1,6 +1,13 @@ local mall_gold = { [1]={ - ["idel_time"]=24000, + ["gold"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, ["cost"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -12,7 +19,14 @@ local mall_gold = { ["daily"]=2 }, [2]={ - ["idel_time"]=180000, + ["gold"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + }, ["cost"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -23,14 +37,21 @@ local mall_gold = { } }, [3]={ - ["idel_time"]=1800000, + ["gold"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" + }, ["cost"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=450, - ["num_for_nothing"]="Ug1c" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } } } diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 198cb4f4..24afdc41 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1258,7 +1258,7 @@ local skill = { ["name_act"]="skill01", ["fx_self"]=300009, ["bullet_time"]={ - 933, + 800, 3000, 400 } @@ -1347,7 +1347,7 @@ local skill = { ["name_act"]="skill01", ["fx_self"]=300009, ["bullet_time"]={ - 933, + 800, 3000, 400 } @@ -2663,25 +2663,19 @@ local skill = { ["effect"]={ { ["type"]="hurt_green", - ["num"]=8000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, { ["type"]="hurt_green", - ["num"]=8000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, { ["type"]="hurt_green", - ["num"]=8000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="hurt_green", - ["num"]=9400, + ["num"]=13400, ["ratio"]=10000, ["round"]=0 } @@ -2699,8 +2693,7 @@ local skill = { ["effect_block"]={ 1, 2, - 3, - 4 + 3 }, ["skill_position"]=1, ["shake_time"]=200, @@ -2760,25 +2753,19 @@ local skill = { ["effect"]={ { ["type"]="hurt_green", - ["num"]=8000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, { ["type"]="hurt_green", - ["num"]=8000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, { ["type"]="hurt_green", - ["num"]=8000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="hurt_green", - ["num"]=9400, + ["num"]=13400, ["ratio"]=10000, ["round"]=0 }, @@ -2802,8 +2789,7 @@ local skill = { ["effect_block"]={ 1, 2, - 3, - 5 + 4 }, ["skill_position"]=1, ["shake_time"]=200, @@ -2850,25 +2836,19 @@ local skill = { ["effect"]={ { ["type"]="hurt_green", - ["num"]=8000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, { ["type"]="hurt_green", - ["num"]=8000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, { ["type"]="hurt_green", - ["num"]=8000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="hurt_green", - ["num"]=9400, + ["num"]=13400, ["ratio"]=10000, ["round"]=0 }, @@ -2892,8 +2872,7 @@ local skill = { ["effect_block"]={ 1, 2, - 3, - 5 + 4 }, ["skill_position"]=1, ["shake_time"]=200, @@ -7123,19 +7102,13 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=4000, + ["num"]=6000, ["ratio"]=10000, ["round"]=0 }, { ["type"]="hurt", - ["num"]=4000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="hurt", - ["num"]=4000, + ["num"]=6000, ["ratio"]=10000, ["round"]=0 }, @@ -7162,8 +7135,7 @@ local skill = { ["effect_block"]={ 1, 2, - 3, - 6 + 5 }, ["skill_position"]=1, ["cd"]=3, @@ -7173,8 +7145,7 @@ local skill = { ["sound_hit"]={ 2200120, 1200114, - 1200113, - 1200114 + 1200113 }, ["name_act"]="skill01", ["fx_self"]=400039, diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index e3fc9f23..3aabd077 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -206,6 +206,9 @@ local localization_global = ["BIND_ACCOUNT_FAILED"] = "账号绑定失败，请重试", ["CHANGE_ACCOUNT_FAILED"] = "账号切换失败，请重试", ["SUMMON_SKIP"] = "跳过", + ["CHANGE_ACCOUNT_FAILED_2"] = "当前账号已是目标账号，无需切换", + ["MAIL_COUNTDOWN"] = "{0}小时到期", + ["SHOP_DESC_37"] = "宝箱奖励", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index d0f8c844..2942589b 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -12,7 +12,7 @@ local item = { ["desc"]="It takes stamina to complete stages" }, [4]={ - ["name"]="Outstanding Hero", + ["name"]="Uncommon Hero", ["desc"]="Can obtain Uncommon Hero" }, [5]={ @@ -24,110 +24,135 @@ local item = { ["desc"]="Can obtain Epic Hero" }, [7]={ + ["name"]="Pass Point", ["desc"]="Accumulated points can level up Pass." }, [8]={ + ["name"]="Wooden Box", ["desc"]="Can obtain heroes of the above qualities." }, [9]={ + ["name"]="Wooden Chest", ["desc"]="Can obtain heroes of the above qualities." }, [10]={ + ["name"]="Gold Chest", ["desc"]="Hero chests adorned with gold." }, [11]={ + ["name"]="Platinum Chest", ["desc"]="Powerful heroes are inside." }, [12]={ + ["name"]="EXP", ["desc"]="Accumulate to a certain quantity for an upgrade." }, [13]={ + ["name"]="Common Key", ["desc"]="Used to open Normal Chest in the shop." }, [14]={ + ["name"]="Exquisite Key", ["desc"]="Used to open Exquisite Chest in the shop." }, [15]={ + ["name"]="Precious Key", ["desc"]="Used to open Precious Chest in the shop." }, [16]={ + ["name"]="Quest Chest", ["desc"]="Obtained by completing 5 daily quests." }, [17]={ + ["name"]="Ad Chest", ["desc"]="You can watch ads anywhere in the game to earn rewards." }, [18]={ + ["name"]="Platinum Large Chest", ["desc"]="A huge Platinum Chest!" }, [19]={ + ["name"]="Random Shard", ["desc"]="AFK rewards include random shards. The quantity and quality will increase with the progress of the stages." }, [12001]={ - ["name"]="Roxy Shard", + ["name"]="Dancer Shard", ["desc"]="Dancer Shard, collect the shards to activate or upgrade." }, [13001]={ - ["name"]="Carla Shard", + ["name"]="Claude Shard", ["desc"]="Claude Shard， collect the shards to activate or upgrade." }, [13002]={ - ["name"]="Great Sword Robert Shard", + ["name"]="Flare Shard", ["desc"]="Flare Shard, collect the shards to activate or upgrade." }, [14001]={ - ["name"]="Aske Shard", + ["name"]="Alexander Shard", ["desc"]="Alexander Shard, collect the shards to activate or upgrade." }, [22001]={ - ["name"]="Evelyn Shard", + ["name"]="Blade Maid Shard", ["desc"]="Blade Maid Shard, collect the shards to activate or upgrade." }, [23001]={ - ["name"]="Lilith Shard", + ["name"]="Barbarian Shard", ["desc"]="Barbarian Shard, collect the shards to activate or upgrade." }, [23002]={ - ["name"]="White-Hair Catherine Shard", + ["name"]="Er-Ya Shard", ["desc"]="Er-Ya Shard, collect the shards to activate or upgrade." }, [24001]={ - ["name"]="Allen Shard", + ["name"]="Claymore Kid Shard", ["desc"]="Claymore Kid Shard, collect the shards to activate or upgrade." }, [32001]={ + ["name"]="Onion Shard", ["desc"]="Onion Shard, collect the shards to activate or upgrade." }, [33001]={ + ["name"]="Fawn Shard", ["desc"]="Fawn Shard, collect the shards to activate or upgrade." }, [33002]={ + ["name"]="Timberwolf Shard", ["desc"]="Timberwolf Shard, collect the shards to activate or upgrade." }, [34001]={ + ["name"]="Mulan Shard", ["desc"]="Mulan Shard, collect the shards to activate or upgrade." }, [42001]={ + ["name"]="Iceheart Shard", ["desc"]="Iceheart Shard, collect the shards to activate or upgrade." }, [43001]={ + ["name"]="Ice Maiden Shard", ["desc"]="Ice Maiden Shard, collect the shards to activate or upgrade." }, [43002]={ + ["name"]="Raven Shard", ["desc"]="Raven Shard, collect the shards to activate or upgrade." }, [44001]={ + ["name"]="Frost Enchantress Shard", ["desc"]="Frost Enchantress Shard, collect the shards to activate or upgrade." }, [52001]={ + ["name"]="Ninja Lun Shard", ["desc"]="Ninja Lun Shard, collect the shards to activate or upgrade." }, [53001]={ + ["name"]="Witch Kiki Shard", ["desc"]="Witch Kiki Shard, collect the shards to activate or upgrade." }, [53002]={ + ["name"]="Soul Hunter Shard", ["desc"]="Soul Hunter Shard, collect the shards to activate or upgrade." }, [54001]={ + ["name"]="Butterfly Shard", ["desc"]="Butterfly Shard, collect the shards to activate or upgrade." } } diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index 23b094a0..7aef2dab 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -12,112 +12,112 @@ local item = { ["desc"]="ステージクリアに必要なのは、当然スタミナだぜ。" }, [4]={ - ["name"]="Uncommon Hero" + }, [5]={ - ["name"]="Rare Hero" + }, [6]={ - ["name"]="Epic Hero" + }, [7]={ - ["name"]="Pass Point" + }, [8]={ - ["name"]="Wooden Box" + }, [9]={ - ["name"]="Wooden Chest" + }, [10]={ - ["name"]="Gold Chest" + }, [11]={ - ["name"]="Platinum Chest" + }, [12]={ - ["name"]="EXP" + }, [13]={ - ["name"]="Common Key" + }, [14]={ - ["name"]="Exquisite Key" + }, [15]={ - ["name"]="Precious Key" + }, [16]={ - ["name"]="Quest Chest" + }, [17]={ - ["name"]="Ad Chest" + }, [18]={ - ["name"]="Platinum Large Chest" + }, [19]={ - ["name"]="Random Shard" + }, [12001]={ - ["name"]="Dancer Shard" + }, [13001]={ - ["name"]="Claude Shard" + }, [13002]={ - ["name"]="Flare Shard" + }, [14001]={ - ["name"]="Alexander Shard" + }, [22001]={ - ["name"]="Blade Maid Shard" + }, [23001]={ - ["name"]="Barbarian Shard" + }, [23002]={ - ["name"]="Er-Ya Shard" + }, [24001]={ - ["name"]="Claymore Kid Shard" + }, [32001]={ - ["name"]="Onion Shard" + }, [33001]={ - ["name"]="Fawn Shard" + }, [33002]={ - ["name"]="Timberwolf Shard" + }, [34001]={ - ["name"]="Mulan Shard" + }, [42001]={ - ["name"]="Iceheart Shard" + }, [43001]={ - ["name"]="Ice Maiden Shard" + }, [43002]={ - ["name"]="Raven Shard" + }, [44001]={ - ["name"]="Frost Enchantress Shard" + }, [52001]={ - ["name"]="Ninja Lun Shard" + }, [53001]={ - ["name"]="Witch Kiki Shard" + }, [53002]={ - ["name"]="Soul Hunter Shard" + }, [54001]={ - ["name"]="Butterfly Shard" + } } local config = { diff --git a/lua/app/config/task.lua b/lua/app/config/task.lua index a8d7586a..60929b36 100644 --- a/lua/app/config/task.lua +++ b/lua/app/config/task.lua @@ -553,7 +553,6 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=2, ["icon"]="7" }, [37]={ @@ -569,7 +568,6 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=2, ["icon"]="7" }, [38]={ @@ -585,7 +583,6 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=2, ["icon"]="7" }, [39]={ @@ -601,7 +598,6 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=2, ["icon"]="7" }, [40]={ @@ -617,7 +613,6 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=2, ["icon"]="7" }, [41]={ @@ -633,7 +628,6 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=2, ["icon"]="7" }, [42]={ @@ -649,7 +643,6 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=2, ["icon"]="7" }, [43]={ @@ -665,7 +658,6 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=2, ["icon"]="7" }, [44]={ @@ -1270,7 +1262,6 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=2, ["icon"]="7" }, [84]={ @@ -1286,7 +1277,6 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=2, ["icon"]="7" }, [85]={ diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index 3022d325..291dc200 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -453,7 +453,7 @@ local tutorial = { } }, [50000]={ - ["next_id"]=10, + ["next_id"]=50010, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/left_btn", ["arrow_direction"]=2, @@ -463,7 +463,6 @@ local tutorial = { } }, [50010]={ - ["next_id"]=20, ["type"]=3, ["txt"]="tutorial_txt_6", ["txt_offset"]={ diff --git a/lua/app/ui/shop/box_level_ui.lua b/lua/app/ui/shop/box_level_ui.lua index afb4e430..08500cf9 100644 --- a/lua/app/ui/shop/box_level_ui.lua +++ b/lua/app/ui/shop/box_level_ui.lua @@ -24,7 +24,7 @@ function BoxLevelUI:onLoadRootComplete() self.bg = self.uiMap["box_level_ui.bg"] self.titleTx = self.uiMap["box_level_ui.bg.title_img.title"] - self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_27)) + self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_37)) self.lvTx = self.uiMap["box_level_ui.bg.lv_node.lv_bg.text"] self.leftArrow = self.uiMap["box_level_ui.bg.lv_node.left_arrow"] self.rightArrow = self.uiMap["box_level_ui.bg.lv_node.right_arrow"] diff --git a/lua/app/ui/shop/gift_pop_ui.lua b/lua/app/ui/shop/gift_pop_ui.lua index b8dc7fae..5741d480 100644 --- a/lua/app/ui/shop/gift_pop_ui.lua +++ b/lua/app/ui/shop/gift_pop_ui.lua @@ -173,7 +173,7 @@ function GiftPopUI:updateTime() remainTime = 0 self:checkNextPopGiftOrClose() end - self.timeText:setText(GFunc.getTimeStr(remainTime)) + self.timeText:setText(Time:formatNumTime(remainTime)) end end elseif self.actType == PayManager.PURCHARSE_TYPE.GROW_UP_GIFT then -- 成长礼包 @@ -187,7 +187,7 @@ function GiftPopUI:updateTime() remainTime = 0 self:checkNextPopGiftOrClose() end - self.timeText:setText(GFunc.getTimeStr(remainTime)) + self.timeText:setText(Time:formatNumTime(remainTime)) end self.timeNode:setVisible(hasTime) end