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

hero

Browse Source
This commit is contained in:
puxuan 2025-06-05 00:14:21 +08:00
parent c026ff582c
commit a6c0a22942
8 changed files with 33271 additions and 906 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,7 +245,7 @@ local attr = {
},
[62]={
["id"]=62,
["name"]="attr_atkp_person"
["name"]="attr_atkp_personal"
}
}
local keys = {
@ -311,7 +311,7 @@ local keys = {
["attr_all_hurtp_green"]=attr[59],
["attr_all_hurtp_blue"]=attr[60],
["attr_all_hurtp_purple"]=attr[61],
["attr_atkp_person"]=attr[62]
["attr_atkp_personal"]=attr[62]
}
}
local config = {

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

@ -1579,24 +1579,28 @@ local fx = {
["res"]="sfx_m20058_b03",
["bind"]="root"
},
[300000]={
["res"]="sfx_p0001_b01",
["bind"]="root"
},
[300001]={
["res"]="sfx_p0001_b02",
["res"]="sfx_c1_p0004_01",
["bind"]="root"
},
[300002]={
["res"]="sfx_p0001_b03",
["res"]="sfx_c1_p0004_02",
["bind"]="root"
},
[300003]={
["res"]="sfx_p0001_b04",
["res"]="sfx_c1_p0004_03",
["bind"]="root"
},
[300004]={
["res"]="sfx_p0001_b05",
["res"]="sfx_c1_p0004_04",
["bind"]="root"
},
[300005]={
["res"]="sfx_c1_p0004_05",
["bind"]="root"
},
[300006]={
["res"]="sfx_c1_p0004_06",
["bind"]="root"
},
[300005]={
@ -3281,6 +3285,6 @@ local fx = {
}
}
local config = {
data=fx,count=767
data=fx,count=768
}
return config

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -126,6 +126,9 @@ local skill = {
1000001
},
["name_act"]="attack01",
["name_hit"]={
"suffer01"
},
["fx_self"]=300018,
["fx_self_mirror"]=400068
},
@ -152,6 +155,9 @@ local skill = {
1000002
},
["name_act"]="attack02",
["name_hit"]={
"suffer02"
},
["fx_self"]=300019,
["fx_self_mirror"]=400069
},
@ -178,6 +184,9 @@ local skill = {
1000003
},
["name_act"]="attack03",
["name_hit"]={
"suffer01"
},
["fx_self"]=300020,
["fx_self_mirror"]=400070
},
@ -204,6 +213,9 @@ local skill = {
1000004
},
["name_act"]="attack04",
["name_hit"]={
"suffer02"
},
["fx_self"]=300021,
["fx_self_mirror"]=400071
},
@ -237,6 +249,9 @@ local skill = {
["sound"]=12001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["name_hit"]={
"suffer02"
},
["fx_self"]=300022,
["bullet_time"]={
1167,
@ -2569,6 +2584,9 @@ local skill = {
1000001
},
["name_act"]="attack01",
["name_hit"]={
"suffer01"
},
["fx_self"]=300018,
["fx_self_mirror"]=400068
},
@ -2595,6 +2613,9 @@ local skill = {
1000002
},
["name_act"]="attack02",
["name_hit"]={
"suffer02"
},
["fx_self"]=300019,
["fx_self_mirror"]=400069
},
@ -2621,6 +2642,9 @@ local skill = {
1000003
},
["name_act"]="attack03",
["name_hit"]={
"suffer01"
},
["fx_self"]=300020,
["fx_self_mirror"]=400070
},
@ -2647,6 +2671,9 @@ local skill = {
1000004
},
["name_act"]="attack04",
["name_hit"]={
"suffer02"
},
["fx_self"]=300021,
["fx_self_mirror"]=400071
},
@ -2698,6 +2725,12 @@ local skill = {
["sound"]=12001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["name_hit"]={
"suffer01",
"suffer01",
"suffer02",
"suffer03"
},
["fx_self"]=300022,
["bullet_time"]={
1167,
@ -2768,6 +2801,12 @@ local skill = {
["sound"]=12001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["name_hit"]={
"suffer01",
"suffer01",
"suffer02",
"suffer03"
},
["fx_self"]=300022,
["bullet_time"]={
1167,
@ -3129,6 +3168,9 @@ local skill = {
1000001
},
["name_act"]="attack01",
["name_hit"]={
"suffer01"
},
["fx_self"]=300018,
["fx_self_mirror"]=400068
},
@ -3155,6 +3197,9 @@ local skill = {
1000002
},
["name_act"]="attack02",
["name_hit"]={
"suffer02"
},
["fx_self"]=300019,
["fx_self_mirror"]=400069
},
@ -3181,6 +3226,9 @@ local skill = {
1000003
},
["name_act"]="attack03",
["name_hit"]={
"suffer01"
},
["fx_self"]=300020,
["fx_self_mirror"]=400070
},
@ -3207,6 +3255,9 @@ local skill = {
1000004
},
["name_act"]="attack04",
["name_hit"]={
"suffer02"
},
["fx_self"]=300021,
["fx_self_mirror"]=400071
},
@ -3240,6 +3291,9 @@ local skill = {
["sound"]=12001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["name_hit"]={
"suffer01"
},
["fx_self"]=300022,
["bullet_time"]={
1167,
@ -4815,6 +4869,9 @@ local skill = {
1000001
},
["name_act"]="attack01",
["name_hit"]={
"suffer01"
},
["fx_self"]=300018,
["fx_self_mirror"]=400068
},
@ -4841,6 +4898,9 @@ local skill = {
1000002
},
["name_act"]="attack02",
["name_hit"]={
"suffer02"
},
["fx_self"]=300019,
["fx_self_mirror"]=400069
},
@ -4867,6 +4927,9 @@ local skill = {
1000003
},
["name_act"]="attack03",
["name_hit"]={
"suffer02"
},
["fx_self"]=300020,
["fx_self_mirror"]=400070
},
@ -4893,6 +4956,9 @@ local skill = {
1000004
},
["name_act"]="attack04",
["name_hit"]={
"suffer02"
},
["fx_self"]=300021,
["fx_self_mirror"]=400071
},
@ -4935,6 +5001,9 @@ local skill = {
["sound"]=12001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["name_hit"]={
"suffer03"
},
["fx_self"]=300022,
["bullet_time"]={
1167,
@ -5090,7 +5159,8 @@ local skill = {
1000001
},
["name_act"]="attack01",
["fx_self"]=300018,
["fx_self"]=300001,
["fx_target"]=300006,
["fx_self_mirror"]=400068
},
[4500211]={
@ -5116,7 +5186,8 @@ local skill = {
1000002
},
["name_act"]="attack02",
["fx_self"]=300019,
["fx_self"]=300002,
["fx_target"]=300006,
["fx_self_mirror"]=400069
},
[4500212]={
@ -5142,7 +5213,8 @@ local skill = {
1000003
},
["name_act"]="attack03",
["fx_self"]=300020,
["fx_self"]=300003,
["fx_target"]=300006,
["fx_self_mirror"]=400070
},
[4500213]={
@ -5168,7 +5240,8 @@ local skill = {
1000004
},
["name_act"]="attack04",
["fx_self"]=300021,
["fx_self"]=300004,
["fx_target"]=300006,
["fx_self_mirror"]=400071
},
[4500220]={
@ -5210,7 +5283,8 @@ local skill = {
["sound"]=12001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["fx_self"]=300022,
["fx_self"]=300005,
["fx_target"]=300006,
["bullet_time"]={
1167,
3000,
@ -5639,6 +5713,9 @@ local skill = {
1000001
},
["name_act"]="attack01",
["name_hit"]={
"suffer01"
},
["fx_self"]=300018,
["fx_self_mirror"]=400068
},
@ -5665,6 +5742,9 @@ local skill = {
1000002
},
["name_act"]="attack02",
["name_hit"]={
"suffer02"
},
["fx_self"]=300019,
["fx_self_mirror"]=400069
},
@ -5691,6 +5771,9 @@ local skill = {
1000003
},
["name_act"]="attack03",
["name_hit"]={
"suffer01"
},
["fx_self"]=300020,
["fx_self_mirror"]=400070
},
@ -5717,6 +5800,9 @@ local skill = {
1000004
},
["name_act"]="attack04",
["name_hit"]={
"suffer02"
},
["fx_self"]=300021,
["fx_self_mirror"]=400071
},
@ -5750,6 +5836,9 @@ local skill = {
["sound"]=12001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["name_hit"]={
"suffer03"
},
["fx_self"]=300022,
["bullet_time"]={
1167,

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

@ -519,12 +519,12 @@ GConst.ENTITY_TYPE = {
}
GConst.MATCH_ATKP_PERSONAL = {
[0] = "attr_atkp_person",
[1] = "attr_atkp_person",
[2] = "attr_atkp_person",
[3] = "attr_atkp_person",
[4] = "attr_atkp_person",
[5] = "attr_atkp_person",
[0] = "attr_atkp_personal",
[1] = "attr_atkp_personal",
[2] = "attr_atkp_personal",
[3] = "attr_atkp_personal",
[4] = "attr_atkp_personal",
[5] = "attr_atkp_personal",
}
GConst.MATCH_HP_NAME = {

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

@ -486,7 +486,7 @@ 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_PERSON = "attr_atkp_person",
ATTR_ATKP_PERSONAL = "attr_atkp_personal",
INVINCIBLE_SHIELD = "invincible_shield",
REBIRTH = "rebirth",

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

@ -78,8 +78,7 @@ end
-- 更新皮肤属性
function HeroEntity:updateStarAttr()
self.starAttr = {}
-- local attr = self:getStarAttrCfg()[self.data.star]
local attr = self:getStarAttrCfg()
local attr = self:getStarAttrCfg()[self.data.star]
for index, value in ipairs(attr or {}) do
self.starAttr[value.type] = value.num
end
@ -333,8 +332,9 @@ function HeroEntity:getConfig()
end
function HeroEntity:getModelId()
local skinModel = DataManager.SkinData:getModelId(self:getSkinId())
return skinModel or self.config.model_id
-- local skinModel = DataManager.SkinData:getModelId(self:getSkinId())
-- return skinModel or self.config.model_id
return self.config.model_id
end
function HeroEntity:getBaseSkill()