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

背景特效

Browse Source
This commit is contained in:
xiekaidong 2023-08-15 14:59:15 +08:00
parent c515a8be09
commit aff0c425bf
6 changed files with 199 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
lua/app/config/equip.lua
View File

@ -11540,23 +11540,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_atkp_red",
["type"]="attr_atkp_purple",
["num"]=1000
},
{
["type"]="attr_crit_red",
["type"]="attr_crit_purple",
["num"]=1000
},
{
["type"]="attr_hpp_red",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_crit_time_red",
["type"]="attr_crit_time_purple",
["num"]=3000
},
{
["type"]="attr_atkp_red",
["type"]="attr_atkp_purple",
["num"]=2000
}
},
@ -11985,23 +11985,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_red",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_red",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_red",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_red",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_red",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -12430,23 +12430,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_red",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_red",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_red",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_red",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_red",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -12875,23 +12875,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_red",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_red",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_red",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_red",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_red",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -13320,23 +13320,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_red",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_red",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_red",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_red",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_red",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -24890,23 +24890,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_atkp_yellow",
["type"]="attr_atkp_purple",
["num"]=1000
},
{
["type"]="attr_crit_yellow",
["type"]="attr_crit_purple",
["num"]=1000
},
{
["type"]="attr_hpp_yellow",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_crit_time_yellow",
["type"]="attr_crit_time_purple",
["num"]=3000
},
{
["type"]="attr_atkp_yellow",
["type"]="attr_atkp_purple",
["num"]=2000
}
},
@ -25335,23 +25335,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_yellow",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_yellow",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_yellow",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_hpp_yellow",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_yellow",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -25780,23 +25780,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_yellow",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_yellow",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_yellow",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_hpp_yellow",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_yellow",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -26225,23 +26225,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_yellow",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_yellow",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_yellow",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_hpp_yellow",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_yellow",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -26670,23 +26670,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_yellow",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_yellow",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_yellow",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_hpp_yellow",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_yellow",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -38240,23 +38240,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_atkp_green",
["type"]="attr_atkp_purple",
["num"]=1000
},
{
["type"]="attr_crit_green",
["type"]="attr_crit_purple",
["num"]=1000
},
{
["type"]="attr_hpp_green",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_crit_time_green",
["type"]="attr_crit_time_purple",
["num"]=3000
},
{
["type"]="attr_atkp_green",
["type"]="attr_atkp_purple",
["num"]=2000
}
},
@ -38685,23 +38685,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_green",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_green",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_green",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_green",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_green",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -39130,23 +39130,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_green",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_green",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_green",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_green",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_green",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -39575,23 +39575,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_green",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_green",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_green",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_green",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_green",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -40020,23 +40020,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_green",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_green",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_green",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_green",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_green",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -51590,23 +51590,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_atkp_blue",
["type"]="attr_atkp_purple",
["num"]=1000
},
{
["type"]="attr_crit_blue",
["type"]="attr_crit_purple",
["num"]=1000
},
{
["type"]="attr_hpp_blue",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_crit_time_blue",
["type"]="attr_crit_time_purple",
["num"]=3000
},
{
["type"]="attr_atkp_blue",
["type"]="attr_atkp_purple",
["num"]=2000
}
},
@ -52035,23 +52035,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_blue",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_blue",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_blue",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_blue",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_blue",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -52480,23 +52480,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_blue",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_blue",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_blue",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_blue",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_blue",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -52925,23 +52925,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_blue",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_blue",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_blue",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_blue",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_blue",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},
@ -53370,23 +53370,23 @@ local equip = {
},
["features_attr"]={
{
["type"]="attr_hpp_blue",
["type"]="attr_hpp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_blue",
["type"]="attr_normal_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_skill_hurtp_blue",
["type"]="attr_skill_hurtp_purple",
["num"]=1000
},
{
["type"]="attr_normal_hurtp_blue",
["type"]="attr_normal_hurtp_purple",
["num"]=2000
},
{
["type"]="attr_skill_hurtp_blue",
["type"]="attr_skill_hurtp_purple",
["num"]=2000
}
},

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

@ -1989,6 +1989,15 @@ local fx = {
["res"]="sfx_p0033_b05",
["bind"]="root"
},
[300147]={
["res"]="sfx_p0034_b05",
["bind"]="root"
},
[300148]={
["res"]="sfx_p0031_b05",
["bind"]="root",
["bg"]=1
},
[400000]={
["res"]="sfx_p0012_b01",
["bind"]="root",
@ -2723,9 +2732,20 @@ local fx = {
["res"]="sfx_p0033_b05",
["bind"]="root",
["flip"]=1
},
[400147]={
["res"]="sfx_p0034_b05",
["bind"]="root",
["flip"]=1
},
[400148]={
["res"]="sfx_p0031_b05",
["bind"]="root",
["flip"]=1,
["bg"]=1
}
}
local config = {
data=fx,count=641
data=fx,count=645
}
return config

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

