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-25 08:15:57 +08:00
parent 516395a014
commit 29c5e099cb
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/bullet.h
View File

@ -7,7 +7,7 @@ namespace MetaData
{ {
struct Player; struct Player;
struct Equip; struct Equip;
struct EquipUpgrade; struct Skill;
} }
class Human; class Human;
@ -23,8 +23,8 @@ class Bullet : public MoveableEntity
long long weapon_uniid = 0; long long weapon_uniid = 0;
int gun_lv = 0; int gun_lv = 0;
MetaData::Equip* gun_meta = nullptr; MetaData::Equip* gun_meta = nullptr;
MetaData::EquipUpgrade* gun_upgrade_meta = nullptr;
MetaData::Equip* meta = nullptr; MetaData::Equip* meta = nullptr;
MetaData::Skill* skill_meta = nullptr;
CreatureWeakPtr sender; CreatureWeakPtr sender;
CreatureWeakPtr passenger; CreatureWeakPtr passenger;
a8::Vec2 dir; a8::Vec2 dir;

3
server/gameserver/creature.cc
View File

@ -30,6 +30,7 @@ struct BulletInfo
long long weapon_uniid = 0; long long weapon_uniid = 0;
MetaData::Equip* weapon_meta = nullptr; MetaData::Equip* weapon_meta = nullptr;
MetaData::Equip* bullet_meta = nullptr; MetaData::Equip* bullet_meta = nullptr;
MetaData::Skill* skill_meta = nullptr;
a8::Vec2 bullet_born_pos; a8::Vec2 bullet_born_pos;
a8::Vec2 bullet_dir; a8::Vec2 bullet_dir;
float fly_distance = 0; float fly_distance = 0;
@ -82,6 +83,7 @@ static void InternalCreateBullet(BulletInfo& bullet_info)
c->shot_passenger, c->shot_passenger,
bullet_info.weapon_meta, bullet_info.weapon_meta,
bullet_info.bullet_meta, bullet_info.bullet_meta,
bullet_info.skill_meta,
bullet_info.bullet_born_pos, bullet_info.bullet_born_pos,
bullet_info.bullet_dir, bullet_info.bullet_dir,
bullet_info.fly_distance, bullet_info.fly_distance,
@ -340,6 +342,7 @@ void InternalShot(Creature* c,
bullet_info.c = c->GetWeakPtrRef(); bullet_info.c = c->GetWeakPtrRef();
bullet_info.weapon_uniid = weapon_uniid; bullet_info.weapon_uniid = weapon_uniid;
bullet_info.weapon_meta = weapon_meta; bullet_info.weapon_meta = weapon_meta;
bullet_info.skill_meta = skill_meta;
bullet_info.bullet_meta = bullet_meta; bullet_info.bullet_meta = bullet_meta;
bullet_info.bullet_born_pos = bullet_born_pos; bullet_info.bullet_born_pos = bullet_born_pos;
bullet_info.bullet_dir = bullet_dir; bullet_info.bullet_dir = bullet_dir;

2
server/gameserver/room.cc
View File

@ -591,6 +591,7 @@ int Room::CreateBullet(Creature* sender,
Creature* passenger, Creature* passenger,
MetaData::Equip* weapon_meta, MetaData::Equip* weapon_meta,
MetaData::Equip* bullet_meta, MetaData::Equip* bullet_meta,
MetaData::Skill* skill_meta,
a8::Vec2 pos, a8::Vec2 pos,
a8::Vec2 dir, a8::Vec2 dir,
float fly_distance, float fly_distance,
@ -608,6 +609,7 @@ int Room::CreateBullet(Creature* sender,
bullet->weapon_uniid = weapon_uniid; bullet->weapon_uniid = weapon_uniid;
bullet->gun_meta = weapon_meta; bullet->gun_meta = weapon_meta;
bullet->meta = bullet_meta; bullet->meta = bullet_meta;
bullet->skill_meta = skill_meta;
bullet->SetPos(pos); bullet->SetPos(pos);
bullet->dir = dir; bullet->dir = dir;
bullet->born_pos = pos; bullet->born_pos = pos;

2
server/gameserver/room.h
View File

@ -20,6 +20,7 @@ namespace MetaData
struct Player; struct Player;
struct PveGeminiMode; struct PveGeminiMode;
struct PveGemini; struct PveGemini;
struct Skill;
} }
namespace metatable namespace metatable
@ -165,6 +166,7 @@ public:
Creature* passenger, Creature* passenger,
MetaData::Equip* weapon_meta, MetaData::Equip* weapon_meta,
MetaData::Equip* bullet_meta, MetaData::Equip* bullet_meta,
MetaData::Skill* skill_meta,
a8::Vec2 pos, a8::Vec2 pos,
a8::Vec2 dir, a8::Vec2 dir,
float fly_distance, float fly_distance,