From c9558263e2d66807fe8acd731d62565e8d0064a7 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 6 Jun 2023 14:39:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_gift.lua | 18 +-- lua/app/config/bounty_level.lua | 196 +++++++++++++-------------- lua/app/config/bounty_time.lua | 8 +- lua/app/config/mall_gold.lua | 12 +- lua/app/config/skill.lua | 32 ++--- lua/app/config/strings/en/global.lua | 1 + lua/app/config/strings/zh/global.lua | 1 + lua/app/config/tutorial.lua | 8 +- 8 files changed, 142 insertions(+), 134 deletions(-) diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 19e801dd..a442c758 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -24,15 +24,15 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=50000, - ["num_for_nothing"]="UwhcA2U=" + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" } }, ["time_type"]=1, ["limit_time"]=1, ["cd"]=6, ["limit"]=1, - ["value"]=800 + ["value"]=1000 }, [20202]={ ["type"]=2, @@ -47,15 +47,15 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=80000, - ["num_for_nothing"]="XghcA2U=" + ["num"]=60000, + ["num_for_nothing"]="UAhcA2U=" } }, ["time_type"]=1, ["limit_time"]=1, ["cd"]=6, ["limit"]=1, - ["value"]=800 + ["value"]=1200 }, [20302]={ ["type"]=2, @@ -70,15 +70,15 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=120000, - ["num_for_nothing"]="VwpcA2VR" + ["num"]=100000, + ["num_for_nothing"]="VwhcA2VR" } }, ["time_type"]=1, ["limit_time"]=1, ["cd"]=6, ["limit"]=1, - ["value"]=800 + ["value"]=1500 }, [50102]={ ["type"]=5, diff --git a/lua/app/config/bounty_level.lua b/lua/app/config/bounty_level.lua index ea3776e2..829fa875 100644 --- a/lua/app/config/bounty_level.lua +++ b/lua/app/config/bounty_level.lua @@ -7,14 +7,14 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=34001, - ["id_for_nothing"]="VQxcA2Q=", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -67,16 +67,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [105]={ @@ -113,8 +113,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=34001, - ["id_for_nothing"]="VQxcA2Q=", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -228,16 +228,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [113]={ @@ -294,8 +294,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=34001, - ["id_for_nothing"]="VQxcA2Q=", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -429,16 +429,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [123]={ @@ -495,8 +495,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=34001, - ["id_for_nothing"]="VQxcA2Q=", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -630,16 +630,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [133]={ @@ -696,8 +696,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=34001, - ["id_for_nothing"]="VQxcA2Q=", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -831,16 +831,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [143]={ @@ -897,8 +897,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=34001, - ["id_for_nothing"]="VQxcA2Q=", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -991,8 +991,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=730, - ["num_for_nothing"]="UQtc" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" }, ["reward_pro"]={ ["type"]=1, @@ -1032,16 +1032,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [153]={ @@ -1098,8 +1098,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=34001, - ["id_for_nothing"]="VQxcA2Q=", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -1233,16 +1233,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [163]={ @@ -1299,8 +1299,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=34001, - ["id_for_nothing"]="VQxcA2Q=", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -1434,16 +1434,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [173]={ @@ -1500,8 +1500,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=34001, - ["id_for_nothing"]="VQxcA2Q=", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -1534,16 +1534,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [178]={ @@ -1627,8 +1627,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1687,16 +1687,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [205]={ @@ -1848,16 +1848,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [213]={ @@ -2049,16 +2049,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [223]={ @@ -2250,16 +2250,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [233]={ @@ -2451,16 +2451,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [243]={ @@ -2611,8 +2611,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=730, - ["num_for_nothing"]="UQtc" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" }, ["reward_pro"]={ ["type"]=1, @@ -2652,16 +2652,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [253]={ @@ -2853,16 +2853,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [263]={ @@ -3054,16 +3054,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [273]={ @@ -3154,16 +3154,16 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=640, - ["num_for_nothing"]="UAxc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [278]={ diff --git a/lua/app/config/bounty_time.lua b/lua/app/config/bounty_time.lua index ff75494c..64e527ca 100644 --- a/lua/app/config/bounty_time.lua +++ b/lua/app/config/bounty_time.lua @@ -1,13 +1,13 @@ local bounty_time = { [1]={ ["season"]=1, - ["start_time"]="2023-5-1 00:00:00", - ["end_time"]="2023-6-1 00:00:00" + ["start_time"]="2023-6-1 00:00:00", + ["end_time"]="2023-7-1 00:00:00" }, [2]={ ["season"]=2, - ["start_time"]="2023-6-1 00:00:00", - ["end_time"]="2023-7-1 00:00:00" + ["start_time"]="2023-7-1 00:00:00", + ["end_time"]="2023-8-1 00:00:00" } } local config = { diff --git a/lua/app/config/mall_gold.lua b/lua/app/config/mall_gold.lua index 230169a6..62ab8e04 100644 --- a/lua/app/config/mall_gold.lua +++ b/lua/app/config/mall_gold.lua @@ -5,8 +5,8 @@ local mall_gold = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=400, - ["num_for_nothing"]="Ughc" + ["num"]=600, + ["num_for_nothing"]="UAhc" }, ["cost"]={ ["type"]=1, @@ -24,8 +24,8 @@ local mall_gold = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" }, ["cost"]={ ["type"]=1, @@ -42,8 +42,8 @@ local mall_gold = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=40000, - ["num_for_nothing"]="UghcA2U=" + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" }, ["cost"]={ ["type"]=1, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 7fb26050..372f0e6b 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -751,11 +751,11 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 13002201, - 13002202, - 13002201, - 13002202, - 1300223 + 130022201, + 130022202, + 130022201, + 130022202, + 130022203 }, ["name_act"]="skill01", ["fx_self"]=300039, @@ -865,11 +865,11 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 13002201, - 13002202, - 13002201, - 13002202, - 1300223 + 130022201, + 130022202, + 130022201, + 130022202, + 130022203 }, ["name_act"]="skill01", ["fx_self"]=300039, @@ -3962,7 +3962,7 @@ local skill = { 4300120 }, ["name_act"]="skill01", - ["fx_self"]=300034, + ["fx_target"]=300034, ["bullet_time"]={ 633, 3000, @@ -6044,11 +6044,11 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 13002201, - 13002202, - 13002201, - 13002202, - 1300223 + 130022201, + 130022202, + 130022201, + 130022202, + 130022203 }, ["name_act"]="skill01", ["fx_self"]=400024, diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 1da38167..6d835a49 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -215,6 +215,7 @@ local localization_global = ["BIND_TIPS_DESC"] = "For the security of your account, please bind your accounts", ["GET_SEVER_ERROR"] = "Request to server failed, please try again", ["PAY_FAILED_DESC_1"] = "Order abnormal, please contact customer support", + ["CHAPTER_DESC_2"] = "Mysterious Chest{0}/{1}", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index b07299dc..89e69908 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -215,6 +215,7 @@ local localization_global = ["BIND_TIPS_DESC"] = "爲了您的帳戶安全，請綁定賬號", ["GET_SEVER_ERROR"] = "請求服務器失敗，請重試", ["PAY_FAILED_DESC_1"] = "訂單異常，請聯繫客服處理", + ["CHAPTER_DESC_2"] = "神祕寶箱{0}/{1}", } return localization_global \ No newline at end of file diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index b29b79e5..5206af43 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -467,11 +467,17 @@ local tutorial = { ["txt"]="tutorial_txt_6", ["txt_offset"]={ 0, - 180 + 280 }, ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/daily_challenge_comp/challenge/task/icon_task3", ["arrow_direction"]=4, ["arrow_offset"]={ + 0, + 15 + }, + ["show_mask"]=2, + ["circle_r"]=100, + ["circle_offset"]={ 0, 0 }