From 2ce6af90081e34b70e95fff151b9d5d633548037 Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Mon, 10 Jun 2024 16:20:09 +0900 Subject: [PATCH] =?UTF-8?q?Rhinoceros=20=EB=8F=8C=EC=A7=84=20=EC=8A=A4?= =?UTF-8?q?=ED=82=AC=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Boss/Rhinoceros/BullChargeData.asset | 2 +- .../Skill/Enemy/Boss/Rhinoceros/BullCharge.cs | 7 +-- Assets/05.Prefabs/Maps/MapController.prefab | 8 +-- .../NoEditor/Sirenix.Serialization.dll.meta | 38 +++++-------- .../NoEditor/Sirenix.Utilities.dll.meta | 38 +++++-------- .../Sirenix.Serialization.dll.meta | 50 ++++++++--------- .../Sirenix.Utilities.dll.meta | 50 ++++++++--------- Assets/Settings/Build Profiles/Windows.asset | 46 ---------------- .../Build Profiles/Windows.asset.meta | 8 --- Assets/Universal Render Pipeline Asset.asset | 54 +++++++++---------- ...niversalRenderPipelineGlobalSettings.asset | 13 ++++- .../BurstAotSettings_StandaloneWindows.json | 18 +++++++ ProjectSettings/CommonBurstAotSettings.json | 6 +++ ProjectSettings/TagManager.asset | 1 + 14 files changed, 141 insertions(+), 198 deletions(-) delete mode 100644 Assets/Settings/Build Profiles/Windows.asset delete mode 100644 Assets/Settings/Build Profiles/Windows.asset.meta create mode 100644 ProjectSettings/BurstAotSettings_StandaloneWindows.json create mode 100644 ProjectSettings/CommonBurstAotSettings.json diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/BullChargeData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/BullChargeData.asset index cead9a291..8ec31bc36 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/BullChargeData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/BullChargeData.asset @@ -20,7 +20,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 0 - k__BackingField: 15 + k__BackingField: 25 k__BackingField: 3 k__BackingField: 10 k__BackingField: 0.05 diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/BullCharge.cs b/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/BullCharge.cs index 0c360a0db..73d142d69 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/BullCharge.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/BullCharge.cs @@ -108,8 +108,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros.Skills var totalDistanceCovered = 0f; while (totalDistanceCovered < targetDistance) { - var moveDistance = _bullChargeData.ChargeSpeed * Time.deltaTime; - totalDistanceCovered += moveDistance; + var moveDistance = _bullChargeData.ChargeSpeed * Time.fixedDeltaTime; var skillUserPosition = SkillUser.transform.position; var hitCount = Physics.SphereCastNonAlloc(skillUserPosition, _attackRadius, targetDirection, RaycastHits, 0f, _targetLayer, QueryTriggerInteraction.Collide); @@ -141,7 +140,9 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros.Skills iPhysicMovable.AddForce(addForceDirection * _bullChargeData.PushPower, ForceMode.Impulse); } - yield return null; + totalDistanceCovered += moveDistance; + + yield return new WaitForFixedUpdate(); } EndSkill(SkillData.Cooldown, actions[0]); diff --git a/Assets/05.Prefabs/Maps/MapController.prefab b/Assets/05.Prefabs/Maps/MapController.prefab index 4681f751d..50afe980b 100644 --- a/Assets/05.Prefabs/Maps/MapController.prefab +++ b/Assets/05.Prefabs/Maps/MapController.prefab @@ -46,7 +46,7 @@ GameObject: - component: {fileID: 4838935533491775989} m_Layer: 7 m_Name: Wall (1) - m_TagString: Untagged + m_TagString: Wall m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -185,7 +185,7 @@ GameObject: - component: {fileID: 1757358112690105673} m_Layer: 7 m_Name: Wall - m_TagString: Untagged + m_TagString: Wall m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -576,7 +576,7 @@ GameObject: - component: {fileID: 2393723494385299022} m_Layer: 7 m_Name: Wall (3) - m_TagString: Untagged + m_TagString: Wall m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1076,7 +1076,7 @@ GameObject: - component: {fileID: 141768429308446024} m_Layer: 7 m_Name: Wall (2) - m_TagString: Untagged + m_TagString: Wall m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta index 8e3fe82fa..ab927fc92 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: 5651992cdad94894a3af7dc3f1da9170 -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.0 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll + uploadId: 664282 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Any: enabled: 0 @@ -37,28 +47,13 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - N3DS: - enabled: 1 - settings: {} PS4: enabled: 1 settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} WebGL: enabled: 1 settings: {} - WiiU: + Win64: enabled: 1 settings: {} WindowsStoreApps: @@ -77,10 +72,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.0 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll - uploadId: 664282 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta index 47408cdf2..9d538964a 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: 5978f8f3dd274e848fbb7a123bde1fb9 -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.0 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll + uploadId: 664282 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Any: enabled: 0 @@ -37,28 +47,13 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - N3DS: - enabled: 1 - settings: {} PS4: enabled: 1 settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} WebGL: enabled: 1 settings: {} - WiiU: + Win64: enabled: 1 settings: {} WindowsStoreApps: @@ -77,10 +72,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.0 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll - uploadId: 664282 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta index 62d6f20eb..b8ace3b14 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: d2a8f0021d6b47c5923d8972dfb81ef1 -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.0 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll + uploadId: 664282 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Android: enabled: 1 @@ -40,33 +50,22 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - Linux: - enabled: 1 - settings: {} Linux64: enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} + settings: + CPU: OSXUniversal: enabled: 1 - settings: {} - PSM: - enabled: 0 - settings: {} + settings: + CPU: Win: enabled: 1 - settings: {} + settings: + CPU: Win64: - enabled: 1 - settings: {} + enabled: 0 + settings: + CPU: WindowsStoreApps: enabled: 0 settings: @@ -74,10 +73,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.0 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll - uploadId: 664282 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta index 0b421ae0b..fb78aa9d9 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: 1e0a9643dc0d4b46bf2321f72c4e503e -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.0 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll + uploadId: 664282 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Android: enabled: 1 @@ -40,33 +50,22 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - Linux: - enabled: 1 - settings: {} Linux64: enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} + settings: + CPU: OSXUniversal: enabled: 1 - settings: {} - PSM: - enabled: 0 - settings: {} + settings: + CPU: Win: enabled: 1 - settings: {} + settings: + CPU: Win64: - enabled: 1 - settings: {} + enabled: 0 + settings: + CPU: WindowsStoreApps: enabled: 0 settings: @@ -74,10 +73,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.0 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll - uploadId: 664282 diff --git a/Assets/Settings/Build Profiles/Windows.asset b/Assets/Settings/Build Profiles/Windows.asset deleted file mode 100644 index 35be320f6..000000000 --- a/Assets/Settings/Build Profiles/Windows.asset +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 15003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: Windows - m_EditorClassIdentifier: - m_BuildTarget: 19 - m_Subtarget: 2 - m_PlatformId: 4e3c793746204150860bf175a9a41a05 - m_PlatformBuildProfile: - rid: 5032277230150746112 - m_Scenes: [] - m_ScriptingDefines: [] - m_PlayerSettingsYaml: - m_Settings: [] - references: - version: 2 - RefIds: - - rid: 5032277230150746112 - type: {class: WindowsPlatformSettings, ns: UnityEditor.WindowsStandalone, asm: UnityEditor.WindowsStandalone.Extensions} - data: - m_Development: 0 - m_ConnectProfiler: 0 - m_BuildWithDeepProfilingSupport: 0 - m_AllowDebugging: 0 - m_WaitForManagedDebugger: 0 - m_ManagedDebuggerFixedPort: 0 - m_ExplicitNullChecks: 0 - m_ExplicitDivideByZeroChecks: 0 - m_ExplicitArrayBoundsChecks: 0 - m_CompressionType: 0 - m_InstallInBuildFolder: 0 - m_WindowsBuildAndRunDeployTarget: 0 - m_Architecture: 0 - m_CreateSolution: 0 - m_CopyPDBFiles: 0 - m_WindowsDevicePortalAddress: - m_WindowsDevicePortalUsername: diff --git a/Assets/Settings/Build Profiles/Windows.asset.meta b/Assets/Settings/Build Profiles/Windows.asset.meta deleted file mode 100644 index 968adc4fe..000000000 --- a/Assets/Settings/Build Profiles/Windows.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6c435ffdf6d0bfc41b59432a420537f0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Universal Render Pipeline Asset.asset b/Assets/Universal Render Pipeline Asset.asset index cacc2ff03..acbbd9a17 100644 --- a/Assets/Universal Render Pipeline Asset.asset +++ b/Assets/Universal Render Pipeline Asset.asset @@ -99,35 +99,35 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterAlphaOutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 2 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 7cc81dab8..d5f5ab467 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -55,7 +55,18 @@ MonoBehaviour: - rid: 5032277253446697262 - rid: 5032277253446697263 m_RuntimeSettings: - m_List: [] + m_List: + - rid: 5032277253446697243 + - rid: 5032277253446697244 + - rid: 5032277253446697245 + - rid: 5032277253446697247 + - rid: 5032277253446697248 + - rid: 5032277253446697251 + - rid: 5032277253446697253 + - rid: 5032277253446697255 + - rid: 5032277253446697258 + - rid: 5032277253446697259 + - rid: 5032277253446697262 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json new file mode 100644 index 000000000..58cf25f24 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -0,0 +1,18 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json new file mode 100644 index 000000000..0293dafc8 --- /dev/null +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -0,0 +1,6 @@ +{ + "MonoBehaviour": { + "Version": 4, + "DisabledWarnings": "" + } +} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a560c8581..0d63c0303 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 3 tags: - Missile + - Wall layers: - Default - TransparentFX