puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

star

Browse Source
This commit is contained in:
puxuan 2025-06-22 19:05:14 +08:00
parent e516654be1
commit 443bf10a2d
49 changed files with 14921 additions and 16655 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lua/app/config/attr.lua
View File

@ -245,7 +245,23 @@ local attr = {
},
[62]={
["id"]=62,
["name"]="attr_atkp_personal"
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -311,12 +327,16 @@ local keys = {
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_personal"]=attr[62]
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=62
count=66
}
return config

6
lua/app/config/chapter.lua
View File

@ -39,9 +39,9 @@ local chapter = {
},
["monster"]={
101,
101,
101,
101,
201,
301,
401,
501
},
["mystery_box"]={

44
lua/app/config/fx.lua
View File

@ -1603,60 +1603,32 @@ local fx = {
["res"]="sfx_c1_p0004_06",
["bind"]="root"
},
[300005]={
["res"]="sfx_p0002_b01",
["bind"]="root"
},
[300006]={
["res"]="sfx_p0002_b02",
["bind"]="root"
},
[300007]={
["res"]="sfx_p0002_b03",
["res"]="sfx_c1_p0005_01",
["bind"]="root"
},
[300008]={
["res"]="sfx_p0002_b04",
["res"]="sfx_c1_p0005_02",
["bind"]="root"
},
[300009]={
["res"]="sfx_p0002_b06",
["res"]="sfx_c1_p0002_b01",
["bind"]="root"
},
[300010]={
["res"]="sfx_p0003_b01",
["res"]="sfx_c1_p0002_b02",
["bind"]="root"
},
[300011]={
["res"]="sfx_p0003_b02",
["res"]="sfx_c1_p0002_b03",
["bind"]="root"
},
[300012]={
["res"]="sfx_p0003_b03",
["res"]="sfx_c1_p0002_b04",
["bind"]="root"
},
[300013]={
["res"]="sfx_p0003_b04",
["bind"]="root"
},
[300014]={
["res"]="sfx_p0003_b05",
["bind"]="root"
},
[300015]={
["res"]="sfx_p0004_b01",
["bind"]="root"
},
[300016]={
["res"]="sfx_p0004_b03",
["bind"]="root"
},
[300017]={
["res"]="sfx_p0004_b05",
["bind"]="root"
},
[300018]={
["res"]="sfx_p0005_b01",
["res"]="sfx_c1_p0002_b05",
["bind"]="root"
},
[300019]={
@ -3285,6 +3257,6 @@ local fx = {
}
}
local config = {
data=fx,count=768
data=fx,count=761
}
return config

4726
lua/app/config/hero.lua
View File

File diff suppressed because it is too large Load Diff

7160
lua/app/config/hero_level.lua
View File

File diff suppressed because it is too large Load Diff

18
lua/app/config/item.lua
View File

@ -1708,47 +1708,47 @@ local item = {
[68]={
["type"]=2,
["qlt"]=3,
["icon"]="68"
["icon"]="28"
},
[69]={
["type"]=2,
["qlt"]=3,
["icon"]="69"
["icon"]="29"
},
[70]={
["type"]=2,
["qlt"]=3,
["icon"]="70"
["icon"]="30"
},
[71]={
["type"]=2,
["qlt"]=3,
["icon"]="71"
["icon"]="31"
},
[72]={
["type"]=2,
["qlt"]=3,
["icon"]="72"
["icon"]="32"
},
[73]={
["type"]=2,
["qlt"]=3,
["icon"]="73"
["icon"]="33"
},
[74]={
["type"]=2,
["qlt"]=4,
["icon"]="74"
["icon"]="34"
},
[75]={
["type"]=2,
["qlt"]=5,
["icon"]="75"
["icon"]="35"
},
[76]={
["type"]=2,
["qlt"]=6,
["icon"]="76"
["icon"]="36"
},
[1001]={
["type"]=2,

6
lua/app/config/localization/localization_global_const.lua
View File

@ -635,12 +635,6 @@ local LocalizationGlobalConst =
ACT_TOURN_ARENEA_HELP_2 = "ACT_TOURN_ARENEA_HELP_2",
ACT_TOURN_WAVE_DESC_4 = "ACT_TOURN_WAVE_DESC_4",
EVENT_COUNTDOWN = "EVENT_COUNTDOWN",
HERO_STAR_DESC_1 = "HERO_STAR_DESC_1",
HERO_STAR_DESC_2 = "HERO_STAR_DESC_2",
HERO_STAR_DESC_3 = "HERO_STAR_DESC_3",
HERO_STAR_DESC_4 = "HERO_STAR_DESC_4",
HERO_STAR_DESC_5 = "HERO_STAR_DESC_5",
HERO_STAR_DESC_6 = "HERO_STAR_DESC_6",
}
return LocalizationGlobalConst

18220
lua/app/config/monster_chapter.lua
View File

File diff suppressed because it is too large Load Diff

4
lua/app/config/player_initial.lua
View File

@ -23,8 +23,8 @@ local player_initial = {
["reward"]={
["type"]=2,
["type_for_nothing"]="VA==",
["id"]=23001,
["id_for_nothing"]="VAtcA2Q=",
["id"]=33001,
["id_for_nothing"]="VQtcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
}

108
lua/app/config/skill.lua
View File

@ -117,8 +117,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -129,7 +129,7 @@ local skill = {
["name_hit"]={
"suffer01"
},
["fx_self"]=300018,
["fx_self"]=300009,
["fx_self_mirror"]=400068
},
[1300111]={
@ -146,8 +146,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -158,7 +158,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300019,
["fx_self"]=300010,
["fx_self_mirror"]=400069
},
[1300112]={
@ -175,8 +175,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -187,7 +187,7 @@ local skill = {
["name_hit"]={
"suffer01"
},
["fx_self"]=300020,
["fx_self"]=300011,
["fx_self_mirror"]=400070
},
[1300113]={
@ -204,8 +204,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -216,7 +216,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300021,
["fx_self"]=300012,
["fx_self_mirror"]=400071
},
[1300120]={
@ -241,8 +241,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=200,
["shake_type"]=5,
@ -252,7 +252,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300022,
["fx_self"]=300013,
["bullet_time"]={
1167,
3000,
@ -5077,7 +5077,8 @@ local skill = {
["name_hit"]={
"suffer01"
},
["fx_self"]=300018,
["fx_self"]=300001,
["fx_target"]=300006,
["fx_self_mirror"]=400068
},
[4500111]={
@ -5106,7 +5107,8 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300019,
["fx_self"]=300002,
["fx_target"]=300006,
["fx_self_mirror"]=400069
},
[4500112]={
@ -5135,7 +5137,8 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300020,
["fx_self"]=300003,
["fx_target"]=300006,
["fx_self_mirror"]=400070
},
[4500113]={
@ -5164,7 +5167,8 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300021,
["fx_self"]=300004,
["fx_target"]=300006,
["fx_self_mirror"]=400071
},
[4500120]={
@ -5209,7 +5213,8 @@ local skill = {
["name_hit"]={
"suffer03"
},
["fx_self"]=300022,
["fx_self"]=300005,
["fx_target"]=300006,
["bullet_time"]={
1167,
3000,
@ -5940,8 +5945,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -5952,7 +5957,7 @@ local skill = {
["name_hit"]={
"suffer01"
},
["fx_self"]=300018,
["fx_self"]=300007,
["fx_self_mirror"]=400068
},
[5400111]={
@ -5969,8 +5974,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -5981,7 +5986,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300019,
["fx_self"]=300007,
["fx_self_mirror"]=400069
},
[5400112]={
@ -5998,8 +6003,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -6010,7 +6015,7 @@ local skill = {
["name_hit"]={
"suffer01"
},
["fx_self"]=300020,
["fx_self"]=300007,
["fx_self_mirror"]=400070
},
[5400113]={
@ -6027,8 +6032,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -6039,7 +6044,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300021,
["fx_self"]=300007,
["fx_self_mirror"]=400071
},
[5400120]={
@ -6064,8 +6069,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=200,
["shake_type"]=5,
@ -6075,7 +6080,7 @@ local skill = {
["name_hit"]={
"suffer03"
},
["fx_self"]=300022,
["fx_self"]=300008,
["bullet_time"]={
1167,
3000,
@ -6097,8 +6102,8 @@ local skill = {
},
["obj"]=1,
["skill_position"]={
1,
140
2,
0
}
},
[5400122]={
@ -12150,7 +12155,7 @@ local skill = {
},
["name_act"]="attack01",
["name_hit"]={
"suffer02"
"suffer01"
}
},
[20002]={
@ -12218,8 +12223,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -12228,9 +12233,8 @@ local skill = {
},
["name_act"]="attack01",
["name_hit"]={
"suffer03"
},
["fx_self"]=100004
"suffer01"
}
},
[20005]={
["effect_type"]=1,
@ -12245,8 +12249,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -12255,9 +12259,8 @@ local skill = {
},
["name_act"]="attack02",
["name_hit"]={
"suffer03"
},
["fx_self"]=100005
"suffer02"
}
},
[20006]={
["effect_type"]=1,
@ -12272,8 +12275,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
1,
140
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
@ -12282,9 +12285,8 @@ local skill = {
},
["name_act"]="attack03",
["name_hit"]={
"suffer03"
},
["fx_self"]=100006
"suffer01"
}
},
[20007]={
["effect_type"]=1,

34
lua/app/config/strings/cn/attr.lua
View File

@ -303,6 +303,31 @@ local attr = {
["id"]=61,
["desc"]="所有伤害提升{0}%",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["desc"]="全体红色快递员攻击+{0}%",
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["desc"]="全体黄色快递员攻击+{0}%",
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["desc"]="全体绿色快递员攻击+{0}%",
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["desc"]="全体蓝色快递员攻击+{0}%",
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["desc"]="全体紫色快递员攻击+{0}%",
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +392,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

6
lua/app/config/strings/cn/global.lua
View File

@ -635,12 +635,6 @@ local localization_global =
["ACT_TOURN_ARENEA_HELP_2"] = "{0}：胜利{1}分，失败{2}分；",
["ACT_TOURN_WAVE_DESC_4"] = "礼包",
["EVENT_COUNTDOWN"] = "活动倒计时：",
["HERO_STAR_DESC_1"] = "{0}攻击+{0}%",
["HERO_STAR_DESC_2"] = "全体红色快递员攻击+{0}",
["HERO_STAR_DESC_3"] = "全体黄色快递员攻击+{0}",
["HERO_STAR_DESC_4"] = "全体绿色快递员攻击+{0}",
["HERO_STAR_DESC_5"] = "全体蓝色快递员攻击+{0}",
["HERO_STAR_DESC_6"] = "全体紫色快递员攻击+{0}",
}
return localization_global

38
lua/app/config/strings/cn/item.lua
View File

@ -263,6 +263,42 @@ local item = {
["name"]="S8赛季黄金头像框",
["desc"]="S8竞技场黄金头像框，英雄的光辉。"
},
[68]={
["name"]="红元素英雄升级材料",
["desc"]="红元素英雄升级材料"
},
[69]={
["name"]="黄元素英雄升级材料",
["desc"]="黄元素英雄升级材料"
},
[70]={
["name"]="绿元素英雄升级材料",
["desc"]="绿元素英雄升级材料"
},
[71]={
["name"]="蓝元素英雄升级材料",
["desc"]="蓝元素英雄升级材料"
},
[72]={
["name"]="紫元素英雄升级材料",
["desc"]="紫元素英雄升级材料"
},
[73]={
["name"]="稀有英雄升星材料",
["desc"]="稀有英雄升星材料"
},
[74]={
["name"]="史诗英雄升星材料",
["desc"]="史诗英雄升星材料"
},
[75]={
["name"]="传说英雄升星材料",
["desc"]="传说英雄升星材料"
},
[76]={
["name"]="神话英雄升星材料",
["desc"]="神话英雄升星材料"
},
[1001]={
["name"]="暗淡陨铁",
["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。"
@ -473,6 +509,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/de/attr.lua
View File

@ -242,6 +242,26 @@ local attr = {
[61]={
["id"]=61,
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -306,12 +326,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/de/item.lua
View File

@ -196,6 +196,33 @@ local item = {
},
[67]={
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
@ -355,6 +382,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/en/attr.lua
View File

@ -303,6 +303,26 @@ local attr = {
["id"]=61,
["desc"]="All damage increases by {0}%",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +387,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/en/item.lua
View File

@ -262,6 +262,33 @@ local item = {
[67]={
["name"]="S8 Gold Avatar Frame",
["desc"]="S8 Gold Arena Avatar Frame, shining with heroic radiance."
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
["name"]="Dim Meteorite",
@ -451,6 +478,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/es/attr.lua
View File

@ -303,6 +303,26 @@ local attr = {
["id"]=61,
["desc"]="Todo el daño aumenta en {0}%",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +387,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/es/item.lua
View File

@ -262,6 +262,33 @@ local item = {
[67]={
["name"]="Marco de avatar de oro Temporada S8",
["desc"]="Marco de avatar de oro de Arena S1, gloria del héroe."
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
["name"]="Meteorito Opaco",
@ -451,6 +478,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/fr/attr.lua
View File

@ -242,6 +242,26 @@ local attr = {
[61]={
["id"]=61,
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -306,12 +326,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/fr/item.lua
View File

@ -196,6 +196,33 @@ local item = {
},
[67]={
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
@ -355,6 +382,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/id/attr.lua
View File

@ -303,6 +303,26 @@ local attr = {
["id"]=61,
["desc"]="Semua DMG meningkat {0}%",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +387,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/id/item.lua
View File

@ -262,6 +262,33 @@ local item = {
[67]={
["name"]="Bingkai Avatar Emas Musim S8",
["desc"]="Bingkai Avatar Emas Arena S8.Pahlawan mulia."
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
["name"]="Chondrite",
@ -451,6 +478,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/ja/attr.lua
View File

@ -303,6 +303,26 @@ local attr = {
["id"]=61,
["desc"]="すべてのダメージが{0}%増加する",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +387,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/ja/item.lua
View File

@ -262,6 +262,33 @@ local item = {
[67]={
["name"]="S8シーズンゴールドフレーム",
["desc"]="S8闘技場ゴールドフレーム。ヒーローの輝き。"
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
["name"]="薄暗い隕石",
@ -451,6 +478,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/ko/attr.lua
View File

@ -303,6 +303,26 @@ local attr = {
["id"]=61,
["desc"]="모든 대미지가 {0}% 증가합니다.",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +387,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/ko/item.lua
View File

@ -262,6 +262,33 @@ local item = {
[67]={
["name"]="S8 시즌 골드 아이콘 프레임",
["desc"]="S8 아레나 골드 아이콘 프레임, 영웅의 눈부신 업적입니다."
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
["name"]="알렌데 운석",
@ -451,6 +478,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/pt/attr.lua
View File

@ -303,6 +303,26 @@ local attr = {
["id"]=61,
["desc"]="Aumenta o dano causado em {0}%.",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +387,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/pt/item.lua
View File

@ -262,6 +262,33 @@ local item = {
[67]={
["name"]="Moldura de Avatar de Ouro da S8",
["desc"]="Moldura de avatar de ouro da Arena S8, o brilho de um herói."
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
["name"]="Ferro Meteórico Opaco",
@ -451,6 +478,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/ru/attr.lua
View File

@ -242,6 +242,26 @@ local attr = {
[61]={
["id"]=61,
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -306,12 +326,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/ru/item.lua
View File

@ -196,6 +196,33 @@ local item = {
},
[67]={
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
@ -355,6 +382,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/th/attr.lua
View File

@ -303,6 +303,26 @@ local attr = {
["id"]=61,
["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}%",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +387,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/th/item.lua
View File

@ -262,6 +262,33 @@ local item = {
[67]={
["name"]="กรอบรูปทองซีซั่น S8",
["desc"]="กรอบรูปทองของอารีน่า S8 ความรุ่งโรจน์ของฮีโร่"
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
["name"]="อุกกาบาตทื่อ",
@ -451,6 +478,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/vi/attr.lua
View File

@ -303,6 +303,26 @@ local attr = {
["id"]=61,
["desc"]="Tất cả ST tăng {0}%",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +387,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/vi/item.lua
View File

@ -262,6 +262,33 @@ local item = {
[67]={
["name"]="Khung Avatar Vàng S8",
["desc"]="Khung Avatar Vàng Đấu Trường S8, anh hùng tỏa sáng."
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
["name"]="Thiên Thạch Ảm Đạm",
@ -451,6 +478,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

29
lua/app/config/strings/zh/attr.lua
View File

@ -303,6 +303,26 @@ local attr = {
["id"]=61,
["desc"]="所有傷害提高{0}%",
["name"]="attr_all_hurtp_purple"
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all"
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all"
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all"
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all"
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
}
}
local keys = {
@ -367,12 +387,17 @@ local keys = {
["attr_all_hurtp_yellow"]=attr[58],
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61]
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_red_all"]=attr[62],
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
}
}
local config = {
data=attr,
keys=keys,
count=61
count=66
}
return config

29
lua/app/config/strings/zh/item.lua
View File

@ -262,6 +262,33 @@ local item = {
[67]={
["name"]="S8賽季黃金頭像框",
["desc"]="S8競技場黃金頭像框，英雄的光輝。"
},
[68]={
},
[69]={
},
[70]={
},
[71]={
},
[72]={
},
[73]={
},
[74]={
},
[75]={
},
[76]={
},
[1001]={
["name"]="暗淡隕鐵",
@ -451,6 +478,6 @@ local item = {
}
}
local config = {
data=item,count=118
data=item,count=127
}
return config

318
lua/app/config/summon.lua
View File

@ -8,88 +8,88 @@ local summon = {
["num"]=1,
["num_for_nothing"]="Vw=="
},
["ad_time"]=23,
["ad_time"]=12,
["free_time"]=23,
["summon"]={
{
["id"]=15001,
["weight"]=1000
},
{
["id"]=15002,
["weight"]=1000
},
{
["id"]=25001,
["weight"]=1000
},
{
["id"]=25002,
["weight"]=1000
},
{
["id"]=35001,
["weight"]=1000
},
{
["id"]=35002,
["weight"]=1000
},
{
["id"]=45001,
["weight"]=1000
},
{
["id"]=45002,
["weight"]=1000
},
{
["id"]=55001,
["weight"]=1000
},
{
["id"]=55002,
["weight"]=1000
},
{
["id"]=13001,
["weight"]=17780000
["weight"]=177800
},
{
["id"]=23001,
["weight"]=17780000
["weight"]=177800
},
{
["id"]=33001,
["weight"]=17780000
["weight"]=177800
},
{
["id"]=43001,
["weight"]=17780000
["weight"]=177800
},
{
["id"]=53001,
["weight"]=17780000
["weight"]=177800
},
{
["id"]=14001,
["weight"]=2218000
["weight"]=22180
},
{
["id"]=24001,
["weight"]=2218000
["weight"]=22180
},
{
["id"]=34001,
["weight"]=2218000
["weight"]=22180
},
{
["id"]=44001,
["weight"]=2218000
["weight"]=22180
},
{
["id"]=54001,
["weight"]=2218000
["weight"]=22180
},
{
["id"]=15001,
["weight"]=10
},
{
["id"]=15002,
["weight"]=10
},
{
["id"]=25001,
["weight"]=10
},
{
["id"]=25002,
["weight"]=10
},
{
["id"]=35001,
["weight"]=10
},
{
["id"]=35002,
["weight"]=10
},
{
["id"]=45001,
["weight"]=10
},
{
["id"]=45002,
["weight"]=10
},
{
["id"]=55001,
["weight"]=10
},
{
["id"]=55002,
["weight"]=10
}
},
["hero_item"]={
@ -138,88 +138,88 @@ local summon = {
["num"]=200,
["num_for_nothing"]="VAhc"
},
["ad_time"]=47,
["ad_time"]=23,
["free_time"]=47,
["summon"]={
{
["id"]=15001,
["weight"]=1250000
},
{
["id"]=15002,
["weight"]=1250000
},
{
["id"]=25001,
["weight"]=1250000
},
{
["id"]=25002,
["weight"]=1250000
},
{
["id"]=35001,
["weight"]=1250000
},
{
["id"]=35002,
["weight"]=1250000
},
{
["id"]=45001,
["weight"]=1250000
},
{
["id"]=45002,
["weight"]=1250000
},
{
["id"]=55001,
["weight"]=1250000
},
{
["id"]=55002,
["weight"]=1250000
},
{
["id"]=13001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=23001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=33001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=43001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=53001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=14001,
["weight"]=5000000
["weight"]=500
},
{
["id"]=24001,
["weight"]=5000000
["weight"]=500
},
{
["id"]=34001,
["weight"]=5000000
["weight"]=500
},
{
["id"]=44001,
["weight"]=5000000
["weight"]=500
},
{
["id"]=54001,
["weight"]=5000000
["weight"]=500
},
{
["id"]=15001,
["weight"]=125
},
{
["id"]=15002,
["weight"]=125
},
{
["id"]=25001,
["weight"]=125
},
{
["id"]=25002,
["weight"]=125
},
{
["id"]=35001,
["weight"]=125
},
{
["id"]=35002,
["weight"]=125
},
{
["id"]=45001,
["weight"]=125
},
{
["id"]=45002,
["weight"]=125
},
{
["id"]=55001,
["weight"]=125
},
{
["id"]=55002,
["weight"]=125
}
},
["hero_item"]={
@ -279,7 +279,7 @@ local summon = {
["weight"]=1
}
},
["guarantee3"]=10,
["guarantee3"]=0,
["guarantee2"]=100,
["love"]={
15001,
@ -318,93 +318,93 @@ local summon = {
["num_for_nothing"]="Vw=="
},
["summon"]={
{
["id"]=15001,
["weight"]=1250000
},
{
["id"]=15002,
["weight"]=1250000
},
{
["id"]=25001,
["weight"]=1250000
},
{
["id"]=25002,
["weight"]=1250000
},
{
["id"]=35001,
["weight"]=1250000
},
{
["id"]=35002,
["weight"]=1250000
},
{
["id"]=45001,
["weight"]=1250000
},
{
["id"]=45002,
["weight"]=1250000
},
{
["id"]=55001,
["weight"]=1250000
},
{
["id"]=55002,
["weight"]=1250000
},
{
["id"]=13001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=23001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=33001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=43001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=53001,
["weight"]=12500000
["weight"]=1250
},
{
["id"]=14001,
["weight"]=4800000
["weight"]=500
},
{
["id"]=24001,
["weight"]=4800000
["weight"]=500
},
{
["id"]=34001,
["weight"]=4800000
["weight"]=500
},
{
["id"]=44001,
["weight"]=4800000
["weight"]=500
},
{
["id"]=54001,
["weight"]=4800000
["weight"]=500
},
{
["id"]=15001,
["weight"]=500000
["weight"]=100
},
{
["id"]=15002,
["weight"]=500000
["weight"]=100
},
{
["id"]=25001,
["weight"]=100
},
{
["id"]=25002,
["weight"]=100
},
{
["id"]=35001,
["weight"]=100
},
{
["id"]=35002,
["weight"]=100
},
{
["id"]=45001,
["weight"]=100
},
{
["id"]=45002,
["weight"]=100
},
{
["id"]=55001,
["weight"]=100
},
{
["id"]=55002,
["weight"]=100
},
{
["id"]=16001,
["weight"]=125
},
{
["id"]=26001,
["weight"]=125
}
},
["hero_item"]={
@ -428,19 +428,19 @@ local summon = {
["guarantee1"]=50,
["guarantee_summon"]={
{
["id"]=15001,
["id"]=16001,
["weight"]=1
},
{
["id"]=15002,
["id"]=26001,
["weight"]=1
}
},
["guarantee3"]=0,
["guarantee2"]=100,
["love"]={
15001,
15002
16001,
26001
},
["show"]={
{

8
lua/app/global/global_const.lua
View File

@ -639,6 +639,14 @@ GConst.MATCH_ALL_HURTP_NAME = {
[5] = "attr_all_hurtp_purple",
}
GConst.MATCH_ALL_ATKP_NAME = {
[1] = "attr_atkp_red_all",
[2] = "attr_atkp_yellow_all",
[3] = "attr_atkp_green_all",
[4] = "attr_atkp_blue_all",
[5] = "attr_atkp_purple_all",
}
GConst.GAMEOBJECT_LAYER = {
DEFAULT = CS.BF.Utils.NameToLayer("Default"),
UI = CS.BF.Utils.NameToLayer("UI"),

8
lua/app/global/global_func.lua
View File

@ -447,6 +447,7 @@ function GFunc.getAttrShowValue(attrType, attrNum, notPercentSign)
table.containValue(GConst.MATCH_CRIT_NAME, attrType) or
table.containValue(GConst.MATCH_CRIT_TIME_NAME, attrType) or
table.containValue(GConst.MATCH_CURED_NAME, attrType) or
table.containValue(GConst.MATCH_ALL_ATKP_NAME, attrType) or
table.containValue(GConst.MATCH_ALL_HURTP_NAME, attrType)
then
local str = notPercentSign and "" or "%"
@ -1940,4 +1941,11 @@ function GFunc.randomDrop(dropList)
return dropList[idx]
end
-- 获取属性描述和数值
function GFunc.getAttrInfo(attr)
local attrType = attr.type
local attrValue = attr.num
return
end
return GFunc

6
lua/app/module/battle/battle_const.lua
View File

@ -486,7 +486,11 @@ local ATTR_NAME = {
ATTR_ALL_HURTP_GREEN = "attr_all_hurtp_green",
ATTR_ALL_HURTP_BLUE = "attr_all_hurtp_blue",
ATTR_ALL_HURTP_PURPLE = "attr_all_hurtp_purple",
ATTR_ATKP_PERSONAL = "attr_atkp_personal",
ATTR_ATKP_RED_ALL = "attr_atkp_red_all",
ATTR_ATKP_YELLOW_ALL = "attr_atkp_yellow_all",
ATTR_ATKP_GREEN_ALL = "attr_atkp_green_all",
ATTR_ATKP_BLUE_ALL = "attr_atkp_blue_all",
ATTR_ATKP_PURPLE_ALL = "attr_atkp_purple_all",
INVINCIBLE_SHIELD = "invincible_shield",
REBIRTH = "rebirth",

4
lua/app/module/hero/hero_const.lua
View File

@ -22,7 +22,9 @@ HeroConst.CHECK_LV_UP_STATE = {
MAX_LV = 2,
NO_COST = 3,
FRAGMENT_NOT_ENOUGH = 4,
COIN_NOT_ENOUGH = 5
COIN_NOT_ENOUGH = 5,
NEED_STAR = 6,
NEED_LV = 7,
}
-- 英雄界面显示类型

14
lua/app/module/hero/hero_manager.lua
View File

@ -12,7 +12,7 @@ function HeroManager:showHeroUnlockUI(heroIdList)
UIManager:showUI("app/ui/hero/hero_unlock_ui", {heroIdList = heroIdList})
end
function HeroManager:upgradeHero(heroId, heroEntity)
function HeroManager:upgradeHero(heroId, heroEntity, level)
local heroEntity = heroEntity or DataManager.HeroData:getHeroById(heroId)
if not heroEntity then
return
@ -24,7 +24,7 @@ function HeroManager:upgradeHero(heroId, heroEntity)
return
end
self:sendMessage(ProtoMsgType.FromMsgEnum.HeroUpgradeReq, {id = heroId}, {}, self.upgradeHeroFinish, BIReport.ITEM_GET_TYPE.UPGRADE_HERO)
self:sendMessage(ProtoMsgType.FromMsgEnum.HeroUpgradeReq, {id = heroId, level = level}, {}, self.upgradeHeroFinish, BIReport.ITEM_GET_TYPE.UPGRADE_HERO)
end
function HeroManager:upgradeHeroFinish(result)
@ -44,14 +44,7 @@ function HeroManager:upgradeHeroStar(heroId, heroEntity)
local canStarUp, state = heroEntity:canStarUp()
if not canStarUp then
-- 如果是金币不足 尝试触发金币礼包
if state == GConst.HeroConst.CHECK_LV_UP_STATE.COIN_NOT_ENOUGH then
-- if not ModuleManager.ShopManager:tryTriggerCoinGift() then
GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_GOLD)
-- end
else
heroEntity:canStarUp(true)
end
heroEntity:canStarUp(true)
return
end
@ -61,6 +54,7 @@ end
function HeroManager:heroStarReqFinish(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.HeroData:onHeroStarUp(result.hero.id)
DataManager.HeroData:setDirty()
AudioManager:playEffect(AudioManager.EFFECT_ID.HERO_UP)
end

19
lua/app/ui/hero/cell/star_cell.lua
View File

@ -21,9 +21,18 @@ function StarCell:refresh(heroEntity, idx)
end
local star = self.heroEntity:getStar()
local starType = math.ceil(idx / 5)
for i, v in ipairs(self.starImgs) do
if i <= idx then
local star = (idx - 1)%5 + 1
if i <= star then
v:setActive(true)
if starType == 1 then
v:setSprite(GConst.ATLAS_PATH.COMMON, "common_star_1")
elseif starType == 2 then
v:setSprite(GConst.ATLAS_PATH.COMMON, "common_point")
else
v:setSprite(GConst.ATLAS_PATH.COMMON, "common_info")
end
else
v:setActive(false)
end
@ -34,7 +43,13 @@ function StarCell:refresh(heroEntity, idx)
self.baseObject:setSprite(GConst.ATLAS_PATH.COMMON, "common_board_quality_2")
end
self.starBg:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT):RefreshLayout()
self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst["HERO_STAR_DESC_" .. idx]) .. self.heroEntity:getCfgId())
local attr = heroEntity:getStarAttrCfg(idx)
local descTx = GFunc.getAttrDesc(attr.type, attr.num)
if not table.containValue(GConst.MATCH_ALL_ATKP_NAME, attr.type) then
descTx = heroEntity:getName() .. descTx
end
self.descTx:setText(descTx)
end
return StarCell

3
lua/app/ui/hero/hero_detail_ui.lua
View File

@ -245,7 +245,8 @@ function HeroDetailUI:showStarInfo()
self.compStar:setParentUI(self)
end
self.compStar:refresh(self.heroEntity)
self.compStar:setHeroData(self.heroEntity, self.onlyLook)
self.compStar:refresh()
end
function HeroDetailUI:showskinInfo()

4
lua/app/ui/hero/hero_info_comp.lua
View File

@ -58,6 +58,10 @@ function HeroInfoComp:init()
self.btnUp:addClickListener(function()
ModuleManager.HeroManager:upgradeHero(self.heroEntity:getCfgId(), self.heroEntity)
end)
self.btnUp5:addClickListener(function()
local canLvUpLv = self.heroEntity:getLvUpLv()
ModuleManager.HeroManager:upgradeHero(self.heroEntity:getCfgId(), self.heroEntity, canLvUpLv)
end)
self.btnSkillDesc:addClickListener(function()
local cfg = ConfigManager:getConfig("skill")[self.heroEntity:getBaseSkill()]
if cfg.buff_id and #cfg.buff_id > 0 then

30
lua/app/ui/hero/star_info_comp.lua
View File

@ -9,12 +9,14 @@ function StarInfoComp:init()
self.upBtnTx = uiMap["star_info.upgrade.up_btn.text"]
self.lvBtn = uiMap["star_info.upgrade.lv_btn"]
self.lvBtnTx = uiMap["star_info.upgrade.lv_btn.text"]
self.descTx = uiMap["star_info.upgrade.desc_tx"]
self.costCells = {}
for i = 1, 2 do
self.costCells[i] = uiMap["star_info.upgrade.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
end
-- self.upBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_4))
-- self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_4))
self.upBtnTx:setText("升星")
self.lvBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_4))
self.upBtn:addClickListener(function()
@ -33,32 +35,44 @@ function StarInfoComp:init()
cell:refresh(self.heroEntity, index)
end)
self.scrollRectComp:clearCells()
-- self.scrollRectComp:refillCells(count)
end
function StarInfoComp:setParentUI(parentUI)
self.parentUI = parentUI
end
function StarInfoComp:refresh(heroEntity)
self.heroEntity = heroEntity or self.heroEntity
if not self.heroEntity then
return
end
self.scrollRectComp:refillCells(5)
function StarInfoComp:setHeroData(heroEntity, onlyLook)
self.heroEntity = heroEntity
self.onlyLook = onlyLook
self:bind(self.heroEntity, "isDirty", function()
self:refresh(true)
end)
end
function StarInfoComp:refresh(starUp)
local maxStarLv = self.heroEntity:getMaxStar()
self.scrollRectComp:refillCells(maxStarLv)
if self.heroEntity:getIsStarMax() then
self.upBtn:setActive(false)
self.lvBtn:setActive(false)
self.descTx:setActive(false)
for i,v in ipairs(self.costCells) do
v:setActive(false)
end
elseif self.heroEntity:getIsCurLvMax() then
elseif not self.heroEntity:getIsCurLvMax() then
self.upBtn:setActive(false)
self.lvBtn:setActive(true)
self.descTx:setActive(true)
for i,v in ipairs(self.costCells) do
v:setActive(false)
end
local nextLv = self.heroEntity:getNextLv()
self.descTx:setText("等级达到" .. nextLv .. "可升星")
else
self.upBtn:setActive(true)
self.lvBtn:setActive(false)
self.descTx:setActive(false)
local materials = self.heroEntity:getStarUpMaterials()
local costs = {}
costs[1] = {id = self.heroEntity:getFragmentId(), num = materials[1], type = 1}

2
lua/app/userdata/hero/hero_data.lua
View File

@ -97,7 +97,7 @@ function HeroData:getHeroById(id)
return
end
if not self.heroes[id] then
self.heroes[id] = self:getEntity({id = id, level = 0, skin = 0})
self.heroes[id] = self:getEntity({id = id, level = 0, skin = 0, star = 0})
end
return self.heroes[id]
end

68
lua/app/userdata/hero/hero_entity.lua
View File

@ -6,8 +6,7 @@ function HeroEntity:ctor(cfgId, lv, skin, star)
self.data.isDirty = false
self.data.lv = lv
self.data.skin = skin
self.data.star = star
self.data.star = 1
self.data.star = star or 0
self.config = ConfigManager:getConfig("hero")[self.cfgId]
self.beginLv = 1 -- 激活等级
@ -264,6 +263,19 @@ function HeroEntity:getMaxLv()
return self.maxLv
end
function HeroEntity:getNextLv()
local cfg = ConfigManager:getConfig("hero_level")
local lv = self.data.lv
for i = self.data.lv + 1, #cfg do
if self.data.star >= cfg[i].star then
lv = i
else
break
end
end
return lv
end
function HeroEntity:getIsCurLvMax()
if self:isMaxLv() then
return true
@ -280,6 +292,10 @@ function HeroEntity:canLvUp(showToast)
return false, GConst.HeroConst.CHECK_LV_UP_STATE.MAX_LV
end
if self:getIsCurLvMax() then
return false, GConst.HeroConst.CHECK_LV_UP_STATE.NEED_STAR
end
local cost = self:getLvUpMaterials()
if not cost then
return false, GConst.HeroConst.CHECK_LV_UP_STATE.NO_COST
@ -324,6 +340,31 @@ function HeroEntity:getLvUpMaterials()
-- local fieldName = "cost_" .. self:getQlt()
return nextLvInfo.cost
end
function HeroEntity:getLvUpLv()
local count = 0
local totalCost1 = 0
local totalCost2 = 0
for i = 1, 5 do
local lv = self.data.lv + i
local nextLvInfo = ConfigManager:getConfig("hero_level")[lv]
if not nextLvInfo then
break
end
local fragmentCost = nextLvInfo.cost[1] or 0
local itemCost = nextLvInfo.cost[2] or 0
totalCost1 = totalCost1 + fragmentCost
totalCost2 = totalCost2 + itemCost
if not GFunc.checkCost(self:getFragmentId(), totalCost1, false) then
break
end
if not GFunc.checkCost(self:getLvUpCostId(), totalCost2, false) then
break
end
count = count + 1
end
return count
end
-- endregion
-- region 配置
@ -385,8 +426,15 @@ function HeroEntity:getStarUpCostId()
return self.config.star_id
end
function HeroEntity:getStarAttrCfg()
return self.config.star
function HeroEntity:getStarAttrCfg(star)
if star then
return self.config.star_attr[star]
end
return self.config.star_attr
end
function HeroEntity:getStarAttrTxt()
return self.config.star_txt
end
-- endregion
@ -487,6 +535,10 @@ function HeroEntity:canStarUp(showToast)
return false, GConst.HeroConst.CHECK_LV_UP_STATE.MAX_LV
end
if not self:getIsCurLvMax() then
return false, GConst.HeroConst.CHECK_LV_UP_STATE.NEED_LV
end
local cost = self:getStarUpMaterials()
if not cost then
return false, GConst.HeroConst.CHECK_LV_UP_STATE.NO_COST
@ -496,8 +548,8 @@ function HeroEntity:canStarUp(showToast)
if not GFunc.checkCost(self:getFragmentId(), fragmentCost, showToast) then
return false, GConst.HeroConst.CHECK_LV_UP_STATE.FRAGMENT_NOT_ENOUGH
end
local goldCost = cost[2] or 0
if not GFunc.checkCost(GConst.ItemConst.ITEM_ID_GOLD, goldCost, showToast) then
local itemCost = cost[2] or 0
if not GFunc.checkCost(self:getStarUpCostId(), itemCost, showToast) then
return false, GConst.HeroConst.CHECK_LV_UP_STATE.COIN_NOT_ENOUGH
end
@ -508,6 +560,10 @@ function HeroEntity:onHeroStarUp()
self.data.star = self.data.star + 1
self:setDirty()
end
function HeroEntity:getMaxStar()
return #self:getStarAttrCfg()
end
-- endregion
-- region 皮肤相关