From 424752982e21372fb817cdfc29514ab03538b6dc Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 2 Apr 2023 20:44:22 +0800 Subject: [PATCH] 1 --- server/gameserver/android.cc | 2 +- server/gameserver/buff/callfunc.cc | 2 +- server/gameserver/car.cc | 2 +- server/gameserver/creature.cc | 2 +- server/gameserver/gungrasp.cc | 2 +- server/gameserver/hero.cc | 2 +- server/gameserver/human.cc | 2 +- server/gameserver/lispenv.cc | 2 +- server/gameserver/matchteam.h | 2 +- server/gameserver/matchteamnew.h | 2 +- server/gameserver/netdata.cc | 2 +- server/gameserver/obstacle.cc | 7 +------ server/gameserver/roommgr.h | 2 +- server/gameserver/roomobstacle.cc | 2 +- server/gameserver/shot.cc | 2 +- server/gameserver/skill.cc | 2 +- server/gameserver/skillhelper.cc | 2 +- server/gameserver/stats.cc | 2 +- server/gameserver/team.cc | 2 +- server/gameserver/weapon.cc | 2 +- 20 files changed, 20 insertions(+), 25 deletions(-) diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index bb4f2507..4e8431dd 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -5,7 +5,7 @@ #include "app.h" #include "android_agent.h" #include "movement.h" -#include "battledatacontext.h" +#include "netdata.h" #include "f8/btmgr.h" diff --git a/server/gameserver/buff/callfunc.cc b/server/gameserver/buff/callfunc.cc index 79d9d4c7..e1ebff17 100644 --- a/server/gameserver/buff/callfunc.cc +++ b/server/gameserver/buff/callfunc.cc @@ -12,7 +12,7 @@ #include "human.h" #include "team.h" #include "collision.h" -#include "battledatacontext.h" +#include "netdata.h" #include "hero.h" #include "obstacle.h" diff --git a/server/gameserver/car.cc b/server/gameserver/car.cc index fb1172e9..4828ca94 100644 --- a/server/gameserver/car.cc +++ b/server/gameserver/car.cc @@ -18,7 +18,7 @@ #include "pbutils.h" #include "trigger.h" #include "ability.h" -#include "battledatacontext.h" +#include "netdata.h" #include "buff.h" #include "stats.h" #include "hero.h" diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 784d76d0..1a0448e1 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -20,7 +20,7 @@ #include "movement.h" #include "trigger.h" #include "ability.h" -#include "battledatacontext.h" +#include "netdata.h" #include "buff.h" #include "mapinstance.h" #include "collision.h" diff --git a/server/gameserver/gungrasp.cc b/server/gameserver/gungrasp.cc index 40bcdf09..9ed39609 100644 --- a/server/gameserver/gungrasp.cc +++ b/server/gameserver/gungrasp.cc @@ -2,7 +2,7 @@ #include "gungrasp.h" #include "creature.h" -#include "battledatacontext.h" +#include "netdata.h" #include "trigger.h" #include "room.h" #include "effect.h" diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc index f4ae753d..5f83293e 100644 --- a/server/gameserver/hero.cc +++ b/server/gameserver/hero.cc @@ -15,7 +15,7 @@ #include "app.h" #include "pbutils.h" #include "trigger.h" -#include "battledatacontext.h" +#include "netdata.h" #include "stats.h" #include "hero_agent.h" #include "movement.h" diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index aa1d8ea9..43d2ab10 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -34,7 +34,7 @@ #include "httpproxy.h" #include "skillhelper.h" #include "shot.h" -#include "battledatacontext.h" +#include "netdata.h" #include "mapinstance.h" #include "movement.h" #include "pbutils.h" diff --git a/server/gameserver/lispenv.cc b/server/gameserver/lispenv.cc index d75c5ab1..b149bf78 100644 --- a/server/gameserver/lispenv.cc +++ b/server/gameserver/lispenv.cc @@ -2,7 +2,7 @@ #include "lispenv.h" #include "buff.h" -#include "battledatacontext.h" +#include "netdata.h" #include "creature.h" #include "glmhelper.h" #include "room.h" diff --git a/server/gameserver/matchteam.h b/server/gameserver/matchteam.h index 798eeac0..a7915708 100644 --- a/server/gameserver/matchteam.h +++ b/server/gameserver/matchteam.h @@ -2,7 +2,7 @@ #include -#include "battledatacontext.h" +#include "netdata.h" namespace cs { diff --git a/server/gameserver/matchteamnew.h b/server/gameserver/matchteamnew.h index e142da05..d2ddff56 100644 --- a/server/gameserver/matchteamnew.h +++ b/server/gameserver/matchteamnew.h @@ -1,6 +1,6 @@ #pragma once -#include "battledatacontext.h" +#include "netdata.h" #include "matchteam.h" diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index 87a99fd1..e406d4a1 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -2,7 +2,7 @@ #include -#include "battledatacontext.h" +#include "netdata.h" #include "human.h" #include "creature.h" diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc index 14cde385..1ae17e89 100644 --- a/server/gameserver/obstacle.cc +++ b/server/gameserver/obstacle.cc @@ -14,7 +14,7 @@ #include "explosion.h" #include "entityfactory.h" #include "pbutils.h" -#include "battledatacontext.h" +#include "netdata.h" #include "mt/Equip.h" #include "mt/MapThing.h" @@ -211,12 +211,7 @@ void Obstacle::OnExplosionHit(Explosion* e) float dmg = e->GetDmg(); float def = 0; - // 999 - #if 1 float finaly_dmg = dmg; - #else - float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K); - #endif SetHealth(e->GetRoom(), std::max(0.0f, GetHealth(e->GetRoom()) - finaly_dmg)); if (GetHealth(e->GetRoom()) <= 0.01f) { Die(e->GetRoom()); diff --git a/server/gameserver/roommgr.h b/server/gameserver/roommgr.h index d9eaf662..cb3c5676 100644 --- a/server/gameserver/roommgr.h +++ b/server/gameserver/roommgr.h @@ -6,7 +6,7 @@ #include #include -#include "battledatacontext.h" +#include "netdata.h" namespace cs { class CMJoin; diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index 36f64045..50ae15d2 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -15,7 +15,7 @@ #include "incubator.h" #include "skillhelper.h" #include "ability.h" -#include "battledatacontext.h" +#include "netdata.h" #include "collision.h" #include "mt/MapThing.h" diff --git a/server/gameserver/shot.cc b/server/gameserver/shot.cc index 8f60b332..c3f7c1c1 100644 --- a/server/gameserver/shot.cc +++ b/server/gameserver/shot.cc @@ -12,7 +12,7 @@ #include "buff.h" #include "debugcmd.h" #include "ability.h" -#include "battledatacontext.h" +#include "netdata.h" #include "mt/Param.h" #include "mt/Hero.h" diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc index fd0bcef6..82e5d09f 100644 --- a/server/gameserver/skill.cc +++ b/server/gameserver/skill.cc @@ -15,7 +15,7 @@ #include "collision.h" #include "pbutils.h" #include "ability.h" -#include "battledatacontext.h" +#include "netdata.h" #include "collision.h" #include "shot.h" #include "movement.h" diff --git a/server/gameserver/skillhelper.cc b/server/gameserver/skillhelper.cc index 43192330..d3bd8ce8 100644 --- a/server/gameserver/skillhelper.cc +++ b/server/gameserver/skillhelper.cc @@ -10,7 +10,7 @@ #include "room.h" #include "roomobstacle.h" #include "ability.h" -#include "battledatacontext.h" +#include "netdata.h" #include "mt/Buff.h" #include "mt/Skill.h" diff --git a/server/gameserver/stats.cc b/server/gameserver/stats.cc index 4c92a7bc..d8259eba 100644 --- a/server/gameserver/stats.cc +++ b/server/gameserver/stats.cc @@ -3,7 +3,7 @@ #include "stats.h" #include "human.h" #include "room.h" -#include "battledatacontext.h" +#include "netdata.h" static double TopXFunc (Human* sender, std::function cmpFunc, diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc index 50a92c5a..63ddd794 100644 --- a/server/gameserver/team.cc +++ b/server/gameserver/team.cc @@ -7,7 +7,7 @@ #include "room.h" #include "app.h" #include "bornpoint.h" -#include "battledatacontext.h" +#include "netdata.h" #include "stats.h" #include "jsondatamgr.h" #include "httpproxy.h" diff --git a/server/gameserver/weapon.cc b/server/gameserver/weapon.cc index 09373a9b..d1033ea8 100644 --- a/server/gameserver/weapon.cc +++ b/server/gameserver/weapon.cc @@ -2,7 +2,7 @@ #include "weapon.h" #include "creature.h" -#include "battledatacontext.h" +#include "netdata.h" #include "pbutils.h" #include "human.h"