diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 00000000..aade28f6 --- /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..128ce260 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,11 @@ 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: 1839133412} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -109,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -123,6 +134,8 @@ GameObject: - component: {fileID: 141422279} - component: {fileID: 141422278} - component: {fileID: 141422277} + - component: {fileID: 141422276} + - component: {fileID: 141422280} m_Layer: 0 m_Name: enemy m_TagString: Enemy @@ -130,6 +143,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!61 &141422276 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141422275} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!114 &141422277 MonoBehaviour: m_ObjectHideFlags: 0 @@ -156,6 +195,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 +208,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 @@ -197,13 +239,34 @@ 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: 3.9261353, y: 1.5548346, z: 1.7731395} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 240765285} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &141422280 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141422275} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &170076733 GameObject: m_ObjectHideFlags: 0 @@ -229,12 +292,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 +309,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 +334,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 @@ -273,6 +360,40 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &240765284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 240765285} + m_Layer: 0 + m_Name: Enemies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &240765285 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240765284} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.33613536, y: 1.5351653, z: -1.7731395} + 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!1 &534669902 GameObject: m_ObjectHideFlags: 0 @@ -312,9 +433,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 @@ -368,13 +490,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} m_Name: m_EditorClassIdentifier: - go: {fileID: 1054253062} - a: {fileID: 1761935009} - B: - - {fileID: 2083640146} - - {fileID: 1754708960} - - {fileID: 141422275} - - {fileID: 1578050036} + _endScreen: {fileID: 1054253062} --- !u!1 &1054253062 GameObject: m_ObjectHideFlags: 0 @@ -386,7 +502,7 @@ GameObject: - component: {fileID: 1054253064} - component: {fileID: 1054253063} m_Layer: 0 - m_Name: New Sprite + m_Name: EndScreen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -406,6 +522,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 +535,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 @@ -452,7 +571,7 @@ Transform: m_LocalScale: {x: 25, y: 25, 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 GameObject: @@ -465,6 +584,8 @@ GameObject: - component: {fileID: 1578050040} - component: {fileID: 1578050039} - component: {fileID: 1578050038} + - component: {fileID: 1578050037} + - component: {fileID: 1578050041} m_Layer: 0 m_Name: enemy m_TagString: Enemy @@ -472,6 +593,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!61 &1578050037 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578050036} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!114 &1578050038 MonoBehaviour: m_ObjectHideFlags: 0 @@ -498,6 +645,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,6 +658,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 @@ -539,13 +689,34 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.9261353, y: -2.8751655, z: 1.7731395} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 240765285} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &1578050041 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578050036} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &1754708960 GameObject: m_ObjectHideFlags: 0 @@ -557,6 +728,8 @@ GameObject: - component: {fileID: 1754708964} - component: {fileID: 1754708963} - component: {fileID: 1754708962} + - component: {fileID: 1754708961} + - component: {fileID: 1754708965} m_Layer: 0 m_Name: enemy m_TagString: Enemy @@ -564,6 +737,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!61 &1754708961 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754708960} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!114 &1754708962 MonoBehaviour: m_ObjectHideFlags: 0 @@ -590,6 +789,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 +802,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 @@ -631,13 +833,34 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.9261353, y: -0.82516533, z: 1.7731395} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 240765285} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &1754708965 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754708960} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &1761935009 GameObject: m_ObjectHideFlags: 0 @@ -649,8 +872,11 @@ GameObject: - component: {fileID: 1761935011} - component: {fileID: 1761935010} - component: {fileID: 1761935012} + - component: {fileID: 1761935013} + - component: {fileID: 1761935014} + - component: {fileID: 1761935015} m_Layer: 0 - m_Name: New Sprite (1) + m_Name: Player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -670,6 +896,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,6 +909,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 @@ -716,7 +945,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1761935012 MonoBehaviour: @@ -730,9 +959,120 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 + _speed: 5 + _isTimerRunning: 0 + _timer: 0 +--- !u!58 &1761935013 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761935009} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!50 &1761935014 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761935009} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &1761935015 +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: b38012943befcdd4faba99d58fc33b04, type: 3} + m_Name: + m_EditorClassIdentifier: + _speed: 5 +--- !u!850595691 &1839133412 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Settings.lighting + 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 --- !u!1 &2083640146 GameObject: m_ObjectHideFlags: 0 @@ -744,6 +1084,8 @@ GameObject: - component: {fileID: 2083640148} - component: {fileID: 2083640147} - component: {fileID: 2083640150} + - component: {fileID: 2083640149} + - component: {fileID: 2083640151} m_Layer: 0 m_Name: enemy m_TagString: Enemy @@ -765,6 +1107,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 +1120,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 @@ -806,13 +1151,39 @@ 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: -2.7938647, y: -0.82516533, z: 1.7731395} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Father: {fileID: 240765285} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2083640149 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2083640146} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!114 &2083640150 MonoBehaviour: m_ObjectHideFlags: 0 @@ -825,3 +1196,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!50 &2083640151 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2083640146} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 diff --git a/Assets/Group1/Scripts/EnemyMovement.cs b/Assets/Group1/Scripts/EnemyMovement.cs new file mode 100644 index 00000000..bc806e94 --- /dev/null +++ b/Assets/Group1/Scripts/EnemyMovement.cs @@ -0,0 +1,27 @@ +using UnityEngine; + +public class EnemyMovement : MonoBehaviour +{ + private Vector3 _target; + private float _movementRadius = 4; + + private void Start() + { + FindNewTarget(); + } + + private void Update() + { + transform.position = Vector3.MoveTowards(transform.position, _target, 2 * Time.deltaTime); + + if (transform.position == _target) + { + FindNewTarget(); + } + } + + private void FindNewTarget() + { + _target = Random.insideUnitCircle * _movementRadius; + } +} diff --git a/Assets/Group1/Scripts/e.cs.meta b/Assets/Group1/Scripts/EnemyMovement.cs.meta similarity index 100% rename from Assets/Group1/Scripts/e.cs.meta rename to Assets/Group1/Scripts/EnemyMovement.cs.meta diff --git a/Assets/Group1/Scripts/Game.cs b/Assets/Group1/Scripts/Game.cs new file mode 100644 index 00000000..06bff53c --- /dev/null +++ b/Assets/Group1/Scripts/Game.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +public class Game : MonoBehaviour +{ + [SerializeField] private GameObject _endScreen; + + public void EndGame() + { + _endScreen.SetActive(true); + } +} diff --git a/Assets/Group1/Scripts/GameController.cs.meta b/Assets/Group1/Scripts/Game.cs.meta similarity index 100% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Group1/Scripts/Game.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/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/Player.cs b/Assets/Group1/Scripts/Player.cs new file mode 100644 index 00000000..0f6f797f --- /dev/null +++ b/Assets/Group1/Scripts/Player.cs @@ -0,0 +1,51 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +[RequireComponent(typeof(PlayerMovement))] +public class Player : MonoBehaviour +{ + [SerializeField] private float _speed; + + private List _enemies; + private float _timer = 2f; + private PlayerMovement _playerMovement; + private Game _game; + + private void Start() + { + _playerMovement = GetComponent(); + _game = FindObjectOfType(); + + _enemies = FindObjectsOfType().ToList(); + } + + private IEnumerator SpeedBoost() + { + _playerMovement.SetSpeed(_playerMovement.Speed * 2); + yield return new WaitForSeconds(_timer); + _playerMovement.SetSpeed(_playerMovement.Speed / 2); + } + + private void OnTriggerEnter2D(Collider2D collision) + { + if(collision.TryGetComponent(out EnemyMovement enemyMovement)) + { + _enemies.Remove(enemyMovement); + + if (_enemies.Count == 0) + { + _game.EndGame(); + enabled = false; + } + + Destroy(collision.gameObject); + } + + if(collision.TryGetComponent(out _)) + { + StartCoroutine(SpeedBoost()); + } + } +} diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta b/Assets/Group1/Scripts/Player.cs.meta similarity index 100% rename from Assets/Group1/Scripts/NewBehaviourScript1.cs.meta rename to Assets/Group1/Scripts/Player.cs.meta diff --git a/Assets/Group1/Scripts/PlayerMovement.cs b/Assets/Group1/Scripts/PlayerMovement.cs new file mode 100644 index 00000000..9132b8a5 --- /dev/null +++ b/Assets/Group1/Scripts/PlayerMovement.cs @@ -0,0 +1,24 @@ +using UnityEngine; + +public class PlayerMovement : MonoBehaviour +{ + [SerializeField] private float _speed; + + public float Speed => _speed; + + private void Update() + { + + float xDirection = Input.GetAxis("Horizontal"); + float yDirection = Input.GetAxis("Vertical"); + + Vector3 direction = new Vector2(xDirection, yDirection); + + transform.position += direction * _speed * Time.deltaTime; + } + + public void SetSpeed(float newSpeed) + { + _speed = newSpeed; + } +} diff --git a/Assets/Group1/Scripts/PlayerMovement.cs.meta b/Assets/Group1/Scripts/PlayerMovement.cs.meta new file mode 100644 index 00000000..9590377e --- /dev/null +++ b/Assets/Group1/Scripts/PlayerMovement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b38012943befcdd4faba99d58fc33b04 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/SpeedBooster.cs b/Assets/Group1/Scripts/SpeedBooster.cs new file mode 100644 index 00000000..f2cd2a52 --- /dev/null +++ b/Assets/Group1/Scripts/SpeedBooster.cs @@ -0,0 +1,6 @@ +using UnityEngine; + +public class SpeedBooster : MonoBehaviour +{ + +} diff --git a/Assets/Group1/Scripts/SpeedBooster.cs.meta b/Assets/Group1/Scripts/SpeedBooster.cs.meta new file mode 100644 index 00000000..0ec68d04 --- /dev/null +++ b/Assets/Group1/Scripts/SpeedBooster.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3492cf6e69fda8b428f4abceed493834 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: 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/Resources.meta b/Assets/Resources.meta new file mode 100644 index 00000000..b14d9ecf --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eadbb5011783d764c8a1582dbe6c6bcb +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..807758b0 --- /dev/null +++ b/Assets/Resources/BillingMode.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1bdf1f33052c59d48895d386f5dc2f0a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log new file mode 100644 index 00000000..bd5e5fde --- /dev/null +++ b/Logs/AssetImportWorker0-prev.log @@ -0,0 +1,165 @@ +Using pre-set license +Built from '2020.3/staging' branch; Version is '2020.3.6f1 (338bb68529b2) revision 3378102'; Using compiler version '192528614'; Build Type 'Release' +OS: 'Windows 10 Home Single Language; OS build 19043.1081; Version 2009; 64bit' Language: 'ru' Physical Memory: 15791 MB +BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0 + + COMMAND LINE ARGUMENTS: +D:\Software\Unity\2020.3.6f1\Editor\Unity.exe +-adb2 +-batchMode +-noUpm +-name +AssetImportWorker0 +-projectPath +D:/Unity Projects/SHK-Unity +-logFile +Logs/AssetImportWorker0.log +-srvPort +63912 +Successfully changed project path to: D:/Unity Projects/SHK-Unity +D:/Unity Projects/SHK-Unity +Using Asset Import Pipeline V2. +Refreshing native plugins compatible for Editor in 37.25 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Initialize engine version: 2020.3.6f1 (338bb68529b2) +[Subsystems] Discovering subsystems at path D:/Software/Unity/2020.3.6f1/Editor/Data/Resources/UnitySubsystems +[Subsystems] Discovering subsystems at path D:/Unity Projects/SHK-Unity/Assets +GfxDevice: creating device client; threaded=0 +Direct3D: + Version: Direct3D 11.0 [level 11.1] + Renderer: NVIDIA GeForce GTX 1650 Ti (ID=0x1f95) + Vendor: + VRAM: 3962 MB + Driver: 27.21.14.6647 +Initialize mono +Mono path[0] = 'D:/Software/Unity/2020.3.6f1/Editor/Data/Managed' +Mono path[1] = 'D:/Software/Unity/2020.3.6f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' +Mono config path = 'D:/Software/Unity/2020.3.6f1/Editor/Data/MonoBleedingEdge/etc' +Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56060 +Begin MonoManager ReloadAssembly +Registering precompiled unity dll's ... +Register platform support module: D:/Software/Unity/2020.3.6f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll +Registered in 0.001292 seconds. +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 32.85 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 1.527 seconds +Platform modules already initialized, skipping +Registering precompiled user dll's ... +Registered in 0.001530 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.49 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.882 seconds +Platform modules already initialized, skipping +======================================================================== +Worker process is ready to serve import requests +Launched and connected shader compiler UnityShaderCompiler.exe after 0.05 seconds +Refreshing native plugins compatible for Editor in 0.46 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1638 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 70.5 MB. +System memory in use after: 70.6 MB. + +Unloading 42 unused Assets to reduce memory usage. Loaded Objects now: 2059. +Total: 6.636200 ms (FindLiveObjects: 0.201700 ms CreateObjectMapping: 0.038800 ms MarkObjects: 6.310300 ms DeleteObjects: 0.083900 ms) + +======================================================================== +Received Import Request. + path: Assets/Group1/Scripts/EnemyMovement.cs + artifactKey: Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/EnemyMovement.cs using Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'd423d461f8f6c15e4ec53e75a3d25095') in 0.039680 seconds + Import took 0.044250 seconds . + +======================================================================== +Received Import Request. + Time since last request: 17.370778 seconds. + path: Assets/Group1/Scripts/EnemyMovement.cs + artifactKey: Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/EnemyMovement.cs using Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'd893abc58936f4bcffb9937fbd946731') in 0.002087 seconds + Import took 0.005514 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.001580 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.51 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.824 seconds +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.48 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1632 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 70.4 MB. +System memory in use after: 70.5 MB. + +Unloading 33 unused Assets to reduce memory usage. Loaded Objects now: 2062. +Total: 5.032100 ms (FindLiveObjects: 0.243600 ms CreateObjectMapping: 0.066000 ms MarkObjects: 4.693600 ms DeleteObjects: 0.026700 ms) + +======================================================================== +Received Import Request. + Time since last request: 4170.673937 seconds. + path: Assets/Group1/Scripts/PlayerMovement.cs + artifactKey: Guid(b38012943befcdd4faba99d58fc33b04) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/PlayerMovement.cs using Guid(b38012943befcdd4faba99d58fc33b04) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '5dd4ea858d63877c3aee3134be8eaa95') in 0.004494 seconds + Import took 0.007357 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.001285 seconds. + path: Assets/Group1/Scripts/PlayerMovement.cs + artifactKey: Guid(b38012943befcdd4faba99d58fc33b04) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/PlayerMovement.cs using Guid(b38012943befcdd4faba99d58fc33b04) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '5dd4ea858d63877c3aee3134be8eaa95') in 0.001692 seconds + Import took 0.004129 seconds . + +======================================================================== +Received Import Request. + Time since last request: 1.792955 seconds. + path: Assets/Group1/Scripts/Player.cs + artifactKey: Guid(dede9e7d6741aea4cb07b98da83cc6a8) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/Player.cs using Guid(dede9e7d6741aea4cb07b98da83cc6a8) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '78453dc5ac9629c12055b981c6a5eb21') in 0.002133 seconds + Import took 0.005686 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000653 seconds. + path: Assets/Group1/Scripts/Player.cs + artifactKey: Guid(dede9e7d6741aea4cb07b98da83cc6a8) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/Player.cs using Guid(dede9e7d6741aea4cb07b98da83cc6a8) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '78453dc5ac9629c12055b981c6a5eb21') in 0.002099 seconds + Import took 0.004551 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.002143 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.86 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.809 seconds +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.48 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1632 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 70.4 MB. +System memory in use after: 70.5 MB. + +Unloading 33 unused Assets to reduce memory usage. Loaded Objects now: 2065. +Total: 4.944300 ms (FindLiveObjects: 0.190700 ms CreateObjectMapping: 0.036500 ms MarkObjects: 4.691000 ms DeleteObjects: 0.024800 ms) + +======================================================================== +Received Import Request. + Time since last request: 269.741428 seconds. + path: Assets/Group1/Scripts/EnemyMovement.cs + artifactKey: Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/EnemyMovement.cs using Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '86b3c125a34eb13b5f5f5a0fd951d220') in 0.007964 seconds + Import took 0.011726 seconds . + +AssetImportWorkerClient::OnTransportError - code=2 error=End of file diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log new file mode 100644 index 00000000..67a42abf --- /dev/null +++ b/Logs/AssetImportWorker0.log @@ -0,0 +1,200 @@ +Using pre-set license +Built from '2020.3/release' branch; Version is '2020.3.1f1 (77a89f25062f) revision 7841951'; Using compiler version '192528614'; Build Type 'Release' +OS: 'Windows 10 Home; OS build 19042.1237; Version 2009; 64bit' Language: 'ru' Physical Memory: 16337 MB +BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0 + + COMMAND LINE ARGUMENTS: +C:\Program Files\Unity\Hub\Editor\2020.3.1f1\Editor\Unity.exe +-adb2 +-batchMode +-noUpm +-name +AssetImportWorker0 +-projectPath +C:/Unity Projects/SHK-Unity +-logFile +Logs/AssetImportWorker0.log +-srvPort +49157 +Successfully changed project path to: C:/Unity Projects/SHK-Unity +C:/Unity Projects/SHK-Unity +Using Asset Import Pipeline V2. +Refreshing native plugins compatible for Editor in 61.30 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Initialize engine version: 2020.3.1f1 (77a89f25062f) +[Subsystems] Discovering subsystems at path C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data/Resources/UnitySubsystems +[Subsystems] Discovering subsystems at path C:/Unity Projects/SHK-Unity/Assets +GfxDevice: creating device client; threaded=0 +Direct3D: + Version: Direct3D 11.0 [level 11.1] + Renderer: Radeon RX 580 Series (ID=0x67df) + Vendor: + VRAM: 8171 MB + Driver: 27.20.22021.1002 +Initialize mono +Mono path[0] = 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data/Managed' +Mono path[1] = 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' +Mono config path = 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data/MonoBleedingEdge/etc' +Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56268 +Begin MonoManager ReloadAssembly +Registering precompiled unity dll's ... +Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll +Registered in 0.003015 seconds. +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 50.51 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Invoked RoslynAnalysisRunner static constructor. +RoslynAnalysisRunner will not be running. +RoslynAnalysisRunner has terminated. +Mono: successfully reloaded assembly +- Completed reload, in 1.383 seconds +Platform modules already initialized, skipping +Registering precompiled user dll's ... +Registered in 0.003263 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.62 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Invoked RoslynAnalysisRunner static constructor. +RoslynAnalysisRunner will not be running. +RoslynAnalysisRunner has terminated. +Mono: successfully reloaded assembly +- Completed reload, in 1.159 seconds +Platform modules already initialized, skipping +======================================================================== +Worker process is ready to serve import requests +Launched and connected shader compiler UnityShaderCompiler.exe after 0.05 seconds +Refreshing native plugins compatible for Editor in 0.61 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1638 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 70.4 MB. +System memory in use after: 70.5 MB. + +Unloading 42 unused Assets to reduce memory usage. Loaded Objects now: 2059. +Total: 6.220400 ms (FindLiveObjects: 0.220900 ms CreateObjectMapping: 0.060100 ms MarkObjects: 5.855900 ms DeleteObjects: 0.082200 ms) + +======================================================================== +Received Import Request. + path: Assets/Group1/Scripts/EnemyMovement.cs + artifactKey: Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/EnemyMovement.cs using Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '2de52c2c29090c5aaa47121f8221d103') in 0.028138 seconds + Import took 0.031320 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000281 seconds. + path: Assets/Group1/Scripts/Game.cs + artifactKey: Guid(cd6d0074e725a114e850d2e604fe4b0d) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/Game.cs using Guid(cd6d0074e725a114e850d2e604fe4b0d) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '552728163d39d23a79fe4725f122291d') in 0.009079 seconds + Import took 0.012080 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000257 seconds. + path: Assets/Group1/Scripts/Player.cs + artifactKey: Guid(dede9e7d6741aea4cb07b98da83cc6a8) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/Player.cs using Guid(dede9e7d6741aea4cb07b98da83cc6a8) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '07da959e35fe7fdc3a291bbb5f0e81a7') in 0.008174 seconds + Import took 0.010929 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000266 seconds. + path: Assets/Group1/Scripts/SpeedBooster.cs + artifactKey: Guid(3492cf6e69fda8b428f4abceed493834) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/SpeedBooster.cs using Guid(3492cf6e69fda8b428f4abceed493834) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'f92399e7953728030ec29a72c5088736') in 0.008719 seconds + Import took 0.011599 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000233 seconds. + path: Assets/Group1/Scripts/PlayerMovement.cs + artifactKey: Guid(b38012943befcdd4faba99d58fc33b04) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/PlayerMovement.cs using Guid(b38012943befcdd4faba99d58fc33b04) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '45109a009d84b709cf9ca6d55a9e937d') in 0.008123 seconds + Import took 0.010868 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.003102 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.62 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Invoked RoslynAnalysisRunner static constructor. +RoslynAnalysisRunner will not be running. +RoslynAnalysisRunner has terminated. +Mono: successfully reloaded assembly +- Completed reload, in 1.125 seconds +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.64 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1632 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 70.3 MB. +System memory in use after: 70.4 MB. + +Unloading 33 unused Assets to reduce memory usage. Loaded Objects now: 2062. +Total: 5.979400 ms (FindLiveObjects: 0.220900 ms CreateObjectMapping: 0.045800 ms MarkObjects: 5.679000 ms DeleteObjects: 0.032100 ms) + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.002903 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.64 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Invoked RoslynAnalysisRunner static constructor. +RoslynAnalysisRunner will not be running. +Temp/RoslynAnalysisRunner has been deleted. +RoslynAnalysisRunner has terminated. +Mono: successfully reloaded assembly +- Completed reload, in 1.111 seconds +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.71 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1632 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 70.4 MB. +System memory in use after: 70.5 MB. + +Unloading 33 unused Assets to reduce memory usage. Loaded Objects now: 2065. +Total: 6.064400 ms (FindLiveObjects: 0.261200 ms CreateObjectMapping: 0.047300 ms MarkObjects: 5.716800 ms DeleteObjects: 0.037400 ms) + +======================================================================== +Received Import Request. + Time since last request: 549.726924 seconds. + path: Assets/Group1/Scripts/EnemyMovement.cs + artifactKey: Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/EnemyMovement.cs using Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'fd0730846ecf7228c27b7d07846d0439') in 0.007131 seconds + Import took 0.010451 seconds . + +======================================================================== +Received Import Request. + Time since last request: 1.373988 seconds. + path: Assets/Group1/Scripts/EnemyMovement.cs + artifactKey: Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/EnemyMovement.cs using Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'fd0730846ecf7228c27b7d07846d0439') in 0.006033 seconds + Import took 0.009214 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.002903 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.68 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Invoked RoslynAnalysisRunner static constructor. +RoslynAnalysisRunner will not be running. +RoslynAnalysisRunner has terminated. +Mono: successfully reloaded assembly +- Completed reload, in 1.077 seconds +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.97 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1632 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 70.4 MB. +System memory in use after: 70.5 MB. + +Unloading 33 unused Assets to reduce memory usage. Loaded Objects now: 2068. +Total: 7.847900 ms (FindLiveObjects: 0.534200 ms CreateObjectMapping: 0.116000 ms MarkObjects: 7.160700 ms DeleteObjects: 0.035000 ms) + diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 00000000..6d437557 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,25 @@ + +=== Sun Aug 1 22:05:32 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.7 + com.unity.ide.vscode@1.2.3 + com.unity.modules.androidjni@1.0.0 + com.unity.test-framework@1.1.24 + com.unity.timeline@1.4.7 + com.unity.ugui@1.0.0 + com.unity.xr.legacyinputhelpers@2.1.7 +The following packages were updated: + com.unity.ads from version 2.0.8 to 3.6.1 + com.unity.analytics from version 3.2.2 to 3.5.3 + com.unity.collab-proxy from version 1.2.15 to 1.3.9 + com.unity.purchasing from version 2.0.3 to 3.0.2 + com.unity.textmeshpro from version 1.3.0 to 3.0.1 +The following packages were removed: + com.unity.package-manager-ui@2.0.7 diff --git a/Logs/shadercompiler-AssetImportWorker0.log b/Logs/shadercompiler-AssetImportWorker0.log new file mode 100644 index 00000000..56836900 --- /dev/null +++ b/Logs/shadercompiler-AssetImportWorker0.log @@ -0,0 +1,3 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log new file mode 100644 index 00000000..0058ff16 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe0.log @@ -0,0 +1,6 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: preprocess + insize=2414 inputPath=Packages/com.unity.textmeshpro/Editor Resources/Shaders surfaceOnly=0 cachingPP=1 buildPlatform=19 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR dKW=UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2035 + diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe1.log b/Logs/shadercompiler-UnityShaderCompiler.exe1.log new file mode 100644 index 00000000..56836900 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe1.log @@ -0,0 +1,3 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe2.log b/Logs/shadercompiler-UnityShaderCompiler.exe2.log new file mode 100644 index 00000000..56836900 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe2.log @@ -0,0 +1,3 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.1f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + diff --git a/Packages/manifest.json b/Packages/manifest.json index 8392bea1..5291a612 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.6.1", + "com.unity.analytics": "3.5.3", + "com.unity.collab-proxy": "1.3.9", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.7", + "com.unity.ide.vscode": "1.2.3", + "com.unity.purchasing": "3.0.2", + "com.unity.test-framework": "1.1.24", + "com.unity.textmeshpro": "3.0.1", + "com.unity.timeline": "1.4.7", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.7", "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..9002c61c --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,391 @@ +{ + "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.6.1", + "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.3.9", + "depth": 0, + "source": "registry", + "dependencies": {}, + "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.7", + "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.purchasing": { + "version": "3.0.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.24", + "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.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.4.7", + "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.7", + "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..6830e2a8 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2020.3.1f1 +m_EditorVersionWithRevision: 2020.3.1f1 (77a89f25062f) 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