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-10-26 14:32:40 +08:00
parent 8b8e735a88
commit 2bd04c0374
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/gameserver/creature.cc
View File

@ -884,7 +884,7 @@ bool Creature::InternalCanUseSkill(Skill* skill)
return false; return false;
} }
#endif #endif
if (skill->GetCurrTimes() <= 0) { if (!(skill->GetCurrTimes() > 0 || skill->GetMinorType() != SMT_NONE)) {
return false; return false;
} }
if (room->GetGasData().GetGasMode() == GasInactive) { if (room->GetGasData().GetGasMode() == GasInactive) {
@ -928,13 +928,20 @@ void Creature::DoSkill(int skill_id,
float skill_distance float skill_distance
) )
{ {
#ifdef DEBUG
if (IsPlayer()) {
a8::XPrintf("DoSkill skill_id:%d\n", {skill_id});
}
#endif
if (room->HasRoomSwitch(kRoomSwitchDisableUseSkill)) { if (room->HasRoomSwitch(kRoomSwitchDisableUseSkill)) {
return; return;
} }
Skill* skill = GetSkill(skill_id); Skill* skill = GetSkill(skill_id);
if (skill && CanUseSkill(skill_id)) { if (skill && CanUseSkill(skill_id)) {
#ifdef DEBUG1 #ifdef DEBUG
if (IsPlayer()) {
a8::XPrintf("DoSkill minor_type:%d\n", {skill->GetMinorType()}); a8::XPrintf("DoSkill minor_type:%d\n", {skill->GetMinorType()});
}
#endif #endif
RemoveBuffByEffectId(kBET_Hide); RemoveBuffByEffectId(kBET_Hide);
if (!nature_recover_hp_idle_timer.expired()) { if (!nature_recover_hp_idle_timer.expired()) {

2
server/gameserver/shot.cc
View File

@ -505,7 +505,7 @@ void InternalShot(Creature* c,
bullet_born_offset = glm::vec3(v.z *10*1, v.y, v.x*10*-1); bullet_born_offset = glm::vec3(v.z *10*1, v.y, v.x*10*-1);
bullet_born_pos = c->GetPos().ToGlmVec3() + bullet_born_offset; bullet_born_pos = c->GetPos().ToGlmVec3() + bullet_born_offset;
if (c->IsPlayer() || c->IsCar()) { if (c->IsPlayer() || c->IsCar()) {
#ifdef DEBUG1 #ifdef DEBUG
a8::XPrintf("idx:%d offset:%f,%f,%f angle:%f old_angle:%f angle_xyz:%f,%f,%f %f %f gun_muzzle_position:%f,%f,%f pos:%f,%f,%f gun_id:%d t:%d\n", a8::XPrintf("idx:%d offset:%f,%f,%f angle:%f old_angle:%f angle_xyz:%f,%f,%f %f %f gun_muzzle_position:%f,%f,%f pos:%f,%f,%f gun_id:%d t:%d\n",
{ {
bulletIdx, bulletIdx,