etetet package从ET中移除

Packages/cn.etetet.actorlocation/Ignore.ET.ActorLocation.asmdef

@@ -1,16 +0,0 @@
-{
-    "name": "Ignore.ET.ActorLocation",
-    "rootNamespace": "",
-    "references": [],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [
-        "IGNORE"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

Packages/cn.etetet.actorlocation/Ignore.ET.ActorLocation.asmdef.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4316cb3baa7123e40a4dfe87d3d447b3
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/LICENSE

@@ -1,30 +0,0 @@
-ET License
-
-1. 该ET版本版权属于广州市一踢互联网科技有限公司所有。  
-2. 该ET版本可以任意修改代码，或者在ET基础上添加代码，但是仅限于自己或者自己任职的公司使用，不得传播给他人，私下传播ET修改版或者基于ET开发的代码都是违反ET License的行为  
-3. 自行修改的代码或者在ET基础上添加的代码，如果要分享给他人使用，必须以Package的形式放到ET的Package仓库中，具体请咨询广州市一踢互联网科技有限公司的唐海，QQ:80081771  
-4. 该版本可以用于开发任何商业项目。在项目上线运营之前必须主动通知广州市一踢互联网科技有限公司上线项目的名称，上线项目的公司等信息。广州市一踢互联网科技有限公司不会泄露这些信息，仅仅作为统计使用，如果需要公布，则会获得上线项目公司的许可  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Packages/cn.etetet.actorlocation/LICENSE.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 02de30c85d9e7544ab621e9d2678a6bc
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/PackageConfig.asset

@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d54714756eb2c264a9e75f3e033bb25f, type: 3}
-  m_Name: PackageConfig
-  m_EditorClassIdentifier: 
-  Id: 3
-  Name: ActorLocation
-  CreatePackageTypeFile: 1

Packages/cn.etetet.actorlocation/PackageConfig.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 502c19e0cdf62524698af5c7917e3990
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Proto.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8c79b8edb72990f4c8030c2a01b36a4a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Proto/ActorLocation_S_20100.proto

@@ -1,82 +0,0 @@
-
-syntax = "proto3";
-
-package ET;
-
-// ResponseType ObjectAddResponse
-message ObjectAddRequest // IRequest
-{
-	int32 RpcId = 1;
-	int32 Type = 2;
-	int64 Key = 3;
-	ActorId ActorId = 4;
-}
-
-message ObjectAddResponse // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-}
-
-// ResponseType ObjectLockResponse
-message ObjectLockRequest // IRequest
-{
-	int32 RpcId = 1;
-	int32 Type = 2;
-	int64 Key = 3;
-	ActorId ActorId = 4;
-	int32 Time = 5;
-}
-message ObjectLockResponse // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-}
-
-// ResponseType ObjectUnLockResponse
-message ObjectUnLockRequest // IRequest
-{
-	int32 RpcId = 1;
-	int32 Type = 2;
-	int64 Key = 3;
-	ActorId OldActorId = 4;
-	ActorId NewActorId = 5;
-}
-message ObjectUnLockResponse // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-}
-
-// ResponseType ObjectRemoveResponse
-message ObjectRemoveRequest // IRequest
-{
-	int32 RpcId = 1;
-	int32 Type = 2;
-	int64 Key = 3;
-}
-message ObjectRemoveResponse // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-}
-
-// ResponseType ObjectGetResponse
-message ObjectGetRequest // IRequest
-{
-	int32 RpcId = 1;
-	int32 Type = 2;
-	int64 Key = 3;
-}
-message ObjectGetResponse // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-	int32 Type = 4;
-	ActorId ActorId = 5;
-}

Packages/cn.etetet.actorlocation/Proto/ActorLocation_S_20100.proto.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8d4f74e2f9836e24a9b732da07844c9e
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b6f335f5b9478c845b2c916948158d68
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f19752c38fa79a34494f2ecf95cfb023
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d9bc21a46418bbd4a9f291daf9fb4193
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/FiberInit_Location.cs

