diff --git a/JNFrame2/AimingRig.csproj b/JNFrame2/AimingRig.csproj index aa03c86d..b54d6756 100644 --- a/JNFrame2/AimingRig.csproj +++ b/JNFrame2/AimingRig.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -341,9 +341,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -386,6 +383,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -422,6 +422,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -434,8 +437,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/Assembly-CSharp-Editor.csproj b/JNFrame2/Assembly-CSharp-Editor.csproj index 7b916c51..df98a7f2 100644 --- a/JNFrame2/Assembly-CSharp-Editor.csproj +++ b/JNFrame2/Assembly-CSharp-Editor.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -385,9 +385,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -430,6 +427,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -466,6 +466,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -478,8 +481,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="nunit.framework"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath> diff --git a/JNFrame2/Assembly-CSharp-firstpass.csproj b/JNFrame2/Assembly-CSharp-firstpass.csproj index 92a2bbb4..20a7e51e 100644 --- a/JNFrame2/Assembly-CSharp-firstpass.csproj +++ b/JNFrame2/Assembly-CSharp-firstpass.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -337,9 +337,6 @@ <Reference Include="DesperateDevs.Threading"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Threading.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -367,6 +364,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Sherlog.Appenders"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll</HintPath> </Reference> @@ -382,14 +382,17 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> <Reference Include="Unity.VisualScripting.Antlr3.Runtime"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/Assembly-CSharp.csproj b/JNFrame2/Assembly-CSharp.csproj index 8b9aae56..ccb8180a 100644 --- a/JNFrame2/Assembly-CSharp.csproj +++ b/JNFrame2/Assembly-CSharp.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -180,7 +180,7 @@ <Compile Include="Assets\JNGame\Plugins\Entitas\Entitas\src\Entity\Exceptions\EntityDoesNotHaveComponentException.cs" /> <Compile Include="Assets\JNGame\Plugins\Entitas\Entitas\src\Context\ContextExtension.cs" /> <Compile Include="Assets\Samples\Cinemachine\2.10.1\Cinemachine Example Scenes\Shared\Scripts\SimpleElevator.cs" /> - <Compile Include="Assets\Scripts\Game\Data\DStateDataSystem.cs" /> + <Compile Include="Assets\Scripts\Game\Data\GDataBaseSystem.cs" /> <Compile Include="Assets\JNGame\Map\DotRecast\Src\DotRecast.Core\Buffers\RcCyclicBuffer.cs" /> <Compile Include="Assets\Samples\Cinemachine\2.10.1\Cinemachine Example Scenes\Scenes\FadeOutNearbyObjects\CinemachineFadeOutNearbyObjects.cs" /> <Compile Include="Assets\JNGame\Map\DotRecast\Src\DotRecast.Recast\RcHeightfieldLayerSet.cs" /> @@ -206,6 +206,7 @@ <Compile Include="Assets\Samples\Cinemachine\2.10.1\Cinemachine Example Scenes\Scenes\Anywhere Door\PlayerMovement.cs" /> <Compile Include="Assets\Samples\Cinemachine\2.10.1\Cinemachine Example Scenes\Shared\Scripts\ThirdPersonFollowDistanceModifier.cs" /> <Compile Include="Assets\JNGame\Map\DotRecast\Src\DotRecast.Detour.Dynamic\Colliders\DtTrimeshCollider.cs" /> + <Compile Include="Assets\JNGame\Sync\App\Tile\JNSSTileTool.cs" /> <Compile Include="Assets\Samples\Cinemachine\2.10.1\Cinemachine Example Scenes\Scenes\3rdPersonWithAimMode\ActivateOnKeypress.cs" /> <Compile Include="Assets\Samples\Cinemachine\2.10.1\Cinemachine Example Scenes\Scenes\DualTarget\MoveAimTarget.cs" /> <Compile Include="Assets\JNGame\Map\DotRecast\Src\DotRecast.Detour.TileCache\IDtTileCacheMeshProcess.cs" /> @@ -687,8 +688,8 @@ <Compile Include="Assets\JNGame\Map\DotRecast\Src\DotRecast.Core\IRcRand.cs" /> <Compile Include="Assets\JNGame\Math\BaseType\LVector2.cs" /> <Compile Include="Assets\JNGame\Plugins\Entitas\Entitas\src\Context\Context.cs" /> - <None Include="Assets\Packages\TouchSocket.2.0.15\LICENSE.txt" /> <None Include="Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.xml" /> + <None Include="Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.xml" /> <None Include="Assets\Packages\System.Text.Encodings.Web.6.0.0\useSharedDesignerContext.txt" /> <None Include="Assets\Resources\map1.json" /> <None Include="Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.xml" /> @@ -696,15 +697,17 @@ <None Include="Assets\Resources\Battle\Map\NavMesh\Map_1001.navmesh.json" /> <None Include="Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.xml" /> <None Include="Assets\JNGame\Plugins\Entitas\Entitas\src\version.txt" /> + <None Include="Assets\Packages\TouchSocket.2.0.16\LICENSE.txt" /> <None Include="Assets\Packages\System.Text.Json.6.0.0\lib\netstandard2.0\System.Text.Json.xml" /> - <None Include="Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.xml" /> <None Include="Assets\Samples\Cinemachine\2.10.1\Cinemachine Example Scenes\Scenes\Anywhere Door\ScreenCutoutShader.shader" /> - <None Include="Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.xml" /> + <None Include="Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.xml" /> <None Include="Assets\Packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.xml" /> <None Include="Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.xml" /> <None Include="Assets\Packages\System.Text.Json.6.0.0\useSharedDesignerContext.txt" /> - <None Include="Assets\Packages\TouchSocket.Core.2.0.15\LICENSE.txt" /> + <None Include="Assets\Packages\TouchSocket.Http.2.0.16\LICENSE.txt" /> + <None Include="Assets\Packages\TouchSocket.Core.2.0.16\LICENSE.txt" /> <None Include="Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\useSharedDesignerContext.txt" /> + <None Include="Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.xml" /> <None Include="Assets\Packages\System.Runtime.CompilerServices.Unsafe.6.0.0\useSharedDesignerContext.txt" /> <Reference Include="UnityEngine"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\Managed\UnityEngine\UnityEngine.dll</HintPath> @@ -961,9 +964,6 @@ <Reference Include="DesperateDevs.Threading"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\DesperateDevs\DesperateDevs.Threading.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -991,6 +991,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Sherlog.Appenders"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Appenders.dll</HintPath> </Reference> @@ -1006,14 +1009,17 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> <Reference Include="Unity.VisualScripting.Antlr3.Runtime"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.visualscripting@1.9.1\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/Assets/JNGame/Network/Action/NActionEnum.cs b/JNFrame2/Assets/JNGame/Network/Action/NActionEnum.cs index 2a554995..9fb84b47 100644 --- a/JNFrame2/Assets/JNGame/Network/Action/NActionEnum.cs +++ b/JNFrame2/Assets/JNGame/Network/Action/NActionEnum.cs @@ -26,9 +26,12 @@ NSyncStateDataUpdate = 121, //状态同步更新 NSyncStateAllUpdate = 122, //状态全量更新 - NSyncStateAllBack = 123, //状态同步全量回调 + NSyncStateAllUpdateBack = 123, //状态同步全量回调 - NSyncTileInput = 131, //状态Tile同步输入 + NSyncTileInput = 131, //区块Tile同步输入 + NSyncTileAllUpdate = 132, //区块全量更新 + NSyncTileAllUpdateBack = 133, //区块同步全量回调 + NSyncTileGetTileInfo = 134, //获取指定区块的全量信息 NAddTileServer = 141, //添加区块服务器 diff --git a/JNFrame2/Assets/JNGame/Network/JNClientBase.cs b/JNFrame2/Assets/JNGame/Network/JNClientBase.cs index f701b869..807e46db 100644 --- a/JNFrame2/Assets/JNGame/Network/JNClientBase.cs +++ b/JNFrame2/Assets/JNGame/Network/JNClientBase.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Reflection; using System.Threading.Tasks; using AppGame; +using Cysharp.Threading.Tasks; using DotRecast.Core.Collections; using Google.Protobuf; using Plugins.JNGame.Network.Entity; @@ -26,6 +27,9 @@ namespace Plugins.JNGame.Network //计入字节大小 protected Dictionary<int, int> _byteSize = new(); + + //回调消息 + protected Dictionary<int, UniTaskCompletionSource<byte[]>> _callback = new (); public void SetEvent(EventDispatcher dispatcher) { @@ -46,8 +50,21 @@ namespace Plugins.JNGame.Network public virtual void Dispatch(JNetParam data) { _byteSize[data.HId] = data.Bytes.Length; - //发送消息 - _event.Dispatch($"{data.HId}",data.Bytes); + + //判断是否是回调消息 + if (data.HId <= 0) + { + //回调消息 + _callback.TryGetValue(data.ID,out var task); + if (task is null) return; + task.TrySetResult(data.Bytes); + } + else + { + //通知消息 + _event.Dispatch($"{data.HId}",data.Bytes); + } + } //向服务器发送消息 @@ -57,6 +74,17 @@ namespace Plugins.JNGame.Network _byteSize[hId] = bytes.Length; SendBytes(bytes); } + + //向服务器发送消息(有回调的消息) + public virtual async Task<byte[]> SendCallback(int hId,IMessage data = null,int timeout = 1000) + { + var id = this._id++; + _callback[id] = new UniTaskCompletionSource<byte[]>(); + var bytes = NDataUtil.Encrypt(JNetParam.Build(id, hId).SetData(data)); + SendBytes(bytes); + var message = await UniTask.WhenAny(_callback[id].Task, UniTask.Delay(timeout)); + return message.result; + } public virtual void SendBytes(byte[] data){ } diff --git a/JNFrame2/Assets/JNGame/Network/JNServerBase.cs b/JNFrame2/Assets/JNGame/Network/JNServerBase.cs index 5cf8f0b6..59f1642c 100644 --- a/JNFrame2/Assets/JNGame/Network/JNServerBase.cs +++ b/JNFrame2/Assets/JNGame/Network/JNServerBase.cs @@ -17,6 +17,8 @@ namespace Plugins.JNGame.Network public string Client; + public int MessageID; + public byte[] Message; } diff --git a/JNFrame2/Assets/JNGame/Network/JNSocket.cs b/JNFrame2/Assets/JNGame/Network/JNSocket.cs index d3a75115..a03add38 100644 --- a/JNFrame2/Assets/JNGame/Network/JNSocket.cs +++ b/JNFrame2/Assets/JNGame/Network/JNSocket.cs @@ -9,6 +9,9 @@ using Google.Protobuf; using Plugins.JNGame.Network.Entity; using Plugins.JNGame.Network.Util; using Plugins.JNGame.Util; +using TouchSocket.Core; +using TouchSocket.Http.WebSockets; +using TouchSocket.Sockets; using UnityEngine; namespace Plugins.JNGame.Network @@ -16,10 +19,7 @@ namespace Plugins.JNGame.Network public abstract class JNSocket : JNClientBase { - private WebSocket _socket; - - private UniTaskCompletionSource _onOpen; - + private WebSocketClient client; public override async Task OnInit() { @@ -29,61 +29,40 @@ namespace Plugins.JNGame.Network public async Task StartConnect() { + client = new WebSocketClient(); + await client.SetupAsync(new TouchSocketConfig() + .SetRemoteIPHost(await this.GetUrl()) + .ConfigurePlugins(a => + { + a.UseReconnection(-1, true, 1000); //如需永远尝试连接,tryCount设置为-1即可。 + }) + .ConfigureContainer(a => + { + a.AddConsoleLogger(); + })); + client.Received += OnReceived; - - var url = $"{await this.GetUrl()}"; - this._socket = new WebSocket(new Uri(url)); - - this._socket.OnOpen += OnOpen; - this._socket.OnMessage += OnMessageReceived; - this._socket.OnError += OnError; - this._socket.OnClosed += OnClosed; - this._socket.OnBinary += Onbinary; - - Debug.Log($"[JNSocket]初始化WebSocket成功,URL:{url}"); - this._socket.Open(); - - //等待连接成功 - await (this._onOpen = new UniTaskCompletionSource()).Task; + client.Connect(); + Debug.Log($"[JNSocket]连接WebSocket成功"); } - - private void OnOpen(WebSocket websocket) + private Task OnReceived(WebSocketClient webSocketClient, WSDataFrameEventArgs e) { - Debug.Log($"[JNSocket] OnOpen"); - this._onOpen.TrySetResult(); + if (e.DataFrame.Opcode == WSDataType.Binary && e.DataFrame.FIN) + { + Dispatch(NDataUtil.Parse(e.DataFrame.PayloadData)); + } + return Task.CompletedTask; } - private void OnMessageReceived(WebSocket websocket, string message) - { - Debug.Log($"[JNSocket] OnMessageReceived"); - } - private void OnError(WebSocket websocket, string reason) - { - Debug.Log($"[JNSocket] OnError"); - } - - private void OnClosed(WebSocket websocket, ushort code, string message) - { - Debug.Log($"[JNSocket] OnClosed"); - } - - private void Onbinary(WebSocket websocket, byte[] data) - { - - // NSystem.Log($"[JNSocket] Onbinary"); - Dispatch(NDataUtil.Parse(data)); - - } - protected abstract UniTask<string> GetUrl(); public override void SendBytes(byte[] data) { - _socket.Send(data); + client.SendAsync(data); } } diff --git a/JNFrame2/Assets/JNGame/Network/JNTCPClient.cs b/JNFrame2/Assets/JNGame/Network/JNTCPClient.cs index 87051929..7d07d51b 100644 --- a/JNFrame2/Assets/JNGame/Network/JNTCPClient.cs +++ b/JNFrame2/Assets/JNGame/Network/JNTCPClient.cs @@ -36,7 +36,7 @@ namespace JNGame.Network tcpClient.Disconnected = OnDisconnected;//从服务器断开连接,当连接不成功时不会触发。 tcpClient.Received = OnReceived; - tcpClient.Connect(await GetEndPoint()); + await tcpClient.ConnectAsync(await GetEndPoint()); } /// <summary> @@ -108,8 +108,10 @@ namespace JNGame.Network public override void OnClose() { - base.OnClose(); tcpClient.Close(); + tcpClient.Dispose(); + Debug.Log($"[JNTCPClient] 关闭对象"); + base.OnClose(); } protected virtual async UniTask<string> GetEndPoint() diff --git a/JNFrame2/Assets/JNGame/Network/JNTCPServer.cs b/JNFrame2/Assets/JNGame/Network/JNTCPServer.cs index 1a37d70e..8d6a71d2 100644 --- a/JNFrame2/Assets/JNGame/Network/JNTCPServer.cs +++ b/JNFrame2/Assets/JNGame/Network/JNTCPServer.cs @@ -103,6 +103,7 @@ namespace JNGame.Network Dispatch(param.HId,new JNServerParam() { Client = client.Id, + MessageID = param.ID, Message = param.Bytes, }); await UniTask.NextFrame(); @@ -123,10 +124,19 @@ namespace JNGame.Network public void Send(SocketClient client,int hId,IMessage data = null) + { + Send(client.Id,hId,data); + } + public void Send(string client,int hId,IMessage data = null) { var bytes = NDataUtil.Encrypt(JNetParam.Build(this._id++, hId).SetData(data)); _byteSize[hId] = bytes.Length; - service.SendAsync(client.Id, bytes); + service.SendAsync(client, bytes); + } + public void SendCallback(string client,int id,IMessage data = null) + { + var bytes = NDataUtil.Encrypt(JNetParam.Build(id, 0).SetData(data)); + service.SendAsync(client, bytes); } public void AllSend(int hId,IMessage data = null) diff --git a/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs b/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs index b92f1c33..fdf89d5b 100644 --- a/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs +++ b/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs @@ -31,20 +31,17 @@ public static partial class JNSyncMessageReflection { "CzINLkpORnJhbWVJbnB1dCIsCgxKTkZyYW1lSW5mb3MSHAoGZnJhbWVzGAEg", "AygLMgwuSk5GcmFtZUluZm8iKwoHSk5JbnB1dBIUCgdtZXNzYWdlGAEgASgJ", "SACIAQFCCgoIX21lc3NhZ2UiKQoLSk5TdGF0ZURhdGESEQoEZGF0YRgCIAEo", - "DEgAiAEBQgcKBV9kYXRhIo8BCg5KTlN0YXRlQWxsRGF0YRINCgVOZXRJRBgB", - "IAEoBRIvCghtZXNzYWdlcxgCIAMoCzIdLkpOU3RhdGVBbGxEYXRhLk1lc3Nh", - "Z2VzRW50cnkaPQoNTWVzc2FnZXNFbnRyeRILCgNrZXkYASABKAMSGwoFdmFs", - "dWUYAiABKAsyDC5KTlN0YXRlRGF0YToCOAEikQEKD0pOU3RhdGVJdGVtRGF0", - "YRINCgVOZXRJRBgBIAEoBRIwCghtZXNzYWdlcxgCIAMoCzIeLkpOU3RhdGVJ", - "dGVtRGF0YS5NZXNzYWdlc0VudHJ5Gj0KDU1lc3NhZ2VzRW50cnkSCwoDa2V5", - "GAEgASgDEhsKBXZhbHVlGAIgASgLMgwuSk5TdGF0ZURhdGE6AjgBIkEKEUpO", - "U3RhdGVUaWxlSW5wdXRzEgsKA3RJZBgBIAEoBRIfCgdtZXNzYWdlGAIgASgL", - "Mg4uSk5GcmFtZUlucHV0cyJCChNKTlN0YXRlVGlsZUl0ZW1EYXRhEgsKA3RJ", - "ZBgBIAEoBRIeCgRkYXRhGAIgASgLMhAuSk5TdGF0ZUl0ZW1EYXRhIkAKEkpO", - "U3RhdGVUaWxlQWxsRGF0YRILCgN0SWQYASABKAUSHQoEZGF0YRgCIAEoCzIP", - "LkpOU3RhdGVBbGxEYXRhIjkKD0pOQWRkVGlsZVNlcnZlchIMCgR0aWxlGAEg", - "ASgFEgoKAmlwGAIgASgJEgwKBHBvcnQYAyABKAVCFgoUY24uamlzb2wubmdh", - "bWUucHJvdG9iBnByb3RvMw==")); + "DEgAiAEBQgcKBV9kYXRhIpEBCg9KTlN0YXRlSXRlbURhdGESDQoFTmV0SUQY", + "ASABKAUSMAoIbWVzc2FnZXMYAiADKAsyHi5KTlN0YXRlSXRlbURhdGEuTWVz", + "c2FnZXNFbnRyeRo9Cg1NZXNzYWdlc0VudHJ5EgsKA2tleRgBIAEoAxIbCgV2", + "YWx1ZRgCIAEoCzIMLkpOU3RhdGVEYXRhOgI4ASIwCg5KTlN0YXRlQWxsRGF0", + "YRIeCgRkYXRhGAIgAygLMhAuSk5TdGF0ZUl0ZW1EYXRhIkEKEUpOU3RhdGVU", + "aWxlSW5wdXRzEgsKA3RJZBgBIAEoBRIfCgdtZXNzYWdlGAIgASgLMg4uSk5G", + "cmFtZUlucHV0cyJAChJKTlN0YXRlVGlsZUFsbERhdGESCwoDdElkGAEgASgF", + "Eh0KBGRhdGEYAiABKAsyDy5KTlN0YXRlQWxsRGF0YSIqChtOU3luY1RpbGVH", + "ZXRUaWxlSW5mb1JlcXVlc3QSCwoDdElkGAEgASgFIjkKD0pOQWRkVGlsZVNl", + "cnZlchIMCgR0aWxlGAEgASgFEgoKAmlwGAIgASgJEgwKBHBvcnQYAyABKAVC", + "FgoUY24uamlzb2wubmdhbWUucHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { @@ -56,11 +53,11 @@ public static partial class JNSyncMessageReflection { new pbr::GeneratedClrTypeInfo(typeof(global::JNFrameInfos), global::JNFrameInfos.Parser, new[]{ "Frames" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::JNInput), global::JNInput.Parser, new[]{ "Message" }, new[]{ "Message" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::JNStateData), global::JNStateData.Parser, new[]{ "Data" }, new[]{ "Data" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::JNStateAllData), global::JNStateAllData.Parser, new[]{ "NetID", "Messages" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }), new pbr::GeneratedClrTypeInfo(typeof(global::JNStateItemData), global::JNStateItemData.Parser, new[]{ "NetID", "Messages" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }), + new pbr::GeneratedClrTypeInfo(typeof(global::JNStateAllData), global::JNStateAllData.Parser, new[]{ "Data" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::JNStateTileInputs), global::JNStateTileInputs.Parser, new[]{ "TId", "Message" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::JNStateTileItemData), global::JNStateTileItemData.Parser, new[]{ "TId", "Data" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::JNStateTileAllData), global::JNStateTileAllData.Parser, new[]{ "TId", "Data" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::NSyncTileGetTileInfoRequest), global::NSyncTileGetTileInfoRequest.Parser, new[]{ "TId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::JNAddTileServer), global::JNAddTileServer.Parser, new[]{ "Tile", "Ip", "Port" }, null, null, null, null) })); } @@ -1751,230 +1748,6 @@ public sealed partial class JNStateData : pb::IMessage<JNStateData> } -/// <summary> -/// 全量状态 -/// </summary> -public sealed partial class JNStateAllData : pb::IMessage<JNStateAllData> -#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - , pb::IBufferMessage -#endif -{ - private static readonly pb::MessageParser<JNStateAllData> _parser = new pb::MessageParser<JNStateAllData>(() => new JNStateAllData()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser<JNStateAllData> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pbr::MessageDescriptor Descriptor { - get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[8]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public JNStateAllData() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public JNStateAllData(JNStateAllData other) : this() { - netID_ = other.netID_; - messages_ = other.messages_.Clone(); - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public JNStateAllData Clone() { - return new JNStateAllData(this); - } - - /// <summary>Field number for the "NetID" field.</summary> - public const int NetIDFieldNumber = 1; - private int netID_; - /// <summary> - ///同步Id - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int NetID { - get { return netID_; } - set { - netID_ = value; - } - } - - /// <summary>Field number for the "messages" field.</summary> - public const int MessagesFieldNumber = 2; - private static readonly pbc::MapField<long, global::JNStateData>.Codec _map_messages_codec - = new pbc::MapField<long, global::JNStateData>.Codec(pb::FieldCodec.ForInt64(8, 0L), pb::FieldCodec.ForMessage(18, global::JNStateData.Parser), 18); - private readonly pbc::MapField<long, global::JNStateData> messages_ = new pbc::MapField<long, global::JNStateData>(); - /// <summary> - ///状态bytes - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::MapField<long, global::JNStateData> Messages { - get { return messages_; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override bool Equals(object other) { - return Equals(other as JNStateAllData); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(JNStateAllData other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (NetID != other.NetID) return false; - if (!Messages.Equals(other.Messages)) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override int GetHashCode() { - int hash = 1; - if (NetID != 0) hash ^= NetID.GetHashCode(); - hash ^= Messages.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void WriteTo(pb::CodedOutputStream output) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - output.WriteRawMessage(this); - #else - if (NetID != 0) { - output.WriteRawTag(8); - output.WriteInt32(NetID); - } - messages_.WriteTo(output, _map_messages_codec); - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (NetID != 0) { - output.WriteRawTag(8); - output.WriteInt32(NetID); - } - messages_.WriteTo(ref output, _map_messages_codec); - if (_unknownFields != null) { - _unknownFields.WriteTo(ref output); - } - } - #endif - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int CalculateSize() { - int size = 0; - if (NetID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(NetID); - } - size += messages_.CalculateSize(_map_messages_codec); - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(JNStateAllData other) { - if (other == null) { - return; - } - if (other.NetID != 0) { - NetID = other.NetID; - } - messages_.Add(other.messages_); - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(pb::CodedInputStream input) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - input.ReadRawMessage(this); - #else - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 8: { - NetID = input.ReadInt32(); - break; - } - case 18: { - messages_.AddEntriesFrom(input, _map_messages_codec); - break; - } - } - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); - break; - case 8: { - NetID = input.ReadInt32(); - break; - } - case 18: { - messages_.AddEntriesFrom(ref input, _map_messages_codec); - break; - } - } - } - } - #endif - -} - /// <summary> /// 更新状态 /// </summary> @@ -1992,7 +1765,7 @@ public sealed partial class JNStateItemData : pb::IMessage<JNStateItemData> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[9]; } + get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[8]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -2199,6 +1972,190 @@ public sealed partial class JNStateItemData : pb::IMessage<JNStateItemData> } +/// <summary> +/// 全量状态 +/// </summary> +public sealed partial class JNStateAllData : pb::IMessage<JNStateAllData> +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser<JNStateAllData> _parser = new pb::MessageParser<JNStateAllData>(() => new JNStateAllData()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser<JNStateAllData> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[9]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public JNStateAllData() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public JNStateAllData(JNStateAllData other) : this() { + data_ = other.data_.Clone(); + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public JNStateAllData Clone() { + return new JNStateAllData(this); + } + + /// <summary>Field number for the "data" field.</summary> + public const int DataFieldNumber = 2; + private static readonly pb::FieldCodec<global::JNStateItemData> _repeated_data_codec + = pb::FieldCodec.ForMessage(18, global::JNStateItemData.Parser); + private readonly pbc::RepeatedField<global::JNStateItemData> data_ = new pbc::RepeatedField<global::JNStateItemData>(); + /// <summary> + ///数据 + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField<global::JNStateItemData> Data { + get { return data_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as JNStateAllData); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(JNStateAllData other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if(!data_.Equals(other.data_)) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + hash ^= data_.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + data_.WriteTo(output, _repeated_data_codec); + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + data_.WriteTo(ref output, _repeated_data_codec); + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + size += data_.CalculateSize(_repeated_data_codec); + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(JNStateAllData other) { + if (other == null) { + return; + } + data_.Add(other.data_); + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 18: { + data_.AddEntriesFrom(input, _repeated_data_codec); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 18: { + data_.AddEntriesFrom(ref input, _repeated_data_codec); + break; + } + } + } + } + #endif + +} + /// <summary> /// --------------------- 状态Tile同步 ----------------------- /// 状态Tile输入 @@ -2444,247 +2401,6 @@ public sealed partial class JNStateTileInputs : pb::IMessage<JNStateTileInputs> } -/// <summary> -/// Tile更新状态 -/// </summary> -public sealed partial class JNStateTileItemData : pb::IMessage<JNStateTileItemData> -#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - , pb::IBufferMessage -#endif -{ - private static readonly pb::MessageParser<JNStateTileItemData> _parser = new pb::MessageParser<JNStateTileItemData>(() => new JNStateTileItemData()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser<JNStateTileItemData> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pbr::MessageDescriptor Descriptor { - get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[11]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public JNStateTileItemData() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public JNStateTileItemData(JNStateTileItemData other) : this() { - tId_ = other.tId_; - data_ = other.data_ != null ? other.data_.Clone() : null; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public JNStateTileItemData Clone() { - return new JNStateTileItemData(this); - } - - /// <summary>Field number for the "tId" field.</summary> - public const int TIdFieldNumber = 1; - private int tId_; - /// <summary> - ///区块Id - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int TId { - get { return tId_; } - set { - tId_ = value; - } - } - - /// <summary>Field number for the "data" field.</summary> - public const int DataFieldNumber = 2; - private global::JNStateItemData data_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::JNStateItemData Data { - get { return data_; } - set { - data_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override bool Equals(object other) { - return Equals(other as JNStateTileItemData); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(JNStateTileItemData other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (TId != other.TId) return false; - if (!object.Equals(Data, other.Data)) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override int GetHashCode() { - int hash = 1; - if (TId != 0) hash ^= TId.GetHashCode(); - if (data_ != null) hash ^= Data.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void WriteTo(pb::CodedOutputStream output) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - output.WriteRawMessage(this); - #else - if (TId != 0) { - output.WriteRawTag(8); - output.WriteInt32(TId); - } - if (data_ != null) { - output.WriteRawTag(18); - output.WriteMessage(Data); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (TId != 0) { - output.WriteRawTag(8); - output.WriteInt32(TId); - } - if (data_ != null) { - output.WriteRawTag(18); - output.WriteMessage(Data); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(ref output); - } - } - #endif - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int CalculateSize() { - int size = 0; - if (TId != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TId); - } - if (data_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(Data); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(JNStateTileItemData other) { - if (other == null) { - return; - } - if (other.TId != 0) { - TId = other.TId; - } - if (other.data_ != null) { - if (data_ == null) { - Data = new global::JNStateItemData(); - } - Data.MergeFrom(other.Data); - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(pb::CodedInputStream input) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - input.ReadRawMessage(this); - #else - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 8: { - TId = input.ReadInt32(); - break; - } - case 18: { - if (data_ == null) { - Data = new global::JNStateItemData(); - } - input.ReadMessage(Data); - break; - } - } - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); - break; - case 8: { - TId = input.ReadInt32(); - break; - } - case 18: { - if (data_ == null) { - Data = new global::JNStateItemData(); - } - input.ReadMessage(Data); - break; - } - } - } - } - #endif - -} - /// <summary> /// Tile更新全量状态 /// </summary> @@ -2702,7 +2418,7 @@ public sealed partial class JNStateTileAllData : pb::IMessage<JNStateTileAllData [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[12]; } + get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[11]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -2926,6 +2642,201 @@ public sealed partial class JNStateTileAllData : pb::IMessage<JNStateTileAllData } +/// <summary> +/// 获取指定区块的全量数据 +/// </summary> +public sealed partial class NSyncTileGetTileInfoRequest : pb::IMessage<NSyncTileGetTileInfoRequest> +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser<NSyncTileGetTileInfoRequest> _parser = new pb::MessageParser<NSyncTileGetTileInfoRequest>(() => new NSyncTileGetTileInfoRequest()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser<NSyncTileGetTileInfoRequest> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[12]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public NSyncTileGetTileInfoRequest() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public NSyncTileGetTileInfoRequest(NSyncTileGetTileInfoRequest other) : this() { + tId_ = other.tId_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public NSyncTileGetTileInfoRequest Clone() { + return new NSyncTileGetTileInfoRequest(this); + } + + /// <summary>Field number for the "tId" field.</summary> + public const int TIdFieldNumber = 1; + private int tId_; + /// <summary> + ///区块Id + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int TId { + get { return tId_; } + set { + tId_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as NSyncTileGetTileInfoRequest); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(NSyncTileGetTileInfoRequest other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (TId != other.TId) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (TId != 0) hash ^= TId.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (TId != 0) { + output.WriteRawTag(8); + output.WriteInt32(TId); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (TId != 0) { + output.WriteRawTag(8); + output.WriteInt32(TId); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (TId != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(TId); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(NSyncTileGetTileInfoRequest other) { + if (other == null) { + return; + } + if (other.TId != 0) { + TId = other.TId; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 8: { + TId = input.ReadInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 8: { + TId = input.ReadInt32(); + break; + } + } + } + } + #endif + +} + /// <summary> ///Tile服务器区块信息 /// </summary> diff --git a/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto b/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto index eb0a2dbe..3b4167d3 100644 --- a/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto +++ b/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto @@ -46,18 +46,17 @@ message JNStateData{ optional bytes data = 2; //数据 } -// 全量状态 -message JNStateAllData{ - int32 NetID = 1; //同步Id - map<int64 ,JNStateData> messages = 2; //状态bytes -} - // 更新状态 message JNStateItemData{ int32 NetID = 1; //同步Id map<int64 ,JNStateData> messages = 2; //状态bytes } +// 全量状态 +message JNStateAllData{ + repeated JNStateItemData data = 2; //数据 +} + // --------------------- 状态Tile同步 ----------------------- // 状态Tile输入 message JNStateTileInputs{ @@ -65,18 +64,17 @@ message JNStateTileInputs{ JNFrameInputs message = 2; //inputs } -// Tile更新状态 -message JNStateTileItemData{ - int32 tId = 1; //区块Id - JNStateItemData data = 2; -} - // Tile更新全量状态 message JNStateTileAllData{ int32 tId = 1; //区块Id JNStateAllData data = 2; } +// 获取指定区块的全量数据 +message NSyncTileGetTileInfoRequest{ + int32 tId = 1; //区块Id +} + //Tile服务器区块信息 message JNAddTileServer{ int32 tile = 1; //TileId diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs b/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs index 8e83be40..d4094888 100644 --- a/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using JNGame.Sync.Entity; using JNGame.Sync.Frame.Entity; using JNGame.Sync.Frame.Entity.Components; +using UnityEngine; namespace JNGame.Sync.State.Tile.Entity { @@ -44,6 +45,17 @@ namespace JNGame.Sync.State.Tile.Entity public T TileSyncCreate(long id) { + + //判断是否有这个Id实体 + foreach (var data in GetEntities()) + { + if (data.Id == id) + { + Debug.Log("重复Id实体创建"); + return null; + } + } + var entity = NewEntity(); entity.OnInit(this,id); entity.IsHost = false; diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileClientService.cs b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileClientService.cs index f3a0169e..83ed5162 100644 --- a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileClientService.cs +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileClientService.cs @@ -26,55 +26,10 @@ namespace JNGame.Sync.State.Tile /// 区块大小 /// </summary> protected abstract int TileSize { get; } - - public bool IsTileIndex((int X, int Y) xTuple) - { - if (xTuple.X >= 0 && xTuple.Y >= 0) - { - return xTuple.Y < Tiles.Length && xTuple.X < Tiles[0].Length; - } - return false; - } + public int GetTileIndex(LVector3 pos) { - (int x, int y) = GetXYIndex(pos); - return Tiles[y][x]; - } - - public (int X, int Y) GetXYIndex(LVector3 pos) - { - // 遍历数组 - for (int y = 0; y < Tiles.Length; y++) - { - for (int x = 0; x < Tiles[y].Length; x++) - { - // 检查当前元素是否非零 - if (Tiles[y][x] != 0) - { - - //判断是否所在区块 - var min = new LVector2(x.ToLFloat() * TileSize,y.ToLFloat() * TileSize); - var max = new LVector2((x + 1).ToLFloat() * TileSize,(y + 1).ToLFloat() * TileSize); - - // 假设LVector2是一个包含X和Y属性的结构体或类 - // 检查X坐标是否在范围内 - if (pos.x < min.x || pos.x >= max.x) - { - continue; // X坐标不在范围内 - } - // 检查Y坐标是否在范围内 - if (pos.z < min.y || pos.z >= max.y) - { - continue; // Y坐标不在范围内 - } - - return (x,y); - - } - } - } - - return (0,0); + return JNSSTileTool.GetTileIndex(Tiles, TileSize, pos); } /// <summary> @@ -83,23 +38,7 @@ namespace JNGame.Sync.State.Tile /// <returns></returns> public List<int> GetTileGridIndex(LVector3 pos) { - - (int x, int y) = GetXYIndex(pos); - List<int> grid = new List<int>(); - - // 填充九宫格 - for (int i = -1; i <= 1; i++) - { - for (int j = -1; j <= 1; j++) - { - int tempX = x + i; - int tempY = y + j; // 注意这里j+1+1是因为数组第二维存储的是y坐标 - if (IsTileIndex((tempX,tempY))) grid.Add(Tiles[tempY][tempX]); - } - } - - return grid; - + return JNSSTileTool.GetTileGridIndex(Tiles, TileSize,pos); } public void AddTileShow(int index) diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileServerService.cs b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileServerService.cs index 6648e115..53d5e25f 100644 --- a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileServerService.cs +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileServerService.cs @@ -70,7 +70,7 @@ namespace JNGame.Sync.State.Tile { //根据区块设置Id 起始值 var random = base.CreateRandom(); - random.SetIdValue(100000000000L * TID); + random.SetIdValue(100000000000L * TID,(100000000000L * (TID + 1) - 1)); return random; } @@ -78,15 +78,6 @@ namespace JNGame.Sync.State.Tile { return new JNTileContexts(); } - - public bool IsTileIndex((int X, int Y) xTuple) - { - if (xTuple.X >= 0 && xTuple.Y >= 0) - { - return xTuple.Y < Tiles.Length && xTuple.X < Tiles[0].Length; - } - return false; - } /// <summary> /// 更新区块范围 @@ -110,6 +101,11 @@ namespace JNGame.Sync.State.Tile } } + + public int GetTileIndex(LVector3 pos) + { + return JNSSTileTool.GetTileIndex(Tiles, TileSize, pos); + } /// <summary> /// 判断位置是否在区块内 @@ -117,16 +113,20 @@ namespace JNGame.Sync.State.Tile /// <param name="pos"></param> /// <returns></returns> public bool IsContains(LVector3 position) + { + return IsContains(position,MaxContains,MinContains); + } + public bool IsContains(LVector3 position,LVector3 Max,LVector3 Min) { // 假设LVector2是一个包含X和Y属性的结构体或类 // 检查X坐标是否在范围内 - if (position.x < MinContains.x || position.x >= MaxContains.x) + if (position.x < Min.x || position.x >= Max.x) { return false; // X坐标不在范围内 } // 检查Y坐标是否在范围内 - if (position.z < MinContains.y || position.z >= MaxContains.y) + if (position.z < Min.y || position.z >= Max.y) { return false; // Y坐标不在范围内 } @@ -141,35 +141,7 @@ namespace JNGame.Sync.State.Tile /// <returns></returns> public (LVector2 Max,LVector2 Min) GetTileContains(int index) { - (int X, int Y) = GetTileIDXY(index); - var min = new LVector2(X.ToLFloat() * TileSize,Y.ToLFloat() * TileSize); - var max = new LVector2((X + 1).ToLFloat() * TileSize,(Y + 1).ToLFloat() * TileSize); - return (max,min); - } - - /// <summary> - /// 获取TileID X Y - /// </summary> - /// <returns></returns> - public (int X, int Y) GetTileIDXY(int index) - { - - // 遍历数组 - for (int y = 0; y < Tiles.Length; y++) - { - for (int x = 0; x < Tiles[y].Length; x++) - { - // 检查当前元素是否非零 - if (Tiles[y][x] != 0 && Tiles[y][x] == index) - { - // 返回找到的坐标 - return (x,y); - } - } - } - - throw new Exception(); - + return JNSSTileTool.GetTileContains(Tiles,TileSize,index); } /// <summary> @@ -178,22 +150,7 @@ namespace JNGame.Sync.State.Tile /// <returns></returns> public List<int> GetTileGridIndex(int index) { - - List<int> grid = new List<int>(); - (int X, int Y) = GetTileIDXY(index); - // 填充九宫格 - for (int i = -1; i <= 1; i++) - { - for (int j = -1; j <= 1; j++) - { - int tempX = X + i; - int tempY = Y + j; // 注意这里j+1+1是因为数组第二维存储的是y坐标 - if (IsTileIndex((tempX,tempY))) grid.Add(Tiles[tempY][tempX]); - } - } - - return grid; - + return JNSSTileTool.GetTileGridIndex(Tiles,TileSize,index); } /// <summary> diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileTool.cs b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileTool.cs new file mode 100644 index 00000000..e6f15ad0 --- /dev/null +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileTool.cs @@ -0,0 +1,142 @@ +using System; +using System.Collections.Generic; +using JNGame.Math; + +namespace JNGame.Sync.State.Tile +{ + public class JNSSTileTool + { + + public static bool IsTileIndex(int[][] Tiles,(int X, int Y) xTuple) + { + if (xTuple.X >= 0 && xTuple.Y >= 0) + { + return xTuple.Y < Tiles.Length && xTuple.X < Tiles[0].Length; + } + return false; + } + + + /// <summary> + /// 获取TileID X Y + /// </summary> + /// <returns></returns> + public static (int X, int Y) GetTileIDXY(int[][] Tiles,int index) + { + + // 遍历数组 + for (int y = 0; y < Tiles.Length; y++) + { + for (int x = 0; x < Tiles[y].Length; x++) + { + // 检查当前元素是否非零 + if (Tiles[y][x] != 0 && Tiles[y][x] == index) + { + // 返回找到的坐标 + return (x,y); + } + } + } + + throw new Exception(); + + } + + /// <summary> + /// 根据TileId 获取最大最小范围 + /// </summary> + /// <returns></returns> + public static (LVector2 Max,LVector2 Min) GetTileContains(int[][] Tiles, int TileSize,int index) + { + (int X, int Y) = GetTileIDXY(Tiles,index); + var min = new LVector2(X.ToLFloat() * TileSize,Y.ToLFloat() * TileSize); + var max = new LVector2((X + 1).ToLFloat() * TileSize,(Y + 1).ToLFloat() * TileSize); + return (max,min); + } + + /// <summary> + /// 获取九宫格Index + /// </summary> + /// <returns></returns> + public static List<int> GetTileGridIndex(int[][] Tiles, int TileSize, (int X, int Y) xTuple) + { + List<int> grid = new List<int>(); + // 填充九宫格 + for (int i = -1; i <= 1; i++) + { + for (int j = -1; j <= 1; j++) + { + int tempX = xTuple.X + i; + int tempY = xTuple.Y + j; // 注意这里j+1+1是因为数组第二维存储的是y坐标 + if (IsTileIndex(Tiles,(tempX,tempY))) grid.Add(Tiles[tempY][tempX]); + } + } + return grid; + } + public static List<int> GetTileGridIndex(int[][] Tiles, int TileSize, int index) + { + return GetTileGridIndex(Tiles,TileSize,GetTileIDXY(Tiles,index)); + } + public static List<int> GetTileGridIndex(int[][] Tiles,int TileSize,LVector3 pos) + { + return GetTileGridIndex(Tiles,TileSize,GetXYIndex(Tiles,TileSize,pos)); + } + + /// <summary> + /// 获取Index + /// </summary> + /// <param name="Tiles"></param> + /// <param name="TileSize"></param> + /// <param name="pos"></param> + /// <returns></returns> + public static int GetTileIndex(int[][] Tiles,int TileSize,LVector3 pos) + { + (int x, int y) = JNSSTileTool.GetXYIndex(Tiles,TileSize,pos); + return Tiles[y][x]; + } + + /// <summary> + /// 获取XY + /// </summary> + /// <param name="Tiles"></param> + /// <param name="TileSize"></param> + /// <param name="pos"></param> + /// <returns></returns> + public static (int X, int Y) GetXYIndex(int[][] Tiles,int TileSize,LVector3 pos) + { + // 遍历数组 + for (int y = 0; y < Tiles.Length; y++) + { + for (int x = 0; x < Tiles[y].Length; x++) + { + // 检查当前元素是否非零 + if (Tiles[y][x] != 0) + { + + //判断是否所在区块 + var min = new LVector2(x.ToLFloat() * TileSize,y.ToLFloat() * TileSize); + var max = new LVector2((x + 1).ToLFloat() * TileSize,(y + 1).ToLFloat() * TileSize); + + // 假设LVector2是一个包含X和Y属性的结构体或类 + // 检查X坐标是否在范围内 + if (pos.x < min.x || pos.x >= max.x) + { + continue; // X坐标不在范围内 + } + // 检查Y坐标是否在范围内 + if (pos.z < min.y || pos.z >= max.y) + { + continue; // Y坐标不在范围内 + } + + return (x,y); + + } + } + } + + return (0,0); + } + + } +} \ No newline at end of file diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileTool.cs.meta b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileTool.cs.meta new file mode 100644 index 00000000..67cf8b55 --- /dev/null +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileTool.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 44baac66240645d887c8996de748dd0c +timeCreated: 1724315108 \ No newline at end of file diff --git a/JNFrame2/Assets/JNGame/Sync/Entity/JNEntity.cs b/JNFrame2/Assets/JNGame/Sync/Entity/JNEntity.cs index d20f4fdf..1cba1c62 100644 --- a/JNFrame2/Assets/JNGame/Sync/Entity/JNEntity.cs +++ b/JNFrame2/Assets/JNGame/Sync/Entity/JNEntity.cs @@ -58,6 +58,10 @@ namespace JNGame.Sync.Entity { _id = GetSystem<JNRandomSystem>().NextId(); } + else + { + GetSystem<JNRandomSystem>().AdaptId(id); + } } public abstract JNEntityLookup NewCLookup(); diff --git a/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs index e8d60359..765d1c85 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using DotRecast.Core.Collections; +using NotImplementedException = System.NotImplementedException; namespace JNGame.Sync.System.Data { @@ -41,7 +42,16 @@ namespace JNGame.Sync.System.Data //网络Id (用于确定网络通讯时找到这个数据系统) public int NetID { get; } + /// <summary> + /// 插入字节 + /// </summary> public void OnInsertUBytes(Dictionary<long, byte[]> bytes); + + /// <summary> + /// 获取全部字节 + /// </summary> + public Dictionary<long, byte[]> GetDataBytes(); + } /// <summary> @@ -118,34 +128,57 @@ namespace JNGame.Sync.System.Data //提交数据更新 OnUByteUpdate(bytes); } - + + /// <summary> + /// 获取全部字节 + /// </summary> + public Dictionary<long, byte[]> GetDataBytes() + { + var data = new Dictionary<long, byte[]>(); + + lock (Data) + { + + Data.ForEach(child => + { + data[child.Key] = child.Value.GetByte(); + }); + + } + + return data; + + } + /// <summary> /// 将UByte提交更新 /// </summary> public virtual void OnUByteUpdate(Dictionary<long, byte[]> bytes) { - foreach (var info in bytes) + lock (Data) { - if (SDByteOperate.IsDelete(info.Value)) + foreach (var info in bytes) { - Data.Remove(info.Key); - } - else - { - - if (Data.TryGetValue(info.Key, out var value)) + if (SDByteOperate.IsDelete(info.Value)) { - value.UByte(info.Value); + Data.Remove(info.Key); } else { - Data[info.Key] = NewObject(info.Key,info.Value); - } + if (Data.TryGetValue(info.Key, out var value)) + { + value.UByte(info.Value); + } + else + { + Data[info.Key] = NewObject(info.Key,info.Value); + } + + } } } - } /// <summary> @@ -196,6 +229,6 @@ namespace JNGame.Sync.System.Data { UBytes[id] = SDByteOperate.DELETE; } - + } } \ No newline at end of file diff --git a/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs index 5d862a01..45375a7a 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs @@ -1,25 +1,68 @@ using System.Collections.Generic; using DotRecast.Core.Collections; +using JNGame.Math; using JNGame.Sync.Entity; using JNGame.Sync.Frame.Entity.Components; using JNGame.Sync.State.Tile; using JNGame.Sync.State.Tile.Entity; +using NotImplementedException = System.NotImplementedException; namespace JNGame.Sync.System.Data { + public interface ISTileDataSystem + { + + /// <summary> + /// 清除指定区域数据 + /// </summary> + public void ClearTileData(int index); + + /// <summary> + /// 获取有权限的全部字节 + /// </summary> + public Dictionary<long, byte[]> GetHostDataBytes(); + + + /// <summary> + /// 获取指定区块的全部字节 + /// </summary> + public Dictionary<long, byte[]> GetTileDataBytes(int index); + + + + } + public abstract class ISTileData : ISStateData { public abstract bool IsHost { get; } + public JNTileEntity Entity; + + /// <summary> + /// 绑定实体到数据 (销毁数据时顺带销毁实体) + /// </summary> + /// <param name="entity"></param> + public void BindEntity(JNTileEntity entity) + { + Entity = entity; + } + + /// <summary> + /// 获取数据位置(用于区块清除) + /// </summary> + public abstract LVector3 GetDataPosition(); + } /// <summary> /// 支持区块的数据类 /// </summary> - public abstract class STileDataSystem<T,E> : SStateDataSystem<T> where T : ISTileData,new() where E : JNTileEntity, new() + public abstract class STileDataSystem<T,E> : SStateDataSystem<T>,ISTileDataSystem where T : ISTileData,new() where E : JNTileEntity, new() { public abstract JNTileContext<E> NodeContext { get; } + + protected STileDataSystem(SStateDataEnum type) : base(type) { @@ -40,7 +83,12 @@ namespace JNGame.Sync.System.Data protected virtual void OnDataSyncContext() { - var lIsTileData = new Dictionary<long, T>(Data); + Dictionary<long, T> lIsTileData; + + lock (Data) + { + lIsTileData = new Dictionary<long, T>(Data); + } NodeContext.GetEntities().ForEach(child => { @@ -60,7 +108,9 @@ namespace JNGame.Sync.System.Data foreach (var keyValue in lIsTileData) { var entity = NodeContext.TileSyncCreate(keyValue.Key); - entity.TileSyncData(keyValue.Value); + entity?.TileSyncData(keyValue.Value); + //将实体绑定到数据中 + keyValue.Value.BindEntity(entity); } } @@ -76,6 +126,94 @@ namespace JNGame.Sync.System.Data if (!data.IsHost) return; base.Add(data); } + + /// <summary> + /// 判断数据是否在区块内 + /// </summary> + public bool IsTileInside(int tileId,T data) + { + + var index = -1; + + if (Sync is JNSSTileClientService clientService) + { + index = clientService.GetTileIndex(data.GetDataPosition()); + } + if (Sync is JNSSTileServerService serverService) + { + index = serverService.GetTileIndex(data.GetDataPosition()); + } + + return index == tileId; + + } + + public void ClearTileData(int index) + { + + lock (Data) + { + + //需要删除的数据Id + var ids = new List<long>(); + + Data.ForEach(child => + { + if (IsTileInside(index,child.Value)) ids.Add(child.Key); + }); + + //删除数据和实体 + ids.ForEach(child => + { + //销毁实体 + Data[child].Entity?.Destroy(); + //销毁数据 + Data.Remove(child); + }); + + } + + } + + public Dictionary<long, byte[]> GetHostDataBytes() + { + + var data = new Dictionary<long, byte[]>(); + + lock (Data) + { + Data.ForEach(child => + { + if (child.Value.IsHost) + { + data[child.Key] = child.Value.GetByte(); + } + }); + } + + return data; + + } + + public Dictionary<long, byte[]> GetTileDataBytes(int index) + { + + var data = new Dictionary<long, byte[]>(); + + lock (Data) + { + Data.ForEach(child => + { + if (IsTileInside(index,child.Value)) + { + data[child.Key] = child.Value.GetByte(); + } + }); + } + + return data; + + } } } \ No newline at end of file diff --git a/JNFrame2/Assets/JNGame/Sync/System/Logic/JNRandomSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/Logic/JNRandomSystem.cs index 52fabe1e..590f2f6b 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/Logic/JNRandomSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/Logic/JNRandomSystem.cs @@ -17,6 +17,8 @@ namespace JNGame.Sync.Frame.Service //Id private long _id = 0; + private long _idMin = long.MinValue; + private long _idMax = long.MaxValue; public JNRandomSystem(int seed) { @@ -44,13 +46,30 @@ namespace JNGame.Sync.Frame.Service return ++_id; } - public void SetIdValue(long id) + public void SetIdValue(long min,long max) { - if (_id < id) + if (_id < min) { - _id = id; + _id = min; + } + _idMin = min; + _idMax = max; + } + + /// <summary> + /// 适配Id 用于 历史Id和新Id重复问题 + /// </summary> + /// <param name="id"></param> + /// <exception cref="NotImplementedException"></exception> + public void AdaptId(long id) + { + if (_idMin <= id && id >= _idMax) + { + if (id > _id) + { + _id = id; + } } } - } } \ No newline at end of file diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.dll b/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.dll deleted file mode 100644 index d49f1228..00000000 Binary files a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.dll and /dev/null differ diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15.meta b/JNFrame2/Assets/Packages/TouchSocket.2.0.16.meta similarity index 77% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15.meta rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16.meta index cb164329..266eaf8c 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.2.0.15.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.2.0.16.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6b9b55dc058d24346b06611a45d2fa04 +guid: 385b6e59f9aeb564db8dc8ef322a13bf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.16/.signature.p7s b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/.signature.p7s new file mode 100644 index 00000000..22bd238a Binary files /dev/null and b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/.signature.p7s differ diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/LICENSE.txt b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/LICENSE.txt similarity index 100% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/LICENSE.txt rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/LICENSE.txt diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/LICENSE.txt.meta b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/LICENSE.txt.meta similarity index 75% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/LICENSE.txt.meta rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/LICENSE.txt.meta index 9b5b2e4b..d27e55ee 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/LICENSE.txt.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/LICENSE.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5deb335685b42ef46809c4278256d94c +guid: 75ba54533facd964098a7fa0910e491e TextScriptImporter: externalObjects: {} userData: diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/TouchSocket.nuspec b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/TouchSocket.nuspec similarity index 74% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/TouchSocket.nuspec rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/TouchSocket.nuspec index dfee2a81..c14767d2 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/TouchSocket.nuspec +++ b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/TouchSocket.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"> <metadata> <id>TouchSocket</id> - <version>2.0.15</version> + <version>2.0.16</version> <title>TouchSocket</title> <authors>若汝棋茗</authors> <requireLicenseAcceptance>true</requireLicenseAcceptance> @@ -15,34 +15,34 @@ 说明文档:https://touchsocket.net/</description> <copyright>Copyright © 2024 若汝棋茗</copyright> <tags>Tcp Udp Ssl Socket Saea TouchSocket</tags> - <repository type="git" url="https://touchsocket.net/" commit="a31584e5e1aa674f75232ead706ef7b84573b604" /> + <repository type="git" url="https://touchsocket.net/" commit="2928744a95c3b0b4a392c62454032467c933353f" /> <dependencies> <group targetFramework=".NETFramework4.5"> - <dependency id="TouchSocket.Core" version="2.0.15" exclude="Build,Analyzers" /> + <dependency id="TouchSocket.Core" version="2.0.16" exclude="Build,Analyzers" /> </group> <group targetFramework=".NETFramework4.6.2"> - <dependency id="TouchSocket.Core" version="2.0.15" exclude="Build,Analyzers" /> + <dependency id="TouchSocket.Core" version="2.0.16" exclude="Build,Analyzers" /> </group> <group targetFramework=".NETFramework4.7.2"> - <dependency id="TouchSocket.Core" version="2.0.15" exclude="Build,Analyzers" /> + <dependency id="TouchSocket.Core" version="2.0.16" exclude="Build,Analyzers" /> </group> <group targetFramework=".NETFramework4.8.1"> - <dependency id="TouchSocket.Core" version="2.0.15" exclude="Build,Analyzers" /> + <dependency id="TouchSocket.Core" version="2.0.16" exclude="Build,Analyzers" /> </group> <group targetFramework="net6.0"> - <dependency id="TouchSocket.Core" version="2.0.15" exclude="Build,Analyzers" /> + <dependency id="TouchSocket.Core" version="2.0.16" exclude="Build,Analyzers" /> </group> <group targetFramework="net7.0"> - <dependency id="TouchSocket.Core" version="2.0.15" exclude="Build,Analyzers" /> + <dependency id="TouchSocket.Core" version="2.0.16" exclude="Build,Analyzers" /> </group> <group targetFramework="net8.0"> - <dependency id="TouchSocket.Core" version="2.0.15" exclude="Build,Analyzers" /> + <dependency id="TouchSocket.Core" version="2.0.16" exclude="Build,Analyzers" /> </group> <group targetFramework=".NETStandard2.0"> - <dependency id="TouchSocket.Core" version="2.0.15" exclude="Build,Analyzers" /> + <dependency id="TouchSocket.Core" version="2.0.16" exclude="Build,Analyzers" /> </group> <group targetFramework=".NETStandard2.1"> - <dependency id="TouchSocket.Core" version="2.0.15" exclude="Build,Analyzers" /> + <dependency id="TouchSocket.Core" version="2.0.16" exclude="Build,Analyzers" /> </group> </dependencies> </metadata> diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/TouchSocket.nuspec.meta b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/TouchSocket.nuspec.meta similarity index 74% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/TouchSocket.nuspec.meta rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/TouchSocket.nuspec.meta index a0766360..5cbfef65 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/TouchSocket.nuspec.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/TouchSocket.nuspec.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 787dc95c4fb63bc45a8b9565bb9ba114 +guid: 614156e744f93394aa033de437594b8e DefaultImporter: externalObjects: {} userData: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib.meta b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib.meta similarity index 77% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib.meta rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib.meta index a8bb6249..0c030e38 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90ee388586b2dc743acb99400e15b7e0 +guid: 48f35183c7b04f541aeef89d6945fdc4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1.meta b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1.meta similarity index 77% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1.meta rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1.meta index 9519d8ca..ac000a23 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d8dd70956f83e5479adac906de48b88 +guid: aedaca13f8226314887fc7dfb8461725 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.dll b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.dll new file mode 100644 index 00000000..26236283 Binary files /dev/null and b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.dll differ diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.dll.meta b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.dll.meta similarity index 91% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.dll.meta rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.dll.meta index 87fd2973..1f4b6141 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.dll.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 670b9c96d65efee468bfbd250ebee179 +guid: 46b48c4ed7b2ceb41ac2bc57cac2b87b labels: - NuGetForUnity PluginImporter: diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.xml b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.xml similarity index 100% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.xml rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.xml diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.xml.meta b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.xml.meta similarity index 75% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.xml.meta rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.xml.meta index cbdaa6d5..eac27d89 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1/TouchSocket.xml.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/lib/netstandard2.1/TouchSocket.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19cbd1462837b8e4785e79ce5d3d48b6 +guid: 19eb2f6037057b64987448360cc914c2 TextScriptImporter: externalObjects: {} userData: diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/logo.png b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/logo.png similarity index 100% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/logo.png rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/logo.png diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/logo.png.meta b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/logo.png.meta similarity index 98% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/logo.png.meta rename to JNFrame2/Assets/Packages/TouchSocket.2.0.16/logo.png.meta index 642d0b41..848eb44c 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/logo.png.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.2.0.16/logo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aab37a8cb5df7b94aa2b7db0ca5e456d +guid: a0f2495f1d31a6e45bfe5f109dcb6710 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16.meta similarity index 77% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16.meta index b9317cc1..4e0e3d8a 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 001172482dacfdc468b0c57cdc7a1d21 +guid: 06f5b46e1b301494ab4855f58aef2950 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/.signature.p7s b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/.signature.p7s similarity index 86% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/.signature.p7s rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/.signature.p7s index 6decb6b4..4e1a718e 100644 Binary files a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/.signature.p7s and b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/.signature.p7s differ diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/LICENSE.txt b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/LICENSE.txt similarity index 100% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/LICENSE.txt rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/LICENSE.txt diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/LICENSE.txt.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/LICENSE.txt.meta similarity index 75% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/LICENSE.txt.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/LICENSE.txt.meta index 875a4021..3d779503 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/LICENSE.txt.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/LICENSE.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 309201014e6a0f54abe6c80df8159895 +guid: 5d0047ccf8b340a4d835c89150342d27 TextScriptImporter: externalObjects: {} userData: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/TouchSocket.Core.nuspec b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/TouchSocket.Core.nuspec similarity index 97% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/TouchSocket.Core.nuspec rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/TouchSocket.Core.nuspec index dc7d6089..ade0c190 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/TouchSocket.Core.nuspec +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/TouchSocket.Core.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"> <metadata> <id>TouchSocket.Core</id> - <version>2.0.15</version> + <version>2.0.16</version> <title>TouchSocket.Core</title> <authors>若汝棋茗</authors> <requireLicenseAcceptance>true</requireLicenseAcceptance> @@ -15,7 +15,7 @@ 说明文档:https://touchsocket.net/</description> <copyright>Copyright © 2024 若汝棋茗</copyright> <tags>Message ArrayPool Logger Plugin 3DES Xml FilePool Serialize TouchSocket</tags> - <repository type="git" url="https://touchsocket.net/" commit="a31584e5e1aa674f75232ead706ef7b84573b604" /> + <repository type="git" url="https://touchsocket.net/" commit="2928744a95c3b0b4a392c62454032467c933353f" /> <dependencies> <group targetFramework=".NETFramework4.5"> <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" /> diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/TouchSocket.Core.nuspec.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/TouchSocket.Core.nuspec.meta similarity index 74% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/TouchSocket.Core.nuspec.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/TouchSocket.Core.nuspec.meta index f67811bb..c96f7903 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/TouchSocket.Core.nuspec.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/TouchSocket.Core.nuspec.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21a81c25baebc25498fa9f810e7786a6 +guid: b799c4910b50cce4da620f8ee3d333da DefaultImporter: externalObjects: {} userData: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers.meta similarity index 77% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers.meta index acda00f3..0c08be89 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 836b7aa9f14673a4db50f8e9c6baf431 +guid: de9b33b37cfbb62448055492383aeef2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet.meta similarity index 77% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet.meta index e6265c39..d02d99df 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3117d1ad083f831499a9965656a5f9ec +guid: b4439744ac5c9f44b9e72798cbc48dd3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet/cs.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet/cs.meta similarity index 77% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet/cs.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet/cs.meta index 12fe1eb8..65c6fe24 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet/cs.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet/cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ca244b3d7080a854e91365d2178baf56 +guid: 2149722b8ffe6b6488d972a071c94992 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll similarity index 99% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll index bebd885b..b6d87d7e 100644 Binary files a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll and b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll differ diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll.meta similarity index 96% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll.meta index d253beba..6b273017 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/analyzers/dotnet/cs/TouchSocket.Core.SourceGenerator.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5cfc3bb8c54ec3f4bb436a7e16bfad76 +guid: 419aad6dadc434f46b157bc70763119b labels: - NuGetForUnity - RoslynAnalyzer diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib.meta similarity index 77% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib.meta index c6c5c96e..00fa16b9 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 33d4a46f32ca54f42808cebf48328c98 +guid: 7efe2cfa32825fa4090a04b3babb1425 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1.meta similarity index 77% rename from JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1.meta index 3215c949..615f70dc 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.2.0.15/lib/netstandard2.1.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 58014e80bce032b4fb09f530a09a99f7 +guid: 3c97e10aa24c9bd4fa1b7a98d025a637 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.dll b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.dll similarity index 50% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.dll rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.dll index d1088ec7..a26d9778 100644 Binary files a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.dll and b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.dll differ diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.dll.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.dll.meta similarity index 91% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.dll.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.dll.meta index 3fb792b3..5b234e18 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.dll.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c22dc9f3d374e5e42bef789937f3bc15 +guid: 7e2b27a0c5740f9468c076996fe371d7 labels: - NuGetForUnity PluginImporter: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.xml b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.xml similarity index 100% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.xml rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.xml diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.xml.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.xml.meta similarity index 75% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.xml.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.xml.meta index 303b84af..d464e006 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/lib/netstandard2.1/TouchSocket.Core.xml.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/lib/netstandard2.1/TouchSocket.Core.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f7ab4d1d05dc083429219a23685e56dc +guid: 6f84c78511ff60348be823ecb6b68687 TextScriptImporter: externalObjects: {} userData: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/logo.png b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/logo.png similarity index 100% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/logo.png rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/logo.png diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/logo.png.meta b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/logo.png.meta similarity index 98% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/logo.png.meta rename to JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/logo.png.meta index cf8640b6..2f867994 100644 --- a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/logo.png.meta +++ b/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.16/logo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a2b59de3ab7a114486320a72b05f0bc +guid: bf8def29a7a8fcb45b94317de768ecf5 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16.meta b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16.meta new file mode 100644 index 00000000..cda439b8 --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6cc832bf29ce49640be845ed22f7e33c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/.signature.p7s b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/.signature.p7s similarity index 86% rename from JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/.signature.p7s rename to JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/.signature.p7s index e295a363..edcdbf44 100644 Binary files a/JNFrame2/Assets/Packages/TouchSocket.Core.2.0.15/.signature.p7s and b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/.signature.p7s differ diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/LICENSE.txt b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/LICENSE.txt new file mode 100644 index 00000000..329b5a6f --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/LICENSE.txt @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) 2020-2023 若汝棋茗 + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/LICENSE.txt.meta b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/LICENSE.txt.meta new file mode 100644 index 00000000..2e0ce553 --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/LICENSE.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6b5c22043fce3a5478ea103b613c804c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/TouchSocket.Http.nuspec b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/TouchSocket.Http.nuspec new file mode 100644 index 00000000..c12d4769 --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/TouchSocket.Http.nuspec @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"> + <metadata> + <id>TouchSocket.Http</id> + <version>2.0.16</version> + <title>TouchSocket.Http</title> + <authors>若汝棋茗</authors> + <requireLicenseAcceptance>true</requireLicenseAcceptance> + <license type="file">LICENSE.txt</license> + <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl> + <icon>logo.png</icon> + <projectUrl>https://touchsocket.net/</projectUrl> + <description>这是一个基于Http1.1协议的组件库。它能提供Http服务器、客户端、以及WebSocket组件。功能上支持大文件下载、上传、以及多线程下载和断点续传,小文件form上传,WebApi声明和执行。所提供的Http客户端是基于连接的,可以捕获连接和断开连接等消息。 + +说明文档:https://touchsocket.net/</description> + <copyright>Copyright © 2024 若汝棋茗</copyright> + <tags>Http Https HttpServer HttpClient WebSocket WebSocketServer WebSocketClient TouchSocket</tags> + <repository type="git" url="https://touchsocket.net/" commit="2928744a95c3b0b4a392c62454032467c933353f" /> + <dependencies> + <group targetFramework=".NETFramework4.5"> + <dependency id="TouchSocket" version="2.0.16" exclude="Build,Analyzers" /> + </group> + <group targetFramework=".NETFramework4.6.2"> + <dependency id="TouchSocket" version="2.0.16" exclude="Build,Analyzers" /> + </group> + <group targetFramework=".NETFramework4.7.2"> + <dependency id="TouchSocket" version="2.0.16" exclude="Build,Analyzers" /> + </group> + <group targetFramework=".NETFramework4.8.1"> + <dependency id="TouchSocket" version="2.0.16" exclude="Build,Analyzers" /> + <dependency id="System.Net.Http" version="4.3.4" exclude="Build,Analyzers" /> + </group> + <group targetFramework="net6.0"> + <dependency id="TouchSocket" version="2.0.16" exclude="Build,Analyzers" /> + </group> + <group targetFramework="net7.0"> + <dependency id="TouchSocket" version="2.0.16" exclude="Build,Analyzers" /> + </group> + <group targetFramework="net8.0"> + <dependency id="TouchSocket" version="2.0.16" exclude="Build,Analyzers" /> + </group> + <group targetFramework=".NETStandard2.0"> + <dependency id="TouchSocket" version="2.0.16" exclude="Build,Analyzers" /> + </group> + <group targetFramework=".NETStandard2.1"> + <dependency id="TouchSocket" version="2.0.16" exclude="Build,Analyzers" /> + </group> + </dependencies> + <frameworkAssemblies> + <frameworkAssembly assemblyName="System.Web" targetFramework=".NETFramework4.5, .NETFramework4.6.2, .NETFramework4.7.2, .NETFramework4.8.1" /> + <frameworkAssembly assemblyName="System.IO" targetFramework=".NETFramework4.8.1" /> + <frameworkAssembly assemblyName="System.Net.Http" targetFramework=".NETFramework4.8.1" /> + <frameworkAssembly assemblyName="System.Runtime" targetFramework=".NETFramework4.8.1" /> + <frameworkAssembly assemblyName="System.Security.Cryptography.Algorithms" targetFramework=".NETFramework4.8.1" /> + <frameworkAssembly assemblyName="System.Security.Cryptography.Encoding" targetFramework=".NETFramework4.8.1" /> + <frameworkAssembly assemblyName="System.Security.Cryptography.Primitives" targetFramework=".NETFramework4.8.1" /> + <frameworkAssembly assemblyName="System.Security.Cryptography.X509Certificates" targetFramework=".NETFramework4.8.1" /> + </frameworkAssemblies> + </metadata> +</package> \ No newline at end of file diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/TouchSocket.Http.nuspec.meta b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/TouchSocket.Http.nuspec.meta new file mode 100644 index 00000000..c3c894ce --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/TouchSocket.Http.nuspec.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3a5278302ad841f478efc65c15de9fc3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib.meta b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib.meta new file mode 100644 index 00000000..56e0b521 --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af074891e0c4596409573ac91bfd29d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1.meta b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1.meta new file mode 100644 index 00000000..0a1f0aea --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd394d4309eacdb43a05b53cf334c972 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.dll b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.dll new file mode 100644 index 00000000..ed02f447 Binary files /dev/null and b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.dll differ diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.dll.meta b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.dll.meta new file mode 100644 index 00000000..d325b0ce --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.dll.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 89b519974cf7f19499cddb6f16cbe858 +labels: +- NuGetForUnity +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.xml b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.xml new file mode 100644 index 00000000..99b3feec --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.xml @@ -0,0 +1,3257 @@ +<?xml version="1.0"?> +<doc> + <assembly> + <name>TouchSocket.Http</name> + </assembly> + <members> + <member name="T:TouchSocket.Http.FileCachePool"> + <summary> + 静态文件缓存池 + </summary> + </member> + <member name="T:TouchSocket.Http.FileCachePool.InsertHandler"> + <summary> + 添加委托 + </summary> + <param name="cache"></param> + <param name="key"></param> + <param name="value"></param> + <param name="millisecondsTimeout"></param> + <returns></returns> + </member> + <member name="P:TouchSocket.Http.FileCachePool.Empty"> + <summary> + Is the file cache empty? + </summary> + </member> + <member name="P:TouchSocket.Http.FileCachePool.Size"> + <summary> + Get the file cache size + </summary> + </member> + <member name="M:TouchSocket.Http.FileCachePool.Add(System.String,System.Byte[],System.TimeSpan)"> + <summary> + Add a new cache value with the given millisecondsTimeout into the file cache + </summary> + <param name="key">Key to add</param> + <param name="value">Value to add</param> + <param name="millisecondsTimeout">Cache millisecondsTimeout (default is 0 - no millisecondsTimeout)</param> + <returns>'true' if the cache value was added, 'false' if the given key was not added</returns> + </member> + <member name="M:TouchSocket.Http.FileCachePool.Find(System.String,System.Byte[]@)"> + <summary> + Try to find the cache value by the given key + </summary> + <param name="key">Key to find</param> + <param name="data"></param> + <returns>'true' and cache value if the cache value was found, 'false' if the given key was not found</returns> + </member> + <member name="M:TouchSocket.Http.FileCachePool.Remove(System.String)"> + <summary> + Remove the cache value with the given key from the file cache + </summary> + <param name="key">Key to remove</param> + <returns>'true' if the cache value was removed, 'false' if the given key was not found</returns> + </member> + <member name="M:TouchSocket.Http.FileCachePool.InsertPath(System.String,System.String,System.String,System.TimeSpan,TouchSocket.Http.FileCachePool.InsertHandler)"> + <summary> + Insert a new cache path with the given millisecondsTimeout into the file cache + </summary> + <param name="path">Path to insert</param> + <param name="prefix">Cache prefix (default is "/")</param> + <param name="filter">Cache filter (default is "*.*")</param> + <param name="millisecondsTimeout">Cache millisecondsTimeout (default is 0 - no millisecondsTimeout)</param> + <param name="handler">Cache insert handler (default is 'return cache.Add(key, value, millisecondsTimeout)')</param> + <returns>'true' if the cache path was setup, 'false' if failed to setup the cache path</returns> + </member> + <member name="M:TouchSocket.Http.FileCachePool.FindPath(System.String)"> + <summary> + Try to find the cache path + </summary> + <param name="path">Path to find</param> + <returns>'true' if the cache path was found, 'false' if the given path was not found</returns> + </member> + <member name="M:TouchSocket.Http.FileCachePool.RemovePath(System.String)"> + <summary> + Remove the cache path from the file cache + </summary> + <param name="path">Path to remove</param> + <returns>'true' if the cache path was removed, 'false' if the given path was not found</returns> + </member> + <member name="M:TouchSocket.Http.FileCachePool.Clear"> + <summary> + Clear the memory cache + </summary> + </member> + <member name="M:TouchSocket.Http.FileCachePool.Dispose(System.Boolean)"> + <summary> + 释放 + </summary> + <param name="disposing"></param> + </member> + <member name="M:TouchSocket.Http.FileCachePool.Finalize"> + <summary> + 析构函数 + </summary> + </member> + <member name="T:TouchSocket.Http.HttpBase"> + <summary> + Http基础头部 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpBase.ServerVersion"> + <summary> + 服务器版本 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpBase.#ctor"> + <summary> + 构造函数 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.CanWrite"> + <summary> + 能否写入。 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.Client"> + <summary> + 客户端 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.ContentComplated"> + <summary> + 内容填充完成 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.ContentLength"> + <summary> + 内容长度 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.KeepAlive"> + <summary> + 保持连接。 + <para> + 一般的,当是http1.1时,如果没有显式的Connection: close,即返回true。当是http1.0时,如果没有显式的Connection: Keep-Alive,即返回false。 + </para> + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.ContentType"> + <summary> + 内容类型 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.AcceptEncoding"> + <summary> + 允许编码 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.Accept"> + <summary> + 可接受MIME类型 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.Flag"> + <summary> + 传递标识 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.Headers"> + <summary> + 请求头集合 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.Protocols"> + <summary> + 协议名称,默认HTTP + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.ProtocolVersion"> + <summary> + HTTP协议版本,默认1.1 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpBase.RequestLine"> + <summary> + 请求行 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpBase.ParsingHeader(TouchSocket.Core.ByteBlock,System.Int32)"> + <summary> + <inheritdoc/> + </summary> + <param name="byteBlock"></param> + <param name="length"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpBase.Read(System.Byte[],System.Int32,System.Int32)"> + <summary> + 从Request中持续读取数据。 + </summary> + <param name="buffer"></param> + <param name="offset"></param> + <param name="count"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpBase.ReadHeaders(System.Byte[],System.Int32,System.Int32)"> + <summary> + 从内存中读取 + </summary> + <param name="buffer"></param> + <param name="offset"></param> + <param name="length"></param> + </member> + <member name="M:TouchSocket.Http.HttpBase.SetContent(System.Byte[])"> + <summary> + 设置一次性内容 + </summary> + <param name="content"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpBase.TryGetContent(System.Byte[]@)"> + <summary> + 获取一次性内容。 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpBase.WriteContent(System.Byte[],System.Int32,System.Int32)"> + <summary> + 持续写入内容。 + </summary> + <param name="buffer"></param> + <param name="offset"></param> + <param name="count"></param> + </member> + <member name="M:TouchSocket.Http.HttpBase.Dispose(System.Boolean)"> + <summary> + <inheritdoc/> + </summary> + <param name="disposing"></param> + </member> + <member name="M:TouchSocket.Http.HttpBase.LoadHeaderProterties"> + <summary> + 读取信息 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpBase.Reset"> + <summary> + 重置Http状态。 + </summary> + </member> + <member name="T:TouchSocket.Http.HttpContext"> + <summary> + Http上下文 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpContext.#ctor(TouchSocket.Http.HttpRequest)"> + <summary> + 构造函数 + </summary> + <param name="request"></param> + </member> + <member name="M:TouchSocket.Http.HttpContext.#ctor(TouchSocket.Http.HttpRequest,TouchSocket.Http.HttpResponse)"> + <summary> + 构造函数 + </summary> + <param name="request"></param> + <param name="response"></param> + </member> + <member name="P:TouchSocket.Http.HttpContext.Request"> + <summary> + Http请求 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpContext.Response"> + <summary> + Http响应 + </summary> + </member> + <member name="T:TouchSocket.Http.HttpMethod"> + <summary> + HttpMethod + </summary> + </member> + <member name="F:TouchSocket.Http.HttpMethod.m_value"> + <summary> + 值 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpMethod.Get"> + <summary> + Get + </summary> + </member> + <member name="F:TouchSocket.Http.HttpMethod.Post"> + <summary> + Post + </summary> + </member> + <member name="F:TouchSocket.Http.HttpMethod.Put"> + <summary> + Put + </summary> + </member> + <member name="F:TouchSocket.Http.HttpMethod.Delete"> + <summary> + Delete + </summary> + </member> + <member name="M:TouchSocket.Http.HttpMethod.#ctor(System.String)"> + <summary> + 表示 + </summary> + <param name="value">值</param> + </member> + <member name="M:TouchSocket.Http.HttpMethod.ToString"> + <summary> + 转换为字符串 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpMethod.GetHashCode"> + <summary> + 获取哈希码 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpMethod.Equals(System.Object)"> + <summary> + 比较是否和目标相等 + </summary> + <param name="obj">目标</param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpMethod.op_Equality(TouchSocket.Http.HttpMethod,TouchSocket.Http.HttpMethod)"> + <summary> + 等于 + </summary> + <param name="a"></param> + <param name="b"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpMethod.op_Inequality(TouchSocket.Http.HttpMethod,TouchSocket.Http.HttpMethod)"> + <summary> + 不等于 + </summary> + <param name="a"></param> + <param name="b"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.HttpProxy"> + <summary> + Http代理 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpProxy.#ctor(TouchSocket.Sockets.IPHost)"> + <summary> + 不带基本验证的代理 + </summary> + <param name="host"></param> + </member> + <member name="M:TouchSocket.Http.HttpProxy.#ctor(TouchSocket.Sockets.IPHost,System.String,System.String)"> + <summary> + 带基本验证的代理 + </summary> + <param name="host"></param> + <param name="userName"></param> + <param name="passWord"></param> + </member> + <member name="P:TouchSocket.Http.HttpProxy.Credential"> + <summary> + 验证代理 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpProxy.Host"> + <summary> + 代理的地址 + </summary> + </member> + <member name="T:TouchSocket.Http.HttpRange"> + <summary> + Range: bytes=0-499 表示第 0-499 字节范围的内容 + Range: bytes=500-999 表示第 500-999 字节范围的内容 + Range: bytes=-500 表示最后 500 字节的内容 + Range: bytes=500- 表示从第 500 字节开始到文件结束部分的内容 + Range: bytes=0-0,-1 表示第一个和最后一个字节 + Range: bytes=500-600,601-999 同时指定几个范围 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpRange.GetRanges(System.String,System.Int64)"> + <summary> + 转换获取的集合 + </summary> + <param name="rangeStr"></param> + <param name="size"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpRange.GetRange(System.String,System.Int64)"> + <summary> + 转换获取的集合 + </summary> + <param name="rangeStr"></param> + <param name="size"></param> + <returns></returns> + </member> + <member name="P:TouchSocket.Http.HttpRange.Start"> + <summary> + 起始位置 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRange.Length"> + <summary> + 长度 + </summary> + </member> + <member name="T:TouchSocket.Http.HttpRequest"> + <summary> + HTTP请求定义 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpRequest.#ctor(TouchSocket.Sockets.ITcpClientBase)"> + <summary> + 构造函数 + </summary> + <param name="client"></param> + </member> + <member name="M:TouchSocket.Http.HttpRequest.#ctor"> + <summary> + 构造函数 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRequest.CanRead"> + <summary> + <inheritdoc/> + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRequest.CanWrite"> + <summary> + <inheritdoc/> + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRequest.Client"> + <summary> + <inheritdoc/> + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRequest.Forms"> + <summary> + 表单数据 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRequest.Method"> + <summary> + HTTP请求方式。 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRequest.Params"> + <summary> + Body参数 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRequest.Query"> + <summary> + url参数 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRequest.RelativeURL"> + <summary> + 相对路径(不含参数) + </summary> + </member> + <member name="P:TouchSocket.Http.HttpRequest.URL"> + <summary> + Url全地址,包含参数 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpRequest.Build(TouchSocket.Core.ByteBlock)"> + <summary> + 构建响应数据。 + <para>当数据较大时,不建议这样操作,可直接<see cref="M:TouchSocket.Http.HttpRequest.WriteContent(System.Byte[],System.Int32,System.Int32)"/></para> + </summary> + <param name="byteBlock"></param> + </member> + <member name="M:TouchSocket.Http.HttpRequest.BuildAsBytes"> + <summary> + 构建数据为字节数组。 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpRequest.SetContent(System.Byte[])"> + <summary> + 设置内容 + </summary> + <param name="content"></param> + </member> + <member name="M:TouchSocket.Http.HttpRequest.SetProxyHost(System.String)"> + <summary> + 设置代理Host + </summary> + <param name="host"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpRequest.SetUrl(System.String)"> + <summary> + 设置Url,可带参数 + </summary> + <param name="url"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpRequest.ToString"> + <summary> + 输出 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpRequest.TryGetContent(System.Byte[]@)"> + <summary> + <inheritdoc/> + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpRequest.WriteContent(System.Byte[],System.Int32,System.Int32)"> + <summary> + <inheritdoc/> + </summary> + <param name="buffer"></param> + <param name="offset"></param> + <param name="count"></param> + </member> + <member name="M:TouchSocket.Http.HttpRequest.Reset"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpRequest.Dispose(System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpRequest.LoadHeaderProterties"> + <summary> + 从内存中读取 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpRequest.BuildHeader(TouchSocket.Core.ByteBlock)"> + <summary> + 构建响应头部 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpRequest.Read(System.Byte[],System.Int32,System.Int32)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.HttpResponse"> + <summary> + Http响应 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpResponse.#ctor(TouchSocket.Sockets.ITcpClientBase)"> + <summary> + Http响应 + </summary> + <param name="client"></param> + </member> + <member name="M:TouchSocket.Http.HttpResponse.#ctor(TouchSocket.Http.HttpRequest)"> + <summary> + 从<see cref="T:TouchSocket.Http.HttpRequest"/>创建一个Http响应 + </summary> + <param name="request"></param> + </member> + <member name="M:TouchSocket.Http.HttpResponse.#ctor"> + <summary> + 构造函数 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpResponse.CanRead"> + <summary> + <inheritdoc/> + </summary> + </member> + <member name="P:TouchSocket.Http.HttpResponse.CanWrite"> + <summary> + <inheritdoc/> + </summary> + </member> + <member name="P:TouchSocket.Http.HttpResponse.Client"> + <summary> + <inheritdoc/> + </summary> + </member> + <member name="P:TouchSocket.Http.HttpResponse.IsChunk"> + <summary> + 是否分块 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpResponse.IsProxyAuthenticationRequired"> + <summary> + 是否代理权限验证。 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpResponse.IsRedirect"> + <summary> + 是否重定向 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpResponse.Responsed"> + <summary> + 是否已经响应数据。 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpResponse.StatusCode"> + <summary> + 状态码,默认200 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpResponse.StatusMessage"> + <summary> + 状态消息,默认Success + </summary> + </member> + <member name="M:TouchSocket.Http.HttpResponse.Answer"> + <summary> + 构建数据并回应。 + <para>该方法仅在具有Client实例时有效。</para> + </summary> + </member> + <member name="M:TouchSocket.Http.HttpResponse.AnswerAsync"> + <summary> + 构建数据并回应。 + <para>该方法仅在具有Client实例时有效。</para> + </summary> + </member> + <member name="M:TouchSocket.Http.HttpResponse.Build(TouchSocket.Core.ByteBlock,System.Boolean)"> + <summary> + 构建响应数据。 + <para>当数据较大时,不建议这样操作,可直接<see cref="M:TouchSocket.Http.HttpResponse.WriteContent(System.Byte[],System.Int32,System.Int32)"/></para> + </summary> + <param name="byteBlock"></param> + <param name="responsed"></param> + </member> + <member name="M:TouchSocket.Http.HttpResponse.ToString"> + <summary> + 输出 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpResponse.BuildAsBytes"> + <summary> + 构建数据为字节数组。 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpResponse.Read(System.Byte[],System.Int32,System.Int32)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpResponse.Complete"> + <summary> + 当传输模式是Chunk时,用于结束传输。 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpResponse.SetContent(System.Byte[])"> + <summary> + <inheritdoc/> + </summary> + <param name="content"></param> + </member> + <member name="M:TouchSocket.Http.HttpResponse.TryGetContent(System.Byte[]@)"> + <summary> + <inheritdoc/> + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpResponse.WriteContent(System.Byte[],System.Int32,System.Int32)"> + <summary> + <inheritdoc/> + </summary> + <param name="buffer"></param> + <param name="offset"></param> + <param name="count"></param> + </member> + <member name="M:TouchSocket.Http.HttpResponse.Dispose(System.Boolean)"> + <summary> + <inheritdoc/> + </summary> + <param name="disposing"></param> + </member> + <member name="M:TouchSocket.Http.HttpResponse.LoadHeaderProterties"> + <summary> + 读取数据 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpResponse.BuildHeader(TouchSocket.Core.ByteBlock)"> + <summary> + 构建响应头部 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpResponse.Reset"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.HttpTools"> + <summary> + Http工具 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpTools.GetContentTypeFromExtension(System.String)"> + <summary> + 从扩展名获取ContentType + </summary> + <param name="extension"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.MultifileCollection"> + <summary> + 多文件集合 + </summary> + </member> + <member name="M:TouchSocket.Http.MultifileCollection.#ctor(TouchSocket.Http.HttpRequest)"> + <summary> + 多文件集合 + </summary> + <param name="request"></param> + </member> + <member name="M:TouchSocket.Http.MultifileCollection.GetEnumerator"> + <summary> + 获取一个迭代器。 + </summary> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.TouchSocketHttpUtility"> + <summary> + HttpUtility + </summary> + </member> + <member name="F:TouchSocket.Http.TouchSocketHttpUtility.NoCacheMaxSize"> + <summary> + 非缓存上限 + </summary> + </member> + <member name="T:TouchSocket.Http.AuthenticationChallenge"> + <summary> + 处理代理认证凭证 + </summary> + </member> + <member name="M:TouchSocket.Http.AuthenticationChallenge.#ctor(System.String,TouchSocket.Http.NetworkCredential,System.UInt32)"> + <summary> + 构造 + </summary> + <param name="value">服务器返回的凭证认证类型</param> + <param name="credential">基本凭证用户名密码</param> + <param name="nonceCount">暂时不知道是什么</param> + </member> + <member name="P:TouchSocket.Http.AuthenticationChallenge.NonceCount"> + <summary> + 暂时不知 + </summary> + </member> + <member name="P:TouchSocket.Http.AuthenticationChallenge.Parameters"> + <summary> + 其实用不用他都一样 + </summary> + </member> + <member name="P:TouchSocket.Http.AuthenticationChallenge.Type"> + <summary> + 凭证类型 + </summary> + </member> + <member name="M:TouchSocket.Http.AuthenticationChallenge.ToString"> + <summary> + 转换成凭证本文 + </summary> + <returns></returns> + <exception cref="T:System.Exception"></exception> + </member> + <member name="T:TouchSocket.Http.AuthenticationType"> + <summary> + 代理身份认证类型 + </summary> + </member> + <member name="F:TouchSocket.Http.AuthenticationType.None"> + <summary> + 不允许身份认证 + </summary> + </member> + <member name="F:TouchSocket.Http.AuthenticationType.Digest"> + <summary> + 指定摘要身份验证。 + </summary> + </member> + <member name="F:TouchSocket.Http.AuthenticationType.Basic"> + <summary> + 指定基本身份验证。 + </summary> + </member> + <member name="F:TouchSocket.Http.AuthenticationType.Anonymous"> + <summary> + 指定匿名身份验证。 + </summary> + </member> + <member name="T:TouchSocket.Http.NetworkCredential"> + <summary> + 代理身份认证 + </summary> + </member> + <member name="M:TouchSocket.Http.NetworkCredential.#ctor(System.String,System.String,System.String,System.String[])"> + <summary> + 构造 + </summary> + <param name="username"></param> + <param name="password"></param> + <param name="domain">基本认证应该不需要这个</param> + <param name="roles"></param> + <exception cref="T:System.ArgumentNullException"></exception> + <exception cref="T:System.ArgumentException"></exception> + </member> + <member name="P:TouchSocket.Http.NetworkCredential.Username"> + <summary> + 凭证用户名 + </summary> + </member> + <member name="P:TouchSocket.Http.NetworkCredential.Password"> + <summary> + 凭证密码 + </summary> + </member> + <member name="P:TouchSocket.Http.NetworkCredential.Domain"> + <summary> + Domain + </summary> + </member> + <member name="P:TouchSocket.Http.NetworkCredential.Roles"> + <summary> + Roles + </summary> + </member> + <member name="T:TouchSocket.Http.HttpClient"> + <summary> + Http客户端 + </summary> + </member> + <member name="T:TouchSocket.Http.HttpClientBase"> + <summary> + Http客户端基类 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.Connect(System.Int32,System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.ConnectAsync(System.Int32,System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.Request(TouchSocket.Http.HttpRequest,System.Boolean,System.Int32,System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.RequestAsync(TouchSocket.Http.HttpRequest,System.Boolean,System.Int32,System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.RequestContent(TouchSocket.Http.HttpRequest,System.Boolean,System.Int32,System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.RequestContentAsync(TouchSocket.Http.HttpRequest,System.Boolean,System.Int32,System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.Dispose(System.Boolean)"> + <summary> + <inheritdoc/> + </summary> + <param name="disposing"></param> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.OnConnecting(TouchSocket.Sockets.ConnectingEventArgs)"> + <summary> + <inheritdoc/> + </summary> + <param name="e"></param> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.OnDisconnected(TouchSocket.Sockets.DisconnectEventArgs)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpClientBase.ReceivedData(TouchSocket.Sockets.ReceivedDataEventArgs)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.HttpClientPool"> + <summary> + HttpClient客户端连接池 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpClientPool.MaxCount"> + <summary> + 最大连接数量。 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpClientPool.RemoteIPHost"> + <summary> + 目标地址 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpClientPool.Clear"> + <summary> + 清除现有的所有链接 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpClientPool.RequestContent(TouchSocket.Http.HttpRequest,System.Int32,System.Threading.CancellationToken)"> + <summary> + 发起请求,并获取数据体 + </summary> + <param name="request">请求体</param> + <param name="millisecondsTimeout">等待超时时间</param> + <param name="token">结束等待令箭</param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpClientPool.RequestContentAsync(TouchSocket.Http.HttpRequest,System.Int32,System.Threading.CancellationToken)"> + <summary> + 发起请求,并获取数据体 + </summary> + <param name="request">请求体</param> + <param name="millisecondsTimeout">等待超时时间</param> + <param name="token">结束等待令箭</param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpClientPool.Dispose(System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpClientPool.LoadConfig(TouchSocket.Core.TouchSocketConfig)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.HttpClientSlim"> + <summary> + 这是基于<see cref="T:System.Net.Http.HttpClient"/>的通讯模型。 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpClientSlim.#ctor(System.Net.Http.HttpClient)"> + <summary> + 这是基于<see cref="T:System.Net.Http.HttpClient"/>的通讯模型。 + </summary> + <param name="httpClient"></param> + </member> + <member name="P:TouchSocket.Http.HttpClientSlim.HttpClient"> + <summary> + 通讯客户端 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpClientSlim.LoadConfig(TouchSocket.Core.TouchSocketConfig)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.HttpService`1"> + <summary> + HTTP/HTTPS服务器 + </summary> + </member> + <member name="T:TouchSocket.Http.HttpService"> + <summary> + HTTP/HTTPS服务器 + </summary> + </member> + <member name="T:TouchSocket.Http.HttpSocketClient"> + <summary> + http辅助类 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpSocketClient.#ctor"> + <summary> + 构造函数 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpSocketClient.WebSocket"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpSocketClient.SwitchProtocolToWebSocket(TouchSocket.Http.HttpContext)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpSocketClient.OnConnecting(TouchSocket.Sockets.ConnectingEventArgs)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpSocketClient.OnDisconnected(TouchSocket.Sockets.DisconnectEventArgs)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpSocketClient.OnReceivedHttpRequest(TouchSocket.Http.HttpRequest)"> + <summary> + 当收到到Http请求时。覆盖父类方法将不会触发插件。 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpSocketClient.ReceivedData(TouchSocket.Sockets.ReceivedDataEventArgs)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpSocketClient.Dispose(System.Boolean)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.IHttpClient"> + <summary> + Http终端接口 + </summary> + </member> + <member name="M:TouchSocket.Http.IHttpClient.Request(TouchSocket.Http.HttpRequest,System.Boolean,System.Int32,System.Threading.CancellationToken)"> + <summary> + 发起请求 + </summary> + <param name="request">请求体</param> + <param name="onlyRequest">仅仅请求,而不等待结果</param> + <param name="millisecondsTimeout">等待超时时间</param> + <param name="token">结束等待令箭</param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.IHttpClient.RequestAsync(TouchSocket.Http.HttpRequest,System.Boolean,System.Int32,System.Threading.CancellationToken)"> + <summary> + 发起请求 + </summary> + <param name="request">请求体</param> + <param name="onlyRequest">仅仅请求,而不等待结果</param> + <param name="millisecondsTimeout">等待超时时间</param> + <param name="token">结束等待令箭</param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.IHttpClient.RequestContent(TouchSocket.Http.HttpRequest,System.Boolean,System.Int32,System.Threading.CancellationToken)"> + <summary> + 发起请求,并获取数据体 + </summary> + <param name="request">请求体</param> + <param name="onlyRequest">仅仅请求,而不等待结果</param> + <param name="millisecondsTimeout">等待超时时间</param> + <param name="token">结束等待令箭</param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.IHttpClient.RequestContentAsync(TouchSocket.Http.HttpRequest,System.Boolean,System.Int32,System.Threading.CancellationToken)"> + <summary> + 发起请求,并获取数据体 + </summary> + <param name="request">请求体</param> + <param name="onlyRequest">仅仅请求,而不等待结果</param> + <param name="millisecondsTimeout">等待超时时间</param> + <param name="token">结束等待令箭</param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.IHttpClientBase"> + <summary> + Http终端基础接口 + </summary> + </member> + <member name="T:TouchSocket.Http.IHttpService`1"> + <summary> + IHttpService + </summary> + </member> + <member name="T:TouchSocket.Http.IHttpService"> + <summary> + IHttpService + </summary> + </member> + <member name="T:TouchSocket.Http.IHttpServiceBase"> + <summary> + IHttpServiceBase + </summary> + </member> + <member name="T:TouchSocket.Http.IHttpSocketClient"> + <summary> + Http服务器终端接口 + </summary> + </member> + <member name="P:TouchSocket.Http.IHttpSocketClient.WebSocket"> + <summary> + 当该连接是WebSocket时,可获取该对象,否则为null。 + </summary> + </member> + <member name="M:TouchSocket.Http.IHttpSocketClient.SwitchProtocolToWebSocket(TouchSocket.Http.HttpContext)"> + <summary> + 转化Protocol协议标识为<see cref="F:TouchSocket.Sockets.Protocol.WebSocket"/> + </summary> + <param name="httpContext">Http上下文</param> + </member> + <member name="T:TouchSocket.Http.CorsBuilder"> + <summary> + CorsBuilder + </summary> + </member> + <member name="P:TouchSocket.Http.CorsBuilder.Credentials"> + <summary> + 允许客户端携带验证信息 + </summary> + </member> + <member name="P:TouchSocket.Http.CorsBuilder.Headers"> + <summary> + 请求头 + </summary> + </member> + <member name="P:TouchSocket.Http.CorsBuilder.Methods"> + <summary> + 允许跨域的方法。 + </summary> + </member> + <member name="P:TouchSocket.Http.CorsBuilder.Origin"> + <summary> + 允许跨域的域名 + </summary> + </member> + <member name="M:TouchSocket.Http.CorsBuilder.AllowAnyHeaders"> + <summary> + 允许所有的Header + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.CorsBuilder.AllowAnyMethod"> + <summary> + 允许任何Method。 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.CorsBuilder.AllowAnyOrigin"> + <summary> + 允许所有的源 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.CorsBuilder.AllowCredentials"> + <summary> + 允许客户端携带验证信息 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.CorsBuilder.WithHeaders(System.String[])"> + <summary> + 允许跨域的Header + </summary> + <param name="values"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.CorsBuilder.WithMethods(System.String[])"> + <summary> + 允许跨域的方法。 + 例如“PUT,POST,GET,DELETE,OPTIONS,HEAD,PATCH” + </summary> + <param name="values"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.CorsBuilder.WithOrigin(System.String)"> + <summary> + 允许跨域的域名 + </summary> + <param name="value"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.CorsBuilder.Build"> + <summary> + 构建 + </summary> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.CorsOptions"> + <summary> + 跨域相关配置 + </summary> + </member> + <member name="P:TouchSocket.Http.CorsOptions.CorsPolicys"> + <summary> + 跨域策略集 + </summary> + </member> + <member name="M:TouchSocket.Http.CorsOptions.Add(System.String,System.Action{TouchSocket.Http.CorsBuilder})"> + <summary> + 添加跨域策略 + </summary> + <param name="policyName"></param> + <param name="corsBuilderAction"></param> + </member> + <member name="M:TouchSocket.Http.CorsOptions.Add(System.String,TouchSocket.Http.CorsPolicy)"> + <summary> + 添加跨域策略 + </summary> + <param name="policyName"></param> + <param name="corsResult"></param> + </member> + <member name="T:TouchSocket.Http.CorsPlugin"> + <summary> + 可以配置跨域的插件 + </summary> + </member> + <member name="M:TouchSocket.Http.CorsPlugin.#ctor(TouchSocket.Http.ICorsService,System.String)"> + <summary> + 可以配置跨域的插件 + </summary> + <param name="corsService"></param> + <param name="policyName"></param> + </member> + <member name="M:TouchSocket.Http.CorsPlugin.Loaded(TouchSocket.Core.IPluginManager)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.CorsPolicy"> + <summary> + CorsResult + </summary> + </member> + <member name="M:TouchSocket.Http.CorsPolicy.#ctor(System.Boolean,System.String,System.String,System.String)"> + <summary> + CorsResult + </summary> + <param name="credentials"></param> + <param name="headers"></param> + <param name="methods"></param> + <param name="origin"></param> + </member> + <member name="P:TouchSocket.Http.CorsPolicy.Credentials"> + <summary> + 允许客户端携带验证信息 + </summary> + </member> + <member name="P:TouchSocket.Http.CorsPolicy.Headers"> + <summary> + 请求头 + </summary> + </member> + <member name="P:TouchSocket.Http.CorsPolicy.Methods"> + <summary> + 允许跨域的方法。 + </summary> + </member> + <member name="P:TouchSocket.Http.CorsPolicy.Origin"> + <summary> + 允许跨域的域名 + </summary> + </member> + <member name="M:TouchSocket.Http.CorsPolicy.Apply(TouchSocket.Http.HttpContext)"> + <summary> + 应用跨域策略 + </summary> + <param name="context"></param> + </member> + <member name="T:TouchSocket.Http.ICorsService"> + <summary> + 跨域相关的服务类接口 + </summary> + </member> + <member name="M:TouchSocket.Http.ICorsService.GetPolicy(System.String)"> + <summary> + 按照策略名称,获取策略 + </summary> + <param name="name"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.HttpClientDataHandlingAdapter"> + <summary> + Http客户端数据处理适配器 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpClientDataHandlingAdapter.tempByteBlock"> + <summary> + 缓存数据,如果需要手动释放,请先判断,然后到调用<see cref="M:System.IDisposable.Dispose"/>后,再置空; + </summary> + </member> + <member name="P:TouchSocket.Http.HttpClientDataHandlingAdapter.CanSplicingSend"> + <summary> + <inheritdoc/> + </summary> + </member> + <member name="M:TouchSocket.Http.HttpClientDataHandlingAdapter.OnLoaded(System.Object)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpClientDataHandlingAdapter.PreviewReceived(TouchSocket.Core.ByteBlock)"> + <summary> + <inheritdoc/> + </summary> + <param name="byteBlock"></param> + </member> + <member name="T:TouchSocket.Http.HttpServerDataHandlingAdapter"> + <summary> + Http服务器数据处理适配器 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpServerDataHandlingAdapter.tempByteBlock"> + <summary> + 缓存数据,如果需要手动释放,请先判断,然后到调用<see cref="M:System.IDisposable.Dispose"/>后,再置空; + </summary> + </member> + <member name="M:TouchSocket.Http.HttpServerDataHandlingAdapter.Dispose(System.Boolean)"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.HttpServerDataHandlingAdapter.CanSplicingSend"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpServerDataHandlingAdapter.OnLoaded(System.Object)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.HttpServerDataHandlingAdapter.PreviewReceived(TouchSocket.Core.ByteBlock)"> + <summary> + <inheritdoc/> + </summary> + <param name="byteBlock"></param> + </member> + <member name="T:TouchSocket.Http.HttpContextEventHandler`1"> + <summary> + HTTP上下文事件委托 + </summary> + <typeparam name="TClient"></typeparam> + <param name="client"></param> + <param name="e"></param> + </member> + <member name="T:TouchSocket.Http.HttpHeaders"> + <summary> + 请求头枚举 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.CacheControl"> + <summary> + Cache-Control 标头,指定请求/响应链上所有缓存控制机制必须服从的指令。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Connection"> + <summary> + Connection 标头,指定特定连接需要的选项。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Date"> + <summary> + Date 标头,指定开始创建请求的日期和时间。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.KeepAlive"> + <summary> + Keep-Alive 标头,指定用以维护持久性连接的参数。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Pragma"> + <summary> + Pragma 标头,指定可应用于请求/响应链上的任何代理的特定于实现的指令。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Trailer"> + <summary> + Trailer 标头,指定标头字段显示在以 chunked 传输编码方式编码的消息的尾部。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.TransferEncoding"> + <summary> + Transfer-Encoding 标头,指定对消息正文应用的转换的类型(如果有)。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Upgrade"> + <summary> + Upgrade 标头,指定客户端支持的附加通信协议。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Via"> + <summary> + Via 标头,指定网关和代理程序要使用的中间协议。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Warning"> + <summary> + Warning 标头,指定关于可能未在消息中反映的消息的状态或转换的附加信息。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Allow"> + <summary> + Allow 标头,指定支持的 HTTP 方法集。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ContentLength"> + <summary> + Content-Length 标头,指定伴随正文数据的长度(以字节为单位)。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ContentType"> + <summary> + Content-Type 标头,指定伴随正文数据的 MIME 类型。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ContentEncoding"> + <summary> + Content-Encoding 标头,指定已应用于伴随正文数据的编码。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ContentLanguage"> + <summary> + Content-Langauge 标头,指定伴随正文数据的自然语言。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ContentLocation"> + <summary> + Content-Location 标头,指定可从其中获得伴随正文的 URI。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ContentMd5"> + <summary> + Content-MD5 标头,指定伴随正文数据的 MD5 摘要,用于提供端到端消息完整性检查。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ContentRange"> + <summary> + Content-Range 标头,指定在完整正文中应用伴随部分正文数据的位置。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Expires"> + <summary> + Expires 标头,指定日期和时间,在此之后伴随的正文数据应视为陈旧的。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.LastModified"> + <summary> + Last-Modified 标头,指定上次修改伴随的正文数据的日期和时间。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Accept"> + <summary> + Accept 标头,指定响应可接受的 MIME 类型。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.AcceptCharset"> + <summary> + Accept-Charset 标头,指定响应可接受的字符集。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.AcceptEncoding"> + <summary> + Accept-Encoding 标头,指定响应可接受的内容编码。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.AcceptLanguage"> + <summary> + Accept-Langauge 标头,指定响应首选的自然语言。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Authorization"> + <summary> + Authorization 标头,指定客户端为向服务器验证自身身份而出示的凭据。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Cookie"> + <summary> + Cookie 标头,指定向服务器提供的 Cookie 数据。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Expect"> + <summary> + Expect 标头,指定客户端要求的特定服务器行为。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.From"> + <summary> + From 标头,指定控制请求用户代理的用户的 Internet 电子邮件地址。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Host"> + <summary> + Host 标头,指定所请求资源的主机名和端口号。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.IfMatch"> + <summary> + If-Match 标头,指定仅当客户端的指示资源的缓存副本是最新的时,才执行请求的操作。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.IfModifiedSince"> + <summary> + If-Modified-Since 标头,指定仅当自指示的数据和时间之后修改了请求的资源时,才执行请求的操作。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.IfNoneMatch"> + <summary> + If-None-Match 标头,指定仅当客户端的指示资源的缓存副本都不是最新的时,才执行请求的操作。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.IfRange"> + <summary> + If-Range 标头,指定如果客户端的缓存副本是最新的,仅发送指定范围的请求资源。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.IfUnmodifiedSince"> + <summary> + If-Unmodified-Since 标头,指定仅当自指示的日期和时间之后修改了请求的资源时,才执行请求的操作。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.MaxForwards"> + <summary> + Max-Forwards 标头,指定一个整数,表示此请求还可转发的次数。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ProxyAuthorization"> + <summary> + Proxy-Authorization 标头,指定客户端为向代理验证自身身份而出示的凭据。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Referer"> + <summary> + Referer 标头,指定从中获得请求 URI 的资源的 URI。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Range"> + <summary> + Range 标头,指定代替整个响应返回的客户端请求的响应的子范围。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Te"> + <summary> + TE 标头,指定响应可接受的传输编码方式。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Translate"> + <summary> + Translate 标头,与 WebDAV 功能一起使用的 HTTP 规范的 Microsoft 扩展。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.UserAgent"> + <summary> + User-Agent 标头,指定有关客户端代理的信息。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.AcceptRanges"> + <summary> + Accept-Ranges 标头,指定服务器接受的范围。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Age"> + <summary> + Age 标头,指定自起始服务器生成响应以来的时间长度(以秒为单位)。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ETag"> + <summary> + Etag 标头,指定请求的变量的当前值。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Location"> + <summary> + Location 标头,指定为获取请求的资源而将客户端重定向到的 URI。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ProxyAuthenticate"> + <summary> + Proxy-Authenticate 标头,指定客户端必须对代理验证其自身。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.RetryAfter"> + <summary> + Retry-After 标头,指定某个时间(以秒为单位)或日期和时间,在此时间之后客户端可以重试其请求。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Server"> + <summary> + Server 标头,指定关于起始服务器代理的信息。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.SetCookie"> + <summary> + Set-Cookie 标头,指定提供给客户端的 Cookie 数据。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Vary"> + <summary> + Vary 标头,指定用于确定缓存的响应是否为新响应的请求标头。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.WwwAuthenticate"> + <summary> + WWW-Authenticate 标头,指定客户端必须对服务器验证其自身。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.Origin"> + <summary> + Origin。 + </summary> + </member> + <member name="F:TouchSocket.Http.HttpHeaders.ContentDisposition"> + <summary> + Content-Disposition + </summary> + </member> + <member name="T:TouchSocket.Http.HttpContextEventArgs"> + <summary> + Http请求事件类 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpContextEventArgs.Context"> + <summary> + Http上下文 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpContextEventArgs.#ctor(TouchSocket.Http.HttpContext)"> + <summary> + 构造函数 + </summary> + <param name="context"></param> + </member> + <member name="T:TouchSocket.Http.HttpContainerExtension"> + <summary> + HttpContainerExtension + </summary> + </member> + <member name="M:TouchSocket.Http.HttpContainerExtension.AddCors(TouchSocket.Core.IRegistrator,System.Action{TouchSocket.Http.CorsOptions})"> + <summary> + 向注册器中添加跨域服务。 + </summary> + <param name="registrator"></param> + <param name="action"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.HttpExtensions"> + <summary> + Http扩展辅助 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.GetEnum``1(System.String,``0@)"> + <summary> + 根据字符串获取枚举 + </summary> + <typeparam name="T"></typeparam> + <param name="str"></param> + <param name="result"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.AddHeader``1(``0,System.String,System.String)"> + <summary> + 添加Header参数 + </summary> + <param name="request"></param> + <param name="key"></param> + <param name="value"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.AddHeader``1(``0,TouchSocket.Http.HttpHeaders,System.String)"> + <summary> + 添加Header参数 + </summary> + <param name="request"></param> + <param name="key"></param> + <param name="value"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.FromJson``1(``0,System.String)"> + <summary> + 从Json + </summary> + <param name="request"></param> + <param name="value"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.FromText``1(``0,System.String)"> + <summary> + 从文本 + </summary> + <param name="request"></param> + <param name="value"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.FromXML``1(``0,System.String)"> + <summary> + 从Xml格式 + </summary> + <param name="request"></param> + <param name="value"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.GetBody(TouchSocket.Http.HttpBase)"> + <summary> + 获取Body的字符串 + </summary> + <param name="httpBase"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.GetBoundary(TouchSocket.Http.HttpBase)"> + <summary> + 当数据类型为multipart/form-data时,获取boundary + </summary> + <param name="httpBase"></param> + <returns></returns> + <exception cref="T:System.Exception"></exception> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.SetContent``1(``0,System.String,System.Text.Encoding)"> + <summary> + 设置内容 + </summary> + <param name="httpBase"></param> + <param name="content"></param> + <param name="encoding"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.SetContentLength``1(``0,System.Int64)"> + <summary> + 设置数据体长度 + </summary> + <param name="httpBase"></param> + <param name="value"></param> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.SetContentTypeByExtension``1(``0,System.String)"> + <summary> + 从扩展名设置内容类型,必须以“.”开头 + </summary> + <param name="httpBase"></param> + <param name="extension"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.WriteContent``1(``0,System.Byte[])"> + <summary> + 写入 + </summary> + <param name="httpBase"></param> + <param name="buffer"></param> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.GetMultifileCollection``1(``0)"> + <summary> + 获取多文件集合。如果不存在,则返回null。 + </summary> + <typeparam name="TRequest"></typeparam> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.InitHeaders``1(``0)"> + <summary> + 初始化常规的请求头。 + <para>包含:</para> + <list type="number"> + <item>Connection:keep-alive</item> + <item>Pragma:no-cache</item> + <item>UserAgent:TouchSocket.Http</item> + </list> + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.SetHost``1(``0,System.String)"> + <summary> + 添加Host请求头 + </summary> + <param name="request"></param> + <param name="host"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.AddQuery``1(``0,System.String,System.String)"> + <summary> + 添加Query参数 + </summary> + <param name="request"></param> + <param name="key"></param> + <param name="value"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.UrlEquals``1(``0,System.String)"> + <summary> + 对比不包含参数的Url。其中有任意一方为null,则均返回False。 + </summary> + <param name="request"></param> + <param name="url"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.AsDelete``1(``0)"> + <summary> + 作为Delete访问 + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.AsGet``1(``0)"> + <summary> + 作为Get访问 + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.AsMethod``1(``0,System.String)"> + <summary> + 作为指定函数 + </summary> + <param name="request"></param> + <param name="method"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.AsPost``1(``0)"> + <summary> + 作为Post访问 + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.AsPut``1(``0)"> + <summary> + 作为Put访问 + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.IsDelete``1(``0)"> + <summary> + 是否作为Delete访问 + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.IsGet``1(``0)"> + <summary> + 是否作为Get访问 + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.IsMethod``1(``0,System.String)"> + <summary> + 是否作为指定函数 + </summary> + <param name="request"></param> + <param name="method"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.IsPost``1(``0)"> + <summary> + 是否作为Post访问 + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.IsPut``1(``0)"> + <summary> + 是否作为Put访问 + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.IsUpgrade``1(``0)"> + <summary> + 是否在headers中包含升级连接 + </summary> + <param name="request"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.SetContentTypeFromFileName``1(``0,System.String)"> + <summary> + 设置文件类型。 + </summary> + <param name="response"></param> + <param name="fileName"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.IsSuccess``1(``0,System.Nullable{System.Int32})"> + <summary> + 判断返回的状态码是否为成功。 + </summary> + <param name="response"></param> + <param name="status"> + 当不指定具体的状态码时,只要状态码在200-299之间则为<see langword="true"/>。 + 当指定时,状态码不仅必须要在200-299之间,还必须是指定的状态码才会返回<see langword="true"/>。 + </param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.SetStatus``1(``0,System.Int32,System.String)"> + <summary> + 设置状态,并且附带时间戳。 + </summary> + <param name="response"></param> + <param name="status"></param> + <param name="msg"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.SetStatus``1(``0)"> + <summary> + 设置默认Success状态,并且附带时间戳。 + </summary> + <typeparam name="TResponse"></typeparam> + <param name="response"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.UrlNotFind``1(``0)"> + <summary> + 路径文件没找到 + </summary> + <param name="response"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.FromFile(TouchSocket.Http.HttpResponse,System.String,TouchSocket.Http.HttpRequest,System.String,System.Int32,System.Int32)"> + <summary> + 从文件响应。 + <para>当response支持持续写入时,会直接回复响应。并阻塞执行,直到完成。所以在执行该方法之前,请确保已设置完成所有状态字</para> + <para>当response不支持持续写入时,会填充Content,且不会响应,需要自己执行Build,并发送。</para> + </summary> + <param name="response">响应</param> + <param name="request">请求头,用于尝试续传,为null时则不续传。</param> + <param name="filePath">文件路径</param> + <param name="fileName">文件名,不设置时会获取路径文件名</param> + <param name="maxSpeed">最大速度(仅企业版有效)。</param> + <param name="bufferLen">读取长度。</param> + <exception cref="T:System.Exception"></exception> + <exception cref="T:System.Exception"></exception> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.FromFile(TouchSocket.Http.HttpContext,System.String,System.String,System.Int32,System.Int32)"> + <summary> + 从文件响应。 + <para>当response支持持续写入时,会直接回复响应。并阻塞执行,直到完成。所以在执行该方法之前,请确保已设置完成所有状态字</para> + <para>当response不支持持续写入时,会填充Content,且不会响应,需要自己执行Build,并发送。</para> + </summary> + <param name="context">上下文</param> + <param name="filePath">文件路径</param> + <param name="fileName">文件名,不设置时会获取路径文件名</param> + <param name="maxSpeed">最大速度(仅企业版有效)。</param> + <param name="bufferLen">读取长度。</param> + <exception cref="T:System.Exception"></exception> + <exception cref="T:System.Exception"></exception> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.FromFileAsync(TouchSocket.Http.HttpResponse,System.String,TouchSocket.Http.HttpRequest,System.String,System.Int32,System.Int32)"> + <summary> + 从文件响应。 + <para>当response支持持续写入时,会直接回复响应。并阻塞执行,直到完成。所以在执行该方法之前,请确保已设置完成所有状态字</para> + <para>当response不支持持续写入时,会填充Content,且不会响应,需要自己执行Build,并发送。</para> + </summary> + <param name="response">响应</param> + <param name="request">请求头,用于尝试续传,为null时则不续传。</param> + <param name="filePath">文件路径</param> + <param name="fileName">文件名,不设置时会获取路径文件名</param> + <param name="maxSpeed">最大速度(仅企业版有效)。</param> + <param name="bufferLen">读取长度。</param> + <exception cref="T:System.Exception"></exception> + <exception cref="T:System.Exception"></exception> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpExtensions.FromFileAsync(TouchSocket.Http.HttpContext,System.String,System.String,System.Int32,System.Int32)"> + <summary> + 从文件响应。 + <para>当response支持持续写入时,会直接回复响应。并阻塞执行,直到完成。所以在执行该方法之前,请确保已设置完成所有状态字</para> + <para>当response不支持持续写入时,会填充Content,且不会响应,需要自己执行Build,并发送。</para> + </summary> + <param name="context">上下文</param> + <param name="filePath">文件路径</param> + <param name="fileName">文件名,不设置时会获取路径文件名</param> + <param name="maxSpeed">最大速度(仅企业版有效)。</param> + <param name="bufferLen">读取长度。</param> + <exception cref="T:System.Exception"></exception> + <exception cref="T:System.Exception"></exception> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.IContentTypeProvider"> + <summary> + IContentTypeProvider + </summary> + </member> + <member name="M:TouchSocket.Http.IContentTypeProvider.TryGetContentType(System.String,System.String@)"> + <summary> + 给定文件路径,确定MIME类型 + </summary> + <param name="subpath"></param> + <param name="contentType"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.IFormFile"> + <summary> + 表单文件 + </summary> + </member> + <member name="P:TouchSocket.Http.IFormFile.ContentDisposition"> + <summary> + 获取Content-Disposition + </summary> + </member> + <member name="P:TouchSocket.Http.IFormFile.ContentType"> + <summary> + 获取Content-Type + </summary> + </member> + <member name="P:TouchSocket.Http.IFormFile.Data"> + <summary> + 实际的数据 + </summary> + </member> + <member name="P:TouchSocket.Http.IFormFile.DataPair"> + <summary> + 数据对 + </summary> + </member> + <member name="P:TouchSocket.Http.IFormFile.FileName"> + <summary> + 获取file name + </summary> + </member> + <member name="P:TouchSocket.Http.IFormFile.Length"> + <summary> + 文件长度。在数据接收完成之前,该值为-1; + </summary> + </member> + <member name="P:TouchSocket.Http.IFormFile.Name"> + <summary> + 获取name字段 + </summary> + </member> + <member name="T:TouchSocket.Http.IHttpHeader"> + <summary> + 表示http的headers + </summary> + </member> + <member name="M:TouchSocket.Http.IHttpHeader.Get(System.String)"> + <summary> + 获取Header + </summary> + <param name="key"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.IHttpHeader.Get(TouchSocket.Http.HttpHeaders)"> + <summary> + 获取Header + </summary> + <param name="key"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.IHttpHeader.Add(TouchSocket.Http.HttpHeaders,System.String)"> + <summary> + 添加Header + </summary> + <param name="key"></param> + <param name="value"></param> + </member> + <member name="P:TouchSocket.Http.IHttpHeader.Item(TouchSocket.Http.HttpHeaders)"> + <summary> + 获取、添加Header + </summary> + <param name="headers"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.IHttpParams"> + <summary> + Http参数 + </summary> + </member> + <member name="M:TouchSocket.Http.IHttpParams.Get(System.String)"> + <summary> + 获取参数 + </summary> + <param name="key"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.DefaultHttpServicePlugin"> + <summary> + 默认的Http服务。为Http做兜底拦截。该插件应该最后添加。 + </summary> + </member> + <member name="M:TouchSocket.Http.DefaultHttpServicePlugin.Loaded(TouchSocket.Core.IPluginManager)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.DefaultHttpServicePlugin.OnHttpRequest(TouchSocket.Http.IHttpSocketClient,TouchSocket.Http.HttpContextEventArgs)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.IHttpPlugin`1"> + <summary> + IHttpPlugin + </summary> + </member> + <member name="M:TouchSocket.Http.IHttpPlugin`1.OnHttpRequest(`0,TouchSocket.Http.HttpContextEventArgs)"> + <summary> + 在收到Http请求。 + </summary> + <param name="client"></param> + <param name="e"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.IHttpPlugin"> + <summary> + IHttpPlugin + </summary> + </member> + <member name="T:TouchSocket.Http.FileExtensionContentTypeProvider"> + <summary> + FileExtensionContentTypeProvider + </summary> + </member> + <member name="M:TouchSocket.Http.FileExtensionContentTypeProvider.#ctor"> + <summary> + FileExtensionContentTypeProvider + </summary> + </member> + <member name="M:TouchSocket.Http.FileExtensionContentTypeProvider.#ctor(System.Collections.Generic.IDictionary{System.String,System.String})"> + <summary> + FileExtensionContentTypeProvider + </summary> + <param name="mapping"></param> + </member> + <member name="P:TouchSocket.Http.FileExtensionContentTypeProvider.Mappings"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.FileExtensionContentTypeProvider.TryGetContentType(System.String,System.String@)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.HttpStaticPagePlugin"> + <summary> + Http静态内容插件 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.#ctor"> + <summary> + 构造函数 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.Loaded(TouchSocket.Core.IPluginManager)"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.HttpStaticPagePlugin.ContentTypeProvider"> + <summary> + 提供文件扩展名和MIME类型之间的映射。 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpStaticPagePlugin.FileCache"> + <summary> + 静态文件缓存。 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpStaticPagePlugin.NavigateAction"> + <summary> + 重新导航 + </summary> + </member> + <member name="P:TouchSocket.Http.HttpStaticPagePlugin.ResponseAction"> + <summary> + 在响应之前调用。 + </summary> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.AddFolder(System.String,System.String,System.String,System.Nullable{System.TimeSpan})"> + <summary> + 添加静态 + </summary> + <param name="path">Static content path</param> + <param name="prefix">Cache prefix (default is "/")</param> + <param name="filter">Cache filter (default is "*.*")</param> + <param name="millisecondsTimeout">Refresh cache millisecondsTimeout (default is 1 hour)</param> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.ClearFolder"> + <summary> + Clear static content cache + </summary> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.RemoveFolder(System.String)"> + <summary> + Remove static content cache + </summary> + <param name="path">Static content path</param> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.SetContentTypeProvider(TouchSocket.Http.IContentTypeProvider)"> + <summary> + 设置提供文件扩展名和MIME类型之间的映射。 + </summary> + <param name="provider"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.SetNavigateAction(System.Func{TouchSocket.Http.HttpRequest,System.Threading.Tasks.Task{System.String}})"> + <summary> + 设定重新导航 + </summary> + <param name="func"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.SetNavigateAction(System.Func{TouchSocket.Http.HttpRequest,System.String})"> + <summary> + 设定重新导航 + </summary> + <param name="func"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.SetResponseAction(System.Func{TouchSocket.Http.HttpContext,System.Threading.Tasks.Task})"> + <summary> + 在响应之前调用。 + </summary> + <param name="func"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.HttpStaticPagePlugin.SetResponseAction(System.Action{TouchSocket.Http.HttpContext})"> + <summary> + 在响应之前调用。 + </summary> + <param name="action"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.StaticPageOptions"> + <summary> + 静态页面配置 + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketOption"> + <summary> + WebSocket配置 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketOption.Version"> + <summary> + 版本 + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketReceiveResult"> + <summary> + WebSocketReceiveResult + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketReceiveResult.#ctor(System.Action,TouchSocket.Http.WebSockets.WSDataFrame)"> + <summary> + WebSocketReceiveResult + </summary> + <param name="disAction"></param> + <param name="dataFrame"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketReceiveResult.Dispose"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketReceiveResult.DataFrame"> + <summary> + WebSocket数据帧 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketReceiveResult.IsClosed"> + <summary> + 连接已关闭 + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.WSDataFrame"> + <summary> + WebSocket数据帧 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.FIN"> + <summary> + 是否为最后数据帧。 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.IsBinary"> + <summary> + 是否是二进制数据类型 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.IsClose"> + <summary> + 是否是关闭请求 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.IsPing"> + <summary> + 是否是Ping + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.IsPong"> + <summary> + 是否是Pong + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.IsText"> + <summary> + 是否是文本类型 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.Mask"> + <summary> + 计算掩码 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.MaskingKey"> + <summary> + 掩码值 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.Opcode"> + <summary> + 数据类型 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.PayloadData"> + <summary> + 有效数据 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.PayloadLength"> + <summary> + 有效载荷数据长度 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.RSV1"> + <summary> + 标识RSV-1。 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.RSV2"> + <summary> + 标识RSV-2。 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrame.RSV3"> + <summary> + 标识RSV-3。 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSDataFrame.Build(TouchSocket.Core.ByteBlock)"> + <summary> + 构建数据 + </summary> + <param name="byteBlock"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSDataFrame.GetTotalSize"> + <summary> + TotalSize + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSDataFrame.SetMaskString(System.String)"> + <summary> + 设置Mask。 + </summary> + <param name="mask"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSDataFrame.Dispose(System.Boolean)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.WebSockets.WSTools"> + <summary> + WSTools + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WSTools.acceptMask"> + <summary> + 应答。 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSTools.Build(TouchSocket.Core.ByteBlock,TouchSocket.Http.WebSockets.WSDataFrame,System.Byte[],System.Int32,System.Int32)"> + <summary> + 构建数据 + </summary> + <param name="byteBlock"></param> + <param name="dataFrame"></param> + <param name="buffer"></param> + <param name="offset"></param> + <param name="length"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSTools.CalculateBase64Key(System.String)"> + <summary> + 计算Base64值 + </summary> + <param name="str"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSTools.CreateBase64Key"> + <summary> + 获取Base64随即字符串。 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSTools.DoMask(System.Byte[],System.Int32,System.Byte[],System.Int32,System.Int32,System.Byte[])"> + <summary> + 掩码运算 + </summary> + <param name="storeBuf"></param> + <param name="sOffset"></param> + <param name="buffer"></param> + <param name="offset"></param> + <param name="length"></param> + <param name="masks"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSTools.GetWSRequest(System.String,System.String,System.String,System.String@)"> + <summary> + 获取WS的请求头 + </summary> + <param name="host"></param> + <param name="url"></param> + <param name="version"></param> + <param name="base64Key"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSTools.TryGetResponse(TouchSocket.Http.HttpRequest,TouchSocket.Http.HttpResponse)"> + <summary> + 获取响应 + </summary> + <param name="request"></param> + <param name="response"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.WebSockets.SetupClientWebSocket"> + <summary> + SetupClientWebSocket + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.SetupClientWebSocket.#ctor"> + <summary> + SetupClientWebSocket + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.SetupClientWebSocket.Connect(System.Int32,System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.SetupClientWebSocket.ConnectAsync(System.Int32,System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.SetupClientWebSocket.LastReceivedTime"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.SetupClientWebSocket.LastSendTime"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.SetupClientWebSocket.Protocol"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.SetupClientWebSocket.RemoteIPHost"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.SetupClientWebSocket.ProtectedIsHandshaked"> + <summary> + 是否已完成连接 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.SetupClientWebSocket.Client"> + <summary> + 通讯实际客户端 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.SetupClientWebSocket.Close(System.String)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.SetupClientWebSocket.BreakOut(System.String,System.Boolean)"> + <summary> + 中断连接 + </summary> + <param name="msg"></param> + <param name="manual"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.SetupClientWebSocket.Dispose(System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.SetupClientWebSocket.LoadConfig(TouchSocket.Core.TouchSocketConfig)"> + <summary> + 加载配置 + </summary> + <param name="config"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.SetupClientWebSocket.OnDisconnected(TouchSocket.Sockets.DisconnectEventArgs)"> + <summary> + 已断开连接。 + </summary> + <param name="e"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.SetupClientWebSocket.OnReceived(System.Net.WebSockets.WebSocketReceiveResult,TouchSocket.Core.ByteBlock)"> + <summary> + 收到数据 + </summary> + <param name="result"></param> + <param name="byteBlock"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketClient"> + <summary> + WebSocketClient用户终端简单实现。 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClient.Received"> + <summary> + 收到WebSocket数据 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClient.OnReceivedWSDataFrame(TouchSocket.Http.WebSockets.WSDataFrameEventArgs)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketClientBase"> + <summary> + WebSocket用户终端。 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.#ctor"> + <summary> + WebSocket用户终端 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Connect(System.Int32,System.Threading.CancellationToken)"> + <summary> + 连接到ws服务器 + </summary> + <param name="millisecondsTimeout"></param> + <param name="token"></param> + <exception cref="T:TouchSocket.Http.WebSockets.WebSocketConnectException"></exception> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.ConnectAsync(System.Int32,System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.AllowAsyncRead"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.Client"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.Config"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.Handshaked"> + <summary> + 表示完成握手后。 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.Handshaking"> + <summary> + 表示在即将握手连接时。 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.IsHandshaked"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.LastReceivedTime"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.LastSendTime"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.Logger"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.PluginManager"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.Protocol"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.Resolver"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketClientBase.Version"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.OnHandshaked(TouchSocket.Http.HttpContextEventArgs)"> + <summary> + 表示完成握手后。 + </summary> + <param name="e"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.OnHandshaking(TouchSocket.Http.HttpContextEventArgs)"> + <summary> + 表示在即将握手连接时。 + </summary> + <param name="e"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Close(System.String)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Dispose"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.GetValue``1(TouchSocket.Core.IDependencyProperty{``0})"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.HasValue``1(TouchSocket.Core.IDependencyProperty{``0})"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Ping"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.PingAsync"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Pong"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.PongAsync"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.ReadAsync(System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.RemoveValue``1(TouchSocket.Core.IDependencyProperty{``0})"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Send(TouchSocket.Http.WebSockets.WSDataFrame,System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Send(System.String,System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Send(System.Byte[],System.Int32,System.Int32,System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Send(TouchSocket.Core.ByteBlock,System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Send(System.Byte[],System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.SendAsync(TouchSocket.Http.WebSockets.WSDataFrame,System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.SendAsync(System.String,System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.SendAsync(System.Byte[],System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.SendAsync(System.Byte[],System.Int32,System.Int32,System.Boolean)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.Setup(TouchSocket.Core.TouchSocketConfig)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.SetupAsync(TouchSocket.Core.TouchSocketConfig)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.SetValue``1(TouchSocket.Core.IDependencyProperty{``0},``0)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.TryGetValue``1(TouchSocket.Core.IDependencyProperty{``0},``0@)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.TryRemoveValue``1(TouchSocket.Core.IDependencyProperty{``0},``0@)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.ValueReadAsync(System.Threading.CancellationToken)"> + <inheritdoc/> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.OnReceivedWSDataFrame(TouchSocket.Http.WebSockets.WSDataFrameEventArgs)"> + <summary> + 当收到WS数据时。 + </summary> + <param name="e"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketClientBase.PrivateHttpClient.OnDisconnected(TouchSocket.Sockets.DisconnectEventArgs)"> + <summary> + <inheritdoc/> + </summary> + <param name="e"></param> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketDataHandlingAdapter"> + <summary> + WebSocket适配器 + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WebSocketDataHandlingAdapter.m_surPlusLength"> + <summary> + 数据包剩余长度 + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WebSocketDataHandlingAdapter.m_tempByteBlock"> + <summary> + 临时包 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataHandlingAdapter.DecodingFromBytes(System.Byte[],System.Int32@,System.Int32,TouchSocket.Http.WebSockets.WSDataFrame@)"> + <summary> + 解码 + </summary> + <param name="dataBuffer"></param> + <param name="offset"></param> + <param name="length"></param> + <param name="dataFrame"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataHandlingAdapter.PreviewReceived(TouchSocket.Core.ByteBlock)"> + <summary> + 当接收到数据时处理数据 + </summary> + <param name="byteBlock">数据流</param> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataHandlingAdapter.Reset"> + <summary> + <inheritdoc/> + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataHandlingAdapter.SplitPackage(System.Byte[],System.Int32,System.Int32)"> + <summary> + 分解包 + </summary> + <param name="dataBuffer"></param> + <param name="offset"></param> + <param name="length"></param> + </member> + <member name="T:TouchSocket.Http.WebSockets.WSDataFrameEventHandler`1"> + <summary> + 收到WebSocket数据 + </summary> + <param name="client"></param> + <param name="e"></param> + </member> + <member name="T:TouchSocket.Http.WebSockets.WSDataType"> + <summary> + WebSocket数据类型 + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WSDataType.Cont"> + <summary> + 表示一个中间数据包 + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WSDataType.Text"> + <summary> + 表示一个text类型数据包 + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WSDataType.Binary"> + <summary> + 表示一个binary类型数据包 + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WSDataType.Close"> + <summary> + 表示一个断开连接类型数据包 + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WSDataType.Ping"> + <summary> + 表示一个ping类型数据包 + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WSDataType.Pong"> + <summary> + 表示一个pong类型数据包 + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.WSDataFrameEventArgs"> + <summary> + WS数据事件类 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WSDataFrameEventArgs.#ctor(TouchSocket.Http.WebSockets.WSDataFrame)"> + <summary> + 构造函数 + </summary> + <param name="dataFrame"></param> + </member> + <member name="P:TouchSocket.Http.WebSockets.WSDataFrameEventArgs.DataFrame"> + <summary> + WS数据帧。 + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketConnectException"> + <summary> + WebSocket连接异常。 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketConnectException.#ctor(System.String,TouchSocket.Http.HttpContext)"> + <summary> + WebSocket连接异常 + </summary> + <param name="mes"></param> + <param name="context"></param> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketConnectException.Context"> + <summary> + HttpContext + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketClientExtension"> + <summary> + WebSocketClientExtension + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketDataFrameExtension"> + <summary> + WSDataFrame辅助扩展类 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataFrameExtension.AppendBinary(TouchSocket.Http.WebSockets.WSDataFrame,System.Byte[],System.Int32,System.Int32)"> + <summary> + 追加二进制流 + </summary> + <param name="dataFrame"></param> + <param name="buffer"></param> + <param name="offset"></param> + <param name="length"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataFrameExtension.AppendText(TouchSocket.Http.WebSockets.WSDataFrame,System.String,System.Text.Encoding)"> + <summary> + 追加文本 + </summary> + <param name="dataFrame"></param> + <param name="text"></param> + <param name="encoding"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataFrameExtension.BuildRequest(TouchSocket.Http.WebSockets.WSDataFrame,TouchSocket.Core.ByteBlock)"> + <summary> + 构建请求数据(含Make) + </summary> + <param name="dataFrame"></param> + <param name="byteBlock"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataFrameExtension.BuildRequestToBytes(TouchSocket.Http.WebSockets.WSDataFrame)"> + <summary> + 构建请求数据(含Make) + </summary> + <param name="dataFrame"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataFrameExtension.BuildResponse(TouchSocket.Http.WebSockets.WSDataFrame,TouchSocket.Core.ByteBlock)"> + <summary> + 构建响应数据(无Make) + </summary> + <param name="dataFrame"></param> + <param name="byteBlock"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataFrameExtension.BuildResponseToBytes(TouchSocket.Http.WebSockets.WSDataFrame)"> + <summary> + 构建响应数据(无Make) + </summary> + <param name="dataFrame"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketDataFrameExtension.ToText(TouchSocket.Http.WebSockets.WSDataFrame,System.Text.Encoding)"> + <summary> + 当<see cref="F:TouchSocket.Http.WebSockets.WSDataType.Text"/>时,转换为Text消息。 + </summary> + <param name="dataFrame"></param> + <param name="encoding"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocket"> + <summary> + IWebSocket + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.IWebSocket.Version"> + <summary> + WebSocket版本 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.IWebSocket.AllowAsyncRead"> + <summary> + 允许异步Read读取 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.IWebSocket.Client"> + <summary> + 使用的Http客户端 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.Ping"> + <summary> + 发送Ping报文。 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.PingAsync"> + <summary> + 发送Ping报文 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.Pong"> + <summary> + 发送Pong报文。 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.PongAsync"> + <summary> + 发送Pong报文 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.ReadAsync(System.Threading.CancellationToken)"> + <summary> + 异步等待读取数据 + </summary> + <param name="token"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.Send(TouchSocket.Http.WebSockets.WSDataFrame,System.Boolean)"> + <summary> + 采用WebSocket协议,发送WS数据。发送结束后,请及时释放<see cref="T:TouchSocket.Http.WebSockets.WSDataFrame"/> + </summary> + <param name="dataFrame"></param> + <param name="endOfMessage"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.Send(System.String,System.Boolean)"> + <summary> + 发送文本消息 + </summary> + <param name="text"></param> + <param name="endOfMessage"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.Send(System.Byte[],System.Int32,System.Int32,System.Boolean)"> + <summary> + 发送二进制消息 + </summary> + <param name="buffer"></param> + <param name="offset"></param> + <param name="length"></param> + <param name="endOfMessage"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.Send(TouchSocket.Core.ByteBlock,System.Boolean)"> + <summary> + 发送二进制消息 + </summary> + <param name="byteBlock"></param> + <param name="endOfMessage"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.Send(System.Byte[],System.Boolean)"> + <summary> + 发送二进制消息 + </summary> + <param name="buffer"></param> + <param name="endOfMessage"></param> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.SendAsync(TouchSocket.Http.WebSockets.WSDataFrame,System.Boolean)"> + <summary> + 采用WebSocket协议,发送WS数据。发送结束后,请及时释放<see cref="T:TouchSocket.Http.WebSockets.WSDataFrame"/> + </summary> + <param name="dataFrame"></param> + <param name="endOfMessage"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.SendAsync(System.String,System.Boolean)"> + <summary> + 发送文本消息 + </summary> + <param name="text"></param> + <param name="endOfMessage"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.SendAsync(System.Byte[],System.Boolean)"> + <summary> + 发送二进制消息 + </summary> + <param name="buffer"></param> + <param name="endOfMessage"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocket.SendAsync(System.Byte[],System.Int32,System.Int32,System.Boolean)"> + <summary> + 发送二进制消息 + </summary> + <param name="buffer"></param> + <param name="offset"></param> + <param name="length"></param> + <param name="endOfMessage"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocketClient"> + <summary> + 用户终端接口 + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocketClosingPlugin`1"> + <summary> + IWebSocketClosingPlugin + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocketClosingPlugin`1.OnWebSocketClosing(`0,TouchSocket.Core.MsgPermitEventArgs)"> + <summary> + 表示收到断开连接报文。如果对方直接断开连接,此方法则不会触发。 + </summary> + <param name="client"></param> + <param name="e"></param> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocketClosingPlugin"> + <summary> + IWebSocketClosingPlugin + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocketHandshakedPlugin`1"> + <summary> + IWebSocketHandshakedPlugin + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocketHandshakedPlugin`1.OnWebSocketHandshaked(`0,TouchSocket.Http.HttpContextEventArgs)"> + <summary> + 表示完成握手后。 + </summary> + <param name="client"></param> + <param name="e"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocketHandshakedPlugin"> + <summary> + IWebSocketHandshakedPlugin + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocketHandshakingPlugin`1"> + <summary> + IWebSocketHandshakingPlugin + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocketHandshakingPlugin`1.OnWebSocketHandshaking(`0,TouchSocket.Http.HttpContextEventArgs)"> + <summary> + 表示在即将握手连接时。 + </summary> + <param name="client"></param> + <param name="e"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocketHandshakingPlugin"> + <summary> + IWebSocketHandshakingPlugin + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocketReceivedPlugin`1"> + <summary> + IWebSocketReceivedPlugin + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.IWebSocketReceivedPlugin`1.OnWebSocketReceived(`0,TouchSocket.Http.WebSockets.WSDataFrameEventArgs)"> + <summary> + 当收到WS数据时。 + </summary> + <param name="client"></param> + <param name="e"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Http.WebSockets.IWebSocketReceivedPlugin"> + <summary> + IWebSocketReceivedPlugin + </summary> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketCommandLinePlugin"> + <summary> + WS命令行插件。 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketCommandLinePlugin.#ctor(TouchSocket.Core.ILog)"> + <summary> + WSCommandLinePlugin + </summary> + <param name="logger"></param> + <exception cref="T:System.ArgumentNullException"></exception> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketCommandLinePlugin.Loaded(TouchSocket.Core.IPluginManager)"> + <inheritdoc/> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketCommandLinePlugin.Converter"> + <summary> + 字符串转换器,默认支持基础类型和Json。可以自定义。 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketCommandLinePlugin.ReturnException"> + <summary> + 是否返回执行异常。 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketCommandLinePlugin.NoReturnException"> + <summary> + 当有执行异常时,不返回异常。 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketCommandLinePlugin.OnWebSocketReceived(TouchSocket.Http.WebSockets.IWebSocket,TouchSocket.Http.WebSockets.WSDataFrameEventArgs)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketFeature"> + <summary> + 基于Http的WebSocket的扩展。 + <para>此组件只能挂载在<see cref="T:TouchSocket.Http.HttpService"/>中</para> + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WebSocketFeature.AutoCloseProperty"> + <summary> + 自动响应Close报文 + </summary> + </member> + <member name="F:TouchSocket.Http.WebSockets.WebSocketFeature.AutoPongProperty"> + <summary> + 自动响应Ping报文 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketFeature.#ctor"> + <summary> + WebSocketFeature + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketFeature.AutoClose"> + <summary> + 是否默认处理Close报文。 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketFeature.AutoPong"> + <summary> + 当收到ping报文时,是否自动回应pong。 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketFeature.VerifyConnection"> + <summary> + 验证连接 + </summary> + </member> + <member name="P:TouchSocket.Http.WebSockets.WebSocketFeature.WSUrl"> + <summary> + 用于WebSocket连接的路径,默认为“/ws” + <para>如果设置为null或空,则意味着所有的连接都将解释为WS</para> + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketFeature.NoAutoClose"> + <summary> + 不处理Close报文。 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketFeature.SetVerifyConnection(System.Func{TouchSocket.Http.IHttpSocketClient,TouchSocket.Http.HttpContext,System.Boolean})"> + <summary> + 验证连接 + </summary> + <param name="func"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketFeature.SetVerifyConnection(System.Func{TouchSocket.Http.IHttpSocketClient,TouchSocket.Http.HttpContext,System.Threading.Tasks.Task{System.Boolean}})"> + <summary> + 验证连接 + </summary> + <param name="func"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketFeature.SetWSUrl(System.String)"> + <summary> + 用于WebSocket连接的路径,默认为“/ws” + <para>如果设置为null或空,则意味着所有的连接都将解释为WS</para> + </summary> + <param name="url"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketFeature.UseAutoPong"> + <summary> + 当收到ping报文时,自动回应pong。 + </summary> + <returns></returns> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketFeature.Loaded(TouchSocket.Core.IPluginManager)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Http.WebSockets.WebSocketHeartbeatPlugin"> + <summary> + 初始化一个适用于WebSocket的心跳插件 + </summary> + </member> + <member name="M:TouchSocket.Http.WebSockets.WebSocketHeartbeatPlugin.Loaded(TouchSocket.Core.IPluginManager)"> + <inheritdoc/> + </member> + <member name="T:TouchSocket.Sockets.HttpConfigExtensions"> + <summary> + HttpConfigExtensions + </summary> + </member> + <member name="M:TouchSocket.Sockets.HttpConfigExtensions.BuildWithHttpClient``1(TouchSocket.Core.TouchSocketConfig)"> + <summary> + 构建Http类客户端,并连接 + </summary> + <typeparam name="TClient"></typeparam> + <param name="config"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Sockets.HttpConfigExtensions.BuildWithHttpClient(TouchSocket.Core.TouchSocketConfig)"> + <summary> + 构建Http类客户端,并连接 + </summary> + <param name="config"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Sockets.HttpConfigExtensions.BuildWithHttpService``1(TouchSocket.Core.TouchSocketConfig)"> + <summary> + 构建Http类服务器,并启动。 + </summary> + <typeparam name="TService"></typeparam> + <param name="config"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Sockets.HttpConfigExtensions.BuildWithHttpService(TouchSocket.Core.TouchSocketConfig)"> + <summary> + 构建Http类服务器,并启动。 + </summary> + <param name="config"></param> + <returns></returns> + </member> + <member name="F:TouchSocket.Sockets.HttpConfigExtensions.HttpProxyProperty"> + <summary> + Http代理 + </summary> + </member> + <member name="M:TouchSocket.Sockets.HttpConfigExtensions.SetHttpProxy(TouchSocket.Core.TouchSocketConfig,TouchSocket.Http.HttpProxy)"> + <summary> + 设置Http代理 + </summary> + <param name="config"></param> + <param name="value"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Sockets.WebSocketConfigExtension"> + <summary> + WebSocketConfigExtensions + </summary> + </member> + <member name="M:TouchSocket.Sockets.WebSocketConfigExtension.BuildWithWebSocketClient``1(TouchSocket.Core.TouchSocketConfig)"> + <summary> + 构建WebSocketClient类客户端,并连接 + </summary> + <typeparam name="TClient"></typeparam> + <param name="config"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Sockets.WebSocketConfigExtension.BuildWithWebSocketClient(TouchSocket.Core.TouchSocketConfig)"> + <summary> + 构建WebSocketClient类客户端,并连接 + </summary> + <param name="config"></param> + <returns></returns> + </member> + <member name="F:TouchSocket.Sockets.WebSocketConfigExtension.WebSocketOptionProperty"> + <summary> + WebSocket配置属性 + </summary> + </member> + <member name="M:TouchSocket.Sockets.WebSocketConfigExtension.SetWebSocketOption(TouchSocket.Core.TouchSocketConfig,TouchSocket.Http.WebSockets.WebSocketOption)"> + <summary> + 设置WebSocket的相关配置 + </summary> + <param name="config"></param> + <param name="value"></param> + <returns></returns> + </member> + <member name="T:TouchSocket.Core.HttpPluginManagerExtension"> + <summary> + HttpPluginManagerExtension + </summary> + </member> + <member name="M:TouchSocket.Core.HttpPluginManagerExtension.UseDefaultHttpServicePlugin(TouchSocket.Core.IPluginManager)"> + <summary> + 默认的Http服务。为Http做兜底拦截。该插件应该最后添加。 + </summary> + <param name="pluginManager"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Core.HttpPluginManagerExtension.UseHttpStaticPage(TouchSocket.Core.IPluginManager)"> + <summary> + 使用Http静态页面。 + </summary> + <param name="pluginManager"></param> + <returns></returns> + </member> + <member name="M:TouchSocket.Core.HttpPluginManagerExtension.UseCors(TouchSocket.Core.IPluginManager,System.String)"> + <summary> + 使用跨域 + </summary> + <returns></returns> + </member> + <member name="T:TouchSocket.Core.WebSocketPluginManagerExtension"> + <summary> + WebSocketPluginManagerExtension + </summary> + </member> + <member name="M:TouchSocket.Core.WebSocketPluginManagerExtension.UseWebSocket(TouchSocket.Core.IPluginManager)"> + <summary> + 使用WebSocket插件。 + </summary> + <returns>插件类型实例</returns> + </member> + <member name="M:TouchSocket.Core.WebSocketPluginManagerExtension.UseWebSocketHeartbeat(TouchSocket.Core.IPluginManager)"> + <summary> + 使用WebSocket心跳插件,客户端、服务器均有效。但是一般建议客户端使用即可。 + </summary> + <returns>插件类型实例</returns> + </member> + <member name="T:TouchSocket.Resources.TouchSocketHttpResource"> + <summary> + TouchSocketHttp资源枚举 + </summary> + </member> + <member name="F:TouchSocket.Resources.TouchSocketHttpResource.UnknownError"> + <summary> + 未知错误 + </summary> + </member> + <member name="F:TouchSocket.Resources.TouchSocketHttpResource.Success"> + <summary> + 操作成功 + </summary> + </member> + <member name="F:TouchSocket.Resources.TouchSocketHttpResource.Overtime"> + <summary> + 操作超时 + </summary> + </member> + <member name="F:TouchSocket.Resources.TouchSocketHttpResource.Canceled"> + <summary> + 用户主动取消操作。 + </summary> + </member> + <member name="F:TouchSocket.Resources.TouchSocketHttpResource.ArgumentNull"> + <summary> + 参数‘{0}’为空。 + </summary> + </member> + <member name="F:TouchSocket.Resources.TouchSocketHttpResource.Exception"> + <summary> + 发生异常,信息:{0}。 + </summary> + </member> + </members> +</doc> diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.xml.meta b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.xml.meta new file mode 100644 index 00000000..d2e2b878 --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/lib/netstandard2.1/TouchSocket.Http.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1230e633010d74549980716c81b4048e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/logo.png b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/logo.png new file mode 100644 index 00000000..d4199b5c Binary files /dev/null and b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/logo.png differ diff --git a/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/logo.png.meta b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/logo.png.meta new file mode 100644 index 00000000..d775b85c --- /dev/null +++ b/JNFrame2/Assets/Packages/TouchSocket.Http.2.0.16/logo.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 8d64822e514722a45a813d2dd46950ef +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/JNFrame2/Assets/Scripts/AppGame/DApplication.cs b/JNFrame2/Assets/Scripts/AppGame/DApplication.cs index b3cbfcee..0b8e9dc9 100644 --- a/JNFrame2/Assets/Scripts/AppGame/DApplication.cs +++ b/JNFrame2/Assets/Scripts/AppGame/DApplication.cs @@ -24,10 +24,10 @@ public class DApplication : MonoBehaviour //开始运行同步 if (App.IsServer()) { - var tileServer = App.Game.Start<JNGTileServerSystem>(); + var tileServer = App.Game.StartServer<JNGTileServerSystem>(); JNTileServerDebuger.Instance.Add(tileServer); } - if (App.IsClient()) App.Game.Start<JNGTileClientSystem>(); + if (App.IsClient()) App.Game.StartClient<JNGTileClientSystem>(); } @@ -48,10 +48,5 @@ public class DApplication : MonoBehaviour var input = App.Game.GetInput<IDWorld>(); input.IsAdd = true; } - - public void OnClickServerCreate() - { - App.Game.Start<JNGTileServerSystem>(); - } } diff --git a/JNFrame2/Assets/Scripts/AppGame/GAPI.cs b/JNFrame2/Assets/Scripts/AppGame/GAPI.cs index c3f1f767..fba0d832 100644 --- a/JNFrame2/Assets/Scripts/AppGame/GAPI.cs +++ b/JNFrame2/Assets/Scripts/AppGame/GAPI.cs @@ -7,7 +7,7 @@ namespace AppGame public class TileServerInfo { - public String id; + public String server; public String ip; public int port; } diff --git a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileClientSystem.cs b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileClientSystem.cs index a5dff74e..fb481314 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileClientSystem.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileClientSystem.cs @@ -28,6 +28,8 @@ namespace AppGame.Sync public override void Initialize() { + + base.Initialize(); //默认玩家位置 SetPlayerPosition(LVector3.Zero); @@ -174,6 +176,7 @@ namespace AppGame.Sync if (info is not null) { client.SetPoint($"{info.ip}:{info.port}"); + client.SetTileServer(info.server); if (IsTileConnect(index)) { @@ -194,8 +197,27 @@ namespace AppGame.Sync { Debug.Log($"[{index}] 卸载 Socket"); App.Client.RemoveClient(client); + //并且释放数据 + GetSystems<ISTileDataSystem>().ForEach(data => + { + data.ClearTileData(index); + }); } Sockets.Remove(index); } + public void RemoveSocket(string server) + { + Sockets.ToArray().ForEach(tile => + { + if (tile.Value.TileServer != server) return; + tile.Value.OnClose(); + Sockets.Remove(tile.Key); + //并且释放数据 + GetSystems<ISTileDataSystem>().ForEach(data => + { + data.ClearTileData(tile.Key); + }); + }); + } } } \ No newline at end of file diff --git a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs index 83e12ab8..77d0df60 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs @@ -39,6 +39,9 @@ namespace AppGame.Sync //区块Socket public Dictionary<int, JNGTileClient> Sockets = new (); + //是否开始前尝试连接周围区块去恢复历史数据 + public bool isRecover = true; + /// <summary> /// 初始化服务器 /// </summary> @@ -47,6 +50,48 @@ namespace AppGame.Sync { await base.OnInit(); + + if (isRecover) + { + + List<int> tileIds = GetTileGridIndex(TID); + foreach (var tileId in tileIds) + { + var client = await AddSocket(tileId); + if (client is null) continue; + + //连接到附近区块 开始 恢复数据 + Debug.Log($"[JNGTileServerSystem] 连接到附近区块{tileId} 开始 恢复数据"); + var tileInfo = await client.NSyncTileGetTileInfo(TID); + if (tileInfo is not null) + { + Debug.Log("[JNGTileServerSystem] 获取到恢复数据成功 正在恢复数据"); + + var message = new Dictionary<long, byte[]>(); + tileInfo.Data.Data.ForEach(frame => + { + message.Clear(); + foreach (var data in frame.Messages) + { + message.Add(data.Key,data.Value.Data.ToByteArray()); + } + GetSystems<ISStateDataSystem>().ForEach(child => + { + if (child.NetID != frame.NetID) return; + child.OnInsertUBytes(message); + }); + }); + } + else + { + Debug.Log("[JNGTileServerSystem] 获取到恢复数据失败"); + } + + } + + Debug.Log("[JNGTileServerSystem] 恢复数据结束"); + + } //添加Tile服务器 App.Business.Send((int)NActionEnum.NAddTileServer,new JNAddTileServer() @@ -60,7 +105,7 @@ namespace AppGame.Sync Timers.Instance.SetInterval(1f, UpdateTileSocket); } - + public override SLogicSystem[] NewLogicSystems() { return new SLogicSystem[] @@ -193,9 +238,9 @@ namespace AppGame.Sync return Sockets.Keys.Where(key => Sockets[key].IsOpen).ToArray(); } - protected async Task AddSocket(int index) + protected async Task<JNGTileClient> AddSocket(int index) { - if (IsTileConnect(index)) return; + if (IsTileConnect(index)) return null; var client = new JNGTileClient(); Sockets.Add(index,client); @@ -207,16 +252,23 @@ namespace AppGame.Sync { Debug.Log($"[{index}] 连接 Socket"); client.SetPoint($"{info.ip}:{info.port}"); + client.SetTileServer(info.server); await client.OnInit(); + return client; } else { Sockets.Remove(index); } - + + return null; } - protected void RemoveSocket(int index) + /// <summary> + /// 销毁Socket + /// </summary> + /// <param name="index"></param> + public void RemoveSocket(int index) { if (Sockets.TryGetValue(index,out var client)) { @@ -225,6 +277,15 @@ namespace AppGame.Sync } Sockets.Remove(index); } + public void RemoveSocket(string server) + { + Sockets.ToArray().ForEach(tile => + { + if (tile.Value.TileServer != server) return; + tile.Value.OnClose(); + Sockets.Remove(tile.Key); + }); + } } } \ No newline at end of file diff --git a/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGClient.cs b/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGClient.cs index 47043b07..dd63ec2f 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGClient.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGClient.cs @@ -1,6 +1,7 @@ using System.Net; using System.Threading.Tasks; using Cysharp.Threading.Tasks; +using DotRecast.Core.Collections; using JNGame.Network; using Plugins.JNGame.Network; using Plugins.JNGame.Network.Action; @@ -14,6 +15,12 @@ namespace AppGame.Systems private int _clientId; public int ClientId => _clientId; + /// <summary> + /// 区块服务器标识 + /// </summary> + private string _tileServer; + public string TileServer => _tileServer; + public void BindID(int clientId) { _clientId = clientId; @@ -23,6 +30,10 @@ namespace AppGame.Systems { _point = point; } + public void SetTileServer(string tileServer) + { + _tileServer = tileServer; + } protected override async UniTask<string> GetEndPoint() { @@ -36,6 +47,7 @@ namespace AppGame.Systems //监听服务端事件 AddListener((int)NActionEnum.NSyncStateDataUpdate,OnNSyncStateDataUpdate); AddListener((int)NActionEnum.LocalClientConnect,OnClientConnect); + AddListener((int)NActionEnum.NSyncTileAllUpdateBack,OnNSyncTileAllUpdateBack); //连接 await base.OnInit(); @@ -49,6 +61,8 @@ namespace AppGame.Systems { ClientId = ClientId }); + //向服务器索要全量信息 + Send((int)NActionEnum.NSyncTileAllUpdate); } private void OnNSyncStateDataUpdate(byte[] data) @@ -56,5 +70,26 @@ namespace AppGame.Systems var info = JNStateItemData.Parser.ParseFrom(data); App.Game.AddState(info); } + + + /// <summary> + /// 状态同步全量回调 + /// </summary> + /// <param name="obj"></param> + private void OnNSyncTileAllUpdateBack(byte[] data) + { + + var allData = JNStateTileAllData.Parser.ParseFrom(data); + + App.Game.ClearTileState(allData.TId); + + //生效全局回调 + allData.Data.Data.ForEach(child => + { + App.Game.AddState(child); + }); + + } + } } \ No newline at end of file diff --git a/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGServer.cs b/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGServer.cs index f799dacf..f3601ab3 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGServer.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGServer.cs @@ -2,9 +2,13 @@ using System.Collections.Generic; using System.Net.Sockets; using System.Threading.Tasks; +using AppGame.Sync; using Cysharp.Threading.Tasks; using DotRecast.Core.Collections; +using Google.Protobuf; using JNGame.Network; +using JNGame.Sync.System; +using JNGame.Sync.System.Data; using Plugins.JNGame.Network; using Plugins.JNGame.Network.Action; @@ -27,6 +31,8 @@ namespace AppGame.Systems //监听服务端事件 AddListener((int)NActionEnum.NSyncFrameInput,OnNSyncFrameInput); AddListener((int)NActionEnum.NSyncTileInput,OnNSyncTileInput); + AddListener((int)NActionEnum.NSyncTileAllUpdate,OnNSyncTileAllUpdate); + AddListener((int)NActionEnum.NSyncTileGetTileInfo,OnNSyncTileGetTileInfo); AddListener((int)GActionEnum.BindClientID,OnBindClientID); //连接 @@ -87,6 +93,72 @@ namespace AppGame.Systems }); App.Game.AddTileInput(inputs); } + + /// <summary> + /// 返回全量信息 + /// </summary> + private void OnNSyncTileAllUpdate(JNServerParam args) + { + + if (App.Game.Server is not JNGTileServerSystem tileServer) return; + + var allData = new JNStateTileAllData(); + + allData.TId = tileServer.TID; + allData.Data = new JNStateAllData(); + + tileServer.GetSystems<ISTileDataSystem>().ForEach(data => + { + + var item = new JNStateItemData(); + allData.Data.Data.Add(item); + + item.NetID = ((ISStateDataSystem)data).NetID; + data.GetHostDataBytes().ForEach(keyValue => + { + item.Messages[keyValue.Key] = new JNStateData() { Data = ByteString.CopyFrom(keyValue.Value) }; + }); + + }); + + Send(args.Client, (int)NActionEnum.NSyncTileAllUpdateBack,allData); + + } + + /// <summary> + /// 获取指定区块的全量信息 + /// </summary> + private void OnNSyncTileGetTileInfo(JNServerParam args) + { + + if (App.Game.Server is not JNGTileServerSystem tileServer) return; + + var tileSpecify = NSyncTileGetTileInfoRequest.Parser.ParseFrom(args.Message); + + var allData = new JNStateTileAllData(); + + allData.TId = tileServer.TID; + allData.Data = new JNStateAllData(); + + tileServer.GetSystems<ISTileDataSystem>().ForEach(data => + { + + var item = new JNStateItemData(); + allData.Data.Data.Add(item); + + item.NetID = ((ISStateDataSystem)data).NetID; + data.GetTileDataBytes(tileSpecify.TId).ForEach(keyValue => + { + item.Messages[keyValue.Key] = new JNStateData() { Data = ByteString.CopyFrom(keyValue.Value) }; + }); + + }); + + //返回消息 + SendCallback(args.Client,args.MessageID,allData); + + } + } } \ No newline at end of file diff --git a/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGTileClient.cs b/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGTileClient.cs index 810f82c9..9d57e5a5 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGTileClient.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGTileClient.cs @@ -1,6 +1,7 @@ using System.Net; using System.Threading.Tasks; using Cysharp.Threading.Tasks; +using DotRecast.Core.Collections; using JNGame.Network; using Plugins.JNGame.Network; using Plugins.JNGame.Network.Action; @@ -12,10 +13,20 @@ namespace AppGame.Systems private string _point; + /// <summary> + /// 区块服务器标识 + /// </summary> + private string _tileServer; + public string TileServer => _tileServer; + public void SetPoint(string point) { _point = point; } + public void SetTileServer(string tileServer) + { + _tileServer = tileServer; + } protected override async UniTask<string> GetEndPoint() { @@ -28,11 +39,19 @@ namespace AppGame.Systems //监听服务端事件 AddListener((int)NActionEnum.NSyncStateDataUpdate,OnNSyncStateDataUpdate); + AddListener((int)NActionEnum.LocalClientConnect,OnClientConnect); + AddListener((int)NActionEnum.NSyncTileAllUpdateBack,OnNSyncTileAllUpdateBack); //连接 await base.OnInit(); } + + private void OnClientConnect(byte[] obj) + { + //向服务器索要全量信息 + Send((int)NActionEnum.NSyncTileAllUpdate); + } private void OnNSyncStateDataUpdate(byte[] data) { @@ -40,5 +59,41 @@ namespace AppGame.Systems App.Game.AddState(info); } + /// <summary> + /// 状态同步全量回调 + /// </summary> + /// <param name="obj"></param> + private void OnNSyncTileAllUpdateBack(byte[] data) + { + + var allData = JNStateTileAllData.Parser.ParseFrom(data); + + App.Game.ClearTileState(allData.TId); + + //生效全局状态 + allData.Data.Data.ForEach(child => + { + App.Game.AddState(child); + }); + + } + + /// <summary> + /// 区块全量更新指定区块 + /// </summary> + public async Task<JNStateTileAllData> NSyncTileGetTileInfo(int index) + { + var data = new NSyncTileGetTileInfoRequest() + { + TId = index + }; + var result = await SendCallback((int)NActionEnum.NSyncTileGetTileInfo, data); + + if (result is null) return null; + + return JNStateTileAllData.Parser.ParseFrom(result); + + } + } } \ No newline at end of file diff --git a/JNFrame2/Assets/Scripts/AppGame/Systems/JNGGame.cs b/JNFrame2/Assets/Scripts/AppGame/Systems/JNGGame.cs index c6b592e1..b05f0402 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Systems/JNGGame.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Systems/JNGGame.cs @@ -12,15 +12,14 @@ namespace AppGame.Systems public class JNGGame : SystemBase { - /// <summary> - /// 同步组 - /// </summary> - private List<JNSyncDefaultService> syncs = new(); - private JNSyncDefaultService client; - private List<JNSStateServerService> servers = new(); + public JNSyncDefaultService Client => client; + + private JNSStateServerService server; + public JNSStateServerService Server => server; - public bool IsStartGame => syncs.Count > 0 && syncs[0].IsStartGame; + public bool IsStartClient => client is not null && client.IsStartGame; + public bool IsStartServer => server is not null && server.IsStartGame; public override async Task OnInit() { @@ -28,23 +27,19 @@ namespace AppGame.Systems } /// <summary> - /// 运行一个同步类 + /// 运行同步类 /// </summary> - public T Start<T>() where T : JNSyncDefaultService,new() + public T StartClient<T>() where T : JNSyncDefaultService,new() { - syncs.Add(new T()); - syncs[^1].Initialize(); - - if (syncs[^1] is JNSStateServerService server) - { - servers.Add(server); - } - else - { - client = syncs[^1]; - } - - return syncs[^1] as T; + client = new T(); + client.Initialize(); + return client as T; + } + public T StartServer<T>() where T : JNSStateServerService,new() + { + server = new T(); + server.Initialize(); + return server as T; } /// <summary> @@ -52,10 +47,8 @@ namespace AppGame.Systems /// </summary> public void Update() { - foreach (var sync in syncs) - { - sync.Execute(); - } + client?.Execute(); + server?.Execute(); } /// <summary> @@ -81,39 +74,45 @@ namespace AppGame.Systems return (T)client; } - /// <summary> /// 接收输入数据 /// </summary> /// <param name="frame"></param> public void AddInput(JNFrameInfo frame) { - foreach (var sync in syncs) - { - (sync as JNGFrameSystem)?.AddFrame(frame); - (sync as JNGStateServerSystem)?.AddInput(frame); - } + (client as JNGFrameSystem)?.AddFrame(frame); + (server as JNGStateServerSystem)?.AddInput(frame); } public void AddTileInput(JNStateTileInputs frame) { - foreach (var sync in syncs) + if (server is JNGTileServerSystem system) { - if (sync is JNGTileServerSystem system) + if (system.TID == frame.TId || frame.TId == 0) { - if (system.TID == frame.TId || frame.TId == 0) - { - system.AddInput(frame); - } + system.AddInput(frame); } } } - + + /// <summary> + /// 清除指定区域的状态 + /// </summary> + public void ClearTileState(int index) + { + client?.GetSystems<ISTileDataSystem>().ForEach(child => + { + child.ClearTileData(index); + }); + server?.GetSystems<ISTileDataSystem>().ForEach(child => + { + child.ClearTileData(index); + }); + } /// <summary> /// 接收状态数据 /// </summary> - /// <param name="frame"></param> public void AddState(JNStateItemData frame) { var message = new Dictionary<long, byte[]>(); @@ -121,14 +120,17 @@ namespace AppGame.Systems { message.Add(data.Key,data.Value.Data.ToByteArray()); } - foreach (var sync in syncs) + + client?.GetSystems<ISStateDataSystem>().ForEach(child => { - sync.GetSystems<ISStateDataSystem>().ForEach(child => - { - if (child.NetID != frame.NetID) return; - child.OnInsertUBytes(message); - }); - } + if (child.NetID != frame.NetID) return; + child.OnInsertUBytes(message); + }); + server?.GetSystems<ISStateDataSystem>().ForEach(child => + { + if (child.NetID != frame.NetID) return; + child.OnInsertUBytes(message); + }); } } diff --git a/JNFrame2/Assets/Scripts/AppGame/Systems/JNGSocket.cs b/JNFrame2/Assets/Scripts/AppGame/Systems/JNGSocket.cs index ff868b88..376837cc 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Systems/JNGSocket.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Systems/JNGSocket.cs @@ -1,12 +1,39 @@ +using System.Threading.Tasks; +using AppGame; +using AppGame.Sync; using Cysharp.Threading.Tasks; using Plugins.JNGame.Network; +using Plugins.JNGame.Network.Action; public class JNGSocket : JNSocket { + public override async Task OnInit() + { + + AddListener((int)NActionEnum.ServerClientDisconnect,OnServerClientDisconnect); + + await base.OnInit(); + } + protected override async UniTask<string> GetUrl() { await UniTask.NextFrame(); return "ws://127.0.0.1:8080/websocket"; } + + /// <summary> + /// 有客户端断开服务器连接 + /// </summary> + /// <param name="obj"></param> + private void OnServerClientDisconnect(byte[] data) + { + + var disconnect = JNClientDisconnect.Parser.ParseFrom(data); + + //断开Tile服务器连接 + (App.Game.Client as JNGTileClientSystem)?.RemoveSocket(disconnect.ClientId); + (App.Game.Server as JNGTileServerSystem)?.RemoveSocket(disconnect.ClientId); + + } } \ No newline at end of file diff --git a/JNFrame2/Assets/Scripts/Game/Data/DStateDataSystem.cs b/JNFrame2/Assets/Scripts/Game/Data/DStateDataSystem.cs deleted file mode 100644 index 3c79527b..00000000 --- a/JNFrame2/Assets/Scripts/Game/Data/DStateDataSystem.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections.Generic; -using AppGame; -using Google.Protobuf; -using JNGame.Sync.Entity; -using JNGame.Sync.State.Tile.Entity; -using JNGame.Sync.System.Data; -using Plugins.JNGame.Network.Action; - -namespace Game.JNGState.Logic.Data -{ - public abstract class DStateDataSystem<T,E> : STileDataSystem<T,E> where T : ISTileData,new() where E : JNTileEntity, new() - { - protected DStateDataSystem(SStateDataEnum type) : base(type) - { - } - - public override void OnSendUBytes(Dictionary<long, byte[]> bytes) - { - - JNStateItemData data = new JNStateItemData(); - data.NetID = NetID; - - foreach (var byteItem in bytes) - { - data.Messages.Add(byteItem.Key,new JNStateData() - { - Data = ByteString.CopyFrom(byteItem.Value) - }); - } - - App.Server.AllSend((int)NActionEnum.NSyncStateDataUpdate,data); - - } - - } -} \ No newline at end of file diff --git a/JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs b/JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs index a2fdc2b0..662ab243 100644 --- a/JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs +++ b/JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Text; +using AppGame; using DotRecast.Core.Collections; using Entitas; using Game.JNGFrame.Logic.Entity; @@ -14,73 +15,26 @@ using UnityEngine; namespace Game.JNGState.Logic.Data { - + [Serializable] - public class EDNodeValue + public class EDNodeValue : GDataValue { - public DValuePosition Position = null; + } - public class EDNodeData : ISTileData + public class EDNodeData : GDataBase<EDNodeData,EDNodeValue,EDNode> { - - public readonly EDNodeValue Value = new (); - - private readonly EDNode _data; - public override bool IsHost => _data is not null && _data.IsHost; - + public EDNodeData() { } - public EDNodeData(EDNode node){ - Id = node.Id; - Value.Position = new DValuePosition() - { - x = node.Position.x.rawValue, - y = node.Position.y.rawValue, - z = node.Position.z.rawValue, - }; - _data = node; - } - - public override bool IsEquals(ISData data) + public EDNodeData(EDNode node) : base(node) { - var node = data as EDNodeData; - if (node is null) return false; - return Value.Position.Equals(node.Value.Position); - } - - public override byte[] GetByte() - { - return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(Value)); - } - - public override byte[] GetByteDifference(ISData diffValue = null) - { - var diff = diffValue as EDNodeData; - if (diff is null || IsEquals(diffValue)) return Array.Empty<byte>(); - - var value = new EDNodeValue(); - - if (diff.Value.Position is not null) value.Position = diff.Value.Position; - - return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(value)); - } - - /// <summary> - /// 生效字节 - /// </summary> - /// <param name="bytes"></param> - /// <exception cref="NotImplementedException"></exception> - public override void UByte(byte[] bytes) - { - if (bytes.Length == 0) return; - var value = JsonConvert.DeserializeObject<EDNodeValue>(Encoding.UTF8.GetString(bytes)); - if (value.Position is not null) Value.Position = value.Position; } + } - public class EDNodeDataSystem : DStateDataSystem<EDNodeData,EDNode> + public class EDNodeDataSystem : GDataBaseSystem<EDNodeData,EDNode> { public EDNodeDataSystem(SStateDataEnum type) : base(type) diff --git a/JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs b/JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs index 51024d59..a689b13c 100644 --- a/JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs +++ b/JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs @@ -16,77 +16,49 @@ namespace Game.JNGState.Logic.Data { [Serializable] - public class EDPlayerValue + public class EDPlayerValue : GDataValue { public int? Auth = null; - public DValuePosition Position = null; } - public class EDPlayerData : ISTileData + public class EDPlayerData : GDataBase<EDPlayerData,EDPlayerValue,EDPlayer> { - - public readonly EDPlayerValue Value = new (); - private readonly EDPlayer _data; - public override bool IsHost => _data is not null && _data.IsHost; - public EDPlayerData() { } - public EDPlayerData(EDPlayer node){ - Id = node.Id; + public EDPlayerData(EDPlayer node) : base(node) + { Value.Auth = node.Controller.Auth; - Value.Position = new DValuePosition() - { - x = node.Position.x.rawValue, - y = node.Position.y.rawValue, - z = node.Position.z.rawValue, - }; - _data = node; } public override bool IsEquals(ISData data) { var node = data as EDPlayerData; if (node is null) return false; - return Value.Position.Equals(node.Value.Position) - && Value.Auth.Equals(node.Value.Auth); + return base.IsEquals(data) && Value.Auth.Equals(node.Value.Auth); } - public override byte[] GetByte() - { - return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(Value)); - } - - public override byte[] GetByteDifference(ISData diffValue = null) + public override EDPlayerValue GetDifference(ISData diffValue = null) { var diff = diffValue as EDPlayerData; - if (diff is null || IsEquals(diffValue)) return Array.Empty<byte>(); + var value = base.GetDifference(diffValue); + if (value is null || diff is null) return null; - var value = new EDPlayerValue(); - - if (diff.Value.Position is not null) value.Position = diff.Value.Position; if (diff.Value.Auth is not null) value.Auth = diff.Value.Auth; - return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(value)); + return value; } - /// <summary> - /// 生效字节 - /// </summary> - /// <param name="bytes"></param> - /// <exception cref="NotImplementedException"></exception> - public override void UByte(byte[] bytes) + public override void UData(EDPlayerValue data) { - - if (bytes.Length == 0) return; - var value = JsonConvert.DeserializeObject<EDPlayerValue>(Encoding.UTF8.GetString(bytes)); - if (value.Position is not null) Value.Position = value.Position; - if (value.Auth is not null) Value.Auth = value.Auth; - + base.UData(data); + if (data.Auth is not null) Value.Auth = data.Auth; } } - public class EDPlayerDataSystem : DStateDataSystem<EDPlayerData,EDPlayer> + + + public class EDPlayerDataSystem : GDataBaseSystem<EDPlayerData,EDPlayer> { public EDPlayerDataSystem(SStateDataEnum type) : base(type) diff --git a/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs b/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs new file mode 100644 index 00000000..79254001 --- /dev/null +++ b/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs @@ -0,0 +1,132 @@ +using System; +using System.Collections.Generic; +using System.Text; +using AppGame; +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; + +namespace Game.JNGState.Logic.Data +{ + + [Serializable] + public class GDataValue + { + public DValuePosition Position = null; + } + + public class GDataBase<Self,T,N> : ISTileData where Self : GDataBase<Self,T,N> where T : GDataValue,new() where N : JNTileEntity + { + + public readonly T Value = new (); + + public N Node => Entity as N; + + public override bool IsHost => Node is not null && Node.IsHost; + + public GDataBase() + { + } + + public GDataBase(N node) + { + Id = node.Id; + Value.Position = new DValuePosition() + { + x = node.Position.x.rawValue, + y = node.Position.y.rawValue, + z = node.Position.z.rawValue, + }; + BindEntity(node); + } + + public override bool IsEquals(ISData data) + { + var node = data as Self; + if (node is null) return false; + return Value.Position.Equals(node.Value.Position); + } + + public sealed override byte[] GetByte() + { + return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(Value)); + } + + public sealed override byte[] GetByteDifference(ISData diffValue = null) + { + var diff = GetDifference(diffValue); + if (diff is not null) + { + return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(diff)); + } + else + { + return Array.Empty<byte>(); + } + } + + public virtual T GetDifference(ISData diffValue = null) + { + var diff = diffValue as Self; + if (diff is null || IsEquals(diffValue)) return null; + + var value = new T(); + + if (diff.Value.Position is not null) value.Position = diff.Value.Position; + + return value; + } + + public sealed override void UByte(byte[] bytes) + { + if (bytes.Length == 0) return; + var value = JsonConvert.DeserializeObject<T>(Encoding.UTF8.GetString(bytes)); + UData(value); + } + + /// <summary> + /// 更新数据 + /// </summary> + public virtual void UData(T data) + { + if (data.Position is not null) Value.Position = data.Position; + } + + public override LVector3 GetDataPosition() + { + return Value.Position.ToLVector3(); + } + + } + + public abstract class GDataBaseSystem<T,E> : STileDataSystem<T,E> where T : ISTileData,new() where E : JNTileEntity, new() + { + protected GDataBaseSystem(SStateDataEnum type) : base(type) + { + } + + public override void OnSendUBytes(Dictionary<long, byte[]> bytes) + { + + JNStateItemData data = new JNStateItemData(); + data.NetID = NetID; + + foreach (var byteItem in bytes) + { + data.Messages.Add(byteItem.Key,new JNStateData() + { + Data = ByteString.CopyFrom(byteItem.Value) + }); + } + + App.Server.AllSend((int)NActionEnum.NSyncStateDataUpdate,data); + + } + + } +} \ No newline at end of file diff --git a/JNFrame2/Assets/Scripts/Game/Data/DStateDataSystem.cs.meta b/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs.meta similarity index 100% rename from JNFrame2/Assets/Scripts/Game/Data/DStateDataSystem.cs.meta rename to JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs.meta diff --git a/JNFrame2/Assets/Scripts/UI/DMainUI.cs b/JNFrame2/Assets/Scripts/UI/DMainUI.cs index 8c7e0cc3..b017ba1e 100644 --- a/JNFrame2/Assets/Scripts/UI/DMainUI.cs +++ b/JNFrame2/Assets/Scripts/UI/DMainUI.cs @@ -44,7 +44,7 @@ namespace UI X = movement.x.ToLFloat(), Y = movement.z.ToLFloat(), }; - if (App.Game.IsStartGame) + if (App.Game.IsStartClient) { App.Game.GetInput<IDPlayer>().MoveVector = vector; } diff --git a/JNFrame2/Assets/packages.config b/JNFrame2/Assets/packages.config index 2df773b5..931db816 100644 --- a/JNFrame2/Assets/packages.config +++ b/JNFrame2/Assets/packages.config @@ -6,6 +6,7 @@ <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" /> <package id="System.Text.Encodings.Web" version="6.0.0" /> <package id="System.Text.Json" version="6.0.0" /> - <package id="TouchSocket" version="2.0.15" manuallyInstalled="true" /> - <package id="TouchSocket.Core" version="2.0.15" /> + <package id="TouchSocket" version="2.0.16" manuallyInstalled="true" /> + <package id="TouchSocket.Core" version="2.0.16" /> + <package id="TouchSocket.Http" version="2.0.16" manuallyInstalled="true" /> </packages> \ No newline at end of file diff --git a/JNFrame2/BestHTTP.csproj b/JNFrame2/BestHTTP.csproj index fbdbfcd8..cc8e20bf 100644 --- a/JNFrame2/BestHTTP.csproj +++ b/JNFrame2/BestHTTP.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -2344,9 +2344,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -2389,6 +2386,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -2425,6 +2425,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -2437,8 +2440,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/Logs/AssetImportWorker0.log b/JNFrame2/Logs/AssetImportWorker0.log deleted file mode 100644 index cf66464d..00000000 --- a/JNFrame2/Logs/AssetImportWorker0.log +++ /dev/null @@ -1,1949 +0,0 @@ -Using pre-set license -Built from '2021.3/staging' branch; Version is '2021.3.35f1 (157b46ce122a) revision 1407814'; Using compiler version '192829333'; Build Type 'Release' -OS: 'Windows 11 (10.0.22631) 64bit Professional' Language: 'zh' Physical Memory: 32651 MB -BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 1 - -COMMAND LINE ARGUMENTS: -D:\Unity\2021.3.35f1\Editor\Unity.exe --adb2 --batchMode --noUpm --name -AssetImportWorker0 --projectPath -D:/myproject/JisolGame/JNFrame2 --logFile -Logs/AssetImportWorker0.log --srvPort -52371 -Successfully changed project path to: D:/myproject/JisolGame/JNFrame2 -D:/myproject/JisolGame/JNFrame2 -[UnityMemory] Configuration Parameters - Can be set up in boot.config - "memorysetup-bucket-allocator-granularity=16" - "memorysetup-bucket-allocator-bucket-count=8" - "memorysetup-bucket-allocator-block-size=33554432" - "memorysetup-bucket-allocator-block-count=8" - "memorysetup-main-allocator-block-size=16777216" - "memorysetup-thread-allocator-block-size=16777216" - "memorysetup-gfx-main-allocator-block-size=16777216" - "memorysetup-gfx-thread-allocator-block-size=16777216" - "memorysetup-cache-allocator-block-size=4194304" - "memorysetup-typetree-allocator-block-size=2097152" - "memorysetup-profiler-bucket-allocator-granularity=16" - "memorysetup-profiler-bucket-allocator-bucket-count=8" - "memorysetup-profiler-bucket-allocator-block-size=33554432" - "memorysetup-profiler-bucket-allocator-block-count=8" - "memorysetup-profiler-allocator-block-size=16777216" - "memorysetup-profiler-editor-allocator-block-size=1048576" - "memorysetup-temp-allocator-size-main=16777216" - "memorysetup-job-temp-allocator-block-size=2097152" - "memorysetup-job-temp-allocator-block-size-background=1048576" - "memorysetup-job-temp-allocator-reduction-small-platforms=262144" - "memorysetup-temp-allocator-size-background-worker=32768" - "memorysetup-temp-allocator-size-job-worker=262144" - "memorysetup-temp-allocator-size-preload-manager=33554432" - "memorysetup-temp-allocator-size-nav-mesh-worker=65536" - "memorysetup-temp-allocator-size-audio-worker=65536" - "memorysetup-temp-allocator-size-cloud-worker=32768" - "memorysetup-temp-allocator-size-gi-baking-worker=262144" - "memorysetup-temp-allocator-size-gfx=262144" -Player connection [20844] Host "[IP] 192.168.15.124 [Port] 0 [Flags] 2 [Guid] 1776684126 [EditorId] 1776684126 [Version] 1048832 [Id] WindowsEditor(7,PC-20230316NUNE) [Debug] 1 [PackageName] WindowsEditor [ProjectName] Editor" joined multi-casting on [225.0.0.222:54997]... - -Player connection [20844] Host "[IP] 192.168.15.124 [Port] 0 [Flags] 2 [Guid] 1776684126 [EditorId] 1776684126 [Version] 1048832 [Id] WindowsEditor(7,PC-20230316NUNE) [Debug] 1 [PackageName] WindowsEditor [ProjectName] Editor" joined alternative multi-casting on [225.0.0.222:34997]... - -[Physics::Module] Initialized MultithreadedJobDispatcher with {0} workers. -Refreshing native plugins compatible for Editor in 123.67 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Initialize engine version: 2021.3.35f1 (157b46ce122a) -[Subsystems] Discovering subsystems at path D:/Unity/2021.3.35f1/Editor/Data/Resources/UnitySubsystems -[Subsystems] Discovering subsystems at path D:/myproject/JisolGame/JNFrame2/Assets -GfxDevice: creating device client; threaded=0; jobified=0 -Direct3D: - Version: Direct3D 11.0 [level 11.1] - Renderer: NVIDIA GeForce GTX 1660 SUPER (ID=0x21c4) - Vendor: NVIDIA - VRAM: 5980 MB - Driver: 31.0.15.3623 -Initialize mono -Mono path[0] = 'D:/Unity/2021.3.35f1/Editor/Data/Managed' -Mono path[1] = 'D:/Unity/2021.3.35f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit-win32' -Mono config path = 'D:/Unity/2021.3.35f1/Editor/Data/MonoBleedingEdge/etc' -Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56712 -Begin MonoManager ReloadAssembly -Registering precompiled unity dll's ... -Register platform support module: D:/Unity/2021.3.35f1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll -Register platform support module: D:/Unity/2021.3.35f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll -Registered in 0.005771 seconds. -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Android Extension - Scanning For ADB Devices 398 ms -Refreshing native plugins compatible for Editor in 115.45 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Mono: successfully reloaded assembly -- Completed reload, in 1.210 seconds -Domain Reload Profiling: - ReloadAssembly (1210ms) - BeginReloadAssembly (120ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (0ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (1ms) - EndReloadAssembly (985ms) - LoadAssemblies (116ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (118ms) - ReleaseScriptCaches (0ms) - RebuildScriptCaches (29ms) - SetupLoadedEditorAssemblies (788ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (533ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (116ms) - BeforeProcessingInitializeOnLoad (1ms) - ProcessInitializeOnLoadAttributes (89ms) - ProcessInitializeOnLoadMethodAttributes (49ms) - AfterProcessingInitializeOnLoad (0ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (0ms) -Platform modules already initialized, skipping -Registering precompiled user dll's ... -Registered in 0.033015 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.25 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Package Manager log level set to [2] -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.928 seconds -Domain Reload Profiling: - ReloadAssembly (2930ms) - BeginReloadAssembly (448ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (68ms) - BackupInstance (0ms) - ReleaseScriptingObjects (1ms) - CreateAndSetChildDomain (65ms) - EndReloadAssembly (2255ms) - LoadAssemblies (299ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (709ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (130ms) - SetupLoadedEditorAssemblies (1167ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (32ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (144ms) - ProcessInitializeOnLoadAttributes (940ms) - ProcessInitializeOnLoadMethodAttributes (40ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -======================================================================== -Worker process is ready to serve import requests -Launched and connected shader compiler UnityShaderCompiler.exe after 0.12 seconds -Refreshing native plugins compatible for Editor in 1.33 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6324 Unused Serialized files (Serialized files now loaded: 0) -Unloading 99 unused Assets / (121.0 KB). Loaded Objects now: 6749. -Memory consumption went from 223.8 MB to 223.7 MB. -Total: 4.732800 ms (FindLiveObjects: 0.522300 ms CreateObjectMapping: 0.471400 ms MarkObjects: 3.564900 ms DeleteObjects: 0.172700 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.032523 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.33 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.147 seconds -Domain Reload Profiling: - ReloadAssembly (2148ms) - BeginReloadAssembly (302ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (9ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (98ms) - EndReloadAssembly (1673ms) - LoadAssemblies (223ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (470ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (67ms) - SetupLoadedEditorAssemblies (906ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (34ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (93ms) - ProcessInitializeOnLoadAttributes (728ms) - ProcessInitializeOnLoadMethodAttributes (34ms) - AfterProcessingInitializeOnLoad (15ms) - EditorAssembliesLoaded (1ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.07 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6764. -Memory consumption went from 223.3 MB to 223.2 MB. -Total: 3.298500 ms (FindLiveObjects: 0.502300 ms CreateObjectMapping: 0.343000 ms MarkObjects: 2.371100 ms DeleteObjects: 0.081000 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.035287 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.40 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.044 seconds -Domain Reload Profiling: - ReloadAssembly (2044ms) - BeginReloadAssembly (219ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (9ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (67ms) - EndReloadAssembly (1687ms) - LoadAssemblies (177ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (445ms) - ReleaseScriptCaches (3ms) - RebuildScriptCaches (62ms) - SetupLoadedEditorAssemblies (954ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (27ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (91ms) - ProcessInitializeOnLoadAttributes (779ms) - ProcessInitializeOnLoadMethodAttributes (42ms) - AfterProcessingInitializeOnLoad (12ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (14ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 2.00 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6779. -Memory consumption went from 223.3 MB to 223.2 MB. -Total: 3.250200 ms (FindLiveObjects: 0.751600 ms CreateObjectMapping: 0.270100 ms MarkObjects: 2.160800 ms DeleteObjects: 0.066300 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.042532 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.11 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.866 seconds -Domain Reload Profiling: - ReloadAssembly (1867ms) - BeginReloadAssembly (257ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (79ms) - EndReloadAssembly (1446ms) - LoadAssemblies (201ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (375ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (53ms) - SetupLoadedEditorAssemblies (827ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (27ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (77ms) - ProcessInitializeOnLoadAttributes (679ms) - ProcessInitializeOnLoadMethodAttributes (31ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.19 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6794. -Memory consumption went from 223.4 MB to 223.3 MB. -Total: 3.742700 ms (FindLiveObjects: 0.500200 ms CreateObjectMapping: 0.309100 ms MarkObjects: 2.877300 ms DeleteObjects: 0.053600 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.034162 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.82 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.752 seconds -Domain Reload Profiling: - ReloadAssembly (1753ms) - BeginReloadAssembly (216ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (73ms) - EndReloadAssembly (1409ms) - LoadAssemblies (160ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (360ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (50ms) - SetupLoadedEditorAssemblies (822ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (34ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (77ms) - ProcessInitializeOnLoadAttributes (668ms) - ProcessInitializeOnLoadMethodAttributes (29ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.44 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6809. -Memory consumption went from 223.4 MB to 223.3 MB. -Total: 2.802500 ms (FindLiveObjects: 0.478000 ms CreateObjectMapping: 0.243300 ms MarkObjects: 2.025500 ms DeleteObjects: 0.054100 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.033597 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.01 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.195 seconds -Domain Reload Profiling: - ReloadAssembly (2196ms) - BeginReloadAssembly (314ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (108ms) - EndReloadAssembly (1725ms) - LoadAssemblies (240ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (453ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (58ms) - SetupLoadedEditorAssemblies (958ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (25ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (120ms) - ProcessInitializeOnLoadAttributes (761ms) - ProcessInitializeOnLoadMethodAttributes (37ms) - AfterProcessingInitializeOnLoad (13ms) - EditorAssembliesLoaded (1ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (18ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.83 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6824. -Memory consumption went from 223.4 MB to 223.3 MB. -Total: 4.364100 ms (FindLiveObjects: 0.849200 ms CreateObjectMapping: 0.713200 ms MarkObjects: 2.735600 ms DeleteObjects: 0.063100 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.039346 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.05 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.751 seconds -Domain Reload Profiling: - ReloadAssembly (1752ms) - BeginReloadAssembly (208ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (61ms) - EndReloadAssembly (1414ms) - LoadAssemblies (155ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (411ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (55ms) - SetupLoadedEditorAssemblies (780ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (22ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (67ms) - ProcessInitializeOnLoadAttributes (651ms) - ProcessInitializeOnLoadMethodAttributes (28ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (9ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.28 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6839. -Memory consumption went from 223.4 MB to 223.3 MB. -Total: 5.046400 ms (FindLiveObjects: 0.543400 ms CreateObjectMapping: 0.492100 ms MarkObjects: 3.881500 ms DeleteObjects: 0.126700 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 16.33 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.6 KB). Loaded Objects now: 6839. -Memory consumption went from 98.9 MB to 98.8 MB. -Total: 3.422700 ms (FindLiveObjects: 0.635100 ms CreateObjectMapping: 0.269400 ms MarkObjects: 2.432100 ms DeleteObjects: 0.084600 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.033012 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.47 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.005 seconds -Domain Reload Profiling: - ReloadAssembly (2006ms) - BeginReloadAssembly (248ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (12ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (67ms) - EndReloadAssembly (1621ms) - LoadAssemblies (208ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (420ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (70ms) - SetupLoadedEditorAssemblies (901ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (30ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (90ms) - ProcessInitializeOnLoadAttributes (731ms) - ProcessInitializeOnLoadMethodAttributes (37ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (1ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (14ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.58 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 6854. -Memory consumption went from 223.4 MB to 223.3 MB. -Total: 3.485000 ms (FindLiveObjects: 0.546900 ms CreateObjectMapping: 0.297200 ms MarkObjects: 2.553200 ms DeleteObjects: 0.086100 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.033016 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.37 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.780 seconds -Domain Reload Profiling: - ReloadAssembly (1780ms) - BeginReloadAssembly (263ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (93ms) - EndReloadAssembly (1385ms) - LoadAssemblies (175ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (378ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (51ms) - SetupLoadedEditorAssemblies (776ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (21ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (79ms) - ProcessInitializeOnLoadAttributes (637ms) - ProcessInitializeOnLoadMethodAttributes (28ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (10ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.23 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 6869. -Memory consumption went from 223.4 MB to 223.4 MB. -Total: 3.157500 ms (FindLiveObjects: 0.640600 ms CreateObjectMapping: 0.325700 ms MarkObjects: 2.090300 ms DeleteObjects: 0.098500 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 13.90 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.7 KB). Loaded Objects now: 6869. -Memory consumption went from 98.9 MB to 98.8 MB. -Total: 3.234400 ms (FindLiveObjects: 0.569500 ms CreateObjectMapping: 0.356600 ms MarkObjects: 2.234300 ms DeleteObjects: 0.072900 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.039156 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.48 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.027 seconds -Domain Reload Profiling: - ReloadAssembly (2028ms) - BeginReloadAssembly (220ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (71ms) - EndReloadAssembly (1660ms) - LoadAssemblies (168ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (462ms) - ReleaseScriptCaches (3ms) - RebuildScriptCaches (85ms) - SetupLoadedEditorAssemblies (898ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (28ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (91ms) - ProcessInitializeOnLoadAttributes (734ms) - ProcessInitializeOnLoadMethodAttributes (32ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.24 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6884. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 3.300800 ms (FindLiveObjects: 0.524200 ms CreateObjectMapping: 0.431500 ms MarkObjects: 2.278000 ms DeleteObjects: 0.065100 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.035812 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.10 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.131 seconds -Domain Reload Profiling: - ReloadAssembly (2131ms) - BeginReloadAssembly (240ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (70ms) - EndReloadAssembly (1708ms) - LoadAssemblies (218ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (508ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (66ms) - SetupLoadedEditorAssemblies (899ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (25ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (97ms) - ProcessInitializeOnLoadAttributes (728ms) - ProcessInitializeOnLoadMethodAttributes (37ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (15ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 2.80 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6899. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 5.350400 ms (FindLiveObjects: 0.944100 ms CreateObjectMapping: 0.697200 ms MarkObjects: 3.598200 ms DeleteObjects: 0.108500 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.035051 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.74 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.972 seconds -Domain Reload Profiling: - ReloadAssembly (1973ms) - BeginReloadAssembly (216ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (62ms) - EndReloadAssembly (1633ms) - LoadAssemblies (172ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (459ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (68ms) - SetupLoadedEditorAssemblies (887ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (28ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (91ms) - ProcessInitializeOnLoadAttributes (715ms) - ProcessInitializeOnLoadMethodAttributes (38ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (1ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (16ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.37 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.6 KB). Loaded Objects now: 6914. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 4.252400 ms (FindLiveObjects: 0.585900 ms CreateObjectMapping: 0.864800 ms MarkObjects: 2.713900 ms DeleteObjects: 0.085300 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.032343 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.30 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.769 seconds -Domain Reload Profiling: - ReloadAssembly (1770ms) - BeginReloadAssembly (215ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (64ms) - EndReloadAssembly (1405ms) - LoadAssemblies (186ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (370ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (46ms) - SetupLoadedEditorAssemblies (791ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (24ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (77ms) - ProcessInitializeOnLoadAttributes (650ms) - ProcessInitializeOnLoadMethodAttributes (27ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 2.95 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6929. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 3.282500 ms (FindLiveObjects: 0.555900 ms CreateObjectMapping: 0.302700 ms MarkObjects: 2.345400 ms DeleteObjects: 0.076600 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.053846 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.59 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.046 seconds -Domain Reload Profiling: - ReloadAssembly (2048ms) - BeginReloadAssembly (395ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (18ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (170ms) - EndReloadAssembly (1475ms) - LoadAssemblies (168ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (416ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (50ms) - SetupLoadedEditorAssemblies (832ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (23ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (74ms) - ProcessInitializeOnLoadAttributes (688ms) - ProcessInitializeOnLoadMethodAttributes (36ms) - AfterProcessingInitializeOnLoad (8ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.80 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6944. -Memory consumption went from 223.5 MB to 223.5 MB. -Total: 5.393500 ms (FindLiveObjects: 0.739100 ms CreateObjectMapping: 0.415800 ms MarkObjects: 4.100200 ms DeleteObjects: 0.135400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.057852 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.51 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.821 seconds -Domain Reload Profiling: - ReloadAssembly (1823ms) - BeginReloadAssembly (253ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (76ms) - EndReloadAssembly (1430ms) - LoadAssemblies (179ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (373ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (57ms) - SetupLoadedEditorAssemblies (823ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (23ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (74ms) - ProcessInitializeOnLoadAttributes (680ms) - ProcessInitializeOnLoadMethodAttributes (30ms) - AfterProcessingInitializeOnLoad (13ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.41 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6959. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 2.757000 ms (FindLiveObjects: 0.432100 ms CreateObjectMapping: 0.236000 ms MarkObjects: 2.031600 ms DeleteObjects: 0.055700 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 18.26 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.6 KB). Loaded Objects now: 6959. -Memory consumption went from 99.0 MB to 98.9 MB. -Total: 3.469000 ms (FindLiveObjects: 0.581700 ms CreateObjectMapping: 0.313000 ms MarkObjects: 2.506000 ms DeleteObjects: 0.067300 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.032140 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 2.23 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.020 seconds -Domain Reload Profiling: - ReloadAssembly (2020ms) - BeginReloadAssembly (204ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (57ms) - EndReloadAssembly (1660ms) - LoadAssemblies (172ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (474ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (65ms) - SetupLoadedEditorAssemblies (899ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (29ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (96ms) - ProcessInitializeOnLoadAttributes (723ms) - ProcessInitializeOnLoadMethodAttributes (36ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (12ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.59 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6974. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 5.304800 ms (FindLiveObjects: 0.883300 ms CreateObjectMapping: 0.928000 ms MarkObjects: 3.354600 ms DeleteObjects: 0.136600 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.035204 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.79 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.934 seconds -Domain Reload Profiling: - ReloadAssembly (1935ms) - BeginReloadAssembly (263ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (78ms) - EndReloadAssembly (1511ms) - LoadAssemblies (207ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (436ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (58ms) - SetupLoadedEditorAssemblies (811ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (25ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (74ms) - ProcessInitializeOnLoadAttributes (669ms) - ProcessInitializeOnLoadMethodAttributes (32ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.62 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 6989. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 4.306600 ms (FindLiveObjects: 0.837700 ms CreateObjectMapping: 0.512900 ms MarkObjects: 2.860200 ms DeleteObjects: 0.093800 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.051489 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.03 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.727 seconds -Domain Reload Profiling: - ReloadAssembly (1728ms) - BeginReloadAssembly (225ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (69ms) - EndReloadAssembly (1365ms) - LoadAssemblies (171ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (334ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (46ms) - SetupLoadedEditorAssemblies (808ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (21ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (70ms) - ProcessInitializeOnLoadAttributes (677ms) - ProcessInitializeOnLoadMethodAttributes (29ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (10ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 2.33 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7004. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 3.044300 ms (FindLiveObjects: 0.650300 ms CreateObjectMapping: 0.309100 ms MarkObjects: 2.033700 ms DeleteObjects: 0.049400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.035463 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.08 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.911 seconds -Domain Reload Profiling: - ReloadAssembly (1912ms) - BeginReloadAssembly (275ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (9ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (77ms) - EndReloadAssembly (1467ms) - LoadAssemblies (216ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (413ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (52ms) - SetupLoadedEditorAssemblies (809ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (22ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (76ms) - ProcessInitializeOnLoadAttributes (674ms) - ProcessInitializeOnLoadMethodAttributes (26ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (10ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.42 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7019. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 3.880400 ms (FindLiveObjects: 0.564500 ms CreateObjectMapping: 0.313700 ms MarkObjects: 2.916900 ms DeleteObjects: 0.083400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 16.60 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.6 KB). Loaded Objects now: 7019. -Memory consumption went from 99.1 MB to 99.0 MB. -Total: 4.130800 ms (FindLiveObjects: 0.566400 ms CreateObjectMapping: 0.301200 ms MarkObjects: 3.168700 ms DeleteObjects: 0.093000 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.039992 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.34 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.012 seconds -Domain Reload Profiling: - ReloadAssembly (2013ms) - BeginReloadAssembly (222ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (66ms) - EndReloadAssembly (1648ms) - LoadAssemblies (176ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (475ms) - ReleaseScriptCaches (3ms) - RebuildScriptCaches (78ms) - SetupLoadedEditorAssemblies (874ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (31ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (96ms) - ProcessInitializeOnLoadAttributes (699ms) - ProcessInitializeOnLoadMethodAttributes (34ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.42 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7034. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 4.271400 ms (FindLiveObjects: 0.590700 ms CreateObjectMapping: 0.384400 ms MarkObjects: 3.177800 ms DeleteObjects: 0.116400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.036523 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.15 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.893 seconds -Domain Reload Profiling: - ReloadAssembly (1894ms) - BeginReloadAssembly (236ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (77ms) - EndReloadAssembly (1506ms) - LoadAssemblies (170ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (446ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (68ms) - SetupLoadedEditorAssemblies (794ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (23ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (76ms) - ProcessInitializeOnLoadAttributes (653ms) - ProcessInitializeOnLoadMethodAttributes (29ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.66 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7049. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 3.865100 ms (FindLiveObjects: 0.653000 ms CreateObjectMapping: 0.280600 ms MarkObjects: 2.849900 ms DeleteObjects: 0.079700 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 18.45 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.6 KB). Loaded Objects now: 7049. -Memory consumption went from 99.1 MB to 99.0 MB. -Total: 5.074300 ms (FindLiveObjects: 0.729000 ms CreateObjectMapping: 0.548100 ms MarkObjects: 3.611600 ms DeleteObjects: 0.183300 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.032061 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.07 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.944 seconds -Domain Reload Profiling: - ReloadAssembly (1945ms) - BeginReloadAssembly (211ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (53ms) - EndReloadAssembly (1599ms) - LoadAssemblies (182ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (430ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (70ms) - SetupLoadedEditorAssemblies (887ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (28ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (96ms) - ProcessInitializeOnLoadAttributes (713ms) - ProcessInitializeOnLoadMethodAttributes (35ms) - AfterProcessingInitializeOnLoad (12ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (15ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.08 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 7064. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 3.245700 ms (FindLiveObjects: 0.591100 ms CreateObjectMapping: 0.264200 ms MarkObjects: 2.289400 ms DeleteObjects: 0.098000 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.032373 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.12 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.987 seconds -Domain Reload Profiling: - ReloadAssembly (1988ms) - BeginReloadAssembly (228ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (47ms) - EndReloadAssembly (1624ms) - LoadAssemblies (197ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (449ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (69ms) - SetupLoadedEditorAssemblies (895ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (28ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (95ms) - ProcessInitializeOnLoadAttributes (720ms) - ProcessInitializeOnLoadMethodAttributes (38ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (12ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.42 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 7079. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 3.749500 ms (FindLiveObjects: 0.602600 ms CreateObjectMapping: 0.424600 ms MarkObjects: 2.638000 ms DeleteObjects: 0.082300 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.045265 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 2.23 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.110 seconds -Domain Reload Profiling: - ReloadAssembly (2112ms) - BeginReloadAssembly (279ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (11ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (77ms) - EndReloadAssembly (1693ms) - LoadAssemblies (200ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (359ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (53ms) - SetupLoadedEditorAssemblies (1067ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (25ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (74ms) - ProcessInitializeOnLoadAttributes (853ms) - ProcessInitializeOnLoadMethodAttributes (90ms) - AfterProcessingInitializeOnLoad (21ms) - EditorAssembliesLoaded (1ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (16ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.57 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 7094. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 5.472200 ms (FindLiveObjects: 0.916700 ms CreateObjectMapping: 0.436300 ms MarkObjects: 3.886100 ms DeleteObjects: 0.230000 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.062459 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.42 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.182 seconds -Domain Reload Profiling: - ReloadAssembly (2183ms) - BeginReloadAssembly (298ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (102ms) - EndReloadAssembly (1736ms) - LoadAssemblies (200ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (552ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (80ms) - SetupLoadedEditorAssemblies (856ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (30ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (95ms) - ProcessInitializeOnLoadAttributes (685ms) - ProcessInitializeOnLoadMethodAttributes (31ms) - AfterProcessingInitializeOnLoad (12ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (10ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.36 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 7109. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 4.986600 ms (FindLiveObjects: 0.799600 ms CreateObjectMapping: 0.338900 ms MarkObjects: 3.770300 ms DeleteObjects: 0.075800 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.042093 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 2.00 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.796 seconds -Domain Reload Profiling: - ReloadAssembly (1796ms) - BeginReloadAssembly (210ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (54ms) - EndReloadAssembly (1442ms) - LoadAssemblies (176ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (372ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (55ms) - SetupLoadedEditorAssemblies (827ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (28ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (81ms) - ProcessInitializeOnLoadAttributes (674ms) - ProcessInitializeOnLoadMethodAttributes (32ms) - AfterProcessingInitializeOnLoad (8ms) - EditorAssembliesLoaded (1ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (9ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.76 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7124. -Memory consumption went from 223.8 MB to 223.7 MB. -Total: 4.163100 ms (FindLiveObjects: 0.562300 ms CreateObjectMapping: 0.351900 ms MarkObjects: 3.127200 ms DeleteObjects: 0.118900 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.041771 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.32 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.858 seconds -Domain Reload Profiling: - ReloadAssembly (1859ms) - BeginReloadAssembly (230ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (65ms) - EndReloadAssembly (1472ms) - LoadAssemblies (198ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (377ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (59ms) - SetupLoadedEditorAssemblies (819ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (28ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (77ms) - ProcessInitializeOnLoadAttributes (673ms) - ProcessInitializeOnLoadMethodAttributes (28ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.46 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7139. -Memory consumption went from 223.8 MB to 223.7 MB. -Total: 3.594100 ms (FindLiveObjects: 0.591600 ms CreateObjectMapping: 0.495700 ms MarkObjects: 2.437700 ms DeleteObjects: 0.067500 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 16.90 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.6 KB). Loaded Objects now: 7139. -Memory consumption went from 99.2 MB to 99.1 MB. -Total: 7.318200 ms (FindLiveObjects: 1.957200 ms CreateObjectMapping: 1.254300 ms MarkObjects: 3.967900 ms DeleteObjects: 0.135200 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.033510 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.59 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.955 seconds -Domain Reload Profiling: - ReloadAssembly (1956ms) - BeginReloadAssembly (203ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (49ms) - EndReloadAssembly (1609ms) - LoadAssemblies (174ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (434ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (62ms) - SetupLoadedEditorAssemblies (896ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (34ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (85ms) - ProcessInitializeOnLoadAttributes (730ms) - ProcessInitializeOnLoadMethodAttributes (34ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (1ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.48 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 7154. -Memory consumption went from 223.8 MB to 223.7 MB. -Total: 4.589400 ms (FindLiveObjects: 0.797400 ms CreateObjectMapping: 0.789900 ms MarkObjects: 2.921600 ms DeleteObjects: 0.077100 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.031519 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.32 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.960 seconds -Domain Reload Profiling: - ReloadAssembly (1961ms) - BeginReloadAssembly (209ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (57ms) - EndReloadAssembly (1611ms) - LoadAssemblies (183ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (423ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (63ms) - SetupLoadedEditorAssemblies (901ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (29ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (87ms) - ProcessInitializeOnLoadAttributes (739ms) - ProcessInitializeOnLoadMethodAttributes (34ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (12ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.65 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7169. -Memory consumption went from 223.8 MB to 223.7 MB. -Total: 4.728500 ms (FindLiveObjects: 0.944700 ms CreateObjectMapping: 0.778300 ms MarkObjects: 2.902100 ms DeleteObjects: 0.101600 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> diff --git a/JNFrame2/Logs/AssetImportWorker1.log b/JNFrame2/Logs/AssetImportWorker1.log deleted file mode 100644 index e84209cb..00000000 --- a/JNFrame2/Logs/AssetImportWorker1.log +++ /dev/null @@ -1,1957 +0,0 @@ -Using pre-set license -Built from '2021.3/staging' branch; Version is '2021.3.35f1 (157b46ce122a) revision 1407814'; Using compiler version '192829333'; Build Type 'Release' -OS: 'Windows 11 (10.0.22631) 64bit Professional' Language: 'zh' Physical Memory: 32651 MB -BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 1 - -COMMAND LINE ARGUMENTS: -D:\Unity\2021.3.35f1\Editor\Unity.exe --adb2 --batchMode --noUpm --name -AssetImportWorker1 --projectPath -D:/myproject/JisolGame/JNFrame2 --logFile -Logs/AssetImportWorker1.log --srvPort -52371 -Successfully changed project path to: D:/myproject/JisolGame/JNFrame2 -D:/myproject/JisolGame/JNFrame2 -[UnityMemory] Configuration Parameters - Can be set up in boot.config - "memorysetup-bucket-allocator-granularity=16" - "memorysetup-bucket-allocator-bucket-count=8" - "memorysetup-bucket-allocator-block-size=33554432" - "memorysetup-bucket-allocator-block-count=8" - "memorysetup-main-allocator-block-size=16777216" - "memorysetup-thread-allocator-block-size=16777216" - "memorysetup-gfx-main-allocator-block-size=16777216" - "memorysetup-gfx-thread-allocator-block-size=16777216" - "memorysetup-cache-allocator-block-size=4194304" - "memorysetup-typetree-allocator-block-size=2097152" - "memorysetup-profiler-bucket-allocator-granularity=16" - "memorysetup-profiler-bucket-allocator-bucket-count=8" - "memorysetup-profiler-bucket-allocator-block-size=33554432" - "memorysetup-profiler-bucket-allocator-block-count=8" - "memorysetup-profiler-allocator-block-size=16777216" - "memorysetup-profiler-editor-allocator-block-size=1048576" - "memorysetup-temp-allocator-size-main=16777216" - "memorysetup-job-temp-allocator-block-size=2097152" - "memorysetup-job-temp-allocator-block-size-background=1048576" - "memorysetup-job-temp-allocator-reduction-small-platforms=262144" - "memorysetup-temp-allocator-size-background-worker=32768" - "memorysetup-temp-allocator-size-job-worker=262144" - "memorysetup-temp-allocator-size-preload-manager=33554432" - "memorysetup-temp-allocator-size-nav-mesh-worker=65536" - "memorysetup-temp-allocator-size-audio-worker=65536" - "memorysetup-temp-allocator-size-cloud-worker=32768" - "memorysetup-temp-allocator-size-gi-baking-worker=262144" - "memorysetup-temp-allocator-size-gfx=262144" -Player connection [3568] Host "[IP] 192.168.15.124 [Port] 0 [Flags] 2 [Guid] 910524850 [EditorId] 910524850 [Version] 1048832 [Id] WindowsEditor(7,PC-20230316NUNE) [Debug] 1 [PackageName] WindowsEditor [ProjectName] Editor" joined multi-casting on [225.0.0.222:54997]... - -Player connection [3568] Host "[IP] 192.168.15.124 [Port] 0 [Flags] 2 [Guid] 910524850 [EditorId] 910524850 [Version] 1048832 [Id] WindowsEditor(7,PC-20230316NUNE) [Debug] 1 [PackageName] WindowsEditor [ProjectName] Editor" joined alternative multi-casting on [225.0.0.222:34997]... - -[Physics::Module] Initialized MultithreadedJobDispatcher with {0} workers. -Refreshing native plugins compatible for Editor in 126.73 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Initialize engine version: 2021.3.35f1 (157b46ce122a) -[Subsystems] Discovering subsystems at path D:/Unity/2021.3.35f1/Editor/Data/Resources/UnitySubsystems -[Subsystems] Discovering subsystems at path D:/myproject/JisolGame/JNFrame2/Assets -GfxDevice: creating device client; threaded=0; jobified=0 -Direct3D: - Version: Direct3D 11.0 [level 11.1] - Renderer: NVIDIA GeForce GTX 1660 SUPER (ID=0x21c4) - Vendor: NVIDIA - VRAM: 5980 MB - Driver: 31.0.15.3623 -Initialize mono -Mono path[0] = 'D:/Unity/2021.3.35f1/Editor/Data/Managed' -Mono path[1] = 'D:/Unity/2021.3.35f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit-win32' -Mono config path = 'D:/Unity/2021.3.35f1/Editor/Data/MonoBleedingEdge/etc' -Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56904 -Begin MonoManager ReloadAssembly -Registering precompiled unity dll's ... -Register platform support module: D:/Unity/2021.3.35f1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll -Register platform support module: D:/Unity/2021.3.35f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll -Registered in 0.006900 seconds. -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Android Extension - Scanning For ADB Devices 398 ms -Refreshing native plugins compatible for Editor in 119.59 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Mono: successfully reloaded assembly -- Completed reload, in 1.248 seconds -Domain Reload Profiling: - ReloadAssembly (1249ms) - BeginReloadAssembly (127ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (0ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (1ms) - EndReloadAssembly (1005ms) - LoadAssemblies (125ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (132ms) - ReleaseScriptCaches (0ms) - RebuildScriptCaches (28ms) - SetupLoadedEditorAssemblies (794ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (534ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (120ms) - BeforeProcessingInitializeOnLoad (1ms) - ProcessInitializeOnLoadAttributes (92ms) - ProcessInitializeOnLoadMethodAttributes (46ms) - AfterProcessingInitializeOnLoad (0ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (0ms) -Platform modules already initialized, skipping -Registering precompiled user dll's ... -Registered in 0.034564 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.33 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Package Manager log level set to [2] -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 3.729 seconds -Domain Reload Profiling: - ReloadAssembly (3731ms) - BeginReloadAssembly (1020ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (15ms) - BackupInstance (0ms) - ReleaseScriptingObjects (1ms) - CreateAndSetChildDomain (116ms) - EndReloadAssembly (2345ms) - LoadAssemblies (765ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (724ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (152ms) - SetupLoadedEditorAssemblies (1205ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (36ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (154ms) - ProcessInitializeOnLoadAttributes (966ms) - ProcessInitializeOnLoadMethodAttributes (37ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (12ms) -Platform modules already initialized, skipping -======================================================================== -Worker process is ready to serve import requests -Launched and connected shader compiler UnityShaderCompiler.exe after 0.09 seconds -Refreshing native plugins compatible for Editor in 1.81 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6324 Unused Serialized files (Serialized files now loaded: 0) -Unloading 99 unused Assets / (121.0 KB). Loaded Objects now: 6749. -Memory consumption went from 223.8 MB to 223.7 MB. -Total: 9.105900 ms (FindLiveObjects: 1.093000 ms CreateObjectMapping: 1.003200 ms MarkObjects: 6.616200 ms DeleteObjects: 0.389700 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Import Request. - Time since last request: 3145.967422 seconds. - path: Assets/Scripts/TextMain.cs - artifactKey: Guid(870a0b4c0dd966a4e8d4036ec0ef5a81) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -Number of updated assets reloaded before import = 0 -Start importing Assets/Scripts/TextMain.cs using Guid(870a0b4c0dd966a4e8d4036ec0ef5a81) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'b8761902e3da7dad6a016a4697f0108b') in 0.090639 seconds -Number of asset objects unloaded after import = 0 -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.034849 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.34 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.139 seconds -Domain Reload Profiling: - ReloadAssembly (2140ms) - BeginReloadAssembly (284ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (71ms) - EndReloadAssembly (1676ms) - LoadAssemblies (245ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (470ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (66ms) - SetupLoadedEditorAssemblies (900ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (30ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (91ms) - ProcessInitializeOnLoadAttributes (732ms) - ProcessInitializeOnLoadMethodAttributes (34ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (12ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.29 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6764. -Memory consumption went from 223.3 MB to 223.2 MB. -Total: 3.550900 ms (FindLiveObjects: 0.658900 ms CreateObjectMapping: 0.358300 ms MarkObjects: 2.465700 ms DeleteObjects: 0.065300 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.040102 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.82 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.006 seconds -Domain Reload Profiling: - ReloadAssembly (2007ms) - BeginReloadAssembly (212ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (68ms) - EndReloadAssembly (1656ms) - LoadAssemblies (166ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (446ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (58ms) - SetupLoadedEditorAssemblies (937ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (27ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (84ms) - ProcessInitializeOnLoadAttributes (771ms) - ProcessInitializeOnLoadMethodAttributes (38ms) - AfterProcessingInitializeOnLoad (14ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (15ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.75 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6779. -Memory consumption went from 223.3 MB to 223.2 MB. -Total: 3.927900 ms (FindLiveObjects: 0.705500 ms CreateObjectMapping: 0.376000 ms MarkObjects: 2.735100 ms DeleteObjects: 0.109000 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.038769 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.63 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.887 seconds -Domain Reload Profiling: - ReloadAssembly (1888ms) - BeginReloadAssembly (263ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (81ms) - EndReloadAssembly (1464ms) - LoadAssemblies (218ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (377ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (56ms) - SetupLoadedEditorAssemblies (821ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (26ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (79ms) - ProcessInitializeOnLoadAttributes (671ms) - ProcessInitializeOnLoadMethodAttributes (32ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (12ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.02 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.6 KB). Loaded Objects now: 6794. -Memory consumption went from 223.3 MB to 223.2 MB. -Total: 3.617000 ms (FindLiveObjects: 0.564800 ms CreateObjectMapping: 0.382700 ms MarkObjects: 2.599200 ms DeleteObjects: 0.068700 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.039398 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.20 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.759 seconds -Domain Reload Profiling: - ReloadAssembly (1759ms) - BeginReloadAssembly (217ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (66ms) - EndReloadAssembly (1411ms) - LoadAssemblies (167ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (365ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (49ms) - SetupLoadedEditorAssemblies (818ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (33ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (74ms) - ProcessInitializeOnLoadAttributes (671ms) - ProcessInitializeOnLoadMethodAttributes (29ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.33 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.6 KB). Loaded Objects now: 6809. -Memory consumption went from 223.3 MB to 223.3 MB. -Total: 4.853000 ms (FindLiveObjects: 0.762400 ms CreateObjectMapping: 0.341700 ms MarkObjects: 3.577300 ms DeleteObjects: 0.168500 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.035269 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 2.20 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.181 seconds -Domain Reload Profiling: - ReloadAssembly (2183ms) - BeginReloadAssembly (323ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (9ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (112ms) - EndReloadAssembly (1706ms) - LoadAssemblies (255ms) - RebuildTransferFunctionScriptingTraits (1ms) - SetupTypeCache (447ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (63ms) - SetupLoadedEditorAssemblies (940ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (23ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (129ms) - ProcessInitializeOnLoadAttributes (734ms) - ProcessInitializeOnLoadMethodAttributes (37ms) - AfterProcessingInitializeOnLoad (15ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (22ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.41 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.6 KB). Loaded Objects now: 6824. -Memory consumption went from 223.4 MB to 223.3 MB. -Total: 29.022400 ms (FindLiveObjects: 0.677500 ms CreateObjectMapping: 0.496400 ms MarkObjects: 27.701200 ms DeleteObjects: 0.145200 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.037352 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.10 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.756 seconds -Domain Reload Profiling: - ReloadAssembly (1757ms) - BeginReloadAssembly (207ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (60ms) - EndReloadAssembly (1421ms) - LoadAssemblies (158ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (397ms) - ReleaseScriptCaches (3ms) - RebuildScriptCaches (53ms) - SetupLoadedEditorAssemblies (795ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (24ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (70ms) - ProcessInitializeOnLoadAttributes (659ms) - ProcessInitializeOnLoadMethodAttributes (30ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 2.33 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6839. -Memory consumption went from 223.4 MB to 223.3 MB. -Total: 4.175300 ms (FindLiveObjects: 0.861200 ms CreateObjectMapping: 0.451200 ms MarkObjects: 2.680300 ms DeleteObjects: 0.180800 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 16.71 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.6 KB). Loaded Objects now: 6839. -Memory consumption went from 98.8 MB to 98.7 MB. -Total: 4.191800 ms (FindLiveObjects: 0.491100 ms CreateObjectMapping: 0.393500 ms MarkObjects: 3.233900 ms DeleteObjects: 0.072400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.032961 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.69 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.987 seconds -Domain Reload Profiling: - ReloadAssembly (1988ms) - BeginReloadAssembly (244ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (79ms) - EndReloadAssembly (1604ms) - LoadAssemblies (193ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (431ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (67ms) - SetupLoadedEditorAssemblies (884ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (31ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (85ms) - ProcessInitializeOnLoadAttributes (719ms) - ProcessInitializeOnLoadMethodAttributes (35ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (15ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 3.29 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6854. -Memory consumption went from 223.4 MB to 223.3 MB. -Total: 4.419200 ms (FindLiveObjects: 0.491900 ms CreateObjectMapping: 0.314200 ms MarkObjects: 3.506700 ms DeleteObjects: 0.104700 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.035711 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.13 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.745 seconds -Domain Reload Profiling: - ReloadAssembly (1745ms) - BeginReloadAssembly (242ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (65ms) - EndReloadAssembly (1373ms) - LoadAssemblies (194ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (372ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (50ms) - SetupLoadedEditorAssemblies (774ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (25ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (72ms) - ProcessInitializeOnLoadAttributes (639ms) - ProcessInitializeOnLoadMethodAttributes (27ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (10ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.09 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6869. -Memory consumption went from 223.4 MB to 223.3 MB. -Total: 3.789100 ms (FindLiveObjects: 0.708700 ms CreateObjectMapping: 0.356200 ms MarkObjects: 2.665000 ms DeleteObjects: 0.057800 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 17.28 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.6 KB). Loaded Objects now: 6869. -Memory consumption went from 98.9 MB to 98.8 MB. -Total: 4.429500 ms (FindLiveObjects: 0.985600 ms CreateObjectMapping: 0.946500 ms MarkObjects: 2.390100 ms DeleteObjects: 0.105800 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.031242 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 2.99 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.019 seconds -Domain Reload Profiling: - ReloadAssembly (2020ms) - BeginReloadAssembly (221ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (60ms) - EndReloadAssembly (1664ms) - LoadAssemblies (191ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (455ms) - ReleaseScriptCaches (3ms) - RebuildScriptCaches (77ms) - SetupLoadedEditorAssemblies (911ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (37ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (3ms) - BeforeProcessingInitializeOnLoad (92ms) - ProcessInitializeOnLoadAttributes (737ms) - ProcessInitializeOnLoadMethodAttributes (31ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (9ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.47 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 6884. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 4.183100 ms (FindLiveObjects: 0.524700 ms CreateObjectMapping: 0.329800 ms MarkObjects: 3.246700 ms DeleteObjects: 0.080800 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.038622 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 2.42 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.127 seconds -Domain Reload Profiling: - ReloadAssembly (2129ms) - BeginReloadAssembly (247ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (73ms) - EndReloadAssembly (1700ms) - LoadAssemblies (207ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (500ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (67ms) - SetupLoadedEditorAssemblies (918ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (25ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (3ms) - BeforeProcessingInitializeOnLoad (99ms) - ProcessInitializeOnLoadAttributes (745ms) - ProcessInitializeOnLoadMethodAttributes (33ms) - AfterProcessingInitializeOnLoad (13ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (12ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.53 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 6899. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 4.771300 ms (FindLiveObjects: 0.526800 ms CreateObjectMapping: 0.397100 ms MarkObjects: 3.744700 ms DeleteObjects: 0.101400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.030120 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.72 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.973 seconds -Domain Reload Profiling: - ReloadAssembly (1974ms) - BeginReloadAssembly (208ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (56ms) - EndReloadAssembly (1633ms) - LoadAssemblies (189ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (454ms) - ReleaseScriptCaches (3ms) - RebuildScriptCaches (66ms) - SetupLoadedEditorAssemblies (884ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (29ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (89ms) - ProcessInitializeOnLoadAttributes (712ms) - ProcessInitializeOnLoadMethodAttributes (40ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 4.61 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6914. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 4.787700 ms (FindLiveObjects: 0.644400 ms CreateObjectMapping: 0.562300 ms MarkObjects: 3.510200 ms DeleteObjects: 0.068500 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.030183 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.12 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.778 seconds -Domain Reload Profiling: - ReloadAssembly (1779ms) - BeginReloadAssembly (228ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (66ms) - EndReloadAssembly (1406ms) - LoadAssemblies (197ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (377ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (47ms) - SetupLoadedEditorAssemblies (781ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (22ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (73ms) - ProcessInitializeOnLoadAttributes (647ms) - ProcessInitializeOnLoadMethodAttributes (27ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 2.11 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 6929. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 3.825600 ms (FindLiveObjects: 0.758300 ms CreateObjectMapping: 0.338300 ms MarkObjects: 2.629400 ms DeleteObjects: 0.098100 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.042623 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.06 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.014 seconds -Domain Reload Profiling: - ReloadAssembly (2015ms) - BeginReloadAssembly (352ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (12ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (122ms) - EndReloadAssembly (1514ms) - LoadAssemblies (243ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (397ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (55ms) - SetupLoadedEditorAssemblies (839ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (24ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (76ms) - ProcessInitializeOnLoadAttributes (698ms) - ProcessInitializeOnLoadMethodAttributes (28ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (12ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.78 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6944. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 5.327600 ms (FindLiveObjects: 0.739000 ms CreateObjectMapping: 0.501200 ms MarkObjects: 3.991300 ms DeleteObjects: 0.093900 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.058755 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.13 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.821 seconds -Domain Reload Profiling: - ReloadAssembly (1822ms) - BeginReloadAssembly (251ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (79ms) - EndReloadAssembly (1434ms) - LoadAssemblies (182ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (375ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (56ms) - SetupLoadedEditorAssemblies (825ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (22ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (74ms) - ProcessInitializeOnLoadAttributes (684ms) - ProcessInitializeOnLoadMethodAttributes (32ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.62 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6959. -Memory consumption went from 223.5 MB to 223.4 MB. -Total: 4.285900 ms (FindLiveObjects: 0.879500 ms CreateObjectMapping: 0.519500 ms MarkObjects: 2.789900 ms DeleteObjects: 0.094400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 18.14 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.6 KB). Loaded Objects now: 6959. -Memory consumption went from 99.0 MB to 98.9 MB. -Total: 4.880500 ms (FindLiveObjects: 0.839900 ms CreateObjectMapping: 0.873700 ms MarkObjects: 2.995100 ms DeleteObjects: 0.170300 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.032025 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.55 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.027 seconds -Domain Reload Profiling: - ReloadAssembly (2028ms) - BeginReloadAssembly (201ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (53ms) - EndReloadAssembly (1678ms) - LoadAssemblies (189ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (484ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (67ms) - SetupLoadedEditorAssemblies (899ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (29ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (90ms) - ProcessInitializeOnLoadAttributes (732ms) - ProcessInitializeOnLoadMethodAttributes (34ms) - AfterProcessingInitializeOnLoad (12ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 2.46 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 6974. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 6.715200 ms (FindLiveObjects: 0.930200 ms CreateObjectMapping: 0.889000 ms MarkObjects: 4.821200 ms DeleteObjects: 0.073400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.036403 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.07 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.913 seconds -Domain Reload Profiling: - ReloadAssembly (1915ms) - BeginReloadAssembly (259ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (75ms) - EndReloadAssembly (1510ms) - LoadAssemblies (198ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (442ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (59ms) - SetupLoadedEditorAssemblies (808ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (24ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (75ms) - ProcessInitializeOnLoadAttributes (667ms) - ProcessInitializeOnLoadMethodAttributes (31ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (14ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.40 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 6989. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 3.454200 ms (FindLiveObjects: 0.505300 ms CreateObjectMapping: 0.256700 ms MarkObjects: 2.569700 ms DeleteObjects: 0.120500 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.049403 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.06 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.729 seconds -Domain Reload Profiling: - ReloadAssembly (1729ms) - BeginReloadAssembly (231ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (63ms) - EndReloadAssembly (1364ms) - LoadAssemblies (180ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (334ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (44ms) - SetupLoadedEditorAssemblies (804ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (24ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (70ms) - ProcessInitializeOnLoadAttributes (668ms) - ProcessInitializeOnLoadMethodAttributes (31ms) - AfterProcessingInitializeOnLoad (8ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.88 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.6 KB). Loaded Objects now: 7004. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 5.698100 ms (FindLiveObjects: 0.938900 ms CreateObjectMapping: 0.945000 ms MarkObjects: 3.663300 ms DeleteObjects: 0.148800 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.033403 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.34 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.911 seconds -Domain Reload Profiling: - ReloadAssembly (1912ms) - BeginReloadAssembly (269ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (76ms) - EndReloadAssembly (1470ms) - LoadAssemblies (216ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (418ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (51ms) - SetupLoadedEditorAssemblies (805ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (25ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (73ms) - ProcessInitializeOnLoadAttributes (668ms) - ProcessInitializeOnLoadMethodAttributes (29ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (9ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.17 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7019. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 3.782100 ms (FindLiveObjects: 0.690100 ms CreateObjectMapping: 0.524400 ms MarkObjects: 2.458300 ms DeleteObjects: 0.107200 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 16.38 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.7 KB). Loaded Objects now: 7019. -Memory consumption went from 99.1 MB to 99.0 MB. -Total: 3.836700 ms (FindLiveObjects: 0.546600 ms CreateObjectMapping: 0.290400 ms MarkObjects: 2.944700 ms DeleteObjects: 0.054100 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.039932 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 2.16 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.969 seconds -Domain Reload Profiling: - ReloadAssembly (1970ms) - BeginReloadAssembly (213ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (62ms) - EndReloadAssembly (1630ms) - LoadAssemblies (167ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (467ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (72ms) - SetupLoadedEditorAssemblies (878ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (30ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (85ms) - ProcessInitializeOnLoadAttributes (712ms) - ProcessInitializeOnLoadMethodAttributes (38ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (12ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.05 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7034. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 4.460300 ms (FindLiveObjects: 0.793900 ms CreateObjectMapping: 0.386900 ms MarkObjects: 3.154800 ms DeleteObjects: 0.123600 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.037396 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.41 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.932 seconds -Domain Reload Profiling: - ReloadAssembly (1933ms) - BeginReloadAssembly (246ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (64ms) - EndReloadAssembly (1532ms) - LoadAssemblies (203ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (444ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (60ms) - SetupLoadedEditorAssemblies (810ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (28ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (74ms) - ProcessInitializeOnLoadAttributes (666ms) - ProcessInitializeOnLoadMethodAttributes (29ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.78 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7049. -Memory consumption went from 223.6 MB to 223.5 MB. -Total: 3.946100 ms (FindLiveObjects: 0.524000 ms CreateObjectMapping: 0.545500 ms MarkObjects: 2.804200 ms DeleteObjects: 0.071000 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 17.42 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.6 KB). Loaded Objects now: 7049. -Memory consumption went from 99.1 MB to 99.0 MB. -Total: 3.867500 ms (FindLiveObjects: 0.760800 ms CreateObjectMapping: 0.442900 ms MarkObjects: 2.568300 ms DeleteObjects: 0.094300 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.034447 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.88 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.918 seconds -Domain Reload Profiling: - ReloadAssembly (1919ms) - BeginReloadAssembly (204ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (61ms) - EndReloadAssembly (1581ms) - LoadAssemblies (155ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (422ms) - ReleaseScriptCaches (4ms) - RebuildScriptCaches (66ms) - SetupLoadedEditorAssemblies (887ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (30ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (90ms) - ProcessInitializeOnLoadAttributes (718ms) - ProcessInitializeOnLoadMethodAttributes (33ms) - AfterProcessingInitializeOnLoad (12ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (16ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 2.18 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7064. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 4.897600 ms (FindLiveObjects: 0.803200 ms CreateObjectMapping: 0.659600 ms MarkObjects: 3.295600 ms DeleteObjects: 0.136800 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.036358 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.71 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.034 seconds -Domain Reload Profiling: - ReloadAssembly (2035ms) - BeginReloadAssembly (248ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (75ms) - EndReloadAssembly (1638ms) - LoadAssemblies (196ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (457ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (64ms) - SetupLoadedEditorAssemblies (897ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (27ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (90ms) - ProcessInitializeOnLoadAttributes (730ms) - ProcessInitializeOnLoadMethodAttributes (38ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.62 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.8 KB). Loaded Objects now: 7079. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 4.029300 ms (FindLiveObjects: 0.693600 ms CreateObjectMapping: 0.503900 ms MarkObjects: 2.768600 ms DeleteObjects: 0.062000 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.043450 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.31 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.135 seconds -Domain Reload Profiling: - ReloadAssembly (2138ms) - BeginReloadAssembly (259ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (82ms) - EndReloadAssembly (1717ms) - LoadAssemblies (167ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (350ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (48ms) - SetupLoadedEditorAssemblies (1092ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (21ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (78ms) - ProcessInitializeOnLoadAttributes (925ms) - ProcessInitializeOnLoadMethodAttributes (51ms) - AfterProcessingInitializeOnLoad (13ms) - EditorAssembliesLoaded (1ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (16ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 7.13 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7094. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 3.262700 ms (FindLiveObjects: 0.595000 ms CreateObjectMapping: 0.472000 ms MarkObjects: 2.139500 ms DeleteObjects: 0.055100 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.060303 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 2.87 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 2.182 seconds -Domain Reload Profiling: - ReloadAssembly (2183ms) - BeginReloadAssembly (307ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (10ms) - BackupInstance (0ms) - ReleaseScriptingObjects (1ms) - CreateAndSetChildDomain (98ms) - EndReloadAssembly (1730ms) - LoadAssemblies (195ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (556ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (75ms) - SetupLoadedEditorAssemblies (853ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (29ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (3ms) - BeforeProcessingInitializeOnLoad (93ms) - ProcessInitializeOnLoadAttributes (687ms) - ProcessInitializeOnLoadMethodAttributes (31ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (10ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.41 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.6 KB). Loaded Objects now: 7109. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 3.175100 ms (FindLiveObjects: 0.708300 ms CreateObjectMapping: 0.284200 ms MarkObjects: 2.110900 ms DeleteObjects: 0.069900 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.037483 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.09 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.813 seconds -Domain Reload Profiling: - ReloadAssembly (1814ms) - BeginReloadAssembly (219ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (62ms) - EndReloadAssembly (1448ms) - LoadAssemblies (169ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (374ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (50ms) - SetupLoadedEditorAssemblies (831ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (26ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (75ms) - ProcessInitializeOnLoadAttributes (690ms) - ProcessInitializeOnLoadMethodAttributes (28ms) - AfterProcessingInitializeOnLoad (10ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (10ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.47 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7124. -Memory consumption went from 223.7 MB to 223.6 MB. -Total: 2.914200 ms (FindLiveObjects: 0.564500 ms CreateObjectMapping: 0.271200 ms MarkObjects: 2.022800 ms DeleteObjects: 0.054800 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.039560 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.16 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.843 seconds -Domain Reload Profiling: - ReloadAssembly (1844ms) - BeginReloadAssembly (232ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (69ms) - EndReloadAssembly (1454ms) - LoadAssemblies (178ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (378ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (56ms) - SetupLoadedEditorAssemblies (814ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (27ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (1ms) - BeforeProcessingInitializeOnLoad (78ms) - ProcessInitializeOnLoadAttributes (672ms) - ProcessInitializeOnLoadMethodAttributes (27ms) - AfterProcessingInitializeOnLoad (9ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (11ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.35 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7139. -Memory consumption went from 223.7 MB to 223.7 MB. -Total: 3.111200 ms (FindLiveObjects: 0.629900 ms CreateObjectMapping: 0.285400 ms MarkObjects: 2.118400 ms DeleteObjects: 0.075500 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Refreshing native plugins compatible for Editor in 19.62 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 80 Unused Serialized files (Serialized files now loaded: 0) -Unloading 80 unused Assets / (93.7 KB). Loaded Objects now: 7139. -Memory consumption went from 99.2 MB to 99.1 MB. -Total: 5.855100 ms (FindLiveObjects: 0.471100 ms CreateObjectMapping: 0.297500 ms MarkObjects: 4.934600 ms DeleteObjects: 0.149900 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.031071 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.62 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.944 seconds -Domain Reload Profiling: - ReloadAssembly (1945ms) - BeginReloadAssembly (212ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (7ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (58ms) - EndReloadAssembly (1596ms) - LoadAssemblies (174ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (435ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (64ms) - SetupLoadedEditorAssemblies (885ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (28ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (87ms) - ProcessInitializeOnLoadAttributes (724ms) - ProcessInitializeOnLoadMethodAttributes (33ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.43 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.7 KB). Loaded Objects now: 7154. -Memory consumption went from 223.8 MB to 223.7 MB. -Total: 3.634100 ms (FindLiveObjects: 0.753600 ms CreateObjectMapping: 0.306000 ms MarkObjects: 2.485400 ms DeleteObjects: 0.087100 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.030848 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for Android target not found -Refreshing native plugins compatible for Editor in 1.46 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument -[Package Manager] Cannot connect to Unity Package Manager local server -Mono: successfully reloaded assembly -- Completed reload, in 1.940 seconds -Domain Reload Profiling: - ReloadAssembly (1941ms) - BeginReloadAssembly (206ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (8ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (66ms) - EndReloadAssembly (1599ms) - LoadAssemblies (160ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (425ms) - ReleaseScriptCaches (2ms) - RebuildScriptCaches (63ms) - SetupLoadedEditorAssemblies (902ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (29ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (2ms) - BeforeProcessingInitializeOnLoad (88ms) - ProcessInitializeOnLoadAttributes (737ms) - ProcessInitializeOnLoadMethodAttributes (35ms) - AfterProcessingInitializeOnLoad (11ms) - EditorAssembliesLoaded (1ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (14ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 1.39 ms, found 3 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 6313 Unused Serialized files (Serialized files now loaded: 0) -Unloading 82 unused Assets / (93.6 KB). Loaded Objects now: 7169. -Memory consumption went from 223.8 MB to 223.7 MB. -Total: 3.582900 ms (FindLiveObjects: 0.689700 ms CreateObjectMapping: 0.380600 ms MarkObjects: 2.442600 ms DeleteObjects: 0.068400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:CustomObjectIndexerAttribute: bc11b3a6c3213fcdd17b65e7da85e133 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 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/Packages/TouchSocket.Core.2.0.15/tools/install.ps1 b/JNFrame2/Packages/TouchSocket.Core.2.0.16/tools/install.ps1 similarity index 100% rename from JNFrame2/Packages/TouchSocket.Core.2.0.15/tools/install.ps1 rename to JNFrame2/Packages/TouchSocket.Core.2.0.16/tools/install.ps1 diff --git a/JNFrame2/Packages/TouchSocket.Core.2.0.15/tools/uninstall.ps1 b/JNFrame2/Packages/TouchSocket.Core.2.0.16/tools/uninstall.ps1 similarity index 100% rename from JNFrame2/Packages/TouchSocket.Core.2.0.15/tools/uninstall.ps1 rename to JNFrame2/Packages/TouchSocket.Core.2.0.16/tools/uninstall.ps1 diff --git a/JNFrame2/StompyRobot.SRDebugger.Editor.csproj b/JNFrame2/StompyRobot.SRDebugger.Editor.csproj index fda8c701..cbc9070d 100644 --- a/JNFrame2/StompyRobot.SRDebugger.Editor.csproj +++ b/JNFrame2/StompyRobot.SRDebugger.Editor.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -359,9 +359,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -404,6 +401,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -440,6 +440,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -452,8 +455,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="nunit.framework"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath> diff --git a/JNFrame2/StompyRobot.SRDebugger.csproj b/JNFrame2/StompyRobot.SRDebugger.csproj index 0685c82f..e8dc6bc9 100644 --- a/JNFrame2/StompyRobot.SRDebugger.csproj +++ b/JNFrame2/StompyRobot.SRDebugger.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -451,9 +451,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -496,6 +493,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -532,6 +532,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -544,8 +547,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/StompyRobot.SRF.Editor.csproj b/JNFrame2/StompyRobot.SRF.Editor.csproj index 5f950c9b..12e4cfd1 100644 --- a/JNFrame2/StompyRobot.SRF.Editor.csproj +++ b/JNFrame2/StompyRobot.SRF.Editor.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -350,9 +350,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -395,6 +392,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -431,6 +431,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -443,8 +446,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="nunit.framework"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath> diff --git a/JNFrame2/StompyRobot.SRF.csproj b/JNFrame2/StompyRobot.SRF.csproj index 1b11dc82..4f6c4190 100644 --- a/JNFrame2/StompyRobot.SRF.csproj +++ b/JNFrame2/StompyRobot.SRF.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -396,9 +396,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -441,6 +438,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -477,6 +477,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -489,8 +492,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/UniTask.Addressables.csproj b/JNFrame2/UniTask.Addressables.csproj index ab18df46..a84fe0d2 100644 --- a/JNFrame2/UniTask.Addressables.csproj +++ b/JNFrame2/UniTask.Addressables.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -341,9 +341,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -386,6 +383,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -422,6 +422,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -434,8 +437,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/UniTask.DOTween.csproj b/JNFrame2/UniTask.DOTween.csproj index 14949e48..0b21c129 100644 --- a/JNFrame2/UniTask.DOTween.csproj +++ b/JNFrame2/UniTask.DOTween.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -341,9 +341,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -386,6 +383,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -422,6 +422,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -434,8 +437,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/UniTask.Editor.csproj b/JNFrame2/UniTask.Editor.csproj index 99f70dbf..f37df0e5 100644 --- a/JNFrame2/UniTask.Editor.csproj +++ b/JNFrame2/UniTask.Editor.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -346,9 +346,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -391,6 +388,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -427,6 +427,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -439,8 +442,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="nunit.framework"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath> diff --git a/JNFrame2/UniTask.Linq.csproj b/JNFrame2/UniTask.Linq.csproj index 792a276e..71518f37 100644 --- a/JNFrame2/UniTask.Linq.csproj +++ b/JNFrame2/UniTask.Linq.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -413,9 +413,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -458,6 +455,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -494,6 +494,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -506,8 +509,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/UniTask.TextMeshPro.csproj b/JNFrame2/UniTask.TextMeshPro.csproj index fe148f78..6a16d6ec 100644 --- a/JNFrame2/UniTask.TextMeshPro.csproj +++ b/JNFrame2/UniTask.TextMeshPro.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -342,9 +342,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -387,6 +384,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -423,6 +423,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -435,8 +438,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/UniTask.csproj b/JNFrame2/UniTask.csproj index e0818b01..2be3e8e0 100644 --- a/JNFrame2/UniTask.csproj +++ b/JNFrame2/UniTask.csproj @@ -44,6 +44,7 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\fr\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> + <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ko\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ja\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\tr\System.Text.Json.SourceGeneration.resources.dll" /> @@ -54,7 +55,6 @@ <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\de\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\pl\System.Text.Json.SourceGeneration.resources.dll" /> - <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\System.Text.Json.SourceGeneration.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn4.0\cs\ru\System.Text.Json.SourceGeneration.resources.dll" /> <Analyzer Include="D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Json.6.0.0\analyzers\dotnet\roslyn3.11\cs\es\System.Text.Json.SourceGeneration.resources.dll" /> @@ -413,9 +413,6 @@ <Reference Include="Jenny"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.dll</HintPath> </Reference> - <Reference Include="TouchSocket.Core"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.15\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> - </Reference> <Reference Include="Google.Protobuf"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Google.Protobuf.3.18.3\lib\netstandard2.0\Google.Protobuf.dll</HintPath> </Reference> @@ -458,6 +455,9 @@ <Reference Include="System.Text.Encodings.Web"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\System.Text.Encodings.Web.6.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath> </Reference> + <Reference Include="TouchSocket.Http"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Http.2.0.16\lib\netstandard2.1\TouchSocket.Http.dll</HintPath> + </Reference> <Reference Include="Unity.Plastic.Newtonsoft.Json"> <HintPath>D:\myproject\JisolGame\JNFrame2\Library\PackageCache\com.unity.collab-proxy@2.2.0\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath> </Reference> @@ -494,6 +494,9 @@ <Reference Include="Sherlog.Formatters"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Sherlog\Sherlog.Formatters.dll</HintPath> </Reference> + <Reference Include="TouchSocket"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.16\lib\netstandard2.1\TouchSocket.dll</HintPath> + </Reference> <Reference Include="Microsoft.Bcl.AsyncInterfaces"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> @@ -506,8 +509,8 @@ <Reference Include="Jenny.Generator.Unity.Editor"> <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\JNGame\Plugins\Jenny\Editor\Jenny.Generator.Unity.Editor.dll</HintPath> </Reference> - <Reference Include="TouchSocket"> - <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.2.0.15\lib\netstandard2.1\TouchSocket.dll</HintPath> + <Reference Include="TouchSocket.Core"> + <HintPath>D:\myproject\JisolGame\JNFrame2\Assets\Packages\TouchSocket.Core.2.0.16\lib\netstandard2.1\TouchSocket.Core.dll</HintPath> </Reference> <Reference Include="Unity.Android.Types"> <HintPath>D:\Unity\2021.3.35f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> diff --git a/JNFrame2/UserSettings/Layouts/default-2021.dwlt b/JNFrame2/UserSettings/Layouts/default-2021.dwlt index 6ad48d46..c857ea53 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: Inspector + m_Title: Game 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: 73 + controlID: 90 --- !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: 74 + controlID: 91 --- !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: 75 + controlID: 92 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -296,8 +296,8 @@ MonoBehaviour: y: 0 width: 452 height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -489,9 +489,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 00930000 + m_SelectedIDs: aca20000 m_LastClickedID: 0 - m_ExpandedIDs: 7adeffff9ee1ffffb8e3ffff0ee4ffffcae6ffffcee6ffff12eaffffb8ecffff0eedffffcaefffffceefffffc8f1ffff46f6ffff9cf6ffff58f9ffff5cf9ffff16fbfffff092000000930000 + m_ExpandedIDs: ba75ffff427affffb27effff087fffffc481ffffc881ffffc88dffff1e8effffda90ffffde90ffff54caffff60ccffffb6ccffff72cfffff76cfffff68d9ffff9cdbfffff2dbffffaedeffffb2deffff88e1ffffd0e3ffff26e4ffffe2e6ffffe6e6ffff0ce9ffff38ebffff8eebffff4aeeffff4eeeffff7cf6ffffd2f6ffff8ef9ffff92f9ffff18fbffff3a9000002c93000016960000049900009ca20000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -829,9 +829,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 207.45923, y: 142.01059, z: -10.114366} + m_Target: {x: 66.31595, y: 60.237167, z: -26.589392} speed: 2 - m_Value: {x: 207.45923, y: 142.01059, z: -10.114366} + m_Value: {x: 66.31595, y: 60.237167, z: -26.589392} 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.54965925, y: 0.14655384, z: -0.09864675, w: -0.8165088} + m_Target: {x: -0.4022476, y: -0.07621663, z: 0.033646982, w: -0.9117491} speed: 2 - m_Value: {x: -0.5496534, y: 0.1465523, z: -0.09864571, w: -0.8165002} + m_Value: {x: -0.4022414, y: -0.07621546, z: 0.033646464, w: -0.9117351} m_Size: m_Target: 3.155869 speed: 2 @@ -994,7 +994,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 199} m_SelectedIDs: d28c0000 m_LastClickedID: 36050 - m_ExpandedIDs: 00000000c2730000c4730000c6730000c8730000ca730000cc730000ce730000d0730000d2730000d4730000d673000000ca9a3bffffff7f + m_ExpandedIDs: 00000000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1022,7 +1022,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c2730000c4730000c6730000c8730000ca730000cc730000ce730000d0730000d2730000d4730000d6730000 + m_ExpandedIDs: 00000000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/JNFrame2/obj/Debug/AimingRig.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/AimingRig.csproj.AssemblyReference.cache index f4c28f97..e8d0a53f 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/Assembly-CSharp-Editor.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache index 76ee1f49..8acf301f 100644 Binary files a/JNFrame2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache differ diff --git a/JNFrame2/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache index 08085fef..1ae47bcc 100644 Binary files a/JNFrame2/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache differ diff --git a/JNFrame2/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache index 5d6bee32..eddd5689 100644 Binary files a/JNFrame2/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache differ diff --git a/JNFrame2/obj/Debug/BestHTTP.csproj.AssemblyReference.cache b/JNFrame2/obj/Debug/BestHTTP.csproj.AssemblyReference.cache index b0e161cb..dcb75c97 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 73fa7c1d..173fa182 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 f4c28f97..e8d0a53f 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 73fa7c1d..173fa182 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 f4c28f97..e8d0a53f 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 b0e161cb..dcb75c97 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 a6af5743..cea0447a 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 6df37677..6cd76309 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 b0e161cb..dcb75c97 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 aca107f4..230248b1 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 b0e161cb..dcb75c97 100644 Binary files a/JNFrame2/obj/Debug/UniTask.csproj.AssemblyReference.cache and b/JNFrame2/obj/Debug/UniTask.csproj.AssemblyReference.cache differ diff --git a/JisolGameServer/JNGame b/JisolGameServer/JNGame index 4252d755..c83997da 160000 --- a/JisolGameServer/JNGame +++ b/JisolGameServer/JNGame @@ -1 +1 @@ -Subproject commit 4252d755a7ddf5ff613d7383600dee71b4cd7ac6 +Subproject commit c83997da2eba65699f799caad45fda79fb833240