diff --git a/CAPI/cpp/API/include/structures.h b/CAPI/cpp/API/include/structures.h index 39d0cab..304892d 100644 --- a/CAPI/cpp/API/include/structures.h +++ b/CAPI/cpp/API/include/structures.h @@ -260,7 +260,10 @@ namespace THUAI8 // int32_t shild; int32_t shoesEquipment; long shoesEquipmentTime; + bool purified; long purificationEquipmentTime; + bool isBerserk; + long berserkTime; // CharacterBuffType attackBuff; long attackBuffTime; diff --git a/dependency/proto/Message2Clients.proto b/dependency/proto/Message2Clients.proto index d1916eb..9d89efb 100644 --- a/dependency/proto/Message2Clients.proto +++ b/dependency/proto/Message2Clients.proto @@ -67,21 +67,22 @@ message MessageOfCharacter // EquipmentType shoes_equipment = ; // 鞋子装备 int32 shoes_equipment = 31; int64 shoes_equipment_time = 32; + bool purified = 33; // EquipmentType purification_equipment = ; - int64 purification_equipment_time = 33; + int64 purification_equipment_time = 34; // EquipmentType invisibility_equipment = ; // long invisibility_equipment_time = ; - // EquipmentType berserk_equipment = ; - // long berserk_equipment_time = ; + bool is_berserk = 35; + int64 berserk_time = 36; // 加成资源的Buff // CharacterBuffType attack_buff = 39; - int32 attack_buff_num = 34; - int64 attack_buff_time = 35; + int32 attack_buff_num = 37; + int64 attack_buff_time = 38; // CharacterBuffType speed_buff = 43; - int64 speed_buff_time = 36; + int64 speed_buff_time = 39; // CharacterBuffType vision_buff = 45; - int64 vision_buff_time = 37; + int64 vision_buff_time = 40; } message MessageOfBarracks diff --git a/logic/Server/CopyInfo.cs b/logic/Server/CopyInfo.cs index bc8ad71..e19086d 100644 --- a/logic/Server/CopyInfo.cs +++ b/logic/Server/CopyInfo.cs @@ -125,12 +125,12 @@ namespace Server ShoesEquipment = (int)player.Shoes, // 加成值 ShoesEquipmentTime = player.ShoesTime, // 包含所有速度加成的时间 // 待修改,Transformation缺东西 - PurificationEquipment = (player.Purified) ? Protobuf.EquipmentType.PurificationPotion : Protobuf.PurificationEquipmentType.NullEquipmentType, // 数值,1~3表示等级,0表示没有 + Purified = player.Purified, PurificationEquipmentTime = player.PurifiedTime, // 待修改,Character.cs没有隐身时间,没有狂暴药水 // InvisibilityEquipment = player.Invisibility, // InvisibilityEquipmentTime = player.InsvisibilityTime, - BerserkEquipment = (player.IsBerserk) ? Protobuf.EquipmentType.BerserkPotion : Protobuf.EquipmentType.NullEquipmentType, // 数值,1~3表示等级,0表示没有 + IsBerserk = player.IsBerserk, BerserkTime = player.BerserkTime, // 待修改,Transformation缺东西