From 7de42dd068cfdd363b020fd523eff3acaf9ecc89 Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 11 Jul 2023 14:53:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A2=8E=E7=89=87=E5=89=AF=E6=9C=AC=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= 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 +++++++++--------- lua/app/config/item.lua | 24 +- .../localization_global_const.lua | 5 +- lua/app/config/strings/cn/global.lua | 3 +- lua/app/module/item/item_const.lua | 3 +- lua/app/module/tips/tips_manager.lua | 5 +- lua/app/ui/dungeon/dungeon_board_cell.lua | 24 +- lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 48 +- .../userdata/dungeon/dungeon_base_entity.lua | 5 - lua/app/userdata/dungeon/dungeon_data.lua | 5 - .../dungeon/dungeon_shards_entity.lua | 7 +- 13 files changed, 508 insertions(+), 543 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 } } diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 870b2fc9..58a3c7bf 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -377,9 +377,29 @@ local item = { ["icon"]="19" }, [20]={ - ["type"]=1, + ["type"]=6, ["qlt"]=5, - ["icon"]="20" + ["icon"]="20", + ["box_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=1, + ["weight"]=50 + }, + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=890 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=60 + } + } }, [21]={ ["type"]=1, diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 33d70eda..9535eb1e 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -1,7 +1,5 @@ local LocalizationGlobalConst = { - ["HERO_TRIAL_DESC_1"] = "HERO_TRIAL_DESC_1", - ["HERO_TRIAL_DESC_2"] = "HERO_TRIAL_DESC_2", MAIN_BTN_1 = "MAIN_BTN_1", QLT_DESC_1 = "QLT_DESC_1", QLT_DESC_2 = "QLT_DESC_2", @@ -332,6 +330,9 @@ local LocalizationGlobalConst = ARENA_BATTLEPASS_5 = "ARENA_BATTLEPASS_5", ARENA_BATTLEPASS_6 = "ARENA_BATTLEPASS_6", ARENA_BATTLEPASS_7 = "ARENA_BATTLEPASS_7", + HERO_TRIAL_DESC_1 = "HERO_TRIAL_DESC_1", + HERO_TRIAL_DESC_2 = "HERO_TRIAL_DESC_2", + HERO_TRIAL_DESC_3 = "HERO_TRIAL_DESC_3", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 2eec539e..2f80e1ca 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -330,8 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "解锁高级战令", ["ARENA_BATTLEPASS_6"] = "获得高级战令，+10级，立即获得更多奖励！", ["ARENA_BATTLEPASS_7"] = "当你完成战令的所有内容,每1000个积分可以获取一个奖励宝箱", - ["HERO_TRIAL_DESC_1"] = "请试用S级英雄木兰挑战刚才战败的关卡！", + ["HERO_TRIAL_DESC_1"] = "请试用S级英雄木兰挑战刚才战败的关卡！", ["HERO_TRIAL_DESC_2"] = "试玩", + ["HERO_TRIAL_DESC_3"] = "木兰参战", } return localization_global \ No newline at end of file diff --git a/lua/app/module/item/item_const.lua b/lua/app/module/item/item_const.lua index 1f3ba49b..f492656f 100644 --- a/lua/app/module/item/item_const.lua +++ b/lua/app/module/item/item_const.lua @@ -22,7 +22,8 @@ ItemConst.ITEM_TYPE = { ITEM = 2, RANDOM_FRAGMENT = 3, BOX = 4, - HERO_FRAGMENT = 5 + HERO_FRAGMENT = 5, + WEIGHT_FRAGMENT = 6, } return ItemConst \ No newline at end of file diff --git a/lua/app/module/tips/tips_manager.lua b/lua/app/module/tips/tips_manager.lua index 573afe2b..0ddeeb54 100644 --- a/lua/app/module/tips/tips_manager.lua +++ b/lua/app/module/tips/tips_manager.lua @@ -31,13 +31,16 @@ function TipsManager:showRewardTips(rewardId, rewardType, tarPrefabObj, alignTyp if rewardType == GConst.REWARD_TYPE.ITEM then local info = ConfigManager:getConfig("item")[rewardId] if info then - if info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_FRAGMENT then + if info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_FRAGMENT or info.type == GConst.ItemConst.ITEM_TYPE.WEIGHT_FRAGMENT then + -- 随机碎片 or 权重随机碎片 self:showHeroFragmentTips(rewardId) return elseif info.type == GConst.ItemConst.ITEM_TYPE.BOX then + -- 宝箱 self:showBoxTips(rewardId) return elseif info.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then + -- 英雄碎片 ModuleManager.HeroManager:showHeroDetailUI(info.parameter, true) return end diff --git a/lua/app/ui/dungeon/dungeon_board_cell.lua b/lua/app/ui/dungeon/dungeon_board_cell.lua index 8c17e47b..a66775a6 100644 --- a/lua/app/ui/dungeon/dungeon_board_cell.lua +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua @@ -16,8 +16,7 @@ function DungeonBoardCell:init() self.txStart = self.uiMap["dungeon_board_cell.btn_start.tx_btn"] self.txTimes = self.uiMap["dungeon_board_cell.btn_start.tx_times"] self.btnHelp = self.uiMap["dungeon_board_cell.btn_help"] - self.itemReward = self.uiMap["dungeon_board_cell.item_reward"] - self.itemRewardIcon = self.uiMap["dungeon_board_cell.item_reward.icon"] + self.itemReward = self.uiMap["dungeon_board_cell.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) self.btnStart:addClickListener(function() -- 打开副本关卡选择界面 @@ -79,25 +78,8 @@ function DungeonBoardCell:refreshInfo() end function DungeonBoardCell:refreshRewards() - local reward = DataManager.DungeonData:getBoardShowRewardId(self.moduleKey) - if reward ~= nil then - -- 展示实际item - local info = ConfigManager:getConfig("item")[reward] - if info == nil then - return - end - - self.itemRewardIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) - self.itemReward:setTouchEnable(true) - self.itemReward:addClickListener(function() - ModuleManager.TipsManager:showRewardTips(reward, info.type, self.itemReward) - end) - else - reward = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey) - -- 展示icon图片 - self.itemRewardIcon:setSprite(reward[1], reward[2]) - self.itemReward:setTouchEnable(false) - end + local id = DataManager.DungeonData:getBoardShowRewardId(self.moduleKey) + self.itemReward:refreshItemById(id, 0) end function DungeonBoardCell:refreshCountdown(txCountdown) diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index 394e78b2..e574fdc3 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -43,12 +43,8 @@ function DungeonDifficultyUI:onLoadRootComplete() self.txbuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.tx_buff"] self.iconBuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.icon_buff"] self.rewardTx = self.uiMap["dungeon_difficulty_ui.bg.reward_desc"] - self.rewardFirst = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first"] - self.rewardFirstIcon = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.icon"] - self.rewardFirstNum = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.num"] - self.rewardPass = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass"] - self.rewardPassIcon = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass.icon"] - self.rewardPassNum = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass.num"] + self.rewardFirst = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.rewardPass = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) self.txFrist = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.first.tx_first"] self.Frist = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.first"] self.txLock = self.uiMap["dungeon_difficulty_ui.bg.tx_lock"] @@ -151,41 +147,15 @@ function DungeonDifficultyUI:refreshDifficulty() self.arrowLeft:setActive(not self:isMinId()) -- 奖励 - local reward = DataManager.DungeonData:getBoardShowRewardId(self.module) - if reward ~= nil then - -- 展示实际item - local info = ConfigManager:getConfig("item")[reward] - if info == nil then - return - end - - self.rewardFirstIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) - self.rewardPassIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) - self.rewardFirst:setTouchEnable(true) - self.rewardPass:setTouchEnable(true) - self.rewardFirst:addClickListener(function() - ModuleManager.TipsManager:showRewardTips(reward, info.type, self.rewardFirst) - end) - self.rewardPass:addClickListener(function() - ModuleManager.TipsManager:showRewardTips(reward, info.type, self.rewardPass) - end) - else - reward = DataManager.DungeonData:getBoardShowRewardIcon(self.module) - -- 展示icon图片 - self.rewardFirstIcon:setSprite(reward[1], reward[2]) - self.rewardPassIcon:setSprite(reward[1], reward[2]) - self.rewardFirst:setTouchEnable(false) - self.rewardPass:setTouchEnable(false) - end + local id = DataManager.DungeonData:getBoardShowRewardId(self.module) local firstNum = DataManager.DungeonData:getFirstRewardNum(self.module, self.curId) + firstNum = firstNum or 0 local passNum = DataManager.DungeonData:getPassRewardNum(self.module, self.curId) - if (not self:isCanSweepId()) and firstNum then - self.rewardFirst:setActive(true) - self.rewardFirstNum:setText(firstNum) - else - self.rewardFirst:setActive(false) - end - self.rewardPassNum:setText(passNum) + passNum = passNum or 0 + + self.rewardFirst:refreshItemById(id, firstNum) + self.rewardPass:refreshItemById(id, passNum) + self.rewardFirst:getBaseObject():setActive((not self:isCanSweepId()) and firstNum) end -- 是否是可扫荡关卡 diff --git a/lua/app/userdata/dungeon/dungeon_base_entity.lua b/lua/app/userdata/dungeon/dungeon_base_entity.lua index e8ea3699..de40104e 100644 --- a/lua/app/userdata/dungeon/dungeon_base_entity.lua +++ b/lua/app/userdata/dungeon/dungeon_base_entity.lua @@ -81,11 +81,6 @@ function DungeonBaseEntity:getTodayMaxCount() return nil end --- 获取看板展示的副本奖励(返回icon) -function DungeonBaseEntity:getBoardShowRewardIcon() - return nil -end - -- 获取看板展示的副本奖励（返回id list） function DungeonBaseEntity:getBoardShowRewardId() return nil diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index df5cd6be..5da25d7e 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -320,11 +320,6 @@ function DungeonData:getCloseTime(moduleKey) return Time:getTodaySurplusTime() + (count * 86400) end --- 获取看板展示的副本奖励(返回icon) -function DungeonData:getBoardShowRewardIcon(moduleKey) - return self.dataDungeons[moduleKey]:getBoardShowRewardIcon() -end - -- 获取看板展示的副本奖励（返回item id list） function DungeonData:getBoardShowRewardId(moduleKey) return self.dataDungeons[moduleKey]:getBoardShowRewardId() diff --git a/lua/app/userdata/dungeon/dungeon_shards_entity.lua b/lua/app/userdata/dungeon/dungeon_shards_entity.lua index 96f996c3..73cafe00 100644 --- a/lua/app/userdata/dungeon/dungeon_shards_entity.lua +++ b/lua/app/userdata/dungeon/dungeon_shards_entity.lua @@ -75,11 +75,8 @@ function DungeonShardsEntity:getTodayMaxCount() return GFunc.getConstIntValue("dungeon_shards_limit") end -function DungeonShardsEntity:getBoardShowRewardIcon() - if self.rewardIcon == nil then - self.rewardIcon = {GConst.ATLAS_PATH.ICON_ITEM,"20"} - end - return self.rewardIcon +function DungeonShardsEntity:getBoardShowRewardId() + return 20 end function DungeonShardsEntity:getFirstRewardNum(id)