diff --git a/lua/app/bf/unity/ui_spine_object.lua b/lua/app/bf/unity/ui_spine_object.lua index 414a5ce1..8366e4f5 100644 --- a/lua/app/bf/unity/ui_spine_object.lua +++ b/lua/app/bf/unity/ui_spine_object.lua @@ -95,8 +95,8 @@ function UISpineObject:rePlayAnim(animName, loop, forceRefresh) end end -function UISpineObject:playAnimComplete(animName, loop, forceRefresh, complete) - local spineAnim = self:getAnimation(self:playAnim(animName, loop, forceRefresh)) +function UISpineObject:playAnimComplete(animName, loop, forceRefresh, complete, forceGetSG) + local spineAnim = self:getAnimation(self:playAnim(animName, loop, forceRefresh, forceGetSG)) local duration = spineAnim.Duration local sequence = self:createBindTweenSequence() sequence:AppendInterval(duration) diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 86831afe..164a768a 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -31,10 +31,15 @@ BIReport.PAY_OPT_TYPE = { } BIReport.ACCOUNT_OPT_TYPE = { - LOGIN_FINISH = "LoginFinish", + LOGIN_SUCCESS = "LoginSuccess", LOGIN_FAILED = "LoginFailed", - BIND_CLICK = "BindClick", - BIND_FINISH = "BindFinish", + CLICK_BIND = "ClickBind", + BIND_SUCCESS = "BindSuccess", + BIND_FAILED = "BindFailed", + DELETE = "Delete", + CLICK_CHANGE_ACCOUNT = "ClickChangeAccount", + CHANGE_ACCOUNT_SUCCESS = "ChangeAccountSuccess", + CHANGE_ACCOUNT_FAILED = "ChangeAccountFailed", } BIReport.CHAPTER_OPT_TYPE = { @@ -685,7 +690,7 @@ end function BIReport:postAccountLoginFinish(loginType) local args = { login_type = loginType, - event_type = BIReport.ACCOUNT_OPT_TYPE.LOGIN_FINISH, + event_type = BIReport.ACCOUNT_OPT_TYPE.LOGIN_SUCCESS, } self:report(EVENT_NAME_ACCOUNT_OPT, args) end @@ -765,7 +770,6 @@ function BIReport:postMailOpen(mailId) event_type = BIReport.MAIL_OPT_TYPE.OPEN, } self:report(EVENT_NAME_MAIL_OPT, args) - BIReport:printArgsStr(EVENT_NAME_MAIL_OPT, args) end function BIReport:postMailClaim(mailId) @@ -778,7 +782,46 @@ function BIReport:postMailClaim(mailId) event_type = BIReport.MAIL_OPT_TYPE.CLAIM, } self:report(EVENT_NAME_MAIL_OPT, args) - BIReport:printArgsStr(EVENT_NAME_MAIL_OPT, args) +end + +function BIReport:postAccountDelete(loginType) + local args = { + login_type = loginType, + event_type = BIReport.ACCOUNT_OPT_TYPE.DELETE, + } + self:report(EVENT_NAME_ACCOUNT_OPT, args) +end + +function BIReport:postAccountBindClick(loginType) + local args = { + login_type = loginType, + event_type = BIReport.ACCOUNT_OPT_TYPE.CLICK_BIND, + } + self:report(EVENT_NAME_ACCOUNT_OPT, args) +end + +function BIReport:postAccountBindFinish(loginType, success) + local args = { + login_type = loginType, + event_type = success and BIReport.ACCOUNT_OPT_TYPE.BIND_SUCCESS or BIReport.ACCOUNT_OPT_TYPE.BIND_FAILED, + } + self:report(EVENT_NAME_ACCOUNT_OPT, args) +end + +function BIReport:postAccountChangeClick(loginType) + local args = { + login_type = loginType, + event_type = BIReport.ACCOUNT_OPT_TYPE.CLICK_CHANGE_ACCOUNT, + } + self:report(EVENT_NAME_ACCOUNT_OPT, args) +end + +function BIReport:postAccountChangeFinish(loginType, success) + local args = { + login_type = loginType, + event_type = success and BIReport.ACCOUNT_OPT_TYPE.CHANGE_ACCOUNT_SUCCESS or BIReport.ACCOUNT_OPT_TYPE.CHANGE_ACCOUNT_FAILED, + } + self:report(EVENT_NAME_ACCOUNT_OPT, args) end return BIReport \ No newline at end of file diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index 092347ef..12cb89c1 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -33,6 +33,7 @@ EventManager.CUSTOM_EVENT = { GO_CHAPTER = "GO_CHAPTER", -- 跳转主线章节 CLOSE_BOX_HERO_UI = "CLOSE_BOX_HERO_UI", CLOSE_BOX_OPEN_UI = "CLOSE_BOX_OPEN_UI", + BIND_ACCOUNT_SUCCESS = "BIND_ACCOUNT_SUCCESS", -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" } diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 1743db0b..1329067a 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -49,6 +49,8 @@ local MODULE_PATHS = { MailManager = "app/module/mail/mail_manager", -- 玩家 PlayerManager = "app/module/player/player_manager", + -- 账号 + AccountManager= "app/module/account/account_manager", } -- 这里的key对应func_open里的id diff --git a/lua/app/common/sdk_manager.lua b/lua/app/common/sdk_manager.lua index 4b56d6b6..06d0f15d 100644 --- a/lua/app/common/sdk_manager.lua +++ b/lua/app/common/sdk_manager.lua @@ -370,7 +370,6 @@ function SDKManager:login(callback, loginType) Logger.log("三方当前正在登陆中") return end - self.isLogining = true self:_login(function(code, msg) if code == SDKManager.BF_LOGIN_RESULT.Success then @@ -388,7 +387,6 @@ function SDKManager:login(callback, loginType) self.isLogining = false return end - local userId = loginResult.UserId local token = loginResult.Token local params = {} @@ -430,12 +428,9 @@ function SDKManager:logout(callback, loginType) Logger.log("当前正在登出中") return end - self.isLogouting = true - - self:_logout(function(code, msg) - if (code == SDKManager.BF_LOGIN_RESULT.Success) then + if code == SDKManager.BF_LOGIN_RESULT.Success then if callback then callback() end @@ -443,9 +438,7 @@ function SDKManager:logout(callback, loginType) if msg and msg ~= "" then local jData = json.decode(msg) if jData then - local type = jData.loginType - local msg = jData.msg - Logger.logError("登出失败 result:%s type:%s msg:%s", code, type, msg) + Logger.logError("登出失败 result:%s type:%s msg:%s", code, jData.loginType, jData.msg) else Logger.logError("登出失败 result:%s", code) end diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index f5c984ff..12d558c3 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -9,27 +9,27 @@ local func_open = { }, ["task"]={ ["stage"]=3, - ["icon"]="main_task" + ["icon"]="module_unlock_task" }, ["act_level_gift"]={ ["level"]=5, - ["icon"]="main_act_level_gift" + ["icon"]="module_unlock_fund" }, ["idle_drop"]={ ["stage"]=2, - ["icon"]="main_idle_drop" + ["icon"]="module_unlock_idle" }, ["act_sevenday"]={ ["stage"]=2, - ["icon"]="main_act_sevenday" + ["icon"]="module_unlock_sevenday" }, ["mall"]={ ["stage"]=2, ["pop_ups"]=1 }, ["mall_daily"]={ - ["stage"]=5, - ["icon"]="main_mall_daily" + ["stage"]=4, + ["icon"]="module_unlock_dailyshop" }, ["store_box_open"]={ ["stage"]=2, @@ -40,8 +40,8 @@ local func_open = { ["pop_ups"]=1 }, ["daily_challenge"]={ - ["stage"]=8, - ["icon"]="main_daily_challenge" + ["stage"]=4, + ["icon"]="module_unlock_dailychallenge" }, ["act_gift_show_open"]={ ["stage"]=3, diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index de73f824..9e37b11f 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -433,9 +433,24 @@ local fx = { [300034]={ ["res"]="sfx_p0007_b05", ["bind"]="root" + }, + [300035]={ + ["res"]="sfx_p0004_b01", + ["bind"]="root", + ["flip"]=1 + }, + [300036]={ + ["res"]="sfx_p0004_b03", + ["bind"]="root", + ["flip"]=1 + }, + [300037]={ + ["res"]="sfx_p0004_b04", + ["bind"]="root", + ["flip"]=1 } } local config = { -data=fx,count=108 +data=fx,count=111 } return config \ No newline at end of file diff --git a/lua/app/config/grid_type.lua b/lua/app/config/grid_type.lua index 48f17c62..9dda1f1c 100644 --- a/lua/app/config/grid_type.lua +++ b/lua/app/config/grid_type.lua @@ -173,6 +173,7 @@ local grid_type = { ["bftc_icon"]="battle_obstacle_lamp", ["cant_link"]=1, ["element_invalid"]=1, + ["break_sfx"]="sfx_piece_za_b01", ["effect"]=3, ["effect_trigger"]=2 }, diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 5332f70a..df22f7a1 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -77,38 +77,38 @@ local hero = { ["rouge_skill_7"]=1300107, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0014", ["icon"]="6", @@ -136,38 +136,38 @@ local hero = { ["rouge_skill_7"]=1300207, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0009", ["icon"]="11", @@ -195,38 +195,38 @@ local hero = { ["rouge_skill_7"]=1400107, ["begin_lv"]=5, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, - 5160000, - 5760000, - 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, - 2580000, - 2880000, - 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 }, ["model_id"]="p0011", ["icon"]="16", @@ -311,38 +311,38 @@ local hero = { ["rouge_skill_7"]=2300107, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0010", ["icon"]="12", @@ -370,38 +370,38 @@ local hero = { ["rouge_skill_7"]=2300207, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0012", ["icon"]="7", @@ -429,38 +429,38 @@ local hero = { ["rouge_skill_7"]=2400107, ["begin_lv"]=5, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, - 5160000, - 5760000, - 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, - 2580000, - 2880000, - 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 }, ["model_id"]="p0007", ["icon"]="17", @@ -546,38 +546,38 @@ local hero = { ["rouge_skill_7"]=3300107, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0006", ["icon"]="8", @@ -605,38 +605,38 @@ local hero = { ["rouge_skill_7"]=3300207, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0020", ["icon"]="13", @@ -664,38 +664,38 @@ local hero = { ["rouge_skill_7"]=3400107, ["begin_lv"]=5, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, - 5160000, - 5760000, - 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, - 2580000, - 2880000, - 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 }, ["model_id"]="p0016", ["icon"]="18", @@ -781,38 +781,38 @@ local hero = { ["rouge_skill_7"]=4300107, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0022", ["icon"]="9", @@ -840,38 +840,38 @@ local hero = { ["rouge_skill_7"]=4300207, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0021", ["icon"]="14", @@ -899,38 +899,38 @@ local hero = { ["rouge_skill_7"]=4400107, ["begin_lv"]=5, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, - 5160000, - 5760000, - 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, - 2580000, - 2880000, - 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 }, ["model_id"]="p0008", ["icon"]="19", @@ -1017,38 +1017,38 @@ local hero = { ["rouge_skill_7"]=5300107, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0015", ["icon"]="10", @@ -1076,38 +1076,38 @@ local hero = { ["rouge_skill_7"]=5300207, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, + 3000000, + 3520000, + 4040000, + 4580000, 5160000, 5760000, 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 7120000, + 7900000, + 8760000, + 9700000, + 10740000, + 11920000, + 13220000, + 14700000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, + 1500000, + 1760000, + 2020000, + 2290000, 2580000, 2880000, 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3560000, + 3950000, + 4380000, + 4850000, + 5370000, + 5960000, + 6610000, + 7350000 }, ["model_id"]="p0019", ["icon"]="15", @@ -1135,38 +1135,38 @@ local hero = { ["rouge_skill_7"]=5400107, ["begin_lv"]=5, ["hp"]={ - 2000000, - 2400000, - 2800000, - 3220000, - 3660000, - 4120000, - 4620000, - 5160000, - 5760000, - 6420000, - 7140000, - 7940000, - 8840000, - 9840000, - 10980000 + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 }, ["atk"]={ - 1000000, - 1200000, - 1400000, - 1610000, - 1830000, - 2060000, - 2310000, - 2580000, - 2880000, - 3210000, - 3570000, - 3970000, - 4420000, - 4920000, - 5490000 + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 }, ["model_id"]="p0023", ["icon"]="20", diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 013e3660..2a8600f8 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -321,7 +321,7 @@ local item = { [18]={ ["type"]=4, ["qlt"]=1, - ["icon"]="11", + ["icon"]="18", ["reward"]={ { ["type"]=1, diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index aac8c9ff..659feef3 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -189,6 +189,11 @@ local LocalizationGlobalConst = BOUNTY_TITLE = "BOUNTY_TITLE", REMAIN_TIME = "REMAIN_TIME", BATTLE_DESC_11 = "BATTLE_DESC_11", + NO_NETWORK = "NO_NETWORK", + NETWORK_ERROE_1 = "NETWORK_ERROE_1", + NO_ADS = "NO_ADS", + BESURE_DELETE_TIPS_DESC = "BESURE_DELETE_TIPS_DESC", + BESURE_DELETE_ACCOUNT_DESC = "BESURE_DELETE_ACCOUNT_DESC", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 8970563b..a6562440 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -2217,7 +2217,7 @@ local skill = { ["effect"]={ { ["type"]="dmg_addition_green_add", - ["num"]=2000, + ["num"]=5000, ["ratio"]=10000, ["round"]=1 } @@ -2829,7 +2829,8 @@ local skill = { ["energy"]=10, ["link"]=1, ["position"]=3, - ["method"]=2, + ["method"]=1, + ["skill_type"]=0, ["battle_icon"]="18", ["effect_type"]=1, ["trigger"]=1, @@ -2921,6 +2922,57 @@ local skill = { }, ["obj"]=2 }, + [3400125]={ + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=2 + }, + { + ["type"]=2, + ["range"]=2 + } + }, + ["battle_icon"]="18", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=43750, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["eliminate_effect"]={ + { + ["type"]="dmg_addition_all_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["eliminate_obj"]=1, + ["skill_position"]=1, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]=2200120, + ["name_act"]="skill01", + ["fx_self"]=300008, + ["fx_target"]=4, + ["fx_target_delay"]=1100, + ["bullet_time"]={ + 1100, + 3000, + 400 + } + }, [4200110]={ ["position"]=4, ["effect_type"]=1, @@ -3192,11 +3244,8 @@ local skill = { ["energy"]=10, ["link"]=1, ["position"]=4, - ["method"]=2, - ["skill_type"]=4, - ["boardrange"]={ - - }, + ["method"]=1, + ["skill_type"]=0, ["battle_icon"]="9", ["effect_type"]=1, ["trigger"]=1, @@ -3299,6 +3348,47 @@ local skill = { ["obj"]=1, ["skill_position"]=2 }, + [4300125]={ + ["energy"]=10, + ["link"]=1, + ["position"]=4, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + { + ["type"]=3, + ["range"]=2 + }, + { + ["type"]=4, + ["range"]=2 + } + }, + ["battle_icon"]="9", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="normal_attack_dec", + ["num"]=1, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]=4200120, + ["name_act"]="skill01", + ["fx_target"]=300011 + }, [4300210]={ ["position"]=4, ["effect_type"]=1, @@ -4242,7 +4332,7 @@ local skill = { ["effect"]={ { ["type"]="counterattack", - ["num"]=5000, + ["num"]=2500, ["ratio"]=5000, ["round"]=2 } @@ -4287,7 +4377,7 @@ local skill = { ["effect"]={ { ["type"]="counterattack", - ["num"]=5000, + ["num"]=2500, ["ratio"]=10000, ["round"]=2 } @@ -4717,7 +4807,7 @@ local skill = { ["effect"]={ { ["type"]="counterattack", - ["num"]=5000, + ["num"]=2500, ["ratio"]=10000, ["round"]=999 } @@ -6308,7 +6398,7 @@ local skill = { ["effect"]={ { ["type"]="counterattack", - ["num"]=5000, + ["num"]=2500, ["ratio"]=10000, ["round"]=2 } @@ -6361,7 +6451,7 @@ local skill = { ["effect"]={ { ["type"]="counterattack", - ["num"]=5000, + ["num"]=2500, ["ratio"]=10000, ["round"]=2 } @@ -11874,7 +11964,7 @@ local skill = { ["shake_type"]=1, ["sound_hit"]=5200111, ["name_act"]="attack01", - ["fx_target"]=300013 + ["fx_target"]=300035 }, [40030]={ ["effect_type"]=1, @@ -11893,7 +11983,7 @@ local skill = { ["shake_type"]=1, ["sound_hit"]=5200112, ["name_act"]="attack02", - ["fx_target"]=300013 + ["fx_target"]=300035 }, [40031]={ ["effect_type"]=1, @@ -11912,7 +12002,7 @@ local skill = { ["shake_type"]=1, ["sound_hit"]=5200113, ["name_act"]="attack03", - ["fx_target"]=300014 + ["fx_target"]=300036 }, [40032]={ ["effect_type"]=1, @@ -11931,7 +12021,7 @@ local skill = { ["shake_type"]=1, ["sound_hit"]=5200114, ["name_act"]="attack04", - ["fx_target"]=300015 + ["fx_target"]=300037 }, [40033]={ ["effect_type"]=1, @@ -12087,6 +12177,6 @@ local skill = { } } local config = { -data=skill,count=570 +data=skill,count=572 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index d096b950..8cbc25ca 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -2138,18 +2138,11 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=2, - ["skill_position"]=3, - ["boardrange"]={ - { - ["type"]=1, - ["range"]=2 - }, - { - ["type"]=2, - ["range"]=2 - } + ["type"]=1, + ["parameter"]={ + 3400125 }, + ["skill_position"]=3, ["icon"]="151" }, [3400103]={ @@ -2379,18 +2372,11 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=2, - ["skill_position"]=4, - ["boardrange"]={ - { - ["type"]=3, - ["range"]=2 - }, - { - ["type"]=4, - ["range"]=2 - } + ["type"]=1, + ["parameter"]={ + 4300125 }, + ["skill_position"]=4, ["icon"]="87" }, [4300102]={ diff --git a/lua/app/config/strings/cn/buff_daily_challenge.lua b/lua/app/config/strings/cn/buff_daily_challenge.lua index 358151aa..1985e8f7 100644 --- a/lua/app/config/strings/cn/buff_daily_challenge.lua +++ b/lua/app/config/strings/cn/buff_daily_challenge.lua @@ -1,45 +1,45 @@ local buff_daily_challenge = { [1]={ - ["desc"]="获取经验+10%" + ["desc"]="获取经验+10%" }, [2]={ - ["desc"]="所有伤害+5%" + ["desc"]="所有伤害+5%" }, [3]={ - ["desc"]="受到所有伤害-10%" + ["desc"]="受到所有伤害-10%" }, [4]={ - ["desc"]="暴击率+20%，暴击伤害+30%" + ["desc"]="暴击率+20%，暴击伤害+30%" }, [5]={ - ["desc"]="技能伤害+15%" + ["desc"]="技能伤害+15%" }, [6]={ - ["desc"]="回合开始前生命值+1%" + ["desc"]="回合开始前生命值恢复1%" }, [7]={ - ["desc"]="生命值恢复效果+5%" + ["desc"]="生命值恢复效果提升5%" }, [8]={ - ["desc"]="回合开始前生命值+1%" + ["desc"]="回合开始前生命值恢复1%" }, [9]={ - ["desc"]="敌方攻击力+5%" + ["desc"]="敌方攻击力+5%" }, [10]={ - ["desc"]="敌方造成伤害+5%" + ["desc"]="敌方造成伤害+5%" }, [11]={ - ["desc"]="敌方普攻次数+1" + ["desc"]="敌方普攻次数+1" }, [12]={ - ["desc"]="治疗效果-10%" + ["desc"]="治疗效果-10%" }, [13]={ - ["desc"]="敌方格挡概率+5%" + ["desc"]="敌方格挡概率+5%" }, [14]={ - ["desc"]="受到所有伤害-5%" + ["desc"]="受到所有伤害-5%" } } local config = { diff --git a/lua/app/config/strings/cn/func_open.lua b/lua/app/config/strings/cn/func_open.lua index 0f49067e..c304c324 100644 --- a/lua/app/config/strings/cn/func_open.lua +++ b/lua/app/config/strings/cn/func_open.lua @@ -1,46 +1,51 @@ local func_open = { - ["bounty"]={ - ["name"]="战令", - ["desc"]="大陆贸易点，可购买多种道具" + ["act_gold_pig"]={ + ["name"]="金猪" + }, + ["bounty_open"]={ + ["name"]="战令" }, ["task"]={ - ["name"]="任务", - ["desc"]="呼朋唤友，集结各方力量" + ["name"]="任务" }, ["act_level_gift"]={ - ["name"]="成长基金", - ["desc"]="帝国科技，打造理想装备" + ["name"]="成长基金" }, ["idle_drop"]={ - ["name"]="挂机", - ["desc"]="快速获取游戏道具" + ["name"]="挂机奖励" }, ["act_sevenday"]={ - ["name"]="七天乐", - ["desc"]="团队作战" + ["name"]="七天乐" }, ["mall"]={ - ["name"]="商城", - ["desc"]="玩家对决，为荣誉而战" + ["name"]="商城" }, ["mall_daily"]={ - ["name"]="商城每日商店", - ["desc"]="突破极限，创新记录" + ["name"]="每日特惠" }, - ["store_box"]={ - ["name"]="商城普通宝箱+精致宝箱", - ["desc"]="战斗速度增加一倍" + ["store_box_open"]={ + ["name"]="商城宝箱" }, - ["store_box_3"]={ - ["name"]="商城珍贵宝箱", - ["desc"]="解放双手，策略制胜" + ["store_box_3_open"]={ + ["name"]="珍贵宝箱" }, ["daily_challenge"]={ - ["name"]="每日挑战开启章节", - ["desc"]="多方成长，强化英雄" + ["name"]="每日挑战" + }, + ["act_gift_show_open"]={ + ["name"]="弹窗礼包" + }, + ["first_charge"]={ + ["name"]="首充礼包" + }, + ["new_player_gift"]={ + ["name"]="新手礼包" + }, + ["mail_open"]={ + ["name"]="邮箱" } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 00598ea5..80d90981 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -189,6 +189,11 @@ local localization_global = ["BOUNTY_TITLE"] = "通行证", ["REMAIN_TIME"] = "剩余时间：{0}", ["BATTLE_DESC_11"] = "神秘宝箱", + ["NO_NETWORK"] = "无网络连接，请连接网络后重试", + ["NETWORK_ERROE_1"] = "服务器通信繁忙，请稍后重试", + ["NO_ADS"] = "新广告还没有准备好", + ["BESURE_DELETE_TIPS_DESC"] = "是否要删除账号，删除后将清除所有信息和内容，账号重新登陆后将是初始1级新手状态。如果确定请输入“{0}”", + ["BESURE_DELETE_ACCOUNT_DESC"] = "确认删除", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/hero.lua b/lua/app/config/strings/cn/hero.lua index 11d6bf5f..60cb1454 100644 --- a/lua/app/config/strings/cn/hero.lua +++ b/lua/app/config/strings/cn/hero.lua @@ -1,83 +1,83 @@ local hero = { [12001]={ ["name"]="舞娘", - ["desc"]="舞娘起舞，轻盈的舞步甩在敌人的脸上。" + ["desc"]="扇子好看吗，打人的时候更好看哟。" }, [13001]={ ["name"]="克劳德", - ["desc"]="克劳德挥舞大剑，剑气形成旋风，灼灼逼人。" + ["desc"]="他一跃而起，扛起巨剑，犹如旋风般使出连击。" }, [13002]={ ["name"]="火旺", - ["desc"]="火旺擅长炎拳，拳拳带火花，有谁不服，就是邦邦两拳。" + ["desc"]="有谁不服，就是梆梆两拳，打到服为止，打不过另说。" }, [14001]={ ["name"]="亚历山大", - ["desc"]="亚历山大的装备，可不是用来好看的。" + ["desc"]="没人能抗住亚历山大的钢铁重击，如果扛住了，那就再来一击。" }, [22001]={ ["name"]="刀妹", - ["desc"]="刀妹使用一次拔刀斩终结技，造成大量伤害。" + ["desc"]="剑一出鞘，必要见血。" }, [23001]={ ["name"]="野蛮人", - ["desc"]="野蛮人的多段伤害，附加流血。" + ["desc"]="最有效的伤害，往往要采用最朴素的殴打方式。" }, [23002]={ ["name"]="二丫", - ["desc"]="二丫的链接可以增伤。" + ["desc"]="牛仔的击剑术，敌人和我，只能活一个" }, [24001]={ ["name"]="巨剑魔童", - ["desc"]="巨剑魔童可以造成大量伤害，并概率眩晕敌人。" + ["desc"]="我可能拿不起巨剑，但不妨碍我用它轰人。" }, [32001]={ ["name"]="洋葱头", - ["desc"]="洋葱头使用一次长枪突刺终结技，造成大量伤害并恢复自身血量。" + ["desc"]="盾牌只是为了掩饰下一次突刺。" }, [33001]={ ["name"]="小鹿", - ["desc"]="小鹿的急速治疗法，起死回生不过一瞬。" + ["desc"]="温柔又单纯的森林子民，与生俱来的是治疗的能力。" }, [33002]={ ["name"]="森林狼", - ["desc"]="森林狼的链接可以增伤，概率附加易伤效果。" + ["desc"]="嗷嗷嗷嗷嗷嗷嗷嗷嗷——————。" }, [34001]={ ["name"]="木兰", - ["desc"]="木兰的链接可以增伤，并附加易伤效果。" + ["desc"]="这一箭下去你可能会死。" }, [42001]={ ["name"]="冰心", - ["desc"]="冰心的攻击随机消除额外元素，并造成伤害，有概率冰冻敌人。" + ["desc"]="我的心和我的法术一样冰冷。" }, [43001]={ ["name"]="冰女", - ["desc"]="冰女的攻击附加冰霜，并增加灼烧伤害。" + ["desc"]="我喜欢冰块，你也要来一块吗。" }, [43002]={ ["name"]="鸦姐", - ["desc"]="鸦姐的攻击一定给敌人附加腐败状态。" + ["desc"]="我这把可是沾满毒药的匕首。" }, [44001]={ ["name"]="寒冰妖姬", - ["desc"]="寒冰妖姬随机消除元素，释放一次附带冰霜效果的剑舞攻击。" + ["desc"]="有人持剑起舞，寒冰妖姬用剑让敌人起舞。" }, [52001]={ ["name"]="忍者伦", - ["desc"]="忍者伦生成的魔法罩可以承受伤害。" + ["desc"]="虽然带的是手里剑，但是最擅长的还是护盾术，忍者伦最大的愿望还是世界和平。" }, [53001]={ ["name"]="魔女琪琪", - ["desc"]="魔女琪琪的扫帚攻击命中可以附加负面负面状态。" + ["desc"]="魔女琪琪的魔法扫帚，不仅能扫地，还能扫人。" }, [53002]={ ["name"]="灵魂猎手", - ["desc"]="灵魂猎手攻击冰霜敌人概率冰冻敌人。" + ["desc"]="这玩意儿可比用牙吸血好用多啦。" }, [54001]={ ["name"]="蝴蝶", - ["desc"]="蝴蝶的技能可以随机增加技能的能量。" + ["desc"]="蝴蝶破茧而出，美丽又坚韧，坚韧的不止是内心，还有手里同样美丽的长刀。" } } local config = { diff --git a/lua/app/config/strings/de/func_open.lua b/lua/app/config/strings/de/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/de/func_open.lua +++ b/lua/app/config/strings/de/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua index 6b5bf41c..b829dfe4 100644 --- a/lua/app/config/strings/en/buff.lua +++ b/lua/app/config/strings/en/buff.lua @@ -1,122 +1,152 @@ local buff = { [7]={ ["id"]=7, + ["desc"]="Red Resistance: Reduces damage taken from Red element heroes by {0}.", ["name"]="dec_dmg_red_add" }, [8]={ ["id"]=8, + ["desc"]="Yellow Resistance: Reduces damage taken from Yellow element heroes by {0}.", ["name"]="dec_dmg_yellow_add" }, [9]={ ["id"]=9, + ["desc"]="Green Resistance: Reduces damage taken from Green element heroes by {0}.", ["name"]="dec_dmg_green_add" }, [10]={ ["id"]=10, + ["desc"]="Blue Resistance: Reduces damage taken from Blue element heroes by {0}.", ["name"]="dec_dmg_blue_add" }, [11]={ ["id"]=11, + ["desc"]="Purple Resistance: Reduces damage taken from Purple element heroes by {0}.", ["name"]="dec_dmg_purple_add" }, [12]={ ["id"]=12, + ["desc"]="Ultimate Resistance: Reduces damage taken from all heroes by {0}.", ["name"]="dec_dmg_all_add" }, [24]={ ["id"]=24, + ["desc"]="Damage Increased: The damage dealt is increased by {0}.", ["name"]="dmg_addition_all_add" }, [33]={ ["id"]=33, + ["desc"]="Stun: Unable to take any action this turn.", ["name"]="stun" }, [34]={ ["id"]=34, + ["desc"]="Shield: Absorbs damage up to {0} of Max HP.", ["name"]="shield" }, [36]={ ["id"]=36, + ["desc"]="Freeze: Normal attack -{0}.", ["name"]="normal_attack_dec" }, [37]={ ["id"]=37, + ["desc"]="Rage: Normal attack +{0}.", ["name"]="normal_attack_add" }, [47]={ ["id"]=47, + ["desc"]="Counter Shield: Absorbs damage up to {0} of Max HP and reflects 200% of the damage back to the enemy.", ["name"]="shield_rebound_200" }, [48]={ ["id"]=48, + ["desc"]="Burn: Inflicts damage equal to {0} of the caster's attack at the end of the turn.", ["name"]="burn" }, [49]={ ["id"]=49, + ["desc"]="Vulnerable: Increases all damage taken by {0}.", ["name"]="vulnerable" }, [50]={ ["id"]=50, + ["desc"]="Frozen: Unable to take any action and buff won't take effect this turn.", ["name"]="frozen" }, [51]={ ["id"]=51, + ["desc"]="Poisoned: Inflicts damage equal to {0} of the caster's attack at the end of the turn.", ["name"]="poison" }, [52]={ ["id"]=52, + ["desc"]="Imprison: Can only use normal attack this turn.", ["name"]="imprison" }, [53]={ ["id"]=53, + ["desc"]="Corruption: Reduces HP recovery effect by {0}.", ["name"]="corrupt" }, [54]={ ["id"]=54, + ["desc"]="Bleed: Restores the attacker's HP upon hit and deals damage equal to {0} of the attacker's attack at the end of the turn.", ["name"]="bleed" }, [55]={ ["id"]=55, + ["desc"]="Weak: Reduces damage dealt by {0}.", ["name"]="weaken" }, [56]={ ["id"]=56, + ["desc"]="Drowsy: Unable to take any action this turn until getting hit.", ["name"]="lethargy" }, [57]={ ["id"]=57, + ["desc"]="Curse: Attacks will not deal damage but instead heal the opponent.", ["name"]="curse" }, [58]={ ["id"]=58, + ["desc"]="Lock: Locks a random color on the board that cannot be selected later.", ["name"]="lock" }, [59]={ ["id"]=59, + ["desc"]="Head-start: Act first every turn.", ["name"]="first_hand" }, [61]={ ["id"]=61, + ["desc"]="Undead: Does not die from fatal damage.", ["name"]="undead" }, [62]={ ["id"]=62, + ["desc"]="Counterattack: Has a {0} chance to counterattack after taking direct damage.", ["name"]="counterattack" }, [63]={ ["id"]=63, + ["desc"]="Damage Counter: Reflects {0} of the enemy's damage.", ["name"]="thorns" }, [73]={ ["id"]=73, + ["desc"]="Counter Shield: Absorbs damage up to {0} of Max HP and reflects 400% of the enemy's damage.", ["name"]="shield_rebound_400" }, [74]={ ["id"]=74, + ["desc"]="Freeze Shield: Absorbs damage up to {0} of Max HP.", ["name"]="shield_ice" }, [75]={ ["id"]=75, + ["desc"]="Freeze Shield: Absorbs damage up to {0} of Max HP and reflects 400% of the enemy's damage.", ["name"]="shield_ice_rebound_400" } } diff --git a/lua/app/config/strings/en/buff_daily_challenge.lua b/lua/app/config/strings/en/buff_daily_challenge.lua index b83bf3ba..f332d6c9 100644 --- a/lua/app/config/strings/en/buff_daily_challenge.lua +++ b/lua/app/config/strings/en/buff_daily_challenge.lua @@ -1,45 +1,45 @@ local buff_daily_challenge = { [1]={ - + ["desc"]="EXP gained +10%" }, [2]={ - + ["desc"]="All damage +5%" }, [3]={ - + ["desc"]="all damage taken -10%" }, [4]={ - + ["desc"]="Crti Rate +20%, Crit Damage +30%" }, [5]={ - + ["desc"]="Skill damage +15%" }, [6]={ - + ["desc"]="HP recovers 1% when turn begins" }, [7]={ - + ["desc"]="HP recovery effect increases by 5%" }, [8]={ - + ["desc"]="HP recovers 1% when turn begins" }, [9]={ - + ["desc"]="Enemy Attack +5%" }, [10]={ - + ["desc"]="Enemy damage dealt +5%" }, [11]={ - + ["desc"]="Enemy normal attacks +1" }, [12]={ - + ["desc"]="Healing effect -10%" }, [13]={ - + ["desc"]="Enemy block rate +5%" }, [14]={ - + ["desc"]="all damage taken -5%" } } local config = { diff --git a/lua/app/config/strings/en/chapter.lua b/lua/app/config/strings/en/chapter.lua index 9b628142..fbab83ed 100644 --- a/lua/app/config/strings/en/chapter.lua +++ b/lua/app/config/strings/en/chapter.lua @@ -1,93 +1,93 @@ local chapter = { [1]={ - + ["name"]="1. Town Square" }, [2]={ - + ["name"]="2. Town Fortress" }, [3]={ - + ["name"]="3. Town Mine" }, [4]={ - + ["name"]="4. Dark Mine" }, [5]={ - + ["name"]="5. Empire Border" }, [6]={ - + ["name"]="6. Snowy Jungle (West)" }, [7]={ - + ["name"]="7. Snowy Jungle (East)" }, [8]={ - + ["name"]="8. Castle Perimeter" }, [9]={ - + ["name"]="9. Castle Main Gate" }, [10]={ - + ["name"]="10. Empire Castle" }, [11]={ - + ["name"]="11. Castle Depths" }, [12]={ - + ["name"]="12. Castle Secret Passage" }, [13]={ - + ["name"]="13. Secret Passage Exit" }, [14]={ - + ["name"]="14. Castle Lakeside" }, [15]={ - + ["name"]="15. East Shore" }, [16]={ - + ["name"]="16. Corrupted Swamp" }, [17]={ - + ["name"]="17. Swamp Ruins" }, [18]={ - + ["name"]="18. Rainforest Entrance" }, [19]={ - + ["name"]="19. Rainforest" }, [20]={ - + ["name"]="20. Giant Temple" }, [21]={ - + ["name"]="21. South of Temple" }, [22]={ - + ["name"]="22. Mysterious Altar" }, [23]={ - + ["name"]="23. Demon Altar" }, [24]={ - + ["name"]="24. Strange Cave" }, [25]={ - + ["name"]="25. Deep Cave" }, [26]={ - + ["name"]="26. Demon City West Street" }, [27]={ - + ["name"]="27. Demon City East Street" }, [28]={ - + ["name"]="28. Demon City Center" }, [29]={ - + ["name"]="29. Demon City Pathway" }, [30]={ - + ["name"]="30. Demon City Exit" } } local config = { diff --git a/lua/app/config/strings/en/func_open.lua b/lua/app/config/strings/en/func_open.lua index eb782ebc..472ab227 100644 --- a/lua/app/config/strings/en/func_open.lua +++ b/lua/app/config/strings/en/func_open.lua @@ -1,36 +1,51 @@ local func_open = { - ["bounty"]={ - ["desc"]="Trading Spot of the continent." + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ + }, ["task"]={ - ["desc"]="Gather friends to unify strength." + }, ["act_level_gift"]={ - ["desc"]="Empire technology to craft ideal gear." + }, ["idle_drop"]={ - ["desc"]="Get game items fast." + }, ["act_sevenday"]={ - ["desc"]="Team Battle" + }, ["mall"]={ - ["desc"]="Players duel. Fight for honor." + }, ["mall_daily"]={ - ["desc"]="Break limit. New record." + }, - ["store_box"]={ - ["desc"]="Battle speed doubles" + ["store_box_open"]={ + }, - ["store_box_3"]={ - ["desc"]="Free up your hands." + ["store_box_3_open"]={ + }, ["daily_challenge"]={ - ["desc"]="Multiple growth to strengthen heroes." + + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 6358f098..caa7ce8d 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -56,9 +56,82 @@ local localization_global = ["CLICK_COPY_ACOUNT_DESC"] = "Click to copy your PlayerID", ["APP"] = "Version:", ["CHAPTER_DESC_1"] = "The Best Record: {0}", - ["ACT_SEVENDAY_TITLE"] = "HAPPY SEVENDAY", - ["BTN_CLAIM"] = "CLAIM", - ["BTN_DONE"] = "GOT", + ["SETTING_DESC"] = "Settings", + ["SETTING_DESC_MUSIC"] = "Music", + ["SETTING_DESC_VOICE"] = "Sound", + ["SETTING_DESC_LANGUAGE"] = "Language", + ["SERVICE_DESC"] = "Terms of Use", + ["PRIVACY_DESC"] = "Privacy Policy", + ["CLIENT_VERSION"] = "Current Version: {0}", + ["BIND_ACCOUNT_DESC"] = "Bind Account", + ["CHANGE_ACCOUNT_DESC"] = "Switch Account", + ["DELETE_ACCOUNT_DESC"] = "Delete Account", + ["SETTING_DESC_1"] = "ID:{0}", + ["ACCOUNT_ALREADY_BINDED_DESC"] = "Registered", + ["LANGUAGE_DESC"] = "Language", + ["ACT_SEVENDAY_TITLE"] = "Server Carnival", + ["ACT_SEVENDAY_LEFTTIME"] = "Time Remaining: {0} day(s) {1} hour(s)", + ["ACT_SEVENDAY_TASK"] = "Quest Completed: {0}/{1}", + ["ACT_SEVENDAY_DESC"] = "New quests will be unlocked daily.", + ["BTN_CLAIM"] = "Obtain", + ["BTN_DONE"] = "Got", + ["BOUNTY_BUY_LEVEL_TITLE"] = "Confirm Level Unlock", + ["BOUNTY_BUY_LEVEL_COUNTENT"] = "Unlock current level immediately\nLevel rewards will be unlocked instantly, and your earned points will remain the same.", + ["BOUNTY_PURCHASE_NAME"] = "Golden Pass", + ["BOUNTY_DESC_1"] = "Unlock rewards and reward quests", + ["BOUNTY_DESC_2"] = "Obtain the Premium Pass to level up by 10 for richer rewards instantly!", + ["REWARD_BOX_DESC"] = "Reward Chest", + ["BOUNTY_DESC_3"] = "Upon completing all content of the Pass, you can receive a reward chest for every 1000 points.", + ["STR_MAX"] = "MAX", + ["ALREADY_ACTIVE"] = "Activated", + ["ACTIVE_BOUNTY"] = "Activate Golden Pass", + ["BOUNTY_FREE_NAME"] = "Free Pass", + ["CONFIRM_IGNORE"] = "Don't show again today", + ["MAIL_NAME"] = "Mailbox", + ["COLLET_REWARDS"] = "Claim Rewards", + ["TASK_NAME"] = "Mission", + ["TASK_DAILY"] = "Daily", + ["TASK_CHALLENGE"] = "Challenge", + ["TASK_HELP_1"] = "Refreshes daily and quest will be reset. Watch ads to refresh quests.", + ["STR_REFRESH"] = "Refresh", + ["STR_UNLOCK"] = "Unlock", + ["TASK_DESC_1"] = "Pass-exclusive Quest", + ["STR_COMPLETED"] = "Completed", + ["HERO_CARD_TIPS_DESC"] = "Possible Hero Card Rewards:", + ["HERO_CARD_DESC_QLT_2"] = "Uncommon Hero", + ["HERO_CARD_DESC_QLT_3"] = "Rare Hero", + ["HERO_CARD_DESC_QLT_4"] = "Epic Hero", + ["HERO_CARD_DESC_QLT_5"] = "Legendary Hero", + ["HERO_CARD_DESC_QLT_6"] = "Mythical Hero", + ["IDLE_DROP_REWARD"] = "AFK Rewards", + ["IDLE_DROP_DESC_1"] = "More chapters cleared brings greater rewards", + ["PER_HOUR"] = "{0}/ h", + ["IDLE_DROP_DESC_2"] = "Longest AFK: {0} hour(s)", + ["IDLE_QUICK"] = "Fast AFK", + ["IDLE_DROP_DESC_3"] = "Obtain {0} hours of AFK rewards immediately", + ["STR_FREE"] = "Free", + ["TODAY_REMAIN_TIMES"] = "{0} chance(s) left today", + ["BUY_ENERGY"] = "Buy Energy", + ["MAIL_TITLE"] = "Mailbox", + ["BTN_DELETE_ALL_READ_MAIL"] = "Delete Read", + ["BTN_CLAIM_ALL"] = "Claim All", + ["BTN_READ"] = "Read", + ["BATTLE_DESC_9"] = "{0} Attack: {1}", + ["BATTLE_DESC_10"] = "Activated Effect", + ["BLOCK_DESC"] = "Block", + ["COUNTER_ATTACK_DESC"] = "Counterattack", + ["EXPIRES_IN_HOURS"] = "Expires in {0} hour(s)", + ["EXTRA_REWARDS"] = "Extra Bonus", + ["PLAYER_LEVEL_UP_DESC"] = "Congrats on reaching level {0}", + ["LEVEL_UP_REWARD"] = "Level-Up Rewards", + ["CLICK_TO_CONTINUE"] = "Tap to continue", + ["BOUNTY_DESC_4"] = "Buying this pass will exceed the pass level limit and result in loss. Confirm to buy it?", + ["RELOGIN"] = "Re-login", + ["GOLD_PIG_CLOSE_DESC"] = "Golden Pig has expired. Seize the next opportunity.", + ["GOLD_PIG_TITLE"] = "Super Value Golden Pig", + ["GOLD_PIG_DESC"] = "Challenge stages and collect Diamonds for a great deal.", + ["SIDE_BAR_FULL"] = "MAX", + ["DAILY_CHALLENGE"] = "Daily Challenge", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/hero.lua b/lua/app/config/strings/en/hero.lua index fe5b3598..5999c582 100644 --- a/lua/app/config/strings/en/hero.lua +++ b/lua/app/config/strings/en/hero.lua @@ -1,63 +1,83 @@ local hero = { [12001]={ - + ["name"]="Dancer", + ["desc"]="Does the fan look good? It looks even better when using it to hit someone." }, [13001]={ - + ["name"]="Claude", + ["desc"]="He jumped up, picked up the giant sword, and made a combo of blows like a whirlwind." }, [13002]={ - + ["name"]="Flare", + ["desc"]="If anyone challenges me, I'll just punch him until he is convinced, and it was another story if I defeated, of course." }, [14001]={ - + ["name"]="Alexander", + ["desc"]="No one can withstand Alexander's heavy blow of steel, and if he bears it, then hit again." }, [22001]={ - + ["name"]="Blade Maid", + ["desc"]="As soon as the sword is unsheathed, blood must be seen." }, [23001]={ - + ["name"]="Barbarian", + ["desc"]="The most effective damage often takes the simplest form of beating." }, [23002]={ - + ["name"]="Er-Ya", + ["desc"]="Cowboy fencing, the enemy and I, only one to live" }, [24001]={ - + ["name"]="Claymore Kid", + ["desc"]="I may not be able to hold the greatsword, but that doesn't stop me from blasting people with it." }, [32001]={ - + ["name"]="Onion", + ["desc"]="The shield is just to cover the next thrust." }, [33001]={ - + ["name"]="Fawn", + ["desc"]="The gentle and simple forest people are born with the ability to heal." }, [33002]={ - + ["name"]="Timberwolf", + ["desc"]="Aoooooooooooooooooooooooo!!!!!!!" }, [34001]={ - + ["name"]="Mulan", + ["desc"]="You may die with this arrow." }, [42001]={ - + ["name"]="Iceheart", + ["desc"]="My heart is as cold as my spells." }, [43001]={ - + ["name"]="Ice Maiden", + ["desc"]="I like ice cubes, would you like one too?" }, [43002]={ - + ["name"]="Raven", + ["desc"]="My dagger is covered in poison." }, [44001]={ - + ["name"]="Frost Enchantress", + ["desc"]="Someone danced with a sword, and Frost Enchantress used the sword to make the enemy dance." }, [52001]={ - + ["name"]="Ninja Lun", + ["desc"]="Although he is carrying a shuriken, he is best at shielding. Ninja Lun's greatest wish is world peace." }, [53001]={ - + ["name"]="Witch Kiki", + ["desc"]="Witch Kiki's magic broom can not only sweep the floor, but also sweep enemies." }, [53002]={ - + ["name"]="Soul Hunter", + ["desc"]="This thing is much better than sucking blood with teeth." }, [54001]={ - + ["name"]="Butterfly", + ["desc"]="The butterfly emerges from the cocoon, beautiful and tough, not only the heart is tough, but also the beautiful long knife in the hand." } } local config = { diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 6e5470a9..d0f8c844 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -13,114 +13,122 @@ local item = { }, [4]={ ["name"]="Outstanding Hero", - ["desc"]="Allows you to get an outstanding hero" + ["desc"]="Can obtain Uncommon Hero" }, [5]={ ["name"]="Rare Hero", - ["desc"]="Allows you to get a rare hero" + ["desc"]="Can obtain Rare Hero" }, [6]={ ["name"]="Epic Hero", - ["desc"]="Allows you to get an epic hero" + ["desc"]="Can obtain Epic Hero" }, [7]={ - + ["desc"]="Accumulated points can level up Pass." }, [8]={ - + ["desc"]="Can obtain heroes of the above qualities." }, [9]={ - + ["desc"]="Can obtain heroes of the above qualities." }, [10]={ - + ["desc"]="Hero chests adorned with gold." }, [11]={ - + ["desc"]="Powerful heroes are inside." }, [12]={ - + ["desc"]="Accumulate to a certain quantity for an upgrade." }, [13]={ - + ["desc"]="Used to open Normal Chest in the shop." }, [14]={ - + ["desc"]="Used to open Exquisite Chest in the shop." }, [15]={ - + ["desc"]="Used to open Precious Chest in the shop." }, [16]={ - + ["desc"]="Obtained by completing 5 daily quests." }, [17]={ - + ["desc"]="You can watch ads anywhere in the game to earn rewards." }, [18]={ - + ["desc"]="A huge Platinum Chest!" }, [19]={ - + ["desc"]="AFK rewards include random shards. The quantity and quality will increase with the progress of the stages." }, [12001]={ - ["name"]="Roxy Shard" + ["name"]="Roxy Shard", + ["desc"]="Dancer Shard, collect the shards to activate or upgrade." }, [13001]={ - ["name"]="Carla Shard" + ["name"]="Carla Shard", + ["desc"]="Claude Shard， collect the shards to activate or upgrade." }, [13002]={ - ["name"]="Great Sword Robert Shard" + ["name"]="Great Sword Robert Shard", + ["desc"]="Flare Shard, collect the shards to activate or upgrade." }, [14001]={ - ["name"]="Aske Shard" + ["name"]="Aske Shard", + ["desc"]="Alexander Shard, collect the shards to activate or upgrade." }, [22001]={ - ["name"]="Evelyn Shard" + ["name"]="Evelyn Shard", + ["desc"]="Blade Maid Shard, collect the shards to activate or upgrade." }, [23001]={ - ["name"]="Lilith Shard" + ["name"]="Lilith Shard", + ["desc"]="Barbarian Shard, collect the shards to activate or upgrade." }, [23002]={ - ["name"]="White-Hair Catherine Shard" + ["name"]="White-Hair Catherine Shard", + ["desc"]="Er-Ya Shard, collect the shards to activate or upgrade." }, [24001]={ - ["name"]="Allen Shard" + ["name"]="Allen Shard", + ["desc"]="Claymore Kid Shard, collect the shards to activate or upgrade." }, [32001]={ - + ["desc"]="Onion Shard, collect the shards to activate or upgrade." }, [33001]={ - + ["desc"]="Fawn Shard, collect the shards to activate or upgrade." }, [33002]={ - + ["desc"]="Timberwolf Shard, collect the shards to activate or upgrade." }, [34001]={ - + ["desc"]="Mulan Shard, collect the shards to activate or upgrade." }, [42001]={ - + ["desc"]="Iceheart Shard, collect the shards to activate or upgrade." }, [43001]={ - + ["desc"]="Ice Maiden Shard, collect the shards to activate or upgrade." }, [43002]={ - + ["desc"]="Raven Shard, collect the shards to activate or upgrade." }, [44001]={ - + ["desc"]="Frost Enchantress Shard, collect the shards to activate or upgrade." }, [52001]={ - + ["desc"]="Ninja Lun Shard, collect the shards to activate or upgrade." }, [53001]={ - + ["desc"]="Witch Kiki Shard, collect the shards to activate or upgrade." }, [53002]={ - + ["desc"]="Soul Hunter Shard, collect the shards to activate or upgrade." }, [54001]={ - + ["desc"]="Butterfly Shard, collect the shards to activate or upgrade." } } local config = { diff --git a/lua/app/config/strings/en/monster_base.lua b/lua/app/config/strings/en/monster_base.lua index 224fcc53..17cc71fa 100644 --- a/lua/app/config/strings/en/monster_base.lua +++ b/lua/app/config/strings/en/monster_base.lua @@ -174,76 +174,76 @@ local monster_base = { }, [20001]={ - + ["name"]="Jungle Divine Archer" }, [20002]={ - + ["name"]="Jungle Divine Hunter" }, [20003]={ - + ["name"]="Mighty Dragon" }, [20004]={ - + ["name"]="Elite Goblin" }, [20005]={ - + ["name"]="Ancient Fortress" }, [20006]={ - + ["name"]="Armor the Green Turtle" }, [20007]={ }, [20008]={ - + ["name"]="Rock Giant" }, [20009]={ - + ["name"]="Treant Priest" }, [20010]={ - + ["name"]="Fire Spirit Guardian" }, [20011]={ - + ["name"]="Goblin Golem" }, [20012]={ - + ["name"]="Skeleton King" }, [20013]={ - + ["name"]="Clown King" }, [20014]={ - + ["name"]="Steel Shield Chieftain (green)" }, [20015]={ - + ["name"]="Steel Shield Chieftain (red)" }, [20016]={ - + ["name"]="One-eyed Cyclone" }, [20017]={ - + ["name"]="Skeleton Mage" }, [20018]={ - + ["name"]="Vile Mage" }, [20019]={ - + ["name"]="Fire Spirit Swordsman" }, [20020]={ - + ["name"]="Fire Spirit King" }, [20021]={ - + ["name"]="Zhuo Yide DH" }, [20022]={ - + ["name"]="Yeti Blacksmith" }, [20023]={ }, [20024]={ - + ["name"]="Winged Demon" }, [20025]={ @@ -252,7 +252,7 @@ local monster_base = { }, [20027]={ - + ["name"]="Horton the Red Turtle" }, [20028]={ @@ -261,70 +261,70 @@ local monster_base = { }, [20030]={ - + ["name"]="Demon Shard" }, [20031]={ - + ["name"]="Demon Guardian" }, [20032]={ - + ["name"]="Ancient Demon" }, [30001]={ - + ["name"]="Onion" }, [30002]={ - + ["name"]="Blade Maid" }, [30003]={ - + ["name"]="Iceheart" }, [30004]={ - + ["name"]="Ninja Lun" }, [30005]={ - + ["name"]="Dancer" }, [30006]={ - + ["name"]="Fawn" }, [30007]={ - + ["name"]="Claymore Kid" }, [30008]={ - + ["name"]="Frost Enchantress" }, [30009]={ - + ["name"]="Flare" }, [30010]={ - + ["name"]="Barbarian" }, [30011]={ - + ["name"]="Alexander" }, [30012]={ - + ["name"]="Er-Ya" }, [30014]={ - + ["name"]="Claude" }, [30015]={ - + ["name"]="Witch Kiki" }, [30016]={ - + ["name"]="Mulan" }, [30017]={ }, [30019]={ - + ["name"]="Soul Hunter" }, [30020]={ - + ["name"]="Timberwolf" }, [30022]={ - + ["name"]="Ice Maiden" } } local config = { diff --git a/lua/app/config/strings/en/skill.lua b/lua/app/config/strings/en/skill.lua index 9b09cecb..ffbc7e45 100644 --- a/lua/app/config/strings/en/skill.lua +++ b/lua/app/config/strings/en/skill.lua @@ -1,42 +1,42 @@ local skill = { [1200120]={ - + ["desc"]="Dispersion Dance: Clear 5 grids horizontally and deal skill damage once." }, [1300120]={ - + ["desc"]="Claymore Cyclone: Deal skill damage multiple times." }, [1300220]={ - + ["desc"]="Flame Punch: Clear 5 grids vertically, dealing skill damage once, with a 50% chance to inflict Burn for 2 turns." }, [1400120]={ - + ["desc"]="Steel Strike: Change the color of 4 adjacent elements and deal massive skill damage multiple times." }, [2200120]={ - + ["desc"]="Unsheathe: Deal one additional hit of skill damage." }, [2300120]={ - + ["desc"]="Bone Cyclone: Deal skill damage multiple times." }, [2300220]={ - + ["desc"]="Phantom Blade: Increase the skill damage and deal skill damage multiple times." }, [2400120]={ - + ["desc"]="Claymore Crush: Deal one additional hit of massive skill damage." }, [3200120]={ - + ["desc"]="Lance Thrust: Deal one additional hit of skill damage." }, [3300120]={ - + ["desc"]="Rapid Recovery: Restore HP for this turn." }, [3300220]={ }, [3400120]={ - + ["desc"]="Moon Chaser: Increase damage and deal massive skill damage once." }, [4200120]={ - + ["desc"]="Elemental Link: Clear 3 random elements and deal skill damage once." }, [4300120]={ @@ -45,10 +45,10 @@ local skill = { }, [4400120]={ - + ["desc"]="Frost Sword Dance: Clear 3 random elements and deal skill damage once. Inflict Freeze for 1 turn." }, [5200120]={ - + ["desc"]="Shield Art: Apply a shield to the team for 1 turn." }, [5300120]={ diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 0b6eeeae..17897fe0 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -132,244 +132,244 @@ local skill_rogue = { ["desc"]="Turns 5 random Non-Purple elements into Purple" }, [1200100]={ - + ["desc"]="Unleashed Dispersion Dance: Clear 5 grids horizontally and deal skill damage once." }, [1200101]={ - + ["desc"]="Dispersion Danc has a 30% chance to burn enemies for 2 turns." }, [1200102]={ - + ["desc"]="When Dispersion Dance is used, normal attack damage increases by 10% for this turn." }, [1200103]={ - + ["desc"]="Dispersion Dance deals 50% more damage to freeze enemies." }, [1200104]={ - + ["desc"]="Dispersion Dance clears an additional 4 grids vertically." }, [1200105]={ - + ["desc"]="When Dispersion Dance links 5 or more elements, applies Rage to the team for 2 turns." }, [1200106]={ - + ["desc"]="Dancer's attack increases by 15%." }, [1200107]={ - + ["desc"]="The requirement to apply Rage with Dispersion Dance is reduced to linking more than 3 elements." }, [1300100]={ - + ["desc"]="Unleashed Claymore Cyclone: Deal skill damage multiple times." }, [1300101]={ - + ["desc"]="Claymore Cyclone can inflict Burn for 2 turns." }, [1300102]={ - + ["desc"]="Claymore Cyclone deals 50% more damage to bleeding enemies." }, [1300103]={ - + ["desc"]="Claymore Cyclone damage increases." }, [1300104]={ - + ["desc"]="Increase the damage of Burn inflicted by Claymore Cyclone." }, [1300105]={ - + ["desc"]="When Claymore Cyclone links 4 or more elements, increases damage by 30% for 2 turns." }, [1300106]={ - + ["desc"]="Claymore Cyclone damage increase effect lasts +1 turns." }, [1300107]={ - + ["desc"]="If Claymore Cyclone kills an enemy, grants the team Rage for 2 turns." }, [1300200]={ - + ["desc"]="Unleashed Flame Punch: Clear 5 grids vertically and deal skill damage once. Has a 50% chance to inflict Burn for 2 turns." }, [1300201]={ - + ["desc"]="Flame Punch clears an additional 4 grids horizontally." }, [1300202]={ - + ["desc"]="Flame Punch deals 50% more damage to imprisoned enemies." }, [1300203]={ - + ["desc"]="The chance of Burn inflicted by Flame Punch increases to 100%." }, [1300204]={ - + ["desc"]="Flame Punch clears an additional 2 grids vertically." }, [1300205]={ - + ["desc"]="Increase the damage of Burn inflicted by Flame Punch." }, [1300206]={ - + ["desc"]="Flare's attack increases by 15%." }, [1300207]={ - + ["desc"]="Flame Punch will be cast 2 times." }, [1400100]={ - + ["desc"]="Unleashed Steel Strike: Change the color of 4 adjacent elements and deal massive skill damage multiple times." }, [1400101]={ - + ["desc"]="Steel Strike can inflict Burn for 2 turns." }, [1400102]={ - + ["desc"]="Steel Strike applies the stun effect for 1 turns." }, [1400103]={ - + ["desc"]="Steel Strike deals 1 additional damage to bleeding enemies." }, [1400104]={ - + ["desc"]="Steel Strike stun effect lasts +1 turns." }, [1400105]={ - + ["desc"]="Increase the damage of Burn inflicted by Steel Strike. Lasts +1 turns." }, [1400106]={ - + ["desc"]="Alexander's attack increases by 15%." }, [1400107]={ - + ["desc"]="For every 4 elements linked, Steel Strike launches 1 Fireball to deal damage." }, [2200100]={ - + ["desc"]="Unleashed Unsheathe: Deal one additional hit of skill damage." }, [2200101]={ - + ["desc"]="Unsheathe damage increases." }, [2200102]={ - + ["desc"]="Unsheathe clears an additional 4 grids vertically." }, [2200103]={ - + ["desc"]="Unsheathe deals 50% more damage to burning enemies." }, [2200104]={ - + ["desc"]="Blade Maid's attack increases by 15%." }, [2200105]={ - + ["desc"]="Unsheathe will be cast 2 times." }, [2200106]={ - + ["desc"]="Unsheathe can clear additional 4 grids in the X direction." }, [2200107]={ - + ["desc"]="When Unsheathe links 5 or more elements, skill damage increases." }, [2300100]={ - + ["desc"]="Unleashed Cyclone Bone: Deal skill damage multiple times." }, [2300101]={ - + ["desc"]="Cyclone Bone can inflict Bleed for 2 turns." }, [2300102]={ - + ["desc"]="Cyclone Bone damage increases." }, [2300103]={ - + ["desc"]="Cyclone Bone has a 50% chance to stun Drowsy enemies for 1 turns." }, [2300104]={ - + ["desc"]="Cyclone Bone Bleed effect lasts +1 turns." }, [2300105]={ - + ["desc"]="For each 1 enemy that dies from bleeding, Barbarian's damage is increased by 10%." }, [2300106]={ - + ["desc"]="Cyclone Bone Stun effect lasts +1 turns." }, [2300107]={ - + ["desc"]="Barbarian's attack increases by 15%." }, [2300200]={ - + ["desc"]="Unleashed Phantom Blade: Increase the skill damage and deal skill damage multiple times." }, [2300201]={ - + ["desc"]="Phantom Blade can clear additional 4 grids in the X direction." }, [2300202]={ - + ["desc"]="Er-Ya's attack increases by 15%." }, [2300203]={ - + ["desc"]="When Phantom Blade is used, normal attack damage increases by 10% for this turn." }, [2300204]={ - + ["desc"]="Phantom Blade can clear additional 4 grids in the X direction." }, [2300205]={ - + ["desc"]="When Phantom Blade links 4 or more elements, critical rate increases by 20% for this turn." }, [2300206]={ - + ["desc"]="When Phantom Blade links 4 or more elements, critical rate increases by 30% for this turn." }, [2300207]={ - + ["desc"]="When Phantom Slash is used, critical damage against enemies with below 50% HP increases by 50% for this turn." }, [2400100]={ - + ["desc"]="Unleashed Claymore Crush: Deal one additional hit of massive skill damage." }, [2400101]={ - + ["desc"]="Claymore Crush can clear additional 4 grids in the X direction." }, [2400102]={ - + ["desc"]="Against frozen enemies, Claymore Crush's damage increases significantly and has a 50% chance to inflict Stun that lasts 1 turn." }, [2400103]={ - + ["desc"]="The chance of Stun inflicted by Claymore Crush increases to 70%." }, [2400104]={ - + ["desc"]="Claymore Kid's attack increases by 15%." }, [2400105]={ - + ["desc"]="Claymore Crush's damage increases significantly and has a 50% chance to inflict Imprison that lasts 1 turn." }, [2400106]={ - + ["desc"]="The chance of Imprison inflicted by Claymore Crush increases to 70%." }, [2400107]={ - + ["desc"]="Claymore Crush deals double damage." }, [3200100]={ - + ["desc"]="Unleashed Lance Thrust: Deal one additional hit of skill damage." }, [3200101]={ - + ["desc"]="Lance Thrust can restore HP." }, [3200102]={ - + ["desc"]="Lance Thrust deals 50% more damage to poisoned enemies." }, [3200103]={ - + ["desc"]="Lance Thrust damage increases." }, [3200104]={ - + ["desc"]="Lance Thrust can clear additional 4 grids in the X direction." }, [3200105]={ - + ["desc"]="Lance Thrust has a 30% chance to stun enemies for 1 turns." }, [3200106]={ - + ["desc"]="The chance of Stun inflicted by Lance Thrust increases by 20%." }, [3200107]={ - + ["desc"]="After Lance Thrust is used, the team gains 20% block for 2 turns." }, [3300100]={ - + ["desc"]="Unleashed Rapid Recovery: Restore HP for this turn." }, [3300101]={ - + ["desc"]="Rapid Recovery's HP recovery effect is increased." }, [3300102]={ - + ["desc"]="When Rapid Recovery is used, normal attack damage increases by 15% for this turn." }, [3300103]={ - + ["desc"]="Rapid Recovery can clear additional 4 grids in the X direction." }, [3300104]={ - + ["desc"]="Rapid Recovery increases additional skill damage to the team for 2 turns." }, [3300105]={ - + ["desc"]="When Rapid Recovery is used, normal attacks recover HP for this turn." }, [3300106]={ - + ["desc"]="Rapid Recovery skill damage increase effect lasts +1 turns." }, [3300107]={ - + ["desc"]="When Rapid Recovery links 5 or more elements, HP recovery effect increases." }, [3300200]={ @@ -396,52 +396,52 @@ local skill_rogue = { }, [3400100]={ - + ["desc"]="Unleashed Moonchaser: Increase damage and deal massive skill damage once." }, [3400101]={ - + ["desc"]="Moonchaser can inflict Vulnerable for 2 turns." }, [3400102]={ - + ["desc"]="Moonchaser clears an additional 4 grids vertically." }, [3400103]={ - + ["desc"]="Mulan's attack increases by 15%." }, [3400104]={ - + ["desc"]="Vulnerable effect of Moonchaser increases." }, [3400105]={ - + ["desc"]="Moonchaser can inflict Bleed for 2 turns." }, [3400106]={ - + ["desc"]="Bleed effect of Moonchaser increases." }, [3400107]={ - + ["desc"]="When Moonchaser links 4 or more elements, it will be cast by 2 times." }, [4200100]={ - + ["desc"]="Unleashed Elemental Link: Clear 3 random elements and deal skill damage once." }, [4200101]={ - + ["desc"]="Elemental Link clears 2 more random elements." }, [4200102]={ - + ["desc"]="When Elemental Link is used, normal attack damage increases by 10% for this turn." }, [4200103]={ - + ["desc"]="Elemental Link has a 50% chance to inflict freeze for 2 turns." }, [4200104]={ - + ["desc"]="Elemental Link clears 2 more random elements." }, [4200105]={ - + ["desc"]="Elemental Link has a 50% chance to inflict frozen to freeze enemies for 1 turn." }, [4200106]={ - + ["desc"]="Iceheart's attack increases by 15%." }, [4200107]={ - + ["desc"]="The chance of Frozen inflicted by Elemental Link increases to 40%." }, [4300100]={ @@ -492,52 +492,52 @@ local skill_rogue = { }, [4400100]={ - + ["desc"]="Unleashed Frost Sword Dance: Clear 3 random elements and deal skill damage once. Inflict Freeze for 1 turn." }, [4400101]={ - + ["desc"]="Frost Sword Dance Freeze effect lasts +1 turns." }, [4400102]={ - + ["desc"]="Frost Sword Dance deals 50% more damage to burning enemies." }, [4400103]={ - + ["desc"]="Frost Sword Dance clears 3 more random elements." }, [4400104]={ - + ["desc"]="Freeze effect of Frost Sword Dance increases." }, [4400105]={ - + ["desc"]="Frost Sword Dance has a 50% chance to inflict frozen for 2 turns." }, [4400106]={ - + ["desc"]="Frost Enchantress' attack increases by 15%." }, [4400107]={ - + ["desc"]="The chance of Frozen inflicted by Frost Sword Dance increases to 70%." }, [5200100]={ - + ["desc"]="Unleashed Shield Art: Apply a shield to the team for 1 turn." }, [5200101]={ - + ["desc"]="The shield from Shield Art absorbs more damage." }, [5200102]={ - + ["desc"]="Shield Art have a 10% chance of poisoning the enemy with normal attacks for 2 turns." }, [5200103]={ - + ["desc"]="Shield from Shield Art lasts +1 turns." }, [5200104]={ - + ["desc"]="Shield Art can clear additional 4 grids in the X direction." }, [5200105]={ - + ["desc"]="Shield from Shield Art can reflect 200% of damage." }, [5200106]={ - + ["desc"]="Ninja Lun's attack increases by 15%." }, [5200107]={ - + ["desc"]="Damage counter effect of the shield from Shield Art is doubled." }, [5300100]={ diff --git a/lua/app/config/strings/en/task.lua b/lua/app/config/strings/en/task.lua index 334f1161..b6c352fc 100644 --- a/lua/app/config/strings/en/task.lua +++ b/lua/app/config/strings/en/task.lua @@ -1,279 +1,279 @@ local task = { [1]={ - + ["desc"]="Ads watched" }, [2]={ - + ["desc"]="Complete all daily quests" }, [3]={ - + ["desc"]="Ads Time" }, [4]={ - + ["desc"]="Obtain Gold Coins" }, [5]={ - + ["desc"]="Obtain Gold Coins" }, [6]={ - + ["desc"]="Obtain Gold Coins" }, [7]={ - + ["desc"]="Obtain Gold Coins" }, [8]={ - + ["desc"]="Obtain Diamonds" }, [9]={ - + ["desc"]="Obtain Diamonds" }, [10]={ - + ["desc"]="Obtain Diamonds" }, [11]={ - + ["desc"]="Obtain Diamonds" }, [12]={ - + ["desc"]="Spend Gold Coins" }, [13]={ - + ["desc"]="Spend Gold Coins" }, [14]={ - + ["desc"]="Spend Gold Coins" }, [15]={ - + ["desc"]="Spend Gold Coins" }, [16]={ - + ["desc"]="Spend Diamonds" }, [17]={ - + ["desc"]="Spend Diamonds" }, [18]={ - + ["desc"]="Spend Diamonds" }, [19]={ - + ["desc"]="Spend Diamonds" }, [20]={ - + ["desc"]="Open Any Chest in the Shop" }, [21]={ - + ["desc"]="Open Any Chest in the Shop" }, [22]={ - + ["desc"]="Open Any Chest in the Shop" }, [23]={ - + ["desc"]="Open Any Chest in the Shop" }, [24]={ - + ["desc"]="Open Epic Chest in the Shop" }, [25]={ - + ["desc"]="Open Epic Chest in the Shop" }, [26]={ - + ["desc"]="Open Epic Chest in the Shop" }, [27]={ - + ["desc"]="Open Epic Chest in the Shop" }, [28]={ - + ["desc"]="Open skill lamp in the stage" }, [29]={ - + ["desc"]="Open skill lamp in the stage" }, [30]={ - + ["desc"]="Open skill lamp in the stage" }, [31]={ - + ["desc"]="Open skill lamp in the stage" }, [32]={ - + ["desc"]="Win the battle" }, [33]={ - + ["desc"]="Win the battle" }, [34]={ - + ["desc"]="Win the battle" }, [35]={ - + ["desc"]="Win the battle" }, [36]={ - + ["desc"]="Upgrade Hero" }, [37]={ - + ["desc"]="Upgrade Hero" }, [38]={ - + ["desc"]="Upgrade Hero" }, [39]={ - + ["desc"]="Upgrade Hero" }, [40]={ - + ["desc"]="Obtain Hero Shard" }, [41]={ - + ["desc"]="Obtain Hero Shard" }, [42]={ - + ["desc"]="Obtain Hero Shard" }, [43]={ - + ["desc"]="Obtain Hero Shard" }, [44]={ - + ["desc"]="Kill boss" }, [45]={ - + ["desc"]="Kill boss" }, [46]={ - + ["desc"]="Kill boss" }, [47]={ - + ["desc"]="Kill boss" }, [48]={ - + ["desc"]="Kill minions" }, [49]={ - + ["desc"]="Kill minions" }, [50]={ - + ["desc"]="Kill minions" }, [51]={ - + ["desc"]="Kill minions" }, [52]={ - + ["desc"]="Elements cleared" }, [53]={ - + ["desc"]="Elements cleared" }, [54]={ - + ["desc"]="Elements cleared" }, [55]={ - + ["desc"]="Elements cleared" }, [56]={ - + ["desc"]="6-Links" }, [57]={ - + ["desc"]="6-Links" }, [58]={ - + ["desc"]="6-Links" }, [59]={ - + ["desc"]="6-Links" }, [60]={ - + ["desc"]="8-Links" }, [61]={ - + ["desc"]="8-Links" }, [62]={ - + ["desc"]="8-Links" }, [63]={ - + ["desc"]="8-Links" }, [64]={ - + ["desc"]="10 Combos or more in battle" }, [65]={ - + ["desc"]="10 Combos or more in battle" }, [66]={ - + ["desc"]="10 Combos or more in battle" }, [67]={ - + ["desc"]="10 Combos or more in battle" }, [68]={ - + ["desc"]="Skills released in battle" }, [69]={ - + ["desc"]="Skills released in battle" }, [70]={ - + ["desc"]="Skills released in battle" }, [71]={ - + ["desc"]="Skills released in battle" }, [72]={ - + ["desc"]="Clear battle waves" }, [73]={ - + ["desc"]="Clear battle waves" }, [74]={ - + ["desc"]="Clear battle waves" }, [75]={ - + ["desc"]="Clear battle waves" }, [76]={ - + ["desc"]="Obtain Gold Coins" }, [77]={ - + ["desc"]="Obtain Diamonds" }, [78]={ - + ["desc"]="Spend Diamonds" }, [79]={ - + ["desc"]="Open Any Chest in the Shop" }, [80]={ - + ["desc"]="Open Epic Chest in the Shop" }, [81]={ - + ["desc"]="Open skill lamp in the stage" }, [82]={ - + ["desc"]="Win the battle" }, [83]={ - + ["desc"]="Upgrade Hero" }, [84]={ - + ["desc"]="Obtain Hero Shard" }, [85]={ - + ["desc"]="Kill boss" }, [86]={ - + ["desc"]="Kill minions" }, [87]={ - + ["desc"]="Elements cleared" }, [88]={ - + ["desc"]="6-Links" }, [89]={ - + ["desc"]="8-Links" }, [90]={ - + ["desc"]="10 Combos or more in battle" }, [91]={ - + ["desc"]="Skills released in battle" }, [92]={ - + ["desc"]="Clear battle waves" } } local config = { diff --git a/lua/app/config/strings/en/tutorial.lua b/lua/app/config/strings/en/tutorial.lua index 273478b3..07f07580 100644 --- a/lua/app/config/strings/en/tutorial.lua +++ b/lua/app/config/strings/en/tutorial.lua @@ -1,18 +1,18 @@ local tutorial = { ["tutorial_txt_1"]={ - ["value"]="Select a skill and continue the battle" + ["value"]="Select skills to continue battle" }, ["tutorial_txt_2"]={ - ["value"]="Claim chest to unlock new heroes" + ["value"]="Claim chest to unlock new hero" }, ["tutorial_txt_3"]={ - ["value"]="Claim chest to obtain hero shards" + ["value"]="Claim chest to obtain Hero Shard" }, ["tutorial_txt_4"]={ - ["value"]="Claim chest to unlock the 5th hero" + ["value"]="Claim chest to obtain the fifth hero" }, ["tutorial_txt_5"]={ - + ["value"]="Head to the shop for more heroes!" } } local config = { diff --git a/lua/app/config/strings/fpt/func_open.lua b/lua/app/config/strings/fpt/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/fpt/func_open.lua +++ b/lua/app/config/strings/fpt/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/func_open.lua b/lua/app/config/strings/fr/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/fr/func_open.lua +++ b/lua/app/config/strings/fr/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/func_open.lua b/lua/app/config/strings/id/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/id/func_open.lua +++ b/lua/app/config/strings/id/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index 7aef2dab..23b094a0 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/strings/jp/func_open.lua b/lua/app/config/strings/jp/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/jp/func_open.lua +++ b/lua/app/config/strings/jp/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/func_open.lua b/lua/app/config/strings/ko/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/ko/func_open.lua +++ b/lua/app/config/strings/ko/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/func_open.lua b/lua/app/config/strings/ru/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/ru/func_open.lua +++ b/lua/app/config/strings/ru/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/func_open.lua b/lua/app/config/strings/th/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/th/func_open.lua +++ b/lua/app/config/strings/th/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/func_open.lua b/lua/app/config/strings/vi/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/vi/func_open.lua +++ b/lua/app/config/strings/vi/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua index 6b5bf41c..02294add 100644 --- a/lua/app/config/strings/zh/buff.lua +++ b/lua/app/config/strings/zh/buff.lua @@ -1,122 +1,152 @@ local buff = { [7]={ ["id"]=7, + ["desc"]="紅色抗性：受到紅色元素英雄的傷害降低{0}。", ["name"]="dec_dmg_red_add" }, [8]={ ["id"]=8, + ["desc"]="黃色抗性：受到黃色元素英雄的傷害降低{0}。", ["name"]="dec_dmg_yellow_add" }, [9]={ ["id"]=9, + ["desc"]="綠色抗性：受到綠色元素英雄的傷害降低{0}。", ["name"]="dec_dmg_green_add" }, [10]={ ["id"]=10, + ["desc"]="藍色抗性：受到藍色元素英雄的傷害降低{0}。", ["name"]="dec_dmg_blue_add" }, [11]={ ["id"]=11, + ["desc"]="紫色抗性：受到紫色元素英雄的傷害降低{0}。", ["name"]="dec_dmg_purple_add" }, [12]={ ["id"]=12, + ["desc"]="極致抗性：受到所有英雄的傷害降低{0}。", ["name"]="dec_dmg_all_add" }, [24]={ ["id"]=24, + ["desc"]="傷害提升：造成的傷害提升{0}。", ["name"]="dmg_addition_all_add" }, [33]={ ["id"]=33, + ["desc"]="暈眩：本回合無法行動。", ["name"]="stun" }, [34]={ ["id"]=34, + ["desc"]="護盾：可承受最大生命值{0}的傷害。", ["name"]="shield" }, [36]={ ["id"]=36, + ["desc"]="冰霜：普攻次數-{0}。", ["name"]="normal_attack_dec" }, [37]={ ["id"]=37, + ["desc"]="亢奮：普攻次數+{0}。", ["name"]="normal_attack_add" }, [47]={ ["id"]=47, + ["desc"]="反傷護盾：可承受最大生命值{0}的傷害，反彈200%敵方傷害。", ["name"]="shield_rebound_200" }, [48]={ ["id"]=48, + ["desc"]="灼燒：回合結束時造成釋放者攻擊力{0}的傷害。", ["name"]="burn" }, [49]={ ["id"]=49, + ["desc"]="易傷：受到所有傷害提高{0}。", ["name"]="vulnerable" }, [50]={ ["id"]=50, + ["desc"]="凍結：本回合無法行動，且增益效果無效。", ["name"]="frozen" }, [51]={ ["id"]=51, + ["desc"]="中毒：回合結束時造成釋放者攻擊力{0}的傷害。", ["name"]="poison" }, [52]={ ["id"]=52, + ["desc"]="禁錮：本回合只可使用普攻。", ["name"]="imprison" }, [53]={ ["id"]=53, + ["desc"]="腐敗：生命回復效果降低{0}。", ["name"]="corrupt" }, [54]={ ["id"]=54, + ["desc"]="流血：受擊時回復攻擊者生命，回合結束時造成釋放者攻擊力{0}的傷害。", ["name"]="bleed" }, [55]={ ["id"]=55, + ["desc"]="虛弱：造成的傷害降低{0}。", ["name"]="weaken" }, [56]={ ["id"]=56, + ["desc"]="昏睡：本回合無法行動，受擊會移去效果。", ["name"]="lethargy" }, [57]={ ["id"]=57, + ["desc"]="詛咒：攻擊不會造成傷害，而會治療對方。", ["name"]="curse" }, [58]={ ["id"]=58, + ["desc"]="鎖定：隨機鎖定棋盤上的一種顏色，無法選中。", ["name"]="lock" }, [59]={ ["id"]=59, + ["desc"]="先手：每回合都率先出手。", ["name"]="first_hand" }, [61]={ ["id"]=61, + ["desc"]="不死：受到致命傷害不會死亡。", ["name"]="undead" }, [62]={ ["id"]=62, + ["desc"]="反擊：受到直接傷害時有{0}的機率進行反擊。", ["name"]="counterattack" }, [63]={ ["id"]=63, + ["desc"]="反傷：反彈{0}敵方傷害。", ["name"]="thorns" }, [73]={ ["id"]=73, + ["desc"]="反傷護盾：可承受最大生命值{0}的傷害，反彈400%敵方傷害。", ["name"]="shield_rebound_400" }, [74]={ ["id"]=74, + ["desc"]="冰霜護盾：可承受最大生命值{0}的傷害。", ["name"]="shield_ice" }, [75]={ ["id"]=75, + ["desc"]="冰霜護盾：可承受最大生命值{0}的傷害，反彈400%敵方傷害。", ["name"]="shield_ice_rebound_400" } } diff --git a/lua/app/config/strings/zh/buff_daily_challenge.lua b/lua/app/config/strings/zh/buff_daily_challenge.lua index b83bf3ba..4125bae1 100644 --- a/lua/app/config/strings/zh/buff_daily_challenge.lua +++ b/lua/app/config/strings/zh/buff_daily_challenge.lua @@ -1,45 +1,45 @@ local buff_daily_challenge = { [1]={ - + ["desc"]="獲取經驗+10%" }, [2]={ - + ["desc"]="所有傷害+5%" }, [3]={ - + ["desc"]="受到所有傷害-10%" }, [4]={ - + ["desc"]="暴擊率+20%，暴擊傷害+30%" }, [5]={ - + ["desc"]="技能傷害+15%" }, [6]={ - + ["desc"]="回合開始前生命值恢復1%" }, [7]={ - + ["desc"]="生命值恢復效果提升5%" }, [8]={ - + ["desc"]="回合開始前生命值恢復1%" }, [9]={ - + ["desc"]="敵方攻擊力+5%" }, [10]={ - + ["desc"]="敵方造成傷害+5%" }, [11]={ - + ["desc"]="敵方普攻次數+1" }, [12]={ - + ["desc"]="治療效果-10%" }, [13]={ - + ["desc"]="敵方格擋概率+5%" }, [14]={ - + ["desc"]="受到所有傷害-5%" } } local config = { diff --git a/lua/app/config/strings/zh/chapter.lua b/lua/app/config/strings/zh/chapter.lua index 9b628142..c7c44c59 100644 --- a/lua/app/config/strings/zh/chapter.lua +++ b/lua/app/config/strings/zh/chapter.lua @@ -1,93 +1,93 @@ local chapter = { [1]={ - + ["name"]="1.小鎮廣場" }, [2]={ - + ["name"]="2.小鎮堡壘" }, [3]={ - + ["name"]="3.小鎮礦山" }, [4]={ - + ["name"]="4.幽暗礦洞" }, [5]={ - + ["name"]="5.帝國邊境" }, [6]={ - + ["name"]="6.異雪叢林（西）" }, [7]={ - + ["name"]="7.異雪叢林（東）" }, [8]={ - + ["name"]="8.城堡外圍" }, [9]={ - + ["name"]="9.城堡正門" }, [10]={ - + ["name"]="10.帝國城堡" }, [11]={ - + ["name"]="11.城堡深處" }, [12]={ - + ["name"]="12.城堡密道" }, [13]={ - + ["name"]="13.密道出口" }, [14]={ - + ["name"]="14.城堡湖畔" }, [15]={ - + ["name"]="15.湖畔東岸" }, [16]={ - + ["name"]="16.腐敗沼澤" }, [17]={ - + ["name"]="17.沼澤遺跡" }, [18]={ - + ["name"]="18.雨林入口" }, [19]={ - + ["name"]="19.熱帶雨林" }, [20]={ - + ["name"]="20.巨大神廟" }, [21]={ - + ["name"]="21.神廟下方" }, [22]={ - + ["name"]="22.神秘祭壇" }, [23]={ - + ["name"]="23.惡魔祭壇" }, [24]={ - + ["name"]="24.奇怪洞穴" }, [25]={ - + ["name"]="25.洞穴深處" }, [26]={ - + ["name"]="26.魔都西街" }, [27]={ - + ["name"]="27.魔都東街" }, [28]={ - + ["name"]="28.魔都中心" }, [29]={ - + ["name"]="29.魔都通路" }, [30]={ - + ["name"]="30.魔都出口" } } local config = { diff --git a/lua/app/config/strings/zh/func_open.lua b/lua/app/config/strings/zh/func_open.lua index 864ae094..472ab227 100644 --- a/lua/app/config/strings/zh/func_open.lua +++ b/lua/app/config/strings/zh/func_open.lua @@ -1,5 +1,8 @@ local func_open = { - ["bounty"]={ + ["act_gold_pig"]={ + + }, + ["bounty_open"]={ }, ["task"]={ @@ -20,17 +23,29 @@ local func_open = { ["mall_daily"]={ }, - ["store_box"]={ + ["store_box_open"]={ }, - ["store_box_3"]={ + ["store_box_3_open"]={ }, ["daily_challenge"]={ + }, + ["act_gift_show_open"]={ + + }, + ["first_charge"]={ + + }, + ["new_player_gift"]={ + + }, + ["mail_open"]={ + } } local config = { -data=func_open,count=10 +data=func_open,count=15 } return config \ 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 450679f1..d35ea1ac 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -56,6 +56,82 @@ local localization_global = ["CLICK_COPY_ACOUNT_DESC"] = "點擊複製用戶ID", ["APP"] = "版本號：", ["CHAPTER_DESC_1"] = "最高紀錄：{0}", + ["SETTING_DESC"] = "設定", + ["SETTING_DESC_MUSIC"] = "音樂", + ["SETTING_DESC_VOICE"] = "音效", + ["SETTING_DESC_LANGUAGE"] = "語言", + ["SERVICE_DESC"] = "使用條款", + ["PRIVACY_DESC"] = "隱私政策", + ["CLIENT_VERSION"] = "目前版本:{0}", + ["BIND_ACCOUNT_DESC"] = "綁定帳號", + ["CHANGE_ACCOUNT_DESC"] = "切換帳號", + ["DELETE_ACCOUNT_DESC"] = "刪除帳號", + ["SETTING_DESC_1"] = "ID:{0}", + ["ACCOUNT_ALREADY_BINDED_DESC"] = "已綁定", + ["LANGUAGE_DESC"] = "語言", + ["ACT_SEVENDAY_TITLE"] = "開服嘉年華", + ["ACT_SEVENDAY_LEFTTIME"] = "剩餘時間：{0}天{1}小時", + ["ACT_SEVENDAY_TASK"] = "任務完成：{0}/{1}", + ["ACT_SEVENDAY_DESC"] = "每日將開啟新的任務。", + ["BTN_CLAIM"] = "領取", + ["BTN_DONE"] = "已領取", + ["BOUNTY_BUY_LEVEL_TITLE"] = "確認解鎖等級", + ["BOUNTY_BUY_LEVEL_COUNTENT"] = "立即解鎖目前等級\n等級獎勵將立即解鎖，你收集到的積分數量不變", + ["BOUNTY_PURCHASE_NAME"] = "黃金通行證", + ["BOUNTY_DESC_1"] = "解鎖獎勵和獎勵任務", + ["BOUNTY_DESC_2"] = "獲得高級通行證，+10級，立即獲得更多獎勵！", + ["REWARD_BOX_DESC"] = "獎勵寶箱", + ["BOUNTY_DESC_3"] = "當你完成通行證上的所有內容,之後每1000積分可以獲取一個獎勵寶箱", + ["STR_MAX"] = "MAX", + ["ALREADY_ACTIVE"] = "已激活", + ["ACTIVE_BOUNTY"] = "啟用黃金通行證", + ["BOUNTY_FREE_NAME"] = "免費通行證", + ["CONFIRM_IGNORE"] = "今日不再提示", + ["MAIL_NAME"] = "郵箱", + ["COLLET_REWARDS"] = "收集獎勵", + ["TASK_NAME"] = "任務", + ["TASK_DAILY"] = "日常", + ["TASK_CHALLENGE"] = "挑戰", + ["TASK_HELP_1"] = "每日刷新，刷新後任務將重置，可以觀看廣告刷新任務", + ["STR_REFRESH"] = "刷新", + ["STR_UNLOCK"] = "解鎖", + ["TASK_DESC_1"] = "通行證專屬任務", + ["STR_COMPLETED"] = "已完成", + ["HERO_CARD_TIPS_DESC"] = "可能會獲得以下英雄卡牌：", + ["HERO_CARD_DESC_QLT_2"] = "優秀英雄", + ["HERO_CARD_DESC_QLT_3"] = "稀有英雄", + ["HERO_CARD_DESC_QLT_4"] = "史詩英雄", + ["HERO_CARD_DESC_QLT_5"] = "傳說英雄", + ["HERO_CARD_DESC_QLT_6"] = "神話英雄", + ["IDLE_DROP_REWARD"] = "挂機獎勵", + ["IDLE_DROP_DESC_1"] = "章節越後面，收益越多", + ["PER_HOUR"] = "{0}/小時", + ["IDLE_DROP_DESC_2"] = "最長挂機{0}小時", + ["IDLE_QUICK"] = "快速挂機", + ["IDLE_DROP_DESC_3"] = "立即領取{0}小時的挂機收益", + ["STR_FREE"] = "免費", + ["TODAY_REMAIN_TIMES"] = "今日剩餘{0}次", + ["BUY_ENERGY"] = "購買體力", + ["MAIL_TITLE"] = "郵箱", + ["BTN_DELETE_ALL_READ_MAIL"] = "刪除已讀郵件", + ["BTN_CLAIM_ALL"] = "全部領取", + ["BTN_READ"] = "讀取", + ["BATTLE_DESC_9"] = "{0}攻擊力：{1}", + ["BATTLE_DESC_10"] = "已啟用效果", + ["BLOCK_DESC"] = "格擋", + ["COUNTER_ATTACK_DESC"] = "反擊", + ["EXPIRES_IN_HOURS"] = "{0}小時到期", + ["EXTRA_REWARDS"] = "額外獎勵", + ["PLAYER_LEVEL_UP_DESC"] = "恭喜等級達到{0}級", + ["LEVEL_UP_REWARD"] = "升級獎勵", + ["CLICK_TO_CONTINUE"] = "點擊繼續", + ["BOUNTY_DESC_4"] = "購買此通行證會超過通行證等級上限，將會造成損失，確定要購買嗎？", + ["RELOGIN"] = "重新登入", + ["GOLD_PIG_CLOSE_DESC"] = "金豬期限已到，請把握下次機會", + ["GOLD_PIG_TITLE"] = "超值金豬", + ["GOLD_PIG_DESC"] = "挑戰關卡並收集鑽石，你就可以得到一筆划算的交易。", + ["SIDE_BAR_FULL"] = "MAX", + ["DAILY_CHALLENGE"] = "每日挑戰", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/zh/hero.lua b/lua/app/config/strings/zh/hero.lua index fe5b3598..cc3b144f 100644 --- a/lua/app/config/strings/zh/hero.lua +++ b/lua/app/config/strings/zh/hero.lua @@ -1,63 +1,63 @@ local hero = { [12001]={ - + ["name"]="舞孃" }, [13001]={ - + ["name"]="克勞德" }, [13002]={ - + ["name"]="火旺" }, [14001]={ - + ["name"]="亞歷山大" }, [22001]={ - + ["name"]="刀妹" }, [23001]={ - + ["name"]="野蠻人" }, [23002]={ - + ["name"]="二丫" }, [24001]={ - + ["name"]="巨劍魔童" }, [32001]={ - + ["name"]="洋蔥頭" }, [33001]={ - + ["name"]="小鹿" }, [33002]={ - + ["name"]="森林之狼" }, [34001]={ - + ["name"]="木蘭" }, [42001]={ - + ["name"]="冰心" }, [43001]={ - + ["name"]="冰女" }, [43002]={ - + ["name"]="烏鴉姐" }, [44001]={ - + ["name"]="寒冰妖姬" }, [52001]={ - + ["name"]="忍者倫" }, [53001]={ - + ["name"]="魔女琪琪" }, [53002]={ - + ["name"]="靈魂獵手" }, [54001]={ - + ["name"]="胡蝶" } } local config = { diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index db3f2710..80b02800 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -24,103 +24,136 @@ local item = { ["desc"]="可以獲得史詩英雄。" }, [7]={ - + ["name"]="通行證積分", + ["desc"]="累積積分可提高通行證等級。" }, [8]={ - + ["name"]="木盒子", + ["desc"]="可以開出以上品級英雄。" }, [9]={ - + ["name"]="木箱子", + ["desc"]="可以開出以上品級英雄。" }, [10]={ - + ["name"]="金箱子", + ["desc"]="用黃金裝飾的英雄寶箱。" }, [11]={ - + ["name"]="白金箱子", + ["desc"]="厲害的英雄都在這裡。" }, [12]={ - + ["name"]="經驗", + ["desc"]="累積達到特定數量可升級。" }, [13]={ - + ["name"]="普通鑰匙", + ["desc"]="可以在商城開啟普通寶箱。" }, [14]={ - + ["name"]="精緻鑰匙", + ["desc"]="可以在商城開啟精緻寶箱。" }, [15]={ - + ["name"]="珍貴鑰匙", + ["desc"]="可以在商城開啟珍貴寶箱。" }, [16]={ - + ["name"]="任務寶箱", + ["desc"]="完成5個日常任務可獲得。" }, [17]={ - + ["name"]="廣告寶箱", + ["desc"]="你可以在遊戲中任何地方看廣告，獲取獎勵。" }, [18]={ - + ["name"]="白金大箱子", + ["desc"]="大大的白金箱子！" }, [19]={ - + ["name"]="隨機碎片", + ["desc"]="挂機可獲得隨機碎片，領取數量和品級將根據關卡提高。" }, [12001]={ - ["desc"]="洛克西英雄碎片,湊齊可解鎖或升級。" + ["name"]="舞孃碎片", + ["desc"]="舞娘碎片，湊齊可激活或升級。" }, [13001]={ - ["desc"]="卡拉英雄碎片,湊齊可解鎖或升級。" + ["name"]="克勞德碎片", + ["desc"]="克勞德碎片，湊齊可激活或升級。" }, [13002]={ - ["desc"]="巨劍羅伯特英雄碎片,湊齊可解鎖或升級。" + ["name"]="火旺碎片", + ["desc"]="火旺碎片，湊齊可激活或升級。" }, [14001]={ - ["desc"]="阿斯克英雄碎片,湊齊可解鎖或升級。" + ["name"]="亞歷山大碎片", + ["desc"]="亞歷山大碎片，湊齊可激活或升級。" }, [22001]={ - ["desc"]="艾芙琳英雄碎片,湊齊可解鎖或升級。" + ["name"]="刀妹碎片", + ["desc"]="刀妹碎片，湊齊可激活或升級。" }, [23001]={ - ["desc"]="莉莉絲英雄碎片,湊齊可解鎖或升級。" + ["name"]="野蠻人碎片", + ["desc"]="野蠻人碎片，湊齊可激活或升級。" }, [23002]={ - ["desc"]="白髮凱瑟琳英雄碎片,湊齊可解鎖或升級。" + ["name"]="二丫碎片", + ["desc"]="二丫碎片，湊齊可激活或升級。" }, [24001]={ - ["desc"]="艾倫英雄碎片,湊齊可解鎖或升級。" + ["name"]="巨劍魔童碎片", + ["desc"]="巨劍魔童碎片，湊齊可激活或升級。" }, [32001]={ - + ["name"]="洋蔥頭碎片", + ["desc"]="洋蔥頭碎片，湊齊可激活或升級。" }, [33001]={ - + ["name"]="小鹿碎片", + ["desc"]="小鹿碎片，湊齊可激活或升級。" }, [33002]={ - + ["name"]="森林之狼碎片", + ["desc"]="森林狼碎片，湊齊可激活或升級。" }, [34001]={ - + ["name"]="木蘭碎片", + ["desc"]="木蘭碎片，湊齊可激活或升級。" }, [42001]={ - + ["name"]="冰心碎片", + ["desc"]="冰心碎片，湊齊可激活或升級。" }, [43001]={ - + ["name"]="冰女碎片", + ["desc"]="冰女碎片，湊齊可激活或升級。" }, [43002]={ - + ["name"]="烏鴉姐碎片", + ["desc"]="鴉姐碎片，湊齊可激活或升級。" }, [44001]={ - + ["name"]="寒冰妖姬碎片", + ["desc"]="寒冰妖姬碎片，湊齊可激活或升級。" }, [52001]={ - + ["name"]="忍者倫碎片", + ["desc"]="忍者倫碎片，湊齊可激活或升級。" }, [53001]={ - + ["name"]="魔女琪琪碎片", + ["desc"]="魔女琪琪碎片，湊齊可激活或升級。" }, [53002]={ - + ["name"]="靈魂獵手碎片", + ["desc"]="靈魂獵手碎片，湊齊可激活或升級。" }, [54001]={ - + ["name"]="胡蝶碎片", + ["desc"]="蝴蝶碎片，湊齊可激活或升級。" } } local config = { diff --git a/lua/app/config/strings/zh/monster_base.lua b/lua/app/config/strings/zh/monster_base.lua index 224fcc53..11ad7e51 100644 --- a/lua/app/config/strings/zh/monster_base.lua +++ b/lua/app/config/strings/zh/monster_base.lua @@ -174,76 +174,76 @@ local monster_base = { }, [20001]={ - + ["name"]="叢林神射手" }, [20002]={ - + ["name"]="叢林神獵手" }, [20003]={ - + ["name"]="王之巨龍" }, [20004]={ - + ["name"]="菁英哥布林" }, [20005]={ - + ["name"]="遠古堡壘" }, [20006]={ - + ["name"]="綠龜剛鎧" }, [20007]={ }, [20008]={ - + ["name"]="石巨人" }, [20009]={ - + ["name"]="樹精祭祀" }, [20010]={ - + ["name"]="火靈守衛" }, [20011]={ - + ["name"]="地精魔像" }, [20012]={ - + ["name"]="骷髏王" }, [20013]={ - + ["name"]="小丑之王" }, [20014]={ - + ["name"]="鋼盾綠首領" }, [20015]={ - + ["name"]="鋼盾紅首領" }, [20016]={ - + ["name"]="獨眼旋風" }, [20017]={ - + ["name"]="骷髏法師" }, [20018]={ - + ["name"]="惡毒法師" }, [20019]={ - + ["name"]="火靈刀客" }, [20020]={ - + ["name"]="火靈王" }, [20021]={ - + ["name"]="卓一德DH" }, [20022]={ - + ["name"]="雪人鐵匠" }, [20023]={ }, [20024]={ - + ["name"]="飛天魔" }, [20025]={ @@ -252,7 +252,7 @@ local monster_base = { }, [20027]={ - + ["name"]="紅龜霍頓" }, [20028]={ @@ -261,70 +261,70 @@ local monster_base = { }, [20030]={ - + ["name"]="魔神碎片" }, [20031]={ - + ["name"]="魔神守護者" }, [20032]={ - + ["name"]="遠古魔神" }, [30001]={ - + ["name"]="洋蔥頭" }, [30002]={ - + ["name"]="刀妹" }, [30003]={ - + ["name"]="冰心" }, [30004]={ - + ["name"]="忍者倫" }, [30005]={ - + ["name"]="舞孃" }, [30006]={ - + ["name"]="小鹿" }, [30007]={ - + ["name"]="巨劍魔童" }, [30008]={ - + ["name"]="寒冰妖姬" }, [30009]={ - + ["name"]="火旺" }, [30010]={ - + ["name"]="野蠻人" }, [30011]={ - + ["name"]="亞歷山大" }, [30012]={ - + ["name"]="二丫" }, [30014]={ - + ["name"]="克勞德" }, [30015]={ - + ["name"]="魔女琪琪" }, [30016]={ - + ["name"]="木蘭" }, [30017]={ }, [30019]={ - + ["name"]="靈魂獵手" }, [30020]={ - + ["name"]="森林之狼" }, [30022]={ - + ["name"]="冰女" } } local config = { diff --git a/lua/app/config/strings/zh/skill.lua b/lua/app/config/strings/zh/skill.lua index 9b09cecb..7525d11a 100644 --- a/lua/app/config/strings/zh/skill.lua +++ b/lua/app/config/strings/zh/skill.lua @@ -1,42 +1,42 @@ local skill = { [1200120]={ - + ["desc"]="舞步消散：沿橫向消除5格，並造成一次技能傷害。" }, [1300120]={ - + ["desc"]="巨劍旋風：額外造成數次技能傷害。" }, [1300220]={ - + ["desc"]="炎拳：沿直向消除5格，並造成一次技能傷害，50%機率附帶灼燒效果，2回合。" }, [1400120]={ - + ["desc"]="鋼鐵重擊：將周圍4個元素變色，並造成數次大量技能傷害。" }, [2200120]={ - + ["desc"]="拔刀斬：額外造成一次技能傷害。" }, [2300120]={ - + ["desc"]="骨旋風：額外造成數次技能傷害。" }, [2300220]={ - + ["desc"]="幻影劍襲：使用後本次技能傷害提高，並額外造成數次大量技能傷害。" }, [2400120]={ - + ["desc"]="巨劍轟擊：額外造成一次巨大技能傷害。" }, [3200120]={ - + ["desc"]="長槍突刺：額外造成一次技能傷害。" }, [3300120]={ - + ["desc"]="急速治療：使用後本次回復生命。" }, [3300220]={ }, [3400120]={ - + ["desc"]="流星追月：使用後本次傷害提高，並造成一次巨大技能傷害。" }, [4200120]={ - + ["desc"]="元素連接：隨機消除3個元素，並造成一次技能傷害。" }, [4300120]={ @@ -45,10 +45,10 @@ local skill = { }, [4400120]={ - + ["desc"]="冰霜劍舞：隨機消除3個元素，並造成一次技能傷害，附帶冰霜效果，1回合。" }, [5200120]={ - + ["desc"]="護盾術：賦予團隊一個護盾，1回合。" }, [5300120]={ diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 12babab9..cd4d1756 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -132,244 +132,244 @@ local skill_rogue = { ["desc"]="將場上隨機5個非紫色元素變為紫色" }, [1200100]={ - + ["desc"]="解鎖舞步消散：沿橫向消除5格，並造成一次技能傷害。" }, [1200101]={ - + ["desc"]="舞步消散有30%概率附加灼燒效果，2回合。" }, [1200102]={ - + ["desc"]="舞步消散使用時本次普攻傷害提高10%。" }, [1200103]={ - + ["desc"]="舞步消散對冰霜敵人的傷害增加50%。" }, [1200104]={ - + ["desc"]="舞步消散直向可額外消除4格。" }, [1200105]={ - + ["desc"]="舞步消散連接5個元素及以上時，賦予團隊亢奮效果，2回合。" }, [1200106]={ - + ["desc"]="舞孃攻擊提高15%。" }, [1200107]={ - + ["desc"]="舞步消散附帶亢奮效果的要求降低至連接超過3個元素。" }, [1300100]={ - + ["desc"]="解鎖巨劍旋風：額外造成數次技能傷害。" }, [1300101]={ - + ["desc"]="巨劍旋風可附帶灼燒效果，2回合。" }, [1300102]={ - + ["desc"]="巨劍旋風對流血敵人的傷害增加50%。" }, [1300103]={ - + ["desc"]="巨劍旋風技能傷害提高。" }, [1300104]={ - + ["desc"]="巨劍旋風附帶的灼燒傷效果，傷害提高。" }, [1300105]={ - + ["desc"]="巨劍旋風連接4個元素及以上時，傷害提高30%，2回合。" }, [1300106]={ - + ["desc"]="巨劍旋風附帶的傷害提高效果，回合數+1。" }, [1300107]={ - + ["desc"]="巨劍旋風擊殺敵人則為團隊賦予亢奮效果，2回合。" }, [1300200]={ - + ["desc"]="解鎖炎拳：沿直向消除5格，並造成一次技能傷害，50%機率附帶灼燒效果，2回合。" }, [1300201]={ - + ["desc"]="炎拳沿橫向可額外消除4格。" }, [1300202]={ - + ["desc"]="炎拳對禁錮敵人的傷害增加50%。" }, [1300203]={ - + ["desc"]="炎拳的灼燒機率提高到100%。" }, [1300204]={ - + ["desc"]="炎拳直向可額外消除2格。" }, [1300205]={ - + ["desc"]="炎拳附帶的灼燒效果，傷害提高。" }, [1300206]={ - + ["desc"]="火旺攻擊提高15%。" }, [1300207]={ - + ["desc"]="炎拳攻擊將釋放2次。" }, [1400100]={ - + ["desc"]="解鎖鋼鐵重擊：將周圍4個元素變色，並造成數次大量技能傷害。" }, [1400101]={ - + ["desc"]="鋼鐵重擊可附帶灼燒效果，2回合。" }, [1400102]={ - + ["desc"]="鋼鐵重擊附加眩暈效果，1回合。" }, [1400103]={ - + ["desc"]="鋼鐵重擊對流血敵人額外造成1次傷害。" }, [1400104]={ - + ["desc"]="鋼鐵重擊附加的眩暈，回合數+1。" }, [1400105]={ - + ["desc"]="鋼鐵重擊附帶的灼燒效果，傷害提高，回合數+1。" }, [1400106]={ - + ["desc"]="亞歷山大攻擊提高15%。" }, [1400107]={ - + ["desc"]="鋼鐵重擊每連接4個元素則額外發射1個火球造成傷害。" }, [2200100]={ - + ["desc"]="解鎖拔刀斬：額外造成一次技能傷害。" }, [2200101]={ - + ["desc"]="拔刀斬技能傷害提高。" }, [2200102]={ - + ["desc"]="拔刀斬直向可額外消除4格。" }, [2200103]={ - + ["desc"]="拔刀斬對灼燒敵人的傷害增加50%。" }, [2200104]={ - + ["desc"]="刀妹攻擊提高15%。" }, [2200105]={ - + ["desc"]="拔刀斬攻擊將釋放2次。" }, [2200106]={ - + ["desc"]="拔刀斬沿X方向可額外消除4格。" }, [2200107]={ - + ["desc"]="拔刀斬連接5個元素或以上時，則技能傷害提高。" }, [2300100]={ - + ["desc"]="解鎖旋風骨：額外造成數次技能傷害。" }, [2300101]={ - + ["desc"]="旋風骨可附帶流血效果，2回合。" }, [2300102]={ - + ["desc"]="旋風骨技能傷害提高。" }, [2300103]={ - + ["desc"]="旋風骨對昏睡敵人有50%機率附帶暈眩效果，1回合。" }, [2300104]={ - + ["desc"]="旋風骨附帶的流血效果，回合數+1。" }, [2300105]={ - + ["desc"]="每有1名敵人因流血死亡，則野蠻人傷害提高10%。" }, [2300106]={ - + ["desc"]="旋風骨附帶的暈眩效果，回合數+1。" }, [2300107]={ - + ["desc"]="野蠻人攻擊提高15%。" }, [2300200]={ - + ["desc"]="解鎖幻影劍襲：使用後本次技能傷害提高，並額外造成數次大量技能傷害。" }, [2300201]={ - + ["desc"]="幻影劍襲沿＋方向可額外消除4格。" }, [2300202]={ - + ["desc"]="二丫攻擊提高15%。" }, [2300203]={ - + ["desc"]="幻影劍襲使用時本次普攻傷害提高10%。" }, [2300204]={ - + ["desc"]="幻影劍襲沿X方向可額外消除4格。" }, [2300205]={ - + ["desc"]="幻影劍襲連接4個元素或以上時，本回合暴擊提高20%。" }, [2300206]={ - + ["desc"]="幻影劍襲連接4個元素或以上時，本回合暴擊提高30%。" }, [2300207]={ - + ["desc"]="幻影劍襲使用時本回合對生命值50%以下的敵人暴擊傷害提高50%。" }, [2400100]={ - + ["desc"]="解鎖巨劍轟擊：額外造成一次巨大技能傷害。" }, [2400101]={ - + ["desc"]="巨劍轟擊沿X方向可額外消除4格。" }, [2400102]={ - + ["desc"]="巨劍轟擊對凍結敵人傷害大幅增加，並有50%機率附帶暈眩效果，1回合。" }, [2400103]={ - + ["desc"]="巨劍轟擊附帶暈眩效果的機率提高到70%。" }, [2400104]={ - + ["desc"]="巨劍魔童攻擊提高15%。" }, [2400105]={ - + ["desc"]="巨劍轟擊技能傷害大幅增加，並有50%機率附帶禁錮效果，1回合。" }, [2400106]={ - + ["desc"]="巨劍轟擊附帶禁錮效果的機率提高到70%。" }, [2400107]={ - + ["desc"]="巨劍轟擊將造成雙倍傷害。" }, [3200100]={ - + ["desc"]="解鎖長槍突刺：額外造成一次技能傷害。" }, [3200101]={ - + ["desc"]="長槍突刺可回復一定量生命。" }, [3200102]={ - + ["desc"]="長槍突刺對中毒敵人的傷害增加50%。" }, [3200103]={ - + ["desc"]="長槍突刺傷害提高。" }, [3200104]={ - + ["desc"]="長槍突刺沿X方向可額外消除4格。" }, [3200105]={ - + ["desc"]="長槍突刺有30%機率附帶暈眩效果，1回合。" }, [3200106]={ - + ["desc"]="長槍突刺暈眩機率提高20%" }, [3200107]={ - + ["desc"]="長槍突刺後為團隊增加20%格擋，2回合" }, [3300100]={ - + ["desc"]="解鎖急速治療：使用後本次回復生命。" }, [3300101]={ - + ["desc"]="急速治療回血效果提高。" }, [3300102]={ - + ["desc"]="急速治療使用時本次普攻傷害提高15%。" }, [3300103]={ - + ["desc"]="急速治療沿＋方向可額外消除4格。" }, [3300104]={ - + ["desc"]="急速治療額外為團隊提供技能傷害提高效果，2回合。" }, [3300105]={ - + ["desc"]="急速治療使用時本次普攻每一擊都將回復生命。" }, [3300106]={ - + ["desc"]="急速治療附帶的技能傷害提高效果，回合數+1。" }, [3300107]={ - + ["desc"]="急速治療連接5個元素或以上時，回血效果提高。" }, [3300200]={ @@ -396,52 +396,52 @@ local skill_rogue = { }, [3400100]={ - + ["desc"]="解鎖流星追月：使用後本次傷害提高，並造成一次巨大技能傷害。" }, [3400101]={ - + ["desc"]="流星追月可附帶易傷效果，2回合。" }, [3400102]={ - + ["desc"]="流星追月直向可額外消除4格。" }, [3400103]={ - + ["desc"]="木蘭攻擊提高15%。" }, [3400104]={ - + ["desc"]="流星追月附帶的易傷效果，效果提高。" }, [3400105]={ - + ["desc"]="流星追月可附帶流血效果，2回合。" }, [3400106]={ - + ["desc"]="流星追月附帶的流血效果，傷害提高。" }, [3400107]={ - + ["desc"]="流星追月連接4個元素或以上時，流星追月攻擊將釋放2次。" }, [4200100]={ - + ["desc"]="解鎖元素連接：隨機消除3個元素，並造成一次技能傷害。" }, [4200101]={ - + ["desc"]="元素連接隨機消除元素+2。" }, [4200102]={ - + ["desc"]="元素連接使用時本次普攻傷害提高10%。" }, [4200103]={ - + ["desc"]="元素連接有50%機率附帶冰霜效果，2回合。" }, [4200104]={ - + ["desc"]="元素連接隨機消除元素+2。" }, [4200105]={ - + ["desc"]="元素連接對冰霜敵人有20%機率附帶凍結效果，1回合。" }, [4200106]={ - + ["desc"]="冰心攻擊提高15%。" }, [4200107]={ - + ["desc"]="元素連接附帶凍結效果機率提高到40%。" }, [4300100]={ @@ -492,52 +492,52 @@ local skill_rogue = { }, [4400100]={ - + ["desc"]="解鎖冰霜劍舞：隨機消除3個元素，並造成一次技能傷害，附帶冰霜效果，1回合。" }, [4400101]={ - + ["desc"]="冰霜劍舞附帶的冰霜效果，回合數+1" }, [4400102]={ - + ["desc"]="冰霜劍舞對灼燒敵人傷害增加50%。" }, [4400103]={ - + ["desc"]="冰霜劍舞隨機消除元素+3" }, [4400104]={ - + ["desc"]="冰霜劍舞附帶的冰霜效果，效果提高。" }, [4400105]={ - + ["desc"]="冰霜劍舞有50%機率附帶凍結效果，2回合。" }, [4400106]={ - + ["desc"]="寒冰妖姬攻擊提高15%。" }, [4400107]={ - + ["desc"]="冰霜劍舞附帶凍結效果機率提高到70%。" }, [5200100]={ - + ["desc"]="解鎖護盾術：為團隊增加一個護盾，1回合。" }, [5200101]={ - + ["desc"]="護盾術增加的護盾，承受傷害提高。" }, [5200102]={ - + ["desc"]="護盾術使用時本次普攻有10%概率附加中毒效果，2回合。" }, [5200103]={ - + ["desc"]="護盾術增加的護盾，回合數+1。" }, [5200104]={ - + ["desc"]="護盾術沿＋方向可額外消除4格。" }, [5200105]={ - + ["desc"]="護盾術增加的護盾，可反傷200%。" }, [5200106]={ - + ["desc"]="忍者倫攻擊提高15%。" }, [5200107]={ - + ["desc"]="護盾術增加的護盾，反傷效果翻倍。" }, [5300100]={ diff --git a/lua/app/config/strings/zh/task.lua b/lua/app/config/strings/zh/task.lua index 334f1161..1faa30c9 100644 --- a/lua/app/config/strings/zh/task.lua +++ b/lua/app/config/strings/zh/task.lua @@ -1,279 +1,279 @@ local task = { [1]={ - + ["desc"]="累積觀看廣告" }, [2]={ - + ["desc"]="完成所有日常任務" }, [3]={ - + ["desc"]="廣告時間" }, [4]={ - + ["desc"]="獲得金幣" }, [5]={ - + ["desc"]="獲得金幣" }, [6]={ - + ["desc"]="獲得金幣" }, [7]={ - + ["desc"]="獲得金幣" }, [8]={ - + ["desc"]="獲得鑽石" }, [9]={ - + ["desc"]="獲得鑽石" }, [10]={ - + ["desc"]="獲得鑽石" }, [11]={ - + ["desc"]="獲得鑽石" }, [12]={ - + ["desc"]="花費金幣" }, [13]={ - + ["desc"]="花費金幣" }, [14]={ - + ["desc"]="花費金幣" }, [15]={ - + ["desc"]="花費金幣" }, [16]={ - + ["desc"]="花費鑽石" }, [17]={ - + ["desc"]="花費鑽石" }, [18]={ - + ["desc"]="花費鑽石" }, [19]={ - + ["desc"]="花費鑽石" }, [20]={ - + ["desc"]="開啟商城任意寶箱" }, [21]={ - + ["desc"]="開啟商城任意寶箱" }, [22]={ - + ["desc"]="開啟商城任意寶箱" }, [23]={ - + ["desc"]="開啟商城任意寶箱" }, [24]={ - + ["desc"]="開啟商城史詩寶箱" }, [25]={ - + ["desc"]="開啟商城史詩寶箱" }, [26]={ - + ["desc"]="開啟商城史詩寶箱" }, [27]={ - + ["desc"]="開啟商城史詩寶箱" }, [28]={ - + ["desc"]="關卡內打開技能神燈" }, [29]={ - + ["desc"]="關卡內打開技能神燈" }, [30]={ - + ["desc"]="關卡內打開技能神燈" }, [31]={ - + ["desc"]="關卡內打開技能神燈" }, [32]={ - + ["desc"]="在戰鬥中獲勝" }, [33]={ - + ["desc"]="在戰鬥中獲勝" }, [34]={ - + ["desc"]="在戰鬥中獲勝" }, [35]={ - + ["desc"]="在戰鬥中獲勝" }, [36]={ - + ["desc"]="升級你的英雄" }, [37]={ - + ["desc"]="升級你的英雄" }, [38]={ - + ["desc"]="升級你的英雄" }, [39]={ - + ["desc"]="升級你的英雄" }, [40]={ - + ["desc"]="獲得英雄碎片" }, [41]={ - + ["desc"]="獲得英雄碎片" }, [42]={ - + ["desc"]="獲得英雄碎片" }, [43]={ - + ["desc"]="獲得英雄碎片" }, [44]={ - + ["desc"]="擊殺首領" }, [45]={ - + ["desc"]="擊殺首領" }, [46]={ - + ["desc"]="擊殺首領" }, [47]={ - + ["desc"]="擊殺首領" }, [48]={ - + ["desc"]="擊殺小怪" }, [49]={ - + ["desc"]="擊殺小怪" }, [50]={ - + ["desc"]="擊殺小怪" }, [51]={ - + ["desc"]="擊殺小怪" }, [52]={ - + ["desc"]="累積消除元素" }, [53]={ - + ["desc"]="累積消除元素" }, [54]={ - + ["desc"]="累積消除元素" }, [55]={ - + ["desc"]="累積消除元素" }, [56]={ - + ["desc"]="6連消次數" }, [57]={ - + ["desc"]="6連消次數" }, [58]={ - + ["desc"]="6連消次數" }, [59]={ - + ["desc"]="6連消次數" }, [60]={ - + ["desc"]="8連消次數" }, [61]={ - + ["desc"]="8連消次數" }, [62]={ - + ["desc"]="8連消次數" }, [63]={ - + ["desc"]="8連消次數" }, [64]={ - + ["desc"]="戰鬥中超過10連擊次數" }, [65]={ - + ["desc"]="戰鬥中超過10連擊次數" }, [66]={ - + ["desc"]="戰鬥中超過10連擊次數" }, [67]={ - + ["desc"]="戰鬥中超過10連擊次數" }, [68]={ - + ["desc"]="戰鬥中釋放技能次數" }, [69]={ - + ["desc"]="戰鬥中釋放技能次數" }, [70]={ - + ["desc"]="戰鬥中釋放技能次數" }, [71]={ - + ["desc"]="戰鬥中釋放技能次數" }, [72]={ - + ["desc"]="完成戰鬥波次" }, [73]={ - + ["desc"]="完成戰鬥波次" }, [74]={ - + ["desc"]="完成戰鬥波次" }, [75]={ - + ["desc"]="完成戰鬥波次" }, [76]={ - + ["desc"]="獲得金幣" }, [77]={ - + ["desc"]="獲得鑽石" }, [78]={ - + ["desc"]="花費鑽石" }, [79]={ - + ["desc"]="開啟商城任意寶箱" }, [80]={ - + ["desc"]="開啟商城史詩寶箱" }, [81]={ - + ["desc"]="關卡內打開技能神燈" }, [82]={ - + ["desc"]="在戰鬥中獲勝" }, [83]={ - + ["desc"]="升級你的英雄" }, [84]={ - + ["desc"]="獲得英雄碎片" }, [85]={ - + ["desc"]="擊殺首領" }, [86]={ - + ["desc"]="擊殺小怪" }, [87]={ - + ["desc"]="累積消除元素" }, [88]={ - + ["desc"]="6連消次數" }, [89]={ - + ["desc"]="8連消次數" }, [90]={ - + ["desc"]="戰鬥中超過10連擊次數" }, [91]={ - + ["desc"]="戰鬥中釋放技能次數" }, [92]={ - + ["desc"]="完成戰鬥波次" } } local config = { diff --git a/lua/app/config/strings/zh/tutorial.lua b/lua/app/config/strings/zh/tutorial.lua index 41fe959b..2d01e891 100644 --- a/lua/app/config/strings/zh/tutorial.lua +++ b/lua/app/config/strings/zh/tutorial.lua @@ -12,7 +12,7 @@ local tutorial = { ["value"]="領取寶箱，獲取第五位英雄" }, ["tutorial_txt_5"]={ - + ["value"]="前往商城，獲得更多英雄！" } } local config = { diff --git a/lua/app/config/task_daily_challenge.lua b/lua/app/config/task_daily_challenge.lua index 36c5adba..7c86e0e2 100644 --- a/lua/app/config/task_daily_challenge.lua +++ b/lua/app/config/task_daily_challenge.lua @@ -5,10 +5,18 @@ local task_daily_challenge = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } }, ["number"]=1 @@ -22,16 +30,16 @@ local task_daily_challenge = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, ["number"]=2 @@ -44,16 +52,16 @@ local task_daily_challenge = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, ["number"]=2 @@ -66,16 +74,16 @@ local task_daily_challenge = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, ["number"]=2 @@ -89,24 +97,24 @@ local task_daily_challenge = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, ["number"]=3 @@ -119,24 +127,24 @@ local task_daily_challenge = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, ["number"]=3 @@ -168,24 +176,24 @@ local task_daily_challenge = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, ["number"]=3 @@ -199,24 +207,24 @@ local task_daily_challenge = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, ["number"]=3 diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 7eef40c2..131d68bf 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -35,7 +35,7 @@ local CONST_METATABLE = { } setmetatable(GConst, CONST_METATABLE) -GConst.ANDROID_STORE_URL = "https://play.google.com/store/apps/details?id=com.cobby.lonelysurvivor" +GConst.ANDROID_STORE_URL = "https://play.google.com/store/apps/details?id=com.knight.connect.rpg" GConst.IOS_STORE_URL = "https://itunes.apple.com/app/1637393009" GConst.SKIP_VERSION = CS.BF.GameConst.SKIP_VERSION GConst.DESIGN_RESOLUTION_WIDTH = CS.BF.GameConst.DESIGN_RESOLUTION_WIDTH @@ -193,6 +193,7 @@ GConst.ATLAS_PATH = { HERO = "assets/arts/atlas/ui/hero.asset", FUND = "assets/arts/atlas/ui/fund.asset", SEVEN_DAY = "assets/arts/atlas/ui/sevenday.asset", + MODULE = "assets/arts/atlas/ui/module.asset", } GConst.TOUCH_EVENT = { diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index c6f42fd2..094b119a 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -336,16 +336,6 @@ function GFunc.showMessageBox(params) MessageBox:showMessageBox(params) end -function GFunc.showCheatingBox(params) - local CheatMessageBox = require "app/ui/common/cheat_message_box" - CheatMessageBox:showCheatMessageBox(params) -end - -function GFunc.hideCheatingBox() - local CheatMessageBox = require "app/ui/common/cheat_message_box" - CheatMessageBox:hideCheatMessageBox() -end - function GFunc.showToast(params) ModuleManager.ToastManager:showToast(params) end @@ -424,7 +414,8 @@ function GFunc.getPerStr(key, str) key == GConst.BattleConst.BUFF_NAME.SHIELD_REBOUND_400 or key == GConst.BattleConst.BUFF_NAME.SHIELD_ICE_REBOUND_400 or key == GConst.BattleConst.BUFF_NAME.BURN or - key == GConst.BattleConst.BUFF_NAME.SHIELD_ICE + key == GConst.BattleConst.BUFF_NAME.SHIELD_ICE or + key == GConst.BattleConst.BUFF_NAME.BLOCK then str = str // 100 .. "%" end diff --git a/lua/app/module/account.meta b/lua/app/module/account.meta new file mode 100644 index 00000000..b929040c --- /dev/null +++ b/lua/app/module/account.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8f4a8cf53417314abb0cba97d791459 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/account/account_manager.lua b/lua/app/module/account/account_manager.lua new file mode 100644 index 00000000..36e44dc5 --- /dev/null +++ b/lua/app/module/account/account_manager.lua @@ -0,0 +1,129 @@ +local AccountManager = class("AccountManager", BaseModule) + +function AccountManager:showBindUI() + if DataManager.PlayerData:isBinded() then + return + end + UIManager:showUI("app/ui/game_setting/setting_binding_ui") +end + +function AccountManager:showDeleteUI() + return UIManager:showUI("app/ui/game_setting/account_delete_ui") +end + +function AccountManager:getIsBinded() + local accountInfo = LocalData:getAccountInfo() + if accountInfo.google_id and accountInfo.google_id ~= "" then + return true + end + if accountInfo.apple_id and accountInfo.apple_id ~= "" then + return true + end + return false +end + +function AccountManager:deleteAccount() + self:sendMessage(ProtoMsgType.FromMsgEnum.DeleteReq, {}, {}, self.onDeleteAccount, BIReport.ITEM_GET_TYPE.NONE) +end + +function AccountManager:onDeleteAccount(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then -- 删除账号成功 + local info = LocalData:getLastLoginInfo() + BIReport:postAccountDelete(info.type) + ModuleManager.LoginManager:goToLoginScene() + else + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DELETE_ACCOUNT_FAILED)) + end +end + +function AccountManager:bindAccount() + local loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE + if Platform:isIosPlatform() then + loginType = SDKManager.BF_LOGIN_TYPE.APPLE + end + + BIReport:postAccountBindClick(loginType) + SDKManager:login(function(params) + if not params.token then + return + end + local args = { + type = SDKManager.LOGIN_TYPE[loginType], + id = params.id, + token = params.token + } + self:sendMessage(ProtoMsgType.FromMsgEnum.BindReq, args, {}, self.onBindAccount, BIReport.ITEM_GET_TYPE.NONE) + end, loginType) +end + +function AccountManager:onBindAccount(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + local accountInfo = LocalData:getAccountInfo() + local loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE + if Platform:isIosPlatform() then + loginType = SDKManager.BF_LOGIN_TYPE.APPLE + accountInfo.apple_id = result.reqData.id + else + accountInfo.googld_id = result.reqData.id + end + LocalData:setLastLoginInfo(loginType, result.reqData.id, result.reqData.token) + LocalData:setAccountInfo(accountInfo) + LocalData:save() + + BIReport:postAccountBindFinish(loginType, true) + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BIND_ACCOUNT_SUCCESS)) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.BIND_ACCOUNT_SUCCESS) + else -- 一些失败的提示 + local loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE + if Platform:isIosPlatform() then + loginType = SDKManager.BF_LOGIN_TYPE.APPLE + end + BIReport:postAccountBindFinish(loginType, false) + end +end + +function AccountManager:changeAccount() + local loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE + if Platform:isIosPlatform() then + loginType = SDKManager.BF_LOGIN_TYPE.APPLE + end + + BIReport:postAccountChangeClick(loginType) + SDKManager:login(function(params) + if not params.token then + return + end + local args = { + type = SDKManager.LOGIN_TYPE[loginType], + id = params.id, + token = params.token + } + self:sendMessage(ProtoMsgType.FromMsgEnum.ExistReq, args, {}, self.onChangeAccount, BIReport.ITEM_GET_TYPE.NONE) + end, loginType) +end + +function AccountManager:onChangeAccount(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then -- 目标账号存在，切换到目标账号 + local accountInfo = LocalData:getAccountInfo() + local loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE + if Platform:isIosPlatform() then + loginType = SDKManager.BF_LOGIN_TYPE.APPLE + accountInfo.apple_id = result.reqData.id + else + accountInfo.googld_id = result.reqData.id + end + LocalData:setLastLoginInfo(loginType, result.reqData.id, result.reqData.token) + LocalData:setAccountInfo(accountInfo) + LocalData:save() + BIReport:postAccountChangeFinish(loginType, true) + ModuleManager.LoginManager:goToLoginScene() + else + local loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE + if Platform:isIosPlatform() then + loginType = SDKManager.BF_LOGIN_TYPE.APPLE + end + BIReport:postAccountChangeFinish(loginType, false) + end +end + +return AccountManager \ No newline at end of file diff --git a/lua/app/ui/common/cheat_message_box.lua.meta b/lua/app/module/account/account_manager.lua.meta similarity index 86% rename from lua/app/ui/common/cheat_message_box.lua.meta rename to lua/app/module/account/account_manager.lua.meta index fa77c80e..7f82a3f7 100644 --- a/lua/app/ui/common/cheat_message_box.lua.meta +++ b/lua/app/module/account/account_manager.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ed5cd4e2a31830e439ea9f1e38f55731 +guid: fbc7bda584c3578478d7e7fe2bb9e7a1 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index db0157af..32a1614f 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1408,14 +1408,15 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx) end function BattleUnitComp:judgeSkillEffectCondition(skill, index) - if not skill or skill:haveBuffCondition() then + if not skill or not skill:haveBuffCondition() then return true end - local buffConditionIndex, conditionRel = skill:getBuffConditionRel(index) - if not buffConditionIndex then + local rel = skill:getBuffConditionRel(index) + if not rel then return true end + local buffConditionIndex, conditionRel = rel[1], rel[2] local buffConditions = skill:getBuffCondition(buffConditionIndex) return BATTLE_SKILL_CONDITION_HANDLE.judgeSkillEffectCondition(buffConditions, conditionRel, self.battleController) @@ -1791,24 +1792,11 @@ function BattleUnitComp:getEffectAndPlay(fxInfo, isLoop) effectObj:setLocalPosition(0, 0, 0) end end - if fxInfo.follow_direction then - if self.side == BattleConst.SIDE_ATK then - if effectObj:getIsEulerAnglesFlip() then - effectObj:setLocalEulerAngles(0, 0, 0) - end - effectObj:setLocalScale(fxScale, fxScale, fxScale) - else - if effectObj:getIsEulerAnglesFlip() then - effectObj:setLocalEulerAngles(0, 180, 0) - effectObj:setLocalScale(fxScale, fxScale, fxScale) - else - effectObj:setLocalScale(-fxScale, fxScale, fxScale) - end - end + if fxInfo.flip then + effectObj:setLocalEulerAngles(0, 180, 0) + effectObj:setLocalScale(fxScale, fxScale, fxScale) else - if effectObj:getIsEulerAnglesFlip() then - effectObj:setLocalEulerAngles(0, 0, 0) - end + effectObj:setLocalEulerAngles(0, 0, 0) effectObj:setLocalScale(fxScale, fxScale, fxScale) end local baseOrder = BattleHelper:getBaseOrder() diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 1079043d..1be6f5b5 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -119,6 +119,7 @@ function BattleController:onDefDead(callback) if callback then callback() end + self:handleBuffs(BattleConst.SIDE_DEF) end) else if callback then @@ -1018,7 +1019,9 @@ function BattleController:calculateCurElimination(onlyCheck) local elementType = entity:getElementType() if not info.noAni and info.isIdle then if not info.isSkill then - elementTypeMap[elementType] = (elementTypeMap[elementType] or 0) + 1 + if not entity:isElmentTypeInvalid() then + elementTypeMap[elementType] = (elementTypeMap[elementType] or 0) + 1 + end if boomGridIds[info.posId] and boomGridIds[info.posId][GRID_BREAK_CONDITION.LINE] then lineCount = lineCount + 1 linkElementType = elementType diff --git a/lua/app/module/battle/controller/battle_controller_stage.lua b/lua/app/module/battle/controller/battle_controller_stage.lua index 292766d8..e353fc7c 100644 --- a/lua/app/module/battle/controller/battle_controller_stage.lua +++ b/lua/app/module/battle/controller/battle_controller_stage.lua @@ -60,6 +60,7 @@ function BattleControllerStage:_stageGenerateNextMonster() local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) monsterComp:initWithEntity(modelId, unitEntity, self) self.defTeam:addUnit(monsterComp, true) + self:handleBuffs(GConst.BattleConst.SIDE_DEF) self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN) if isBoss then -- 如果是boss就跑过去 diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 89f1c453..e3176375 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -293,7 +293,7 @@ function BattleTeam:removeAllBuff() local count = #self.buffList for i = count, 1, -1 do buffEffect = self.buffList[i] - if buffEffect and not buffEffect.buff:isCantRemove() then + if buffEffect then self:updateBuffState(buffEffect.buff, -1) table.remove(self.buffList, i) BattleBuffHandle.removeBuff(self.mainUnit, buffEffect) diff --git a/lua/app/module/login/login_manager.lua b/lua/app/module/login/login_manager.lua index 7016bf8d..63524c2e 100644 --- a/lua/app/module/login/login_manager.lua +++ b/lua/app/module/login/login_manager.lua @@ -101,6 +101,7 @@ function LoginManager:goToLoginScene() ModuleManager.BattleManager:clearOnExitScene() NetManager:closeAndClear() UIManager:backToLoginWithoutLogout() + UIManager:clearUIPrefabCache() DataManager:clear() end diff --git a/lua/app/net/net_manager.lua b/lua/app/net/net_manager.lua index caf2042b..611805b2 100644 --- a/lua/app/net/net_manager.lua +++ b/lua/app/net/net_manager.lua @@ -215,12 +215,17 @@ function NetManager:connect(domain, port, callback, socketName) pbData.status = not pbData.err_code and 0 or ProtoMsgDispatch:getErrCodeEnum(pbData.err_code) if pbData.status ~= 0 then self:closeAndClear() - local lastLoginType = LocalData:getLastLoginType() - if lastLoginType == NetManager.LOGIN_TYPE.GOOGLE or lastLoginType == NetManager.LOGIN_TYPE.APPLE then - local loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE - if lastLoginType == NetManager.LOGIN_TYPE.APPLE then - loginType = SDKManager.BF_LOGIN_TYPE.APPLE - end + local accountInfo = LocalData:getAccountInfo() + local loginType + local lastLoginType + if accountInfo.google_id and accountInfo.google_id ~= "" then + loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE + lastLoginType = NetManager.LOGIN_TYPE.GOOGLE + elseif accountInfo.apple_id and accountInfo.apple_id ~= "" then + loginType = SDKManager.BF_LOGIN_TYPE.APPLE + lastLoginType = NetManager.LOGIN_TYPE.APPLE + end + if loginType then SDKManager:login(function(params) if not params.token then return diff --git a/lua/app/ui/activity/gold_pig/gold_pig_ui.lua b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua index 58563936..25608f42 100644 --- a/lua/app/ui/activity/gold_pig/gold_pig_ui.lua +++ b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua @@ -53,16 +53,19 @@ function GoldPigUI:onLoadRootComplete() end) self:bind(DataManager.GoldPigData, "dirty", function() - -- 金猪到时间关闭了 if not DataManager.GoldPigData:getIsOpen() then - local params = { - content = I18N:getGlobalText(I18N.GlobalConst.GOLD_PIG_CLOSE_DESC), - boxType = GConst.MESSAGE_BOX_TYPE.MB_OK, - okFunc = function() - self:closeUI() - end - } - GFunc.showMessageBox(params) + --如果是到时间关闭的则弹出提示 + local id = DataManager.GoldPigData:getId() + if self.goldPigId > id then -- 降级说明是时间到了关闭的 + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.GOLD_PIG_CLOSE_DESC), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK, + okFunc = function() + self:closeUI() + end + } + GFunc.showMessageBox(params) + end end end) end diff --git a/lua/app/ui/battle/battle_daily_challenge_buff_ui.lua b/lua/app/ui/battle/battle_daily_challenge_buff_ui.lua index cae11cea..9c814fa8 100644 --- a/lua/app/ui/battle/battle_daily_challenge_buff_ui.lua +++ b/lua/app/ui/battle/battle_daily_challenge_buff_ui.lua @@ -18,6 +18,13 @@ function BattleDailyChallengeBuffUI:ctor() end end +function BattleDailyChallengeBuffUI:onClose() + if self.txSeq then + self.txSeq:Kill() + self.txSeq = nil + end +end + function BattleDailyChallengeBuffUI:onLoadRootComplete() self:_display() self:_addListeners() @@ -32,6 +39,17 @@ function BattleDailyChallengeBuffUI:_display() for index, obj in ipairs(buffDescs) do obj:setText(self.buffDescs[index]) end + local txNode = uiMap["battle_daily_challenge_buff_ui.raw_img"]:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) + txNode.alpha = 0 + uiMap["battle_daily_challenge_buff_ui.ui_spine_obj"]:playAnim("idle", false, true) + + if self.txSeq then + self.txSeq:Kill() + self.txSeq = nil + end + self.txSeq = self.root:createBindTweenSequence() + self.txSeq:AppendInterval(0.2) + self.txSeq:Append(txNode:DOFade(1, 0.2)) end function BattleDailyChallengeBuffUI:_addListeners() diff --git a/lua/app/ui/battle/battle_pause_ui.lua b/lua/app/ui/battle/battle_pause_ui.lua index 27745681..7edb5271 100644 --- a/lua/app/ui/battle/battle_pause_ui.lua +++ b/lua/app/ui/battle/battle_pause_ui.lua @@ -3,9 +3,11 @@ local BattlePauseUI = class("BattlePauseUI", BaseUI) local SELECT_SKILL_CELL = "app/ui/battle/cell/select_skill_cell" local SKILL_ROGUE_CFG = ConfigManager:getConfig("skill_rogue") local HIDE_TYPE = { - [9] = true, [10] = true } +local HIDE_ID = { + [29] = true +} function BattlePauseUI:isFullScreen() return false @@ -25,7 +27,7 @@ function BattlePauseUI:ctor(params) self.skillList = {} for skillId, info in pairs(map) do local cfg = SKILL_ROGUE_CFG[skillId] - if cfg and not HIDE_TYPE[cfg.type] then + if cfg and not HIDE_TYPE[cfg.type] and not HIDE_ID[skillId] then table.insert(self.skillList, {skillId = skillId, info = info}) end end diff --git a/lua/app/ui/battle/cell/grid_cell.lua b/lua/app/ui/battle/cell/grid_cell.lua index d0f88f5f..3fee2761 100644 --- a/lua/app/ui/battle/cell/grid_cell.lua +++ b/lua/app/ui/battle/cell/grid_cell.lua @@ -29,8 +29,25 @@ function GridCell:refresh(gridEntity, curElement, skillPosId) if self.lastGridType ~= gridEntity:getGridType() then self.lastGridType = gridEntity:getGridType() - local atlas, icon = gridEntity:getIcon() - uiMap["grid_cell.touch_node.ani_node.up_bg"]:setSprite(atlas, icon) + local spineObj = uiMap["grid_cell.touch_node.ani_node.up_bg.ui_spine_obj"] + local upBg = uiMap["grid_cell.touch_node.ani_node.up_bg"] + if gridEntity:getSpineAsset() then + spineObj:setActive(true) + spineObj:loadAssetAsync(gridEntity:getSpineAsset(), function() + if gridEntity:getSpineChangeName() then + spineObj:playAnimComplete(gridEntity:getSpineChangeName(), false, true, function() + spineObj:playAnim(gridEntity:getSpineIdleName(), true, false, true) + end, true) + else + spineObj:playAnim(gridEntity:getSpineIdleName(), true, false, true) + end + end) + upBg:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") + else + spineObj:setActive(false) + local atlas, icon = gridEntity:getIcon() + upBg:setSprite(atlas, icon) + end end local skillIcon = uiMap["grid_cell.touch_node.ani_node.skill_icon"] @@ -219,6 +236,7 @@ end function GridCell:setGridTypeIcon(icon) local uiMap = self:getUIMap() uiMap["grid_cell.touch_node.ani_node.up_bg"]:setSprite(GConst.ATLAS_PATH.BATTLE, icon) + uiMap["grid_cell.touch_node.ani_node.up_bg.ui_spine_obj"]:setActive(false) end return GridCell \ No newline at end of file diff --git a/lua/app/ui/common/cheat_message_box.lua b/lua/app/ui/common/cheat_message_box.lua deleted file mode 100644 index 1844ca0a..00000000 --- a/lua/app/ui/common/cheat_message_box.lua +++ /dev/null @@ -1,80 +0,0 @@ -local CheatMessageBox = {} - -function CheatMessageBox:showCheatMessageBox(params) - if params and params.noDeleteBtn then - CheatMessageBox.noDeleteBtn = true - end - UIManager:getCheatMessageBox(function(prefabObject) - local uiMap = prefabObject:genAllChildren() - uiMap["message_box.title_bg_img.title_text"]:setText(I18N:getGlobalText(I18N.GlobalConst.MESSAGE_BOX_TITLE)) - uiMap["cheating_ui.title_bg_img.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CHEATING_DESC_1)) - uiMap["message_box.title_bg_img.ok_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUPPORT_DESSC)) - uiMap["cheating_box.title_bg_img.delete_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.DELETE_ACCOUNT_DESC)) - uiMap["cheating_ui.title_bg_img.bg1.player_id_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.COPY_ID)) - uiMap["cheating_ui.title_bg_img.bg2.player_id_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.COPY_MAIL)) - - local objectId = "" - uiMap["cheating_ui.title_bg_img.bg1.player_id"]:setText("PlayerID:" .. objectId) - uiMap["cheating_ui.title_bg_img.bg2.player_id"]:setText("LonelySurvivorTech@cobbygame.com") - - uiMap["cheating_ui.title_bg_img.bg1.player_id_btn"]:addClickListener(function() - -- local objectId = :getServerPlayerId() or "" - -- GFunc.copyStr(objectId) - end) - - uiMap["cheating_ui.title_bg_img.bg2.player_id_btn"]:addClickListener(function() - GFunc.copyStr("LonelySurvivorTech@cobbygame.com") - end) - - local okBtn = uiMap["message_box.title_bg_img.ok_btn"] - okBtn:addClickListener(function() - local subject = "Lonely Survivor(" .. Platform:getClientVersion() .. ")'s Feedback" - - local platform = "Android" - if Platform:isIosPlatform() then - platform = "IOS" - end - - local objectId = "" - - local body = "\nPlease don't delete the information below\n===========\nGameName: Lonely Survivor\n" - body = body .. "GameVersion: " .. Platform:getClientVersion() .. "\n" - body = body .. "Device Model: " .. DeviceHelper:getDeviceModel() .. "\n" - body = body .. "Platform: " .. platform .. "\n" - body = body .. "OSversion: " .. DeviceHelper:getOSVersion() .. "\n" - body = body .. "User ID: " .. objectId .. "\n" - body = body .. "===========\nPlease don't delete the information above" - - local uri = CS.System.Uri("mailto:LonelySurvivorTech@cobbygame.com?subject=" .. subject .. "&body=" .. body) - GFunc.openUrl(uri.AbsoluteUri) - end) - - local deleteBtn = uiMap["cheating_box.title_bg_img.delete_btn"] - - deleteBtn:addClickListener(function() - local sortingOrder = prefabObject:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS).sortingOrder + 1 - local obj = ModuleManager.AccountManager:showDeleteUI() - obj:setUIOrder(0, sortingOrder) - end) - - local showDeleteBtn = true - if CheatMessageBox.noDeleteBtn then - showDeleteBtn = false - end - - deleteBtn:setActive(showDeleteBtn) - if showDeleteBtn then - okBtn:setAnchoredPositionX(132) - else - okBtn:setAnchoredPositionX(0) - end - end) -end - -function CheatMessageBox:hideCheatMessageBox() - if not CheatMessageBox.noDeleteBtn then - UIManager:hideCheatMessageBox() - end -end - -return CheatMessageBox \ No newline at end of file diff --git a/lua/app/ui/game_setting/account_delete_ui.lua b/lua/app/ui/game_setting/account_delete_ui.lua new file mode 100644 index 00000000..7ba88c5f --- /dev/null +++ b/lua/app/ui/game_setting/account_delete_ui.lua @@ -0,0 +1,63 @@ +local AccountDeleteUI = class("AccountDeleteUI", BaseUI) + +function AccountDeleteUI:isFullScreen() + return false +end + +function AccountDeleteUI:showCommonBG() + return false +end + +function AccountDeleteUI:getPrefabPath() + return "assets/prefabs/ui/setting/account_delete_ui.prefab" +end + +function AccountDeleteUI:onClose() + if self.inputFieldObj then + self.inputFieldObj:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TMP_INPUT_FIELD).text = GConst.EMPTY_STRING + end +end + +function AccountDeleteUI:ctor() + self.besureTxStr = I18N:getGlobalText(I18N.GlobalConst.BESURE_DELETE_ACCOUNT_DESC) +end + +function AccountDeleteUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.okBtn = uiMap["account_delete_ui.title_bg_img.change_btn"] + self.btnTx = uiMap["account_delete_ui.title_bg_img.change_btn.text"] + self.okBtnGray = uiMap["account_delete_ui.title_bg_img.change_btn.gray"] + self.inputFieldObj = uiMap["account_delete_ui.title_bg_img.input_field"] + + self.okBtn:addClickListener(function() + local content = self.inputFieldObj:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TMP_INPUT_FIELD).text + if content == self.besureTxStr then + ModuleManager.AccountManager:deleteAccount() + end + end) + + uiMap["account_delete_ui.title_bg_img.close_btn"]:addClickListener(function() + self:closeUI() + end) + + self:_display() +end + +function AccountDeleteUI:_display() + local uiMap = self.root:genAllChildren() + uiMap["account_delete_ui.title_bg_img.title_text"]:setText(I18N:getGlobalText(I18N.GlobalConst.MESSAGE_BOX_TITLE)) + uiMap["account_delete_ui.title_bg_img.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.BESURE_DELETE_TIPS_DESC, self.besureTxStr)) + + self:refreshBtn(true) + self.inputFieldObj:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TMP_INPUT_FIELD).onValueChanged:AddListener(function(content) + self:refreshBtn(content ~= self.besureTxStr) + end) +end + +function AccountDeleteUI:refreshBtn(gray) + self.okBtnGray:setVisible(gray) + self.okBtn:setTouchEnable(not gray) + self.btnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK)) +end + +return AccountDeleteUI \ No newline at end of file diff --git a/lua/app/ui/game_setting/account_delete_ui.lua.meta b/lua/app/ui/game_setting/account_delete_ui.lua.meta new file mode 100644 index 00000000..8817dc6d --- /dev/null +++ b/lua/app/ui/game_setting/account_delete_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2dba9e1bf395ae54584347a571d14188 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/game_setting/game_setting_ui.lua b/lua/app/ui/game_setting/game_setting_ui.lua index 8dd0dbc4..477889b4 100644 --- a/lua/app/ui/game_setting/game_setting_ui.lua +++ b/lua/app/ui/game_setting/game_setting_ui.lua @@ -18,7 +18,9 @@ function GameSettingUI:onLoadRootComplete() self.uiMap = self.root:genAllChildren() self:_display() self:_addListeners() - self:_bind() + self:addEventListener(EventManager.CUSTOM_EVENT.BIND_ACCOUNT_SUCCESS, function() + self:refreshAccountInfo() + end) end function GameSettingUI:onPressBackspace() @@ -46,23 +48,36 @@ end function GameSettingUI:initLoginBtn() self.uiMap["game_setting_ui.bg.google_sign_btn"]:addClickListener(function() - + if ModuleManager.AccountManager:getIsBinded() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACCOUNT_ALREADY_BINDED_DESC)) + return + end + ModuleManager.AccountManager:bindAccount() end) - if DataManager.PlayerData:getIsBinded() then - self.uiMap["game_setting_ui.bg.google_sign_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACCOUNT_ALREADY_BINDED_DESC)) - else - self.uiMap["game_setting_ui.bg.google_sign_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.BIND_ACCOUNT_DESC)) - end self.uiMap["game_setting_ui.bg.google_switch_btn"]:addClickListener(function() - + if ModuleManager.AccountManager:getIsBinded() then + ModuleManager.AccountManager:changeAccount() + else + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.CHANGE_ACCOUNT_TIPS_DESC), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), + okFunc = function() + ModuleManager.AccountManager:changeAccount() + end + } + GFunc.showMessageBox(params) + end end) self.uiMap["game_setting_ui.bg.google_switch_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.CHANGE_ACCOUNT_DESC)) local deleteTx = self.uiMap["game_setting_ui.bg.delete_tx"] deleteTx:setText(I18N:getGlobalText(I18N.GlobalConst.DELETE_ACCOUNT_DESC)) deleteTx:addClickListener(function() + ModuleManager.AccountManager:showDeleteUI() end) + self:refreshAccountInfo() end function GameSettingUI:_addListeners() @@ -116,9 +131,6 @@ function GameSettingUI:_addListeners() end) end -function GameSettingUI:_bind() -end - function GameSettingUI:refreshMusic() local offIcon = self.uiMap["game_setting_ui.bg.music_bg.off"] local onIcon = self.uiMap["game_setting_ui.bg.music_bg.on"] @@ -137,4 +149,12 @@ function GameSettingUI:refreshVoice() onIcon:setVisible(status == true) end +function GameSettingUI:refreshAccountInfo() + if ModuleManager.AccountManager:getIsBinded() then + self.uiMap["game_setting_ui.bg.google_sign_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACCOUNT_ALREADY_BINDED_DESC)) + else + self.uiMap["game_setting_ui.bg.google_sign_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.BIND_ACCOUNT_DESC)) + end +end + return GameSettingUI \ No newline at end of file diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 9947eacd..6b764822 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -139,8 +139,10 @@ function MainCityUI:_addListeners() end return end - self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnimComplete("born", false, false, function() - self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnim("idle", false, false) + self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnimComplete("born1", false, false, function() + self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnimComplete("born2", false, false, function() + self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnim("idle", false, false) + end) end) self:refreshBottom(GConst.MainCityConst.BOTTOM_PAGE.SHOP, true) if self.subComps and self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP] then @@ -261,8 +263,10 @@ function MainCityUI:initBottomUI() BIReport:postHomeBtnCilck(BIReport.CLICK_BTN_TYPE[MainCityUI.CLICK_BTN_TYPE[i]]) end - self.bottomBtnSpines[i]:playAnimComplete("born", false, false, function() - self.bottomBtnSpines[i]:playAnim("idle", false, false) + self.bottomBtnSpines[i]:playAnimComplete("born1", false, false, function() + self.bottomBtnSpines[i]:playAnimComplete("born2", false, false, function() + self.bottomBtnSpines[i]:playAnim("idle", false, false) + end) end) self:refreshBottom(i, true) end) diff --git a/lua/app/ui/main_city/module_unlock_ui.lua b/lua/app/ui/main_city/module_unlock_ui.lua index f7bcf04b..5fc5ed30 100644 --- a/lua/app/ui/main_city/module_unlock_ui.lua +++ b/lua/app/ui/main_city/module_unlock_ui.lua @@ -60,6 +60,9 @@ function ModuleUnlockUI:showModuleUnlockAnimation() return false end self.moduleNameTx:setText(i18nInfo.name) + if info.icon then + self.moduleIcon:setSprite(GConst.ATLAS_PATH.MODULE, info.icon) + end return true end diff --git a/lua/app/ui/ui_manager.lua b/lua/app/ui/ui_manager.lua index 221fef8d..6e82968f 100644 --- a/lua/app/ui/ui_manager.lua +++ b/lua/app/ui/ui_manager.lua @@ -1,7 +1,6 @@ local UIManager = {} local MESSAGE_BOX_PATH = "assets/prefabs/ui/common/message_box.prefab" -local CHEATING_BOX_PATH = "assets/prefabs/ui/common/cheating_box.prefab" local TUTORIAL_PATH = "assets/prefabs/ui/tutorial/tutorial_ui.prefab" UIManager.UI_TYPE = { @@ -405,7 +404,6 @@ end -- 显示引导节点 function UIManager:showTutorial() self.tutorialCanvas:setActive(true) - self:hideChatBtn() end -- 隐藏引导节点 @@ -577,9 +575,6 @@ function UIManager:addLoadUICompleteListener(uiIndex, callback) end function UIManager:getMessageBox(top, callback) - if self.cheatMsgBox and self.cheatMsgBox:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS).enabled then - return - end if top then if self.topMsgBox == nil then UIPrefabManager:loadUIWidgetAsync(MESSAGE_BOX_PATH, self.messageBoxNode, function (prefabObject) @@ -621,36 +616,6 @@ function UIManager:getMessageBox(top, callback) end end -function UIManager:getCheatMessageBox(callback) - if self.topMsgBox then - self.topMsgBox:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS).enabled = false - end - if self.messageBox then - self.messageBox:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS).enabled = false - end - if self.cheatMsgBox == nil then - UIPrefabManager:loadUIWidgetAsync(CHEATING_BOX_PATH, self.messageBoxNode, function (prefabObject) - if self.cheatMsgBox then - prefabObject:destroy() - callback(self.cheatMsgBox) - return - end - prefabObject:initPrefabHelper() - prefabObject:getTransform():SetAsLastSibling() - - local messageBoxCanvas = prefabObject:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS) - local messageBoxCanvasOrder = UI_MAX_ORDER + UI_INTERVAL_ORDER*OTHER_CANVAS_INTERVAL_ORDER.MESSAGE_BOX_TOP + 1 - messageBoxCanvas.overrideSorting = true - messageBoxCanvas.sortingOrder = messageBoxCanvasOrder - self.cheatMsgBox = prefabObject - callback(self.cheatMsgBox) - end) - else - self.cheatMsgBox:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS).enabled = true - callback(self.cheatMsgBox) - end -end - function UIManager:getMessageBoxGameObject(top) if top then return self.topMsgBox @@ -669,12 +634,6 @@ function UIManager:hideMessageBox() end end -function UIManager:hideCheatMessageBox() - if self.cheatMsgBox then - self.cheatMsgBox:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS).enabled = false - end -end - function UIManager:hideMessageBoxByTag(tag) if self.messageBox then if self.messageBox:getTag() == tag then @@ -972,23 +931,14 @@ function UIManager:showNotchScreen() end end -function UIManager:backToLogin(clearLoginType) +function UIManager:backToLogin() self:stopCurrentBGM() - - SDKManager:gameLogout(clearLoginType or false, function () - -- 移除 - -- SchedulerManager:removeCrossDaySId() - - -- 清除引导 - ModuleManager.TutorialManager:stopTutorial() - -- 触发断线回到Login界面事件 - -- EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.LOGOUT_BACK_TO_LOGIN) - - self:closeAllUI() - ModuleManager.BattleManager:clearOnExitScene() - self:hideChatBtn() - Game:showLoginUI() - end) + SDKManager:logout() + -- 清除引导 + ModuleManager.TutorialManager:stopTutorial() + self:closeAllUI() + ModuleManager.BattleManager:clearOnExitScene() + Game:showLoginUI() end function UIManager:backToLoginWithoutLogout() @@ -997,7 +947,6 @@ function UIManager:backToLoginWithoutLogout() self:closeAllUI() ModuleManager.BattleManager:clearOnExitScene() - self:hideChatBtn() Game:showLoginUI() end diff --git a/lua/app/userdata/battle/battle_grid_entity.lua b/lua/app/userdata/battle/battle_grid_entity.lua index a83f3d79..9984e0e7 100644 --- a/lua/app/userdata/battle/battle_grid_entity.lua +++ b/lua/app/userdata/battle/battle_grid_entity.lua @@ -394,4 +394,16 @@ function BattleGridEntity:getBreakFlyToCharacterIcon() return self:getGridTypeConfig().bftc_icon end +function BattleGridEntity:getSpineAsset() + return self:getGridTypeConfig().spine_name +end + +function BattleGridEntity:getSpineIdleName() + return self:getGridTypeConfig().spine_idle +end + +function BattleGridEntity:getSpineChangeName() + return self:getGridTypeConfig().spine_change +end + return BattleGridEntity \ No newline at end of file diff --git a/lua/app/userdata/daily_challenge/daily_challenge_data.lua b/lua/app/userdata/daily_challenge/daily_challenge_data.lua index 121e56a4..25f97784 100644 --- a/lua/app/userdata/daily_challenge/daily_challenge_data.lua +++ b/lua/app/userdata/daily_challenge/daily_challenge_data.lua @@ -33,14 +33,6 @@ function DailyChallengeData:onGetedTaskReward(idx) end function DailyChallengeData:clear() - self.maxWave = nil - self.fixedChapterId = nil - self.chapterDailyId = nil - self.tasks = nil - self.buffIds = nil - self.totalFightCount = nil - self.todayFightCount = nil - self.initDay = nil end function DailyChallengeData:isOpen() diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index 52abf7ca..2dcaffeb 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -121,10 +121,6 @@ function PlayerData:getAcountId() return self:getAccountInfo().id or GConst.EMPTY_STRING end -function PlayerData:getIsBinded() - return false -end - function PlayerData:addVitGemBuyCount() self.data.vitGemCount = self.data.vitGemCount + 1 end