From c59ebd62806e40b129effbb14bf62f5545b245d8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5RP3AKU\\Jisol" <2858626794@qq.com> Date: Sat, 14 Sep 2024 04:37:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JNFrame2/AimingRig.csproj | 6 +-- .../Sync/App/Tile/Entity/JNTileContext.cs | 21 +------- .../Sync/App/Tile/Entity/JNTileEntity.cs | 24 +++++++++ .../Assets/JNGame/Sync/Entity/JNContext.cs | 2 +- .../Sync/System/Data/SStateDataSystem.cs | 49 +++++++++--------- .../Sync/System/Data/STileDataSystem.cs | 28 +++------- .../Assets/JNGame/Sync/System/SDataSystem.cs | 12 ++--- .../AppGame/Sync/Tile/JNGTileServerSystem.cs | 2 +- .../Scripts/Game/Data/GDataBaseSystem.cs | 6 --- JNFrame2/BestHTTP.csproj | 6 +-- ...hadercompiler-UnityShaderCompiler.exe0.log | 3 ++ JNFrame2/StompyRobot.SRDebugger.Editor.csproj | 6 +-- JNFrame2/StompyRobot.SRDebugger.csproj | 6 +-- JNFrame2/StompyRobot.SRF.Editor.csproj | 6 +-- JNFrame2/StompyRobot.SRF.csproj | 6 +-- JNFrame2/UniTask.Addressables.csproj | 6 +-- JNFrame2/UniTask.DOTween.csproj | 6 +-- JNFrame2/UniTask.Editor.csproj | 6 +-- JNFrame2/UniTask.Linq.csproj | 6 +-- JNFrame2/UniTask.TextMeshPro.csproj | 6 +-- JNFrame2/UniTask.csproj | 6 +-- .../AimingRig.csproj.AssemblyReference.cache | Bin 290148 -> 290148 bytes .../BestHTTP.csproj.AssemblyReference.cache | Bin 290148 -> 290148 bytes ...gger.Editor.csproj.AssemblyReference.cache | Bin 301203 -> 301203 bytes ....SRDebugger.csproj.AssemblyReference.cache | Bin 290148 -> 290148 bytes ....SRF.Editor.csproj.AssemblyReference.cache | Bin 301203 -> 301203 bytes ...pyRobot.SRF.csproj.AssemblyReference.cache | Bin 290148 -> 290148 bytes ...ddressables.csproj.AssemblyReference.cache | Bin 290148 -> 290148 bytes ...ask.DOTween.csproj.AssemblyReference.cache | Bin 296735 -> 296735 bytes ...Task.Editor.csproj.AssemblyReference.cache | Bin 307790 -> 307790 bytes ...niTask.Linq.csproj.AssemblyReference.cache | Bin 290148 -> 290148 bytes ...TextMeshPro.csproj.AssemblyReference.cache | Bin 291133 -> 291133 bytes .../UniTask.csproj.AssemblyReference.cache | Bin 290148 -> 290148 bytes 33 files changed, 104 insertions(+), 115 deletions(-) diff --git a/JNFrame2/AimingRig.csproj b/JNFrame2/AimingRig.csproj index ec4db832..ed44c4f3 100644 --- a/JNFrame2/AimingRig.csproj +++ b/JNFrame2/AimingRig.csproj @@ -806,12 +806,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs b/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs index c5abf21a..8c106089 100644 --- a/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs @@ -18,26 +18,9 @@ namespace JNGame.Sync.State.Tile.Entity foreach (var entity in base.GetEntities()) { - //生命周期 - bool isContains = SyncTile.IsContains(entity.Position); - bool isHost = entity.IsHost; + //更新权限 + entity.HostUpdate(); - //从服务器 如果数据不是自己创建的则自己永远没有权限 - if (SyncTile.IsSlave && !(entity.IsSelfCreate)) isContains = false; - - entity.IsHost = isContains; - - //区块进入生命周期 - if (!isHost && isContains) - { - entity.OnTileEnter(); - } - //区块移出生命周期 - if (isHost && !isContains) - { - entity.OnTileExit(); - } - //判断实体是否在所属区块 在则 更新 if (entity.IsHost) { diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileEntity.cs b/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileEntity.cs index 8b47e9e4..a9484344 100644 --- a/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileEntity.cs +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileEntity.cs @@ -38,6 +38,8 @@ namespace JNGame.Sync.State.Tile.Entity public abstract class JNTileEntity : JNEntity,IJNTileCycle,IJNTileEntity { + private JNSSTileServerService SyncTile => Context.GetSync() as JNSSTileServerService; + /// /// 是否有权限 /// @@ -84,6 +86,28 @@ namespace JNGame.Sync.State.Tile.Entity public abstract void TileSyncData(ISTileData data); + public virtual void HostUpdate() + { + bool isContains = SyncTile.IsContains(Position); + bool isHost = IsHost; + + //从服务器 如果数据不是自己创建的则自己永远没有权限 + if (SyncTile.IsSlave && !(IsSelfCreate)) isContains = false; + + IsHost = isContains; + + //区块进入生命周期 + if (!isHost && isContains) + { + OnTileEnter(); + } + //区块移出生命周期 + if (isHost && !isContains) + { + OnTileExit(); + } + } + //区块生命周期 public virtual void OnTileEnter() { diff --git a/JNFrame2/Assets/JNGame/Sync/Entity/JNContext.cs b/JNFrame2/Assets/JNGame/Sync/Entity/JNContext.cs index e6ecd274..8bc40bb8 100644 --- a/JNFrame2/Assets/JNGame/Sync/Entity/JNContext.cs +++ b/JNFrame2/Assets/JNGame/Sync/Entity/JNContext.cs @@ -49,7 +49,7 @@ namespace JNGame.Sync.Frame.Entity public void AddEntity(ulong id, JNEntity entity) { - Entities.Add(id,entity as T); + Entities[id] = entity as T; } public void RemoveEntity(ulong id) diff --git a/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs index c346771a..4b54bade 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs @@ -46,7 +46,7 @@ namespace JNGame.Sync.System.Data /// /// 插入字节 /// - public void OnInsertUBytes(Dictionary bytes); + public void OnInsertUBytes(Dictionary bytes,bool isUpdate = false); /// /// 获取全部字节 @@ -131,11 +131,18 @@ namespace JNGame.Sync.System.Data /// 插入字节 /// /// - public void OnInsertUBytes(Dictionary bytes) + public void OnInsertUBytes(Dictionary bytes,bool isUpdate = false) { if (bytes is not null) { - WaitUBytes.Enqueue(bytes); + if (isUpdate) + { + OnUByteUpdate(bytes); + } + else + { + WaitUBytes.Enqueue(bytes); + } } else { @@ -150,15 +157,10 @@ namespace JNGame.Sync.System.Data { var data = new Dictionary(); - lock (Data) + Data.ForEach(child => { - - Data.ForEach(child => - { - data[child.Key] = child.Value.GetByte(); - }); - - } + data[child.Key] = child.Value.GetByte(); + }); return data; @@ -170,27 +172,24 @@ namespace JNGame.Sync.System.Data public virtual void OnUByteUpdate(Dictionary bytes) { if (bytes is null) return; - lock (Data) + foreach (var info in bytes) { - foreach (var info in bytes) + if (SDByteOperate.IsDelete(info.Value)) { - if (SDByteOperate.IsDelete(info.Value)) + Data.Remove(info.Key,out var remove); + } + else + { + + if (Data.TryGetValue(info.Key, out var value)) { - Data.Remove(info.Key); + value.UByte(info.Value); } else { - - if (Data.TryGetValue(info.Key, out var value)) - { - value.UByte(info.Value); - } - else - { - Data[info.Key] = NewObject(info.Key,info.Value); - } - + Data[info.Key] = NewObject(info.Key,info.Value); } + } } diff --git a/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs index 23ffb4aa..749e7e12 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using AppGame.Sync; using DotRecast.Core.Collections; @@ -81,9 +82,9 @@ namespace JNGame.Sync.System.Data { } - public override Dictionary GetLatest() + public override ConcurrentDictionary GetLatest() { - var nodes = new Dictionary(); + var nodes = new ConcurrentDictionary(); E[] entities = null; if (IsMaster) { @@ -96,7 +97,7 @@ namespace JNGame.Sync.System.Data { var entity = new T(); entity.BindEntity(child); - nodes.Add(child.Id,entity); + nodes[child.Id] = entity; }); return nodes; } @@ -137,7 +138,7 @@ namespace JNGame.Sync.System.Data Data.ForEach(child => { //没有则删除 - if (!(latest.ContainsKey(child.Key))) + if (NodeContext.Query(child.Key) is null) { Delete(child.Key); return; @@ -202,12 +203,7 @@ namespace JNGame.Sync.System.Data protected virtual void OnDataSyncContext() { - Dictionary lIsTileData; - - lock (Data) - { - lIsTileData = new Dictionary(Data); - } + Dictionary lIsTileData = new Dictionary(Data); NodeContext.GetEntities().ForEach(child => { @@ -240,6 +236,7 @@ namespace JNGame.Sync.System.Data } entity?.TileSyncData(keyValue.Value); + entity?.HostUpdate(); //将实体绑定到数据中 keyValue.Value.BindEntity(entity); } @@ -266,15 +263,6 @@ namespace JNGame.Sync.System.Data base.Add(data); } - public override void Delete(ulong id) - { - var entity = NodeContext.Query(id); - if (entity is null) - { - base.Delete(id); - } - } - /// /// 判断数据是否在区块内 /// @@ -316,7 +304,7 @@ namespace JNGame.Sync.System.Data //销毁实体 Data[child].Entity?.Destroy(); //销毁数据 - Data.Remove(child); + Data.Remove(child,out var remove); }); } diff --git a/JNFrame2/Assets/JNGame/Sync/System/SDataSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/SDataSystem.cs index 67efa6c9..c1b3c148 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/SDataSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/SDataSystem.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System.Collections.Concurrent; +using System.Collections.Generic; using System.Linq; using DotRecast.Core.Collections; using JNGame.Sync.Frame.Service; @@ -59,15 +60,12 @@ namespace JNGame.Sync.System public JNRandomSystem Random => GetSystem(); //数据集 - public Dictionary Data = new(); + public ConcurrentDictionary Data = new(); public virtual T[] Datas { get { - lock (Data) - { - return Data.Values.ToArray(); - } + return Data.Values.ToArray(); } } @@ -80,7 +78,7 @@ namespace JNGame.Sync.System /// /// 返回最新数据 (收集最新的ISData数据 正常来讲只有服务端会运行) /// - public virtual Dictionary GetLatest() + public virtual ConcurrentDictionary GetLatest() { return new (); } diff --git a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs index 2236746e..5d15d712 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs @@ -75,7 +75,7 @@ namespace AppGame.Sync GetSystems().ForEach(child => { if (child.NetID != frame.NetID) return; - child.OnInsertUBytes(message); + child.OnInsertUBytes(message,true); }); }); } diff --git a/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs b/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs index 7c63b5e7..91ebbc14 100644 --- a/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs +++ b/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs @@ -1,18 +1,12 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using System.Text; using AppGame; using AppGame.Systems.CServer; -using DotRecast.Core.Collections; using Google.Protobuf; using JNGame.Math; -using JNGame.Sync.Entity; using JNGame.Sync.State.Tile.Entity; using JNGame.Sync.System; using JNGame.Sync.System.Data; -using Newtonsoft.Json; using Plugins.JNGame.Network.Action; using Plugins.JNGame.Util; diff --git a/JNFrame2/BestHTTP.csproj b/JNFrame2/BestHTTP.csproj index e07bd8db..e8366a42 100644 --- a/JNFrame2/BestHTTP.csproj +++ b/JNFrame2/BestHTTP.csproj @@ -2809,12 +2809,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + diff --git a/JNFrame2/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/JNFrame2/Logs/shadercompiler-UnityShaderCompiler.exe0.log index e69de29b..d9617fbf 100644 --- a/JNFrame2/Logs/shadercompiler-UnityShaderCompiler.exe0.log +++ b/JNFrame2/Logs/shadercompiler-UnityShaderCompiler.exe0.log @@ -0,0 +1,3 @@ +Base path: 'C:/APP/UnityEdit/2021.3.33f1c1/Editor/Data', plugins path 'C:/APP/UnityEdit/2021.3.33f1c1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + diff --git a/JNFrame2/StompyRobot.SRDebugger.Editor.csproj b/JNFrame2/StompyRobot.SRDebugger.Editor.csproj index 8b66b138..017c3d1e 100644 --- a/JNFrame2/StompyRobot.SRDebugger.Editor.csproj +++ b/JNFrame2/StompyRobot.SRDebugger.Editor.csproj @@ -839,12 +839,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.TestRunner.dll diff --git a/JNFrame2/StompyRobot.SRDebugger.csproj b/JNFrame2/StompyRobot.SRDebugger.csproj index f5c92a6b..14c03377 100644 --- a/JNFrame2/StompyRobot.SRDebugger.csproj +++ b/JNFrame2/StompyRobot.SRDebugger.csproj @@ -916,12 +916,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + diff --git a/JNFrame2/StompyRobot.SRF.Editor.csproj b/JNFrame2/StompyRobot.SRF.Editor.csproj index d9a80448..8ed38a64 100644 --- a/JNFrame2/StompyRobot.SRF.Editor.csproj +++ b/JNFrame2/StompyRobot.SRF.Editor.csproj @@ -830,12 +830,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.TestRunner.dll diff --git a/JNFrame2/StompyRobot.SRF.csproj b/JNFrame2/StompyRobot.SRF.csproj index a1b170eb..d7f5537e 100644 --- a/JNFrame2/StompyRobot.SRF.csproj +++ b/JNFrame2/StompyRobot.SRF.csproj @@ -861,12 +861,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + diff --git a/JNFrame2/UniTask.Addressables.csproj b/JNFrame2/UniTask.Addressables.csproj index ac2ca5f7..a331c4e7 100644 --- a/JNFrame2/UniTask.Addressables.csproj +++ b/JNFrame2/UniTask.Addressables.csproj @@ -806,12 +806,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + diff --git a/JNFrame2/UniTask.DOTween.csproj b/JNFrame2/UniTask.DOTween.csproj index 00a41b0e..2cf761ae 100644 --- a/JNFrame2/UniTask.DOTween.csproj +++ b/JNFrame2/UniTask.DOTween.csproj @@ -806,12 +806,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + diff --git a/JNFrame2/UniTask.Editor.csproj b/JNFrame2/UniTask.Editor.csproj index 838d965b..49045b5d 100644 --- a/JNFrame2/UniTask.Editor.csproj +++ b/JNFrame2/UniTask.Editor.csproj @@ -826,12 +826,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.TestRunner.dll diff --git a/JNFrame2/UniTask.Linq.csproj b/JNFrame2/UniTask.Linq.csproj index 1cd1ea69..25015907 100644 --- a/JNFrame2/UniTask.Linq.csproj +++ b/JNFrame2/UniTask.Linq.csproj @@ -878,12 +878,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + diff --git a/JNFrame2/UniTask.TextMeshPro.csproj b/JNFrame2/UniTask.TextMeshPro.csproj index f1e4a588..66736b24 100644 --- a/JNFrame2/UniTask.TextMeshPro.csproj +++ b/JNFrame2/UniTask.TextMeshPro.csproj @@ -810,12 +810,12 @@ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\Unity.TextMeshPro.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + diff --git a/JNFrame2/UniTask.csproj b/JNFrame2/UniTask.csproj index b3457ec5..ef7114f0 100644 --- a/JNFrame2/UniTask.csproj +++ b/JNFrame2/UniTask.csproj @@ -878,12 +878,12 @@ C:\APP\UnityEdit\2021.3.33f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll - D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + + D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + diff --git a/JNFrame2/obj/Debug/AimingRig.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/AimingRig.csproj.AssemblyReference.cache index 9ac79f3b94e5b3d9f439b92de8cf3f7504a5b4a5..4211a89a15866c2761df202a29064a063e683c6f 100644 GIT binary patch delta 51 zcmaEIOYq4p!G;#b7N!>FEi5M4tmlkVU5&O|X0uo^vgy<%xEfuVzP^yjdU|O#i_7$e HFEi5M4tP_s4q{wf#%x1A-Wb5jzOOd}aeSIO5_4Lwg7MJM_ H#~E_~7}pc< diff --git a/JNFrame2/obj/Debug/BestHTTP.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/BestHTTP.csproj.AssemblyReference.cache index c55f00a70665559e47b2cf9c81b14254f383be9b..70d13702dc1b9508b689c2faada0812cec500e78 100644 GIT binary patch delta 56 zcmaEIOYq4p!G;#b7N!>FEi5M4Z0C$qU5&0x&pXU$J-sxW?m8eIXNAz-9W6 H9F`mamZcW8 delta 56 zcmaEIOYq4p!G;#b7N!>FEi5M4Y!i;Pq{v^Ho_CnhdU|O#%RjcR&N`65`a&kKfXnnB HIV?EFEi6kXvz;?ebv3#&eO(Ka_2lkZoYUV=X8FpdQFEi6kXvrRbGk|KX)`nnb->&e}-IH$j#%<`43tFsOy7;}vg pE@(add^;1{^!%wTdsz3Y)u+gBH<-o}#mK6Ax&g@UpU%R<2mnb`CCLB) diff --git a/JNFrame2/obj/Debug/StompyRobot.SRDebugger.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/StompyRobot.SRDebugger.csproj.AssemblyReference.cache index 9ac79f3b94e5b3d9f439b92de8cf3f7504a5b4a5..4211a89a15866c2761df202a29064a063e683c6f 100644 GIT binary patch delta 51 zcmaEIOYq4p!G;#b7N!>FEi5M4tmlkVU5&O|X0uo^vgy<%xEfuVzP^yjdU|O#i_7$e HFEi5M4tP_s4q{wf#%x1A-Wb5jzOOd}aeSIO5_4Lwg7MJM_ H#~E_~7}pc< diff --git a/JNFrame2/obj/Debug/StompyRobot.SRF.Editor.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/StompyRobot.SRF.Editor.csproj.AssemblyReference.cache index 9985051b556194b49a59f71886cc75773ea8bc99..35c806a43b46f2c6215beac361ec91b9f868e474 100644 GIT binary patch delta 93 zcmbQdQE2i;p@tU57N!>FEi6kXvz;?ebv3#&eO(Ka_2lkZoYUV=X8FpdQFEi6kXvrRbGk|KX)`nnb->&e}-IH$j#%<`43tFsOy7;}vg pE@(add^;1{^!%wTdsz3Y)u+gBH<-o}#mK6Ax&g@UpU%R<2mnb`CCLB) diff --git a/JNFrame2/obj/Debug/StompyRobot.SRF.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/StompyRobot.SRF.csproj.AssemblyReference.cache index 9ac79f3b94e5b3d9f439b92de8cf3f7504a5b4a5..4211a89a15866c2761df202a29064a063e683c6f 100644 GIT binary patch delta 51 zcmaEIOYq4p!G;#b7N!>FEi5M4tmlkVU5&O|X0uo^vgy<%xEfuVzP^yjdU|O#i_7$e HFEi5M4tP_s4q{wf#%x1A-Wb5jzOOd}aeSIO5_4Lwg7MJM_ H#~E_~7}pc< diff --git a/JNFrame2/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache index c55f00a70665559e47b2cf9c81b14254f383be9b..70d13702dc1b9508b689c2faada0812cec500e78 100644 GIT binary patch delta 56 zcmaEIOYq4p!G;#b7N!>FEi5M4Z0C$qU5&0x&pXU$J-sxW?m8eIXNAz-9W6 H9F`mamZcW8 delta 56 zcmaEIOYq4p!G;#b7N!>FEi5M4Y!i;Pq{v^Ho_CnhdU|O#%RjcR&N`65`a&kKfXnnB HIV?E8&{FEi4IZ+0GfKx*A=XUh{_0disNPEH2YGd|+go{(3FT7B-!_ z1d!B*`ApW^fl_RYFp>WYn4BkHDC3#_W*v*&^a%@@%BO$Wz!J*#q%RSq!SDkkT-pL; GUJU>@OElL2 delta 119 zcmX^2MCjZTp@tU57N!>FEi4IZ*(MxoNs+%Yz2*(0_4EhpSX`!W_`t|E{qx-1Ets)+4if|gGBx>U~-;(p^Rtxn{_O9(bxycz(ZB{l&7 diff --git a/JNFrame2/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache index c55f00a70665559e47b2cf9c81b14254f383be9b..70d13702dc1b9508b689c2faada0812cec500e78 100644 GIT binary patch delta 56 zcmaEIOYq4p!G;#b7N!>FEi5M4Z0C$qU5&0x&pXU$J-sxW?m8eIXNAz-9W6 H9F`mamZcW8 delta 56 zcmaEIOYq4p!G;#b7N!>FEi5M4Y!i;Pq{v^Ho_CnhdU|O#%RjcR&N`65`a&kKfXnnB HIV?EFEi6ZK*|=|{xEfuVUU-<%ZaZfl3kxILIpb82$jT#(*3@3-CKyow delta 63 zcmdn{NO12X!G;#b7N!>FEi6ZK*a0tVpB`Ai@&*7&5gFwG diff --git a/JNFrame2/obj/Debug/UniTask.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/UniTask.csproj.AssemblyReference.cache index c55f00a70665559e47b2cf9c81b14254f383be9b..70d13702dc1b9508b689c2faada0812cec500e78 100644 GIT binary patch delta 56 zcmaEIOYq4p!G;#b7N!>FEi5M4Z0C$qU5&0x&pXU$J-sxW?m8eIXNAz-9W6 H9F`mamZcW8 delta 56 zcmaEIOYq4p!G;#b7N!>FEi5M4Y!i;Pq{v^Ho_CnhdU|O#%RjcR&N`65`a&kKfXnnB HIV?E