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

1

Browse Source
This commit is contained in:
aozhiwei 2021-03-15 13:38:47 +08:00
parent 438ea6eec3
commit f98124ec0a
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/constant.h
View File

@ -399,5 +399,7 @@ const int TERMINATOR_BUFF_ID = 1033;
const int TURN_OVER_SKILL_ID = 41001; const int TURN_OVER_SKILL_ID = 41001;
const int HUNLUAN_BUFFID = 6001; const int HUNLUAN_BUFFID = 6001;
const int kThroughWall_BUFFID = 6003;
const int FLY_BUFFID = 7001; const int FLY_BUFFID = 7001;
const int JUMP_BUFFID = 7002; const int JUMP_BUFFID = 7002;

7
server/gameserver/human.cc
View File

@ -1351,11 +1351,14 @@ void Human::DoJump()
{ {
if (HasBuffEffect(kBET_Fly)) { if (HasBuffEffect(kBET_Fly)) {
RemoveBuffByEffectId(kBET_Fly); RemoveBuffByEffectId(kBET_Fly);
MustBeAddBuff(this, kThroughWall_BUFFID);
MustBeAddBuff(this, JUMP_BUFFID); MustBeAddBuff(this, JUMP_BUFFID);
jump_frameno_ = room->GetFrameNo(); jump_frameno_ = room->GetFrameNo();
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(JUMP_BUFFID);
if (buff_meta) {
room->xtimer.AddDeadLineTimerAndAttach room->xtimer.AddDeadLineTimerAndAttach
(MetaMgr::Instance()->jump_time * SERVER_FRAME_RATE, (buff_meta->i->duration_time() * SERVER_FRAME_RATE,
a8::XParams() a8::XParams()
.SetSender(this), .SetSender(this),
[] (const a8::XParams& param) [] (const a8::XParams& param)
@ -1366,6 +1369,7 @@ void Human::DoJump()
&xtimer_attacher.timer_list_); &xtimer_attacher.timer_list_);
} }
} }
}
void Human::DoSkill() void Human::DoSkill()
{ {
@ -4280,6 +4284,7 @@ void Human::OnBuffRemove(const Buff& buff)
void Human::OnLand() void Human::OnLand()
{ {
//着陆 //着陆
RemoveBuffByEffectId(kBET_Jump);
RemoveBuffByEffectId(kBET_ThroughWall); RemoveBuffByEffectId(kBET_ThroughWall);
if (IsCollisionInMapService()) { if (IsCollisionInMapService()) {
a8::Vec2 old_pos = GetPos(); a8::Vec2 old_pos = GetPos();

1
server/gameserver/metamgr.cc
View File

@ -180,7 +180,6 @@ public:
} }
} }
MetaMgr::Instance()->jump_time = MetaMgr::Instance()->GetSysParamAsFloat("jump_time");
MetaMgr::Instance()->K = MetaMgr::Instance()->GetSysParamAsFloat("K"); MetaMgr::Instance()->K = MetaMgr::Instance()->GetSysParamAsFloat("K");
MetaMgr::Instance()->kill_param = MetaMgr::Instance()->GetSysParamAsFloat("kill_parameter"); MetaMgr::Instance()->kill_param = MetaMgr::Instance()->GetSysParamAsFloat("kill_parameter");
MetaMgr::Instance()->rank_param = MetaMgr::Instance()->GetSysParamAsFloat("rank_parameter"); MetaMgr::Instance()->rank_param = MetaMgr::Instance()->GetSysParamAsFloat("rank_parameter");

1
server/gameserver/metamgr.h
View File

@ -61,7 +61,6 @@ class MetaMgr : public a8::Singleton<MetaMgr>
int zbmode_game_duration = 60 * 2; int zbmode_game_duration = 60 * 2;
int zbmode_player_num = 15; int zbmode_player_num = 15;
int zbmode_init_zombie_num = 2; int zbmode_init_zombie_num = 2;
int jump_time = 10;
float K = 100.0f; float K = 100.0f;
float kill_param = 0.0f; float kill_param = 0.0f;
float rank_param = 0.0f; float rank_param = 0.0f;