diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 00000000..d70cd98b --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity b/Assets/Group1/Scenes/KillAllEnemies.unity index 21adfb9b..de1555c0 100644 --- a/Assets/Group1/Scenes/KillAllEnemies.unity +++ b/Assets/Group1/Scenes/KillAllEnemies.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 10 m_AtlasSize: 512 @@ -62,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -76,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 256 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -87,9 +94,12 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 8d5b28f345beb9848827a85a8ac30ad7, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -109,9 +119,111 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &136932431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 136932432} + - component: {fileID: 136932434} + - component: {fileID: 136932433} + m_Layer: 0 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &136932432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136932431} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 1} + m_Children: [] + m_Father: {fileID: 141422279} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &136932433 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136932431} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &136932434 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136932431} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &141422275 GameObject: m_ObjectHideFlags: 0 @@ -156,6 +268,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -167,6 +281,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -179,7 +294,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c393ddce902166c4fb0e2130d216d549, type: 3} + m_Sprite: {fileID: 21300000, guid: f57469eb5216ae041b6302b6da1e2065, type: 3} m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -197,12 +312,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 141422275} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: 3.09, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Children: + - {fileID: 136932432} + m_Father: {fileID: 1974835355} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170076733 GameObject: @@ -229,12 +345,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170076733} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 2 @@ -244,6 +362,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -251,12 +387,16 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &170076735 @@ -284,7 +424,6 @@ GameObject: - component: {fileID: 534669905} - component: {fileID: 534669904} - component: {fileID: 534669903} - - component: {fileID: 534669906} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -312,9 +451,10 @@ Camera: m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 @@ -356,25 +496,103 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &534669906 +--- !u!1 &836932021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 836932023} + - component: {fileID: 836932022} + - component: {fileID: 836932024} + m_Layer: 0 + m_Name: IconSpeed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &836932022 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 836932021} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -9095717837082945937, guid: 02e7924fc96084d46ab2e8b369552542, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &836932023 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 836932021} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.74, y: 3.11, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: + - {fileID: 1140142449} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &836932024 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 534669902} + m_GameObject: {fileID: 836932021} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} + m_Script: {fileID: 11500000, guid: 2da67b6cdc15a5142a813b0eb03126fd, type: 3} m_Name: m_EditorClassIdentifier: - go: {fileID: 1054253062} - a: {fileID: 1761935009} - B: - - {fileID: 2083640146} - - {fileID: 1754708960} - - {fileID: 141422275} - - {fileID: 1578050036} --- !u!1 &1054253062 GameObject: m_ObjectHideFlags: 0 @@ -386,7 +604,7 @@ GameObject: - component: {fileID: 1054253064} - component: {fileID: 1054253063} m_Layer: 0 - m_Name: New Sprite + m_Name: EndLevel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -406,6 +624,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -417,6 +637,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -429,7 +650,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 100 - m_Sprite: {fileID: 21300000, guid: c393ddce902166c4fb0e2130d216d549, type: 3} + m_Sprite: {fileID: 21300000, guid: f57469eb5216ae041b6302b6da1e2065, type: 3} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -448,13 +669,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054253062} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} - m_LocalScale: {x: 25, y: 25, z: 1} + m_LocalPosition: {x: 2.5634, y: -1.4614, z: -0.15457831} + m_LocalScale: {x: 80.66636, y: 76.936165, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1578050036 +--- !u!1 &1140142448 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -462,35 +683,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1578050040} - - component: {fileID: 1578050039} - - component: {fileID: 1578050038} + - component: {fileID: 1140142449} + - component: {fileID: 1140142451} + - component: {fileID: 1140142450} m_Layer: 0 - m_Name: enemy - m_TagString: Enemy + m_Name: Circle + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1578050038 -MonoBehaviour: +--- !u!4 &1140142449 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} + m_GameObject: {fileID: 1140142448} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 1} + m_Children: [] + m_Father: {fileID: 836932023} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &1140142450 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140142448} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!212 &1578050039 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &1140142451 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} + m_GameObject: {fileID: 1140142448} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -498,6 +737,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -509,10 +750,11 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -521,8 +763,9 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c393ddce902166c4fb0e2130d216d549, type: 3} - m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} + m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -532,21 +775,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1578050040 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: -1.34, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1754708960 +--- !u!1 &1578050036 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -554,9 +783,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1754708964} - - component: {fileID: 1754708963} - - component: {fileID: 1754708962} + - component: {fileID: 1578050040} + - component: {fileID: 1578050039} + - component: {fileID: 1578050038} m_Layer: 0 m_Name: enemy m_TagString: Enemy @@ -564,25 +793,25 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1754708962 +--- !u!114 &1578050038 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} + m_GameObject: {fileID: 1578050036} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &1754708963 +--- !u!212 &1578050039 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} + m_GameObject: {fileID: 1578050036} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -590,6 +819,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -601,6 +832,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -613,7 +845,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c393ddce902166c4fb0e2130d216d549, type: 3} + m_Sprite: {fileID: 21300000, guid: f57469eb5216ae041b6302b6da1e2065, type: 3} m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -624,21 +856,22 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1754708964 +--- !u!4 &1578050040 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: 0.71, z: 0} + m_GameObject: {fileID: 1578050036} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -4.43, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} + m_Children: + - {fileID: 2135072972} + m_Father: {fileID: 1974835355} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1761935009 +--- !u!1 &1735018778 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -646,23 +879,76 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1761935011} - - component: {fileID: 1761935010} - - component: {fileID: 1761935012} + - component: {fileID: 1735018779} + - component: {fileID: 1735018782} + - component: {fileID: 1735018781} + - component: {fileID: 1735018780} + - component: {fileID: 1735018783} m_Layer: 0 - m_Name: New Sprite (1) + m_Name: Circle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!212 &1761935010 +--- !u!4 &1735018779 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735018778} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 1} + m_Children: [] + m_Father: {fileID: 1761935011} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &1735018780 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735018778} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 0.0001 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &1735018781 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735018778} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &1735018782 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1761935009} + m_GameObject: {fileID: 1735018778} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -670,6 +956,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -681,10 +969,11 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -692,9 +981,10 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: e3d497cf399ca0d42af41c518d283eb2, type: 3} - m_Color: {r: 0.008547783, g: 1, b: 0, a: 1} + m_SortingOrder: 0 + m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -704,35 +994,362 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1761935011 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1761935009} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1761935012 +--- !u!114 &1735018783 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1761935009} + m_GameObject: {fileID: 1735018778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a985bd01b946334ca461a5419553117, type: 3} + m_Name: + m_EditorClassIdentifier: + _enemyContainer: {fileID: 1974835356} +--- !u!1 &1754708960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1754708964} + - component: {fileID: 1754708963} + - component: {fileID: 1754708962} + m_Layer: 0 + m_Name: enemy + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1754708962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754708960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!212 &1754708963 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754708960} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: f57469eb5216ae041b6302b6da1e2065, type: 3} + m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1754708964 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754708960} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -2.3799999, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2130913285} + m_Father: {fileID: 1974835355} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1761935009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1761935011} + - component: {fileID: 1761935010} + - component: {fileID: 1761935013} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1761935010 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761935009} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: 783ea09b1f87a1d49bc8a5af2a23db5e, type: 3} + m_Color: {r: 0.008547783, g: 1, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1761935011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761935009} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1735018779} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1761935013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761935009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} + m_Name: + m_EditorClassIdentifier: + _speed: 4 + _timer: 1 + _time: 2 +--- !u!1 &1917585921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1917585922} + - component: {fileID: 1917585924} + - component: {fileID: 1917585923} + m_Layer: 0 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1917585922 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917585921} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 1} + m_Children: [] + m_Father: {fileID: 2083640148} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &1917585923 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917585921} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &1917585924 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917585921} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1974835354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1974835355} + - component: {fileID: 1974835356} + m_Layer: 0 + m_Name: EnemyContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1974835355 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1974835354} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.59, y: 3.09, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2083640148} + - {fileID: 1754708964} + - {fileID: 141422279} + - {fileID: 1578050040} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1974835356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1974835354} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 + _endLevel: {fileID: 1054253062} --- !u!1 &2083640146 GameObject: m_ObjectHideFlags: 0 @@ -765,6 +1382,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -776,6 +1395,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -788,7 +1408,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c393ddce902166c4fb0e2130d216d549, type: 3} + m_Sprite: {fileID: 21300000, guid: f57469eb5216ae041b6302b6da1e2065, type: 3} m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -806,12 +1426,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2083640146} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.13, y: 0.71, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.7200003, y: -2.3799999, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Children: + - {fileID: 1917585922} + m_Father: {fileID: 1974835355} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2083640150 MonoBehaviour: @@ -825,3 +1446,203 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2130913284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2130913285} + - component: {fileID: 2130913287} + - component: {fileID: 2130913286} + m_Layer: 0 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2130913285 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2130913284} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 1} + m_Children: [] + m_Father: {fileID: 1754708964} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &2130913286 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2130913284} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &2130913287 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2130913284} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2135072971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2135072972} + - component: {fileID: 2135072974} + - component: {fileID: 2135072973} + m_Layer: 0 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2135072972 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135072971} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 1} + m_Children: [] + m_Father: {fileID: 1578050040} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &2135072973 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135072971} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &2135072974 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135072971} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Group1/Scenes/KillAllEnemiesSettings.lighting b/Assets/Group1/Scenes/KillAllEnemiesSettings.lighting new file mode 100644 index 00000000..9321e507 --- /dev/null +++ b/Assets/Group1/Scenes/KillAllEnemiesSettings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KillAllEnemiesSettings + serializedVersion: 3 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 512 + m_BakeResolution: 10 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 256 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/Assets/Group1/Scenes/KillAllEnemiesSettings.lighting.meta b/Assets/Group1/Scenes/KillAllEnemiesSettings.lighting.meta new file mode 100644 index 00000000..178d250f --- /dev/null +++ b/Assets/Group1/Scenes/KillAllEnemiesSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d5b28f345beb9848827a85a8ac30ad7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/Enemy.cs b/Assets/Group1/Scripts/Enemy.cs new file mode 100644 index 00000000..26d34e3d --- /dev/null +++ b/Assets/Group1/Scripts/Enemy.cs @@ -0,0 +1,29 @@ +using UnityEngine; + +public class Enemy : MonoBehaviour +{ + private readonly float _maxDistance = 2; + + private Vector3 _target; + + + private void Start() + { + SetTarget(); + } + + private void FixedUpdate() + { + transform.position = Vector3.MoveTowards(transform.position, _target, _maxDistance * Time.deltaTime); + + if (transform.position == _target) + SetTarget(); + } + + private void SetTarget() + { + int coefficient = 4; + + _target = Random.insideUnitCircle * coefficient; + } +} diff --git a/Assets/Group1/Scripts/e.cs.meta b/Assets/Group1/Scripts/Enemy.cs.meta similarity index 100% rename from Assets/Group1/Scripts/e.cs.meta rename to Assets/Group1/Scripts/Enemy.cs.meta diff --git a/Assets/Group1/Scripts/EnemyContainer.cs b/Assets/Group1/Scripts/EnemyContainer.cs new file mode 100644 index 00000000..e12e114b --- /dev/null +++ b/Assets/Group1/Scripts/EnemyContainer.cs @@ -0,0 +1,13 @@ +using UnityEngine; + +public class EnemyContainer : MonoBehaviour +{ + [SerializeField] private GameObject _endLevel; + + + public void TryEndLevel() + { + if (transform.childCount == 1) + _endLevel.SetActive(true); + } +} diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta b/Assets/Group1/Scripts/EnemyContainer.cs.meta similarity index 100% rename from Assets/Group1/Scripts/NewBehaviourScript1.cs.meta rename to Assets/Group1/Scripts/EnemyContainer.cs.meta diff --git a/Assets/Group1/Scripts/GameController.cs b/Assets/Group1/Scripts/GameController.cs deleted file mode 100644 index 6afe5356..00000000 --- a/Assets/Group1/Scripts/GameController.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class GameController : MonoBehaviour -{ - public static GameController controller; - - public GameObject go; - public GameObject a; - public GameObject[] B; - - // Start is called before the first frame update - void Start() - { - controller = this; - } - - public void End() - { - go.SetActive(true); - } - - // Update is called once per frame - void Update(){ - foreach (var b in B) - { - if (b == null) - continue; - - if (Vector3.Distance(a.gameObject.gameObject.GetComponent().position, b.gameObject.gameObject.transform.position) < 0.2f) - { - a.SendMessage("SendMEssage", b); - } - - } - } -} diff --git a/Assets/Group1/Scripts/IconSpeed.cs b/Assets/Group1/Scripts/IconSpeed.cs new file mode 100644 index 00000000..f4f41b1d --- /dev/null +++ b/Assets/Group1/Scripts/IconSpeed.cs @@ -0,0 +1,5 @@ +using UnityEngine; + +public class IconSpeed : MonoBehaviour +{ +} diff --git a/Assets/Group1/Scripts/IconSpeed.cs.meta b/Assets/Group1/Scripts/IconSpeed.cs.meta new file mode 100644 index 00000000..d73239d4 --- /dev/null +++ b/Assets/Group1/Scripts/IconSpeed.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2da67b6cdc15a5142a813b0eb03126fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs b/Assets/Group1/Scripts/NewBehaviourScript1.cs deleted file mode 100644 index 14bd7c3f..00000000 --- a/Assets/Group1/Scripts/NewBehaviourScript1.cs +++ /dev/null @@ -1,65 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class NewBehaviourScript1 : MonoBehaviour -{ - public float spEed; - public bool timer; - public float time; - // Use this for initialization - - - void Start() - { - } - // Update is called once per frame - void Update(){ - if (timer) - { - time -= Time.deltaTime; - if(time < 0) - { - timer = false; - spEed /= 2; - } - } - - GameObject[] result = GameObject.FindGameObjectsWithTag("Enemy"); - - if(result.Length == 0) - { - GameController.controller.End(); - enabled = false; - } - - if (Input.GetKey(KeyCode.W)) - transform.Translate(0, spEed * Time.deltaTime, 0); - - if (Input.GetKey(KeyCode.S)) - transform.Translate(0, -spEed * Time.deltaTime, 0); - - if (Input.GetKey(KeyCode.A)) - transform.Translate(-spEed * Time.deltaTime, 0, 0); - - if (Input.GetKey(KeyCode.D)) - transform.Translate(spEed * Time.deltaTime, 0, 0); - } - - public void SendMEssage(GameObject b) - { - - - if(b.name == "enemy") - { - Destroy(b); - }if(b.name == "speed") - { - spEed *= 2; - timer = true; - time = 2; - - - - } - } -} diff --git a/Assets/Group1/Scripts/PlayerCollision.cs b/Assets/Group1/Scripts/PlayerCollision.cs new file mode 100644 index 00000000..fa24ba01 --- /dev/null +++ b/Assets/Group1/Scripts/PlayerCollision.cs @@ -0,0 +1,29 @@ +using UnityEngine; + +public class PlayerCollision : MonoBehaviour +{ + [SerializeField] private EnemyContainer _enemyContainer; + + + private void OnCollisionEnter2D(Collision2D collision) + { + if (collision.collider.transform.parent.TryGetComponent(out _)) + { + Destroy(collision); + + _enemyContainer.TryEndLevel(); + } + + if (collision.collider.transform.parent.TryGetComponent(out _)) + { + transform.parent.GetComponent().IncreaseSpeed(); + + Destroy(collision); + } + } + + private void Destroy(Collision2D collision) + { + Destroy(collision.collider.transform.parent.gameObject); + } +} diff --git a/Assets/Group1/Scripts/PlayerCollision.cs.meta b/Assets/Group1/Scripts/PlayerCollision.cs.meta new file mode 100644 index 00000000..b9aa434f --- /dev/null +++ b/Assets/Group1/Scripts/PlayerCollision.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7a985bd01b946334ca461a5419553117 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/PlayerController.cs b/Assets/Group1/Scripts/PlayerController.cs new file mode 100644 index 00000000..96662e8a --- /dev/null +++ b/Assets/Group1/Scripts/PlayerController.cs @@ -0,0 +1,75 @@ +using System.Collections; +using UnityEngine; + +public class PlayerController : MonoBehaviour +{ + [SerializeField] private float _speed; + [SerializeField] private bool _timer; + [SerializeField] private float _time; + + private int _speedMultiplier = 2; + private int _speedDivider = 2; + + private float _timeValue; + + + private void Start() + { + _timeValue = _time; + + PlayTime(); + } + + private void Update() + { + if (Input.GetKey(KeyCode.W)) + Move(0f, _speed * Time.deltaTime); + + if (Input.GetKey(KeyCode.S)) + Move(0f, -_speed * Time.deltaTime); + + if (Input.GetKey(KeyCode.A)) + Move(-_speed * Time.deltaTime); + + if (Input.GetKey(KeyCode.D)) + Move(_speed * Time.deltaTime); + } + + public void IncreaseSpeed() + { + _speed *= _speedMultiplier; + + _timer = true; + _time = _timeValue; + + PlayTime(); + } + + private void Move(float x, float y = 0, float z = 0) + { + transform.Translate(x, y, z); + } + + private IEnumerator WaitForSeconds() + { + yield return new WaitForFixedUpdate(); + + PlayTime(); + } + + private void PlayTime() + { + if (_timer) + { + _time -= Time.deltaTime; + + if (_time < 0) + { + _timer = false; + _speed /= _speedDivider; + } + + StartCoroutine(WaitForSeconds()); + } + } +} diff --git a/Assets/Group1/Scripts/GameController.cs.meta b/Assets/Group1/Scripts/PlayerController.cs.meta similarity index 100% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Group1/Scripts/PlayerController.cs.meta diff --git a/Assets/Group1/Scripts/e.cs b/Assets/Group1/Scripts/e.cs deleted file mode 100644 index 048ebf2d..00000000 --- a/Assets/Group1/Scripts/e.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class e : MonoBehaviour -{ - private Vector3 Target; - - // Start is called before the first frame update - void Start() - { - Target = Random.insideUnitCircle * 4; - } - - // Update is called once per frame - void Update() - { - transform.position = Vector3.MoveTowards(transform.position, Target, 2 * Time.deltaTime); - if (transform.position == Target) - Target = Random.insideUnitCircle * 4 ; - } -} diff --git a/Assets/Group1/Sprites.meta b/Assets/Group1/Sprites.meta new file mode 100644 index 00000000..f05f5134 --- /dev/null +++ b/Assets/Group1/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 139b9222ef383aa4cba777135056fe13 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Player.png b/Assets/Group1/Sprites/Enemy.png similarity index 100% rename from Assets/Group1/Player.png rename to Assets/Group1/Sprites/Enemy.png diff --git a/Assets/Group1/enemy.png.meta b/Assets/Group1/Sprites/Enemy.png.meta similarity index 98% rename from Assets/Group1/enemy.png.meta rename to Assets/Group1/Sprites/Enemy.png.meta index 59008605..3e05e093 100644 --- a/Assets/Group1/enemy.png.meta +++ b/Assets/Group1/Sprites/Enemy.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c393ddce902166c4fb0e2130d216d549 +guid: f57469eb5216ae041b6302b6da1e2065 TextureImporter: fileIDToRecycleName: {} externalObjects: {} diff --git a/Assets/Group1/enemy.png b/Assets/Group1/Sprites/Player.png similarity index 100% rename from Assets/Group1/enemy.png rename to Assets/Group1/Sprites/Player.png diff --git a/Assets/Group1/Player.png.meta b/Assets/Group1/Sprites/Player.png.meta similarity index 99% rename from Assets/Group1/Player.png.meta rename to Assets/Group1/Sprites/Player.png.meta index bc855aad..fe522f0c 100644 --- a/Assets/Group1/Player.png.meta +++ b/Assets/Group1/Sprites/Player.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e3d497cf399ca0d42af41c518d283eb2 +guid: 783ea09b1f87a1d49bc8a5af2a23db5e TextureImporter: fileIDToRecycleName: {} externalObjects: {} diff --git a/Assets/Group1/Sprites/Speed.png b/Assets/Group1/Sprites/Speed.png new file mode 100644 index 00000000..eb8bb2b6 Binary files /dev/null and b/Assets/Group1/Sprites/Speed.png differ diff --git a/Assets/Group1/Sprites/Speed.png.meta b/Assets/Group1/Sprites/Speed.png.meta new file mode 100644 index 00000000..9610b574 --- /dev/null +++ b/Assets/Group1/Sprites/Speed.png.meta @@ -0,0 +1,180 @@ +fileFormatVersion: 2 +guid: 02e7924fc96084d46ab2e8b369552542 +TextureImporter: + internalIDToNameTable: + - first: + 213: -9095717837082945937 + second: Capsule + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: 0 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 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: iPhone + 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: + - serializedVersion: 2 + name: Capsule + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 256 + height: 512 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: + - - {x: -33, y: 256} + - {x: -95, y: 223} + - {x: -128, y: 161} + - {x: -128, y: -161} + - {x: -95, y: -223} + - {x: -33, y: -256} + - {x: 33, y: -256} + - {x: 95, y: -223} + - {x: 128, y: -161} + - {x: 128, y: 161} + - {x: 95, y: 223} + - {x: 33, y: 256} + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f669c7f71d485c180800000000000000 + internalID: -9095717837082945937 + vertices: [] + indices: + edges: [] + weights: [] + outline: + - - {x: -33, y: 256} + - {x: -95, y: 223} + - {x: -128, y: 161} + - {x: -128, y: -161} + - {x: -95, y: -223} + - {x: -33, y: -256} + - {x: 33, y: -256} + - {x: 95, y: -223} + - {x: 128, y: -161} + - {x: 128, y: 161} + - {x: 95, y: 223} + - {x: 33, y: 256} + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 00000000..3e92a597 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8221612b1f77fc845a7f198f28ba5071 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/BillingMode.json b/Assets/Resources/BillingMode.json new file mode 100644 index 00000000..6f4bfb71 --- /dev/null +++ b/Assets/Resources/BillingMode.json @@ -0,0 +1 @@ +{"androidStore":"GooglePlay"} \ No newline at end of file diff --git a/Assets/Resources/BillingMode.json.meta b/Assets/Resources/BillingMode.json.meta new file mode 100644 index 00000000..4802f70b --- /dev/null +++ b/Assets/Resources/BillingMode.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c5f600177be01b34bb95def1a6754317 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt new file mode 100644 index 00000000..1885645a --- /dev/null +++ b/Logs/ApiUpdaterCheck.txt @@ -0,0 +1,160 @@ +[api-updater (non-obsolete-error-filter)] 17.10.2021 12:24:16 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 52,6093ms +moved types parse time: 38ms +candidates parse time : 0ms +C# parse time : 150ms +candidates check time : 34ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 12:33:59 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 43,6389ms +moved types parse time: 37ms +candidates parse time : 0ms +C# parse time : 128ms +candidates check time : 31ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 12:34:44 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 43,9165ms +moved types parse time: 37ms +candidates parse time : 0ms +C# parse time : 128ms +candidates check time : 31ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 13:34:29 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 44,8801ms +moved types parse time: 37ms +candidates parse time : 0ms +C# parse time : 139ms +candidates check time : 31ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 13:35:45 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 44,244ms +moved types parse time: 38ms +candidates parse time : 0ms +C# parse time : 139ms +candidates check time : 31ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 13:39:32 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 44,5412ms +moved types parse time: 37ms +candidates parse time : 0ms +C# parse time : 133ms +candidates check time : 32ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 13:40:42 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 43,7635ms +moved types parse time: 38ms +candidates parse time : 1ms +C# parse time : 141ms +candidates check time : 32ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 13:41:20 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 42,8867ms +moved types parse time: 37ms +candidates parse time : 0ms +C# parse time : 136ms +candidates check time : 31ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 13:42:18 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 43,6167ms +moved types parse time: 37ms +candidates parse time : 0ms +C# parse time : 139ms +candidates check time : 32ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 13:42:31 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 43,8828ms +moved types parse time: 37ms +candidates parse time : 0ms +C# parse time : 137ms +candidates check time : 31ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 13:43:47 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 44,7996ms +moved types parse time: 37ms +candidates parse time : 1ms +C# parse time : 139ms +candidates check time : 32ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 14:21:34 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 48,381ms +moved types parse time: 38ms +candidates parse time : 0ms +C# parse time : 142ms +candidates check time : 34ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 14:21:38 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 43,8833ms +moved types parse time: 37ms +candidates parse time : 0ms +C# parse time : 138ms +candidates check time : 33ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 14:21:49 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 43,8822ms +moved types parse time: 38ms +candidates parse time : 0ms +C# parse time : 139ms +candidates check time : 32ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 14:22:02 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 43,4815ms +moved types parse time: 37ms +candidates parse time : 0ms +C# parse time : 139ms +candidates check time : 30ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 17.10.2021 16:29:15 : Starting C:/Program Files/Unity/2020.3.17f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 46,9103ms +moved types parse time: 38ms +candidates parse time : 0ms +C# parse time : 122ms +candidates check time : 20ms +console write time : 0ms + diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log new file mode 100644 index 00000000..f2090559 --- /dev/null +++ b/Logs/AssetImportWorker0-prev.log @@ -0,0 +1,216 @@ +Using pre-set license +Built from '2020.3/staging' branch; Version is '2020.3.17f1 (a4537701e4ab) revision 10769271'; Using compiler version '192528614'; Build Type 'Release' +OS: 'Windows 10 Home; OS build 19043.1288; Version 2009; 64bit' Language: 'ru' Physical Memory: 24497 MB +BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0 + +COMMAND LINE ARGUMENTS: +C:\Program Files\Unity\2020.3.17f1\Editor\Unity.exe +-adb2 +-batchMode +-noUpm +-name +AssetImportWorker0 +-projectPath +C:/Users/Vektorrus/Documents/GitHub/SHK-Unity +-logFile +Logs/AssetImportWorker0.log +-srvPort +57154 +Successfully changed project path to: C:/Users/Vektorrus/Documents/GitHub/SHK-Unity +C:/Users/Vektorrus/Documents/GitHub/SHK-Unity +Using Asset Import Pipeline V2. +Refreshing native plugins compatible for Editor in 45.74 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Initialize engine version: 2020.3.17f1 (a4537701e4ab) +[Subsystems] Discovering subsystems at path C:/Program Files/Unity/2020.3.17f1/Editor/Data/Resources/UnitySubsystems +[Subsystems] Discovering subsystems at path C:/Users/Vektorrus/Documents/GitHub/SHK-Unity/Assets +GfxDevice: creating device client; threaded=0 +Direct3D: + Version: Direct3D 11.0 [level 11.1] + Renderer: NVIDIA GeForce GTX 1050 Ti (ID=0x1c82) + Vendor: + VRAM: 4018 MB + Driver: 30.0.14.7212 +Initialize mono +Mono path[0] = 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/Managed' +Mono path[1] = 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' +Mono config path = 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/MonoBleedingEdge/etc' +Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56820 +Begin MonoManager ReloadAssembly +Registering precompiled unity dll's ... +Register platform support module: C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll +Registered in 0.001711 seconds. +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 38.39 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 1.463 seconds +Domain Reload Profiling: + ReloadAssembly (1463ms) + BeginReloadAssembly (43ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (0ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (1ms) + EndReloadAssembly (333ms) + LoadAssemblies (41ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (115ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (24ms) + SetupLoadedEditorAssemblies (138ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (3ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (38ms) + BeforeProcessingInitializeOnLoad (13ms) + ProcessInitializeOnLoadAttributes (60ms) + ProcessInitializeOnLoadMethodAttributes (24ms) + AfterProcessingInitializeOnLoad (0ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (0ms) +Platform modules already initialized, skipping +Registering precompiled user dll's ... +Registered in 0.004711 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.55 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.906 seconds +Domain Reload Profiling: + ReloadAssembly (907ms) + BeginReloadAssembly (112ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (4ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (14ms) + EndReloadAssembly (745ms) + LoadAssemblies (74ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (211ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (34ms) + SetupLoadedEditorAssemblies (355ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (1ms) + BeforeProcessingInitializeOnLoad (73ms) + ProcessInitializeOnLoadAttributes (239ms) + ProcessInitializeOnLoadMethodAttributes (33ms) + AfterProcessingInitializeOnLoad (5ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (5ms) +Platform modules already initialized, skipping +======================================================================== +Worker process is ready to serve import requests +Launched and connected shader compiler UnityShaderCompiler.exe after 0.03 seconds +Refreshing native plugins compatible for Editor in 0.54 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1970 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 81.0 MB. +System memory in use after: 81.1 MB. + +Unloading 58 unused Assets to reduce memory usage. Loaded Objects now: 2374. +Total: 4.475200 ms (FindLiveObjects: 0.161000 ms CreateObjectMapping: 0.067200 ms MarkObjects: 4.190000 ms DeleteObjects: 0.056100 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +======================================================================== +Received Import Request. + path: Assets/Group1/Scripts/IconSpeed.cs + artifactKey: Guid(2da67b6cdc15a5142a813b0eb03126fd) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/IconSpeed.cs using Guid(2da67b6cdc15a5142a813b0eb03126fd) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'f955dd181e522a024cc9e6d24ebc05ad') in 0.014829 seconds + Import took 0.017090 seconds . + +======================================================================== +Received Prepare +Refreshing native plugins compatible for Editor in 10.56 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 47 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 42.8 MB. +System memory in use after: 42.9 MB. + +Unloading 47 unused Assets to reduce memory usage. Loaded Objects now: 2374. +Total: 4.711900 ms (FindLiveObjects: 0.169800 ms CreateObjectMapping: 0.060600 ms MarkObjects: 4.459300 ms DeleteObjects: 0.021400 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.004278 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.54 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.815 seconds +Domain Reload Profiling: + ReloadAssembly (816ms) + BeginReloadAssembly (88ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (4ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (26ms) + EndReloadAssembly (682ms) + LoadAssemblies (71ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (204ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (28ms) + SetupLoadedEditorAssemblies (306ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (1ms) + BeforeProcessingInitializeOnLoad (61ms) + ProcessInitializeOnLoadAttributes (208ms) + ProcessInitializeOnLoadMethodAttributes (27ms) + AfterProcessingInitializeOnLoad (6ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (6ms) +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.55 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1964 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 80.8 MB. +System memory in use after: 81.0 MB. + +Unloading 49 unused Assets to reduce memory usage. Loaded Objects now: 2376. +Total: 4.829000 ms (FindLiveObjects: 0.165900 ms CreateObjectMapping: 0.071400 ms MarkObjects: 4.567200 ms DeleteObjects: 0.023400 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +AssetImportWorkerClient::OnTransportError - code=2 error=End of file diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 00000000..ddb67e79 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,25 @@ + +=== Sun Oct 17 11:56:03 2021 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were added: + com.unity.2d.sprite@1.0.0 + com.unity.2d.tilemap@1.0.0 + com.unity.ide.rider@2.0.7 + com.unity.ide.visualstudio@2.0.11 + com.unity.ide.vscode@1.2.3 + com.unity.modules.androidjni@1.0.0 + com.unity.test-framework@1.1.27 + com.unity.timeline@1.4.8 + com.unity.ugui@1.0.0 + com.unity.xr.legacyinputhelpers@2.1.8 +The following packages were updated: + com.unity.ads from version 2.0.8 to 3.7.5 + com.unity.analytics from version 3.2.2 to 3.5.3 + com.unity.collab-proxy from version 1.2.15 to 1.7.1 + com.unity.purchasing from version 2.0.3 to 3.2.2 + com.unity.textmeshpro from version 1.3.0 to 3.0.6 +The following packages were removed: + com.unity.package-manager-ui@2.0.7 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log new file mode 100644 index 00000000..887eda05 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe0.log @@ -0,0 +1,4 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe1.log b/Logs/shadercompiler-UnityShaderCompiler.exe1.log new file mode 100644 index 00000000..887eda05 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe1.log @@ -0,0 +1,4 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe10.log b/Logs/shadercompiler-UnityShaderCompiler.exe10.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe10.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe11.log b/Logs/shadercompiler-UnityShaderCompiler.exe11.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe11.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe12.log b/Logs/shadercompiler-UnityShaderCompiler.exe12.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe12.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe13.log b/Logs/shadercompiler-UnityShaderCompiler.exe13.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe13.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe14.log b/Logs/shadercompiler-UnityShaderCompiler.exe14.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe14.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe15.log b/Logs/shadercompiler-UnityShaderCompiler.exe15.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe15.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe2.log b/Logs/shadercompiler-UnityShaderCompiler.exe2.log new file mode 100644 index 00000000..887eda05 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe2.log @@ -0,0 +1,4 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe3.log b/Logs/shadercompiler-UnityShaderCompiler.exe3.log new file mode 100644 index 00000000..887eda05 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe3.log @@ -0,0 +1,4 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe4.log b/Logs/shadercompiler-UnityShaderCompiler.exe4.log new file mode 100644 index 00000000..887eda05 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe4.log @@ -0,0 +1,4 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe5.log b/Logs/shadercompiler-UnityShaderCompiler.exe5.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe5.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe6.log b/Logs/shadercompiler-UnityShaderCompiler.exe6.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe6.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe7.log b/Logs/shadercompiler-UnityShaderCompiler.exe7.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe7.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe8.log b/Logs/shadercompiler-UnityShaderCompiler.exe8.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe8.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe9.log b/Logs/shadercompiler-UnityShaderCompiler.exe9.log new file mode 100644 index 00000000..6eb3f92f --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe9.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/2020.3.17f1/Editor/Data', plugins path 'C:/Program Files/Unity/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Packages/manifest.json b/Packages/manifest.json index 8392bea1..fdf7f2f7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,21 @@ { "dependencies": { - "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.2", - "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.7", - "com.unity.purchasing": "2.0.3", - "com.unity.textmeshpro": "1.3.0", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.ads": "3.7.5", + "com.unity.analytics": "3.5.3", + "com.unity.collab-proxy": "1.7.1", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.11", + "com.unity.ide.vscode": "1.2.3", + "com.unity.purchasing": "3.2.2", + "com.unity.test-framework": "1.1.27", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.4.8", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.8", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 00000000..ab5f02d1 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,400 @@ +{ + "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.ads": { + "version": "3.7.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.5.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "1.7.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.nuget.newtonsoft-json": "2.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "2.0.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.3", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "2.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "3.2.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.27", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "3.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.4.8", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.8", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "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": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 00000000..be4a7974 --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreviewPackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Capabilities: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6dfd6c14..2c2c4462 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2020.3.17f1 +m_EditorVersionWithRevision: 2020.3.17f1 (a4537701e4ab) diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 00000000..dca28814 --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset new file mode 100644 index 00000000..aae3070b --- /dev/null +++ b/UserSettings/EditorUserSettings.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + RecentlyUsedScenePath-0: + value: 224247031146467c1f011932416c6c1313191d3963032f3c2108113fc7ee3135ebe225a7f234362820 + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 + m_VCAllowAsyncUpdate: 1