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:24:59 +08:00
parent b777a99815
commit c9ace03089
14 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/battledatacontext.cc
View File

@ -646,8 +646,8 @@ float BattleDataContext::GetWeaponAtk(IBullet* bullet)
} }
if (bullet->GetSkillMeta() && bullet->GetSkillMeta()->_number_meta) { if (bullet->GetSkillMeta() && bullet->GetSkillMeta()->_number_meta) {
switch (bullet->GetSkillMeta()->GetMagicId()) { switch (bullet->GetSkillMeta()->GetMagicId()) {
case MAGIC_HLYZ: case MAGIC_20801:
case MAGIC_HJHX: case MAGIC_20201:
{ {
return bullet->GetSkillMeta()->_number_meta->_float_ratio; return bullet->GetSkillMeta()->_number_meta->_float_ratio;
} }

4
server/gameserver/buff/hide.cc
View File

@ -18,7 +18,7 @@ void HideBuff::Deactivate()
{ {
if (skill_meta) { if (skill_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_YS: case MAGIC_20501:
{ {
owner->GetTrigger()->YsBuffRemove(this); owner->GetTrigger()->YsBuffRemove(this);
} }
@ -35,7 +35,7 @@ void HideBuff::ProcSkill()
{ {
if (skill_meta) { if (skill_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_YS: case MAGIC_20501:
{ {
owner->room->xtimer.ModifyTime owner->room->xtimer.ModifyTime
(remover_timer, (remover_timer,

2
server/gameserver/buff/hold_shield.cc
View File

@ -22,7 +22,7 @@ void HoldShieldBuff::Activate()
owner->shield_hp_); owner->shield_hp_);
if (skill_meta) { if (skill_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_LDFY: case MAGIC_21001:
{ {
owner->room->xtimer.ModifyTime owner->room->xtimer.ModifyTime
(remover_timer, (remover_timer,

6
server/gameserver/buff/machine_gun.cc
View File

@ -59,14 +59,14 @@ void MachineGunBuff::ProcSkill()
{ {
if (skill_meta && skill_meta->_number_meta) { if (skill_meta && skill_meta->_number_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_HLYZ: case MAGIC_20801:
{ {
owner->room->xtimer.ModifyTime owner->room->xtimer.ModifyTime
(remover_timer, (remover_timer,
skill_meta->_number_meta->_float_time * 1000/ FRAME_RATE_MS); skill_meta->_number_meta->_float_time * 1000/ FRAME_RATE_MS);
} }
break; break;
case MAGIC_HJHX: case MAGIC_20201:
{ {
owner->room->xtimer.ModifyTime owner->room->xtimer.ModifyTime
(remover_timer, (remover_timer,
@ -74,7 +74,7 @@ void MachineGunBuff::ProcSkill()
owner->GetTrigger()->DispatchEvent(kStartSwitchWeaponBuffEvent, {this}); owner->GetTrigger()->DispatchEvent(kStartSwitchWeaponBuffEvent, {this});
} }
break; break;
case MAGIC_FG: case MAGIC_20401:
{ {
FgSkill(); FgSkill();
} }

2
server/gameserver/buff/reverse.cc
View File

@ -23,7 +23,7 @@ void ReverseBuff::Activate()
owner->SetAttackDir(dir); owner->SetAttackDir(dir);
if (skill_meta) { if (skill_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_YMCZ: case MAGIC_20901:
{ {
owner->ForwardMove(SkillHelper::GetYmczReserveDistance(skill_meta)); owner->ForwardMove(SkillHelper::GetYmczReserveDistance(skill_meta));
} }

4
server/gameserver/buff/sprint.cc
View File

@ -142,7 +142,7 @@ void SprintBuff::OnEnemyHit(Creature* enemy)
} }
if (skill_meta) { if (skill_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_YMCZ: case MAGIC_20901:
{ {
float dmg = SkillHelper::GetYmczDmg(owner, float dmg = SkillHelper::GetYmczDmg(owner,
enemy, enemy,
@ -171,7 +171,7 @@ void SprintBuff::ProcSkill()
{ {
if (skill_meta) { if (skill_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_YMCZ: case MAGIC_20901:
{ {
owner->room->xtimer.ModifyTime owner->room->xtimer.ModifyTime
(remover_timer, (remover_timer,

2
server/gameserver/bullet.cc
View File

@ -648,7 +648,7 @@ void Bullet::OnStrengthen(Obstacle* ob)
const mt::Skill* skill_meta = room_ob->skill_meta; const mt::Skill* skill_meta = room_ob->skill_meta;
if (skill_meta && skill_meta->_number_meta) { if (skill_meta && skill_meta->_number_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_WLFB: case MAGIC_20601:
{ {
strengthen_wall = skill_meta->_number_meta->_float_ratio2; strengthen_wall = skill_meta->_number_meta->_float_ratio2;
} }

40
server/gameserver/constant.h
View File

@ -442,27 +442,27 @@ enum SamplePolyFlags
enum MagicType_e enum MagicType_e
{ {
MAGIC_NONE = 0, MAGIC_NONE = 0,
MAGIC_AXXF, //20101 爱心香风 MAGIC_20101, //20101 爱心香风
MAGIC_SJYDHX, //20701 瞬间移动回血 MAGIC_20701, //20701 瞬间移动回血
MAGIC_HLYZ, //20801 火力压制 MAGIC_20801, //20801 火力压制
MAGIC_YMCZ, //20901 野蛮冲撞 MAGIC_20901, //20901 野蛮冲撞
MAGIC_LDFY, //21001 立盾防御 MAGIC_21001, //21001 立盾防御
MAGIC_HJHX, //20201 火箭浣熊 MAGIC_20201, //20201 火箭浣熊
MAGIC_FG, //20401 飞勾 MAGIC_20401, //20401 飞勾
MAGIC_WLFB, //20601 威力翻倍 MAGIC_20601, //20601 威力翻倍
MAGIC_YLZ, //20301 医疗站 MAGIC_20301, //20301 医疗站
MAGIC_YS, //20501 隐身 MAGIC_20501, //20501 隐身
MAGIC_SJXY, //30101 射击眩晕 MAGIC_30101, //30101 自然恢复
MAGIC_SSJS, //30201 受伤加速 MAGIC_30201, //30201 受伤加速
MAGIC_JSHX, //30301 击杀回血 MAGIC_30301, //30301 击杀回血
MAGIC_SWZB, //30401 死亡自曝 MAGIC_30401, //30401 死亡自曝
MAGIC_CMXD, //30501 此面向敌 MAGIC_30501, //30501 此面向敌
MAGIC_MYXY, //30601 免疫眩晕 MAGIC_30601, //30601 免疫眩晕
MAGIC_GZJS, //30701 钩爪拉动减伤 MAGIC_30701, //30701 钩爪拉动减伤
MAGIC_JYFH, //30801 救援防护 MAGIC_30801, //30801 救援防护
MAGIC_FH, //30901 复活 MAGIC_30901, //30901 复活
MAGIC_YSHF, //31001 隐身恢复 MAGIC_31001, //31001 隐身恢复
MAGIC_END MAGIC_END
}; };

2
server/gameserver/creature.cc
View File

@ -1439,7 +1439,7 @@ void Creature::SummonObstacle(Buff* buff, int id, const Position& target_pos)
Position pos = target_pos; Position pos = target_pos;
if (buff->skill_meta) { if (buff->skill_meta) {
switch (buff->skill_meta->GetMagicId()) { switch (buff->skill_meta->GetMagicId()) {
case MAGIC_WLFB: case MAGIC_20601:
{ {
if (!GlmHelper::IsZero(GetAttackDir())) { if (!GlmHelper::IsZero(GetAttackDir())) {
// 999 // 999

2
server/gameserver/roomobstacle.cc
View File

@ -787,7 +787,7 @@ void RoomObstacle::ActiveMedicalStation()
if (!skill_meta || !skill_meta->_number_meta) { if (!skill_meta || !skill_meta->_number_meta) {
return; return;
} }
if (skill_meta->GetMagicId() != MAGIC_YLZ) { if (skill_meta->GetMagicId() != MAGIC_20301) {
return; return;
} }
scale = 1.0f; scale = 1.0f;

4
server/gameserver/shot.cc
View File

@ -499,8 +499,8 @@ 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_AXXF || (skill_meta->GetMagicId() == MAGIC_20101 ||
skill_meta->GetMagicId() == MAGIC_HJHX) skill_meta->GetMagicId() == MAGIC_20201)
) { ) {
bullet_info.trace_target_uniid = c->GetSkillTargetId(); bullet_info.trace_target_uniid = c->GetSkillTargetId();
} }

34
server/gameserver/skill.cc
View File

@ -250,52 +250,52 @@ void Skill::InitActiveSkill()
void Skill::InitPassiveSkill() void Skill::InitPassiveSkill()
{ {
switch (meta->GetMagicId()) { switch (meta->GetMagicId()) {
case MAGIC_SJXY: case MAGIC_30101:
{ {
ProcSJXY(); ProcSJXY();
} }
break; break;
case MAGIC_SSJS: case MAGIC_30201:
{ {
ProcSSJS(); ProcSSJS();
} }
break; break;
case MAGIC_JSHX: case MAGIC_30301:
{ {
ProcJSHX(); ProcJSHX();
} }
break; break;
case MAGIC_SWZB: case MAGIC_30401:
{ {
ProcSWZB(); ProcSWZB();
} }
break; break;
case MAGIC_CMXD: case MAGIC_30501:
{ {
ProcCMXD(); ProcCMXD();
} }
break; break;
case MAGIC_MYXY: case MAGIC_30601:
{ {
ProcMYXY(); ProcMYXY();
} }
break; break;
case MAGIC_GZJS: case MAGIC_30701:
{ {
ProcGZJS(); ProcGZJS();
} }
break; break;
case MAGIC_JYFH: case MAGIC_30801:
{ {
ProcJYFH(); ProcJYFH();
} }
break; break;
case MAGIC_FH: case MAGIC_30901:
{ {
ProcFH(); ProcFH();
} }
break; break;
case MAGIC_YSHF: case MAGIC_31001:
{ {
ProcYSHF(); ProcYSHF();
} }
@ -441,7 +441,7 @@ void Skill::ProcJSHX()
} }
#if 0 #if 0
if (!owner->GetCurrWeapon()->skill_meta || if (!owner->GetCurrWeapon()->skill_meta ||
owner->GetCurrWeapon()->skill_meta->GetMagicId() != MAGIC_HLYZ) { owner->GetCurrWeapon()->skill_meta->GetMagicId() != MAGIC_20801) {
return; return;
} }
#endif #endif
@ -695,7 +695,7 @@ void Skill::ProcMYXY()
(const a8::Args& args) (const a8::Args& args)
{ {
Skill* skill = args.Get<Skill*>(0); Skill* skill = args.Get<Skill*>(0);
if (skill->meta->GetMagicId() != MAGIC_HJHX) { if (skill->meta->GetMagicId() != MAGIC_20201) {
return; return;
} }
owner->GetAbility()->AddSpeedAddition(speed_rate); owner->GetAbility()->AddSpeedAddition(speed_rate);
@ -746,7 +746,7 @@ void Skill::ProcGZJS()
(const a8::Args& args) mutable (const a8::Args& args) mutable
{ {
Bullet* bullet = args.Get<Bullet*>(0); Bullet* bullet = args.Get<Bullet*>(0);
if (!bullet->skill_meta || bullet->skill_meta->GetMagicId() != MAGIC_FG) { if (!bullet->skill_meta || bullet->skill_meta->GetMagicId() != MAGIC_20401) {
return; return;
} }
if (!dmg_ruduce_timer.expired()) { if (!dmg_ruduce_timer.expired()) {
@ -996,7 +996,7 @@ void Skill::ProcSpecDirShotPhase(const mt::SkillPhase* phase)
if (std::abs(owner->skill_dir_.x) > FLT_EPSILON || if (std::abs(owner->skill_dir_.x) > FLT_EPSILON ||
std::abs(owner->skill_dir_.y) > FLT_EPSILON) { std::abs(owner->skill_dir_.y) > FLT_EPSILON) {
float target_distance = 5; float target_distance = 5;
if (meta->GetMagicId() == MAGIC_FG) { if (meta->GetMagicId() == MAGIC_20401) {
target_distance = meta->_number_meta->_float_range; target_distance = meta->_number_meta->_float_range;
} }
if (weapon_meta->equip_type() == EQUIP_TYPE_THROW && if (weapon_meta->equip_type() == EQUIP_TYPE_THROW &&
@ -1020,12 +1020,12 @@ void Skill::ProcSpecDirShotPhase(const mt::SkillPhase* phase)
}, },
&xtimer_attacher); &xtimer_attacher);
} }
if (meta->GetMagicId() == MAGIC_YLZ) { if (meta->GetMagicId() == MAGIC_20301) {
target_distance = std::max(0.0001f, target_distance); target_distance = std::max(0.0001f, target_distance);
} }
if (bullet_meta && target_distance > 0.00001f) { if (bullet_meta && target_distance > 0.00001f) {
int target_id = 0; int target_id = 0;
if (meta->GetMagicId() == MAGIC_HJHX) { if (meta->GetMagicId() == MAGIC_20201) {
target_distance = 0; target_distance = 0;
owner->TryAddBuff(owner, 202013); owner->TryAddBuff(owner, 202013);
owner->TryAddBuff(owner, 202014); owner->TryAddBuff(owner, 202014);
@ -1063,7 +1063,7 @@ void Skill::ProcNormalShotPhase(const mt::SkillPhase* phase)
if (entity) { if (entity) {
float target_distance = entity->GetPos().Distance2D2(owner->GetPos()); float target_distance = entity->GetPos().Distance2D2(owner->GetPos());
if (bullet_meta && target_distance > 0.00001f) { if (bullet_meta && target_distance > 0.00001f) {
if (meta->GetMagicId() == MAGIC_HJHX) { if (meta->GetMagicId() == MAGIC_20201) {
owner->TryAddBuff(owner, 202013); owner->TryAddBuff(owner, 202013);
owner->TryAddBuff(owner, 202014); owner->TryAddBuff(owner, 202014);
} }

50
server/gameserver/skillhelper.cc
View File

@ -21,103 +21,103 @@ 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_AXXF: case MAGIC_20101:
{ {
return 20101; return 20101;
} }
break; break;
case MAGIC_SJYDHX: case MAGIC_20701:
{ {
return 20701; return 20701;
} }
break; break;
case MAGIC_HLYZ: case MAGIC_20801:
{ {
return 20801; return 20801;
} }
break; break;
case MAGIC_YMCZ: case MAGIC_20901:
{ {
return 20901; return 20901;
} }
break; break;
case MAGIC_LDFY: case MAGIC_21001:
{ {
return 21001; return 21001;
} }
break; break;
case MAGIC_HJHX: case MAGIC_20201:
{ {
return 20201; return 20201;
} }
break; break;
case MAGIC_FG: case MAGIC_20401:
{ {
return 20401; return 20401;
} }
break; break;
case MAGIC_WLFB: case MAGIC_20601:
{ {
return 20601; return 20601;
} }
break; break;
case MAGIC_YLZ: case MAGIC_20301:
{ {
return 20301; return 20301;
} }
break; break;
case MAGIC_YS: case MAGIC_20501:
{ {
return 20501; return 20501;
} }
break; break;
case MAGIC_SJXY: case MAGIC_30101:
{ {
return 30101; return 30101;
} }
break; break;
case MAGIC_SSJS: case MAGIC_30201:
{ {
return 30701; return 30701;
} }
break; break;
case MAGIC_JSHX: case MAGIC_30301:
{ {
return 30801; return 30801;
} }
break; break;
case MAGIC_SWZB: case MAGIC_30401:
{ {
return 30901; return 30901;
} }
break; break;
case MAGIC_CMXD: case MAGIC_30501:
{ {
return 31001; return 31001;
} }
break; break;
case MAGIC_MYXY: case MAGIC_30601:
{ {
return 30201; return 30201;
} }
break; break;
case MAGIC_GZJS: case MAGIC_30701:
{ {
return 30401; return 30401;
} }
break; break;
case MAGIC_JYFH: case MAGIC_30801:
{ {
return 30601; return 30601;
} }
break; break;
case MAGIC_FH: case MAGIC_30901:
{ {
return 30301; return 30301;
} }
break; break;
case MAGIC_YSHF: case MAGIC_31001:
{ {
return 30501; return 30501;
} }
@ -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_AXXF: case MAGIC_20101:
{ {
if (buff->meta->buff_effect() == kBET_Vertigo) { if (buff->meta->buff_effect() == kBET_Vertigo) {
c->room->xtimer.ModifyTime c->room->xtimer.ModifyTime
@ -347,8 +347,8 @@ bool SkillHelper::ProcBulletDmg(IBullet* bullet, Creature* target, float& finaly
return false; return false;
} }
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_AXXF: case MAGIC_20101:
case MAGIC_FG: case MAGIC_20401:
{ {
finaly_dmg = finaly_dmg =
(skill_meta->_number_meta->_float_ratio + (skill_meta->_number_meta->_float_ratio +
@ -389,8 +389,8 @@ void SkillHelper::ProcSummonObstacle(const mt::Skill* skill_meta, RoomObstacle*
return; return;
} }
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_WLFB: case MAGIC_20601:
case MAGIC_YLZ: case MAGIC_20301:
{ {
if (!ob->life_time_timer.expired()) { if (!ob->life_time_timer.expired()) {
ob->room->xtimer.ModifyTime(ob->life_time_timer, ob->room->xtimer.ModifyTime(ob->life_time_timer,

2
server/gameserver/virtualbullet.cc
View File

@ -182,7 +182,7 @@ void VirtualBullet::OnStrengthen(Obstacle* ob)
const mt::Skill* skill_meta = room_ob->skill_meta; const mt::Skill* skill_meta = room_ob->skill_meta;
if (skill_meta && skill_meta->_number_meta) { if (skill_meta && skill_meta->_number_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_WLFB: case MAGIC_20601:
{ {
strengthen_wall = skill_meta->_number_meta->_float_ratio2; strengthen_wall = skill_meta->_number_meta->_float_ratio2;
} }