mod: C#9.0 update to 12.0 and create playermanager

pull/2/head
zxl 2024-04-05 11:59:11 +08:00
parent f4ed627964
commit e13e4b32f6
31 changed files with 485 additions and 322 deletions

View File

@ -6,17 +6,34 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d018256f-8250-4025-b60e-7cdf03f0e7e0" name="Changes" comment=""> <list default="true" id="d018256f-8250-4025-b60e-7cdf03f0e7e0" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.TestF/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.TestF/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.TestF/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.TestF/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Hotfix/Prefabs/UI/GameSceneUI.prefab" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Plugins/ConsolePro/Remote/LiteNetLib/LiteNetLib.csproj.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Hotfix/Prefabs/UI/GameSceneUI.prefab.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Init.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Init.unity" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scenes/Init.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Init.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/BFS/BFS.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/BFS/BFS.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Game.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Game.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/Game.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Game.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/LoadingGameSceneProcedure.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Process/LoadingGameSceneProcedure.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/Process.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureBase.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureBase.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/GameSceneLogicProcedure.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/GameSceneLogicProcedure.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureManager.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/GameSceneLogicProcedure.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/GameSceneLogicProcedure.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureType.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/IProcedure.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/IProcedure.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/IProcedure.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/IProcedure.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/LoadingGameSceneProcedure.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/LoadingGameSceneProcedure.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/LoadingGameSceneProcedure.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/LoadingGameSceneProcedure.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureBase.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/ProcedureBase.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureBase.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/ProcedureBase.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/ProcedureManager.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureManager.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/ProcedureManager.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/ProcedureType.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Process/ProcedureType.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/ProcedureType.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/ResourceManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/ResourceManager.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Test.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Test.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.bytes" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.bytes" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.bytes" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.bytes" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.hash" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.hash" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.hash" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.hash" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.json" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.json" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/StandaloneWindows64/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/manifest.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/PackageManagerSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/PackageManagerSettings.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/boot.config" beforeDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -59,6 +76,7 @@
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.CSharpInteractiveConfiguration&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}, },
&quot;keyToStringList&quot;: { &quot;keyToStringList&quot;: {
@ -104,10 +122,10 @@
</option> </option>
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" ignored-value-for-modified-check="7896"> <configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
<option name="allowRunningInParallel" value="false" /> <option name="allowRunningInParallel" value="false" />
<option name="listenPortForConnections" value="false" /> <option name="listenPortForConnections" value="false" />
<option name="pid" value="7896" /> <option name="pid" />
<option name="projectPathOnTarget" /> <option name="projectPathOnTarget" />
<option name="selectedOptions"> <option name="selectedOptions">
<list /> <list />
@ -129,6 +147,12 @@
<workItem from="1712105852016" duration="12544000" /> <workItem from="1712105852016" duration="12544000" />
<workItem from="1712121832987" duration="1232000" /> <workItem from="1712121832987" duration="1232000" />
<workItem from="1712123080286" duration="15512000" /> <workItem from="1712123080286" duration="15512000" />
<workItem from="1712279308137" duration="688000" />
<workItem from="1712280113433" duration="281000" />
<workItem from="1712280461129" duration="430000" />
<workItem from="1712281488926" duration="379000" />
<workItem from="1712281963664" duration="14000" />
<workItem from="1712282817746" duration="6615000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -148,10 +172,10 @@
<line>21</line> <line>21</line>
<properties documentPath="D:\UnityProject\TestF\Assets\Scripts\Test.cs" initialLine="21" containingFunctionPresentation="Method 'Update'"> <properties documentPath="D:\UnityProject\TestF\Assets\Scripts\Test.cs" initialLine="21" containingFunctionPresentation="Method 'Update'">
<startOffsets> <startOffsets>
<option value="547" /> <option value="551" />
</startOffsets> </startOffsets>
<endOffsets> <endOffsets>
<option value="548" /> <option value="552" />
</endOffsets> </endOffsets>
</properties> </properties>
<option name="timeStamp" value="6" /> <option name="timeStamp" value="6" />

View File

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

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.35872698, a: 1} m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -104,7 +104,7 @@ NavMeshSettings:
serializedVersion: 2 serializedVersion: 2
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_BuildSettings: m_BuildSettings:
serializedVersion: 2 serializedVersion: 3
agentTypeID: 0 agentTypeID: 0
agentRadius: 0.5 agentRadius: 0.5
agentHeight: 2 agentHeight: 2
@ -117,7 +117,7 @@ NavMeshSettings:
cellSize: 0.16666667 cellSize: 0.16666667
manualTileSize: 0 manualTileSize: 0
tileSize: 256 tileSize: 256
accuratePlacement: 0 buildHeightMesh: 0
maxJobWorkers: 0 maxJobWorkers: 0
preserveTilesOutsideBounds: 0 preserveTilesOutsideBounds: 0
debug: debug:
@ -148,6 +148,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 171801267} m_GameObject: {fileID: 171801267}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
@ -155,7 +156,6 @@ Transform:
m_Children: m_Children:
- {fileID: 261785427} - {fileID: 261785427}
m_Father: {fileID: 1321366406} m_Father: {fileID: 1321366406}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &171801269 --- !u!81 &171801269
AudioListener: AudioListener:
@ -179,9 +179,17 @@ Camera:
m_projectionMatrixMode: 1 m_projectionMatrixMode: 1
m_GateFitMode: 2 m_GateFitMode: 2
m_FOVAxisMode: 0 m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24} m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0} m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect: m_NormalizedViewPortRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
@ -239,9 +247,17 @@ Camera:
m_projectionMatrixMode: 1 m_projectionMatrixMode: 1
m_GateFitMode: 2 m_GateFitMode: 2
m_FOVAxisMode: 0 m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24} m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0} m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect: m_NormalizedViewPortRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
@ -275,13 +291,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 261785425} m_GameObject: {fileID: 261785425}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 171801268} m_Father: {fileID: 171801268}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &438191521 --- !u!1 &438191521
GameObject: GameObject:
@ -369,13 +385,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 438191521} m_GameObject: {fileID: 438191521}
serializedVersion: 2
m_LocalRotation: {x: 0.32367495, y: 0.40315494, z: 0.3577457, w: 0.7776365} m_LocalRotation: {x: 0.32367495, y: 0.40315494, z: 0.3577457, w: 0.7776365}
m_LocalPosition: {x: 5.582583, y: 10.586806, z: -10.511573} m_LocalPosition: {x: 5.582583, y: 10.586806, z: -10.511573}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 12.413, y: 61.54, z: 56.818} m_LocalEulerAnglesHint: {x: 12.413, y: 61.54, z: 56.818}
--- !u!1 &1321366405 --- !u!1 &1321366405
GameObject: GameObject:
@ -402,6 +418,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1321366405} m_GameObject: {fileID: 1321366405}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
@ -410,8 +427,8 @@ Transform:
- {fileID: 171801268} - {fileID: 171801268}
- {fileID: 1619930059} - {fileID: 1619930059}
- {fileID: 1709265748} - {fileID: 1709265748}
- {fileID: 2142424751}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1321366407 --- !u!114 &1321366407
MonoBehaviour: MonoBehaviour:
@ -1251,7 +1268,6 @@ RectTransform:
m_Children: m_Children:
- {fileID: 6483743946380363312} - {fileID: 6483743946380363312}
m_Father: {fileID: 1321366406} m_Father: {fileID: 1321366406}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@ -1315,7 +1331,9 @@ Canvas:
m_OverrideSorting: 0 m_OverrideSorting: 0
m_OverridePixelPerfect: 0 m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0 m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25 m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_TargetDisplay: 0 m_TargetDisplay: 0
@ -1379,13 +1397,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1709265745} m_GameObject: {fileID: 1709265745}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1321366406} m_Father: {fileID: 1321366406}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2142424749 --- !u!1 &2142424749
GameObject: GameObject:
@ -1398,12 +1416,12 @@ GameObject:
- component: {fileID: 2142424751} - component: {fileID: 2142424751}
- component: {fileID: 2142424750} - component: {fileID: 2142424750}
m_Layer: 0 m_Layer: 0
m_Name: test m_Name: '*************Test**************'
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!114 &2142424750 --- !u!114 &2142424750
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1424,13 +1442,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2142424749} m_GameObject: {fileID: 2142424749}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 1321366406}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!222 &693992134497071616 --- !u!222 &693992134497071616
CanvasRenderer: CanvasRenderer:
@ -1462,7 +1480,6 @@ RectTransform:
m_Children: m_Children:
- {fileID: 3446357338686576132} - {fileID: 3446357338686576132}
m_Father: {fileID: 2757610425403794450} m_Father: {fileID: 2757610425403794450}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25} m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75} m_AnchorMax: {x: 1, y: 0.75}
@ -1650,7 +1667,6 @@ RectTransform:
- {fileID: 1274200815851310387} - {fileID: 1274200815851310387}
- {fileID: 6475230103791226419} - {fileID: 6475230103791226419}
m_Father: {fileID: 6483743946380363312} m_Father: {fileID: 6483743946380363312}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
@ -1670,7 +1686,6 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 2801900720503997580} m_Father: {fileID: 2801900720503997580}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
@ -1721,7 +1736,6 @@ RectTransform:
m_Children: m_Children:
- {fileID: 2791905327450121150} - {fileID: 2791905327450121150}
m_Father: {fileID: 6483743946380363312} m_Father: {fileID: 6483743946380363312}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
@ -1741,7 +1755,6 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 2757610425403794450} m_Father: {fileID: 2757610425403794450}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25} m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75} m_AnchorMax: {x: 1, y: 0.75}
@ -1791,7 +1804,6 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 6475230103791226419} m_Father: {fileID: 6475230103791226419}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@ -1811,7 +1823,6 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1274200815851310387} m_Father: {fileID: 1274200815851310387}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@ -2002,7 +2013,6 @@ RectTransform:
m_Children: m_Children:
- {fileID: 3044195824213782846} - {fileID: 3044195824213782846}
m_Father: {fileID: 2757610425403794450} m_Father: {fileID: 2757610425403794450}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
@ -2024,7 +2034,6 @@ RectTransform:
- {fileID: 2801900720503997580} - {fileID: 2801900720503997580}
- {fileID: 2757610425403794450} - {fileID: 2757610425403794450}
m_Father: {fileID: 1619930059} m_Father: {fileID: 1619930059}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
@ -2142,3 +2151,9 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 438191523}
- {fileID: 1321366406}

