From b2a3445c4b3f22b688b770e47ae4a39ae569e587 Mon Sep 17 00:00:00 2001 From: DragonAura Date: Sat, 4 Mar 2023 23:19:39 +0800 Subject: [PATCH 1/4] feat(proto): :sparkles: add rescue and treat progress --- dependency/proto/Message2Clients.proto | 4 +++- dependency/proto/Services.proto | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dependency/proto/Message2Clients.proto b/dependency/proto/Message2Clients.proto index 7e4d4af..07ba4a4 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/Services.proto b/dependency/proto/Services.proto index 798f698..ed577f8 100755 --- a/dependency/proto/Services.proto +++ b/dependency/proto/Services.proto @@ -19,8 +19,8 @@ service AvailableService 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); // 开门 From ddb46a3cf6905b7d35f686d9a779b2bd1bc4221d Mon Sep 17 00:00:00 2001 From: DragonAura Date: Sat, 4 Mar 2023 23:31:14 +0800 Subject: [PATCH 2/4] feat(proto): :sparkles: add skill id --- dependency/proto/Message2Server.proto | 6 ++++++ dependency/proto/Services.proto | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) 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 ed577f8..2f5b29c 100755 --- a/dependency/proto/Services.proto +++ b/dependency/proto/Services.proto @@ -14,8 +14,8 @@ 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); // 开始修理机器 From e785db4fc07b52420d998b41457f2988a6b49b16 Mon Sep 17 00:00:00 2001 From: Timothy Liu Date: Sat, 4 Mar 2023 23:35:43 +0800 Subject: [PATCH 3/4] chore: add eesast logo (32x32) --- resource/eesast_logo_32x32.png | Bin 0 -> 2976 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resource/eesast_logo_32x32.png diff --git a/resource/eesast_logo_32x32.png b/resource/eesast_logo_32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..49670adb9b377f1615290bb521833e27eb8153d1 GIT binary patch literal 2976 zcmV;R3t#k!P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 W7ZG&wLN%2D0000 Date: Sat, 4 Mar 2023 23:53:30 +0800 Subject: [PATCH 4/4] fix: :bug: something unimportant --- logic/GameClass/GameObj/Character/Character.SkillManager.cs | 2 +- logic/GameClass/Skill/Occupation.cs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/logic/GameClass/GameObj/Character/Character.SkillManager.cs b/logic/GameClass/GameObj/Character/Character.SkillManager.cs index bc6e7ad..587b090 100644 --- a/logic/GameClass/GameObj/Character/Character.SkillManager.cs +++ b/logic/GameClass/GameObj/Character/Character.SkillManager.cs @@ -12,7 +12,7 @@ namespace GameClass.GameObj private readonly IOccupation occupation; public IOccupation Occupation => occupation; - private Dictionary timeUntilActiveSkillAvailable; + private Dictionary timeUntilActiveSkillAvailable = new(); public Dictionary TimeUntilActiveSkillAvailable => timeUntilActiveSkillAvailable; public bool SetTimeUntilActiveSkillAvailable(ActiveSkillType activeSkillType, int timeUntilActiveSkillAvailable) 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; } }