diff --git a/JNFrame2/AimingRig.csproj b/JNFrame2/AimingRig.csproj
index ed44c4f3..ec4db832 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\UnityEngine.UI.dll
-
D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll
+
+ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll
+
diff --git a/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs
index 4437215c..5483e40a 100644
--- a/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs
+++ b/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs
@@ -106,7 +106,7 @@ namespace JNGame.Sync.System.Data
base.OnUByteUpdate(bytes);
if (isServer)
{
- OnDataSyncContext();
+ OnDataSyncContext(bytes);
}
}
@@ -206,11 +206,24 @@ namespace JNGame.Sync.System.Data
///
/// 将数据Data同步到Context
///
- protected virtual void OnDataSyncContext()
+ protected virtual void OnDataSyncContext(Dictionary bytes = null)
{
Dictionary lIsTileData = new Dictionary(Data);
+ //同步删除
+ if (bytes is not null)
+ {
+ foreach (var keyValue in bytes)
+ {
+ E entity;
+ if (SDByteOperate.IsDelete(keyValue.Value) && (entity = NodeContext.Query(keyValue.Key)) is not null)
+ {
+ entity.Destroy();
+ }
+ }
+ }
+
NodeContext.GetEntities().ForEach(child =>
{
//如果有则删除
diff --git a/JNFrame2/BestHTTP.csproj b/JNFrame2/BestHTTP.csproj
index d94f6c4b..10a70b42 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\UnityEngine.UI.dll
-
D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll
+
+ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.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 017c3d1e..8b66b138 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\UnityEngine.UI.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\UnityEngine.TestRunner.dll
diff --git a/JNFrame2/StompyRobot.SRDebugger.csproj b/JNFrame2/StompyRobot.SRDebugger.csproj
index 14c03377..f5c92a6b 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\UnityEngine.UI.dll
-
D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll
+
+ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll
+
diff --git a/JNFrame2/StompyRobot.SRF.Editor.csproj b/JNFrame2/StompyRobot.SRF.Editor.csproj
index 8ed38a64..d9a80448 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\UnityEngine.UI.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\UnityEngine.TestRunner.dll
diff --git a/JNFrame2/StompyRobot.SRF.csproj b/JNFrame2/StompyRobot.SRF.csproj
index d7f5537e..a1b170eb 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\UnityEngine.UI.dll
-
D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll
+
+ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll
+
diff --git a/JNFrame2/UniTask.Addressables.csproj b/JNFrame2/UniTask.Addressables.csproj
index a331c4e7..ac2ca5f7 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\UnityEngine.UI.dll
-
D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll
+
+ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll
+
diff --git a/JNFrame2/UniTask.DOTween.csproj b/JNFrame2/UniTask.DOTween.csproj
index 2cf761ae..00a41b0e 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\UnityEngine.UI.dll
-
D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll
+
+ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll
+
diff --git a/JNFrame2/UniTask.Editor.csproj b/JNFrame2/UniTask.Editor.csproj
index 49045b5d..838d965b 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\UnityEngine.UI.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\UnityEngine.TestRunner.dll
diff --git a/JNFrame2/UniTask.Linq.csproj b/JNFrame2/UniTask.Linq.csproj
index 25015907..1cd1ea69 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\UnityEngine.UI.dll
-
D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll
+
+ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll
+
diff --git a/JNFrame2/UniTask.TextMeshPro.csproj b/JNFrame2/UniTask.TextMeshPro.csproj
index 66736b24..f1e4a588 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\UnityEngine.UI.dll
-
D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll
+
+ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll
+
diff --git a/JNFrame2/UniTask.csproj b/JNFrame2/UniTask.csproj
index ef7114f0..b3457ec5 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\UnityEngine.UI.dll
-
D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll
+
+ D:\Jisol\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll
+
diff --git a/JNFrame2/UserSettings/Layouts/default-2021.dwlt b/JNFrame2/UserSettings/Layouts/default-2021.dwlt
index 3f2bb3f4..bf03458b 100644
--- a/JNFrame2/UserSettings/Layouts/default-2021.dwlt
+++ b/JNFrame2/UserSettings/Layouts/default-2021.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 1037
m_ShowMode: 4
- m_Title: "\u63A7\u5236\u53F0"
+ m_Title: "\u6E38\u620F"
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
- controlID: 82
+ controlID: 94
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
- controlID: 83
+ controlID: 95
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -170,7 +170,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
- controlID: 28
+ controlID: 96
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -243,8 +243,8 @@ MonoBehaviour:
y: 0
width: 609
height: 528
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
+ m_MinSize: {x: 102, y: 121}
+ m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 20}
m_Panes:
- {fileID: 20}
@@ -394,23 +394,23 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 169d0000
- m_LastClickedID: 40214
- m_ExpandedIDs: f2beffff0ecaffff64caffff22cdffff26cdffff94e1ffff80e5ffff26f6ffff7cf6ffff3af9ffff3ef9ffff1afbffff12910000ee9c0000
+ m_SelectedIDs:
+ m_LastClickedID: 0
+ m_ExpandedIDs: cef5ffff24f6ffffe2f8ffffe6f8ffff1afbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name: World
- m_OriginalName: World
+ m_Name:
+ m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
- m_UserData: 40174
+ m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
- m_OriginalEventType: 0
+ m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 8}
m_SearchString:
@@ -899,7 +899,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 8e740000
m_LastClickedID: 29838
- m_ExpandedIDs: 000000002274000000ca9a3b
+ m_ExpandedIDs: 0000000024740000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -927,7 +927,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 0000000022740000
+ m_ExpandedIDs: 0000000024740000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1089,7 +1089,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
- m_EnableMouseInput: 1
+ m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
diff --git a/JNFrame2/obj/Debug/AimingRig.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/AimingRig.csproj.AssemblyReference.cache
index 5af6fbdb..ab05e5cc 100644
Binary files a/JNFrame2/obj/Debug/AimingRig.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/AimingRig.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/BestHTTP.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/BestHTTP.csproj.AssemblyReference.cache
index 22b8e2ad..fdfb82a7 100644
Binary files a/JNFrame2/obj/Debug/BestHTTP.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/BestHTTP.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/StompyRobot.SRDebugger.Editor.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/StompyRobot.SRDebugger.Editor.csproj.AssemblyReference.cache
index ddda92a7..b62a8d68 100644
Binary files a/JNFrame2/obj/Debug/StompyRobot.SRDebugger.Editor.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/StompyRobot.SRDebugger.Editor.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/StompyRobot.SRDebugger.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/StompyRobot.SRDebugger.csproj.AssemblyReference.cache
index 5af6fbdb..ab05e5cc 100644
Binary files a/JNFrame2/obj/Debug/StompyRobot.SRDebugger.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/StompyRobot.SRDebugger.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/StompyRobot.SRF.Editor.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/StompyRobot.SRF.Editor.csproj.AssemblyReference.cache
index ddda92a7..b62a8d68 100644
Binary files a/JNFrame2/obj/Debug/StompyRobot.SRF.Editor.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/StompyRobot.SRF.Editor.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/StompyRobot.SRF.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/StompyRobot.SRF.csproj.AssemblyReference.cache
index 5af6fbdb..ab05e5cc 100644
Binary files a/JNFrame2/obj/Debug/StompyRobot.SRF.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/StompyRobot.SRF.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache
index 22b8e2ad..fdfb82a7 100644
Binary files a/JNFrame2/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/UniTask.DOTween.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/UniTask.DOTween.csproj.AssemblyReference.cache
index e21455af..d28f99c8 100644
Binary files a/JNFrame2/obj/Debug/UniTask.DOTween.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/UniTask.DOTween.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/UniTask.Editor.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/UniTask.Editor.csproj.AssemblyReference.cache
index e2c9f1e7..5d537fe0 100644
Binary files a/JNFrame2/obj/Debug/UniTask.Editor.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/UniTask.Editor.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache
index 22b8e2ad..fdfb82a7 100644
Binary files a/JNFrame2/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/UniTask.TextMeshPro.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/UniTask.TextMeshPro.csproj.AssemblyReference.cache
index 99ea1b87..f97b7253 100644
Binary files a/JNFrame2/obj/Debug/UniTask.TextMeshPro.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/UniTask.TextMeshPro.csproj.AssemblyReference.cache differ
diff --git a/JNFrame2/obj/Debug/UniTask.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/UniTask.csproj.AssemblyReference.cache
index 22b8e2ad..fdfb82a7 100644
Binary files a/JNFrame2/obj/Debug/UniTask.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/UniTask.csproj.AssemblyReference.cache differ