View File

@ -46,6 +46,7 @@ public class WayPointGraph : Graph<WayPoint>
{ {
this._wayPoint = wayPoint; this._wayPoint = wayPoint;
} }
public bool Equals(UniqueWayPoint other) public bool Equals(UniqueWayPoint other)
{ {
return _wayPoint.position == other._wayPoint.position; return _wayPoint.position == other._wayPoint.position;
@ -70,8 +71,8 @@ public class WayPointGraph : Graph<WayPoint>
{ {
return new UniqueWayPoint(wayPoint); return new UniqueWayPoint(wayPoint);
} }
} }
public void Initialize(GameGlobalConfig.NodeMap[] nodeMaps) public void Initialize(GameGlobalConfig.NodeMap[] nodeMaps)
{ {
HashSet<UniqueWayPoint> wayPoints = new HashSet<UniqueWayPoint>(); HashSet<UniqueWayPoint> wayPoints = new HashSet<UniqueWayPoint>();
@ -109,11 +110,13 @@ public class WayPointGraph : Graph<WayPoint>
{ {
this._connection[node1] = list1 = new List<Edge<WayPoint>>(); this._connection[node1] = list1 = new List<Edge<WayPoint>>();
} }
list1.Add(edge); list1.Add(edge);
if (!this._connection.TryGetValue(node2, out var list2)) if (!this._connection.TryGetValue(node2, out var list2))
{ {
this._connection[node2] = list2 = new List<Edge<WayPoint>>(); this._connection[node2] = list2 = new List<Edge<WayPoint>>();
} }
list2.Add(edge); list2.Add(edge);
} }
} }
@ -136,6 +139,7 @@ public class Graph<T>
return this._nodes[index]; return this._nodes[index];
} }
[CanBeNull] [CanBeNull]
internal Node<T> GetNode(Predicate<Node<T>> predicate) internal Node<T> GetNode(Predicate<Node<T>> predicate)
{ {
@ -244,6 +248,7 @@ public class Path<T>
{ {
return this._pathNodes; return this._pathNodes;
} }
public void GetDatas(IList<T> result) public void GetDatas(IList<T> result)
{ {
foreach (var pathNode in this._pathNodes) foreach (var pathNode in this._pathNodes)

View File

@ -1,5 +1,6 @@
using System; using System;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using Game.Player;
using UnityEngine; using UnityEngine;
namespace Game namespace Game
@ -10,12 +11,17 @@ namespace Game
private UIManager _uiManager; private UIManager _uiManager;
private ResourceManager _resourceManager; private ResourceManager _resourceManager;
private ProcedureManager _procedureManager; private ProcedureManager _procedureManager;
public PlayerManager _playerManager;
[SerializeField] private LoadType _loadType = LoadType.Editor; [SerializeField] private LoadType _loadType = LoadType.Editor;
[SerializeField] private float time; [SerializeField] private float time;
public static IProcedureManager procedureManager => _game._procedureManager; public static IProcedureManager procedureManager => _game._procedureManager;
public static IResourceManager resourceManager => _game._resourceManager; public static IResourceManager resourceManager => _game._resourceManager;
public static IUIManager uiManager => _game._uiManager; public static IUIManager uiManager => _game._uiManager;
public static IPlayerManager playerManager => _game._playerManager;
private void Awake() private void Awake()
{ {
_game = this; _game = this;
@ -25,10 +31,12 @@ namespace Game
_uiManager = new UIManager(); _uiManager = new UIManager();
_resourceManager = new ResourceManager(); _resourceManager = new ResourceManager();
this._procedureManager = new ProcedureManager(); this._procedureManager = new ProcedureManager();
this._playerManager = new PlayerManager();
_resourceManager.Init(); _resourceManager.Init();
_uiManager.Init(); _uiManager.Init();
this._procedureManager.Init(); this._procedureManager.Init();
this._playerManager.Init();
// ProcedureBase[] procedureBases = new ProcedureBase[] // ProcedureBase[] procedureBases = new ProcedureBase[]
// { // {

View File

@ -0,0 +1,109 @@
using System.Collections.Generic;
using System.Threading;
using Cysharp.Threading.Tasks;
using Game.Pathfinding;
using Sirenix.OdinInspector;
using UnityEngine;
namespace Game.Player;
public class PlayerManager : ManagerBase, IPlayerManager
{
private Dictionary<string, IPlayer> _players = new Dictionary<string, IPlayer>();
public IPlayer CreatePlayer(string playerName, string assetName)
{
var gameObject = Game.resourceManager.LoadGameObjectSync(assetName);
IPlayer player = new Player();
player.SetGameObject(gameObject, playerName);
this._players.Add(playerName, player);
return player;
}
public IPlayer GetPlayer(string playerName)
{
return this._players.GetValueOrDefault(playerName);
}
public void DeletePlayer(string playerName)
{
if (this._players.TryGetValue(playerName, out var player))
{
player.Dispose();
}
}
}
public interface IPlayerManager
{
//
IPlayer CreatePlayer(string playerName, string assetName);
IPlayer GetPlayer(string playerName);
void DeletePlayer(string playerName);
}
public interface IPlayer
{
string playerName { get; }
GameObject self { get; }
void SetGameObject(GameObject gameObject, string name);
UniTask<bool> MoveAsync(List<WayPoint> wayPoint, CancellationToken token);
void Dispose();
}
class PlayerInfo : MonoBehaviour
{
[SerializeField] [ReadOnly] private Player _player;
public void SetPlayer(Player player)
{
this._player = player;
gameObject.name = this._player.playerName;
}
}
internal class Player : IPlayer
{
private GameObject _self;
private string _playerName;
public string playerName => this._playerName;
public GameObject self => this._self;
public void SetGameObject(GameObject gameObject, string name)
{
this._self = gameObject;
this._playerName = name;
var playerInfo = this._self.AddComponent<PlayerInfo>();
playerInfo.SetPlayer(this);
}
public async UniTask<bool> MoveAsync(List<WayPoint> wayPoint, CancellationToken token)
{
foreach (var point in wayPoint)
{
bool isMoveing = true;
while (isMoveing)
{
await UniTask.Yield(token);
if (Vector3.Distance(self.transform.position, point.position) <= 0.1f)
{
isMoveing = false;
break;
}
this._self.transform.Translate(point.position);
}
}
return true;
}
public void Dispose()
{
GameObject.DestroyImmediate(self);
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 38b20a5af27a4d45abcda2e28c4e0a21
timeCreated: 1712285847

View File

@ -18,16 +18,20 @@ namespace Game
// await ResourceManager.Instance.LoadSceneAsync(SceneType.Game.ToString()); // await ResourceManager.Instance.LoadSceneAsync(SceneType.Game.ToString());
// EventManager.Instance.FireNow(this,new LoadingGameSceneFinishEventArgs(true)); // EventManager.Instance.FireNow(this,new LoadingGameSceneFinishEventArgs(true));
// }); // });
var player = Game.playerManager.CreatePlayer("测试","player");
var gameGlobalConfig = GameObject.FindObjectOfType<GameGlobalConfig>(); var gameGlobalConfig = GameObject.FindObjectOfType<GameGlobalConfig>();
BFS<WayPoint> bfs = new BFS<WayPoint>(CreateGraph(gameGlobalConfig)); BFS<WayPoint> bfs = new BFS<WayPoint>(CreateGraph(gameGlobalConfig));
var beginNode = GetNode(bfs, new Vector2(-5.6f,-14.6f)); var beginNode = GetNode(bfs, new Vector2(-29f,-16.5f));
var endNode = GetNode(bfs, new Vector2(-15.8f,44.3f)); var endNode = GetNode(bfs, new Vector2(-15.8f,44.3f));
var findPath = bfs.FindPath(beginNode, endNode); var findPath = bfs.FindPath(beginNode, endNode);
var wayPoints = new List<WayPoint>(); var wayPoints = new List<WayPoint>();
findPath.GetDatas(wayPoints); findPath.GetDatas(wayPoints);
Debug.Log($"Indices:{string.Join(',',findPath.GetNodes().Select(x=> x.index))}"); Debug.Log($"Indices:{string.Join(',',findPath.GetNodes().Select(x=> x.index))}");
Debug.Log($"Positions:{string.Join(',',findPath.GetNodes().Select(x=> x.data.position))}"); Debug.Log($"Positions:{string.Join(',',findPath.GetNodes().Select(x=> x.data.position))}");
// player.MoveAsync()
} }
[CanBeNull] [CanBeNull]

View File

@ -213,10 +213,10 @@ namespace Game
_packageName.Remove(packageName); _packageName.Remove(packageName);
} }
foreach (var handle in _sceneHandles.Values) // foreach (var handle in _sceneHandles.Values)
{ // {
UnloadSceneAsync(handle.SceneName); // UnloadSceneAsync(handle.SceneName);
} // }
_sceneHandles = null; _sceneHandles = null;
_packageName = null; _packageName = null;
@ -248,6 +248,7 @@ namespace Game
public interface IResourceManager public interface IResourceManager
{ {
AssetHandle LoadAssetSync(string name); AssetHandle LoadAssetSync(string name);
GameObject LoadGameObjectSync(string path);
GameObject LoadUIGameObjectSync(string path); GameObject LoadUIGameObjectSync(string path);
UniTask LoadSceneAsync(string name, LoadSceneMode loadSceneMode = LoadSceneMode.Single,bool suspendLoad = false); UniTask LoadSceneAsync(string name, LoadSceneMode loadSceneMode = LoadSceneMode.Single,bool suspendLoad = false);

View File

@ -7,7 +7,7 @@ namespace Game
{ {
public class Test : MonoBehaviour public class Test : MonoBehaviour
{ {
public Transform tr; // public Transform tr;
private void Update() private void Update()
{ {
@ -37,11 +37,15 @@ namespace Game
//var value = this.GetType().ToString().Split("."); //var value = this.GetType().ToString().Split(".");
// Debug.Log(value[^1]); // Debug.Log(value[^1]);
var values = Enum.GetValues(typeof(ProcedureType)); //
foreach (var value in values) // var values = Enum.GetValues(typeof(ProcedureType));
{ // foreach (var value in values)
UnityEngine.Debug.Log( value.ToString()); // {
} // UnityEngine.Debug.Log( value.ToString());
// }
//
} }
} }
} }

View File

@ -1 +1 @@
0ce7751036f8a9d4d8ddc94ebf8142dc b0320ea39a645ba385c482c6a8d18bb1

View File

@ -62,9 +62,9 @@
{ {
"BundleName": "defaultpackage_assets_hotfix_animator.bundle", "BundleName": "defaultpackage_assets_hotfix_animator.bundle",
"UnityCRC": 0, "UnityCRC": 0,
"FileHash": "e04ba4cfe20862bb193019f10ed492e3", "FileHash": "753b451aa9b58fb7304b46ea4610d6f9",
"FileCRC": "00000000", "FileCRC": "00000000",
"FileSize": 8572, "FileSize": 8281,
"Encrypted": false, "Encrypted": false,
"Tags": [], "Tags": [],
"DependIDs": [] "DependIDs": []
@ -72,9 +72,9 @@
{ {
"BundleName": "defaultpackage_assets_hotfix_material.bundle", "BundleName": "defaultpackage_assets_hotfix_material.bundle",
"UnityCRC": 0, "UnityCRC": 0,
"FileHash": "2efc397b9cd6d028131034c9f1637e07", "FileHash": "72fb17302a9e2a509c3c7f8629d237ce",
"FileCRC": "00000000", "FileCRC": "00000000",
"FileSize": 2278, "FileSize": 2195,
"Encrypted": false, "Encrypted": false,
"Tags": [], "Tags": [],
"DependIDs": [] "DependIDs": []
@ -82,9 +82,9 @@
{ {
"BundleName": "defaultpackage_assets_hotfix_prefabs.bundle", "BundleName": "defaultpackage_assets_hotfix_prefabs.bundle",
"UnityCRC": 0, "UnityCRC": 0,
"FileHash": "168fd2bd3d292d0c79e7b311716e1e0c", "FileHash": "fe7be2cecbb6fb054838e8345a41e194",
"FileCRC": "00000000", "FileCRC": "00000000",
"FileSize": 48823, "FileSize": 47274,
"Encrypted": false, "Encrypted": false,
"Tags": [], "Tags": [],
"DependIDs": [] "DependIDs": []
@ -92,9 +92,9 @@
{ {
"BundleName": "defaultpackage_assets_hotfix_prefabs_ui.bundle", "BundleName": "defaultpackage_assets_hotfix_prefabs_ui.bundle",
"UnityCRC": 0, "UnityCRC": 0,
"FileHash": "7e3e04e1d42ac8cf185d96598008c195", "FileHash": "fb04fe75a7a67c88be5242040345863a",
"FileCRC": "00000000", "FileCRC": "00000000",
"FileSize": 83864, "FileSize": 85310,
"Encrypted": false, "Encrypted": false,
"Tags": [], "Tags": [],
"DependIDs": [] "DependIDs": []
@ -102,9 +102,9 @@
{ {
"BundleName": "defaultpackage_assets_hotfix_scene.bundle", "BundleName": "defaultpackage_assets_hotfix_scene.bundle",
"UnityCRC": 0, "UnityCRC": 0,
"FileHash": "92af60652b438caf8c5568ff271a0c6b", "FileHash": "ef1ea81be8ec38308612fb323b2ceb49",
"FileCRC": "00000000", "FileCRC": "00000000",
"FileSize": 164738, "FileSize": 170796,
"Encrypted": false, "Encrypted": false,
"Tags": [], "Tags": [],
"DependIDs": [] "DependIDs": []

View File

@ -2,6 +2,7 @@
"dependencies": { "dependencies": {
"com.tuyoogame.yooasset": "2.1.0", "com.tuyoogame.yooasset": "2.1.0",
"com.unity.2d.sprite": "1.0.0", "com.unity.2d.sprite": "1.0.0",
"com.unity.ai.navigation": "1.1.5",
"com.unity.collab-proxy": "2.2.0", "com.unity.collab-proxy": "2.2.0",
"com.unity.feature.development": "1.0.1", "com.unity.feature.development": "1.0.1",
"com.unity.textmeshpro": "3.0.6", "com.unity.textmeshpro": "3.0.6",

View File

@ -18,89 +18,98 @@
"source": "builtin", "source": "builtin",
"dependencies": {} "dependencies": {}
}, },
"com.unity.ai.navigation": {
"version": "1.1.5",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.ai": "1.0.0"
},
"url": "https://packages.unity.cn"
},
"com.unity.collab-proxy": { "com.unity.collab-proxy": {
"version": "2.2.0", "version": "2.2.0",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.editorcoroutines": { "com.unity.editorcoroutines": {
"version": "1.0.0", "version": "1.0.0",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.ext.nunit": { "com.unity.ext.nunit": {
"version": "1.0.6", "version": "1.0.6",
"depth": 2, "depth": 2,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.feature.development": { "com.unity.feature.development": {
"version": "1.0.1", "version": "1.0.1",
"depth": 0, "depth": 0,
"source": "builtin", "source": "builtin",
"dependencies": { "dependencies": {
"com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.rider": "3.0.18", "com.unity.ide.rider": "3.0.27",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0", "com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.2.2", "com.unity.performance.profile-analyzer": "1.2.2",
"com.unity.test-framework": "1.1.31", "com.unity.test-framework": "1.1.33",
"com.unity.testtools.codecoverage": "1.2.2" "com.unity.testtools.codecoverage": "1.2.4"
} }
}, },
"com.unity.ide.rider": { "com.unity.ide.rider": {
"version": "3.0.18", "version": "3.0.27",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.ext.nunit": "1.0.6" "com.unity.ext.nunit": "1.0.6"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.ide.visualstudio": { "com.unity.ide.visualstudio": {
"version": "2.0.17", "version": "2.0.22",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.test-framework": "1.1.9" "com.unity.test-framework": "1.1.9"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.ide.vscode": { "com.unity.ide.vscode": {
"version": "1.2.5", "version": "1.2.5",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.performance.profile-analyzer": { "com.unity.performance.profile-analyzer": {
"version": "1.2.2", "version": "1.2.2",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.scriptablebuildpipeline": { "com.unity.scriptablebuildpipeline": {
"version": "1.21.21", "version": "1.21.21",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.settings-manager": { "com.unity.settings-manager": {
"version": "1.0.3", "version": "2.0.1",
"depth": 2, "depth": 2,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.test-framework": { "com.unity.test-framework": {
"version": "1.1.31", "version": "1.1.33",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -108,17 +117,17 @@
"com.unity.modules.imgui": "1.0.0", "com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0" "com.unity.modules.jsonserialize": "1.0.0"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.testtools.codecoverage": { "com.unity.testtools.codecoverage": {
"version": "1.2.2", "version": "1.2.4",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.test-framework": "1.0.16", "com.unity.test-framework": "1.0.16",
"com.unity.settings-manager": "1.0.1" "com.unity.settings-manager": "1.0.1"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.textmeshpro": { "com.unity.textmeshpro": {
"version": "3.0.6", "version": "3.0.6",
@ -127,7 +136,7 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.timeline": { "com.unity.timeline": {
"version": "1.7.6", "version": "1.7.6",
@ -139,7 +148,7 @@
"com.unity.modules.audio": "1.0.0", "com.unity.modules.audio": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0" "com.unity.modules.particlesystem": "1.0.0"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.cn"
}, },
"com.unity.ugui": { "com.unity.ugui": {
"version": "1.0.0", "version": "1.0.0",
@ -282,17 +291,6 @@
"version": "1.0.0", "version": "1.0.0",
"depth": 0, "depth": 0,
"source": "builtin", "source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.uielementsnative": "1.0.0"
}
},
"com.unity.modules.uielementsnative": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": { "dependencies": {
"com.unity.modules.ui": "1.0.0", "com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0", "com.unity.modules.imgui": "1.0.0",

View File

@ -13,15 +13,15 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_EnablePreReleasePackages: 0 m_EnablePreReleasePackages: 0
m_EnablePackageDependencies: 0
m_AdvancedSettingsExpanded: 1 m_AdvancedSettingsExpanded: 1
m_ScopedRegistriesSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1
m_SeeAllPackageVersions: 0 m_SeeAllPackageVersions: 0
m_DismissPreviewPackagesInUse: 0
oneTimeWarningShown: 0 oneTimeWarningShown: 0
m_Registries: m_Registries:
- m_Id: main - m_Id: main
m_Name: m_Name:
m_Url: https://packages.unity.com m_Url: https://packages.unity.cn
m_Scopes: [] m_Scopes: []
m_IsDefault: 1 m_IsDefault: 1
m_Capabilities: 7 m_Capabilities: 7
@ -39,6 +39,6 @@ MonoBehaviour:
m_RegistryInfoDraft: m_RegistryInfoDraft:
m_Modified: 0 m_Modified: 0
m_ErrorMessage: m_ErrorMessage:
m_UserModificationsInstanceId: -850 m_UserModificationsInstanceId: -830
m_OriginalInstanceId: -854 m_OriginalInstanceId: -834
m_LoadAssets: 0 m_LoadAssets: 0

View File

@ -1,6 +1,4 @@
{ {
"m_Name": "Settings",
"m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json",
"m_Dictionary": { "m_Dictionary": {
"m_DictionaryValues": [] "m_DictionaryValues": []
} }

View File

@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.22f1 m_EditorVersion: 2022.3.17f1c1
m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3) m_EditorVersionWithRevision: 2022.3.17f1c1 (a01dafa986ec)