server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-09-18 12:08:18 +08:00
commit 535f563c84
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/bin/restart.sh
View File

@ -1,5 +1,16 @@
#!/bin/bash #!/bin/bash
python manage.py restart $1 $2 source /etc/profile
source /root/.bash_profile
echo 'success' pid=$(ps -ef|grep "gameserver2001 -n $2 -i $1"|grep -v grep|awk '{print $2}')
echo $pid
if [[ $pid != "" ]]
then
echo $pid|xargs kill -9
else
echo "pid 为空"
fi
nohup ./gameserver2001 -n $2 -i $1 >> gameserver2001$2_$1.out &

1
server/gameserver/metamgr.cc
View File

@ -134,6 +134,7 @@ public:
MetaMgr::Instance()->tank_damage_interval = MetaMgr::Instance()->GetSysParamAsFloat("tank_damage_interval", 1); MetaMgr::Instance()->tank_damage_interval = MetaMgr::Instance()->GetSysParamAsFloat("tank_damage_interval", 1);
MetaMgr::Instance()->average_oil = MetaMgr::Instance()->GetSysParamAsInt("average_oil"); MetaMgr::Instance()->average_oil = MetaMgr::Instance()->GetSysParamAsInt("average_oil");
MetaMgr::Instance()->max_oil = MetaMgr::Instance()->GetSysParamAsInt("max_oil"); MetaMgr::Instance()->max_oil = MetaMgr::Instance()->GetSysParamAsInt("max_oil");
MetaMgr::Instance()->max_energy_shield = MetaMgr::Instance()->GetSysParamAsInt("max_energy_shield");
if (MetaMgr::Instance()->K < 0.01f) { if (MetaMgr::Instance()->K < 0.01f) {
abort(); abort();
} }

1
server/gameserver/metamgr.h
View File

@ -55,6 +55,7 @@ class MetaMgr : public a8::Singleton<MetaMgr>
float tank_damage_interval = 0.0f; float tank_damage_interval = 0.0f;
float average_oil = 0.0f; float average_oil = 0.0f;
float max_oil = 0.0f; float max_oil = 0.0f;
int max_energy_shield = 100;
private: private:
MetaDataLoader* loader_ = nullptr; MetaDataLoader* loader_ = nullptr;

9
server/gameserver/player.cc
View File

@ -31,7 +31,12 @@ void Player::Initialize()
{ {
Human::Initialize(); Human::Initialize();
health = meta->i->health(); health = meta->i->health();
max_energy_shield = energy_shield; if (energy_shield) {
energy_shield = MetaMgr::Instance()->max_energy_shield;
max_energy_shield = energy_shield;
} else {
max_energy_shield = 0;
}
skin_meta = MetaMgr::Instance()->GetDress(SkinId()); skin_meta = MetaMgr::Instance()->GetDress(SkinId());
if (skin_meta) { if (skin_meta) {
skill_meta = MetaMgr::Instance()->GetSkill(skin_meta->i->skill_id()); skill_meta = MetaMgr::Instance()->GetSkill(skin_meta->i->skill_id());
@ -1123,6 +1128,8 @@ void Player::_CMRevive(f8::MsgHdr& hdr, const cs::CMRevive& msg)
dead = false; dead = false;
real_dead = false; real_dead = false;
downed = false; downed = false;
energy_shield = MetaMgr::Instance()->max_energy_shield;
max_energy_shield = energy_shield;
FreeDownedTimer(); FreeDownedTimer();
health = GetMaxHP(); health = GetMaxHP();
ResetTankSkin(); ResetTankSkin();