diff --git a/dependency/proto/Message2Clients.proto b/dependency/proto/Message2Clients.proto index 59adc12..f7d8358 100755 --- a/dependency/proto/Message2Clients.proto +++ b/dependency/proto/Message2Clients.proto @@ -41,7 +41,9 @@ message MessageOfTricker int64 player_id = 11; int32 view_range = 12; // 视野距离 int32 radius = 13; // 半径 - repeated TrickerBuffType buff = 14; + int32 treat_progress = 14; // 治疗进度 + int32 rescue_progress = 15; // 救援进度 + repeated TrickerBuffType buff = 16; } message MessageOfBullet diff --git a/dependency/proto/Message2Server.proto b/dependency/proto/Message2Server.proto index eb748ea..856115c 100755 --- a/dependency/proto/Message2Server.proto +++ b/dependency/proto/Message2Server.proto @@ -46,6 +46,12 @@ message IDMsg int64 player_id = 1; } +message SkillMsg +{ + int64 player_id = 1; + int32 skill_id = 2; +} + // 基本继承于THUAI5,为了使发送的信息尽可能不被浪费,暂定不发这类大包。 // message MessageToServer // { diff --git a/dependency/proto/Services.proto b/dependency/proto/Services.proto index 798f698..2f5b29c 100755 --- a/dependency/proto/Services.proto +++ b/dependency/proto/Services.proto @@ -14,13 +14,13 @@ service AvailableService // 游戏过程中玩家执行操作的服务 rpc Move (MoveMsg) returns (MoveRes); rpc PickProp (PropMsg) returns (BoolRes); - rpc UseProp (IDMsg) returns (BoolRes); - rpc UseSkill (IDMsg) returns (BoolRes); + rpc UseProp (PropMsg) returns (BoolRes); + rpc UseSkill (SkillMsg) returns (BoolRes); rpc SendMessage (SendMsg) returns (BoolRes); rpc GetMessage (IDMsg) returns (stream MsgRes); rpc StartLearning (IDMsg) returns (BoolRes); // 开始修理机器 - rpc StartHelpMate (IDMsg) returns (BoolRes); // 开始救人 - rpc StartHealMate (IDMsg) returns (BoolRes); + rpc StartRescueMate (IDMsg) returns (BoolRes); // 开始救人 + rpc StartTreatMate (IDMsg) returns (BoolRes); rpc Trick (TrickMsg) returns (BoolRes); // 攻击 rpc Graduate (IDMsg) returns (BoolRes); // 相当于逃跑 rpc OpenDoor (IDMsg) returns (BoolRes); // 开门 diff --git a/logic/GameClass/Skill/Occupation.cs b/logic/GameClass/Skill/Occupation.cs index 18d7abf..26f8507 100644 --- a/logic/GameClass/Skill/Occupation.cs +++ b/logic/GameClass/Skill/Occupation.cs @@ -43,7 +43,7 @@ namespace GameClass.Skill public List ListOfIActiveSkill => new(new IActiveSkill[] { new BecomeInvisible(), new UseKnife() }); public List ListOfIPassiveSkill => new(new IPassiveSkill[] { }); } - public class Athlete : IOccupation + public class Athlete : IStudent { private const int moveSpeed = GameData.basicMoveSpeed; public int MoveSpeed => moveSpeed; @@ -59,7 +59,9 @@ namespace GameClass.Skill public BulletType InitBullet => BulletType.CommonAttackOfGhost; - public List ListOfIActiveSkill => new(new IActiveSkill[] { new BecomeInvisible(), new UseKnife() }); + public List ListOfIActiveSkill => new(new IActiveSkill[] { new BeginToCharge() }); public List ListOfIPassiveSkill => new(new IPassiveSkill[] { }); + + public int FixSpeed => GameData.basicFixSpeed; } } diff --git a/resource/eesast_logo_32x32.png b/resource/eesast_logo_32x32.png new file mode 100644 index 0000000..49670ad Binary files /dev/null and b/resource/eesast_logo_32x32.png differ