@ -127,6 +127,7 @@ local skill = {
},
["name_act"]="attack01",
["fx_self"]=300018,
["fx_bg"]=400148,
["fx_self_mirror"]=400068
},
[1200111]={
@ -153,6 +154,7 @@ local skill = {
},
["name_act"]="attack02",
["fx_self"]=300019,
["fx_bg"]=400148,
["fx_self_mirror"]=400069
},
[1200112]={
@ -179,6 +181,7 @@ local skill = {
},
["name_act"]="attack03",
["fx_self"]=300020,
["fx_bg"]=400148,
["fx_self_mirror"]=400070
},
[1200113]={
@ -205,6 +208,7 @@ local skill = {
},
["name_act"]="attack04",
["fx_self"]=300021,
["fx_bg"]=400148,
["fx_self_mirror"]=400071
},
[1200120]={

60
lua/app/config/skin_skill.lua
View File

@ -7,9 +7,11 @@ local skin_skill = {
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
10019
1000023
},
["name_act"]="attack01"
["name_act"]="attack01",
["fx_self"]=300100,
["fx_self_mirror"]=400100
},
[14002012]={
["skill_position"]={
@ -19,9 +21,11 @@ local skin_skill = {
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
10030
1000024
},
["name_act"]="attack02"
["name_act"]="attack02",
["fx_self"]=300101,
["fx_self_mirror"]=400101
},
[14002013]={
["skill_position"]={
@ -31,9 +35,11 @@ local skin_skill = {
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
10057
1000021
},
["name_act"]="attack03"
["name_act"]="attack03",
["fx_self"]=300102,
["fx_self_mirror"]=400102
},
[14002014]={
["skill_position"]={
@ -43,9 +49,11 @@ local skin_skill = {
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
3200113
1000022
},
["name_act"]="attack04"
["name_act"]="attack04",
["fx_self"]=300103,
["fx_self_mirror"]=400103
},
[14002015]={
["skill_position"]={
@ -56,7 +64,14 @@ local skin_skill = {
["shake_type"]=5,
["sound"]=140020151,
["sound_delay"]=0.0,
["name_act"]="skill01"
["name_act"]="skill01",
["fx_self"]=300147,
["bullet_time"]={
1800,
3000,
400
},
["fx_self_mirror"]=400147
},
[34001011]={
["skill_position"]={
@ -130,7 +145,9 @@ local skin_skill = {
3000,
400
},
["fx_self_mirror"]=400146
["fx_bg"]=300148,
["fx_self_mirror"]=400146,
["fx_bg_mirror"]=400148
},
[53001011]={
["skill_position"]={
@ -143,7 +160,7 @@ local skin_skill = {
1000021
},
["name_act"]="attack01",
["fx_self"]=400025,
["fx_self"]=300060,
["fx_self_mirror"]=400025
},
[53001012]={
@ -157,7 +174,7 @@ local skin_skill = {
1000022
},
["name_act"]="attack02",
["fx_self"]=400026,
["fx_self"]=300061,
["fx_self_mirror"]=400026
},
[53001013]={
@ -171,7 +188,7 @@ local skin_skill = {
1000023
},
["name_act"]="attack03",
["fx_self"]=400027,
["fx_self"]=300062,
["fx_self_mirror"]=400027
},
[53001014]={
@ -185,7 +202,7 @@ local skin_skill = {
1000024
},
["name_act"]="attack04",
["fx_self"]=400028,
["fx_self"]=300063,
["fx_self_mirror"]=400028
},
[53001015]={
@ -202,8 +219,15 @@ local skin_skill = {
53001204
},
["name_act"]="skill01",
["fx_self"]=400029,
["fx_self_mirror"]=400029
["fx_self"]=300064,
["bullet_time"]={
2066,
3000,
400
},
["fx_bg"]=300148,
["fx_self_mirror"]=400029,
["fx_bg_mirror"]=400148
},
[54001011]={
["skill_position"]={
@ -277,7 +301,9 @@ local skin_skill = {
3000,
400
},
["fx_self_mirror"]=400144
["fx_bg"]=300148,
["fx_self_mirror"]=400144,
["fx_bg_mirror"]=400148
}
}
local config = {

16
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -1961,10 +1961,20 @@ function BattleUnitComp:playSkillSound(soundName, delay)
end
function BattleUnitComp:playSkillFx(skill)
self:playSkillSelfBgFx(skill)
self:playSkillSelfFx(skill)
self:playSkillTargetFx(skill)
end
function BattleUnitComp:playSkillSelfBgFx(skill)
local fxId = skill:getFxBg()
if fxId == nil then
return
end
local delay = skill:getFxSelfDelay() or 0
self:playFx(fxId, delay)
end
function BattleUnitComp:playSkillSelfFx(skill)
local fxId = skill:getFxSelf()
if fxId == nil then
@ -2045,7 +2055,11 @@ function BattleUnitComp:getEffectAndPlay(fxInfo, isLoop)
effectObj:setLocalScale(fxScale, fxScale, fxScale)
end
local baseOrder = BattleHelper:getBaseOrder()
effectObj:setSortingOrder(baseOrder, 10)
local order = 19 -- 背景特效预留9, 英雄的层级放在11
if fxInfo.bg then
order = 1
end
effectObj:setSortingOrder(baseOrder, order)
effectObj:play()
if isLoop then
if self.loopFxMap[fxInfo.res] then

16
lua/app/userdata/battle/skill/battle_skill_entity.lua
View File

@ -322,6 +322,22 @@ function BattleSkillEntity:getPassiveTriggerId()
return self.skillInfo.trigger
end
function BattleSkillEntity:getFxBg()
if self.skillShow then
if not self:getIsAtkSideSkill() and self:getUsePvpEffect() then
return self.skillShow.fx_bg_mirror or self.skillShow.fx_bg
else
return self.skillShow.fx_bg
end
end
if not self:getIsAtkSideSkill() and self:getUsePvpEffect() then
return self.skillInfo.fx_bg_mirror or self.skillInfo.fx_bg
else
return self.skillInfo.fx_bg
end
end
function BattleSkillEntity:getFxSelf()
if self.skillShow then
if not self:getIsAtkSideSkill() and self:getUsePvpEffect() then