@@ -1,21 +0,0 @@
-using System.Net;
-
-namespace ET.Server
-{
-    [Invoke(SceneType.Location)]
-    public class FiberInit_Location: AInvokeHandler<FiberInit, ETTask>
-    {
-        public override async ETTask Handle(FiberInit fiberInit)
-        {
-            Scene root = fiberInit.Fiber.Root;
-            root.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
-            root.AddComponent<TimerComponent>();
-            root.AddComponent<CoroutineLockComponent>();
-            root.AddComponent<ProcessInnerSender>();
-            root.AddComponent<MessageSender>();
-            root.AddComponent<LocationManagerComoponent>();
-
-            await ETTask.CompletedTask;
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/FiberInit_Location.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a765e3336d419244098009aaaef5a0c9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/LocationOneTypeSystem.cs

@@ -1,140 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    [EntitySystemOf(typeof(LockInfo))]
-    [FriendOf(typeof(LockInfo))]
-    public static partial class LockInfoSystem
-    {
-        [EntitySystem]
-        private static void Awake(this LockInfo self, ActorId lockActorId, CoroutineLock coroutineLock)
-        {
-            self.CoroutineLock = coroutineLock;
-            self.LockActorId = lockActorId;
-        }
-        
-        [EntitySystem]
-        private static void Destroy(this LockInfo self)
-        {
-            self.CoroutineLock.Dispose();
-            self.LockActorId = default;
-        }
-    }
-    
-
-    [EntitySystemOf(typeof(LocationOneType))]
-    [FriendOf(typeof(LocationOneType))]
-    [FriendOf(typeof(LockInfo))]
-    public static partial class LocationOneTypeSystem
-    {
-        [EntitySystem]
-        private static void Awake(this LocationOneType self)
-        {
-        }
-        
-        public static async ETTask Add(this LocationOneType self, long key, ActorId instanceId)
-        {
-            long coroutineLockType = (self.Id << 32) | CoroutineLockType.Location;
-            using (await self.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, key))
-            {
-                self.locations[key] = instanceId;
-                Log.Info($"location add key: {key} instanceId: {instanceId}");
-            }
-        }
-
-        public static async ETTask Remove(this LocationOneType self, long key)
-        {
-            long coroutineLockType = (self.Id << 32) | CoroutineLockType.Location;
-            using (await self.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, key))
-            {
-                self.locations.Remove(key);
-                Log.Info($"location remove key: {key}");
-            }
-        }
-
-        public static async ETTask Lock(this LocationOneType self, long key, ActorId actorId, int time = 0)
-        {
-            long coroutineLockType = (self.Id << 32) | CoroutineLockType.Location;
-            CoroutineLock coroutineLock = await self.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, key);
-
-            LockInfo lockInfo = self.AddChild<LockInfo, ActorId, CoroutineLock>(actorId, coroutineLock);
-            self.lockInfos.Add(key, lockInfo);
-
-            Log.Info($"location lock key: {key} instanceId: {actorId}");
-
-            if (time > 0)
-            {
-                async ETTask TimeWaitAsync()
-                {
-                    long lockInfoInstanceId = lockInfo.InstanceId;
-                    await self.Root().GetComponent<TimerComponent>().WaitAsync(time);
-                    if (lockInfo.InstanceId != lockInfoInstanceId)
-                    {
-                        return;
-                    }
-                    Log.Info($"location timeout unlock key: {key} instanceId: {actorId} newInstanceId: {actorId}");
-                    self.UnLock(key, actorId, actorId);
-                }
-                TimeWaitAsync().NoContext();
-            }
-        }
-
-        public static void UnLock(this LocationOneType self, long key, ActorId oldActorId, ActorId newInstanceId)
-        {
-            if (!self.lockInfos.TryGetValue(key, out EntityRef<LockInfo> lockInfoRef))
-            {
-                Log.Error($"location unlock not found key: {key} {oldActorId}");
-                return;
-            }
-
-            LockInfo lockInfo = lockInfoRef;
-            if (oldActorId != lockInfo.LockActorId)
-            {
-                Log.Error($"location unlock oldInstanceId is different: {key} {oldActorId}");
-                return;
-            }
-
-            Log.Info($"location unlock key: {key} instanceId: {oldActorId} newInstanceId: {newInstanceId}");
-
-            self.locations[key] = newInstanceId;
-
-            self.lockInfos.Remove(key);
-
-            // 解锁
-            lockInfo.Dispose();
-        }
-
-        public static async ETTask<ActorId> Get(this LocationOneType self, long key)
-        {
-            long coroutineLockType = (self.Id << 32) | CoroutineLockType.Location;
-            using (await self.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, key))
-            {
-                self.locations.TryGetValue(key, out ActorId actorId);
-                Log.Info($"location get key: {key} actorId: {actorId}");
-                return actorId;
-            }
-        }
-    }
-
-    [EntitySystemOf(typeof(LocationManagerComoponent))]
-    [FriendOf(typeof(LocationManagerComoponent))]
-    public static partial class LocationComoponentSystem
-    {
-        [EntitySystem]
-        private static void Awake(this LocationManagerComoponent self)
-        {
-        }
-        
-        public static LocationOneType Get(this LocationManagerComoponent self, int locationType)
-        {
-            LocationOneType locationOneType = self.GetChild<LocationOneType>(locationType);
-            if (locationOneType != null)
-            {
-                return locationOneType;
-            }
-            locationOneType = self.AddChildWithId<LocationOneType>(locationType);
-            return locationOneType;
-        }
-
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/LocationOneTypeSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a563e024756f38a41ac858b65be8c591
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/LocationProxyComponentSystem.cs

@@ -1,85 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    public static partial class LocationProxyComponentSystem
-    {
-        private static ActorId GetLocationSceneId(long key)
-        {
-            return LocationConfigSingleton.Instance.GetLocation(key).ActorId;
-        }
-
-        public static async ETTask Add(this LocationProxyComponent self, int type, long key, ActorId actorId)
-        {
-            Fiber fiber = self.Fiber();
-            Log.Info($"location proxy add {key}, {actorId} {TimeInfo.Instance.ServerNow()}");
-            ObjectAddRequest objectAddRequest = ObjectAddRequest.Create();
-            objectAddRequest.Type = type;
-            objectAddRequest.Key = key;
-            objectAddRequest.ActorId = actorId;
-            await fiber.Root.GetComponent<MessageSender>().Call(GetLocationSceneId(key), objectAddRequest);
-        }
-
-        public static async ETTask Lock(this LocationProxyComponent self, int type, long key, ActorId actorId, int time = 60000)
-        {
-            Fiber fiber = self.Fiber();
-            Log.Info($"location proxy lock {key}, {actorId} {TimeInfo.Instance.ServerNow()}");
-
-            ObjectLockRequest objectLockRequest = ObjectLockRequest.Create();
-            objectLockRequest.Type = type;
-            objectLockRequest.Key = key;
-            objectLockRequest.ActorId = actorId;
-            objectLockRequest.Time = time;
-            await fiber.Root.GetComponent<MessageSender>().Call(GetLocationSceneId(key), objectLockRequest);
-        }
-
-        public static async ETTask UnLock(this LocationProxyComponent self, int type, long key, ActorId oldActorId, ActorId newActorId)
-        {
-            Fiber fiber = self.Fiber();
-            Log.Info($"location proxy unlock {key}, {newActorId} {TimeInfo.Instance.ServerNow()}");
-            ObjectUnLockRequest objectUnLockRequest = ObjectUnLockRequest.Create();
-            objectUnLockRequest.Type = type;
-            objectUnLockRequest.Key = key;
-            objectUnLockRequest.OldActorId = oldActorId;
-            objectUnLockRequest.NewActorId = newActorId;
-            await fiber.Root.GetComponent<MessageSender>().Call(GetLocationSceneId(key), objectUnLockRequest);
-        }
-
-        public static async ETTask Remove(this LocationProxyComponent self, int type, long key)
-        {
-            Fiber fiber = self.Fiber();
-            Log.Info($"location proxy remove {key}, {TimeInfo.Instance.ServerNow()}");
-
-            ObjectRemoveRequest objectRemoveRequest = ObjectRemoveRequest.Create();
-            objectRemoveRequest.Type = type;
-            objectRemoveRequest.Key = key;
-            await fiber.Root.GetComponent<MessageSender>().Call(GetLocationSceneId(key), objectRemoveRequest);
-        }
-
-        public static async ETTask<ActorId> Get(this LocationProxyComponent self, int type, long key)
-        {
-            if (key == 0)
-            {
-                throw new Exception($"get location key 0");
-            }
-
-            // location server配置到共享区，一个大战区可以配置N多个location server,这里暂时为1
-            ObjectGetRequest objectGetRequest = ObjectGetRequest.Create();
-            objectGetRequest.Type = type;
-            objectGetRequest.Key = key;
-            ObjectGetResponse response =
-                    (ObjectGetResponse) await self.Root().GetComponent<MessageSender>().Call(GetLocationSceneId(key), objectGetRequest);
-            return response.ActorId;
-        }
-
-        public static async ETTask AddLocation(this Entity self, int type)
-        {
-            await self.Root().GetComponent<LocationProxyComponent>().Add(type, self.Id, self.GetActorId());
-        }
-
-        public static async ETTask RemoveLocation(this Entity self, int type)
-        {
-            await self.Root().GetComponent<LocationProxyComponent>().Remove(type, self.Id);
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/LocationProxyComponentSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c874c2f355e85844d952ac7921583005
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MailBoxType_OrderedMessageHandler.cs

@@ -1,39 +0,0 @@
-namespace ET
-{
-    [Invoke(MailBoxType.OrderedMessage)]
-    public class MailBoxType_OrderedMessageHandler: AInvokeHandler<MailBoxInvoker>
-    {
-        public override void Handle(MailBoxInvoker args)
-        {
-            HandleInner(args).NoContext();
-        }
-
-        private static async ETTask HandleInner(MailBoxInvoker args)
-        {
-            MailBoxComponent mailBoxComponent = args.MailBoxComponent;
-            
-            MessageObject messageObject = args.MessageObject;
-
-            Fiber fiber = mailBoxComponent.Fiber();
-            if (fiber.IsDisposed)
-            {
-                return;
-            }
-
-            long instanceId = mailBoxComponent.InstanceId;
-            using (await fiber.Root.GetComponent<CoroutineLockComponent>().Wait(CoroutineLockType.Mailbox, mailBoxComponent.ParentInstanceId))
-            {
-                if (mailBoxComponent.InstanceId != instanceId)
-                {
-                    if (messageObject is IRequest request)
-                    {
-                        IResponse resp = MessageHelper.CreateResponse(request.GetType(), request.RpcId, ErrorCore.ERR_NotFoundActor);
-                        mailBoxComponent.Root().GetComponent<ProcessInnerSender>().Reply(args.FromAddress, resp);
-                    }
-                    return;
-                }
-                await MessageDispatcher.Instance.Handle(mailBoxComponent.Parent, args.FromAddress, messageObject);
-            }
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MailBoxType_OrderedMessageHandler.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a9c4b26ad1534c74587a35a5a314b604
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MessageLocationHandler.cs

@@ -1,100 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    public abstract class MessageLocationHandler<E, Message>: HandlerObject, IMHandler where E : Entity where Message : class, ILocationMessage
-    {
-        protected abstract ETTask Run(E entity, Message message);
-
-        public async ETTask Handle(Entity entity, Address fromAddress, MessageObject actorMessage)
-        {
-            Fiber fiber = entity.Fiber();
-            if (actorMessage is not Message message)
-            {
-                Log.Error($"消息类型转换错误: {actorMessage.GetType().FullName} to {typeof (Message).Name}");
-                return;
-            }
-
-            if (entity is not E e)
-            {
-                Log.Error($"Actor类型转换错误: {entity.GetType().FullName} to {typeof (E).FullName} --{typeof (Message).FullName}");
-                return;
-            }
-            
-            MessageResponse response = ObjectPool.Fetch<MessageResponse>();
-            response.RpcId = message.RpcId;
-            fiber.Root.GetComponent<ProcessInnerSender>().Reply(fromAddress, response);
-
-            await this.Run(e, message);
-        }
-
-        public Type GetRequestType()
-        {
-            return typeof (Message);
-        }
-
-        public Type GetResponseType()
-        {
-            return typeof (MessageResponse);
-        }
-    }
-    
-    
-    
-    public abstract class MessageLocationHandler<E, Request, Response>: HandlerObject, IMHandler where E : Entity where Request : MessageObject, ILocationRequest where Response : MessageObject, ILocationResponse
-    {
-        protected abstract ETTask Run(E unit, Request request, Response response);
-
-        public async ETTask Handle(Entity entity, Address fromAddress, MessageObject actorMessage)
-        {
-            try
-            {
-                Fiber fiber = entity.Fiber();
-                if (actorMessage is not Request request)
-                {
-                    Log.Error($"消息类型转换错误: {actorMessage.GetType().FullName} to {typeof (Request).Name}");
-                    return;
-                }
-
-                if (entity is not E ee)
-                {
-                    Log.Error($"Actor类型转换错误: {entity.GetType().FullName} to {typeof (E).FullName} --{typeof (Request).FullName}");
-                    return;
-                }
-
-                int rpcId = request.RpcId;
-                Response response = ObjectPool.Fetch<Response>();
-                try
-                {
-                    await this.Run(ee, request, response);
-                }
-                catch (RpcException exception)
-                {
-                    response.Error = exception.Error;
-                    response.Message = exception.ToString();
-                }
-                catch (Exception exception)
-                {
-                    response.Error = ErrorCore.ERR_RpcFail;
-                    response.Message = exception.ToString();
-                }
-                response.RpcId = rpcId;
-                fiber.Root.GetComponent<ProcessInnerSender>().Reply(fromAddress, response);
-            }
-            catch (Exception e)
-            {
-                throw new Exception($"解释消息失败: {actorMessage.GetType().FullName}", e);
-            }
-        }
-
-        public Type GetRequestType()
-        {
-            return typeof (Request);
-        }
-
-        public Type GetResponseType()
-        {
-            return typeof (Response);
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MessageLocationHandler.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 177574b1827ee3646b70e86bb76320b5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MessageLocationSenderComponentSystem.cs

@@ -1,304 +0,0 @@
-using System;
-using System.IO;
-using MongoDB.Bson;
-
-namespace ET.Server
-{
-    [EntitySystemOf(typeof(MessageLocationSenderOneType))]
-    [FriendOf(typeof(MessageLocationSenderOneType))]
-    [FriendOf(typeof(MessageLocationSender))]
-    public static partial class MessageLocationSenderComponentSystem
-    {
-        [Invoke(TimerInvokeType.MessageLocationSenderChecker)]
-        public class MessageLocationSenderChecker: ATimer<MessageLocationSenderOneType>
-        {
-            protected override void Run(MessageLocationSenderOneType self)
-            {
-                try
-                {
-                    self.Check();
-                }
-                catch (Exception e)
-                {
-                    Log.Error($"move timer error: {self.Id}\n{e}");
-                }
-            }
-        }
-    
-        [EntitySystem]
-        private static void Awake(this MessageLocationSenderOneType self)
-        {
-            // 每10s扫描一次过期的actorproxy进行回收,过期时间是2分钟
-            // 可能由于bug或者进程挂掉，导致ActorLocationSender发送的消息没有确认，结果无法自动删除，每一分钟清理一次这种ActorLocationSender
-            self.CheckTimer = self.Root().GetComponent<TimerComponent>().NewRepeatedTimer(10 * 1000, TimerInvokeType.MessageLocationSenderChecker, self);
-        }
-        
-        [EntitySystem]
-        private static void Destroy(this MessageLocationSenderOneType self)
-        {
-            self.Root().GetComponent<TimerComponent>()?.Remove(ref self.CheckTimer);
-        }
-
-        private static void Check(this MessageLocationSenderOneType self)
-        {
-            using (ListComponent<long> list = ListComponent<long>.Create())
-            {
-                long timeNow = TimeInfo.Instance.ServerNow();
-                foreach ((long key, Entity value) in self.Children)
-                {
-                    MessageLocationSender messageLocationMessageSender = (MessageLocationSender) value;
-
-                    if (timeNow > messageLocationMessageSender.LastSendOrRecvTime + MessageLocationSenderOneType.TIMEOUT_TIME)
-                    {
-                        list.Add(key);
-                    }
-                }
-
-                foreach (long id in list)
-                {
-                    self.Remove(id);
-                }
-            }
-        }
-
-        private static MessageLocationSender GetOrCreate(this MessageLocationSenderOneType self, long id)
-        {
-            if (id == 0)
-            {
-                throw new Exception($"actor id is 0");
-            }
-
-            if (self.Children.TryGetValue(id, out Entity actorLocationSender))
-            {
-                return (MessageLocationSender) actorLocationSender;
-            }
-
-            actorLocationSender = self.AddChildWithId<MessageLocationSender>(id);
-            return (MessageLocationSender) actorLocationSender;
-        }
-
-        // 有需要主动删除actorMessageSender的需求，比如断线重连，玩家登录了不同的Gate，这时候需要通知map删掉之前的actorMessageSender
-        // 然后重新创建新的，重新请求新的ActorId
-        public static void Remove(this MessageLocationSenderOneType self, long id)
-        {
-            if (!self.Children.TryGetValue(id, out Entity actorMessageSender))
-            {
-                return;
-            }
-
-            actorMessageSender.Dispose();
-        }
-        
-        // 发给不会改变位置的actorlocation用这个，这种actor消息不会阻塞发送队列，性能更高
-        // 发送过去找不到actor不会重试,用此方法，你得保证actor提前注册好了location
-        public static async ETTask Send(this MessageLocationSenderOneType self, long entityId, IMessage message)
-        {
-            await self.SendInner(entityId, message);
-        }
-        
-        private static async ETTask SendInner(this MessageLocationSenderOneType self, long entityId, IMessage message)
-        {
-            MessageLocationSender messageLocationSender = self.GetOrCreate(entityId);
-
-            Scene root = self.Root();
-            
-            if (messageLocationSender.ActorId != default)
-            {
-                messageLocationSender.LastSendOrRecvTime = TimeInfo.Instance.ServerNow();
-                root.GetComponent<MessageSender>().Send(messageLocationSender.ActorId, message);
-                return;
-            }
-            
-            long instanceId = messageLocationSender.InstanceId;
-            
-            long coroutineLockType = (self.Id << 32) | CoroutineLockType.MessageLocationSender;
-            using (await root.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, entityId))
-            {
-                if (messageLocationSender.InstanceId != instanceId)
-                {
-                    throw new RpcException(ErrorCore.ERR_MessageTimeout, $"{message}");
-                }
-                
-                if (messageLocationSender.ActorId == default)
-                {
-                    messageLocationSender.ActorId = await root.GetComponent<LocationProxyComponent>().Get((int)self.Id, messageLocationSender.Id);
-                    if (messageLocationSender.InstanceId != instanceId)
-                    {
-                        throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout2, $"{message}");
-                    }
-                }
-                
-                messageLocationSender.LastSendOrRecvTime = TimeInfo.Instance.ServerNow();
-                root.GetComponent<MessageSender>().Send(messageLocationSender.ActorId, message);
-            }
-        }
-
-        // 发给不会改变位置的actorlocation用这个，这种actor消息不会阻塞发送队列，性能更高，发送过去找不到actor不会重试
-        // 发送过去找不到actor不会重试,用此方法，你得保证actor提前注册好了location
-        public static async ETTask<IResponse> Call(this MessageLocationSenderOneType self, long entityId, IRequest request)
-        {
-            MessageLocationSender messageLocationSender = self.GetOrCreate(entityId);
-
-            Scene root = self.Root();
-            
-            if (messageLocationSender.ActorId != default)
-            {
-                messageLocationSender.LastSendOrRecvTime = TimeInfo.Instance.ServerNow();
-                return await root.GetComponent<MessageSender>().Call(messageLocationSender.ActorId, request);
-            }
-            
-            long instanceId = messageLocationSender.InstanceId;
-            
-            long coroutineLockType = (self.Id << 32) | CoroutineLockType.MessageLocationSender;
-            using (await root.GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, entityId))
-            {
-                if (messageLocationSender.InstanceId != instanceId)
-                {
-                    throw new RpcException(ErrorCore.ERR_MessageTimeout, $"{request}");
-                }
-
-                if (messageLocationSender.ActorId == default)
-                {
-                    messageLocationSender.ActorId = await root.GetComponent<LocationProxyComponent>().Get((int)self.Id, messageLocationSender.Id);
-                    if (messageLocationSender.InstanceId != instanceId)
-                    {
-                        throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout2, $"{request}");
-                    }
-                }
-            }
-
-            messageLocationSender.LastSendOrRecvTime = TimeInfo.Instance.ServerNow();
-            return await root.GetComponent<MessageSender>().Call(messageLocationSender.ActorId, request);
-        }
-
-        public static void Send(this MessageLocationSenderOneType self, long entityId, ILocationMessage message)
-        {
-            self.Call(entityId, message).NoContext();
-        }
-
-        public static async ETTask<IResponse> Call(this MessageLocationSenderOneType self, long entityId, ILocationRequest iRequest)
-        {
-            MessageLocationSender messageLocationSender = self.GetOrCreate(entityId);
-
-            Scene root = self.Root();
-            Type iRequestType = iRequest.GetType();
-            long actorLocationSenderInstanceId = messageLocationSender.InstanceId;
-            long coroutineLockType = (self.Id << 32) | CoroutineLockType.MessageLocationSender;
-            using (await root.GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, entityId))
-            {
-                if (messageLocationSender.InstanceId != actorLocationSenderInstanceId)
-                {
-                    throw new RpcException(ErrorCore.ERR_NotFoundActor, $"{iRequest}");
-                }
-
-                try
-                {
-                    return await self.CallInner(messageLocationSender, iRequest);
-                }
-                catch (RpcException)
-                {
-                    self.Remove(messageLocationSender.Id);
-                    throw;
-                }
-                catch (Exception e)
-                {
-                    self.Remove(messageLocationSender.Id);
-                    throw new Exception($"{iRequestType.FullName}", e);
-                }
-            }
-        }
-
-        private static async ETTask<IResponse> CallInner(this MessageLocationSenderOneType self, MessageLocationSender messageLocationSender, IRequest iRequest)
-        {
-            int failTimes = 0;
-            long instanceId = messageLocationSender.InstanceId;
-            messageLocationSender.LastSendOrRecvTime = TimeInfo.Instance.ServerNow();
-            
-            Scene root = self.Root();
-
-            Type requestType = iRequest.GetType();
-            while (true)
-            {
-                if (messageLocationSender.ActorId == default)
-                {
-                    messageLocationSender.ActorId = await root.GetComponent<LocationProxyComponent>().Get((int)self.Id, messageLocationSender.Id);
-                    if (messageLocationSender.InstanceId != instanceId)
-                    {
-                        throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout2, $"{iRequest}");
-                    }
-                }
-
-                if (messageLocationSender.ActorId == default)
-                {
-                    return MessageHelper.CreateResponse(requestType, 0, ErrorCore.ERR_NotFoundActor);
-                }
-                IResponse response = await root.GetComponent<MessageSender>().Call(messageLocationSender.ActorId, iRequest, needException: false);
-                
-                if (messageLocationSender.InstanceId != instanceId)
-                {
-                    throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout3, $"{requestType.FullName}");
-                }
-                
-                switch (response.Error)
-                {
-                    case ErrorCore.ERR_NotFoundActor:
-                    {
-                        // 如果没找到Actor,重试
-                        ++failTimes;
-                        if (failTimes > 20)
-                        {
-                            Log.Debug($"actor send message fail, actorid: {messageLocationSender.Id} {requestType.FullName}");
-                            
-                            // 这里删除actor，后面等待发送的消息会判断InstanceId，InstanceId不一致返回ERR_NotFoundActor
-                            self.Remove(messageLocationSender.Id);
-                            return response;
-                        }
-
-                        // 等待0.5s再发送
-                        await root.GetComponent<TimerComponent>().WaitAsync(500);
-                        if (messageLocationSender.InstanceId != instanceId)
-                        {
-                            throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout4, $"{requestType.FullName}");
-                        }
-
-                        messageLocationSender.ActorId = default;
-                        continue;
-                    }
-                    case ErrorCore.ERR_MessageTimeout:
-                    {
-                        throw new RpcException(response.Error, $"{requestType.FullName}");
-                    }
-                }
-
-                if (ErrorCore.IsRpcNeedThrowException(response.Error))
-                {
-                    throw new RpcException(response.Error, $"Message: {response.Message} Request: {requestType.FullName}");
-                }
-
-                return response;
-            }
-        }
-    }
-
-    [EntitySystemOf(typeof(MessageLocationSenderComponent))]
-    [FriendOf(typeof (MessageLocationSenderComponent))]
-    public static partial class MessageLocationSenderManagerComponentSystem
-    {
-        [EntitySystem]
-        private static void Awake(this MessageLocationSenderComponent self)
-        {
-        }
-        
-        public static MessageLocationSenderOneType Get(this MessageLocationSenderComponent self, int locationType)
-        {
-            MessageLocationSenderOneType messageLocationSenderOneType = self.GetChild<MessageLocationSenderOneType>(locationType);
-            if (messageLocationSenderOneType != null)
-            {
-                return messageLocationSenderOneType;
-            }
-
-            messageLocationSenderOneType = self.AddChildWithId<MessageLocationSenderOneType>(locationType);
-            return messageLocationSenderOneType;
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MessageLocationSenderComponentSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4ab90133ddd27b346845933a813ee425
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MessageLocationSenderSystem.cs

@@ -1,23 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    [EntitySystemOf(typeof(MessageLocationSender))]
-    public static partial class MessageLocationSenderSystem
-    {
-        [EntitySystem]
-        private static void Awake(this MessageLocationSender self)
-        {
-            self.LastSendOrRecvTime = TimeInfo.Instance.ServerNow();
-            self.ActorId = default;
-        }
-        
-        [EntitySystem]
-        private static void Destroy(this MessageLocationSender self)
-        {
-            Log.Debug($"actor location remove: {self.Id}");
-            self.LastSendOrRecvTime = 0;
-            self.ActorId = default;
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MessageLocationSenderSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 12606945916b91946b67b2b42abc87d2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectAddRequestHandler.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    [MessageHandler(SceneType.Location)]
-    public class ObjectAddRequestHandler: MessageHandler<Scene, ObjectAddRequest, ObjectAddResponse>
-    {
-        protected override async ETTask Run(Scene scene, ObjectAddRequest request, ObjectAddResponse response)
-        {
-            await scene.GetComponent<LocationManagerComoponent>().Get(request.Type).Add(request.Key, request.ActorId);
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectAddRequestHandler.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: aabdab1f6eb150d4b9f83d277cdf0d39
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectGetRequestHandler.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    [MessageHandler(SceneType.Location)]
-    public class ObjectGetRequestHandler: MessageHandler<Scene, ObjectGetRequest, ObjectGetResponse>
-    {
-        protected override async ETTask Run(Scene scene, ObjectGetRequest request, ObjectGetResponse response)
-        {
-            response.ActorId = await scene.GetComponent<LocationManagerComoponent>().Get(request.Type).Get(request.Key);
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectGetRequestHandler.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 092b093e96029c147abb788904b64174
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectLockRequestHandler.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    [MessageHandler(SceneType.Location)]
-    public class ObjectLockRequestHandler: MessageHandler<Scene, ObjectLockRequest, ObjectLockResponse>
-    {
-        protected override async ETTask Run(Scene scene, ObjectLockRequest request, ObjectLockResponse response)
-        {
-            await scene.GetComponent<LocationManagerComoponent>().Get(request.Type).Lock(request.Key, request.ActorId, request.Time);
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectLockRequestHandler.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4c748d6282bbc934e9ba075514eb96ea
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectRemoveRequestHandler.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    [MessageHandler(SceneType.Location)]
-    public class ObjectRemoveRequestHandler: MessageHandler<Scene, ObjectRemoveRequest, ObjectRemoveResponse>
-    {
-        protected override async ETTask Run(Scene scene, ObjectRemoveRequest request, ObjectRemoveResponse response)
-        {
-            await scene.GetComponent<LocationManagerComoponent>().Get(request.Type).Remove(request.Key);
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectRemoveRequestHandler.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 84a0a52c9b304604c98a750ab04dc64d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectUnLockRequestHandler.cs

@@ -1,15 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    [MessageHandler(SceneType.Location)]
-    public class ObjectUnLockRequestHandler: MessageHandler<Scene, ObjectUnLockRequest, ObjectUnLockResponse>
-    {
-        protected override async ETTask Run(Scene scene, ObjectUnLockRequest request, ObjectUnLockResponse response)
-        {
-            scene.GetComponent<LocationManagerComoponent>().Get(request.Type).UnLock(request.Key, request.OldActorId, request.NewActorId);
-
-            await ETTask.CompletedTask;
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/ObjectUnLockRequestHandler.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a0fcc1a225ee97548b6231c497d39f92
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 70e3a3f9c0de22d479a5b6c05e28fdb4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9945976a56af6e040b88822502943640
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server/CoroutineLockType.cs

@@ -1,8 +0,0 @@
-namespace ET
-{
-    public static partial class CoroutineLockType
-    {
-        public const int Location = PackageType.ActorLocation * 1000 + 1;                  // location进程上使用
-        public const int MessageLocationSender = PackageType.ActorLocation * 1000 + 2;       // MessageLocationSender中队列消息 
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Server/CoroutineLockType.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c342e8ab590122c499caf23e5ea0d8b0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server/LocationComponent.cs

@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET.Server
-{
-    [ChildOf(typeof(LocationOneType))]
-    public class LockInfo: Entity, IAwake<ActorId, CoroutineLock>, IDestroy
-    {
-        public ActorId LockActorId;
-
-        public CoroutineLock CoroutineLock
-        {
-            get;
-            set;
-        }
-    }
-
-    [ChildOf(typeof(LocationManagerComoponent))]
-    public class LocationOneType: Entity, IAwake
-    {
-        public readonly Dictionary<long, ActorId> locations = new();
-
-        public readonly Dictionary<long, EntityRef<LockInfo>> lockInfos = new();
-    }
-
-    [ComponentOf(typeof(Scene))]
-    public class LocationManagerComoponent: Entity, IAwake
-    {
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Server/LocationComponent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6e6e2820b03d2cc4d86a1350d8c18b23
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server/LocationConfigSingleton.cs

@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET.Server
-{
-    [ConfigProcess]
-    public class LocationConfigSingleton: Singleton<LocationConfigSingleton>, ISingletonAwake
-    {
-        private readonly List<StartSceneConfig> locations = new();
-        
-        public void Awake()
-        {
-            foreach (StartSceneConfig startSceneConfig in StartSceneConfigCategory.Instance.GetAll().Values)
-            {
-                if (startSceneConfig.Type == SceneType.Location)
-                {
-                    this.locations.Add(startSceneConfig);
-                }
-            }
-        }
-
-        public StartSceneConfig GetLocation(long key)
-        {
-            return this.locations[(int)((ulong)key % (ulong)this.locations.Count)];
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Server/LocationConfigSingleton.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: fe58360e655c1aa4493497f79a1a8284
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server/LocationProxyComponent.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace ET.Server
-{
-    [ComponentOf(typeof(Scene))]
-    public class LocationProxyComponent: Entity, IAwake
-    {
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Server/LocationProxyComponent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7be629b18e7cd1347bd3e2844705a34e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server/MailBoxType.cs

@@ -1,7 +0,0 @@
-namespace ET
-{
-    public static partial class MailBoxType
-    {
-        public const int OrderedMessage = PackageType.ActorLocation * 1000 + 1;
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Server/MailBoxType.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 20650ec67eef9754392f6955bf38b8b1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server/MessageLocationHandlerAttribute.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace ET
-{
-    public class MessageLocationHandlerAttribute: MessageHandlerAttribute
-    {
-        public MessageLocationHandlerAttribute(int sceneType): base(sceneType)
-        {
-        }
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Server/MessageLocationHandlerAttribute.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 38185e19d39ddf3469f0fe1f94c64970
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server/MessageLocationSender.cs

@@ -1,14 +0,0 @@
-using System.IO;
-
-namespace ET.Server
-{
-    // 知道对方的Id，使用这个类发actor消息
-    [ChildOf(typeof(MessageLocationSenderOneType))]
-    public class MessageLocationSender: Entity, IAwake, IDestroy
-    {
-        public ActorId ActorId;
-
-        // 最近接收或者发送消息的时间
-        public long LastSendOrRecvTime;
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Server/MessageLocationSender.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a5652df9f52a66541832298e1fe808c5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server/MessageLocationSenderOneType.cs

@@ -1,18 +0,0 @@
-namespace ET.Server
-{
-    
-    [ChildOf(typeof(MessageLocationSenderComponent))]
-    public class MessageLocationSenderOneType: Entity, IAwake, IDestroy
-    {
-        public const long TIMEOUT_TIME = 60 * 1000;
-
-        public long CheckTimer;
-    }
-    
-    
-    [ComponentOf(typeof(Scene))]
-    public class MessageLocationSenderComponent: Entity, IAwake
-    {
-        public long CheckTimer;
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Server/MessageLocationSenderOneType.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d38a558383667574da775d14d1d3adf9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Server/TimerInvokeType.cs

@@ -1,7 +0,0 @@
-namespace ET
-{
-    public static partial class TimerInvokeType
-    {
-        public const int MessageLocationSenderChecker = PackageType.ActorLocation * 1000 + 2;
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Server/TimerInvokeType.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4adf52c305547e04c922590aacd6ef9b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Share.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d256045fad3b18d4fb1f58c25632b1b4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/Scripts/Model/Share/PackageType.cs

@@ -1,7 +0,0 @@
-namespace ET
-{
-    public static partial class PackageType
-    {
-        public const int ActorLocation = 3;
-    }
-}

Packages/cn.etetet.actorlocation/Scripts/Model/Share/PackageType.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: cecc76bb8a432a841980800cc18ebfe2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.actorlocation/package.json

@@ -1,19 +0,0 @@
-{
-  "name": "cn.etetet.actorlocation",
-  "displayName": "ET.ActorLocation",
-  "version": "0.0.1",
-  "unity": "2022.3",
-  "description": "et actorlocation",
-  "author": {
-    "name": "tanghai",
-    "url": "https://github.com/egametang/ET"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/egametang/ET"
-  },
-  "relatedPackages": {},
-  "gitDependencies": {
-    "cn.etetet.core": "https://github.com/ET-Packages/cn.etetet.core.git#0.0.1"
-  }
-}

Packages/cn.etetet.actorlocation/package.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2a4fc5deda80df54eb5b3f11146f015d
-PackageManifestImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Ignore.ET.Aoi.asmdef

@@ -1,16 +0,0 @@
-{
-    "name": "Ignore.ET.Aoi",
-    "rootNamespace": "",
-    "references": [],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [
-        "IGNORE"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

Packages/cn.etetet.aoi/Ignore.ET.Aoi.asmdef.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b323270377012e34fa7740c56eafafda
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/LICENSE

@@ -1,30 +0,0 @@
-ET License
-
-1. 该ET版本版权属于广州市一踢互联网科技有限公司所有。  
-2. 该ET版本可以任意修改代码，或者在ET基础上添加代码，但是仅限于自己或者自己任职的公司使用，不得传播给他人，私下传播ET修改版或者基于ET开发的代码都是违反ET License的行为  
-3. 自行修改的代码或者在ET基础上添加的代码，如果要分享给他人使用，必须以Package的形式放到ET的Package仓库中，具体请咨询广州市一踢互联网科技有限公司的唐海，QQ:80081771  
-4. 该版本可以用于开发任何商业项目。在项目上线运营之前必须主动通知广州市一踢互联网科技有限公司上线项目的名称，上线项目的公司等信息。广州市一踢互联网科技有限公司不会泄露这些信息，仅仅作为统计使用，如果需要公布，则会获得上线项目公司的许可  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Packages/cn.etetet.aoi/LICENSE.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0bb91f26345fb2c428ca3e54cb4092dc
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5a1cfc924c0f8fd41a576552aa11abbb
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Hotfix.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b22d3398085cac04cb93d158f31c9bcd
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Hotfix/Server.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f4e422fe96107c3429152c167f27d6b5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AOIEntitySystem.cs

@@ -1,179 +0,0 @@
-using System.Collections.Generic;
-using Unity.Mathematics;
-
-namespace ET.Server
-{
-    [EntitySystemOf(typeof(AOIEntity))]
-    [FriendOf(typeof(Cell))]
-    public static partial class AOIEntitySystem2
-    {
-        [EntitySystem]
-        private static void Awake(this AOIEntity self, int distance, float3 pos)
-        {
-            self.ViewDistance = distance;
-            self.Scene().GetComponent<AOIManagerComponent>().Add(self, pos.x, pos.z);
-        }
-
-        [EntitySystem]
-        private static void Destroy(this AOIEntity self)
-        {
-            self.Scene().GetComponent<AOIManagerComponent>()?.Remove(self);
-            self.ViewDistance = 0;
-            self.SeeUnits.Clear();
-            self.SeePlayers.Clear();
-            self.BeSeePlayers.Clear();
-            self.BeSeeUnits.Clear();
-            self.SubEnterCells.Clear();
-            self.SubLeaveCells.Clear();
-        }
-    }
-
-    [FriendOf(typeof(Cell))]
-    [FriendOf(typeof(AOIEntity))]
-    public static partial class AOIEntitySystem
-    {
-        // 获取在自己视野中的对象
-        public static Dictionary<long, EntityRef<AOIEntity>> GetSeeUnits(this AOIEntity self)
-        {
-            return self.SeeUnits;
-        }
-
-        public static Dictionary<long, EntityRef<AOIEntity>> GetBeSeePlayers(this AOIEntity self)
-        {
-            return self.BeSeePlayers;
-        }
-
-        public static Dictionary<long, EntityRef<AOIEntity>> GetSeePlayers(this AOIEntity self)
-        {
-            return self.SeePlayers;
-        }
-
-        // cell中的unit进入self的视野
-        public static void SubEnter(this AOIEntity self, Cell cell)
-        {
-            cell.SubsEnterEntities.Add(self.Id, self);
-            foreach (KeyValuePair<long, EntityRef<AOIEntity>> kv in cell.AOIUnits)
-            {
-                if (kv.Key == self.Id)
-                {
-                    continue;
-                }
-
-                self.EnterSight(kv.Value);
-            }
-        }
-
-        public static void UnSubEnter(this AOIEntity self, Cell cell)
-        {
-            cell.SubsEnterEntities.Remove(self.Id);
-        }
-
-        public static void SubLeave(this AOIEntity self, Cell cell)
-        {
-            cell.SubsLeaveEntities.Add(self.Id, self);
-        }
-
-        // cell中的unit离开self的视野
-        public static void UnSubLeave(this AOIEntity self, Cell cell)
-        {
-            foreach (KeyValuePair<long, EntityRef<AOIEntity>> kv in cell.AOIUnits)
-            {
-                if (kv.Key == self.Id)
-                {
-                    continue;
-                }
-
-                self.LeaveSight(kv.Value);
-            }
-
-            cell.SubsLeaveEntities.Remove(self.Id);
-        }
-
-        // enter进入self视野
-        public static void EnterSight(this AOIEntity self, AOIEntity enter)
-        {
-            // 有可能之前在Enter，后来出了Enter还在LeaveCell，这样仍然没有删除，继续进来Enter，这种情况不需要处理
-            if (self.SeeUnits.ContainsKey(enter.Id))
-            {
-                return;
-            }
-            
-            if (!AOISeeCheckHelper.IsCanSee(self, enter))
-            {
-                return;
-            }
-
-            if (self.Unit.Type() == UnitType.Player)
-            {
-                if (enter.Unit.Type() == UnitType.Player)
-                {
-                    self.SeeUnits.Add(enter.Id, enter);
-                    enter.BeSeeUnits.Add(self.Id, self);
-                    self.SeePlayers.Add(enter.Id, enter);
-                    enter.BeSeePlayers.Add(self.Id, self);
-                    
-                }
-                else
-                {
-                    self.SeeUnits.Add(enter.Id, enter);
-                    enter.BeSeeUnits.Add(self.Id, self);
-                    enter.BeSeePlayers.Add(self.Id, self);
-                }
-            }
-            else
-            {
-                if (enter.Unit.Type() == UnitType.Player)
-                {
-                    self.SeeUnits.Add(enter.Id, enter);
-                    enter.BeSeeUnits.Add(self.Id, self);
-                    self.SeePlayers.Add(enter.Id, enter);
-                }
-                else
-                {
-                    self.SeeUnits.Add(enter.Id, enter);
-                    enter.BeSeeUnits.Add(self.Id, self);
-                }
-            }
-            EventSystem.Instance.Publish(self.Scene(), new UnitEnterSightRange() { A = self, B = enter });
-        }
-
-        // leave离开self视野
-        public static void LeaveSight(this AOIEntity self, AOIEntity leave)
-        {
-            if (self.Id == leave.Id)
-            {
-                return;
-            }
-
-            if (!self.SeeUnits.ContainsKey(leave.Id))
-            {
-                return;
-            }
-
-            self.SeeUnits.Remove(leave.Id);
-            if (leave.Unit.Type() == UnitType.Player)
-            {
-                self.SeePlayers.Remove(leave.Id);
-            }
-
-            leave.BeSeeUnits.Remove(self.Id);
-            if (self.Unit.Type() == UnitType.Player)
-            {
-                leave.BeSeePlayers.Remove(self.Id);
-            }
-
-            EventSystem.Instance.Publish(self.Scene(), new UnitLeaveSightRange { A = self, B = leave });
-        }
-
-        /// <summary>
-        /// 是否在Unit视野范围内
-        /// </summary>
-        /// <param name="self"></param>
-        /// <param name="unitId"></param>
-        /// <returns></returns>
-        public static bool IsBeSee(this AOIEntity self, long unitId)
-        {
-            return self.BeSeePlayers.ContainsKey(unitId);
-        }
-    }
-}

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AOIEntitySystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1ffc4e7cbd1d9254580013b23aef127c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AOIHelper.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET.Server
-{
-    [FriendOf(typeof(AOIEntity))]
-    public static partial class AOIHelper
-    {
-        public static long CreateCellId(int x, int y)
-        {
-            return (long) ((ulong) x << 32) | (uint) y;
-        }
-
-        public static void CalcEnterAndLeaveCell(AOIEntity aoiEntity, int cellX, int cellY, HashSet<long> enterCell, HashSet<long> leaveCell)
-        {
-            enterCell.Clear();
-            leaveCell.Clear();
-            int r = (aoiEntity.ViewDistance - 1) / AOIManagerComponent.CellSize + 1;
-            int leaveR = r;
-            if (aoiEntity.Unit.Type() == UnitType.Player)
-            {
-                leaveR += 1;
-            }
-
-            for (int i = cellX - leaveR; i <= cellX + leaveR; ++i)
-            {
-                for (int j = cellY - leaveR; j <= cellY + leaveR; ++j)
-                {
-                    long cellId = CreateCellId(i, j);
-                    leaveCell.Add(cellId);
-
-                    if (i > cellX + r || i < cellX - r || j > cellY + r || j < cellY - r)
-                    {
-                        continue;
-                    }
-
-                    enterCell.Add(cellId);
-                }
-            }
-        }
-    }
-}

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AOIHelper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f2e4156c55f6b9c4294e7ab4d7a9c75f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AOIManagerComponentSystem.cs

@@ -1,190 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET.Server
-{
-    [FriendOf(typeof(AOIManagerComponent))]
-    [FriendOf(typeof(AOIEntity))]
-    [FriendOf(typeof(Cell))]
-    public static partial class AOIManagerComponentSystem
-    {
-        public static void Add(this AOIManagerComponent self, AOIEntity aoiEntity, float x, float y)
-        {
-            int cellX = (int)(x * 1000) / AOIManagerComponent.CellSize;
-            int cellY = (int)(y * 1000) / AOIManagerComponent.CellSize;
-
-            if (aoiEntity.ViewDistance == 0)
-            {
-                aoiEntity.ViewDistance = 1;
-            }
-
-            AOIHelper.CalcEnterAndLeaveCell(aoiEntity, cellX, cellY, aoiEntity.SubEnterCells, aoiEntity.SubLeaveCells);
-
-            // 遍历EnterCell
-            foreach (long cellId in aoiEntity.SubEnterCells)
-            {
-                Cell cell = self.GetCell(cellId);
-                aoiEntity.SubEnter(cell);
-            }
-
-            // 遍历LeaveCell
-            foreach (long cellId in aoiEntity.SubLeaveCells)
-            {
-                Cell cell = self.GetCell(cellId);
-                aoiEntity.SubLeave(cell);
-            }
-
-            // 自己加入的Cell
-            Cell selfCell = self.GetCell(AOIHelper.CreateCellId(cellX, cellY));
-            aoiEntity.Cell = selfCell;
-            selfCell.Add(aoiEntity);
-            // 通知订阅该Cell Enter的Unit
-            foreach (KeyValuePair<long, EntityRef<AOIEntity>> kv in selfCell.SubsEnterEntities)
-            {
-                AOIEntity e = kv.Value;
-                e.EnterSight(aoiEntity);
-            }
-        }
-
-        public static void Remove(this AOIManagerComponent self, AOIEntity aoiEntity)
-        {
-            if (aoiEntity.Cell == null)
-            {
-                return;
-            }
-
-            // 通知订阅该Cell Leave的Unit
-            aoiEntity.Cell.Remove(aoiEntity);
-            foreach (KeyValuePair<long, EntityRef<AOIEntity>> kv in aoiEntity.Cell.SubsLeaveEntities)
-            {
-                AOIEntity e = kv.Value;
-                e?.LeaveSight(aoiEntity);
-            }
-
-            // 通知自己订阅的Enter Cell，清理自己
-            foreach (long cellId in aoiEntity.SubEnterCells)
-            {
-                Cell cell = self.GetCell(cellId);
-                aoiEntity.UnSubEnter(cell);
-            }
-
-            foreach (long cellId in aoiEntity.SubLeaveCells)
-            {
-                Cell cell = self.GetCell(cellId);
-                aoiEntity.UnSubLeave(cell);
-            }
-    
-            // 检查
-            if (aoiEntity.SeeUnits.Count > 1)
-            {
-                Log.Error($"aoiEntity has see units: {aoiEntity.SeeUnits.Count}");
-            }
-
-            if (aoiEntity.BeSeeUnits.Count > 1)
-            {
-                Log.Error($"aoiEntity has beSee units: {aoiEntity.BeSeeUnits.Count}");
-            }
-        }
-
-        private static Cell GetCell(this AOIManagerComponent self, long cellId)
-        {
-            Cell cell = self.GetChild<Cell>(cellId);
-            if (cell == null)
-            {
-                cell = self.AddChildWithId<Cell>(cellId);
-            }
-
-            return cell;
-        }
-
-        public static void Move(AOIEntity aoiEntity, Cell newCell, Cell preCell)
-        {
-            aoiEntity.Cell = newCell;
-            preCell.Remove(aoiEntity);
-            newCell.Add(aoiEntity);
-            // 通知订阅该newCell Enter的Unit
-            foreach (KeyValuePair<long, EntityRef<AOIEntity>> kv in newCell.SubsEnterEntities)
-            {
-                AOIEntity e = kv.Value;
-                if (e.SubEnterCells.Contains(preCell.Id))
-                {
-                    continue;
-                }
-                e.EnterSight(aoiEntity);
-            }
-
-            // 通知订阅preCell leave的Unit
-            foreach (KeyValuePair<long, EntityRef<AOIEntity>> kv in preCell.SubsLeaveEntities)
-            {
-                // 如果新的cell仍然在对方订阅的subleave中
-                AOIEntity e = kv.Value;
-                if (e.SubLeaveCells.Contains(newCell.Id))
-                {
-                    continue;
-                }
-
-                e.LeaveSight(aoiEntity);
-            }
-        }
-
-        public static void Move(this AOIManagerComponent self, AOIEntity aoiEntity, int cellX, int cellY)
-        {
-            long newCellId = AOIHelper.CreateCellId(cellX, cellY);
-            if (aoiEntity.Cell.Id == newCellId) // cell没有变化
-            {
-                return;
-            }
-
-            // 自己加入新的Cell
-            Cell newCell = self.GetCell(newCellId);
-            Move(aoiEntity, newCell, aoiEntity.Cell);
-
-            AOIHelper.CalcEnterAndLeaveCell(aoiEntity, cellX, cellY, aoiEntity.enterHashSet, aoiEntity.leaveHashSet);
-
-            // 算出自己leave新Cell
-            foreach (long cellId in aoiEntity.leaveHashSet)
-            {
-                if (aoiEntity.SubLeaveCells.Contains(cellId))
-                {
-                    continue;
-                }
-
-                Cell cell = self.GetCell(cellId);
-                aoiEntity.SubLeave(cell);
-            }
-
-            // 算出需要通知离开的Cell
-            aoiEntity.SubLeaveCells.ExceptWith(aoiEntity.leaveHashSet);
-            foreach (long cellId in aoiEntity.SubLeaveCells)
-            {
-                Cell cell = self.GetCell(cellId);
-                aoiEntity.UnSubLeave(cell);
-            }
-
-            // 这里交换两个HashSet,提高性能
-            ObjectHelper.Swap(ref aoiEntity.SubLeaveCells, ref aoiEntity.leaveHashSet);
-
-            // 算出自己看到的新Cell
-            foreach (long cellId in aoiEntity.enterHashSet)
-            {
-                if (aoiEntity.SubEnterCells.Contains(cellId))
-                {
-                    continue;
-                }
-
-                Cell cell = self.GetCell(cellId);
-                aoiEntity.SubEnter(cell);
-            }
-
-            // 离开的Enter
-            aoiEntity.SubEnterCells.ExceptWith(aoiEntity.enterHashSet);
-            foreach (long cellId in aoiEntity.SubEnterCells)
-            {
-                Cell cell = self.GetCell(cellId);
-                aoiEntity.UnSubEnter(cell);
-            }
-
-            // 这里交换两个HashSet,提高性能
-            ObjectHelper.Swap(ref aoiEntity.SubEnterCells, ref aoiEntity.enterHashSet);
-        }
-    }
-}

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AOIManagerComponentSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 2ad86448bedfdb749af581f1a93a8abc
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AOISeeCheckHelper.cs

@@ -1,10 +0,0 @@
-namespace ET.Server
-{
-    public static partial class AOISeeCheckHelper
-    {
-        public static bool IsCanSee(AOIEntity a, AOIEntity b)
-        {
-            return true;
-        }
-    }
-}

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/AOISeeCheckHelper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ceb82a7948997aa44a8c1e3e66301ff7
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/CellSystem.cs

@@ -1,55 +0,0 @@
-using System.Collections.Generic;
-using System.Text;
-
-namespace ET.Server
-{
-    [EntitySystemOf(typeof(Cell))]
-    public static partial class CellSystem
-    {
-        [EntitySystem]
-        private static void Awake(this ET.Server.Cell self)
-        {
-
-        }
-        
-        [EntitySystem]
-        private static void Destroy(this Cell self)
-        {
-            self.AOIUnits.Clear();
-
-            self.SubsEnterEntities.Clear();
-
-            self.SubsLeaveEntities.Clear();
-        }
-
-        public static void Add(this Cell self, AOIEntity aoiEntity)
-        {
-            self.AOIUnits.Add(aoiEntity.Id, aoiEntity);
-        }
-
-        public static void Remove(this Cell self, AOIEntity aoiEntity)
-        {
-            self.AOIUnits.Remove(aoiEntity.Id);
-        }
-
-        public static string CellIdToString(this long cellId)
-        {
-            int y = (int)(cellId & 0xffffffff);
-            int x = (int)((ulong)cellId >> 32);
-            return $"{x}:{y}";
-        }
-
-        public static string CellIdToString(this HashSet<long> cellIds)
-        {
-            StringBuilder sb = new StringBuilder();
-            foreach (long cellId in cellIds)
-            {
-                sb.Append(cellId.CellIdToString());
-                sb.Append(",");
-            }
-
-            return sb.ToString();
-        }
-
-    }
-}

Packages/cn.etetet.aoi/Scripts/Hotfix/Server/CellSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 88db5c26ff5dae14592839f695b544a5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Model.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5e35019cc485cbd48be72ba72c264e28
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Model/Server.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 21728f4c091c3b54aa8709d1b41a2cea
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Model/Server/AOIEntity.cs

@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using Unity.Mathematics;
-
-namespace ET.Server
-{
-    [ComponentOf(typeof(Unit))]
-    public class AOIEntity: Entity, IAwake<int, float3>, IDestroy
-    {
-        public Unit Unit => this.GetParent<Unit>();
-
-        public int ViewDistance;
-
-        private EntityRef<Cell> cell;
-
-        public Cell Cell
-        {
-            get
-            {
-                return this.cell;
-            }
-            set
-            {
-                this.cell = value;
-            }
-        }
-
-        // 观察进入视野的Cell
-        public HashSet<long> SubEnterCells = new HashSet<long>();
-
-        // 观察离开视野的Cell
-        public HashSet<long> SubLeaveCells = new HashSet<long>();
-        
-        // 观察进入视野的Cell
-        public HashSet<long> enterHashSet = new HashSet<long>();
-
-        // 观察离开视野的Cell
-        public HashSet<long> leaveHashSet = new HashSet<long>();
-
-        // 我看的见的Unit
-        public Dictionary<long, EntityRef<AOIEntity>> SeeUnits = new Dictionary<long, EntityRef<AOIEntity>>();
-        
-        // 看见我的Unit
-        public Dictionary<long, EntityRef<AOIEntity>> BeSeeUnits = new Dictionary<long, EntityRef<AOIEntity>>();
-        
-        // 我看的见的Player
-        public Dictionary<long, EntityRef<AOIEntity>> SeePlayers = new Dictionary<long, EntityRef<AOIEntity>>();
-
-        // 看见我的Player单独放一个Dict，用于广播
-        public Dictionary<long, EntityRef<AOIEntity>> BeSeePlayers = new Dictionary<long, EntityRef<AOIEntity>>();
-    }
-}

Packages/cn.etetet.aoi/Scripts/Model/Server/AOIEntity.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 75c25cd1e6a75a3489b45e0c322122df
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Model/Server/AOIEventType.cs

@@ -1,14 +0,0 @@
-namespace ET.Server
-{
-	public struct UnitEnterSightRange
-	{
-		public AOIEntity A;
-		public AOIEntity B;
-	}
-
-	public struct UnitLeaveSightRange
-	{
-		public AOIEntity A;
-		public AOIEntity B;
-	}
-}

Packages/cn.etetet.aoi/Scripts/Model/Server/AOIEventType.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4254a2b68b483494d8e6620c8f9b3f5c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Model/Server/AOIManagerComponent.cs

@@ -1,8 +0,0 @@
-namespace ET.Server
-{
-    [ComponentOf(typeof(Scene))]
-    public class AOIManagerComponent: Entity, IAwake
-    {
-        public const int CellSize = 10 * 1000;
-    }
-}

Packages/cn.etetet.aoi/Scripts/Model/Server/AOIManagerComponent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 55c1f435308d68845b4f88e894b5f9f9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/Scripts/Model/Server/Cell.cs

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET.Server
-{
-    [ChildOf(typeof(AOIManagerComponent))]
-    public class Cell: Entity, IAwake, IDestroy
-    {
-        // 处在这个cell的单位
-        public Dictionary<long, EntityRef<AOIEntity>> AOIUnits = new Dictionary<long, EntityRef<AOIEntity>>();
-
-        // 订阅了这个Cell的进入事件
-        public Dictionary<long, EntityRef<AOIEntity>> SubsEnterEntities = new Dictionary<long, EntityRef<AOIEntity>>();
-
-        // 订阅了这个Cell的退出事件
-        public Dictionary<long, EntityRef<AOIEntity>> SubsLeaveEntities = new Dictionary<long, EntityRef<AOIEntity>>();
-    }
-}

Packages/cn.etetet.aoi/Scripts/Model/Server/Cell.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c8308d534fb4bd14bafef4858f8d4a95
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.aoi/package.json

@@ -1,19 +0,0 @@
-{
-  "name": "cn.etetet.aoi",
-  "displayName": "ET.Aoi",
-  "version": "0.0.1",
-  "unity": "2022.3",
-  "description": "et aoi",
-  "author": {
-    "name": "tanghai",
-    "url": "https://github.com/egametang/ET"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/egametang/ET"
-  },
-  "relatedPackages": {},
-  "gitDependencies": {
-    "cn.etetet.unit": "https://github.com/ET-Packages/cn.etetet.unit.git#0.0.1"
-  }
-}

Packages/cn.etetet.aoi/package.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 29c047a7ba4af5148a392dc2e4cc99be
-PackageManifestImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.console/Ignore.ET.Console.asmdef

@@ -1,16 +0,0 @@
-{
-    "name": "Ignore.ET.Console",
-    "rootNamespace": "",
-    "references": [],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [
-        "IGNORE"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

Packages/cn.etetet.console/Ignore.ET.Console.asmdef.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 60f20d689db1b3745b102ac1946de121
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.console/LICENSE

@@ -1,30 +0,0 @@
-ET License
-
-1. 该ET版本版权属于广州市一踢互联网科技有限公司所有。  
-2. 该ET版本可以任意修改代码，或者在ET基础上添加代码，但是仅限于自己或者自己任职的公司使用，不得传播给他人，私下传播ET修改版或者基于ET开发的代码都是违反ET License的行为  
-3. 自行修改的代码或者在ET基础上添加的代码，如果要分享给他人使用，必须以Package的形式放到ET的Package仓库中，具体请咨询广州市一踢互联网科技有限公司的唐海，QQ:80081771  
-4. 该版本可以用于开发任何商业项目。在项目上线运营之前必须主动通知广州市一踢互联网科技有限公司上线项目的名称，上线项目的公司等信息。广州市一踢互联网科技有限公司不会泄露这些信息，仅仅作为统计使用，如果需要公布，则会获得上线项目公司的许可  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Packages/cn.etetet.console/LICENSE.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e85577b07415d9e4c9638d995d39159b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.console/Scripts.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ab11783ed3604d844ac416bea9a91b6a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.console/Scripts/Model.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a454ba4416f31b141a38cf1a7b1ab8ea
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.console/Scripts/Model/Server.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3bfbbcaaaf6264c4ea82f86ac465f4ba
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.console/Scripts/Model/Server/ConsoleComponent.cs

@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-
-namespace ET
-{
-    public static class ConsoleMode
-    {
-        public const string ReloadDll = "R";
-        public const string ReloadConfig = "C";
-        public const string ShowMemory = "M";
-        public const string Repl = "Repl";
-        public const string Debugger = "Debugger";
-        public const string CreateRobot = "CreateRobot";
-        public const string Robot = "Robot";
-    }
-
-    [ComponentOf(typeof(Scene))]
-    public class ConsoleComponent: Entity, IAwake
-    {
-        public CancellationTokenSource CancellationTokenSource;
-
-    }
-}

Packages/cn.etetet.console/Scripts/Model/Server/ConsoleComponent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9383ba8d2883ab8498fdec638b048a93
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/cn.etetet.console/Scripts/Model/Server/ConsoleDispatcher.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ET
-{
-    [CodeProcess]
-    public class ConsoleDispatcher: Singleton<ConsoleDispatcher>, ISingletonAwake
-    {
-        private readonly Dictionary<string, IConsoleHandler> handlers = new();
-        
-        public void Awake()
-        {
-            HashSet<Type> types = CodeTypes.Instance.GetTypes(typeof (ConsoleHandlerAttribute));
-
-            foreach (Type type in types)
-            {
-                object[] attrs = type.GetCustomAttributes(typeof(ConsoleHandlerAttribute), false);
-                if (attrs.Length == 0)
-                {
-                    continue;
-                }
-
-                ConsoleHandlerAttribute consoleHandlerAttribute = (ConsoleHandlerAttribute)attrs[0];
-
-                object obj = Activator.CreateInstance(type);
-
-                IConsoleHandler iConsoleHandler = obj as IConsoleHandler;
-                if (iConsoleHandler == null)
-                {
-                    throw new Exception($"ConsoleHandler handler not inherit IConsoleHandler class: {obj.GetType().FullName}");
-                }
-                this.handlers.Add(consoleHandlerAttribute.Mode, iConsoleHandler);
-            }
-        }
-
-        public IConsoleHandler Get(string key)
-        {
-            return this.handlers[key];
-        }
-    }
-}