From 30b147abb1879c6cbdd4b7ba1e6476a4db1a53b7 Mon Sep 17 00:00:00 2001 From: tanghai Date: Tue, 13 Apr 2021 23:02:24 +0800 Subject: [PATCH] =?UTF-8?q?ai=E6=A1=86=E6=9E=B6=E6=8F=90=E4=BA=A4=EF=BC=8C?= =?UTF-8?q?=E9=99=84=E5=B8=A6=E4=B8=80=E4=B8=AA=E5=B0=8F=E4=BE=8B=E5=AD=90?= =?UTF-8?q?=EF=BC=8C=E7=99=BB=E5=BD=95=E8=BF=9B=E6=B8=B8=E6=88=8F=EF=BC=8C?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=B7=A1=E9=80=BB?= =?UTF-8?q?10=E7=A7=92=EF=BC=8C=E5=81=9C=E4=B8=8B=E6=9D=A5=E6=94=BB?= =?UTF-8?q?=E5=87=BB5=E7=A7=92=EF=BC=8C=E7=84=B6=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E5=B7=A1=E9=80=BB10=E7=A7=92=EF=BC=8C=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E4=B8=8B=E5=8E=BB=20=E6=B3=A8=E6=84=8FAIConf?= =?UTF-8?q?ig=E8=A1=A8=E4=B8=AD=EF=BC=8C=E6=AF=8F=E4=B8=AAai=E6=98=AF?= =?UTF-8?q?=E4=B8=80=E4=B8=AAsheet=EF=BC=8C=E8=A1=A8=E4=B8=AD=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=85=8D=E7=BD=AE=E5=A4=9A=E4=B8=AAai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client-Server.sln.DotSettings | 1 + Config/AIConfigCategory.bytes | 4 + Excel/AIConfig.xlsx | Bin 0 -> 10331 bytes Excel/StartSceneConfig.xlsx | Bin 9424 -> 9406 bytes Proto/OuterMessage.proto | 11 ++- .../Demo/C2M_PathfindingResultHandler.cs | 2 +- Server/Hotfix/Demo/C2M_StopHandler.cs | 15 +++ Server/Hotfix/Demo/Move/MoveHelper.cs | 57 ++++++----- Server/Hotfix/Server.Hotfix.csproj | 6 +- Server/Model/Generate/Config/AIConfig.cs | 91 ++++++++++++++++++ Server/Model/Generate/Message/OuterMessage.cs | 17 +++- Server/Model/Generate/Message/OuterOpcode.cs | 35 +++---- Server/Model/Server.Model.csproj | 4 + Tools/ExcelExporter/ProtoObject.cs | 6 -- .../Bundles/Config/AIConfigCategory.bytes | 4 + .../Config/AIConfigCategory.bytes.meta | 7 ++ Unity/Assets/Hotfix/Demo/AI.meta | 8 ++ Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs | 45 +++++++++ Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs.meta | 11 +++ Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs | 42 ++++++++ Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs.meta | 11 +++ .../Demo/AI/XunLuoPathComponentSystem.cs | 17 ++++ .../Demo/AI/XunLuoPathComponentSystem.cs.meta | 11 +++ Unity/Assets/Hotfix/Demo/MapHelper.cs | 4 + Unity/Assets/Hotfix/Demo/Move/MoveHelper.cs | 4 +- Unity/Assets/Hotfix/Demo/Unit/UnitFactory.cs | 4 + Unity/Assets/Hotfix/Module/AI.meta | 8 ++ .../Hotfix/Module/AI/AIComponentSystem.cs | 80 +++++++++++++++ .../Module/AI/AIComponentSystem.cs.meta | 11 +++ .../Module/AI/AIDispatcherComponentSystem.cs | 55 +++++++++++ .../AI/AIDispatcherComponentSystem.cs.meta | 11 +++ Unity/Assets/HotfixView/AppStart_Init.cs | 2 + .../HotfixView/Opera/OperaComponentSystem.cs | 17 ---- Unity/Assets/HotfixView/Scene/SceneFactory.cs | 1 + Unity/Assets/Model/Core/Object/Object.cs | 2 +- Unity/Assets/Model/Demo/AI.meta | 8 ++ .../Model/Demo/AI/XunLuoPathComponent.cs | 11 +++ .../Model/Demo/AI/XunLuoPathComponent.cs.meta | 11 +++ .../Assets/Model/Generate/Config/AIConfig.cs | 91 ++++++++++++++++++ .../Model/Generate/Config/AIConfig.cs.meta | 11 +++ .../Model/Generate/Message/OuterMessage.cs | 17 +++- .../Model/Generate/Message/OuterOpcode.cs | 35 +++---- Unity/Assets/Model/Module/AI.meta | 8 ++ Unity/Assets/Model/Module/AI/AAIHandler.cs | 18 ++++ .../Assets/Model/Module/AI/AAIHandler.cs.meta | 11 +++ Unity/Assets/Model/Module/AI/AIComponent.cs | 14 +++ .../Model/Module/AI/AIComponent.cs.meta | 11 +++ Unity/Assets/Model/Module/AI/AIConfig.cs | 35 +++++++ Unity/Assets/Model/Module/AI/AIConfig.cs.meta | 11 +++ .../Model/Module/AI/AIDispatcherComponent.cs | 11 +++ .../Module/AI/AIDispatcherComponent.cs.meta | 11 +++ .../Model/Module/Message/OpcodeHelper.cs | 3 +- Unity/Packages/packages-lock.json | 2 +- Unity/ProjectSettings/ProjectVersion.txt | 4 +- 54 files changed, 823 insertions(+), 104 deletions(-) create mode 100644 Config/AIConfigCategory.bytes create mode 100644 Excel/AIConfig.xlsx create mode 100644 Server/Hotfix/Demo/C2M_StopHandler.cs create mode 100644 Server/Model/Generate/Config/AIConfig.cs create mode 100644 Unity/Assets/Bundles/Config/AIConfigCategory.bytes create mode 100644 Unity/Assets/Bundles/Config/AIConfigCategory.bytes.meta create mode 100644 Unity/Assets/Hotfix/Demo/AI.meta create mode 100644 Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs create mode 100644 Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs.meta create mode 100644 Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs create mode 100644 Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs.meta create mode 100644 Unity/Assets/Hotfix/Demo/AI/XunLuoPathComponentSystem.cs create mode 100644 Unity/Assets/Hotfix/Demo/AI/XunLuoPathComponentSystem.cs.meta create mode 100644 Unity/Assets/Hotfix/Module/AI.meta create mode 100644 Unity/Assets/Hotfix/Module/AI/AIComponentSystem.cs create mode 100644 Unity/Assets/Hotfix/Module/AI/AIComponentSystem.cs.meta create mode 100644 Unity/Assets/Hotfix/Module/AI/AIDispatcherComponentSystem.cs create mode 100644 Unity/Assets/Hotfix/Module/AI/AIDispatcherComponentSystem.cs.meta create mode 100644 Unity/Assets/Model/Demo/AI.meta create mode 100644 Unity/Assets/Model/Demo/AI/XunLuoPathComponent.cs create mode 100644 Unity/Assets/Model/Demo/AI/XunLuoPathComponent.cs.meta create mode 100644 Unity/Assets/Model/Generate/Config/AIConfig.cs create mode 100644 Unity/Assets/Model/Generate/Config/AIConfig.cs.meta create mode 100644 Unity/Assets/Model/Module/AI.meta create mode 100644 Unity/Assets/Model/Module/AI/AAIHandler.cs create mode 100644 Unity/Assets/Model/Module/AI/AAIHandler.cs.meta create mode 100644 Unity/Assets/Model/Module/AI/AIComponent.cs create mode 100644 Unity/Assets/Model/Module/AI/AIComponent.cs.meta create mode 100644 Unity/Assets/Model/Module/AI/AIConfig.cs create mode 100644 Unity/Assets/Model/Module/AI/AIConfig.cs.meta create mode 100644 Unity/Assets/Model/Module/AI/AIDispatcherComponent.cs create mode 100644 Unity/Assets/Model/Module/AI/AIDispatcherComponent.cs.meta diff --git a/Client-Server.sln.DotSettings b/Client-Server.sln.DotSettings index 4ab0dc67..02f4a9b2 100644 --- a/Client-Server.sln.DotSettings +++ b/Client-Server.sln.DotSettings @@ -404,6 +404,7 @@ II.2.12 <HandlesEvent /> True True True + True True True True diff --git a/Config/AIConfigCategory.bytes b/Config/AIConfigCategory.bytes new file mode 100644 index 00000000..79b9eb47 --- /dev/null +++ b/Config/AIConfigCategory.bytes @@ -0,0 +1,4 @@ + +e" AI_Attack +f" AI_XunLuo +" AI_XunLuo \ No newline at end of file diff --git a/Excel/AIConfig.xlsx b/Excel/AIConfig.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..26315397a01b839847f215128a6e1f96063dbbf9 GIT binary patch literal 10331 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 literal 0 HcmV?d00001 diff --git a/Excel/StartSceneConfig.xlsx b/Excel/StartSceneConfig.xlsx index fae6420c0832926bfbffb4687d8ed45c841e90d8..fa8a2371edef36e9b12b781558316841c68035fe 100644 GIT binary patch delta 3747 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 NpCl^=p&$SN006YA|C0a! delta 3775 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 + { + protected override async ETTask Run(Unit unit, C2M_Stop message) + { + unit.Stop(0); + await ETTask.CompletedTask; + } + } +} \ No newline at end of file diff --git a/Server/Hotfix/Demo/Move/MoveHelper.cs b/Server/Hotfix/Demo/Move/MoveHelper.cs index 6efa9327..908e9fb3 100644 --- a/Server/Hotfix/Demo/Move/MoveHelper.cs +++ b/Server/Hotfix/Demo/Move/MoveHelper.cs @@ -9,43 +9,48 @@ namespace ET public static async ETTask FindPathMoveToAsync(this Unit unit, Vector3 target, ETCancellationToken cancellationToken = null) { float speed = unit.GetComponent().GetAsFloat(NumericType.Speed); - if (speed < 0.001) + if (speed < 0.01) { unit.SendStop(-1); return; } + + using var list = ListComponent.Create(); - using (var list = ListComponent.Create()) - { - unit.Domain.GetComponent().SearchPath(10001, unit.Position, target, list.List); + unit.Domain.GetComponent().SearchPath(10001, unit.Position, target, list.List); - List path = list.List; - if (path.Count < 2) - { - unit.SendStop(-2); - return; - } + List path = list.List; + if (path.Count < 2) + { + unit.SendStop(0); + return; + } - // 广播寻路路径 - M2C_PathfindingResult m2CPathfindingResult = new M2C_PathfindingResult(); - m2CPathfindingResult.Id = unit.Id; - for (int i = 0; i < list.List.Count; ++i) - { - Vector3 vector3 = list.List[i]; - m2CPathfindingResult.Xs.Add(vector3.x); - m2CPathfindingResult.Ys.Add(vector3.y); - m2CPathfindingResult.Zs.Add(vector3.z); - } - MessageHelper.Broadcast(unit, m2CPathfindingResult); + // 广播寻路路径 + M2C_PathfindingResult m2CPathfindingResult = new M2C_PathfindingResult(); + m2CPathfindingResult.Id = unit.Id; + for (int i = 0; i < list.List.Count; ++i) + { + Vector3 vector3 = list.List[i]; + m2CPathfindingResult.Xs.Add(vector3.x); + m2CPathfindingResult.Ys.Add(vector3.y); + m2CPathfindingResult.Zs.Add(vector3.z); + } + MessageHelper.Broadcast(unit, m2CPathfindingResult); - bool ret = await unit.GetComponent().MoveToAsync(path, speed); - if (ret) // 如果返回false，说明被其它移动取消了，这时候不需要通知客户端stop - { - unit.SendStop(0); - } + bool ret = await unit.GetComponent().MoveToAsync(path, speed); + if (ret) // 如果返回false，说明被其它移动取消了，这时候不需要通知客户端stop + { + unit.SendStop(0); } } + public static void Stop(this Unit unit, int error) + { + unit.GetComponent().Stop(); + unit.SendStop(error); + } + public static void SendStop(this Unit unit, int error) { MessageHelper.Broadcast(unit, new M2C_Stop() diff --git a/Server/Hotfix/Server.Hotfix.csproj b/Server/Hotfix/Server.Hotfix.csproj index 859ce6b8..eccacdd8 100644 --- a/Server/Hotfix/Server.Hotfix.csproj +++ b/Server/Hotfix/Server.Hotfix.csproj @@ -47,8 +47,10 @@ Module\Numeric\NumericWatcher_Hp_ShowUI.cs - - + + + Module\AI\%(RecursiveDir)%(FileName)%(Extension) + diff --git a/Server/Model/Generate/Config/AIConfig.cs b/Server/Model/Generate/Config/AIConfig.cs new file mode 100644 index 00000000..32582834 --- /dev/null +++ b/Server/Model/Generate/Config/AIConfig.cs @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using MongoDB.Bson.Serialization.Attributes; +using ProtoBuf; + +namespace ET +{ + [ProtoContract] + [Config] + public partial class AIConfigCategory : ProtoObject + { + public static AIConfigCategory Instance; + + [ProtoIgnore] + [BsonIgnore] + private Dictionary dict = new Dictionary(); + + [BsonElement] + [ProtoMember(1)] + private List list = new List(); + + public AIConfigCategory() + { + Instance = this; + } + + [ProtoAfterDeserialization] + public void AfterDeserialization() + { + foreach (AIConfig config in list) + { + this.dict.Add(config.Id, config); + } + list.Clear(); + this.EndInit(); + } + + public AIConfig Get(int id) + { + this.dict.TryGetValue(id, out AIConfig item); + + if (item == null) + { + throw new Exception($"配置找不到，配置表名: {nameof (AIConfig)}，配置id: {id}"); + } + + return item; + } + + public bool Contain(int id) + { + return this.dict.ContainsKey(id); + } + + public Dictionary GetAll() + { + return this.dict; + } + + public AIConfig GetOne() + { + if (this.dict == null || this.dict.Count <= 0) + { + return null; + } + return this.dict.Values.GetEnumerator().Current; + } + } + + [ProtoContract] + public partial class AIConfig: ProtoObject, IConfig + { + [ProtoMember(1, IsRequired = true)] + public int Id { get; set; } + [ProtoMember(2, IsRequired = true)] + public int AIConfigId { get; set; } + [ProtoMember(3, IsRequired = true)] + public int Order { get; set; } + [ProtoMember(4, IsRequired = true)] + public string Name { get; set; } + [ProtoMember(5, IsRequired = true)] + public int[] NodeParams { get; set; } + + + [ProtoAfterDeserialization] + public void AfterDeserialization() + { + this.EndInit(); + } + } +} diff --git a/Server/Model/Generate/Message/OuterMessage.cs b/Server/Model/Generate/Message/OuterMessage.cs index 60737c7d..5fd73193 100644 --- a/Server/Model/Generate/Message/OuterMessage.cs +++ b/Server/Model/Generate/Message/OuterMessage.cs @@ -140,7 +140,7 @@ namespace ET [ProtoMember(93)] public long ActorId { get; set; } - [ProtoMember(1)] + [ProtoMember(2)] public List Units = new List(); } @@ -155,9 +155,6 @@ namespace ET [ProtoMember(93)] public long ActorId { get; set; } - [ProtoMember(94)] - public long Id { get; set; } - [ProtoMember(1)] public float X { get; set; } @@ -169,6 +166,18 @@ namespace ET } + [Message(OuterOpcode.C2M_Stop)] + [ProtoContract] + public partial class C2M_Stop: Object, IActorLocationMessage + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(93)] + public long ActorId { get; set; } + + } + [Message(OuterOpcode.M2C_PathfindingResult)] [ProtoContract] public partial class M2C_PathfindingResult: Object, IActorMessage diff --git a/Server/Model/Generate/Message/OuterOpcode.cs b/Server/Model/Generate/Message/OuterOpcode.cs index ce5c1f5c..3ae840a2 100644 --- a/Server/Model/Generate/Message/OuterOpcode.cs +++ b/Server/Model/Generate/Message/OuterOpcode.cs @@ -11,22 +11,23 @@ namespace ET public const ushort UnitInfo = 20007; public const ushort M2C_CreateUnits = 20008; public const ushort C2M_PathfindingResult = 20009; - public const ushort M2C_PathfindingResult = 20010; - public const ushort M2C_Stop = 20011; - public const ushort C2G_Ping = 20012; - public const ushort G2C_Ping = 20013; - public const ushort G2C_Test = 20014; - public const ushort C2M_Reload = 20015; - public const ushort M2C_Reload = 20016; - public const ushort C2R_Login = 20017; - public const ushort R2C_Login = 20018; - public const ushort C2G_LoginGate = 20019; - public const ushort G2C_LoginGate = 20020; - public const ushort G2C_TestHotfixMessage = 20021; - public const ushort C2M_TestActorRequest = 20022; - public const ushort M2C_TestActorResponse = 20023; - public const ushort PlayerInfo = 20024; - public const ushort C2G_PlayerInfo = 20025; - public const ushort G2C_PlayerInfo = 20026; + public const ushort C2M_Stop = 20010; + public const ushort M2C_PathfindingResult = 20011; + public const ushort M2C_Stop = 20012; + public const ushort C2G_Ping = 20013; + public const ushort G2C_Ping = 20014; + public const ushort G2C_Test = 20015; + public const ushort C2M_Reload = 20016; + public const ushort M2C_Reload = 20017; + public const ushort C2R_Login = 20018; + public const ushort R2C_Login = 20019; + public const ushort C2G_LoginGate = 20020; + public const ushort G2C_LoginGate = 20021; + public const ushort G2C_TestHotfixMessage = 20022; + public const ushort C2M_TestActorRequest = 20023; + public const ushort M2C_TestActorResponse = 20024; + public const ushort PlayerInfo = 20025; + public const ushort C2G_PlayerInfo = 20026; + public const ushort G2C_PlayerInfo = 20027; } } diff --git a/Server/Model/Server.Model.csproj b/Server/Model/Server.Model.csproj index db2cea5b..a31bf03d 100644 --- a/Server/Model/Server.Model.csproj +++ b/Server/Model/Server.Model.csproj @@ -37,6 +37,10 @@ Module\Config\%(RecursiveDir)%(FileName)%(Extension) + + + Module\AI\%(RecursiveDir)%(FileName)%(Extension) + diff --git a/Tools/ExcelExporter/ProtoObject.cs b/Tools/ExcelExporter/ProtoObject.cs index 1e2c0fef..104830d0 100644 --- a/Tools/ExcelExporter/ProtoObject.cs +++ b/Tools/ExcelExporter/ProtoObject.cs @@ -14,12 +14,6 @@ namespace ET { } - [ProtoAfterDeserialization] - public virtual void AfterDeserialization() - { - this.EndInit(); - } - public virtual void EndInit() { } diff --git a/Unity/Assets/Bundles/Config/AIConfigCategory.bytes b/Unity/Assets/Bundles/Config/AIConfigCategory.bytes new file mode 100644 index 00000000..79b9eb47 --- /dev/null +++ b/Unity/Assets/Bundles/Config/AIConfigCategory.bytes @@ -0,0 +1,4 @@ + +e" AI_Attack +f" AI_XunLuo +" AI_XunLuo \ No newline at end of file diff --git a/Unity/Assets/Bundles/Config/AIConfigCategory.bytes.meta b/Unity/Assets/Bundles/Config/AIConfigCategory.bytes.meta new file mode 100644 index 00000000..67bc4026 --- /dev/null +++ b/Unity/Assets/Bundles/Config/AIConfigCategory.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 277d58db3067742a7b32f9994984b3bc +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Demo/AI.meta b/Unity/Assets/Hotfix/Demo/AI.meta new file mode 100644 index 00000000..449f5e36 --- /dev/null +++ b/Unity/Assets/Hotfix/Demo/AI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c430df865ee84f2f9348d817d6596a9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs b/Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs new file mode 100644 index 00000000..c8030911 --- /dev/null +++ b/Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs @@ -0,0 +1,45 @@ +using UnityEngine; + +namespace ET +{ + public class AI_Attack: AAIHandler + { + public override int Check(AIComponent aiComponent, AIConfig aiConfig) + { + long sec = TimeHelper.ClientNow() / 1000 % 15; + if (sec >= 10) + { + return 0; + } + return 1; + } + + public override async ETVoid Execute(AIComponent aiComponent, AIConfig aiConfig, ETCancellationToken cancellationToken) + { + Scene zoneScene = aiComponent.DomainScene(); + + Unit myUnit = zoneScene.GetComponent().MyUnit; + if (myUnit == null) + { + return; + } + + // 停在当前位置 + zoneScene.GetComponent().Session.Send(new C2M_Stop()); + + Log.Debug("开始攻击"); + + for (int i = 0; i < 100000; ++i) + { + Log.Debug($"攻击: {i}次"); + + // 因为协程可能被中断，任何协程都要传入cancellationToken，判断如果是中断则要返回 + bool timeRet = await TimerComponent.Instance.WaitAsync(1000, cancellationToken); + if (!timeRet) + { + return; + } + } + } + } +} \ No newline at end of file diff --git a/Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs.meta b/Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs.meta new file mode 100644 index 00000000..0cdfa382 --- /dev/null +++ b/Unity/Assets/Hotfix/Demo/AI/AI_Attack.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0b11fc1dea7c44643a27b53e790e9a1c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs b/Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs new file mode 100644 index 00000000..948e2f0c --- /dev/null +++ b/Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs @@ -0,0 +1,42 @@ +using UnityEngine; + +namespace ET +{ + public class AI_XunLuo: AAIHandler + { + public override int Check(AIComponent aiComponent, AIConfig aiConfig) + { + long sec = TimeHelper.ClientNow() / 1000 % 15; + if (sec < 10) + { + return 0; + } + return 1; + } + + public override async ETVoid Execute(AIComponent aiComponent, AIConfig aiConfig, ETCancellationToken cancellationToken) + { + Scene zoneScene = aiComponent.DomainScene(); + + Unit myUnit = zoneScene.GetComponent().MyUnit; + if (myUnit == null) + { + return; + } + + Log.Debug("开始巡逻"); + + while (true) + { + XunLuoPathComponent xunLuoPathComponent = myUnit.GetComponent(); + Vector3 nextTarget = xunLuoPathComponent.GetCurrent(); + int ret = await myUnit.MoveToAsync(nextTarget, cancellationToken); + if (ret != 0) + { + return; + } + xunLuoPathComponent.MoveNext(); + } + } + } +} \ No newline at end of file diff --git a/Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs.meta b/Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs.meta new file mode 100644 index 00000000..98aa96f5 --- /dev/null +++ b/Unity/Assets/Hotfix/Demo/AI/AI_XunLuo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dd174eb9071c649bfba0b572fa58f130 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Demo/AI/XunLuoPathComponentSystem.cs b/Unity/Assets/Hotfix/Demo/AI/XunLuoPathComponentSystem.cs new file mode 100644 index 00000000..49d443ea --- /dev/null +++ b/Unity/Assets/Hotfix/Demo/AI/XunLuoPathComponentSystem.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace ET +{ + public static class XunLuoPathComponentSystem + { + public static Vector3 GetCurrent(this XunLuoPathComponent self) + { + return self.path[self.Index]; + } + + public static void MoveNext(this XunLuoPathComponent self) + { + self.Index = ++self.Index % self.path.Length; + } + } +} \ No newline at end of file diff --git a/Unity/Assets/Hotfix/Demo/AI/XunLuoPathComponentSystem.cs.meta b/Unity/Assets/Hotfix/Demo/AI/XunLuoPathComponentSystem.cs.meta new file mode 100644 index 00000000..a86b9c8a --- /dev/null +++ b/Unity/Assets/Hotfix/Demo/AI/XunLuoPathComponentSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cbebec6c70d61475b889cc1a0fe80d6e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Demo/MapHelper.cs b/Unity/Assets/Hotfix/Demo/MapHelper.cs index 8cc9db65..c1904c7c 100644 --- a/Unity/Assets/Hotfix/Demo/MapHelper.cs +++ b/Unity/Assets/Hotfix/Demo/MapHelper.cs @@ -10,6 +10,10 @@ namespace ET try { G2C_EnterMap g2CEnterMap = await zoneScene.GetComponent().Session.Call(new C2G_EnterMap()) as G2C_EnterMap; + + UnitComponent unitComponent = zoneScene.GetComponent(); + unitComponent.MyUnit = unitComponent.Get(g2CEnterMap.UnitId); + Game.EventSystem.Publish(new EventType.EnterMapFinish() {ZoneScene = zoneScene}).Coroutine(); } catch (Exception e) diff --git a/Unity/Assets/Hotfix/Demo/Move/MoveHelper.cs b/Unity/Assets/Hotfix/Demo/Move/MoveHelper.cs index ac6d8ed7..57d7c9b6 100644 --- a/Unity/Assets/Hotfix/Demo/Move/MoveHelper.cs +++ b/Unity/Assets/Hotfix/Demo/Move/MoveHelper.cs @@ -8,7 +8,7 @@ namespace ET // 可以多次调用，多次调用的话会取消上一次的协程 public static async ETTask MoveToAsync(this Unit unit, Vector3 targetPos, ETCancellationToken cancellationToken = null) { - C2M_PathfindingResult msg = new C2M_PathfindingResult(); + C2M_PathfindingResult msg = new C2M_PathfindingResult() {X = targetPos.x, Y = targetPos.y, Z = targetPos.z}; unit.Domain.GetComponent().Session.Send(msg); ObjectWait objectWait = unit.GetComponent(); @@ -17,7 +17,7 @@ namespace ET objectWait.Notify(new WaitType.Wait_UnitStop() { Error = WaitTypeError.Cancel }); // 一直等到unit发送stop - WaitType.Wait_UnitStop waitUnitStop = await objectWait.Wait(); + WaitType.Wait_UnitStop waitUnitStop = await objectWait.Wait(cancellationToken); return waitUnitStop.Error; } } diff --git a/Unity/Assets/Hotfix/Demo/Unit/UnitFactory.cs b/Unity/Assets/Hotfix/Demo/Unit/UnitFactory.cs index ffbc16b4..2b966cd3 100644 --- a/Unity/Assets/Hotfix/Demo/Unit/UnitFactory.cs +++ b/Unity/Assets/Hotfix/Demo/Unit/UnitFactory.cs @@ -16,6 +16,10 @@ namespace ET numericComponent.Set((NumericType)unitInfo.Ks[i], unitInfo.Vs[i]); } + unit.AddComponent(); + + unit.AddComponent(); + UnitComponent unitComponent = domain.GetComponent(); unitComponent.Add(unit); diff --git a/Unity/Assets/Hotfix/Module/AI.meta b/Unity/Assets/Hotfix/Module/AI.meta new file mode 100644 index 00000000..b90d29c7 --- /dev/null +++ b/Unity/Assets/Hotfix/Module/AI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 490f7b30b1f804e9882ec3deb25b6013 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Module/AI/AIComponentSystem.cs b/Unity/Assets/Hotfix/Module/AI/AIComponentSystem.cs new file mode 100644 index 00000000..e7201efb --- /dev/null +++ b/Unity/Assets/Hotfix/Module/AI/AIComponentSystem.cs @@ -0,0 +1,80 @@ +using System; +using UnityEngine; + +namespace ET +{ + [ObjectSystem] + public class AIComponentAwakeSystem: AwakeSystem + { + public override void Awake(AIComponent self, int aiConfigId) + { + self.AIConfigId = aiConfigId; + self.Timer = TimerComponent.Instance.NewRepeatedTimer(1000, self.Check); + } + } + + [ObjectSystem] + public class AIComponentDestroySystem: DestroySystem + { + public override void Destroy(AIComponent self) + { + TimerComponent.Instance.Remove(ref self.Timer); + self.CancellationToken?.Cancel(); + self.CancellationToken = null; + self.Current = 0; + } + } + + public static class AIComponentSystem + { + public static void Check(this AIComponent self) + { + if (self.Parent == null) + { + TimerComponent.Instance.Remove(ref self.Timer); + return; + } + + var oneAI = AIConfigCategory.Instance.AIConfigs[self.AIConfigId]; + + foreach (AIConfig aiConfig in oneAI.Values) + { + + AIDispatcherComponent.Instance.AIHandlers.TryGetValue(aiConfig.Name, out AAIHandler aaiHandler); + + if (aaiHandler == null) + { + Log.Error($"not found aihandler: {aiConfig.Name}"); + continue; + } + + int ret = aaiHandler.Check(self, aiConfig); + if (ret != 0) + { + continue; + } + + if (self.Current == aiConfig.Id) + { + break; + } + + self.Cancel(); // 取消之前的行为 + ETCancellationToken cancellationToken = new ETCancellationToken(); + self.CancellationToken = cancellationToken; + self.Current = aiConfig.Id; + + aaiHandler.Execute(self, aiConfig, cancellationToken).Coroutine(); + return; + } + + } + + private static void Cancel(this AIComponent self) + { + self.CancellationToken?.Cancel(); + self.Current = 0; + self.CancellationToken = null; + } + } +} \ No newline at end of file diff --git a/Unity/Assets/Hotfix/Module/AI/AIComponentSystem.cs.meta b/Unity/Assets/Hotfix/Module/AI/AIComponentSystem.cs.meta new file mode 100644 index 00000000..54a53b3f --- /dev/null +++ b/Unity/Assets/Hotfix/Module/AI/AIComponentSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e782e22b472a243e99f82c93f1b191da +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Module/AI/AIDispatcherComponentSystem.cs b/Unity/Assets/Hotfix/Module/AI/AIDispatcherComponentSystem.cs new file mode 100644 index 00000000..89b13b6f --- /dev/null +++ b/Unity/Assets/Hotfix/Module/AI/AIDispatcherComponentSystem.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace ET +{ + [ObjectSystem] + public class AIDispatcherComponentAwakeSystem: AwakeSystem + { + public override void Awake(AIDispatcherComponent self) + { + AIDispatcherComponent.Instance = self; + self.Load(); + } + } + + [ObjectSystem] + public class AIDispatcherComponentLoadSystem: LoadSystem + { + public override void Load(AIDispatcherComponent self) + { + self.Load(); + } + } + + [ObjectSystem] + public class AIDispatcherComponentDestroySystem: DestroySystem + { + public override void Destroy(AIDispatcherComponent self) + { + self.AIHandlers.Clear(); + AIDispatcherComponent.Instance = null; + } + } + + public static class AIDispatcherComponentSystem + { + public static void Load(this AIDispatcherComponent self) + { + self.AIHandlers.Clear(); + + var types = Game.EventSystem.GetTypes(typeof (AIHandlerAttribute)); + foreach (Type type in types) + { + AAIHandler aaiHandler = Activator.CreateInstance(type) as AAIHandler; + if (aaiHandler == null) + { + Log.Error($"robot ai is not AAIHandler: {type.Name}"); + continue; + } + self.AIHandlers.Add(type.Name, aaiHandler); + } + } + } +} \ No newline at end of file diff --git a/Unity/Assets/Hotfix/Module/AI/AIDispatcherComponentSystem.cs.meta b/Unity/Assets/Hotfix/Module/AI/AIDispatcherComponentSystem.cs.meta new file mode 100644 index 00000000..7d6a02e3 --- /dev/null +++ b/Unity/Assets/Hotfix/Module/AI/AIDispatcherComponentSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4e4f1a7d7c4df49d88b56711a37c25d4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/HotfixView/AppStart_Init.cs b/Unity/Assets/HotfixView/AppStart_Init.cs index 10f94e50..9f38ca9e 100644 --- a/Unity/Assets/HotfixView/AppStart_Init.cs +++ b/Unity/Assets/HotfixView/AppStart_Init.cs @@ -24,6 +24,8 @@ namespace ET Game.Scene.AddComponent(); + Game.Scene.AddComponent(); + ResourcesComponent.Instance.LoadBundle("unit.unity3d"); Scene zoneScene = await SceneFactory.CreateZoneScene(1, "Process"); diff --git a/Unity/Assets/HotfixView/Opera/OperaComponentSystem.cs b/Unity/Assets/HotfixView/Opera/OperaComponentSystem.cs index b58392d3..d9b8770d 100644 --- a/Unity/Assets/HotfixView/Opera/OperaComponentSystem.cs +++ b/Unity/Assets/HotfixView/Opera/OperaComponentSystem.cs @@ -34,25 +34,8 @@ namespace ET self.frameClickMap.Y = self.ClickPoint.y; self.frameClickMap.Z = self.ClickPoint.z; self.DomainScene().GetComponent().Session.Send(self.frameClickMap); - - // 测试actor rpc消息 - self.TestActor().Coroutine(); } } } - - public static async ETVoid TestActor(this OperaComponent self) - { - try - { - M2C_TestActorResponse response = (M2C_TestActorResponse)await self.Domain.GetComponent().Session.Call( - new C2M_TestActorRequest() { Info = "actor rpc request" }); - Log.Info(response.Info); - } - catch (Exception e) - { - Log.Error(e); - } - } } } \ No newline at end of file diff --git a/Unity/Assets/HotfixView/Scene/SceneFactory.cs b/Unity/Assets/HotfixView/Scene/SceneFactory.cs index 6181abed..d65143e2 100644 --- a/Unity/Assets/HotfixView/Scene/SceneFactory.cs +++ b/Unity/Assets/HotfixView/Scene/SceneFactory.cs @@ -8,6 +8,7 @@ namespace ET zoneScene.AddComponent(); zoneScene.AddComponent(); zoneScene.AddComponent(); + zoneScene.AddComponent(1); // UI层的初始化 await Game.EventSystem.Publish(new EventType.AfterCreateZoneScene() {ZoneScene = zoneScene}); diff --git a/Unity/Assets/Model/Core/Object/Object.cs b/Unity/Assets/Model/Core/Object/Object.cs index cc3ee7be..2c273ca7 100644 --- a/Unity/Assets/Model/Core/Object/Object.cs +++ b/Unity/Assets/Model/Core/Object/Object.cs @@ -53,7 +53,7 @@ namespace ET } #endif } - + public override string ToString() { return JsonHelper.ToJson(this); diff --git a/Unity/Assets/Model/Demo/AI.meta b/Unity/Assets/Model/Demo/AI.meta new file mode 100644 index 00000000..73689820 --- /dev/null +++ b/Unity/Assets/Model/Demo/AI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc7b2c776a049435694c2242436e6183 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Demo/AI/XunLuoPathComponent.cs b/Unity/Assets/Model/Demo/AI/XunLuoPathComponent.cs new file mode 100644 index 00000000..afddbbb6 --- /dev/null +++ b/Unity/Assets/Model/Demo/AI/XunLuoPathComponent.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +namespace ET +{ + public class XunLuoPathComponent: Entity + { + public Vector3[] path = new Vector3[] { new Vector3(0, 0, 0), new Vector3(20, 0, 0), new Vector3(20, 0, 20), new Vector3(0, 0, 20), }; + + public int Index; + } +} \ No newline at end of file diff --git a/Unity/Assets/Model/Demo/AI/XunLuoPathComponent.cs.meta b/Unity/Assets/Model/Demo/AI/XunLuoPathComponent.cs.meta new file mode 100644 index 00000000..5a5b7123 --- /dev/null +++ b/Unity/Assets/Model/Demo/AI/XunLuoPathComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8bde98272f7b14c46bfc11f5072d4e9a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Generate/Config/AIConfig.cs b/Unity/Assets/Model/Generate/Config/AIConfig.cs new file mode 100644 index 00000000..32582834 --- /dev/null +++ b/Unity/Assets/Model/Generate/Config/AIConfig.cs @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using MongoDB.Bson.Serialization.Attributes; +using ProtoBuf; + +namespace ET +{ + [ProtoContract] + [Config] + public partial class AIConfigCategory : ProtoObject + { + public static AIConfigCategory Instance; + + [ProtoIgnore] + [BsonIgnore] + private Dictionary dict = new Dictionary(); + + [BsonElement] + [ProtoMember(1)] + private List list = new List(); + + public AIConfigCategory() + { + Instance = this; + } + + [ProtoAfterDeserialization] + public void AfterDeserialization() + { + foreach (AIConfig config in list) + { + this.dict.Add(config.Id, config); + } + list.Clear(); + this.EndInit(); + } + + public AIConfig Get(int id) + { + this.dict.TryGetValue(id, out AIConfig item); + + if (item == null) + { + throw new Exception($"配置找不到，配置表名: {nameof (AIConfig)}，配置id: {id}"); + } + + return item; + } + + public bool Contain(int id) + { + return this.dict.ContainsKey(id); + } + + public Dictionary GetAll() + { + return this.dict; + } + + public AIConfig GetOne() + { + if (this.dict == null || this.dict.Count <= 0) + { + return null; + } + return this.dict.Values.GetEnumerator().Current; + } + } + + [ProtoContract] + public partial class AIConfig: ProtoObject, IConfig + { + [ProtoMember(1, IsRequired = true)] + public int Id { get; set; } + [ProtoMember(2, IsRequired = true)] + public int AIConfigId { get; set; } + [ProtoMember(3, IsRequired = true)] + public int Order { get; set; } + [ProtoMember(4, IsRequired = true)] + public string Name { get; set; } + [ProtoMember(5, IsRequired = true)] + public int[] NodeParams { get; set; } + + + [ProtoAfterDeserialization] + public void AfterDeserialization() + { + this.EndInit(); + } + } +} diff --git a/Unity/Assets/Model/Generate/Config/AIConfig.cs.meta b/Unity/Assets/Model/Generate/Config/AIConfig.cs.meta new file mode 100644 index 00000000..727498e1 --- /dev/null +++ b/Unity/Assets/Model/Generate/Config/AIConfig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 43cfda55a06294993bc33c15d1062d6f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Generate/Message/OuterMessage.cs b/Unity/Assets/Model/Generate/Message/OuterMessage.cs index 60737c7d..5fd73193 100644 --- a/Unity/Assets/Model/Generate/Message/OuterMessage.cs +++ b/Unity/Assets/Model/Generate/Message/OuterMessage.cs @@ -140,7 +140,7 @@ namespace ET [ProtoMember(93)] public long ActorId { get; set; } - [ProtoMember(1)] + [ProtoMember(2)] public List Units = new List(); } @@ -155,9 +155,6 @@ namespace ET [ProtoMember(93)] public long ActorId { get; set; } - [ProtoMember(94)] - public long Id { get; set; } - [ProtoMember(1)] public float X { get; set; } @@ -169,6 +166,18 @@ namespace ET } + [Message(OuterOpcode.C2M_Stop)] + [ProtoContract] + public partial class C2M_Stop: Object, IActorLocationMessage + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(93)] + public long ActorId { get; set; } + + } + [Message(OuterOpcode.M2C_PathfindingResult)] [ProtoContract] public partial class M2C_PathfindingResult: Object, IActorMessage diff --git a/Unity/Assets/Model/Generate/Message/OuterOpcode.cs b/Unity/Assets/Model/Generate/Message/OuterOpcode.cs index ce5c1f5c..3ae840a2 100644 --- a/Unity/Assets/Model/Generate/Message/OuterOpcode.cs +++ b/Unity/Assets/Model/Generate/Message/OuterOpcode.cs @@ -11,22 +11,23 @@ namespace ET public const ushort UnitInfo = 20007; public const ushort M2C_CreateUnits = 20008; public const ushort C2M_PathfindingResult = 20009; - public const ushort M2C_PathfindingResult = 20010; - public const ushort M2C_Stop = 20011; - public const ushort C2G_Ping = 20012; - public const ushort G2C_Ping = 20013; - public const ushort G2C_Test = 20014; - public const ushort C2M_Reload = 20015; - public const ushort M2C_Reload = 20016; - public const ushort C2R_Login = 20017; - public const ushort R2C_Login = 20018; - public const ushort C2G_LoginGate = 20019; - public const ushort G2C_LoginGate = 20020; - public const ushort G2C_TestHotfixMessage = 20021; - public const ushort C2M_TestActorRequest = 20022; - public const ushort M2C_TestActorResponse = 20023; - public const ushort PlayerInfo = 20024; - public const ushort C2G_PlayerInfo = 20025; - public const ushort G2C_PlayerInfo = 20026; + public const ushort C2M_Stop = 20010; + public const ushort M2C_PathfindingResult = 20011; + public const ushort M2C_Stop = 20012; + public const ushort C2G_Ping = 20013; + public const ushort G2C_Ping = 20014; + public const ushort G2C_Test = 20015; + public const ushort C2M_Reload = 20016; + public const ushort M2C_Reload = 20017; + public const ushort C2R_Login = 20018; + public const ushort R2C_Login = 20019; + public const ushort C2G_LoginGate = 20020; + public const ushort G2C_LoginGate = 20021; + public const ushort G2C_TestHotfixMessage = 20022; + public const ushort C2M_TestActorRequest = 20023; + public const ushort M2C_TestActorResponse = 20024; + public const ushort PlayerInfo = 20025; + public const ushort C2G_PlayerInfo = 20026; + public const ushort G2C_PlayerInfo = 20027; } } diff --git a/Unity/Assets/Model/Module/AI.meta b/Unity/Assets/Model/Module/AI.meta new file mode 100644 index 00000000..15d2dc7f --- /dev/null +++ b/Unity/Assets/Model/Module/AI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 167c92d772b01476c983b16abfa46562 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Module/AI/AAIHandler.cs b/Unity/Assets/Model/Module/AI/AAIHandler.cs new file mode 100644 index 00000000..add1d5fa --- /dev/null +++ b/Unity/Assets/Model/Module/AI/AAIHandler.cs @@ -0,0 +1,18 @@ +using System; + +namespace ET +{ + public class AIHandlerAttribute: BaseAttribute + { + } + + [AIHandler] + public abstract class AAIHandler + { + // 检查是否满足条件 + public abstract int Check(AIComponent aiComponent, AIConfig aiConfig); + + // 协程编写必须可以取消 + public abstract ETVoid Execute(AIComponent aiComponent, AIConfig aiConfig, ETCancellationToken cancellationToken); + } +} \ No newline at end of file diff --git a/Unity/Assets/Model/Module/AI/AAIHandler.cs.meta b/Unity/Assets/Model/Module/AI/AAIHandler.cs.meta new file mode 100644 index 00000000..ae1779b0 --- /dev/null +++ b/Unity/Assets/Model/Module/AI/AAIHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4fe4e242d994c449483c3160866a57d7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Module/AI/AIComponent.cs b/Unity/Assets/Model/Module/AI/AIComponent.cs new file mode 100644 index 00000000..043479e8 --- /dev/null +++ b/Unity/Assets/Model/Module/AI/AIComponent.cs @@ -0,0 +1,14 @@ +namespace ET +{ + // 客户端挂在ZoneScene上，服务端挂在Unit上 + public class AIComponent: Entity + { + public int AIConfigId; + + public ETCancellationToken CancellationToken; + + public long Timer; + + public int Current; + } +} \ No newline at end of file diff --git a/Unity/Assets/Model/Module/AI/AIComponent.cs.meta b/Unity/Assets/Model/Module/AI/AIComponent.cs.meta new file mode 100644 index 00000000..f2cdb066 --- /dev/null +++ b/Unity/Assets/Model/Module/AI/AIComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c754f37c484d34e4fa0a9160de407f8f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Module/AI/AIConfig.cs b/Unity/Assets/Model/Module/AI/AIConfig.cs new file mode 100644 index 00000000..ee75fde3 --- /dev/null +++ b/Unity/Assets/Model/Module/AI/AIConfig.cs @@ -0,0 +1,35 @@ +using System.Collections.Generic; +using System.ComponentModel; +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; +using ProtoBuf; + +namespace ET +{ + public partial class AIConfigCategory + { + public Dictionary> AIConfigs = new Dictionary>(); + + public SortedDictionary GetAI(int aiConfigId) + { + return this.AIConfigs[aiConfigId]; + } + + public override void EndInit() + { + base.EndInit(); + + foreach (var kv in this.GetAll()) + { + SortedDictionary aiNodeConfig; + if (!this.AIConfigs.TryGetValue(kv.Value.AIConfigId, out aiNodeConfig)) + { + aiNodeConfig = new SortedDictionary(); + this.AIConfigs.Add(kv.Value.AIConfigId, aiNodeConfig); + } + + aiNodeConfig.Add(kv.Key, kv.Value); + } + } + } +} diff --git a/Unity/Assets/Model/Module/AI/AIConfig.cs.meta b/Unity/Assets/Model/Module/AI/AIConfig.cs.meta new file mode 100644 index 00000000..456fcc26 --- /dev/null +++ b/Unity/Assets/Model/Module/AI/AIConfig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9093f3843f3ee4466a5fc71c53a394b1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Module/AI/AIDispatcherComponent.cs b/Unity/Assets/Model/Module/AI/AIDispatcherComponent.cs new file mode 100644 index 00000000..53d8d9e4 --- /dev/null +++ b/Unity/Assets/Model/Module/AI/AIDispatcherComponent.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; + +namespace ET +{ + public class AIDispatcherComponent: Entity + { + public static AIDispatcherComponent Instance; + + public Dictionary AIHandlers = new Dictionary(); + } +} \ No newline at end of file diff --git a/Unity/Assets/Model/Module/AI/AIDispatcherComponent.cs.meta b/Unity/Assets/Model/Module/AI/AIDispatcherComponent.cs.meta new file mode 100644 index 00000000..c8343181 --- /dev/null +++ b/Unity/Assets/Model/Module/AI/AIDispatcherComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b3ad59713447042a18ef6ff24c957d02 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Module/Message/OpcodeHelper.cs b/Unity/Assets/Model/Module/Message/OpcodeHelper.cs index 0320eb69..d4f6a3ec 100644 --- a/Unity/Assets/Model/Module/Message/OpcodeHelper.cs +++ b/Unity/Assets/Model/Module/Message/OpcodeHelper.cs @@ -6,7 +6,8 @@ namespace ET { private static readonly HashSet ignoreDebugLogMessageSet = new HashSet { - + OuterOpcode.C2G_Ping, + OuterOpcode.G2C_Ping, }; private static bool IsNeedLogMessage(ushort opcode) diff --git a/Unity/Packages/packages-lock.json b/Unity/Packages/packages-lock.json index ba047a29..ada12001 100644 --- a/Unity/Packages/packages-lock.json +++ b/Unity/Packages/packages-lock.json @@ -52,7 +52,7 @@ "url": "https://packages.unity.cn" }, "com.unity.test-framework": { - "version": "1.1.22", + "version": "1.1.24", "depth": 1, "source": "registry", "dependencies": { diff --git a/Unity/ProjectSettings/ProjectVersion.txt b/Unity/ProjectSettings/ProjectVersion.txt index e33fd4ac..ab9a1efa 100644 --- a/Unity/ProjectSettings/ProjectVersion.txt +++ b/Unity/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.0f1c1 -m_EditorVersionWithRevision: 2020.3.0f1c1 (1e553bf703d9) +m_EditorVersion: 2020.3.3f1c1 +m_EditorVersionWithRevision: 2020.3.3f1c1 (a34b99c2c582) -- GitLab