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-18 19:10:10 +08:00
parent ba5229b31e
commit 5591cf792f
5 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/creature.cc
View File

@ -376,9 +376,6 @@ void Creature::DoSkillPostProc(bool used, int skill_id, int target_id, const a8:
void Creature::ResetSkill() void Creature::ResetSkill()
{ {
#if 0
use_skill = false;
#endif
curr_skill_phase = 0; curr_skill_phase = 0;
skill_dir = a8::Vec2(); skill_dir = a8::Vec2();
skill_target_pos_ = a8::Vec2(); skill_target_pos_ = a8::Vec2();

3
server/gameserver/creature.h
View File

@ -61,9 +61,6 @@ protected:
int skill_target_id_ = 0; int skill_target_id_ = 0;
a8::Vec2 skill_target_pos_; a8::Vec2 skill_target_pos_;
#if 0
long long last_use_skill_frameno_ = 0;
#endif
a8::XTimerAttacher skill_xtimer_attacher_; a8::XTimerAttacher skill_xtimer_attacher_;
MetaData::Skill* skill_meta_ = nullptr; MetaData::Skill* skill_meta_ = nullptr;

34
server/gameserver/human.cc
View File

@ -25,6 +25,7 @@
#include "roomobstacle.h" #include "roomobstacle.h"
#include "aicomponent.h" #include "aicomponent.h"
#include "jsondatamgr.h" #include "jsondatamgr.h"
#include "skill.h"
#include "framework/cpp/utils.h" #include "framework/cpp/utils.h"
#include "framework/cpp/httpclientpool.h" #include "framework/cpp/httpclientpool.h"
@ -1547,19 +1548,6 @@ void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data)
player_data->set_max_energy_shield(max_energy_shield); player_data->set_max_energy_shield(max_energy_shield);
} }
#endif #endif
#if 0
if (skill_meta) {
if (last_use_skill_frameno_ == 0) {
player_data->set_skill_left_time(0);
player_data->set_skill_cd_time(skill_meta->i->cd_time() * 1000);
} else {
int passed_time = (room->GetFrameNo() - last_use_skill_frameno_) * FRAME_RATE_MS;
int skill_left_time = std::max(0, skill_meta->i->cd_time() * 1000 - passed_time);
player_data->set_skill_left_time(skill_left_time);
player_data->set_skill_cd_time(skill_meta->i->cd_time() * 1000);
}
}
#endif
FillBodyState(player_data->mutable_states()); FillBodyState(player_data->mutable_states());
FillItemList(player_data->mutable_items()); FillItemList(player_data->mutable_items());
} }
@ -2979,17 +2967,17 @@ void Human::AddBuffPostProc(Creature* caster, Buff* buff)
break; break;
case kBET_TurnOver: case kBET_TurnOver:
{ {
MetaData::SkillPhase* phase = GetCurrSkillPhase(); Skill* skill = CurrentSkill();
#if 0 if (skill) {
if (phase && MetaData::SkillPhase* phase = GetCurrSkillPhase();
phase->time_offset >= (int)((room->GetFrameNo() - last_use_skill_frameno_) * FRAME_RATE_MS)) { if (phase && phase->time_offset >= skill->GetLeftTime()) {
if (HasBuffEffect(kBET_Car)) { if (HasBuffEffect(kBET_Car)) {
_UpdateMove(phase->param1.GetDouble() * 1.5); _UpdateMove(phase->param1.GetDouble() * 1.5);
} else { } else {
_UpdateMove(phase->param1); _UpdateMove(phase->param1);
}
} }
} }
#endif
} }
break; break;
case kBET_Camouflage: case kBET_Camouflage:
@ -3948,7 +3936,7 @@ void Human::DoSkillPreProc(int skill_id, int target_id, const a8::Vec2& target_p
void Human::DoSkillPostProc(bool used, int skill_id, int target_id, const a8::Vec2& target_pos) void Human::DoSkillPostProc(bool used, int skill_id, int target_id, const a8::Vec2& target_pos)
{ {
if (used) { if (used) {
++stats.use_skill_times; ++stats.skill_times;
#if 0 #if 0
room->frame_event.AddSkillCdChg(this); room->frame_event.AddSkillCdChg(this);
#endif #endif

2
server/gameserver/human.h
View File

@ -378,8 +378,6 @@ private:
Entity* last_collision_door_ = nullptr; Entity* last_collision_door_ = nullptr;
long long jump_frameno_ = 0; long long jump_frameno_ = 0;
bool use_skill = false;
friend class FrameMaker; friend class FrameMaker;
friend class FrameEvent; friend class FrameEvent;
}; };

2
server/gameserver/types.h
View File

@ -87,7 +87,7 @@ struct PlayerStats
int weapon_id = 0; int weapon_id = 0;
int rank = 0; int rank = 0;
int use_skill_times = 0; int skill_times = 0;
int dead_times = 0; int dead_times = 0;
}; };