This commit is contained in:
aozhiwei 2023-05-19 22:35:17 +08:00
parent becb44661d
commit 03bbbc3b0f
2 changed files with 9 additions and 0 deletions

View File

@ -849,6 +849,9 @@ void Creature::DoSkill(int skill_id,
float skill_distance float skill_distance
) )
{ {
if (room->HasRoomSwitch(kRoomSwitchDisableUseSkill)) {
return;
}
Skill* skill = GetSkill(skill_id); Skill* skill = GetSkill(skill_id);
if (skill && CanUseSkill(skill_id)) { if (skill && CanUseSkill(skill_id)) {
#ifdef DEBUG1 #ifdef DEBUG1
@ -2289,6 +2292,9 @@ void Creature::UpdateMove()
if (GetDisableMoveTimes() > 0) { if (GetDisableMoveTimes() > 0) {
return; return;
} }
if (room->HasRoomSwitch(kRoomSwitchDisableMove)) {
return;
}
{ {
Buff* hide_buff = GetBuffByEffectId(kBET_Hide); Buff* hide_buff = GetBuffByEffectId(kBET_Hide);
if (hide_buff && hide_buff->meta->_int_buff_param1 > 0) { if (hide_buff && hide_buff->meta->_int_buff_param1 > 0) {

View File

@ -450,6 +450,9 @@ void Player::UpdateCancelAction()
void Player::UpdateUseItemIdx() void Player::UpdateUseItemIdx()
{ {
if (room->HasRoomSwitch(kRoomSwitchDisableUseItem)) {
return;
}
#if 0 #if 0
if (use_item_idx == 24) { if (use_item_idx == 24) {
use_item_idx = IS_SHEN_BAO; use_item_idx = IS_SHEN_BAO;