From d9898873d95c1b026455d4ddc9d5a9e8ef68c117 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 27 Mar 2023 13:22:09 +0800 Subject: [PATCH] 1 --- server/gameserver/mapcollider.cc | 2 +- server/gameserver/mapcollider.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/gameserver/mapcollider.cc b/server/gameserver/mapcollider.cc index 871fb981..8e730d46 100644 --- a/server/gameserver/mapcollider.cc +++ b/server/gameserver/mapcollider.cc @@ -38,7 +38,7 @@ namespace mc void Collider::Read(std::shared_ptr xobj) { ca_type = xobj->At("ca_type")->AsXValue(); - if (ca_type < kCA_Floor || ca_type > kCA_Other) { + if (ca_type < kCA_Floor || ca_type > kCA_End) { abort(); } enabled = xobj->At("enabled")->AsXValue(); diff --git a/server/gameserver/mapcollider.h b/server/gameserver/mapcollider.h index 99d49644..766f1892 100644 --- a/server/gameserver/mapcollider.h +++ b/server/gameserver/mapcollider.h @@ -23,6 +23,12 @@ namespace mc kCA_Stairs = 4,//楼梯 kCA_Window = 9,//窗,主要为了射击穿透 kCA_Other = 10,//其他,装饰品 + kCA_Grass = 19,//草,需要抖动 + kCA_Water = 20,//水 + kCA_Box = 21,//箱子 + kCA_Shield = 22,//盾 + kCA_WallShield = 23,//能量盾 + kCA_End }; struct Bounds