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 2022-09-30 10:10:21 +08:00
parent c73977c617
commit 8eb6737d43
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/constant.h
View File

@ -560,5 +560,3 @@ const int MAP_BLOCK_START_ID = 1000000000;
const int ANDROID_AI_ID_START = 10001;
const int MAX_SKILL_LV = 15;
const int DOUBLE_GUN_ANIMATION = 4;

6
server/gameserver/creature.cc
View File

@ -153,7 +153,7 @@ static void CalcGunMuzzlePosition(Creature* c,
int bulletNum)
{
if (shot_animi) {
if (weapon_meta->i->shootfire() == DOUBLE_GUN_ANIMATION &&
if (weapon_meta->i->double_gun()&&
bulletIdx > (int)(bulletNum / 2)) {
gun_muzzle_position +=
glm::vec4(
@ -163,7 +163,7 @@ static void CalcGunMuzzlePosition(Creature* c,
0
);
} else {
if (c->IsCar() && weapon_meta->i->shootfire() != DOUBLE_GUN_ANIMATION) {
if (c->IsCar() && !weapon_meta->i->double_gun()) {
switch (c->shot_hole) {
case 1:
{
@ -377,7 +377,7 @@ void InternalShot(Creature* c,
skill_meta->GetMagicId() == MAGIC_HJHX)) {
bullet_info->trace_target_uniid = c->GetSkillTargetId();
}
if (weapon_meta->i->shootfire() == DOUBLE_GUN_ANIMATION &&
if (weapon_meta->i->double_gun() &&
bulletIdx > (int)(bulletNum / 2)) {
bullet_info->hand = 1;
}

2
server/tools/protobuild/metatable.proto
View File

@ -201,6 +201,8 @@ message Equip
optional int32 auto_trace = 76;
optional int32 trace_range = 77;
optional int32 double_gun = 78;
}
message EquipUpgrade