From 552e60416753b233f7a44eb77e95181830a481ce Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 11 Jul 2023 10:20:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/bi_report.lua | 2 +- lua/app/common/data_manager.lua | 4 +++- lua/app/game.lua | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 8f66ffcc..7a537022 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -487,7 +487,7 @@ function BIReport:postFightBegin(battleType, wave, chapterId, maxChapter, startT event_type = BIReport.FIGHT_OPT_TYPE.START, wave_id = wave, chapter_id = chapterId, - max_chapter = maxChapter, + fight_max_chapter = maxChapter, start_times = startTimes, } args.formation, args.famation_level = DataManager.FormationData:getStageFormationBIStr() diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 22899eeb..1f906855 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -74,7 +74,9 @@ function DataManager:checkDataBind() if name == "BagData" then changeBindFunc(baseData.ItemData, self[name].ItemData) else - changeBindFunc(baseData, self[name]) + if baseData ~= self[name] then + changeBindFunc(baseData, self[name]) + end end end end diff --git a/lua/app/game.lua b/lua/app/game.lua index a3941df6..4b86a579 100644 --- a/lua/app/game.lua +++ b/lua/app/game.lua @@ -519,6 +519,10 @@ if NOT_PUBLISH then battleController.battleUI:initGridCell() end end + + if Input.GetKeyDown(KeyCode.LeftArrow) and Input.GetKey(KeyCode.F) then + ModuleManager.LoginManager:reloginOnReconnectRefuse() + end end Game._releaseOnApplicationFocus = Game.onApplicationFocus From 0157ca5d279a240f8d2c69a6c8ebf3f51481a740 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 11 Jul 2023 11:02:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=B7=B7=E4=B9=B1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/bi_report.lua | 8 ++++---- lua/app/common/pay_manager.lua | 2 +- lua/app/module/chapter/chapter_manager.lua | 2 +- lua/app/module/login/login_manager.lua | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 7a537022..744cb598 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -982,7 +982,7 @@ function BIReport:postBountyLevelUp(bountyType, level, exp, season) local args = { event_type = BIReport.BOUNTY_OPT_TYPE.BOUNTY_LEVEL_UP, season = season, - bounty_level_id = level, + level = level, exp = exp, bounty_type = bountyType, } @@ -996,7 +996,7 @@ function BIReport:postBountyReward(bountyType, level, exp, season, rewardLevelId level = level, exp = exp, bounty_type = bountyType, - level_id = rewardLevelId, + bounty_level_id = rewardLevelId, is_pro = isPro, } self:report(EVENT_NAME_BOUNTY_OPT, args) @@ -1006,7 +1006,7 @@ function BIReport:postArenaBountyLevelUp(bountyType, level, exp, season) local args = { event_type = BIReport.BOUNTY_OPT_TYPE.ARENA_BOUNTY_LEVEL_UP, season = season, - bounty_level_id = level, + level = level, exp = exp, bounty_type = bountyType, } @@ -1020,7 +1020,7 @@ function BIReport:postArenaBountyReward(bountyType, level, exp, season, rewardLe level = level, exp = exp, bounty_type = bountyType, - level_id = rewardLevelId, + bounty_level_id = rewardLevelId, is_pro = isPro, } self:report(EVENT_NAME_BOUNTY_OPT, args) diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index 4004c23f..bab2d912 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -4,7 +4,7 @@ PayManager.PURCHARSE_TYPE = { ACT_GIFT = 1, ACT_GOLD_PIG = 2, CHAPTER_GIFT = 3, - GROW_UP_GIFT = 4,-- 自0.4.0废弃 + GROW_UP_GIFT = 4,-- 已废弃 MALL_TREASURE = 5, GROW_UP_GIFT_NEW = 6, } diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 8e66b01a..270dd4b2 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -106,7 +106,7 @@ function ChapterManager:endFightFinish(result) local newMaxChapter = DataManager.ChapterData:getNewChapterId() if maxChapter ~= newMaxChapter then local data = {} - data.max_chapter = newMaxChapter + data.max_chapter = DataManager.ChapterData:getMaxChapterId() CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) -- 标记可弹出新手礼包 if maxChapter == 1 then diff --git a/lua/app/module/login/login_manager.lua b/lua/app/module/login/login_manager.lua index 1b00089d..1cfd71fe 100644 --- a/lua/app/module/login/login_manager.lua +++ b/lua/app/module/login/login_manager.lua @@ -153,7 +153,7 @@ function LoginManager:loginFinish(data) DataManager:initWithServerData(data) local data = {} - data.max_chapter = DataManager.ChapterData:getNewChapterId() + data.max_chapter = DataManager.ChapterData:getMaxChapterId() data.ads_num = DataManager.PlayerData:getAdCount() data.pay_money = DataManager.PlayerData:getTotalPayAmount() data.pay_count = DataManager.PlayerData:getPayCount() From d9ffcd187e98945eecc58a0971d9ecc2ea326a56 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 11 Jul 2023 11:11:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/arena_bounty_level.lua | 212 ++++----- lua/app/config/bounty_level.lua | 88 ++-- lua/app/config/hero.lua | 622 +++++++++++++------------- 3 files changed, 461 insertions(+), 461 deletions(-) diff --git a/lua/app/config/arena_bounty_level.lua b/lua/app/config/arena_bounty_level.lua index d25c2d9b..b96e1fee 100644 --- a/lua/app/config/arena_bounty_level.lua +++ b/lua/app/config/arena_bounty_level.lua @@ -113,8 +113,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -294,8 +294,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -394,8 +394,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -595,8 +595,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -696,8 +696,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -897,8 +897,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1098,8 +1098,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1299,8 +1299,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1500,8 +1500,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1733,8 +1733,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1914,8 +1914,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2014,8 +2014,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2215,8 +2215,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2316,8 +2316,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2517,8 +2517,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2718,8 +2718,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2919,8 +2919,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3120,8 +3120,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3253,8 +3253,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=23, + ["id_for_nothing"]="VAs=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3353,8 +3353,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3506,18 +3506,18 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=13, + ["id_for_nothing"]="Vws=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" } }, [315]={ @@ -3526,8 +3526,8 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=13, - ["id_for_nothing"]="Vws=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3606,18 +3606,18 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [320]={ @@ -3634,8 +3634,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3707,18 +3707,18 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=13, + ["id_for_nothing"]="Vws=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" } }, [325]={ @@ -3727,8 +3727,8 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=13, - ["id_for_nothing"]="Vws=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3807,18 +3807,18 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, [330]={ @@ -3827,16 +3827,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3916,8 +3916,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3936,8 +3936,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4109,16 +4109,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4137,8 +4137,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4310,16 +4310,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4338,8 +4338,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4511,16 +4511,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4539,8 +4539,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4712,16 +4712,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4740,8 +4740,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/bounty_level.lua b/lua/app/config/bounty_level.lua index 7c599151..a600c933 100644 --- a/lua/app/config/bounty_level.lua +++ b/lua/app/config/bounty_level.lua @@ -274,8 +274,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -394,8 +394,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -475,8 +475,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -676,8 +676,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -869,16 +869,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1070,16 +1070,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1271,16 +1271,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1480,8 +1480,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1894,8 +1894,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2014,8 +2014,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2095,8 +2095,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2296,8 +2296,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2489,16 +2489,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2690,16 +2690,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2891,16 +2891,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3100,8 +3100,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 2e09b5d0..2ffc0ae1 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -172,7 +172,7 @@ local hero = { ["model_id"]="p0009", ["icon"]="11", ["item_id"]=13002, - ["unlock_chapter"]=15, + ["unlock_chapter"]=9, ["is_show"]=1 }, [14001]={ @@ -195,43 +195,43 @@ local hero = { ["rouge_skill_7"]=1400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0011", ["icon"]="16", ["item_id"]=14001, - ["unlock_chapter"]=10, + ["unlock_chapter"]=14, ["is_show"]=1 }, [14002]={ @@ -254,38 +254,38 @@ local hero = { ["rouge_skill_7"]=1400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0018", ["icon"]="23", @@ -405,7 +405,7 @@ local hero = { ["model_id"]="p0010", ["icon"]="12", ["item_id"]=23001, - ["unlock_chapter"]=11, + ["unlock_chapter"]=8, ["is_show"]=1 }, [23002]={ @@ -464,7 +464,7 @@ local hero = { ["model_id"]="p0012", ["icon"]="7", ["item_id"]=23002, - ["unlock_chapter"]=7, + ["unlock_chapter"]=5, ["is_show"]=1 }, [24001]={ @@ -487,43 +487,43 @@ local hero = { ["rouge_skill_7"]=2400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0007", ["icon"]="17", ["item_id"]=24001, - ["unlock_chapter"]=4, + ["unlock_chapter"]=6, ["is_show"]=1 }, [24002]={ @@ -546,38 +546,38 @@ local hero = { ["rouge_skill_7"]=2400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0017", ["icon"]="22", @@ -756,7 +756,7 @@ local hero = { ["model_id"]="p0020", ["icon"]="13", ["item_id"]=33002, - ["unlock_chapter"]=13, + ["unlock_chapter"]=7, ["is_show"]=1 }, [34001]={ @@ -779,38 +779,38 @@ local hero = { ["rouge_skill_7"]=3400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0016", ["icon"]="18", @@ -838,38 +838,38 @@ local hero = { ["rouge_skill_7"]=3400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0024", ["icon"]="24", @@ -1048,7 +1048,7 @@ local hero = { ["model_id"]="p0021", ["icon"]="14", ["item_id"]=43002, - ["unlock_chapter"]=9, + ["unlock_chapter"]=7, ["is_show"]=1 }, [44001]={ @@ -1071,43 +1071,43 @@ local hero = { ["rouge_skill_7"]=4400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0008", ["icon"]="19", ["item_id"]=44001, - ["unlock_chapter"]=6, + ["unlock_chapter"]=10, ["is_show"]=1 }, [44002]={ @@ -1130,43 +1130,43 @@ local hero = { ["rouge_skill_7"]=4400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0025", ["icon"]="25", ["item_id"]=44002, - ["unlock_chapter"]=15, + ["unlock_chapter"]=18, ["is_show"]=1 }, [52001]={ @@ -1284,7 +1284,7 @@ local hero = { ["model_id"]="p0015", ["icon"]="10", ["item_id"]=53001, - ["unlock_chapter"]=16, + ["unlock_chapter"]=9, ["is_show"]=1 }, [53002]={ @@ -1366,38 +1366,38 @@ local hero = { ["rouge_skill_7"]=5400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0023", ["icon"]="20", @@ -1423,43 +1423,43 @@ local hero = { ["rouge_skill_7"]=5400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0026", ["icon"]="26", ["item_id"]=54002, - ["unlock_chapter"]=20, + ["unlock_chapter"]=22, ["is_show"]=1 } }