1
This commit is contained in:
parent
054b78f9e1
commit
501cbb8f03
@ -419,6 +419,8 @@ class Creature : public MoveableEntity
|
|||||||
bool IsOb();
|
bool IsOb();
|
||||||
bool HaveBallingEnemy();
|
bool HaveBallingEnemy();
|
||||||
virtual void SyncServerPos(int reason);
|
virtual void SyncServerPos(int reason);
|
||||||
|
virtual bool IsClientMove() { return false;};
|
||||||
|
virtual std::shared_ptr<glm::vec3> GetClientCurrPos() { return nullptr;};
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void OnBuffRemove(Buff& buff);
|
virtual void OnBuffRemove(Buff& buff);
|
||||||
|
@ -299,6 +299,8 @@ class Human : public Creature
|
|||||||
void SetIpSaddr(long ip_saddr);
|
void SetIpSaddr(long ip_saddr);
|
||||||
int GetHeroQuality();
|
int GetHeroQuality();
|
||||||
void SetHeroQuality(int quality);
|
void SetHeroQuality(int quality);
|
||||||
|
virtual bool IsClientMove() override { return is_client_move;};
|
||||||
|
virtual std::shared_ptr<glm::vec3> GetClientCurrPos() override { return current_pos_;};
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void ProcLootWeapon(AddItemDTO& dto);
|
void ProcLootWeapon(AddItemDTO& dto);
|
||||||
@ -402,6 +404,7 @@ private:
|
|||||||
long long jump_frameno_ = 0;
|
long long jump_frameno_ = 0;
|
||||||
float old_sync_speed = 0;
|
float old_sync_speed = 0;
|
||||||
std::map<int, long long> attacker_hash_;
|
std::map<int, long long> attacker_hash_;
|
||||||
|
std::shared_ptr<glm::vec3> current_pos_;
|
||||||
|
|
||||||
friend class PBUtils;
|
friend class PBUtils;
|
||||||
};
|
};
|
||||||
|
@ -151,7 +151,7 @@ class Player : public Human
|
|||||||
void _CMMobaBattleData(f8::MsgHdr* hdr, const cs::CMMobaBattleData& msg);
|
void _CMMobaBattleData(f8::MsgHdr* hdr, const cs::CMMobaBattleData& msg);
|
||||||
virtual void SetAttackDir(const glm::vec3& attack_dir) override;
|
virtual void SetAttackDir(const glm::vec3& attack_dir) override;
|
||||||
void AsyncRequestWatchWar(bool send_rsp_msg);
|
void AsyncRequestWatchWar(bool send_rsp_msg);
|
||||||
void SyncServerPos(int reason) override;
|
virtual void SyncServerPos(int reason) override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Player();
|
Player();
|
||||||
@ -168,7 +168,6 @@ private:
|
|||||||
a8::XTimerWp watch_war_req_timer_;
|
a8::XTimerWp watch_war_req_timer_;
|
||||||
|
|
||||||
glm::vec3 move_target_pos_ = GlmHelper::ZERO;
|
glm::vec3 move_target_pos_ = GlmHelper::ZERO;
|
||||||
glm::vec3 current_pos_ = GlmHelper::ZERO;
|
|
||||||
|
|
||||||
#ifdef MYDEBUG
|
#ifdef MYDEBUG
|
||||||
std::vector<int> last_interaction_objids_;
|
std::vector<int> last_interaction_objids_;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user