This commit is contained in:
aozhiwei 2024-04-22 20:03:27 +08:00
parent 145b0e76b9
commit eadd44c8be
9 changed files with 10 additions and 19 deletions

View File

@ -296,11 +296,6 @@ float Car::GetRadius()
return hero_meta_->radius(); return hero_meta_->radius();
} }
float Car::GetSpeed()
{
return Creature::GetSpeed();
}
void Car::OnBulletHit(IBullet* bullet) void Car::OnBulletHit(IBullet* bullet)
{ {
if (!IsDead(room)) { if (!IsDead(room)) {

View File

@ -39,7 +39,6 @@ class Car : public Creature
void DecOil(float dec_oil); void DecOil(float dec_oil);
bool HasPassenter() { return !passengers_.empty();}; bool HasPassenter() { return !passengers_.empty();};
virtual float GetRadius() override; virtual float GetRadius() override;
virtual float GetSpeed() override;
virtual void DecHP(float dec_hp, virtual void DecHP(float dec_hp,
int killer_id, const std::string killer_name, int weapon_id, int killer_id, const std::string killer_name, int weapon_id,
int real_killer_id, const std::string real_killer_name, int real_killer_id, const std::string real_killer_name,

View File

@ -3337,6 +3337,12 @@ float Creature::GetSafeAreaRaidus()
} }
float Creature::GetSpeed() float Creature::GetSpeed()
{
float speed = InternalGetSpeed();
return speed;
}
float Creature::InternalGetSpeed()
{ {
const float min_speed = 30.0f; const float min_speed = 30.0f;
const float base_speed = GetHeroMeta()->move_speed(); const float base_speed = GetHeroMeta()->move_speed();

View File

@ -159,7 +159,7 @@ class Creature : public MoveableEntity
virtual const mt::BattleHeroGrow* GetHeroGrowMeta() { return hero_grow_meta_; }; virtual const mt::BattleHeroGrow* GetHeroGrowMeta() { return hero_grow_meta_; };
virtual void FillMFObjectImage(Room* room, Human* hum, cs::MFCharacterImage* image_data) {}; virtual void FillMFObjectImage(Room* room, Human* hum, cs::MFCharacterImage* image_data) {};
virtual void SetPos(Position pos) override; virtual void SetPos(Position pos) override;
virtual float GetSpeed(); float GetSpeed();
virtual void LateUpdate(int delta_time) override; virtual void LateUpdate(int delta_time) override;
std::shared_ptr<Movement> GetMovement() { return movement_; }; std::shared_ptr<Movement> GetMovement() { return movement_; };
bool HasBuffEffect(int buff_effect_id); bool HasBuffEffect(int buff_effect_id);
@ -436,6 +436,7 @@ private:
bool InternalCanUseSkill(Skill* skill); bool InternalCanUseSkill(Skill* skill);
void InternalUseSkill(); void InternalUseSkill();
void GenLevelAttr(); void GenLevelAttr();
float InternalGetSpeed();
protected: protected:
bool need_sync_active_player_ = false; bool need_sync_active_player_ = false;

View File

@ -239,11 +239,6 @@ void Hero::OnBulletHit(IBullet* bullet)
} }
} }
float Hero::GetSpeed()
{
return Creature::GetSpeed();
}
void Hero::UpdateMove() void Hero::UpdateMove()
{ {
Creature::UpdateMove(); Creature::UpdateMove();

View File

@ -34,7 +34,6 @@ public:
virtual std::string GetName() override; virtual std::string GetName() override;
virtual void DropItems(Obstacle* obstacle) override; virtual void DropItems(Obstacle* obstacle) override;
virtual const mt::Hero* GetHeroMeta() override { return meta; }; virtual const mt::Hero* GetHeroMeta() override { return meta; };
virtual float GetSpeed() override;
virtual float GetRadius() override; virtual float GetRadius() override;
virtual float GetHitRadius() override; virtual float GetHitRadius() override;
virtual void OnAddToTargetPartObject(Entity* target) override; virtual void OnAddToTargetPartObject(Entity* target) override;

View File

@ -111,11 +111,6 @@ void Human::Initialize()
SetOxygen(mt::Param::s().dive_oxygen_total); SetOxygen(mt::Param::s().dive_oxygen_total);
} }
float Human::GetSpeed()
{
return Creature::GetSpeed();
}
bool Human::IsDead(Room * room) bool Human::IsDead(Room * room)
{ {
return dead; return dead;

View File

@ -148,7 +148,6 @@ class Human : public Creature
Human(); Human();
virtual ~Human() override; virtual ~Human() override;
virtual void Initialize() override; virtual void Initialize() override;
virtual float GetSpeed() override;
virtual void FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data) override; virtual void FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data) override;
void FillMFObjectLess(Room* room, Human* hum, cs::MFPlayerFull* full_data); void FillMFObjectLess(Room* room, Human* hum, cs::MFPlayerFull* full_data);
virtual void FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data) override; virtual void FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data) override;

View File

@ -1353,6 +1353,8 @@ message MFSettlementNew
optional int32 settlement_status = 12; //0: () 1() optional int32 settlement_status = 12; //0: () 1()
optional int32 custom_battle = 13; // optional int32 custom_battle = 13; //
optional string box_payload = 14; //(,()) optional string box_payload = 14; //(,())
optional int32 map_mode_id = 15; //map模式配置表id
optional int32 map_mode = 16; //map模式配置
optional int32 pvp_settlement_type = 101; //0: 1: optional int32 pvp_settlement_type = 101; //0: 1:
optional int32 pvp_settlement_color = 102; // 0 1 optional int32 pvp_settlement_color = 102; // 0 1