diff --git a/lua/app/common/local_data.lua b/lua/app/common/local_data.lua index 7b6da257..20b88380 100644 --- a/lua/app/common/local_data.lua +++ b/lua/app/common/local_data.lua @@ -436,6 +436,7 @@ function LocalData:saveBattleSnapshot(snapshot) Logger.logHighlight(json.encode(snapshot)) end self:setString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), json.encode(snapshot)) + LocalData:save() end function LocalData:getBattleSnapshot() diff --git a/lua/app/config/arena_bounty_level.lua b/lua/app/config/arena_bounty_level.lua index b96e1fee..08865cc5 100644 --- a/lua/app/config/arena_bounty_level.lua +++ b/lua/app/config/arena_bounty_level.lua @@ -1627,8 +1627,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, @@ -1687,16 +1687,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [205]={ @@ -1848,16 +1848,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [213]={ @@ -1988,16 +1988,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [220]={ @@ -2049,16 +2049,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [223]={ @@ -2189,8 +2189,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, @@ -2250,16 +2250,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [233]={ @@ -2451,16 +2451,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [243]={ @@ -2591,8 +2591,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" }, ["reward_pro"]={ ["type"]=1, @@ -2652,16 +2652,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [253]={ @@ -2853,16 +2853,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [263]={ @@ -3054,16 +3054,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [273]={ @@ -3154,16 +3154,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [278]={ @@ -3247,8 +3247,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, @@ -3307,16 +3307,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [305]={ @@ -3468,16 +3468,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [313]={ @@ -3608,16 +3608,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [320]={ @@ -3669,16 +3669,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [323]={ @@ -3809,8 +3809,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, @@ -3870,16 +3870,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [333]={ @@ -4071,16 +4071,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [343]={ @@ -4211,8 +4211,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" }, ["reward_pro"]={ ["type"]=1, @@ -4272,16 +4272,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [353]={ @@ -4473,16 +4473,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [363]={ @@ -4674,16 +4674,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [373]={ @@ -4774,16 +4774,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [378]={ diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index fbc203a0..e5ff438b 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -31,16 +31,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -49,16 +49,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=130, + ["num_for_nothing"]="Vwtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -197,16 +197,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=120, - ["num_for_nothing"]="Vwpc" + ["num"]=240, + ["num_for_nothing"]="VAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -215,16 +215,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -363,16 +363,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=280, + ["num_for_nothing"]="VABc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -381,16 +381,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=90, - ["num_for_nothing"]="Xwg=" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -537,16 +537,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=160, - ["num_for_nothing"]="Vw5c" + ["num"]=320, + ["num_for_nothing"]="VQpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -555,16 +555,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=210, + ["num_for_nothing"]="VAlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -711,16 +711,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -729,16 +729,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=110, - ["num_for_nothing"]="Vwlc" + ["num"]=230, + ["num_for_nothing"]="VAtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -885,16 +885,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -903,16 +903,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=260, + ["num_for_nothing"]="VA5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1059,16 +1059,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=220, - ["num_for_nothing"]="VApc" + ["num"]=440, + ["num_for_nothing"]="Ugxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1077,16 +1077,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=290, + ["num_for_nothing"]="VAFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1233,16 +1233,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=240, - ["num_for_nothing"]="VAxc" + ["num"]=480, + ["num_for_nothing"]="UgBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1251,16 +1251,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=150, - ["num_for_nothing"]="Vw1c" + ["num"]=310, + ["num_for_nothing"]="VQlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1407,16 +1407,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=260, - ["num_for_nothing"]="VA5c" + ["num"]=520, + ["num_for_nothing"]="Uwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1425,16 +1425,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=170, - ["num_for_nothing"]="Vw9c" + ["num"]=340, + ["num_for_nothing"]="VQxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1581,16 +1581,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=280, - ["num_for_nothing"]="VABc" + ["num"]=560, + ["num_for_nothing"]="Uw5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1599,16 +1599,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1755,16 +1755,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=300, - ["num_for_nothing"]="VQhc" + ["num"]=600, + ["num_for_nothing"]="UAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1773,16 +1773,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=190, - ["num_for_nothing"]="VwFc" + ["num"]=390, + ["num_for_nothing"]="VQFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1929,16 +1929,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=320, - ["num_for_nothing"]="VQpc" + ["num"]=640, + ["num_for_nothing"]="UAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1947,16 +1947,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=210, - ["num_for_nothing"]="VAlc" + ["num"]=420, + ["num_for_nothing"]="Ugpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2087,16 +2087,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2105,16 +2105,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=130, + ["num_for_nothing"]="Vwtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2253,16 +2253,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=120, - ["num_for_nothing"]="Vwpc" + ["num"]=240, + ["num_for_nothing"]="VAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2271,16 +2271,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2419,16 +2419,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=280, + ["num_for_nothing"]="VABc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2437,16 +2437,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=90, - ["num_for_nothing"]="Xwg=" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2593,16 +2593,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=160, - ["num_for_nothing"]="Vw5c" + ["num"]=320, + ["num_for_nothing"]="VQpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2611,16 +2611,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=210, + ["num_for_nothing"]="VAlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2767,16 +2767,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2785,16 +2785,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=110, - ["num_for_nothing"]="Vwlc" + ["num"]=230, + ["num_for_nothing"]="VAtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2941,16 +2941,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2959,16 +2959,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=260, + ["num_for_nothing"]="VA5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3115,16 +3115,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=220, - ["num_for_nothing"]="VApc" + ["num"]=440, + ["num_for_nothing"]="Ugxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3133,16 +3133,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=290, + ["num_for_nothing"]="VAFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3289,16 +3289,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=240, - ["num_for_nothing"]="VAxc" + ["num"]=480, + ["num_for_nothing"]="UgBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3307,16 +3307,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=150, - ["num_for_nothing"]="Vw1c" + ["num"]=310, + ["num_for_nothing"]="VQlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3463,16 +3463,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=260, - ["num_for_nothing"]="VA5c" + ["num"]=520, + ["num_for_nothing"]="Uwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3481,16 +3481,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=170, - ["num_for_nothing"]="Vw9c" + ["num"]=340, + ["num_for_nothing"]="VQxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3637,16 +3637,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=280, - ["num_for_nothing"]="VABc" + ["num"]=560, + ["num_for_nothing"]="Uw5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3655,16 +3655,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3811,16 +3811,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=300, - ["num_for_nothing"]="VQhc" + ["num"]=600, + ["num_for_nothing"]="UAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3829,16 +3829,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=190, - ["num_for_nothing"]="VwFc" + ["num"]=390, + ["num_for_nothing"]="VQFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3985,16 +3985,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=320, - ["num_for_nothing"]="VQpc" + ["num"]=640, + ["num_for_nothing"]="UAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4003,16 +4003,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=210, - ["num_for_nothing"]="VAlc" + ["num"]=420, + ["num_for_nothing"]="Ugpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4141,16 +4141,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4159,16 +4159,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=130, + ["num_for_nothing"]="Vwtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4305,16 +4305,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=120, - ["num_for_nothing"]="Vwpc" + ["num"]=240, + ["num_for_nothing"]="VAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4323,16 +4323,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4469,16 +4469,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=280, + ["num_for_nothing"]="VABc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4487,16 +4487,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=90, - ["num_for_nothing"]="Xwg=" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4641,16 +4641,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=160, - ["num_for_nothing"]="Vw5c" + ["num"]=320, + ["num_for_nothing"]="VQpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4659,16 +4659,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=210, + ["num_for_nothing"]="VAlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4813,16 +4813,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4831,16 +4831,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=110, - ["num_for_nothing"]="Vwlc" + ["num"]=230, + ["num_for_nothing"]="VAtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4985,16 +4985,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5003,16 +5003,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=260, + ["num_for_nothing"]="VA5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5157,16 +5157,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=220, - ["num_for_nothing"]="VApc" + ["num"]=440, + ["num_for_nothing"]="Ugxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5175,16 +5175,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=290, + ["num_for_nothing"]="VAFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5329,16 +5329,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=240, - ["num_for_nothing"]="VAxc" + ["num"]=480, + ["num_for_nothing"]="UgBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5347,16 +5347,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=150, - ["num_for_nothing"]="Vw1c" + ["num"]=310, + ["num_for_nothing"]="VQlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5501,16 +5501,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=260, - ["num_for_nothing"]="VA5c" + ["num"]=520, + ["num_for_nothing"]="Uwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5519,16 +5519,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=170, - ["num_for_nothing"]="Vw9c" + ["num"]=340, + ["num_for_nothing"]="VQxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5673,16 +5673,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=280, - ["num_for_nothing"]="VABc" + ["num"]=560, + ["num_for_nothing"]="Uw5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5691,16 +5691,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5845,16 +5845,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=300, - ["num_for_nothing"]="VQhc" + ["num"]=600, + ["num_for_nothing"]="UAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5863,16 +5863,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=190, - ["num_for_nothing"]="VwFc" + ["num"]=390, + ["num_for_nothing"]="VQFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -6017,16 +6017,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=320, - ["num_for_nothing"]="VQpc" + ["num"]=640, + ["num_for_nothing"]="UAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -6035,16 +6035,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=210, - ["num_for_nothing"]="VAlc" + ["num"]=420, + ["num_for_nothing"]="Ugpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 5876ad50..6bc612d2 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -117,7 +117,7 @@ local chapter = { } }, ["idle_exp"]=5, - ["idle_gold"]=10, + ["idle_gold"]=40, ["idle_drop"]={ { ["type"]=1, @@ -268,7 +268,7 @@ local chapter = { } }, ["idle_exp"]=6, - ["idle_gold"]=10, + ["idle_gold"]=40, ["idle_drop"]={ { ["type"]=1, @@ -414,7 +414,7 @@ local chapter = { } }, ["idle_exp"]=6, - ["idle_gold"]=13, + ["idle_gold"]=43, ["idle_drop"]={ { ["type"]=1, @@ -611,7 +611,7 @@ local chapter = { } }, ["idle_exp"]=7, - ["idle_gold"]=13, + ["idle_gold"]=43, ["idle_drop"]={ { ["type"]=1, @@ -808,7 +808,7 @@ local chapter = { } }, ["idle_exp"]=7, - ["idle_gold"]=19, + ["idle_gold"]=49, ["idle_drop"]={ { ["type"]=1, @@ -1011,7 +1011,7 @@ local chapter = { } }, ["idle_exp"]=8, - ["idle_gold"]=19, + ["idle_gold"]=49, ["idle_drop"]={ { ["type"]=1, @@ -1230,7 +1230,7 @@ local chapter = { } }, ["idle_exp"]=8, - ["idle_gold"]=25, + ["idle_gold"]=55, ["idle_drop"]={ { ["type"]=1, @@ -1449,7 +1449,7 @@ local chapter = { } }, ["idle_exp"]=9, - ["idle_gold"]=25, + ["idle_gold"]=55, ["idle_drop"]={ { ["type"]=1, @@ -1668,7 +1668,7 @@ local chapter = { } }, ["idle_exp"]=9, - ["idle_gold"]=31, + ["idle_gold"]=61, ["idle_drop"]={ { ["type"]=1, @@ -1887,7 +1887,7 @@ local chapter = { } }, ["idle_exp"]=10, - ["idle_gold"]=31, + ["idle_gold"]=61, ["idle_drop"]={ { ["type"]=1, @@ -2106,7 +2106,7 @@ local chapter = { } }, ["idle_exp"]=10, - ["idle_gold"]=37, + ["idle_gold"]=67, ["idle_drop"]={ { ["type"]=1, @@ -2325,7 +2325,7 @@ local chapter = { } }, ["idle_exp"]=12, - ["idle_gold"]=37, + ["idle_gold"]=67, ["idle_drop"]={ { ["type"]=1, @@ -2544,7 +2544,7 @@ local chapter = { } }, ["idle_exp"]=12, - ["idle_gold"]=42, + ["idle_gold"]=72, ["idle_drop"]={ { ["type"]=1, @@ -2763,7 +2763,7 @@ local chapter = { } }, ["idle_exp"]=14, - ["idle_gold"]=42, + ["idle_gold"]=72, ["idle_drop"]={ { ["type"]=1, @@ -2982,7 +2982,7 @@ local chapter = { } }, ["idle_exp"]=14, - ["idle_gold"]=47, + ["idle_gold"]=77, ["idle_drop"]={ { ["type"]=1, @@ -3201,7 +3201,7 @@ local chapter = { } }, ["idle_exp"]=16, - ["idle_gold"]=47, + ["idle_gold"]=77, ["idle_drop"]={ { ["type"]=1, @@ -3420,7 +3420,7 @@ local chapter = { } }, ["idle_exp"]=16, - ["idle_gold"]=48, + ["idle_gold"]=78, ["idle_drop"]={ { ["type"]=1, @@ -3639,7 +3639,7 @@ local chapter = { } }, ["idle_exp"]=18, - ["idle_gold"]=48, + ["idle_gold"]=78, ["idle_drop"]={ { ["type"]=1, @@ -3858,7 +3858,7 @@ local chapter = { } }, ["idle_exp"]=18, - ["idle_gold"]=49, + ["idle_gold"]=79, ["idle_drop"]={ { ["type"]=1, @@ -4077,7 +4077,7 @@ local chapter = { } }, ["idle_exp"]=20, - ["idle_gold"]=49, + ["idle_gold"]=79, ["idle_drop"]={ { ["type"]=1, @@ -4296,7 +4296,7 @@ local chapter = { } }, ["idle_exp"]=20, - ["idle_gold"]=50, + ["idle_gold"]=80, ["idle_drop"]={ { ["type"]=1, @@ -4515,7 +4515,7 @@ local chapter = { } }, ["idle_exp"]=22, - ["idle_gold"]=50, + ["idle_gold"]=80, ["idle_drop"]={ { ["type"]=1, @@ -4734,7 +4734,7 @@ local chapter = { } }, ["idle_exp"]=22, - ["idle_gold"]=51, + ["idle_gold"]=81, ["idle_drop"]={ { ["type"]=1, @@ -4953,7 +4953,7 @@ local chapter = { } }, ["idle_exp"]=24, - ["idle_gold"]=51, + ["idle_gold"]=81, ["idle_drop"]={ { ["type"]=1, @@ -5172,7 +5172,7 @@ local chapter = { } }, ["idle_exp"]=24, - ["idle_gold"]=52, + ["idle_gold"]=82, ["idle_drop"]={ { ["type"]=1, @@ -5391,7 +5391,7 @@ local chapter = { } }, ["idle_exp"]=26, - ["idle_gold"]=52, + ["idle_gold"]=82, ["idle_drop"]={ { ["type"]=1, @@ -5610,7 +5610,7 @@ local chapter = { } }, ["idle_exp"]=26, - ["idle_gold"]=53, + ["idle_gold"]=83, ["idle_drop"]={ { ["type"]=1, @@ -5829,7 +5829,7 @@ local chapter = { } }, ["idle_exp"]=28, - ["idle_gold"]=53, + ["idle_gold"]=83, ["idle_drop"]={ { ["type"]=1, @@ -6048,7 +6048,7 @@ local chapter = { } }, ["idle_exp"]=28, - ["idle_gold"]=54, + ["idle_gold"]=84, ["idle_drop"]={ { ["type"]=1, @@ -6267,7 +6267,7 @@ local chapter = { } }, ["idle_exp"]=30, - ["idle_gold"]=54, + ["idle_gold"]=84, ["idle_drop"]={ { ["type"]=1, @@ -6486,7 +6486,7 @@ local chapter = { } }, ["idle_exp"]=30, - ["idle_gold"]=55, + ["idle_gold"]=85, ["idle_drop"]={ { ["type"]=1, @@ -6705,7 +6705,7 @@ local chapter = { } }, ["idle_exp"]=32, - ["idle_gold"]=55, + ["idle_gold"]=85, ["idle_drop"]={ { ["type"]=1, @@ -6924,7 +6924,7 @@ local chapter = { } }, ["idle_exp"]=32, - ["idle_gold"]=56, + ["idle_gold"]=86, ["idle_drop"]={ { ["type"]=1, @@ -7143,7 +7143,7 @@ local chapter = { } }, ["idle_exp"]=34, - ["idle_gold"]=56, + ["idle_gold"]=86, ["idle_drop"]={ { ["type"]=1, @@ -7362,7 +7362,7 @@ local chapter = { } }, ["idle_exp"]=34, - ["idle_gold"]=57, + ["idle_gold"]=87, ["idle_drop"]={ { ["type"]=1, diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 204ff255..769d5a10 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -2500,9 +2500,7 @@ local monster_chapter = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=22000 }, diff --git a/lua/app/config/monster_daily_challenge.lua b/lua/app/config/monster_daily_challenge.lua index e25526f0..1d428aa5 100644 --- a/lua/app/config/monster_daily_challenge.lua +++ b/lua/app/config/monster_daily_challenge.lua @@ -254,9 +254,7 @@ local monster_daily_challenge = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=22000 }, diff --git a/lua/app/config/monster_dungeon_armor.lua b/lua/app/config/monster_dungeon_armor.lua index 7a1e15bd..80e9ac3f 100644 --- a/lua/app/config/monster_dungeon_armor.lua +++ b/lua/app/config/monster_dungeon_armor.lua @@ -1568,9 +1568,7 @@ local monster_dungeon_armor = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=40000 }, @@ -3430,9 +3428,7 @@ local monster_dungeon_armor = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=40000 }, @@ -5046,9 +5042,7 @@ local monster_dungeon_armor = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=40000 }, diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index c15b14a0..2ac88ba7 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="幻影剑袭链接4个元素或以上时,本回合暴击提升20%。" }, [2300206]={ - ["desc"]="幻影剑袭链接4个元素或以上时,本回合暴击提升30%。" + ["desc"]="幻影剑袭附加的暴击提升效果增加至30%。" }, [2300207]={ ["desc"]="幻影剑袭使用时本回合对生命值50%以下的敌人暴击伤害提升50%。" diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 531e47e6..fc1352fc 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: Steel Strike deals 1 additional hit of damage to bleeding enemies." }, [1400104]={ - ["desc"]="Steel Strike Stun effect lasts +1 turns." + ["desc"]="Steel Strike has a 50% chance to inflict Stun for 2 turns." }, [1400105]={ ["desc"]="Increase the damage of Burn inflicted by Steel Strike. Lasts +1 turns." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="When Phantom Blade links to 4 or more elements, critical rate increases by 20% for this turn." }, [2300206]={ - ["desc"]="When Phantom Blade links to 4 or more elements, critical rate increases by 30% for this turn." + ["desc"]="Critical rate of Phantom Blade increases to 30%." }, [2300207]={ ["desc"]="When Phantom Slash is used, critical damage against enemies with below 50% HP increases by 50% for this turn." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="Frostbite Crystal applies ice shield to the team for 2 turns." }, [4300107]={ - ["desc"]="Ice Shield from Frostbite Crystal can reflect 400% of damage." + ["desc"]="Ice Shield from Frostbite Crystal that can reflect massive damage." }, [4300200]={ ["desc"]="Unlock Corrupt Blade: Deal one additional hit of skill damage and inflict Corrupt for 1 turn." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="Shield Art can clear additional 4 grids in the X direction." }, [5200105]={ - ["desc"]="Shield from Shield Art can reflect 200% of damage." + ["desc"]="The shield from Shield Art that can reflect damage." }, [5200106]={ ["desc"]="Ninja Lun's attack increases by 15%." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="When Enchanted Broomstick is used, normal attack damage increases by 15% for this turn." }, [5300103]={ - ["desc"]="Enchanted Broomstick can inflict Drowsy for 2 turns." + ["desc"]="Enchanted Broomstick has a 50% chance to apply Drowsy for 2 turns." }, [5300104]={ ["desc"]="Increase the damage of Poisoned inflicted by Enchanted Broomstick." diff --git a/lua/app/config/strings/es/skill_rogue.lua b/lua/app/config/strings/es/skill_rogue.lua index 522c8114..3b71ae87 100644 --- a/lua/app/config/strings/es/skill_rogue.lua +++ b/lua/app/config/strings/es/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: Golpe de Acero causa 1 vez más de daño a los enemigos Sangrados." }, [1400104]={ - ["desc"]="El Vértigo aplicado por Golpe de Acero dura +1 ronda." + ["desc"]="Golpe de Acero tiene 50% de chance de aplicar Vértigo durante 2 rondas." }, [1400105]={ ["desc"]="El aumento de daño por el efecto de quemadura de Golpe de Acero dura +1 ronda." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="Cuando Espada de Fantasía enlaza 4 o más elementos, el golpe crítico de esta ronda aumenta un 20%." }, [2300206]={ - ["desc"]="Cuando Espada de Fantasía enlaza 4 o más elementos, el golpe crítico de esta ronda aumenta un 30%." + ["desc"]="El efecto de golpe crítico de la espada de fantasía aumenta al 30%." }, [2300207]={ ["desc"]="Al usar Espada de Fantasía, el daño de golpes críticos a los enemigos con HP inferior a 50% aumenta un 50% en esta ronda." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="Al usar Cristal Escarchado, se agrega un escudo de hielo al equipo durante 2 rondas." }, [4300107]={ - ["desc"]="El escudo de hielo aplicado por Cristal Escarchado puede rebotar 400% del daño." + ["desc"]="El escudo de hielo aplicado por Cristal Escarchado puede reflejar daño masivo." }, [4300200]={ ["desc"]="Desbloquea Filo Corrupto: causa un daño de habilidad adicional con efecto de Corrupto durante 1 ronda." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="Hechizo Escudo elimina 4 bloques extras en direcciones de +." }, [5200105]={ - ["desc"]="El escudo apalicado por Hechizo Escudo puede rebotar 200% del daño." + ["desc"]="El escudo aplicado por Hechizo Escudo puede reflejar daño." }, [5200106]={ ["desc"]="Ataque de Ninja Jay aumenta un 15%." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="Al usar Escoba Mágica, el daño de este ataque común aumenta un 15%." }, [5300103]={ - ["desc"]="Escoba Mágica podría aplicar efecto de Dormido durante 2 rondas." + ["desc"]="Escoba Mágica tiene 50% de chance de aplicar Dormido durante 2 rondas." }, [5300104]={ ["desc"]="Aumenta el efecto de Envenenado aplicado por Escoba Mágica." diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 1fa3318e..51e5847b 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: Strike Baja memberikan 1 DMG tambahan pada musuh yang berdarah." }, [1400104]={ - ["desc"]="Stun pada Strike Baja, jumlah giliran +1." + ["desc"]="Strike Baja memiliki 50% peluang menambahkan efek Stun selama 2 giliran." }, [1400105]={ ["desc"]="Meningkatkan DMG Scorch yang ditimbulkan Strike Baja. Berlangsung selama +1 giliran." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="Saat Pedang Phantom menautkan 4 atau lebih banyak elemen, Crit Rate meningkat 20% untuk giliran ini." }, [2300206]={ - ["desc"]="Saat Pedang Phantom menautkan 4 atau lebih banyak elemen, Crit Rate meningkat 30% untuk giliran ini." + ["desc"]="Efek tambahan Crit dari Pedang Phantom meningkat menjadi 30%." }, [2300207]={ ["desc"]="Saat Pedang Phantom digunakan, DMG Crit terhadap musuh dengan HP di bawah 50% akan meningkat 50% pada giliran tersebut." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="Tambahkan efek Kristal Es ke tim selama 2 giliran." }, [4300107]={ - ["desc"]="Kristal Es yang melekat dapat menangkal DMG 400%." + ["desc"]="Perisai Es yang melekat pada Kristal Es dapat menahan sejumlah DMG." }, [4300200]={ ["desc"]="Membuka Tombak Tajam: Menyebabkan satu kali DMG skill tambahan dengan efek DMG selama 1 giliran." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="Seni Perisai dapat menghapus 4 grid tambahan pada arah +." }, [5200105]={ - ["desc"]="Perisai dari Seni Perisai dapat merefleksikan 200% DMG." + ["desc"]="Seni Perisai yang melekat pada Perisai dapat menahan sejumlah DMG." }, [5200106]={ ["desc"]="ATK Ninja Jay meningkat 15%." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="Saat Sapu Ajaib digunakan, DMG ATK Normal meningkat 15% pada giliran ini." }, [5300103]={ - ["desc"]="Sapu Ajaib dapat menimbulkan Kantuk selama 2 giliran." + ["desc"]="Sapu Ajaib memiliki 50% peluang menambahkan efek Kantuk selama 2 giliran." }, [5300104]={ ["desc"]="Efek racun yang melekat pada Sapu Ajaib meningkatkan DMG." diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index 25fa7fef..1aeaf62e 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo:「ヘヴィーヒット」は出血状態の敵に追加で1回発動する。" }, [1400104]={ - ["desc"]="「ヘヴィーヒット」が付与するスタン効果のターン数が+1。" + ["desc"]="「ヘヴィーヒット」は50%の確率で敵に2ターンスタン効果を付与する。" }, [1400105]={ ["desc"]="「ヘヴィーヒット」の⽕傷効果のターン数が+1。" @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="「ファントムストライク」は4つ以上の元素と繋がると、このターンのクリティカル率が20%アップ。" }, [2300206]={ - ["desc"]="「ファントムストライク」は4つ以上の元素と繋がった時、このターンのクリティカル率が30%アップ。" + ["desc"]="「ファントムストライク」のクリティカルアップ効果が30%に増加する。" }, [2300207]={ ["desc"]="「ファントムストライク」を発動するターン、HPが50%未満の敵へのクリティカルダメージが50%アップ。" @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="「フロストバイトクリスタル」は全員に2ターン氷シールド効果を付与する。" }, [4300107]={ - ["desc"]="「フロストバイトクリスタル」が付与する氷シールドは400%のダメージを反射する。" + ["desc"]="フロストバイトクリスタルの氷シールドは、大量のダメージを反射できる。" }, [4300200]={ ["desc"]="コラプトブレード解放:追加で1ターン腐敗効果付きのスキルを1回発動する。" @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="「シールド術」は追加で縦横4マスを消す。" }, [5200105]={ - ["desc"]="「シールド術」のシールドは200%のダメージを反射する。" + ["desc"]="「シールド術」のシールドは、ダメージを反射できる。" }, [5200106]={ ["desc"]="忍者リンの攻撃が15%アップ。" @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="「魔法のほうき」を発動するターン、通常攻撃のダメージが15%アップ。" }, [5300103]={ - ["desc"]="「魔法のほうき」は敵に2ターン昏睡効果を付与する。" + ["desc"]="「魔法のほうき」は50%の確率で敵に2ターン昏睡効果を付与する。" }, [5300104]={ ["desc"]="「魔法のほうき」が付与する中毒効果のダメージがアップ。" diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 199c90cb..5ca7f004 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: 강철 스트라이크가 출혈 상태의 적에게 추가로 1번의 대미지를 입힙니다." }, [1400104]={ - ["desc"]="강철 스트라이크가 기절 효과를 부여하는 턴의 횟수 +1" + ["desc"]="강철 스트라이크는 50% 확률로 2턴 동안 기절 효과를 부여합니다." }, [1400105]={ ["desc"]="강철 스트라이크에 버닝 효과가 추가되며 대미지가 상승합니다. 지속되는 턴 횟수+1" @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="팬텀 소드가 4개 또는 그 이상의 원소를 연결할 때 이번 턴의 치명타율이 20% 상승합니다." }, [2300206]={ - ["desc"]="팬텀 소드가 4개 또는 그 이상의 원소를 연결할 때 이번 턴의 치명타율이 30% 상승합니다." + ["desc"]="팬텀 소드가 부여한 치명타율 상승 효과가 30%까지 증가합니다." }, [2300207]={ ["desc"]="팬텀 소드를 사용하면 이번 턴에 HP가 50% 미만인 적에게 주는 치명타 대미지가 50% 상승합니다." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="얼음 크리스탈이 2턴 동안 팀을 위해 얼음 보호막을 부여합니다." }, [4300107]={ - ["desc"]="얼음 크리스탈이 부여한 얼음 보호막이 400% 피해를 반사할 수 있습니다." + ["desc"]="얼음 크리스탈이 부여하는 얼음 보호막은 대량의 피해를 반사할 수 있습니다." }, [4300200]={ ["desc"]="부패의 칼날 잠금 해제: 추가로 한 번의 스킬 피해를 입히며 1턴 동안 부패 효과를 부여합니다." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="보호막 기술이 십자가 방향에서 추가로 4개의 그리드를 소멸할 수 있습니다." }, [5200105]={ - ["desc"]="보호막 기술에서 부여한 보호막은 200% 피해를 반사합니다." + ["desc"]="보호막 기술에서 부여된 보호막은 피해를 반사할 수 있습니다." }, [5200106]={ ["desc"]="닌자 룬의 공격력이 15% 증가합니다." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="마법의 빗자루를 사용하면 이번 턴의 일반 공격의 대미지가 15% 증가합니다." }, [5300103]={ - ["desc"]="마법의 빗자루는 2턴 동안 수면 효과를 부여할 수 있습니다." + ["desc"]="마법의 빗자루는 2턴 동안 50% 확률로 수면 효과를 부여합니다." }, [5300104]={ ["desc"]="마법의 빗자루가 부여한 중독 효과의 대미지가 증가합니다." diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index 48a2362e..58b339d4 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: O Golpe Metálico causa mais 1 golpe aos inimigos Sangrados." }, [1400104]={ - ["desc"]="A duração do atordoamento causado pelo Golpe de Aço aumenta em +1 turno." + ["desc"]="O Golpe Metálico tem 50% de chance de estontear os inimigos por 2 turnos." }, [1400105]={ ["desc"]="A Conflagração acionada pelo Golpe Metálico tem dano aumentado e dura +1 turno." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="Ao conectar 4 ou mais elementos com o Golpe da Espada Ilusória, aumenta a chance de acerto crítico em 20% para o turno atual." }, [2300206]={ - ["desc"]="Ao conectar 4 ou mais elementos com o Golpe da Espada Ilusória, aumenta a chance de acerto crítico em 30% para o turno atual." + ["desc"]="Melhora o aumento de acerto crítico da Espada Ilusória para 30%." }, [2300207]={ ["desc"]="No turno de lançamento do Golpe da Espada Ilusória, aumenta o dano de acerto crítico em 50% aos inimigos com 50% ou menos Vida." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="O Cristal Congelado concede efeito de escudo de gelo à equipe por 2 turnos." }, [4300107]={ - ["desc"]="O escudo de gelo concedido pelo Cristal Congelado reflete 400% do dano recebido." + ["desc"]="O escudo de gelo concedido pelo Cristal Congelante reflete boa parte do dano recebido." }, [4300200]={ ["desc"]="Desbloqueie Lâmina da Corrupção: causa dano adicional de habilidade e aplica o efeito de corrupção por 1 turno." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="O Feitiço de Amparo elimina 4 blocos adicionais numa cruz." }, [5200105]={ - ["desc"]="O escudo adicionado pelo Feitiço de Amparo reflete 200% de dano recebido." + ["desc"]="O escudo adicionado pelo Feitiço de Amparo pode refletir dano." }, [5200106]={ ["desc"]="Aumenta o Ataque de Luninja em 15%." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="Ao usar a Vassoura Mágica, o dano do ataque básico aumenta em 15%." }, [5300103]={ - ["desc"]="A Vassoura Mágica pode adicionar um efeito de adormecer, 2 turnos." + ["desc"]="A Vassoura Mágica tem 15% de chance de acionar o efeito Sonolento por 2 turnos." }, [5300104]={ ["desc"]="O efeito de envenenamento adicionado pela Vassoura Mágica, dano aumentado." diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index 7d088aaf..bef94983 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo:เหล็กตีหนักจะสร้างดาเมจเพิ่มเติม1ครั้งให้กับศัตรูเลือดไหล" }, [1400104]={ - ["desc"]="เอฟเฟกต์มึงงงที่เพิ่มโดยเหล็กตีหนัก จำนวนรอบ+1" + ["desc"]="เหล็กตีหนักจะมีโอกาส50%เพิ่มเอฟเฟกต์มึงงงเป็น 2 รอบ" }, [1400105]={ ["desc"]="เอฟเฟกต์เผาไหม้ที่เพิ่มโดยเหล็กตีหนัก จำนวนรอบ+1" @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="เมื่อดาบมายาบุกเชื่อมโยงธาตุ4อันหรือขึ้นไป Crit รอบนี้จะเพิ่มขึ้น20%" }, [2300206]={ - ["desc"]="เมื่อดาบมายาบุกเชื่อมโยงธาตุ4อันหรือขึ้นไป Crit รอบนี้จะเพิ่มขึ้น30%" + ["desc"]="เอฟเฟกต์การเพิ่ม Crit ของดาบมายาบุกเพิ่มขึ้นถึง30%" }, [2300207]={ ["desc"]="เมื่อใช้ดาบมายาบุก CritDmgที่สร้างให้กับศัตรูที่มี HP ต่ำกว่า50%จะเพิ่มขึ้น50%" @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="ผลึกฟรอสต์จะเพิ่มเอฟเฟกต์โล่น้ำแข็งให้กับทีม 2รอบ" }, [4300107]={ - ["desc"]="โล่น้ำแข็งที่เพิ่มโดยผลึกฟรอสต์ สามารถสะท้อนดาเมจ400%" + ["desc"]="โล่น้ำแข็งที่ที่เพิ่มโดยผลึกฟรอสต์นั้นสามารถสะท้อนดาเมจจำนวนมากได้" }, [4300200]={ ["desc"]="ปลดล็อคดาบทุจริต: สร้างดาเมจสกิลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์ทุจริต 1รอบ" @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="มนต์โล่สามารถกำจัด4ช่องเพิ่มเติมตามทิศทาง +" }, [5200105]={ - ["desc"]="โล่ที่เพิ่มโดยมนต์โล่ สามารถสะท้อนดาเมจ200%" + ["desc"]="โล่ที่เพิ่มโดยมนต์โล่ สามารถสะท้อนดาเมจได้" }, [5200106]={ ["desc"]="การโจมตีของนินจาเร็นเพิ่มขึ้น15%" @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="เมื่อใช้ไม้กวาดวิเศษ ดาเมจของการโจมตีทั่วไปครั้งนี้จะเพิ่มขึ้น15%" }, [5300103]={ - ["desc"]="ไม้กวาดวิเศษสามารถเพิ่มเอฟเฟกต์หลับได้ 2รอบ" + ["desc"]="ไม้กวาดวิเศษจะมีโอกาส50%เพิ่มเอฟเฟกต์อมตะ 2รอบ" }, [5300104]={ ["desc"]="ดาเมจของเอฟเฟกต์ถูกพิษที่เพิ่มโดยไม้กวาดวิเศษเพิ่มขึ้น" diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index 277c3de6..71613f3b 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: Trọng Kích Sắt Thép gây thêm 1 lần sát thương lên kẻ địch Mất Máu." }, [1400104]={ - ["desc"]="Trọng Kích Sắt Thép kèm Choáng, số hiệp +1." + ["desc"]="Trọng Kích Sắt Thép có 50% kèm Choáng, 2 hiệp." }, [1400105]={ ["desc"]="Trọng Kích Sắt Thép kèm hiệu ứng Thiêu Đốt, tăng sát thương, số hiệp +1." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="Ảo Ảnh Kiếm Kích liên kết 4 Nguyên Tố trở lên, hiệp này tăng 20% chí mạng." }, [2300206]={ - ["desc"]="Ảo Ảnh Kiếm Kích liên kết 4 Nguyên Tố trở lên, hiệp này tăng 30% chí mạng." + ["desc"]="Hiệu quả tăng chí mạng của Ảo Ảnh Kiếm Kích tăng đến 30%." }, [2300207]={ ["desc"]="Khi dùng Ảo Ảnh Kiếm Kích trong hiệp này với kẻ địch có HP dưới 50% sẽ tăng 50% sát thương chí mạng." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="Sương Băng Tinh kèm hiệu quả Khiên Băng cho đội, 2 hiệp." }, [4300107]={ - ["desc"]="Sương Băng Tinh kèm Khiên Băng, được phản sát thương 400%." + ["desc"]="Sương Băng Tinh kèm Khiên Băng, có thể phản sát thương." }, [4300200]={ ["desc"]="Mở khóa Đao Sa Đọa: Gây thêm 1 lần sát thương kỹ năng, kèm hiệu quả Sa Đọa, 1 hiệp." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="Thuật Khiên theo hướng + có thể xua tan thêm 4 ô." }, [5200105]={ - ["desc"]="Thuật Khiên kèm Khiên, có thể phản sát thương 200%." + ["desc"]="Thuật Khiên kèm Khiên, có thể phản sát thương." }, [5200106]={ ["desc"]="Ninja Jay tăng 15% Công." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="Khi dùng Chổi Phép, sát thương đánh thường lần này tăng 15%." }, [5300103]={ - ["desc"]="Chổi Phép được kèm hiệu quả Ngủ Say, 2 hiệp." + ["desc"]="Chổi Phép có 50% kèm Ngủ Say, 2 hiệp." }, [5300104]={ ["desc"]="Chổi Phép kèm hiệu quả Trúng Độc, tăng sát thương." diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 95fc40e5..9e7c8d07 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo:鋼鐵重擊對流血敵人額外造成1次傷害。" }, [1400104]={ - ["desc"]="鋼鐵重擊附帶的暈眩,回合數+1。" + ["desc"]="鋼鐵重擊有50%概率附加眩暈效果,2回合。" }, [1400105]={ ["desc"]="鋼鐵重擊附帶的灼燒效果,傷害提高,回合數+1。" @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="幻影劍襲連接4個元素或以上時,本回合暴擊提高20%。" }, [2300206]={ - ["desc"]="幻影劍襲連接4個元素或以上時,本回合暴擊提高30%。" + ["desc"]="幻影劍襲附加的暴擊提升效果增加至30%。" }, [2300207]={ ["desc"]="幻影劍襲使用時本回合對生命值50%以下的敵人暴擊傷害提高50%。" @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="霜凍冰晶後為團隊賦予冰盾效果,2回合。" }, [4300107]={ - ["desc"]="霜凍冰晶增加的冰盾,可反傷400%。" + ["desc"]="霜凍冰晶附加的冰盾,可反傷大量傷害。" }, [4300200]={ ["desc"]="解鎖腐敗利刃:額外造成一次技能傷害,附帶腐敗效果,1回合。" @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="護盾術沿+方向可額外消除4格。" }, [5200105]={ - ["desc"]="護盾術增加的護盾,可反傷200%。" + ["desc"]="護盾術附加的護盾,可反傷傷害。" }, [5200106]={ ["desc"]="忍者倫攻擊提高15%。" @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="魔法掃帚使用時本次普攻傷害提高15%。" }, [5300103]={ - ["desc"]="魔法掃帚可附帶昏睡效果,2回合。" + ["desc"]="魔法掃帚有50%概率附加昏睡效果,2回合。" }, [5300104]={ ["desc"]="魔法掃帚附帶的中毒效果,傷害提高。" diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 74af9101..8a4e6472 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1779,7 +1779,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d end if self.actionOverCallback then -- 被反伤时死亡 - self:onAttackOver() + self.actionOverCallback = nil + self.battleController:enterNextTeamAction() end self.battleController:resetTimeSpeed(true) diff --git a/lua/app/module/battle/helper/battle_snapshot_helper.lua b/lua/app/module/battle/helper/battle_snapshot_helper.lua index f848adb4..f846cf4f 100644 --- a/lua/app/module/battle/helper/battle_snapshot_helper.lua +++ b/lua/app/module/battle/helper/battle_snapshot_helper.lua @@ -123,6 +123,7 @@ function BattleSnapshotHelper:dealSnapshotBattleBaseInfo(battleBaseController, s if not snapInfo then return end + if not NEED_SAVE_SNAPSHOT_BATTLE_TYPE[snapInfo.battleType] then return end diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index ea5f513a..f75f0a95 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -597,9 +597,10 @@ function BattleTeam:setIsFinalBlock(isFinalBlock) end function BattleTeam:getIsFinalBlock() - if self.isFinalBlock == nil then -- 容错一下,用于受伤时侯的判定 + if self.isFinalBlock == nil then return true end + return self.isFinalBlock end diff --git a/lua/app/module/common/common_manager.lua b/lua/app/module/common/common_manager.lua index 674bcbb9..7db46857 100644 --- a/lua/app/module/common/common_manager.lua +++ b/lua/app/module/common/common_manager.lua @@ -1,7 +1,8 @@ local CommonManager = class("CommonManager", BaseModule) -function CommonManager:showMopUpUI(rewards, remainCount, callback, customtitleTx, target) +function CommonManager:showMopUpUI(actType, rewards, remainCount, callback, customtitleTx, target) local params = { + actType = actType, customtitleTx = customtitleTx, rewards = rewards, remainCount = remainCount, diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index b04c91d7..8e9134ca 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -191,7 +191,9 @@ function DungeonManager:respEndChallengeShards(result) if result.err_code == GConst.ERROR_STR.SUCCESS then local passId = DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) DataManager.DungeonData:initDungeonShards(result.shards_challenge) - ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, result.rewards, result.reqData and result.reqData.combatReport or {}) + local newRewards = {} + GFunc.mergeRewards2(result.rewards, newRewards, true) + ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, newRewards, result.reqData and result.reqData.combatReport or {}, nil, nil, true) if passId ~= DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) then local data = {} diff --git a/lua/app/module/dungeon_armor/dungeon_armor_manager.lua b/lua/app/module/dungeon_armor/dungeon_armor_manager.lua index 5fb31485..8849842c 100644 --- a/lua/app/module/dungeon_armor/dungeon_armor_manager.lua +++ b/lua/app/module/dungeon_armor/dungeon_armor_manager.lua @@ -150,7 +150,7 @@ function DungeonArmorManager:rspSweep(result) -- 合并奖励 local newRewards = {} GFunc.mergeRewards2(result.rewards, newRewards) - ModuleManager.CommonManager:showMopUpUI(newRewards, remainCount, function() + ModuleManager.CommonManager:showMopUpUI(ModuleManager.MODULE_KEY.DUNGEON_ARMOR, newRewards, remainCount, function() if result.reqData then self:reqSweep(result.reqData.chapter_armor_id, result.reqData.target) end diff --git a/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua b/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua index a75c9e49..a66c3e3b 100644 --- a/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua +++ b/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua @@ -150,7 +150,7 @@ function DungeonWeaponManager:rspSweep(result) -- 合并奖励 local newRewards = {} GFunc.mergeRewards2(result.rewards, newRewards) - ModuleManager.CommonManager:showMopUpUI(newRewards, remainCount, function() + ModuleManager.CommonManager:showMopUpUI(ModuleManager.MODULE_KEY.DUNGEON_WEAPON, newRewards, remainCount, function() self:reqSweep(result.reqData.chapter_weapon_id, result.reqData.target) end, nil, result.reqData.target) DataManager.DungeonData:setDirty() diff --git a/lua/app/module/mail/mail_manager.lua b/lua/app/module/mail/mail_manager.lua index b36a7f6a..b3559049 100644 --- a/lua/app/module/mail/mail_manager.lua +++ b/lua/app/module/mail/mail_manager.lua @@ -149,7 +149,7 @@ function MailManager:needUpdateMail() end self.needUpdateMailSid = self:performWithDelayGlobal(function() self:getMailList(true) - end, math.random(1, 5)) + end, math.random(1, 60)) end return MailManager \ No newline at end of file diff --git a/lua/app/module/shop/shop_manager.lua b/lua/app/module/shop/shop_manager.lua index 2a196230..397a9abc 100644 --- a/lua/app/module/shop/shop_manager.lua +++ b/lua/app/module/shop/shop_manager.lua @@ -54,9 +54,9 @@ function ShopManager:showGiftPopUI(actType, actId, onlySelf, showType) elseif actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID then UIManager:showUI("app/ui/shop/introduct_pop_ui", {showType = showType}) elseif actType == PayManager.PURCHARSE_TYPE.CHAPTER_GIFT then - UIManager:showUI("app/ui/shop/gift_pop_chapter_ui", {type = actType, id = actId, onlySelf = onlySelf}) + UIManager:showUI("app/ui/shop/gift_pop_chapter_ui", {type = actType, id = actId, onlySelf = onlySelf, showType = showType}) elseif actType == PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW then - UIManager:showUI("app/ui/shop/gift_pop_grow_up_ui", {type = actType, id = actId, onlySelf = onlySelf}) + UIManager:showUI("app/ui/shop/gift_pop_grow_up_ui", {type = actType, id = actId, onlySelf = onlySelf, showType = showType}) else UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = onlySelf, showType = showType}) end diff --git a/lua/app/ui/common/mop_up_ui.lua b/lua/app/ui/common/mop_up_ui.lua index ce3511ef..4a7649de 100644 --- a/lua/app/ui/common/mop_up_ui.lua +++ b/lua/app/ui/common/mop_up_ui.lua @@ -20,6 +20,7 @@ function MopUpUI:onClose() end function MopUpUI:ctor(params) + self.actType = params.actType self.customtitleTx = params.customtitleTx self.rewards = params.rewards self.remainCount = params.remainCount @@ -32,6 +33,13 @@ end function MopUpUI:onLoadRootComplete() self:_display() self:_addListeners() + + -- 检查礼包弹出 + if self.actType == ModuleManager.MODULE_KEY.DUNGEON_WEAPON then + DataManager.ShopData:checkPopGift(PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT) + elseif self.actType == ModuleManager.MODULE_KEY.DUNGEON_ARMOR then + DataManager.ShopData:checkPopGift(PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT) + end end function MopUpUI:_display() diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index 8e7f7b39..c4cf5ed4 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -61,15 +61,6 @@ function DungeonDifficultyUI:onLoadRootComplete() local cost = DataManager.DungeonData:getChallengeHpCost(self.module) self.txStartCost:setText(GFunc.getRewardNum(cost)) self.txSweepCost:setText(GFunc.getRewardNum(cost)) - - local time = DataManager.DungeonData:getRemainTimes(self.module) - local timeStr = nil - if time <= 0 then - timeStr = "" .. time .. "" - else - timeStr = time - end - self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) self.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS)) self.rewardTx:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) self.txLock:setText(I18N:getGlobalText(I18N.GlobalConst.PASS_REQUIRE)) @@ -115,6 +106,9 @@ function DungeonDifficultyUI:onLoadRootComplete() self:addEventListener(EventManager.CUSTOM_EVENT.DUNGEON_CHALLENGE, function() self:closeUI() end) + self:addEventListener(EventManager.CUSTOM_EVENT.DUNGEON_SWEEP, function() + self:refreshDifficulty() + end) end function DungeonDifficultyUI:refreshDifficulty() @@ -153,6 +147,16 @@ function DungeonDifficultyUI:refreshDifficulty() self.rewardFirst:refreshItemById(id, firstNum) self.rewardPass:refreshItemById(id, passNum) self.rewardFirst:getBaseObject():setActive((not self:isCanSweepId()) and firstNum) + + -- 次数 + local time = DataManager.DungeonData:getRemainTimes(self.module) + local timeStr = nil + if time <= 0 then + timeStr = "" .. time .. "" + else + timeStr = time + end + self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) end -- 是否是可扫荡关卡 diff --git a/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua b/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua index 7c2fccd0..de964c9b 100644 --- a/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua +++ b/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua @@ -55,6 +55,7 @@ function DungeonArmorMainUI:_display() uiMap["dungeon_armor_main_ui.banner.btn_formation.tx_ok"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_4)) self.bg1 = uiMap["dungeon_armor_main_ui.scrollrect.viewport.content.bg_1"] self.bg2 = uiMap["dungeon_armor_main_ui.scrollrect.viewport.content.bg_2"] + self.bgNames = table.clearOrCreate(self.bgNames) self.bg1:setAnchoredPositionY(-1) self.bg2:setAnchoredPositionY(-1) self.btnFund = uiMap["dungeon_armor_main_ui.btn_fund"] @@ -93,6 +94,9 @@ function DungeonArmorMainUI:_addListeners() if not params or not params.id then return end + self.bgNames = table.clearOrCreate(self.bgNames) + self.bg1:setAnchoredPositionY(-1) + self.bg2:setAnchoredPositionY(-1) self.targetId = params.id self:refreshScrollrect() diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index 7d78169b..fe5888b1 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -486,7 +486,6 @@ function DungeonData:getDungeonBIStr() end str = str .. string.gsub(moduleKey, "_open", "") .. ":" .. entity:getPassedMaxId() end - Logger.logHighlight(str) return str end diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index ade52d52..816fef43 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -844,10 +844,11 @@ function ShopData:initGift(giftType, gift, isInit) end local tempId = self.gifts[giftType] and self.gifts[giftType].id or 0 + local tempTrigerTime = self.gifts[giftType] and self.gifts[giftType].triggerTime or 0 self.gifts[giftType] = giftStruct if not isInit and self:hasGift(giftType) then - if tempId == self.gifts[giftType].id then + if tempId == self.gifts[giftType].id and tempTrigerTime == self.gifts[giftType].triggerTime then if EDITOR_MODE then Logger.logHighlight("重复礼包数据,不处理弹窗:" .. tempId) end