1
This commit is contained in:
parent
5aaee97d08
commit
2823078b69
@ -136,11 +136,6 @@ int Room::AliveCount()
|
|||||||
return alive_count_;
|
return alive_count_;
|
||||||
}
|
}
|
||||||
|
|
||||||
int Room::ActiveCount()
|
|
||||||
{
|
|
||||||
return active_count_;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Room::AddPlayer(Player* hum)
|
void Room::AddPlayer(Player* hum)
|
||||||
{
|
{
|
||||||
assert(gas_data.gas_mode == GasInactive);
|
assert(gas_data.gas_mode == GasInactive);
|
||||||
@ -1870,15 +1865,3 @@ void Room::ProcDieAndroid(int die_time, int die_num)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Room::IncActiveCount()
|
|
||||||
{
|
|
||||||
++active_count_;
|
|
||||||
++App::Instance()->perf.active_count;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Room::DecActiveCount()
|
|
||||||
{
|
|
||||||
--active_count_;
|
|
||||||
--App::Instance()->perf.active_count;
|
|
||||||
}
|
|
||||||
|
@ -75,7 +75,6 @@ public:
|
|||||||
int AliveCount();
|
int AliveCount();
|
||||||
inline int RealAliveCount() { return real_alive_count_; }
|
inline int RealAliveCount() { return real_alive_count_; }
|
||||||
inline void IncRealAliveCount() { ++real_alive_count_stat_; }
|
inline void IncRealAliveCount() { ++real_alive_count_stat_; }
|
||||||
int ActiveCount();
|
|
||||||
Player* GetPlayerByAccountId(const std::string& accountid);
|
Player* GetPlayerByAccountId(const std::string& accountid);
|
||||||
Player* GetPlayerByUniId(int uniid);
|
Player* GetPlayerByUniId(int uniid);
|
||||||
Entity* GetEntityByUniId(int uniid);
|
Entity* GetEntityByUniId(int uniid);
|
||||||
@ -164,15 +163,12 @@ private:
|
|||||||
void DieAndroidTimerFunc();
|
void DieAndroidTimerFunc();
|
||||||
void ProcShuaAndroid(int shua_time, int shua_num);
|
void ProcShuaAndroid(int shua_time, int shua_num);
|
||||||
void ProcDieAndroid(int die_time, int die_num);
|
void ProcDieAndroid(int die_time, int die_num);
|
||||||
void IncActiveCount();
|
|
||||||
void DecActiveCount();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int elapsed_time_ = 0;
|
int elapsed_time_ = 0;
|
||||||
int alive_count_ = 0;
|
int alive_count_ = 0;
|
||||||
int real_alive_count_ = 0;
|
int real_alive_count_ = 0;
|
||||||
int real_alive_count_stat_ = 0;
|
int real_alive_count_stat_ = 0;
|
||||||
int active_count_ = 0;
|
|
||||||
int force_shua_android_times_ = 0;
|
int force_shua_android_times_ = 0;
|
||||||
MetaData::AirLine* airline_ = nullptr;
|
MetaData::AirLine* airline_ = nullptr;
|
||||||
a8::XTimerAttacher xtimer_attacher_;
|
a8::XTimerAttacher xtimer_attacher_;
|
||||||
|
@ -12,7 +12,6 @@ struct PerfMonitor
|
|||||||
long long test_times = 0;
|
long long test_times = 0;
|
||||||
long long alive_count = 0;
|
long long alive_count = 0;
|
||||||
long long real_alive_count = 0;
|
long long real_alive_count = 0;
|
||||||
long long active_count = 0;
|
|
||||||
std::array<long long, 30> params = {};
|
std::array<long long, 30> params = {};
|
||||||
std::array<int, 30> entity_num = {};
|
std::array<int, 30> entity_num = {};
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user