From 17cb3423872abe12d2289169a826539bbb87fb9d Mon Sep 17 00:00:00 2001 From: "PC-20230316NUNE\\Administrator" <2858626794@qq.com> Date: Mon, 19 Aug 2024 20:20:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JNFrame2/AimingRig.csproj | 56 +++++----- JNFrame2/Assembly-CSharp-Editor.csproj | 50 ++++----- JNFrame2/Assembly-CSharp-firstpass.csproj | 40 +++---- JNFrame2/Assembly-CSharp.csproj | 40 +++---- .../Sync/App/Tile/JNSSTileClientService.cs | 2 +- .../AppGame/Sync/Tile/JNGTileClientSystem.cs | 3 +- JNFrame2/BestHTTP.csproj | 58 +++++----- ...orker0.log => AssetImportWorker0-prev.log} | 0 ...orker1.log => AssetImportWorker1-prev.log} | 0 .../shadercompiler-AssetImportWorker0.log | 3 - JNFrame2/StompyRobot.SRDebugger.Editor.csproj | 56 +++++----- JNFrame2/StompyRobot.SRDebugger.csproj | 56 +++++----- JNFrame2/StompyRobot.SRF.Editor.csproj | 56 +++++----- JNFrame2/StompyRobot.SRF.csproj | 56 +++++----- JNFrame2/UniTask.Addressables.csproj | 56 +++++----- JNFrame2/UniTask.DOTween.csproj | 56 +++++----- JNFrame2/UniTask.Editor.csproj | 56 +++++----- JNFrame2/UniTask.Linq.csproj | 56 +++++----- JNFrame2/UniTask.TextMeshPro.csproj | 56 +++++----- JNFrame2/UniTask.csproj | 56 +++++----- .../UserSettings/Layouts/default-2021.dwlt | 104 +++++++++--------- 21 files changed, 457 insertions(+), 459 deletions(-) rename JNFrame2/Logs/{AssetImportWorker0.log => AssetImportWorker0-prev.log} (100%) rename JNFrame2/Logs/{AssetImportWorker1.log => AssetImportWorker1-prev.log} (100%) delete mode 100644 JNFrame2/Logs/shadercompiler-AssetImportWorker0.log diff --git a/JNFrame2/AimingRig.csproj b/JNFrame2/AimingRig.csproj index 14f7e61d..aa03c86d 100644 --- a/JNFrame2/AimingRig.csproj +++ b/JNFrame2/AimingRig.csproj @@ -341,6 +341,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -371,20 +377,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -395,18 +404,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -416,24 +434,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -809,12 +809,12 @@ D:\Unity\2021.3.35f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + diff --git a/JNFrame2/Assembly-CSharp-Editor.csproj b/JNFrame2/Assembly-CSharp-Editor.csproj index e6c7671c..7b916c51 100644 --- a/JNFrame2/Assembly-CSharp-Editor.csproj +++ b/JNFrame2/Assembly-CSharp-Editor.csproj @@ -385,6 +385,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -415,20 +421,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -439,18 +448,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -460,24 +478,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll diff --git a/JNFrame2/Assembly-CSharp-firstpass.csproj b/JNFrame2/Assembly-CSharp-firstpass.csproj index 0a3ae09e..92a2bbb4 100644 --- a/JNFrame2/Assembly-CSharp-firstpass.csproj +++ b/JNFrame2/Assembly-CSharp-firstpass.csproj @@ -337,6 +337,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Threading.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll @@ -352,42 +358,36 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll - - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll diff --git a/JNFrame2/Assembly-CSharp.csproj b/JNFrame2/Assembly-CSharp.csproj index 1d8b49f0..8b9aae56 100644 --- a/JNFrame2/Assembly-CSharp.csproj +++ b/JNFrame2/Assembly-CSharp.csproj @@ -961,6 +961,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Threading.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll @@ -976,42 +982,36 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll - - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileClientService.cs b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileClientService.cs index a54bae3b..f3a0169e 100644 --- a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileClientService.cs +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileClientService.cs @@ -31,7 +31,7 @@ namespace JNGame.Sync.State.Tile { if (xTuple.X >= 0 && xTuple.Y >= 0) { - return xTuple.Y <= Tiles.Length && xTuple.X <= Tiles[0].Length; + return xTuple.Y < Tiles.Length && xTuple.X < Tiles[0].Length; } return false; } diff --git a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileClientSystem.cs b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileClientSystem.cs index 5545795d..157c7619 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileClientSystem.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileClientSystem.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; using AppGame.Systems; +using DotRecast.Core.Collections; using Game.Input; using Game.JNGFrame.View; using Game.JNGState.Logic.Data; @@ -120,7 +121,7 @@ namespace AppGame.Sync List ids = GetTileGridIndex(PlayerPos.Value); ids.ForEach(AddTileShow); - TileShow.ForEach(id => + TileShow.ToArray().ForEach(id => { if (!(ids.Contains(id))) { diff --git a/JNFrame2/BestHTTP.csproj b/JNFrame2/BestHTTP.csproj index 9cd45300..fbdbfcd8 100644 --- a/JNFrame2/BestHTTP.csproj +++ b/JNFrame2/BestHTTP.csproj @@ -1902,8 +1902,8 @@ - + @@ -2344,6 +2344,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -2374,20 +2380,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -2398,18 +2407,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -2419,24 +2437,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -2812,12 +2812,12 @@ D:\Unity\2021.3.35f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + diff --git a/JNFrame2/Logs/AssetImportWorker0.log b/JNFrame2/Logs/AssetImportWorker0-prev.log similarity index 100% rename from JNFrame2/Logs/AssetImportWorker0.log rename to JNFrame2/Logs/AssetImportWorker0-prev.log diff --git a/JNFrame2/Logs/AssetImportWorker1.log b/JNFrame2/Logs/AssetImportWorker1-prev.log similarity index 100% rename from JNFrame2/Logs/AssetImportWorker1.log rename to JNFrame2/Logs/AssetImportWorker1-prev.log diff --git a/JNFrame2/Logs/shadercompiler-AssetImportWorker0.log b/JNFrame2/Logs/shadercompiler-AssetImportWorker0.log deleted file mode 100644 index 9f3e66e5..00000000 --- a/JNFrame2/Logs/shadercompiler-AssetImportWorker0.log +++ /dev/null @@ -1,3 +0,0 @@ -Base path: 'D:/Unity/2021.3.35f1/Editor/Data', plugins path 'D:/Unity/2021.3.35f1/Editor/Data/PlaybackEngines' -Cmd: initializeCompiler - diff --git a/JNFrame2/StompyRobot.SRDebugger.Editor.csproj b/JNFrame2/StompyRobot.SRDebugger.Editor.csproj index 1cd7c7e3..fda8c701 100644 --- a/JNFrame2/StompyRobot.SRDebugger.Editor.csproj +++ b/JNFrame2/StompyRobot.SRDebugger.Editor.csproj @@ -359,6 +359,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -389,20 +395,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -413,18 +422,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -434,24 +452,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -839,12 +839,12 @@ D:\Unity\2021.3.35f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.TestRunner.dll diff --git a/JNFrame2/StompyRobot.SRDebugger.csproj b/JNFrame2/StompyRobot.SRDebugger.csproj index 2b31bb0e..0685c82f 100644 --- a/JNFrame2/StompyRobot.SRDebugger.csproj +++ b/JNFrame2/StompyRobot.SRDebugger.csproj @@ -451,6 +451,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -481,20 +487,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -505,18 +514,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -526,24 +544,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -919,12 +919,12 @@ D:\Unity\2021.3.35f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + diff --git a/JNFrame2/StompyRobot.SRF.Editor.csproj b/JNFrame2/StompyRobot.SRF.Editor.csproj index 0a50d5c9..5f950c9b 100644 --- a/JNFrame2/StompyRobot.SRF.Editor.csproj +++ b/JNFrame2/StompyRobot.SRF.Editor.csproj @@ -350,6 +350,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -380,20 +386,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -404,18 +413,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -425,24 +443,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -830,12 +830,12 @@ D:\Unity\2021.3.35f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.TestRunner.dll diff --git a/JNFrame2/StompyRobot.SRF.csproj b/JNFrame2/StompyRobot.SRF.csproj index 70278655..1b11dc82 100644 --- a/JNFrame2/StompyRobot.SRF.csproj +++ b/JNFrame2/StompyRobot.SRF.csproj @@ -396,6 +396,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -426,20 +432,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -450,18 +459,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -471,24 +489,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -864,12 +864,12 @@ D:\Unity\2021.3.35f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + diff --git a/JNFrame2/UniTask.Addressables.csproj b/JNFrame2/UniTask.Addressables.csproj index 2fa260a0..ab18df46 100644 --- a/JNFrame2/UniTask.Addressables.csproj +++ b/JNFrame2/UniTask.Addressables.csproj @@ -341,6 +341,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -371,20 +377,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -395,18 +404,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -416,24 +434,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -809,12 +809,12 @@ D:\Unity\2021.3.35f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + diff --git a/JNFrame2/UniTask.DOTween.csproj b/JNFrame2/UniTask.DOTween.csproj index 007254bb..14949e48 100644 --- a/JNFrame2/UniTask.DOTween.csproj +++ b/JNFrame2/UniTask.DOTween.csproj @@ -341,6 +341,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -371,20 +377,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -395,18 +404,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -416,24 +434,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -809,12 +809,12 @@ D:\Unity\2021.3.35f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + diff --git a/JNFrame2/UniTask.Editor.csproj b/JNFrame2/UniTask.Editor.csproj index f543d4c6..99f70dbf 100644 --- a/JNFrame2/UniTask.Editor.csproj +++ b/JNFrame2/UniTask.Editor.csproj @@ -346,6 +346,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -376,20 +382,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -400,18 +409,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -421,24 +439,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -826,12 +826,12 @@ D:\Unity\2021.3.35f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.TestRunner.dll diff --git a/JNFrame2/UniTask.Linq.csproj b/JNFrame2/UniTask.Linq.csproj index dd3eb48c..792a276e 100644 --- a/JNFrame2/UniTask.Linq.csproj +++ b/JNFrame2/UniTask.Linq.csproj @@ -413,6 +413,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -443,20 +449,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -467,18 +476,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -488,24 +506,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -881,12 +881,12 @@ D:\Unity\2021.3.35f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + diff --git a/JNFrame2/UniTask.TextMeshPro.csproj b/JNFrame2/UniTask.TextMeshPro.csproj index c633c04c..fe148f78 100644 --- a/JNFrame2/UniTask.TextMeshPro.csproj +++ b/JNFrame2/UniTask.TextMeshPro.csproj @@ -342,6 +342,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -372,20 +378,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -396,18 +405,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -417,24 +435,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -813,12 +813,12 @@ D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\Unity.TextMeshPro.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + diff --git a/JNFrame2/UniTask.csproj b/JNFrame2/UniTask.csproj index b158aa15..e0818b01 100644 --- a/JNFrame2/UniTask.csproj +++ b/JNFrame2/UniTask.csproj @@ -413,6 +413,12 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.dll @@ -443,20 +449,23 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Caching.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Extensions.dll + + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.dll - - D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\Editor\DesperateDevs.Unity.Editor.dll @@ -467,18 +476,27 @@ D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Unity.dll D:\myproject\JisolGame\JNFrame2\Assets\Plugins\Demigiant\DOTween\Editor\DOTweenEditor.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll + + D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll + D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny\Jenny.Plugins.Unity.dll @@ -488,24 +506,6 @@ D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll - D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll @@ -881,12 +881,12 @@ D:\Unity\2021.3.35f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll - D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEditor.UI.dll + + D:\myproject\JisolGame\JNFrame2\Library\ScriptAssemblies\UnityEngine.UI.dll + diff --git a/JNFrame2/UserSettings/Layouts/default-2021.dwlt b/JNFrame2/UserSettings/Layouts/default-2021.dwlt index f85fbb21..18c1ba3f 100644 --- a/JNFrame2/UserSettings/Layouts/default-2021.dwlt +++ b/JNFrame2/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Console + m_Title: Inspector 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: 61 + controlID: 17 --- !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: 62 + controlID: 18 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,11 +166,11 @@ MonoBehaviour: x: 0 y: 0 width: 1468 - height: 113 + height: 384 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 63 + controlID: 96 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,7 +189,7 @@ MonoBehaviour: x: 0 y: 0 width: 264 - height: 113 + height: 384 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} @@ -215,9 +215,9 @@ MonoBehaviour: x: 264 y: 0 width: 709 - height: 113 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + height: 384 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -242,9 +242,9 @@ MonoBehaviour: x: 973 y: 0 width: 495 - height: 113 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + height: 384 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -266,11 +266,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 113 + y: 384 width: 1468 - height: 826 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + height: 555 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 19} @@ -296,8 +296,8 @@ MonoBehaviour: y: 0 width: 452 height: 939 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -324,10 +324,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -31027 - y: -31970 + x: 973 + y: 73 width: 493 - height: 92 + height: 363 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -341,7 +341,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 493, y: 71} + m_TargetSize: {x: 493, y: 342} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -358,8 +358,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -246.5 m_HBaseRangeMax: 246.5 - m_VBaseRangeMin: -35.5 - m_VBaseRangeMax: 35.5 + m_VBaseRangeMin: -171 + m_VBaseRangeMax: 171 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -378,9 +378,9 @@ MonoBehaviour: x: 0 y: 21 width: 493 - height: 71 + height: 342 m_Scale: {x: 1, y: 1} - m_Translation: {x: 246.5, y: 35.5} + m_Translation: {x: 246.5, y: 171} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -388,12 +388,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -246.5 - y: -35.5 + y: -171 width: 493 - height: 71 + height: 342 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 493, y: 92} + m_LastWindowPixelSize: {x: 493, y: 363} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -449,9 +449,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: -32000 - y: -31857 + y: -31586 width: 1467 - height: 805 + height: 534 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -480,7 +480,7 @@ MonoBehaviour: x: 0 y: 73 width: 263 - height: 92 + height: 363 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -491,7 +491,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 18fbffff + m_ExpandedIDs: ee51ffff3054ffff8654ffff4257ffff4657ffffe058ffffd65affff8668ffffdc68ffff986bffff9c6bffffe06effff366ffffff271fffff671ffff0c7bffff627bffff1e7effff227efffff085ffff4686ffff0289ffff0689ffffac8dffff028effffbe90ffffc290ffff5e96ffffb496ffff7099ffff7499ffffb69dffff0c9effffc8a0ffffcca0ffffaea5ffff04a6ffffc0a8ffffc4a8ffffecb2ffff42b3ffff02b6ffff0ab6ffffd2bcffff76bdfffff4d8ffff16fbfffff4ffffff88b20000a6b30000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -535,10 +535,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -31736 - y: -31970 + x: 264 + y: 73 width: 707 - height: 92 + height: 363 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -560,7 +560,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: -83} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 @@ -593,7 +593,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 25} - snapOffsetDelta: {x: 0, y: -25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar index: 0 @@ -829,9 +829,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 54.489304, y: 63.761505, z: -6.9925756} + m_Target: {x: 115.69666, y: 156.10828, z: -93.89607} speed: 2 - m_Value: {x: 54.489304, y: 63.761505, z: -6.9925756} + m_Value: {x: 115.69666, y: 156.10828, z: -93.89607} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -878,9 +878,9 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.49240038, y: -0.055547766, z: 0.03151684, w: -0.86803347} + m_Target: {x: -0.35689405, y: -0.06941557, z: 0.026610041, w: -0.93119174} speed: 2 - m_Value: {x: -0.49239567, y: -0.055547237, z: 0.031516537, w: -0.8680252} + m_Value: {x: -0.3568505, y: -0.07081164, z: 0.027145106, w: -0.93107814} m_Size: m_Target: 3.155869 speed: 2 @@ -959,9 +959,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 367 + y: 457 width: 1467 - height: 624 + height: 534 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -987,14 +987,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scenes m_LastFoldersGridSize: 96 - m_LastProjectPath: E:\project\JNFrame2 + m_LastProjectPath: D:\myproject\JisolGame\JNFrame2 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 155} - m_SelectedIDs: 4e740000 - m_LastClickedID: 29774 - m_ExpandedIDs: 00000000627300006473000066730000687300006a7300006c7300006e73000070730000727300007473000076730000 + scrollPos: {x: 0, y: 199} + m_SelectedIDs: fe730000 + m_LastClickedID: 29694 + m_ExpandedIDs: 00000000827300008473000086730000887300008a7300008c7300008e73000090730000927300009473000096730000d673000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1022,7 +1022,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000627300006473000066730000687300006a7300006c7300006e73000070730000727300007473000076730000 + m_ExpandedIDs: 00000000827300008473000086730000887300008a7300008c7300008e73000090730000927300009473000096730000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1047,8 +1047,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 48780000 + m_LastClickedInstanceID: 30792 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: