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

修复翻滚时打断问题

Browse Source
This commit is contained in:
aozhiwei 2020-03-06 10:34:41 +08:00
parent 5a8b867fd7
commit 389352d59f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/human.cc
View File

@ -1038,7 +1038,9 @@ bool Human::CanUseSkill()
void Human::DoSkill() void Human::DoSkill()
{ {
if (action_type == AT_Relive) { if (action_type == AT_Reload ||
action_type == AT_UseItem
) {
CancelAction(); CancelAction();
} }
if (CanUseSkill()) { if (CanUseSkill()) {
@ -2385,7 +2387,7 @@ void Human::RandSkin()
void Human::AddSkin(int skin_id) void Human::AddSkin(int skin_id)
{ {
if (skins.size() < 3) { if (skins.size() < 4) {
Skin& skin = a8::FastAppend(skins); Skin& skin = a8::FastAppend(skins);
skin.skin_id = skin_id; skin.skin_id = skin_id;
skin.skin_lv = 1; skin.skin_lv = 1;