server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-02-14 15:37:13 +08:00
parent c9ace03089
commit 6f0fee72f6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/constant.h
View File

@ -442,7 +442,7 @@ enum SamplePolyFlags
enum MagicType_e enum MagicType_e
{ {
MAGIC_NONE = 0, MAGIC_NONE = 0,
MAGIC_20101, //20101 爱心香风 MAGIC_20101_XL, //20101 爱心香风
MAGIC_20701, //20701 瞬间移动回血 MAGIC_20701, //20701 瞬间移动回血
MAGIC_20801, //20801 火力压制 MAGIC_20801, //20801 火力压制
MAGIC_20901, //20901 野蛮冲撞 MAGIC_20901, //20901 野蛮冲撞
@ -453,7 +453,7 @@ enum MagicType_e
MAGIC_20301, //20301 医疗站 MAGIC_20301, //20301 医疗站
MAGIC_20501, //20501 隐身 MAGIC_20501, //20501 隐身
MAGIC_30101, //30101 自然恢复 MAGIC_30101_XL, //30101 自然恢复
MAGIC_30201, //30201 受伤加速 MAGIC_30201, //30201 受伤加速
MAGIC_30301, //30301 击杀回血 MAGIC_30301, //30301 击杀回血
MAGIC_30401, //30401 死亡自曝 MAGIC_30401, //30401 死亡自曝

2
server/gameserver/shot.cc
View File

@ -499,7 +499,7 @@ void InternalShot(Creature* c,
bullet_info.bullet_idx = bulletIdx; bullet_info.bullet_idx = bulletIdx;
bullet_info.bullet_num = bulletNum; bullet_info.bullet_num = bulletNum;
if (skill_meta && if (skill_meta &&
(skill_meta->GetMagicId() == MAGIC_20101 || (skill_meta->GetMagicId() == MAGIC_20101_XL ||
skill_meta->GetMagicId() == MAGIC_20201) skill_meta->GetMagicId() == MAGIC_20201)
) { ) {
bullet_info.trace_target_uniid = c->GetSkillTargetId(); bullet_info.trace_target_uniid = c->GetSkillTargetId();

2
server/gameserver/skill.cc
View File

@ -250,7 +250,7 @@ void Skill::InitActiveSkill()
void Skill::InitPassiveSkill() void Skill::InitPassiveSkill()
{ {
switch (meta->GetMagicId()) { switch (meta->GetMagicId()) {
case MAGIC_30101: case MAGIC_30101_XL:
{ {
ProcSJXY(); ProcSJXY();
} }

8
server/gameserver/skillhelper.cc
View File

@ -21,7 +21,7 @@ std::map<int, int> SkillHelper::skill_magic_hash_;
static int GetMagicSkillId(int magic_id) static int GetMagicSkillId(int magic_id)
{ {
switch (magic_id) { switch (magic_id) {
case MAGIC_20101: case MAGIC_20101_XL:
{ {
return 20101; return 20101;
} }
@ -72,7 +72,7 @@ static int GetMagicSkillId(int magic_id)
} }
break; break;
case MAGIC_30101: case MAGIC_30101_XL:
{ {
return 30101; return 30101;
} }
@ -254,7 +254,7 @@ void SkillHelper::ProcBulletHitBuff(IBullet* bullet, Creature* c, int buff_uniid
return; return;
} }
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_20101: case MAGIC_20101_XL:
{ {
if (buff->meta->buff_effect() == kBET_Vertigo) { if (buff->meta->buff_effect() == kBET_Vertigo) {
c->room->xtimer.ModifyTime c->room->xtimer.ModifyTime
@ -347,7 +347,7 @@ bool SkillHelper::ProcBulletDmg(IBullet* bullet, Creature* target, float& finaly
return false; return false;
} }
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_20101: case MAGIC_20101_XL:
case MAGIC_20401: case MAGIC_20401:
{ {
finaly_dmg = finaly_dmg =