From e2d139c1ea57f9f937a05c6357426c23f73bb96f Mon Sep 17 00:00:00 2001 From: ChizaruuGCO Date: Mon, 21 Feb 2022 15:00:41 +1100 Subject: [PATCH 1/5] Updated to Unity 2020.3.29f1 --- Packages/manifest.json | 12 ++++++------ Packages/packages-lock.json | 36 ++++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 969a6eba..14ffbbb3 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { - "com.unity.2d.animation": "5.0.6", - "com.unity.2d.psdimporter": "4.1.0", + "com.unity.2d.animation": "5.1.0", + "com.unity.2d.psdimporter": "4.2.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.6.11", + "com.unity.analytics": "3.6.12", "com.unity.cinemachine": "2.6.0", - "com.unity.collab-proxy": "1.9.0", + "com.unity.collab-proxy": "1.15.12", "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.11", + "com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.vscode": "1.2.4", "com.unity.multiplayer-hlapi": "1.0.6", - "com.unity.purchasing": "3.2.2", + "com.unity.purchasing": "4.1.2", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f82c1b3c..af2b3521 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "5.0.6", + "version": "5.1.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "4.0.3", + "com.unity.2d.common": "4.1.0", "com.unity.mathematics": "1.1.0", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -14,7 +14,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "4.0.3", + "version": "4.1.0", "depth": 1, "source": "registry", "dependencies": { @@ -24,12 +24,12 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "4.1.0", + "version": "4.2.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "4.0.3", - "com.unity.2d.animation": "5.0.6", + "com.unity.2d.common": "4.1.0", + "com.unity.2d.animation": "5.1.0", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -56,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.analytics": { - "version": "3.6.11", + "version": "3.6.12", "depth": 0, "source": "registry", "dependencies": { @@ -72,10 +72,12 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.9.0", + "version": "1.15.12", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.services.core": "1.0.1" + }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { @@ -95,7 +97,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.11", + "version": "2.0.14", "depth": 0, "source": "registry", "dependencies": { @@ -127,7 +129,7 @@ "url": "https://packages.unity.com" }, "com.unity.purchasing": { - "version": "3.2.2", + "version": "4.1.2", "depth": 0, "source": "registry", "dependencies": { @@ -135,7 +137,17 @@ "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" + "com.unity.modules.androidjni": "1.0.0", + "com.unity.services.core": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.0.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, From 536e0e1f063c20c6a7f5ff2db5a50a4057e3f26a Mon Sep 17 00:00:00 2001 From: ChizaruuGCO Date: Mon, 21 Feb 2022 15:03:02 +1100 Subject: [PATCH 2/5] Update Cameras.prefab I honestly have no idea what scripts were there, I used Unity 2020.3.19f1 to double check but it still showed no scripts. --- Assets/Prefabs/StartUp/Cameras.prefab | 113 +++++--------------------- 1 file changed, 21 insertions(+), 92 deletions(-) diff --git a/Assets/Prefabs/StartUp/Cameras.prefab b/Assets/Prefabs/StartUp/Cameras.prefab index 1ce5da14..6eb0f337 100644 --- a/Assets/Prefabs/StartUp/Cameras.prefab +++ b/Assets/Prefabs/StartUp/Cameras.prefab @@ -84,6 +84,7 @@ MonoBehaviour: m_LockStageInInspector: m_StreamingVersion: 20170927 m_Priority: 10 + m_StandbyUpdate: 2 m_LookAt: {fileID: 0} m_Follow: {fileID: 0} m_Lens: @@ -92,6 +93,14 @@ MonoBehaviour: NearClipPlane: 0.1 FarClipPlane: 5000 Dutch: 0 + LensShift: {x: 0, y: 0} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 4880036768425510} --- !u!114 &114826505657298220 MonoBehaviour: @@ -187,9 +196,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_LookaheadTime: 0 m_LookaheadSmoothing: 3 + m_LookaheadIgnoreY: 0 m_XDamping: 1.3 m_YDamping: 1 m_ZDamping: 1 + m_TargetMovementOnly: 0 m_ScreenX: 0.5 m_ScreenY: 0.723 m_CameraDistance: 10 @@ -201,6 +212,7 @@ MonoBehaviour: m_SoftZoneHeight: 1.11 m_BiasX: 0 m_BiasY: 0 + m_CenterOnActivate: 1 m_GroupFramingMode: 2 m_AdjustmentMode: 2 m_GroupFramingSize: 0.8 @@ -225,8 +237,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_NoiseProfile: {fileID: 11400000, guid: b241f91b9ccf8ff489abf204b30d3112, type: 2} + m_PivotOffset: {x: 0, y: 0, z: 0} m_AmplitudeGain: 0.3 m_FrequencyGain: 2.135592e-19 + mNoiseOffsets: {x: 0, y: 0, z: 0} --- !u!1 &1884548363852062 GameObject: m_ObjectHideFlags: 0 @@ -239,9 +253,6 @@ GameObject: - component: {fileID: 20682906277557268} - component: {fileID: 81810105363897254} - component: {fileID: 114676595278818560} - - component: {fileID: 114779388604134948} - - component: {fileID: 1979371213} - - component: {fileID: 1979371212} m_Layer: 17 m_Name: Main Camera m_TagString: MainCamera @@ -331,9 +342,16 @@ MonoBehaviour: m_IgnoreTimeScale: 0 m_WorldUpOverride: {fileID: 0} m_UpdateMethod: 2 + m_BlendUpdateMethod: 1 m_DefaultBlend: m_Style: 1 m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 m_CustomBlends: {fileID: 0} m_CameraCutEvent: m_PersistentCalls: @@ -341,95 +359,6 @@ MonoBehaviour: m_CameraActivatedEvent: m_PersistentCalls: m_Calls: [] ---- !u!114 &114779388604134948 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1884548363852062} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2da2b35a87c240cba9b1e74c36efc12, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1979371213 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1884548363852062} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} - m_Name: - m_EditorClassIdentifier: - volumeTrigger: {fileID: 0} - volumeLayer: - serializedVersion: 2 - m_Bits: 131072 - stopNaNPropagation: 1 - finalBlitToCameraTarget: 0 - antialiasingMode: 0 - temporalAntialiasing: - jitterSpread: 0.75 - sharpness: 0.25 - stationaryBlending: 0.95 - motionBlending: 0.85 - subpixelMorphologicalAntialiasing: - quality: 2 - fastApproximateAntialiasing: - fastMode: 0 - keepAlpha: 0 - fog: - enabled: 1 - excludeSkybox: 1 - debugLayer: - lightMeter: - width: 512 - height: 256 - showCurves: 1 - histogram: - width: 512 - height: 256 - channel: 3 - waveform: - exposure: 0.12 - height: 256 - vectorscope: - size: 256 - exposure: 0.12 - overlaySettings: - linearDepth: 0 - motionColorIntensity: 4 - motionGridSize: 64 - colorBlindnessType: 0 - colorBlindnessStrength: 1 - m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} - m_ShowToolkit: 0 - m_ShowCustomSorter: 0 - breakBeforeColorGrading: 0 - m_BeforeTransparentBundles: [] - m_BeforeStackBundles: [] - m_AfterStackBundles: [] ---- !u!114 &1979371212 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1884548363852062} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} - m_Name: - m_EditorClassIdentifier: - sharedProfile: {fileID: 11400000, guid: 4dee51f7f754a774ebdce88167bae83e, type: 2} - isGlobal: 1 - blendDistance: 0 - weight: 1 - priority: 0 --- !u!1 &7016830368656799714 GameObject: m_ObjectHideFlags: 0 From a3287202aba1b76b6224caeef0fa09819dcbc4b4 Mon Sep 17 00:00:00 2001 From: ChizaruuGCO Date: Mon, 21 Feb 2022 15:06:22 +1100 Subject: [PATCH 3/5] Added InputSystem package It works out better to have the package to support various platforms. --- Packages/manifest.json | 1 + Packages/packages-lock.json | 9 +++ ProjectSettings/ProjectSettings.asset | 108 +++++++++++++++++--------- 3 files changed, 80 insertions(+), 38 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 14ffbbb3..5cf83038 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -11,6 +11,7 @@ "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.vscode": "1.2.4", + "com.unity.inputsystem": "1.3.0", "com.unity.multiplayer-hlapi": "1.0.6", "com.unity.purchasing": "4.1.2", "com.unity.test-framework": "1.1.29", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index af2b3521..41edb348 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -112,6 +112,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.3.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.mathematics": { "version": "1.1.0", "depth": 1, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8050bbf3..05dd2c52 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 22 productGUID: 38b2b35f5d90248b780cd7879d1f93a3 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -51,6 +51,8 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -68,6 +70,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 0 macRetinaSupport: 1 runInBackground: 1 @@ -113,10 +121,15 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -131,31 +144,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 0 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 0 - dashSupport: 0 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -168,7 +156,11 @@ PlayerSettings: androidMaxAspectRatio: 2.1 applicationIdentifier: Standalone: com.Company.ProductName - buildNumber: {} + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 @@ -185,10 +177,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -222,8 +214,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -231,6 +223,7 @@ PlayerSettings: metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -240,10 +233,19 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 5f34be1353de5cf4398729fda238591b templatePackageId: com.unity.template.2d@1.0.1 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 5 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' @@ -260,6 +262,10 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: @@ -304,7 +310,10 @@ PlayerSettings: m_GraphicsJobMode: 0 - m_BuildTarget: XboxOnePlayer m_GraphicsJobMode: 0 - m_BuildTargetGraphicsAPIs: [] + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 @@ -316,6 +325,7 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -325,12 +335,15 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -348,6 +361,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -363,6 +377,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -378,6 +393,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -393,6 +409,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -455,6 +472,11 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 + switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -481,6 +503,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -523,6 +546,9 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 @@ -543,9 +569,10 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: 1: CROSS_PLATFORM_INPUT;UNITY_POST_PROCESSING_STACK_V2 4: CROSS_PLATFORM_INPUT;MOBILE_INPUT @@ -558,15 +585,21 @@ PlayerSettings: 27: UNITY_POST_PROCESSING_STACK_V2 28: UNITY_POST_PROCESSING_STACK_V2 29: UNITY_POST_PROCESSING_STACK_V2 + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + useReferenceAssemblies: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -616,6 +649,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 0 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} @@ -624,10 +658,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -642,11 +673,12 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 1 cloudProjectId: ba8de198-8e1f-42a1-88da-9422982b81b2 framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: PewDiePieDareR2 organizationId: atmosgames cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 1 + virtualTexturingSupportEnabled: 0 From 1a4a7ae6423270a39358d43f60d5f404a202732a Mon Sep 17 00:00:00 2001 From: ChizaruuGCO Date: Mon, 21 Feb 2022 20:14:26 +1100 Subject: [PATCH 4/5] Converted Old Inputs to New InputSystem Prefab Tweaks, PauseMenu QoL & NewPlayer "Improvements" --- Assets/Prefabs/Enemies/EnemyWalker.prefab | 477 +++++++++++++++--- Assets/Prefabs/StartUp/Player.prefab | 270 +++++++--- Assets/Scenes/DemoLevel.unity | 113 ++++- Assets/Scripts/Characters/PhysicsObject.cs | 7 +- Assets/Scripts/Core/Inputsystem.meta | 8 + Assets/Scripts/Core/Inputsystem/Controls.cs | 424 ++++++++++++++++ .../Scripts/Core/Inputsystem/Controls.cs.meta | 11 + .../Core/Inputsystem/Controls.inputactions | 227 +++++++++ .../Inputsystem/Controls.inputactions.meta | 14 + Assets/Scripts/Core/NewPlayer.cs | 211 +++++--- Assets/Scripts/UI/PauseMenu.cs | 15 +- Logs/ApiUpdaterCheck.txt | 40 ++ ProjectSettings/ProjectSettings.asset | 2 +- ...ework,Version=v4.7.1.AssemblyAttributes.cs | 4 + ...harp-Editor.csproj.AssemblyReference.cache | Bin 0 -> 78006 bytes ...mbly-CSharp.csproj.AssemblyReference.cache | Bin 0 -> 195122 bytes 16 files changed, 1594 insertions(+), 229 deletions(-) create mode 100644 Assets/Scripts/Core/Inputsystem.meta create mode 100644 Assets/Scripts/Core/Inputsystem/Controls.cs create mode 100644 Assets/Scripts/Core/Inputsystem/Controls.cs.meta create mode 100644 Assets/Scripts/Core/Inputsystem/Controls.inputactions create mode 100644 Assets/Scripts/Core/Inputsystem/Controls.inputactions.meta create mode 100644 Logs/ApiUpdaterCheck.txt create mode 100644 obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs create mode 100644 obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache create mode 100644 obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache diff --git a/Assets/Prefabs/Enemies/EnemyWalker.prefab b/Assets/Prefabs/Enemies/EnemyWalker.prefab index 6c0b7afe..fb6d1ac4 100644 --- a/Assets/Prefabs/Enemies/EnemyWalker.prefab +++ b/Assets/Prefabs/Enemies/EnemyWalker.prefab @@ -44,7 +44,7 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352256761504476} - serializedVersion: 6 + serializedVersion: 7 lengthInSec: 1000 simulationSpeed: 1 stopAction: 0 @@ -2188,6 +2188,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -3618,19 +3674,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 1 - serializedVersion: 3 + serializedVersion: 4 type: 1 collisionMode: 1 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -3804,17 +3861,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -4769,6 +4829,7 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4811,6 +4872,8 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -4971,6 +5034,7 @@ MonoBehaviour: m_EditorClassIdentifier: minGroundNormalY: 0.65 gravityModifier: 3 + rb2d: {fileID: 50673192763084334} contactFilter: useTriggers: 0 useLayerMask: 1 @@ -4991,22 +5055,21 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 16640 enemyType: 0 - maxSpeed: 3 + attentionRange: 1.09 changeDirectionEase: 2 + followPlayer: 0 flipWhenTurning: 0 + hurtLaunchPower: 14 + jumping: 0 + jumpPower: 7 + maxSpeed: 3 maxSpeedDeviation: 1 - sitStillWhenNotFollowing: 0 neverStopFollowing: 0 - jumpPower: 7 rayCastSize: {x: 1.5, y: 1} - launch: 1 - hurtLaunchPower: 14 - jumping: 0 rayCastOffset: {x: 1, y: 0.46} - followPlayer: 0 - attentionRange: 1.09 - stepSound: {fileID: 0} + sitStillWhenNotFollowing: 0 jumpSound: {fileID: 8300000, guid: a69256e0605cd46c19e2fe34da9587b5, type: 3} + stepSound: {fileID: 0} --- !u!114 &114242110960759840 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5240,8 +5303,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: recoveryTime: 0.1 - counter: 0 - recovering: 0 --- !u!1 &1436683220433172 GameObject: m_ObjectHideFlags: 0 @@ -5281,7 +5342,7 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1436683220433172} - serializedVersion: 6 + serializedVersion: 7 lengthInSec: 1000 simulationSpeed: 1 stopAction: 0 @@ -7425,6 +7486,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -8855,19 +8972,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 1 - serializedVersion: 3 + serializedVersion: 4 type: 1 collisionMode: 1 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -9041,17 +9159,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -10006,6 +10127,7 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10048,6 +10170,8 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -10093,7 +10217,7 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1857230878499620} - serializedVersion: 6 + serializedVersion: 7 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 @@ -12237,6 +12361,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -13667,19 +13847,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -13853,17 +14034,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -14818,6 +15002,7 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -14860,6 +15045,8 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -14915,6 +15102,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -15057,7 +15245,7 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1920424172144604} - serializedVersion: 6 + serializedVersion: 7 lengthInSec: 0.5 simulationSpeed: 1 stopAction: 0 @@ -17201,6 +17389,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -18631,19 +18875,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 1 collisionMode: 1 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -18817,17 +19062,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -19782,6 +20030,7 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -19824,6 +20073,8 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -19869,7 +20120,7 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1985583162212600} - serializedVersion: 6 + serializedVersion: 7 lengthInSec: 0.1 simulationSpeed: 1 stopAction: 0 @@ -22013,6 +22264,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -23443,19 +23750,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 1 collisionMode: 1 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -23629,17 +23937,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -24594,6 +24905,7 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -24636,6 +24948,8 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -24688,6 +25002,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Prefabs/StartUp/Player.prefab b/Assets/Prefabs/StartUp/Player.prefab index ba6f4274..11ac1b69 100644 --- a/Assets/Prefabs/StartUp/Player.prefab +++ b/Assets/Prefabs/StartUp/Player.prefab @@ -49,6 +49,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -71,7 +72,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1524664889 - m_SortingLayer: 0 + m_SortingLayer: 6 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 1cece6b8e403544279b30b97a7ce2d13, type: 3} m_Color: {r: 1, g: 0, b: 0, a: 0} @@ -374,7 +375,7 @@ SortingGroup: m_GameObject: {fileID: 1401446081381832} m_Enabled: 1 m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 --- !u!114 &114355383212365724 MonoBehaviour: @@ -390,6 +391,7 @@ MonoBehaviour: m_EditorClassIdentifier: minGroundNormalY: 0.65 gravityModifier: 3.2 + rb2d: {fileID: 50188015848557130} contactFilter: useTriggers: 0 useLayerMask: 1 @@ -409,12 +411,12 @@ MonoBehaviour: attackHit: {fileID: 1376248496002076} cameraEffects: {fileID: 0} deathParticles: {fileID: 1084583076897638173} - flameParticlesAudioSource: {fileID: 0} + flameParticlesAudioSource: {fileID: 82062164014661386} graphic: {fileID: 1401446081381832} graphicSprites: [] jumpParticles: {fileID: 4470067107435685217} pauseMenu: {fileID: 0} - recoveryCounter: {fileID: 0} + recoveryCounter: {fileID: 647812660725927313} cheatItems: [] dead: 0 frozen: 0 @@ -512,7 +514,7 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753547995046968} - serializedVersion: 6 + serializedVersion: 7 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 @@ -2598,6 +2600,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -4028,19 +4086,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 1 collisionMode: 1 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -4214,17 +4273,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -5179,11 +5241,11 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: c530408e808a8487ebec919713036fe1, type: 2} - - {fileID: 2100000, guid: c530408e808a8487ebec919713036fe1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5202,7 +5264,7 @@ ParticleSystemRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 2 m_RenderMode: 0 m_SortMode: 0 @@ -5221,6 +5283,8 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -5305,6 +5369,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5327,7 +5392,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 5303822438957532308, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -5410,6 +5475,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5432,7 +5498,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 2375533198695494076, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -5545,6 +5611,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5567,7 +5634,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 9055664747413950379, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -5682,6 +5749,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5704,7 +5772,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 3 m_Sprite: {fileID: 5679725541334812069, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -5765,6 +5833,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5787,7 +5856,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 9003116304047692369, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -5869,6 +5938,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5891,7 +5961,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: -4878340244579480210, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -6003,6 +6073,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6025,7 +6096,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: -655447010123683641, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -6137,6 +6208,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6159,7 +6231,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 8320075429477689656, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -6272,6 +6344,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6294,7 +6367,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: -2275177376659759308, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -6441,6 +6514,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6463,7 +6537,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: -2718017732221271195, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -6545,6 +6619,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6567,7 +6642,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: -5470089977235641522, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -6650,6 +6725,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6672,7 +6748,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: -191062134329367057, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -6755,6 +6831,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6777,7 +6854,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 1 m_Sprite: {fileID: -2294408909874599033, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -6851,7 +6928,7 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4470067107435685218} - serializedVersion: 6 + serializedVersion: 7 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 @@ -8995,6 +9072,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -10425,19 +10558,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 1 collisionMode: 1 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -10611,17 +10745,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -11576,11 +11713,11 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 7edc3e9957c1b4597b1a604bbf4f075e, type: 2} - - {fileID: 2100000, guid: 7edc3e9957c1b4597b1a604bbf4f075e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11599,7 +11736,7 @@ ParticleSystemRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 616639249 - m_SortingLayer: 0 + m_SortingLayer: 2 m_SortingOrder: 1 m_RenderMode: 0 m_SortMode: 0 @@ -11618,6 +11755,8 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -11671,6 +11810,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11693,7 +11833,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 8842639854986407125, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -11931,6 +12071,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11953,7 +12094,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 4450822385668979416, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -12193,6 +12334,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12215,7 +12357,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 1 m_Sprite: {fileID: 8621805756124160267, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -12296,6 +12438,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12318,7 +12461,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -525760289 - m_SortingLayer: 0 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: -4913308810346072724, guid: 9e11e74bed897ed49ace64317acf73f2, type: 3} @@ -12364,6 +12507,10 @@ PrefabInstance: propertyPath: m_Name value: DeathParticles objectReference: {fileID: 0} + - target: {fileID: 4727661067630430, guid: 9bc2cc5ac55974d43a623715964618e3, type: 3} + propertyPath: m_RootOrder + value: 19 + objectReference: {fileID: 0} - target: {fileID: 4727661067630430, guid: 9bc2cc5ac55974d43a623715964618e3, type: 3} propertyPath: m_LocalPosition.x value: 0.05 @@ -12376,6 +12523,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0 objectReference: {fileID: 0} + - target: {fileID: 4727661067630430, guid: 9bc2cc5ac55974d43a623715964618e3, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 4727661067630430, guid: 9bc2cc5ac55974d43a623715964618e3, type: 3} propertyPath: m_LocalRotation.x value: -0.7071068 @@ -12388,14 +12539,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4727661067630430, guid: 9bc2cc5ac55974d43a623715964618e3, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4727661067630430, guid: 9bc2cc5ac55974d43a623715964618e3, type: 3} - propertyPath: m_RootOrder - value: 19 - objectReference: {fileID: 0} - target: {fileID: 4727661067630430, guid: 9bc2cc5ac55974d43a623715964618e3, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90 @@ -12408,6 +12551,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 199054367867821184, guid: 9bc2cc5ac55974d43a623715964618e3, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9bc2cc5ac55974d43a623715964618e3, type: 3} --- !u!198 &1084583076897638173 stripped diff --git a/Assets/Scenes/DemoLevel.unity b/Assets/Scenes/DemoLevel.unity index a285f3da..90e43d39 100644 --- a/Assets/Scenes/DemoLevel.unity +++ b/Assets/Scenes/DemoLevel.unity @@ -1699,6 +1699,24 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 994624b53a6cb63488c33eed0b6ef17a, type: 3} +--- !u!114 &366520121 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 647812660725927313, guid: 5a231d6c8a56d42c7829e8707f65eb05, + type: 3} + m_PrefabInstance: {fileID: 4470067106299819798} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 420e96ddfe1ad484ebaaf99004b00fa8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!82 &366520126 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 82062164014661386, guid: 5a231d6c8a56d42c7829e8707f65eb05, + type: 3} + m_PrefabInstance: {fileID: 4470067106299819798} + m_PrefabAsset: {fileID: 0} --- !u!1001 &383418778 PrefabInstance: m_ObjectHideFlags: 0 @@ -2552,6 +2570,11 @@ PrefabInstance: propertyPath: amount value: 10 objectReference: {fileID: 0} + - target: {fileID: 199317658961252212, guid: eafa658dc579340ccb74ef473f37b5dd, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 95803312548059516, guid: eafa658dc579340ccb74ef473f37b5dd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: eafa658dc579340ccb74ef473f37b5dd, type: 3} @@ -3083,6 +3106,11 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} + - target: {fileID: 199317658961252212, guid: eafa658dc579340ccb74ef473f37b5dd, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 95803312548059516, guid: eafa658dc579340ccb74ef473f37b5dd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: eafa658dc579340ccb74ef473f37b5dd, type: 3} @@ -3916,6 +3944,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0f618da174ea44266865b50a04995f3c, type: 3} +--- !u!114 &1060343246 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 114545493876079580, guid: 927e473a2ba484d75b382fc1faaf0eeb, + type: 3} + m_PrefabInstance: {fileID: 7018260866872453974} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 303d86b7c63d6433795d7b39d81a2e63, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1065857932 PrefabInstance: m_ObjectHideFlags: 0 @@ -4112,6 +4152,11 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} + - target: {fileID: 199317658961252212, guid: eafa658dc579340ccb74ef473f37b5dd, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 95803312548059516, guid: eafa658dc579340ccb74ef473f37b5dd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: eafa658dc579340ccb74ef473f37b5dd, type: 3} @@ -5222,6 +5267,11 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} + - target: {fileID: 199317658961252212, guid: eafa658dc579340ccb74ef473f37b5dd, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 95803312548059516, guid: eafa658dc579340ccb74ef473f37b5dd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: eafa658dc579340ccb74ef473f37b5dd, type: 3} @@ -5341,7 +5391,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 114121103681124250, guid: ffc9cd11fa4bd42479840f0e559bfc58, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ffc9cd11fa4bd42479840f0e559bfc58, type: 3} --- !u!1001 &1407178704 PrefabInstance: @@ -7235,6 +7286,51 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ce1bbe003f390412a80f34448b33c93c, type: 3} +--- !u!1 &1888479922 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1420555457428052, guid: ffc9cd11fa4bd42479840f0e559bfc58, + type: 3} + m_PrefabInstance: {fileID: 1404970985} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1888479923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888479922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 --- !u!1001 &1905179071 PrefabInstance: m_ObjectHideFlags: 0 @@ -8934,6 +9030,21 @@ PrefabInstance: propertyPath: pauseMenu value: objectReference: {fileID: 1844477748} + - target: {fileID: 114355383212365724, guid: 5a231d6c8a56d42c7829e8707f65eb05, + type: 3} + propertyPath: cameraEffects + value: + objectReference: {fileID: 1060343246} + - target: {fileID: 114355383212365724, guid: 5a231d6c8a56d42c7829e8707f65eb05, + type: 3} + propertyPath: recoveryCounter + value: + objectReference: {fileID: 366520121} + - target: {fileID: 114355383212365724, guid: 5a231d6c8a56d42c7829e8707f65eb05, + type: 3} + propertyPath: flameParticlesAudioSource + value: + objectReference: {fileID: 366520126} - target: {fileID: 199276761053638502, guid: 5a231d6c8a56d42c7829e8707f65eb05, type: 3} propertyPath: m_Materials.Array.size diff --git a/Assets/Scripts/Characters/PhysicsObject.cs b/Assets/Scripts/Characters/PhysicsObject.cs index b2a928ca..04a49b81 100644 --- a/Assets/Scripts/Characters/PhysicsObject.cs +++ b/Assets/Scripts/Characters/PhysicsObject.cs @@ -13,7 +13,7 @@ public class PhysicsObject : MonoBehaviour [System.NonSerialized] public Vector2 targetVelocity; [System.NonSerialized] public bool grounded; [System.NonSerialized] protected Vector2 groundNormal; - protected Rigidbody2D rb2d; + [SerializeField] private Rigidbody2D rb2d; //Changed to private since I have no idea why it was bugging out protected [System.NonSerialized] public Vector2 velocity; [SerializeField] protected ContactFilter2D contactFilter; [SerializeField] protected RaycastHit2D[] hitBuffer = new RaycastHit2D[16]; @@ -21,11 +21,6 @@ public class PhysicsObject : MonoBehaviour protected const float minMoveDistance = 0.001f; protected const float shellRadius = 0.01f; - void OnEnable() - { - rb2d = GetComponent(); - } - void Start() { contactFilter.useTriggers = false; diff --git a/Assets/Scripts/Core/Inputsystem.meta b/Assets/Scripts/Core/Inputsystem.meta new file mode 100644 index 00000000..780e802a --- /dev/null +++ b/Assets/Scripts/Core/Inputsystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 383b98f2d7009d14aa57c26ba6e4f106 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Core/Inputsystem/Controls.cs b/Assets/Scripts/Core/Inputsystem/Controls.cs new file mode 100644 index 00000000..3b66811b --- /dev/null +++ b/Assets/Scripts/Core/Inputsystem/Controls.cs @@ -0,0 +1,424 @@ +//------------------------------------------------------------------------------ +// +// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator +// version 1.3.0 +// from Assets/Scripts/Core/Inputsystem/Controls.inputactions +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.Utilities; + +public partial class @Controls : IInputActionCollection2, IDisposable +{ + public InputActionAsset asset { get; } + public @Controls() + { + asset = InputActionAsset.FromJson(@"{ + ""name"": ""Controls"", + ""maps"": [ + { + ""name"": ""Player"", + ""id"": ""e7eb1ccf-1b52-4e8b-8690-d773bf81af7c"", + ""actions"": [ + { + ""name"": ""Jump"", + ""type"": ""Button"", + ""id"": ""d1254492-6866-49e0-b3a8-c2336833f8aa"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""RMB"", + ""type"": ""Button"", + ""id"": ""662f1835-ac69-4744-a14d-338747256f64"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""LMB"", + ""type"": ""Button"", + ""id"": ""65f5cec4-08b9-4913-9b5f-d2d528333a53"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""Direction"", + ""type"": ""Value"", + ""id"": ""d4541240-f0a7-467a-b8ba-d392096afa44"", + ""expectedControlType"": ""Vector2"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": true + } + ], + ""bindings"": [ + { + ""name"": """", + ""id"": ""dd507174-b86d-42e9-b445-6b896f8f22ea"", + ""path"": ""/space"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Jump"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""419970eb-b53f-4f41-8352-e6a6995ecc87"", + ""path"": ""/leftButton"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""LMB"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": ""2D Vector"", + ""id"": ""cd502eab-8569-4f88-94f3-6285fe096ea2"", + ""path"": ""2DVector"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Direction"", + ""isComposite"": true, + ""isPartOfComposite"": false + }, + { + ""name"": ""up"", + ""id"": ""281749d3-311b-437e-a64b-1af9948a2d16"", + ""path"": ""/w"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Direction"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""up"", + ""id"": ""d24b454a-e949-465f-bed1-6daff4a5ee40"", + ""path"": ""/upArrow"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Direction"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""down"", + ""id"": ""92d606af-525c-4810-b08e-737ba98da7ce"", + ""path"": ""/s"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Direction"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""down"", + ""id"": ""25ee55bc-f8d7-4c19-a0c7-1d26646e6fd3"", + ""path"": ""/downArrow"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Direction"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""left"", + ""id"": ""11c21fba-380d-48c3-812c-bd8926c7262c"", + ""path"": ""/a"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Direction"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""left"", + ""id"": ""641f8bad-419c-4a72-a6e5-9a14cc6474ed"", + ""path"": ""/leftArrow"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Direction"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""right"", + ""id"": ""7c99bf54-1841-4fc3-8572-e98823dfbe2f"", + ""path"": ""/d"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Direction"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""right"", + ""id"": ""bb5326a1-1ac2-4b5f-bd77-624da98591b0"", + ""path"": ""/rightArrow"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Direction"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": """", + ""id"": ""0850c619-5431-4632-bad4-3a3406384f15"", + ""path"": ""/rightButton"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""RMB"", + ""isComposite"": false, + ""isPartOfComposite"": false + } + ] + }, + { + ""name"": ""UI"", + ""id"": ""93e413cf-599b-4c90-9ec0-9831b92d355f"", + ""actions"": [ + { + ""name"": ""Escape"", + ""type"": ""Button"", + ""id"": ""6a6cc44e-32d4-45ea-afa2-0a58d1572abd"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + } + ], + ""bindings"": [ + { + ""name"": """", + ""id"": ""c3f6cebc-a1e8-48d0-a717-a34eeaf55cf4"", + ""path"": ""/escape"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Escape"", + ""isComposite"": false, + ""isPartOfComposite"": false + } + ] + } + ], + ""controlSchemes"": [ + { + ""name"": ""Mouse & Keyboard"", + ""bindingGroup"": ""Mouse & Keyboard"", + ""devices"": [ + { + ""devicePath"": """", + ""isOptional"": false, + ""isOR"": false + }, + { + ""devicePath"": """", + ""isOptional"": false, + ""isOR"": false + } + ] + } + ] +}"); + // Player + m_Player = asset.FindActionMap("Player", throwIfNotFound: true); + m_Player_Jump = m_Player.FindAction("Jump", throwIfNotFound: true); + m_Player_RMB = m_Player.FindAction("RMB", throwIfNotFound: true); + m_Player_LMB = m_Player.FindAction("LMB", throwIfNotFound: true); + m_Player_Direction = m_Player.FindAction("Direction", throwIfNotFound: true); + // UI + m_UI = asset.FindActionMap("UI", throwIfNotFound: true); + m_UI_Escape = m_UI.FindAction("Escape", throwIfNotFound: true); + } + + public void Dispose() + { + UnityEngine.Object.Destroy(asset); + } + + public InputBinding? bindingMask + { + get => asset.bindingMask; + set => asset.bindingMask = value; + } + + public ReadOnlyArray? devices + { + get => asset.devices; + set => asset.devices = value; + } + + public ReadOnlyArray controlSchemes => asset.controlSchemes; + + public bool Contains(InputAction action) + { + return asset.Contains(action); + } + + public IEnumerator GetEnumerator() + { + return asset.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + + public void Enable() + { + asset.Enable(); + } + + public void Disable() + { + asset.Disable(); + } + public IEnumerable bindings => asset.bindings; + + public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) + { + return asset.FindAction(actionNameOrId, throwIfNotFound); + } + public int FindBinding(InputBinding bindingMask, out InputAction action) + { + return asset.FindBinding(bindingMask, out action); + } + + // Player + private readonly InputActionMap m_Player; + private IPlayerActions m_PlayerActionsCallbackInterface; + private readonly InputAction m_Player_Jump; + private readonly InputAction m_Player_RMB; + private readonly InputAction m_Player_LMB; + private readonly InputAction m_Player_Direction; + public struct PlayerActions + { + private @Controls m_Wrapper; + public PlayerActions(@Controls wrapper) { m_Wrapper = wrapper; } + public InputAction @Jump => m_Wrapper.m_Player_Jump; + public InputAction @RMB => m_Wrapper.m_Player_RMB; + public InputAction @LMB => m_Wrapper.m_Player_LMB; + public InputAction @Direction => m_Wrapper.m_Player_Direction; + public InputActionMap Get() { return m_Wrapper.m_Player; } + public void Enable() { Get().Enable(); } + public void Disable() { Get().Disable(); } + public bool enabled => Get().enabled; + public static implicit operator InputActionMap(PlayerActions set) { return set.Get(); } + public void SetCallbacks(IPlayerActions instance) + { + if (m_Wrapper.m_PlayerActionsCallbackInterface != null) + { + @Jump.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnJump; + @Jump.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnJump; + @Jump.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnJump; + @RMB.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnRMB; + @RMB.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnRMB; + @RMB.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnRMB; + @LMB.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLMB; + @LMB.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLMB; + @LMB.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLMB; + @Direction.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDirection; + @Direction.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDirection; + @Direction.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDirection; + } + m_Wrapper.m_PlayerActionsCallbackInterface = instance; + if (instance != null) + { + @Jump.started += instance.OnJump; + @Jump.performed += instance.OnJump; + @Jump.canceled += instance.OnJump; + @RMB.started += instance.OnRMB; + @RMB.performed += instance.OnRMB; + @RMB.canceled += instance.OnRMB; + @LMB.started += instance.OnLMB; + @LMB.performed += instance.OnLMB; + @LMB.canceled += instance.OnLMB; + @Direction.started += instance.OnDirection; + @Direction.performed += instance.OnDirection; + @Direction.canceled += instance.OnDirection; + } + } + } + public PlayerActions @Player => new PlayerActions(this); + + // UI + private readonly InputActionMap m_UI; + private IUIActions m_UIActionsCallbackInterface; + private readonly InputAction m_UI_Escape; + public struct UIActions + { + private @Controls m_Wrapper; + public UIActions(@Controls wrapper) { m_Wrapper = wrapper; } + public InputAction @Escape => m_Wrapper.m_UI_Escape; + public InputActionMap Get() { return m_Wrapper.m_UI; } + public void Enable() { Get().Enable(); } + public void Disable() { Get().Disable(); } + public bool enabled => Get().enabled; + public static implicit operator InputActionMap(UIActions set) { return set.Get(); } + public void SetCallbacks(IUIActions instance) + { + if (m_Wrapper.m_UIActionsCallbackInterface != null) + { + @Escape.started -= m_Wrapper.m_UIActionsCallbackInterface.OnEscape; + @Escape.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnEscape; + @Escape.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnEscape; + } + m_Wrapper.m_UIActionsCallbackInterface = instance; + if (instance != null) + { + @Escape.started += instance.OnEscape; + @Escape.performed += instance.OnEscape; + @Escape.canceled += instance.OnEscape; + } + } + } + public UIActions @UI => new UIActions(this); + private int m_MouseKeyboardSchemeIndex = -1; + public InputControlScheme MouseKeyboardScheme + { + get + { + if (m_MouseKeyboardSchemeIndex == -1) m_MouseKeyboardSchemeIndex = asset.FindControlSchemeIndex("Mouse & Keyboard"); + return asset.controlSchemes[m_MouseKeyboardSchemeIndex]; + } + } + public interface IPlayerActions + { + void OnJump(InputAction.CallbackContext context); + void OnRMB(InputAction.CallbackContext context); + void OnLMB(InputAction.CallbackContext context); + void OnDirection(InputAction.CallbackContext context); + } + public interface IUIActions + { + void OnEscape(InputAction.CallbackContext context); + } +} diff --git a/Assets/Scripts/Core/Inputsystem/Controls.cs.meta b/Assets/Scripts/Core/Inputsystem/Controls.cs.meta new file mode 100644 index 00000000..d64910fa --- /dev/null +++ b/Assets/Scripts/Core/Inputsystem/Controls.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa6b945d001be4840bb2f5d77bd347db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Core/Inputsystem/Controls.inputactions b/Assets/Scripts/Core/Inputsystem/Controls.inputactions new file mode 100644 index 00000000..9dac853d --- /dev/null +++ b/Assets/Scripts/Core/Inputsystem/Controls.inputactions @@ -0,0 +1,227 @@ +{ + "name": "Controls", + "maps": [ + { + "name": "Player", + "id": "e7eb1ccf-1b52-4e8b-8690-d773bf81af7c", + "actions": [ + { + "name": "Jump", + "type": "Button", + "id": "d1254492-6866-49e0-b3a8-c2336833f8aa", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "RMB", + "type": "Button", + "id": "662f1835-ac69-4744-a14d-338747256f64", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "LMB", + "type": "Button", + "id": "65f5cec4-08b9-4913-9b5f-d2d528333a53", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Direction", + "type": "Value", + "id": "d4541240-f0a7-467a-b8ba-d392096afa44", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + } + ], + "bindings": [ + { + "name": "", + "id": "dd507174-b86d-42e9-b445-6b896f8f22ea", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "419970eb-b53f-4f41-8352-e6a6995ecc87", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "LMB", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "2D Vector", + "id": "cd502eab-8569-4f88-94f3-6285fe096ea2", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Direction", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "281749d3-311b-437e-a64b-1af9948a2d16", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Direction", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "d24b454a-e949-465f-bed1-6daff4a5ee40", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Direction", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "92d606af-525c-4810-b08e-737ba98da7ce", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Direction", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "25ee55bc-f8d7-4c19-a0c7-1d26646e6fd3", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Direction", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "11c21fba-380d-48c3-812c-bd8926c7262c", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Direction", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "641f8bad-419c-4a72-a6e5-9a14cc6474ed", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Direction", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "7c99bf54-1841-4fc3-8572-e98823dfbe2f", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Direction", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "bb5326a1-1ac2-4b5f-bd77-624da98591b0", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Direction", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "0850c619-5431-4632-bad4-3a3406384f15", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "RMB", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, + { + "name": "UI", + "id": "93e413cf-599b-4c90-9ec0-9831b92d355f", + "actions": [ + { + "name": "Escape", + "type": "Button", + "id": "6a6cc44e-32d4-45ea-afa2-0a58d1572abd", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "c3f6cebc-a1e8-48d0-a717-a34eeaf55cf4", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Escape", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Mouse & Keyboard", + "bindingGroup": "Mouse & Keyboard", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/Assets/Scripts/Core/Inputsystem/Controls.inputactions.meta b/Assets/Scripts/Core/Inputsystem/Controls.inputactions.meta new file mode 100644 index 00000000..074c7289 --- /dev/null +++ b/Assets/Scripts/Core/Inputsystem/Controls.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 47884e88651a2ed4cbd5267f6cdb48b5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 1 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/Scripts/Core/NewPlayer.cs b/Assets/Scripts/Core/NewPlayer.cs index e5aaae16..a097bfe3 100644 --- a/Assets/Scripts/Core/NewPlayer.cs +++ b/Assets/Scripts/Core/NewPlayer.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.InputSystem; /*Adds player functionality to a physics object*/ @@ -23,6 +24,7 @@ public class NewPlayer : PhysicsObject [SerializeField] private ParticleSystem jumpParticles; [SerializeField] private GameObject pauseMenu; public RecoveryCounter recoveryCounter; + private Controls controls; // Singleton instantiation private static NewPlayer instance; @@ -53,7 +55,9 @@ public static NewPlayer Instance [System.NonSerialized] public bool pounded; [System.NonSerialized] public bool pounding; [System.NonSerialized] public bool shooting = false; - + [SerializeField] private bool lmbHeld; + [SerializeField] private bool rmbHeld; + [Header ("Inventory")] public float ammo; public int coins; @@ -77,6 +81,34 @@ public static NewPlayer Instance public AudioClip stepSound; [System.NonSerialized] public int whichHurtSound; + private void Awake() => controls = new Controls(); + + private void OnEnable() { + controls.Enable(); + + controls.Player.LMB.started += OnLeftClick; + controls.Player.LMB.canceled += OnLeftClick; + + controls.Player.RMB.started += OnRightClick; + controls.Player.RMB.canceled += OnRightClick; + + controls.UI.Escape.performed += _ => PauseGame(); + controls.Player.Jump.performed += _ => Jump(1f); + } + + private void OnDisable() { + controls.Disable(); + + controls.Player.LMB.started -= OnLeftClick; + controls.Player.LMB.canceled -= OnLeftClick; + + controls.Player.RMB.started -= OnRightClick; + controls.Player.RMB.canceled -= OnRightClick; + + controls.UI.Escape.performed -= _ => PauseGame(); + controls.Player.Jump.performed -= _ => Jump(0f); + } + void Start() { Cursor.visible = false; @@ -92,11 +124,54 @@ void Start() SetGroundType(); } - private void Update() + private void OnLeftClick(InputAction.CallbackContext ctx) { - ComputeVelocity(); + if (ctx.started) + { + lmbHeld = true; + + if(rmbHeld) + { + shooting = true; + } + else + { + Attack(); + } + } + else if (ctx.canceled) + { + lmbHeld = false; + + if(shooting) + { + shooting = false; + Shoot(); //Holster that weapon + } + } + } + + private void OnRightClick(InputAction.CallbackContext ctx) + { + if (ctx.started) + { + rmbHeld = true; + } + else if (ctx.canceled) + { + rmbHeld = false; + lmbHeld = false; //Reset the left click state if the right click is canceled + + if(shooting) + { + shooting = false; + Shoot(); //Holster that weapon + } + } } + private void Update() => ComputeVelocity(); + protected void ComputeVelocity() { //Player movement & attack @@ -106,54 +181,23 @@ protected void ComputeVelocity() //Lerp launch back to zero at all times launch += (0 - launch) * Time.deltaTime * launchRecovery; - if (Input.GetButtonDown("Cancel")) - { - pauseMenu.SetActive(true); - } - //Movement, jumping, and attacking! if (!frozen) { - move.x = Input.GetAxis("Horizontal") + launch; - - if (Input.GetButtonDown("Jump") && animator.GetBool("grounded") == true && !jumping) - { - animator.SetBool("pounded", false); - Jump(1f); - } + move.x = controls.Player.Direction.ReadValue().x + launch; //Flip the graphic's localScale if (move.x > 0.01f) - { graphic.transform.localScale = new Vector3(origLocalScale.x, transform.localScale.y, transform.localScale.z); - } else if (move.x < -0.01f) - { graphic.transform.localScale = new Vector3(-origLocalScale.x, transform.localScale.y, transform.localScale.z); - } - - //Punch - if (Input.GetMouseButtonDown(0)) - { - animator.SetTrigger("attack"); - Shoot(false); - } - - //Secondary attack (currently shooting) with right click - if (Input.GetMouseButtonDown(1)) - { - Shoot(true); - } - else if (Input.GetMouseButtonUp(1)) - { - Shoot(false); - } - - if (shooting) - { - SubtractAmmo(); - } + if(lmbHeld && rmbHeld) + Shoot(); + + if(shooting) + SubtractAmmo(); + //Allow the player to jump even if they have just fallen off an edge ("fall forgiveness") if (!grounded) { @@ -175,14 +219,10 @@ protected void ComputeVelocity() //Set each animator float, bool, and trigger to it knows which animation to fire animator.SetFloat("velocityX", Mathf.Abs(velocity.x) / maxSpeed); animator.SetFloat("velocityY", velocity.y); - animator.SetInteger("attackDirectionY", (int)Input.GetAxis("VerticalDirection")); - animator.SetInteger("moveDirection", (int)Input.GetAxis("HorizontalDirection")); + animator.SetInteger("attackDirectionY", (int)controls.Player.Direction.ReadValue().y); + animator.SetInteger("moveDirection", (int)controls.Player.Direction.ReadValue().x); animator.SetBool("hasChair", GameManager.Instance.inventory.ContainsKey("chair")); targetVelocity = move * maxSpeed; - - - - } else { @@ -219,7 +259,6 @@ public void Freeze(bool freeze) launch = 0; } - public void GetHurt(int hurtDirection, int hitPower) { //If the player is not frozen (ie talking, spawning, etc), recovering, and pounding, get hurt! @@ -269,7 +308,6 @@ public IEnumerator FreezeFrameEffect(float length = .007f) Time.timeScale = 1f; } - public IEnumerator Die() { if (!frozen) @@ -293,23 +331,23 @@ public void ResetLevel() health = maxHealth; } - public void SubtractAmmo() - { - if (ammo > 0) - { - ammo -= 20 * Time.deltaTime; - } - } - public void Jump(float jumpMultiplier) { - if (velocity.y != jumpPower) + if (!frozen) { - velocity.y = jumpPower * jumpMultiplier; //The jumpMultiplier allows us to use the Jump function to also launch the player from bounce platforms - PlayJumpSound(); - PlayStepSound(); - JumpEffect(); - jumping = true; + if (animator.GetBool("grounded") == true) + { + animator.SetBool("pounded", false); + + if (velocity.y != jumpPower) + { + velocity.y = jumpPower * jumpMultiplier; //The jumpMultiplier allows us to use the Jump function to also launch the player from bounce platforms + PlayJumpSound(); + PlayStepSound(); + JumpEffect(); + jumping = true; + } + } } } @@ -317,7 +355,7 @@ public void PlayStepSound() { //Play a step sound at a random pitch between two floats, while also increasing the volume based on the Horizontal axis audioSource.pitch = (Random.Range(0.9f, 1.1f)); - audioSource.PlayOneShot(stepSound, Mathf.Abs(Input.GetAxis("Horizontal") / 10)); + audioSource.PlayOneShot(stepSound, Mathf.Abs(controls.Player.Direction.ReadValue().x / 10)); } public void PlayJumpSound() @@ -326,7 +364,6 @@ public void PlayJumpSound() GameManager.Instance.audioSource.PlayOneShot(jumpSound, .1f); } - public void JumpEffect() { jumpParticles.Emit(1); @@ -368,6 +405,7 @@ public void ActivatePound() FreezeFrameEffect(.3f); } } + public void PoundEffect() { //As long as the player as activated the pound in ActivatePound, the following will occur when hitting the ground. @@ -397,31 +435,34 @@ public void Hide(bool hide) sprite.gameObject.SetActive(!hide); } - public void Shoot(bool equip) + private void Shoot() { - //Flamethrower ability - if (GameManager.Instance.inventory.ContainsKey("flamethrower")) + if (!frozen) { - if (equip) - { - if (!shooting) + //Flamethrower ability + //if (GameManager.Instance.inventory.ContainsKey("flamethrower")) + //{ + if (shooting) { animator.SetBool("shooting", true); GameManager.Instance.audioSource.PlayOneShot(equipSound); flameParticlesAudioSource.Play(); - shooting = true; } - } - else - { - if (shooting) + else { animator.SetBool("shooting", false); flameParticlesAudioSource.Stop(); GameManager.Instance.audioSource.PlayOneShot(holsterSound); - shooting = false; } - } + //} + } + } + + private void Attack() + { + if(!frozen) + { + animator.SetTrigger("attack"); } } @@ -433,4 +474,18 @@ public void SetUpCheatItems() GameManager.Instance.GetInventoryItem(cheatItems[i], null); } } + + private void SubtractAmmo() + { + if (ammo > 0) + { + ammo -= 20 * Time.deltaTime; + } + } + + private void PauseGame() + { + if(!pauseMenu.activeSelf) + pauseMenu.SetActive(true); + } } \ No newline at end of file diff --git a/Assets/Scripts/UI/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs index fda51e8f..e1fffc97 100644 --- a/Assets/Scripts/UI/PauseMenu.cs +++ b/Assets/Scripts/UI/PauseMenu.cs @@ -11,12 +11,25 @@ public class PauseMenu : MonoBehaviour [SerializeField] AudioClip openSound; [SerializeField] GameObject pauseMenu; - // Use this for initialization + private Controls controls; + + private void Awake() => controls = new Controls(); + void OnEnable() { + controls.Enable(); Cursor.visible = true; GameManager.Instance.audioSource.PlayOneShot(openSound); Time.timeScale = 0f; + + controls.UI.Escape.performed += _ => Unpause(); + } + + void OnDisable() + { + controls.Disable(); + + controls.UI.Escape.performed -= _ => Unpause(); } public void Unpause() diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt new file mode 100644 index 00000000..cdb92d76 --- /dev/null +++ b/Logs/ApiUpdaterCheck.txt @@ -0,0 +1,40 @@ +[api-updater (non-obsolete-error-filter)] 21/02/2022 3:53:46 PM : Starting B:/Unity Editors/2020.3.29f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 147.0113ms +moved types parse time: 49ms +candidates parse time : 1ms +C# parse time : 498ms +candidates check time : 74ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 21/02/2022 3:54:14 PM : Starting B:/Unity Editors/2020.3.29f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 70.0153ms +moved types parse time: 50ms +candidates parse time : 1ms +C# parse time : 208ms +candidates check time : 74ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 21/02/2022 5:29:31 PM : Starting B:/Unity Editors/2020.3.29f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 73.0951ms +moved types parse time: 49ms +candidates parse time : 1ms +C# parse time : 208ms +candidates check time : 63ms +console write time : 0ms + +[api-updater (non-obsolete-error-filter)] 21/02/2022 5:52:15 PM : Starting B:/Unity Editors/2020.3.29f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 75.0873ms +moved types parse time: 48ms +candidates parse time : 1ms +C# parse time : 241ms +candidates check time : 115ms +console write time : 0ms + diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 05dd2c52..1389ce81 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -155,7 +155,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Standalone: com.Company.ProductName + Standalone: com.AtmosGames.ZeroDeaths buildNumber: Standalone: 0 iPhone: 0 diff --git a/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs b/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs new file mode 100644 index 00000000..2afc0312 --- /dev/null +++ b/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.1", FrameworkDisplayName = ".NET Framework 4.7.1")] diff --git a/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache new file mode 100644 index 0000000000000000000000000000000000000000..76977693171c15a00b7734d97b6ac8505f7e4f33 GIT binary patch literal 78006 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 HPwD>v2vZmj literal 0 HcmV?d00001 diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache new file mode 100644 index 0000000000000000000000000000000000000000..c6d15b443b3ed921d48a96aa25a355c5e37f88a5 GIT binary patch literal 195122 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 HiKhP#`F1)F literal 0 HcmV?d00001 From df14c820dc6fc66de3c48cf3b690e72e7bc5d429 Mon Sep 17 00:00:00 2001 From: ChizaruuGCO Date: Mon, 21 Feb 2022 22:57:16 +1100 Subject: [PATCH 5/5] Updated Packages & Dialogue support Dialogue is now supported by new input system --- Assets/Prefabs/UI/PauseMenu.prefab | 51 +++++++++++--- Assets/Scenes/DemoLevel.unity | 5 ++ Assets/Scripts/Core/DialogueBoxController.cs | 61 ++++++++++++++--- Assets/Scripts/Core/Inputsystem/Controls.cs | 63 +++++++++++++++--- .../Core/Inputsystem/Controls.inputactions | 53 ++++++++++++--- Assets/Scripts/Interaction/DialogueTrigger.cs | 29 +++++++- Logs/ApiUpdaterCheck.txt | 10 +++ Packages/manifest.json | 12 ++-- Packages/packages-lock.json | 12 ++-- ...mbly-CSharp.csproj.AssemblyReference.cache | Bin 195122 -> 195211 bytes 10 files changed, 243 insertions(+), 53 deletions(-) diff --git a/Assets/Prefabs/UI/PauseMenu.prefab b/Assets/Prefabs/UI/PauseMenu.prefab index 8c169363..eb418023 100644 --- a/Assets/Prefabs/UI/PauseMenu.prefab +++ b/Assets/Prefabs/UI/PauseMenu.prefab @@ -60,6 +60,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.79607844} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -85,7 +86,7 @@ GameObject: m_Component: - component: {fileID: 4923770828874524} - component: {fileID: 114224478885330938} - - component: {fileID: 114121103681124250} + - component: {fileID: 7456902891357313435} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -122,7 +123,7 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 ---- !u!114 &114121103681124250 +--- !u!114 &7456902891357313435 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,16 +132,36 @@ MonoBehaviour: m_GameObject: {fileID: 1420555457428052} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 --- !u!1 &1463026909582672 GameObject: m_ObjectHideFlags: 0 @@ -202,6 +223,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 0, b: 0.32941177, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -234,6 +256,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -264,6 +287,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114035738279882206} + m_TargetAssemblyTypeName: m_MethodName: Quit m_Mode: 1 m_Arguments: @@ -335,6 +359,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -367,6 +392,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -397,6 +423,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114035738279882206} + m_TargetAssemblyTypeName: m_MethodName: RestartLevel m_Mode: 1 m_Arguments: @@ -468,6 +495,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -500,6 +528,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -530,6 +559,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114035738279882206} + m_TargetAssemblyTypeName: m_MethodName: Unpause m_Mode: 1 m_Arguments: @@ -627,6 +657,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &114344645268642648 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/DemoLevel.unity b/Assets/Scenes/DemoLevel.unity index 90e43d39..f3bf432d 100644 --- a/Assets/Scenes/DemoLevel.unity +++ b/Assets/Scenes/DemoLevel.unity @@ -9151,6 +9151,11 @@ PrefabInstance: propertyPath: m_Follow value: objectReference: {fileID: 5809405050015905993} + - target: {fileID: 114843163458573616, guid: 927e473a2ba484d75b382fc1faaf0eeb, + type: 3} + propertyPath: m_FrequencyGain + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1979371213, guid: 927e473a2ba484d75b382fc1faaf0eeb, type: 3} - {fileID: 1979371212, guid: 927e473a2ba484d75b382fc1faaf0eeb, type: 3} diff --git a/Assets/Scripts/Core/DialogueBoxController.cs b/Assets/Scripts/Core/DialogueBoxController.cs index 76536e72..d88a5b16 100644 --- a/Assets/Scripts/Core/DialogueBoxController.cs +++ b/Assets/Scripts/Core/DialogueBoxController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; using TMPro; +using UnityEngine.InputSystem; /*Controls the dialogue box and it's communication with Dialogue.cs, which contains the character dialogue*/ @@ -46,6 +47,46 @@ public class DialogueBoxController : MonoBehaviour private bool horizontalKeyIsDown = true; private bool submitKeyIsDown = true; private bool typing = true; + [SerializeField] private bool interactHeld; + [SerializeField] private bool jumpHeld; + + private Controls controls; + + private void Awake() => controls = new Controls(); + + private void OnEnable() { + controls.Enable(); + + controls.Player.Interact.started += Interact; + controls.Player.Interact.canceled += Interact; + + controls.Player.Jump.started += Jump; + controls.Player.Jump.canceled += Jump; + } + + private void OnDisable() { + controls.Disable(); + + controls.Player.Interact.started -= Interact; + controls.Player.Interact.canceled -= Interact; + + controls.Player.Jump.started -= Jump; + controls.Player.Jump.canceled -= Jump; + } + + private void Interact(InputAction.CallbackContext ctx) { + if(ctx.started) + interactHeld = true; + else if(ctx.canceled) + interactHeld = false; + } + + private void Jump(InputAction.CallbackContext ctx) { + if(ctx.started) + jumpHeld = true; + else if(ctx.canceled) + jumpHeld = false; + } // Update is called once per frame void Update() @@ -54,7 +95,7 @@ void Update() { //Submit //Check for key press - if (((Input.GetAxis("Submit") > 0) || (Input.GetAxis("Jump") > 0)) && !submitKeyIsDown) + if ((interactHeld || jumpHeld) && !submitKeyIsDown) { submitKeyIsDown = true; if (!typing) @@ -78,21 +119,25 @@ void Update() } //Check for first release to ensure we can't spam - if (submitKeyIsDown && Input.GetAxis("Submit") < .001 && Input.GetAxis("Jump") < .001) + if (submitKeyIsDown) { - if (!typing) + if(interactHeld || jumpHeld) { - submitKeyIsDown = false; - if (index == 0) + if (!typing) { - ableToAdvance = true; + submitKeyIsDown = false; + if (index == 0) + { + ableToAdvance = true; + } } } + } //Choices //Check for key press - if ((Input.GetAxis("Horizontal") != 0) && !horizontalKeyIsDown && animator.GetBool("hasChoices") == true) + if ((controls.Player.Direction.ReadValue().x != 0) && !horizontalKeyIsDown && animator.GetBool("hasChoices") == true) { if (animator.GetInteger("choiceSelection") == 1) { @@ -109,7 +154,7 @@ void Update() } //Check for first release to ensure we can't spam - if (horizontalKeyIsDown && Input.GetAxis("Horizontal") == 0) + if (horizontalKeyIsDown && controls.Player.Direction.ReadValue().x == 0) { horizontalKeyIsDown = false; } diff --git a/Assets/Scripts/Core/Inputsystem/Controls.cs b/Assets/Scripts/Core/Inputsystem/Controls.cs index 3b66811b..a9696e96 100644 --- a/Assets/Scripts/Core/Inputsystem/Controls.cs +++ b/Assets/Scripts/Core/Inputsystem/Controls.cs @@ -62,20 +62,18 @@ public @Controls() ""processors"": """", ""interactions"": """", ""initialStateCheck"": true + }, + { + ""name"": ""Interact"", + ""type"": ""Button"", + ""id"": ""044c8576-806a-4b7c-bb50-690ae565b097"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ - { - ""name"": """", - ""id"": ""dd507174-b86d-42e9-b445-6b896f8f22ea"", - ""path"": ""/space"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Mouse & Keyboard"", - ""action"": ""Jump"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, { ""name"": """", ""id"": ""419970eb-b53f-4f41-8352-e6a6995ecc87"", @@ -196,6 +194,39 @@ public @Controls() ""action"": ""RMB"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""90fb4b13-ce78-4f57-9f72-fc34b0dbad67"", + ""path"": ""/e"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Interact"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""4a40f388-a519-464d-976e-a2b57a6b08db"", + ""path"": ""/enter"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Interact"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""27b93944-34f4-4b49-a758-70144b69f7db"", + ""path"": ""/space"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Mouse & Keyboard"", + ""action"": ""Jump"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] }, @@ -253,6 +284,7 @@ public @Controls() m_Player_RMB = m_Player.FindAction("RMB", throwIfNotFound: true); m_Player_LMB = m_Player.FindAction("LMB", throwIfNotFound: true); m_Player_Direction = m_Player.FindAction("Direction", throwIfNotFound: true); + m_Player_Interact = m_Player.FindAction("Interact", throwIfNotFound: true); // UI m_UI = asset.FindActionMap("UI", throwIfNotFound: true); m_UI_Escape = m_UI.FindAction("Escape", throwIfNotFound: true); @@ -319,6 +351,7 @@ public int FindBinding(InputBinding bindingMask, out InputAction action) private readonly InputAction m_Player_RMB; private readonly InputAction m_Player_LMB; private readonly InputAction m_Player_Direction; + private readonly InputAction m_Player_Interact; public struct PlayerActions { private @Controls m_Wrapper; @@ -327,6 +360,7 @@ public struct PlayerActions public InputAction @RMB => m_Wrapper.m_Player_RMB; public InputAction @LMB => m_Wrapper.m_Player_LMB; public InputAction @Direction => m_Wrapper.m_Player_Direction; + public InputAction @Interact => m_Wrapper.m_Player_Interact; public InputActionMap Get() { return m_Wrapper.m_Player; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -348,6 +382,9 @@ public void SetCallbacks(IPlayerActions instance) @Direction.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDirection; @Direction.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDirection; @Direction.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDirection; + @Interact.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnInteract; + @Interact.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnInteract; + @Interact.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnInteract; } m_Wrapper.m_PlayerActionsCallbackInterface = instance; if (instance != null) @@ -364,6 +401,9 @@ public void SetCallbacks(IPlayerActions instance) @Direction.started += instance.OnDirection; @Direction.performed += instance.OnDirection; @Direction.canceled += instance.OnDirection; + @Interact.started += instance.OnInteract; + @Interact.performed += instance.OnInteract; + @Interact.canceled += instance.OnInteract; } } } @@ -416,6 +456,7 @@ public interface IPlayerActions void OnRMB(InputAction.CallbackContext context); void OnLMB(InputAction.CallbackContext context); void OnDirection(InputAction.CallbackContext context); + void OnInteract(InputAction.CallbackContext context); } public interface IUIActions { diff --git a/Assets/Scripts/Core/Inputsystem/Controls.inputactions b/Assets/Scripts/Core/Inputsystem/Controls.inputactions index 9dac853d..04604e24 100644 --- a/Assets/Scripts/Core/Inputsystem/Controls.inputactions +++ b/Assets/Scripts/Core/Inputsystem/Controls.inputactions @@ -40,20 +40,18 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "Interact", + "type": "Button", + "id": "044c8576-806a-4b7c-bb50-690ae565b097", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ - { - "name": "", - "id": "dd507174-b86d-42e9-b445-6b896f8f22ea", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Mouse & Keyboard", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "419970eb-b53f-4f41-8352-e6a6995ecc87", @@ -174,6 +172,39 @@ "action": "RMB", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "90fb4b13-ce78-4f57-9f72-fc34b0dbad67", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4a40f388-a519-464d-976e-a2b57a6b08db", + "path": "/enter", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "27b93944-34f4-4b49-a758-70144b69f7db", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Mouse & Keyboard", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/Scripts/Interaction/DialogueTrigger.cs b/Assets/Scripts/Interaction/DialogueTrigger.cs index 872e41f9..0269b112 100644 --- a/Assets/Scripts/Interaction/DialogueTrigger.cs +++ b/Assets/Scripts/Interaction/DialogueTrigger.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.InputSystem; /*Triggers a dialogue conversation, passing unique commands and information to the dialogue box and inventory system for fetch quests, etc.*/ @@ -38,6 +39,32 @@ public class DialogueTrigger : MonoBehaviour [SerializeField] private int requiredCoins; //Or the required coins (cannot require both an item and coins) public Animator useItemAnimator; //If the player uses an item, like a key, an animator can be fired (ie to open a door) [SerializeField] private string useItemAnimatorBool; //An animator bool can be set to true once an item is used, like ae key. + [SerializeField] private bool interactHeld; + + private Controls controls; + + private void Awake() => controls = new Controls(); + + private void OnEnable() { + controls.Enable(); + + controls.Player.Interact.started += Interact; + controls.Player.Interact.canceled += Interact; + } + + private void OnDisable() { + controls.Disable(); + + controls.Player.Interact.started -= Interact; + controls.Player.Interact.canceled -= Interact; + } + + private void Interact(InputAction.CallbackContext ctx) { + if(ctx.started) + interactHeld = true; + else if(ctx.canceled) + interactHeld = false; + } void OnTriggerStay2D(Collider2D col) { @@ -49,7 +76,7 @@ void OnTriggerStay2D(Collider2D col) if (col.gameObject == NewPlayer.Instance.gameObject && !sleeping && !completed && NewPlayer.Instance.grounded) { iconAnimator.SetBool("active", true); - if (autoHit || (Input.GetAxis("Submit") > 0)) + if (autoHit || interactHeld) { iconAnimator.SetBool("active", false); if (requiredItem == "" && requiredCoins == 0 || !GameManager.Instance.inventory.ContainsKey(requiredItem) && requiredCoins == 0 || (requiredCoins != 0 && NewPlayer.Instance.coins < requiredCoins)) diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt index cdb92d76..095ea2d8 100644 --- a/Logs/ApiUpdaterCheck.txt +++ b/Logs/ApiUpdaterCheck.txt @@ -38,3 +38,13 @@ C# parse time : 241ms candidates check time : 115ms console write time : 0ms +[api-updater (non-obsolete-error-filter)] 21/02/2022 10:36:36 PM : Starting B:/Unity Editors/2020.3.29f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 77.0162ms +moved types parse time: 49ms +candidates parse time : 1ms +C# parse time : 183ms +candidates check time : 49ms +console write time : 0ms + diff --git a/Packages/manifest.json b/Packages/manifest.json index 5cf83038..67585f11 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,15 +6,15 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "3.7.5", "com.unity.analytics": "3.6.12", - "com.unity.cinemachine": "2.6.0", - "com.unity.collab-proxy": "1.15.12", + "com.unity.cinemachine": "2.6.11", + "com.unity.collab-proxy": "1.15.13", "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.14", - "com.unity.ide.vscode": "1.2.4", + "com.unity.ide.vscode": "1.2.5", "com.unity.inputsystem": "1.3.0", - "com.unity.multiplayer-hlapi": "1.0.6", - "com.unity.purchasing": "4.1.2", - "com.unity.test-framework": "1.1.29", + "com.unity.multiplayer-hlapi": "1.0.8", + "com.unity.purchasing": "4.1.3", + "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 41edb348..9df74765 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -65,14 +65,14 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.6.0", + "version": "2.6.11", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.15.12", + "version": "1.15.13", "depth": 0, "source": "registry", "dependencies": { @@ -106,7 +106,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.4", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, @@ -129,7 +129,7 @@ "url": "https://packages.unity.com" }, "com.unity.multiplayer-hlapi": { - "version": "1.0.6", + "version": "1.0.8", "depth": 0, "source": "registry", "dependencies": { @@ -138,7 +138,7 @@ "url": "https://packages.unity.com" }, "com.unity.purchasing": { - "version": "4.1.2", + "version": "4.1.3", "depth": 0, "source": "registry", "dependencies": { @@ -161,7 +161,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache index c6d15b443b3ed921d48a96aa25a355c5e37f88a5..64625112f37cf08daea2f570611fd0f02ce92da5 100644 GIT binary patch delta 1413 zcmZWpeN2^Q6!-nT@AGnldj-w7fET=?;b#ytD#PFcGKZmoO|cf=4jc}|3KA57*grX!e9!*nP%2#7xjTnZCldM4+nCND?I$XHg)<5r_o%cMy^E-xmcU52t_f>M$X5MiNpZ98jb*( zwiS;Vw$Q0$4^$qZpi@YdP2sqt3g_0kIGa2i0jnmC?uud#XBOk2X4>7|7BdDxd0Cim z3Vx4$^CFN=)8gUdsVI{s zO`0uFFmV1-)M~=nS;yz;3CM;iqV0OLtH{B8%o#6Ii5y~P9&%wKIyKRl{e{EUn2b?~ z!pIuFc<&`h)l_o&#c_7OmvM8BJEJSV*bVGo*;+*G6{P9%NBlJpk^Z<(mzLGrQ97nvRyUkQIL^u9101NEuUaeH4UzSi!iaJ zOI+~%p~#{e>)=WE%HS`{kD&?T&!k@&Jh=gJ5Cs>ku{Pq750Ph&0}v6j7V*#KMnDr$ zULnk=<7<4Vij>qhIi7z8!Mgd&&E9S~11aV_0;%f92|cfz!@$GgCLZn-!x5uXXgA`F zCLascZ$W~zv>;ufreatqv<+VJN-Hixm^QRHE z4mbA9@u%(Vyl2N?!KRu3X|`I(c5lWE#B2^U$~l z$wpJ6g`%!uhLNGq9-F|Vv5$w*ADV=h9^B9ptJ10+Fu-wEzGB delta 1411 zcmZWpZBUeD6rK0H`@F2Ui(fr|aSUH6tqLc;!I!z@LVvFfStENm= zgN(kqcO(nJG|iGmYn~~TkNg0{bU{(KQL!PBbR^IiEgbFci-=?Y?##XSJm;Qs@AFw# z|Gj_rU%5v40sC#@BWJm;$!Z%q6|?S;y4K}0)2eNFM0)MG4v|01$N8ENWUJz5S-4S? zQ^If+=IO!bjap9$!u5{u!SwA6WXOY$VHhm^M>cKp<0y(Ul)j6=PzoqTuu*z6*upA1UHWkt-`HpipMf77rUf3&Z|X=rU0d!idWjZKKq7VQM}Rz@iCRT`dA5jAK3|A)nur{lLktP$?z^z)keT}`|hf{M3LTKw+ zeyjUqJS{9DH>(%NP6G;H@53pJWt`XZkVe4;u*vQM>|s7Zdzssw^%!L`FYB}!!1UKB zjPc9s8Hx<@mNWQD59(EMIO8-ICl=w7NmP&B#pEX!;}2opkelDr$Xh*Grf-K`6@$N7 z%Y(XiVl|Lp*GnQsNXKqmQH6Dv!ij-p@TlgbGi@H@9I}@@^dgnzz#>!kVZ9{LZVy+^t#NK6AVG=NzoB9nmtf7mg7;h9Bt34?ji)2eVnjtpV zr?IIu6$sZv!jTk?+YcdHQ3g^&G-ea8afe%AqE;#A?8idNJ zb@%`x%Qb;}57fhCvP|6H-YdF|N=~qOMIYX~#{1^c*C!B6?d7~_>%17Ji2P#*JQ_J# zF@$zEAW&XxK%+_DdTp-ps2)~mm5a~dtRm+B^bgM$??aMmd4I@Tz1}>OUxMAE51KBqA){!e9Mda`by*VFWyn59>}Vx_4q2=&aySn^)LX1entW=VG&K2eOT zmG52QgVwJ5Ts(>%GiL}@)!+%ggwlHz2Ni9{sY*V+-b|ohkP(K$oL)|EwBxQe@5#;w zng1FVZ#HxfqpVGWy8kztA