diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index c501daf9..345dcc5c 100755 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -120,59 +120,6 @@ enum BuffTargetType_e kBuffTargetEnemy = 3, //敌军 }; -enum BuffEffectType_e -{ - kBET_Begin = 0, - kBET_ChgAttr = 1, //改变属性 - kBET_TurnOver = 2, //翻滚 - kBET_Car = 3, //骑乘 - kBET_Invincible = 4, //无敌 - kBET_Camouflage = 5, //伪装 - kBET_AdPlaying = 6, //看广告中 - kBET_LordMode = 7, //上帝模式 - kBET_NewProtect = 8, //新手保护血量低于50% - kBET_BePull = 9, //拉人(被拉方) - kBET_JumpTo = 10, //跳跃 - kBET_OnceChgAttr = 11, //一次性buff - kBET_Pull = 12, //拉人(主动方) - kBET_Terminator = 13, //终结者模式 - kBET_PlayShotAni = 14, //播放射击动画 - kBET_Vertigo = 15, //眩晕 - kBET_DecHp = 16, //扣血 - kBET_PullDone = 17, //拖拽到目的地 - kBET_DelayAddBuff = 18, //延迟加buff - kBET_CliEffect1 = 19, //僵尸被动光环减速(客户端表现用) - kBET_CliEffect2 = 20, //僵尸被动光环毒物(客户端表现用) - kBET_CliEffect3 = 21, //僵尸被动光环地震(客户端表现用) - kBET_CliEffect4 = 22, //被拖拽(客户端表现用) - kBET_HunLuan = 23, //混乱,在烟雾弹中不自动瞄准 - kBET_Fly = 24, //飞行中 - kBET_Jump = 25, //跳伞中 - kBET_IntervalAddBuff = 26, //持续掉血 - //kBET_LastAddHp = 27, //持续加血 - //kBET_OnceAddHp = 28, //加血 - kBET_SummonHero = 29, //召唤英雄 - //kBET_SummonHero = 30, //向前跳跃 - kBET_Shield = 31, //护盾 - kBET_Hide = 32, //隐身 - kBET_CrazyMode = 33, //暴走模式 - kBET_ShockWave = 34, //冲击波 - kBET_Sprint = 35, //冲刺 - kBET_SummonObstacle = 36, //召唤物件 - kBET_FlashMove = 37, //瞬间移动 - - kBET_ThroughWall = 50, //穿墙 - kBET_Driver = 51, //驾驶中 - kBET_Passenger = 52, //乘座中 - kBET_Recoil = 55, //后坐力 - kBET_InGrass = 56, //在草丛 - kBET_InWater = 57, //在水里 - kBET_InIce = 58, //在冰里 - kBET_BatchAddBuff = 60, //批量添加buff - - kBET_End -}; - enum SkillFunc_e { kSkill_FuncNone = 0, @@ -262,28 +209,6 @@ enum EquipType_e EQUIP_TYPE_End }; -enum EntityType_e -{ - ET_None = 0, - ET_Player = 1, - ET_Obstacle = 2, - ET_Building = 3, - //ET_LootSpawner = 4, - ET_Loot = 5, - //ET_DeadBody = 6, - //ET_Decal = 7, - //ET_Projectile = 8, - //ET_Smoke = 9, - ET_Hero = 10, - ET_Car = 11, - - ET_Bullet = 20, - - //ET_Android = 30, - ET_Unuse = 30, - ET_MAX -}; - enum EntitySubType_e { EST_None = 0, @@ -459,14 +384,5 @@ const int HUNLUAN_BUFFID = 6001; const long long SPEC_MAP_OBJECT_FLAGS = A8_DEFINE_RANGE_BIT(long long, kColliderSpecTag_Begin, kColliderSpecTag_End); -const int kThroughWall_BUFFID = 6003; -const int FLY_BUFFID = 7001; -const int JUMP_BUFFID = 7002; -const int DRIVER_BUFFID = 7003; -const int PASSENGER_BUFFID = 7004; -const int kRecoilBuffId = 7005; -const int kInGrassBuffId = 7006; -const int kInWaterBuffId = 7007; -const int kInIceBuffId = 7008; - const float DEFAULT_FLY_DISTANCE = 5.0f; + diff --git a/server/gameserver/constant_export.h b/server/gameserver/constant_export.h new file mode 100644 index 00000000..87df2f9e --- /dev/null +++ b/server/gameserver/constant_export.h @@ -0,0 +1,86 @@ +#pragma once + +const int kThroughWall_BUFFID = 6003; +const int FLY_BUFFID = 7001; +const int JUMP_BUFFID = 7002; +const int DRIVER_BUFFID = 7003; +const int PASSENGER_BUFFID = 7004; +const int kRecoilBuffId = 7005; +const int kInGrassBuffId = 7006; +const int kInWaterBuffId = 7007; +const int kInIceBuffId = 7008; + +enum BuffEffectType_e +{ + kBET_Begin = 0, + kBET_ChgAttr = 1, //改变属性 + kBET_TurnOver = 2, //翻滚 + kBET_Car = 3, //骑乘 + kBET_Invincible = 4, //无敌 + kBET_Camouflage = 5, //伪装 + kBET_AdPlaying = 6, //看广告中 + kBET_LordMode = 7, //上帝模式 + kBET_NewProtect = 8, //新手保护血量低于50% + kBET_BePull = 9, //拉人(被拉方) + kBET_JumpTo = 10, //跳跃 + kBET_OnceChgAttr = 11, //一次性buff + kBET_Pull = 12, //拉人(主动方) + kBET_Terminator = 13, //终结者模式 + kBET_PlayShotAni = 14, //播放射击动画 + kBET_Vertigo = 15, //眩晕 + kBET_DecHp = 16, //扣血 + kBET_PullDone = 17, //拖拽到目的地 + kBET_DelayAddBuff = 18, //延迟加buff + kBET_CliEffect1 = 19, //僵尸被动光环减速(客户端表现用) + kBET_CliEffect2 = 20, //僵尸被动光环毒物(客户端表现用) + kBET_CliEffect3 = 21, //僵尸被动光环地震(客户端表现用) + kBET_CliEffect4 = 22, //被拖拽(客户端表现用) + kBET_HunLuan = 23, //混乱,在烟雾弹中不自动瞄准 + kBET_Fly = 24, //飞行中 + kBET_Jump = 25, //跳伞中 + kBET_IntervalAddBuff = 26, //持续掉血 + //kBET_LastAddHp = 27, //持续加血 + //kBET_OnceAddHp = 28, //加血 + kBET_SummonHero = 29, //召唤英雄 + //kBET_SummonHero = 30, //向前跳跃 + kBET_Shield = 31, //护盾 + kBET_Hide = 32, //隐身 + kBET_CrazyMode = 33, //暴走模式 + kBET_ShockWave = 34, //冲击波 + kBET_Sprint = 35, //冲刺 + kBET_SummonObstacle = 36, //召唤物件 + kBET_FlashMove = 37, //瞬间移动 + + kBET_ThroughWall = 50, //穿墙 + kBET_Driver = 51, //驾驶中 + kBET_Passenger = 52, //乘座中 + kBET_Recoil = 55, //后坐力 + kBET_InGrass = 56, //在草丛 + kBET_InWater = 57, //在水里 + kBET_InIce = 58, //在冰里 + kBET_BatchAddBuff = 60, //批量添加buff + + kBET_End +}; + +enum EntityType_e +{ + ET_None = 0, + ET_Player = 1, + ET_Obstacle = 2, + ET_Building = 3, + //ET_LootSpawner = 4, + ET_Loot = 5, + //ET_DeadBody = 6, + //ET_Decal = 7, + //ET_Projectile = 8, + //ET_Smoke = 9, + ET_Hero = 10, + ET_Car = 11, + + ET_Bullet = 20, + + //ET_Android = 30, + ET_Unuse = 30, + ET_MAX +}; diff --git a/server/gameserver/precompile.h b/server/gameserver/precompile.h index 726d0f72..32a36f79 100644 --- a/server/gameserver/precompile.h +++ b/server/gameserver/precompile.h @@ -8,6 +8,7 @@ #include #include "constant.h" +#include "constant_export.h" #include "types.h" #include "global.h" diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index b6c1cb7f..b96415e8 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -152,6 +152,7 @@ message Player optional string name = 23; optional int32 normal_skill = 24; optional float hit_radius = 25; + optional string ai_script = 26; } message Robot