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-03-10 18:07:58 +08:00
parent cb5587340c
commit f87e733b56
4 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/CMakeLists.txt
View File

@ -15,7 +15,7 @@ set(LIB_DIR "ubuntu20.04_g++-9")
message(LIB_DIR: ${LIB_DIR} ) message(LIB_DIR: ${LIB_DIR} )
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DCXY -DSXY -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DCXY -DSXY -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -fsanitize=address -fno-omit-frame-pointer")
include_directories( include_directories(
AFTER AFTER

2
server/gameserver/human.cc
View File

@ -3498,7 +3498,7 @@ void Human::SyncVolume(int slot_id)
[this, i] (int event, const a8::Args* args) [this, i] (int event, const a8::Args* args)
{ {
if (a8::TIMER_EXEC_EVENT == event) { if (a8::TIMER_EXEC_EVENT == event) {
room->frame_event.AddPropChgEx(GetWeakPtrRef(), kPropVolume, i, GetInventory(i), 0, volume_[i], true); room->frame_event.AddPropChgEx(GetWeakPtrRef(), kPropVolume, i, GetInventory(i), volume_[i], 0, true);
} }
}, },
&xtimer_attacher); &xtimer_attacher);

2
server/gameserver/player.cc
View File

@ -1446,6 +1446,7 @@ void Player::ProcPreSettlementInfo(const std::string& pre_settlement_info)
void Player::UpdateAiming() void Player::UpdateAiming()
{ {
if (aiming) { if (aiming) {
if (!HasBuffEffect(kBET_HoldShield)) {
if (aiming_frameno == 0) { if (aiming_frameno == 0) {
aiming_frameno = room->GetFrameNo(); aiming_frameno = room->GetFrameNo();
power_idx = -1; power_idx = -1;
@ -1472,6 +1473,7 @@ void Player::UpdateAiming()
} }
} }
} }
}
} else { } else {
aiming_frameno = 0; aiming_frameno = 0;
power_idx = -1; power_idx = -1;

16
server/gameserver/skill.cc
View File

@ -182,14 +182,6 @@ void Skill::AddMinorMode(
[this] (int event, const a8::Args* args) [this] (int event, const a8::Args* args)
{ {
if (a8::TIMER_EXEC_EVENT == event) { if (a8::TIMER_EXEC_EVENT == event) {
} else if (a8::TIMER_DELETE_EVENT == event) {
minor_type_ = SMT_NONE;
minor_cd_time_ = 0;
minor_frameno_ = 0;
if (minor_cb_) {
minor_cb_(0);
}
minor_cb_ = nullptr;
ResetSkillCd(); ResetSkillCd();
if (owner->IsHuman()) { if (owner->IsHuman()) {
Human* hum = owner->AsHuman(); Human* hum = owner->AsHuman();
@ -205,6 +197,14 @@ void Skill::AddMinorMode(
); );
NotifySkillState(); NotifySkillState();
} }
} else if (a8::TIMER_DELETE_EVENT == event) {
minor_type_ = SMT_NONE;
minor_cd_time_ = 0;
minor_frameno_ = 0;
if (minor_cb_) {
minor_cb_(0);
}
minor_cb_ = nullptr;
} }
}, },
&xtimer_attacher); &xtimer_attacher);