From e34c3a1f45dce08ab7ca142b7529e2cc74a9e14b Mon Sep 17 00:00:00 2001 From: nakjun Date: Thu, 23 Jul 2026 17:16:30 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=95=EC=A0=9C=20=EC=9E=94=EB=94=94=20?= =?UTF-8?q?=EC=82=AC=EB=A7=9D=EB=A3=A8=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Festival_Chapter5.unity | 4 +- Assets/01_Scenes/Intro.unity | 3 + Assets/01_Scenes/Intro.unity.meta | 7 + .../02_Scripts/Controller/PlayerController.cs | 40 +++++ .../02_Scripts/Managers/HideDuringLoading.cs | 11 ++ .../Managers/HideDuringLoading.cs.meta | 2 + Assets/02_Scripts/Managers/LocalManager.cs | 21 ++- .../02_Scripts/Managers/SceneLoadManager.cs | 11 ++ Assets/04_Models/VR_Player.prefab | 4 +- Assets/05_Textures/CameraBlood.png | 3 + Assets/05_Textures/CameraBlood.png.meta | 156 +++++++++++++++++ .../DialogGraph/Chapter5/Chapter5_Yuna1.dlg | 162 +++++++++++++++++- Assets/10_FX/SFX/SwordBlood.mp3 | 3 + Assets/10_FX/SFX/SwordBlood.mp3.meta | 23 +++ ProjectSettings/EditorBuildSettings.asset | 4 +- 15 files changed, 444 insertions(+), 10 deletions(-) create mode 100644 Assets/01_Scenes/Intro.unity create mode 100644 Assets/01_Scenes/Intro.unity.meta create mode 100644 Assets/02_Scripts/Managers/HideDuringLoading.cs create mode 100644 Assets/02_Scripts/Managers/HideDuringLoading.cs.meta create mode 100644 Assets/05_Textures/CameraBlood.png create mode 100644 Assets/05_Textures/CameraBlood.png.meta create mode 100644 Assets/10_FX/SFX/SwordBlood.mp3 create mode 100644 Assets/10_FX/SFX/SwordBlood.mp3.meta diff --git a/Assets/01_Scenes/Festival_Chapter5.unity b/Assets/01_Scenes/Festival_Chapter5.unity index b86cf3cd..6923f9c7 100644 --- a/Assets/01_Scenes/Festival_Chapter5.unity +++ b/Assets/01_Scenes/Festival_Chapter5.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64d836f31368bb50449f1c1d92cd281af71df172e8153a90d202ad98bc6b0bd7 -size 1631753 +oid sha256:d77d540a71fb28a85f87d35a61c444b243c78b775a95115d4804b45a7c5239d0 +size 1640202 diff --git a/Assets/01_Scenes/Intro.unity b/Assets/01_Scenes/Intro.unity new file mode 100644 index 00000000..c3f16a02 --- /dev/null +++ b/Assets/01_Scenes/Intro.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:152335006c231a414ccd1f5fe7a5d3eb80d1a8e8fa2ba290f31e9a0dea70aff7 +size 110296 diff --git a/Assets/01_Scenes/Intro.unity.meta b/Assets/01_Scenes/Intro.unity.meta new file mode 100644 index 00000000..c13aae3a --- /dev/null +++ b/Assets/01_Scenes/Intro.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 45eba5243a4ddbf4c8776df960426a8f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Controller/PlayerController.cs b/Assets/02_Scripts/Controller/PlayerController.cs index b00cb7a5..44ac5ba9 100644 --- a/Assets/02_Scripts/Controller/PlayerController.cs +++ b/Assets/02_Scripts/Controller/PlayerController.cs @@ -1,10 +1,15 @@ using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit.Locomotion; +using UnityEngine.InputSystem.XR; public class PlayerController : MonoBehaviour { // 시야 가림용 구체(Sight)가 쓰는 머티리얼 — 알파 0(투명)이면 정상 시야, 1(불투명)이면 암전 [SerializeField] private Material _sightMat; + [SerializeField] private GameObject _bloodDieImgRef; + [SerializeField] private AudioClip _bloodSfx; + private static readonly int _baseColorId = Shader.PropertyToID("_BaseColor"); private static readonly int _colorId = Shader.PropertyToID("_Color"); @@ -46,4 +51,39 @@ private void SetSightAlpha(float alpha) color.a = alpha; _sightMat.SetColor(AlphaProp, color); } + + public void PlayerBloodDie(float duration) + { + _ = Util.RunDelayed(duration, () => + { + StopPlayerMovement(); // XR 이동/회전 정지 — PauseAllAnimations로는 못 막는다 + LocalManager.PauseAllAnimations(); + _bloodDieImgRef.SetActive(true); + SoundManager.Instance.PlaySFX(_bloodSfx); + },this.destroyCancellationToken); + + } + + // Player 태그 루트(XR Origin) 아래에서 플레이어가 시야/위치를 바꾸는 수단을 전부 정지시킨다: + // 1) LocomotionProvider → 이동/회전(중력 포함) + // 2) TrackedPoseDriver → 헤드셋·컨트롤러 트래킹. 카메라 드라이버를 꺼야 머리를 돌려도 시야가 안 돈다 + // PauseAllAnimations는 Animator/타임라인/파티클만 멈추므로 이 둘은 못 막는다. 사망 연출이라 복구하지 않는다. + private static void StopPlayerMovement() + { + var playerRoot = GameObject.FindWithTag("Player"); + if (playerRoot == null) + { + Debug.LogWarning("[PlayerController] 'Player' 태그 루트를 찾지 못해 이동 정지를 건너뜁니다."); + return; + } + + // 이동/회전(로코모션) + foreach (var provider in playerRoot.GetComponentsInChildren(true)) + provider.enabled = false; + + // 헤드셋/컨트롤러 트래킹 — 실제 포즈를 매 프레임 카메라/손에 적용하는 드라이버를 꺼 시야를 고정. + // (컨트롤러 손도 함께 멈춘다. 카메라만 얼리려면 Camera.main의 드라이버만 끄면 됨) + foreach (var driver in playerRoot.GetComponentsInChildren(true)) + driver.enabled = false; + } } diff --git a/Assets/02_Scripts/Managers/HideDuringLoading.cs b/Assets/02_Scripts/Managers/HideDuringLoading.cs new file mode 100644 index 00000000..8ba65b38 --- /dev/null +++ b/Assets/02_Scripts/Managers/HideDuringLoading.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +// 이 컴포넌트가 붙은 오브젝트는 씬 로딩 중 화면이 어두워진 순간 SetActive(false)된다. +// SceneLoadManager가 전환 시점에 씬에서 찾아 끈다. +// +// 글로벌 매니저(DontDestroyOnLoad)에 씬 오브젝트를 직접 참조하면 씬을 넘나들 때 참조가 사라지므로, +// 참조를 반대로 — 끄고 싶은 오브젝트 쪽에 이 마커를 달아 런타임에 수집한다. +// (현재 씬 오브젝트면 어차피 씬 언로드로 사라지지만, 어두워지기 전 전환 구간의 깜빡임을 막아준다.) +public class HideDuringLoading : MonoBehaviour +{ +} diff --git a/Assets/02_Scripts/Managers/HideDuringLoading.cs.meta b/Assets/02_Scripts/Managers/HideDuringLoading.cs.meta new file mode 100644 index 00000000..8487ea94 --- /dev/null +++ b/Assets/02_Scripts/Managers/HideDuringLoading.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 59721f2668c7f5c47b205b7d61ff4822 \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/LocalManager.cs b/Assets/02_Scripts/Managers/LocalManager.cs index de636bf5..1c11c38f 100644 --- a/Assets/02_Scripts/Managers/LocalManager.cs +++ b/Assets/02_Scripts/Managers/LocalManager.cs @@ -5,6 +5,7 @@ public class LocalManager : MonoBehaviour,ISceneInitializable { + [SerializeField] private string _startSceneName; [SerializeField] private string _nextSceneName; [SerializeField] private AudioClip _caffebeneBGM; @@ -63,7 +64,7 @@ private async Awaitable CaffebeneSequence(int delay) // 씬 안의 Animator / 타임라인 / 파티클을 전부 일시정지 // (Time.timeScale은 건드리지 않는다 — BGM 페이드와 씬 전환 딜레이가 scaled time 기준이라 함께 멈춰버림) - private static void PauseAllAnimations() + public static void PauseAllAnimations() { foreach (var animator in FindObjectsByType()) animator.speed = 0f; @@ -152,4 +153,22 @@ public void OnSceneLoaded() SceneLoadManager.Instance.SetSceneSkybox(_sceneSkybox); } + public void StartSceneChange(int delay) + { + _ = StartSceneChangeSequence(delay); + } + + private async Awaitable StartSceneChangeSequence(int delay) + { + try + { + await Awaitable.WaitForSecondsAsync((float)delay); + + SceneLoadManager.Instance.RequestSceneChange(_startSceneName); + } + catch (System.OperationCanceledException) + { + // 씬 전환 등으로 자신이 파괴되어 취소됨 + } + } } diff --git a/Assets/02_Scripts/Managers/SceneLoadManager.cs b/Assets/02_Scripts/Managers/SceneLoadManager.cs index e49e20f6..931c5194 100644 --- a/Assets/02_Scripts/Managers/SceneLoadManager.cs +++ b/Assets/02_Scripts/Managers/SceneLoadManager.cs @@ -204,6 +204,14 @@ private void MovePlayerToLoadingArea() if (cc != null) cc.enabled = true; } + // 화면이 어두워진 뒤, HideDuringLoading 마커가 붙은 오브젝트를 전부 끈다 (로딩 중 노출/깜빡임 방지). + // 글로벌 매니저라 씬 오브젝트를 직접 참조할 수 없으므로(씬 전환 시 참조가 끊김) 런타임에 씬에서 찾는다. + private void DisableDarkObjects() + { + foreach (var marker in FindObjectsByType()) + marker.gameObject.SetActive(false); + } + public void RequestSceneChange(string sceneName) { _ = SceneChange(sceneName); @@ -233,6 +241,9 @@ private async Awaitable SceneChange(string sceneName) // (로딩 룸은 카메라를 따라다니므로 함께 이동한다) MovePlayerToLoadingArea(); + // 어두워진 상태에서 지정 오브젝트들 끄기 (로딩 중 보이면 안 되는 것들) + DisableDarkObjects(); + // 로딩 룸에 도착했으니 시야를 다시 연다 (스카이박스 페이드 인과 동시 진행) if (pc != null) _ = pc.FadeSight(true, 0.8f); diff --git a/Assets/04_Models/VR_Player.prefab b/Assets/04_Models/VR_Player.prefab index be554f61..e58ebbda 100644 --- a/Assets/04_Models/VR_Player.prefab +++ b/Assets/04_Models/VR_Player.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0866e216332c621e37c2fcf27af9e81fde20189ac016e22777cc4aa2dfff5355 -size 86246 +oid sha256:a8940ab2151fb515e6fc61dbf3ebe63d313368b32c685cac7e73a1cd594c9cfe +size 90071 diff --git a/Assets/05_Textures/CameraBlood.png b/Assets/05_Textures/CameraBlood.png new file mode 100644 index 00000000..2cd79c70 --- /dev/null +++ b/Assets/05_Textures/CameraBlood.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a61f2f7f21caf075280311a5826f58d903a098ea6c9842fe5b44e06d3e81b33f +size 1636734 diff --git a/Assets/05_Textures/CameraBlood.png.meta b/Assets/05_Textures/CameraBlood.png.meta new file mode 100644 index 00000000..00808164 --- /dev/null +++ b/Assets/05_Textures/CameraBlood.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 8e64251727a9a6145adf2345f055cf6a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg index ac9dc34d..b4018f90 100644 --- a/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg @@ -382,6 +382,8 @@ MonoBehaviour: - __option_HasHiddenBranch - __option_HiddenGestureKey - __option_HiddenCode + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514365209968924 - rid: 4848514365209968925 @@ -403,6 +405,8 @@ MonoBehaviour: - rid: 4848514747977957619 - rid: 4848514747977957620 - rid: 4848514747977957621 + - rid: 4848514753014268038 + - rid: 4848514753014268039 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -574,6 +578,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957624 - rid: 4848514747977957625 @@ -595,6 +601,8 @@ MonoBehaviour: - rid: 4848514747977957641 - rid: 4848514747977957642 - rid: 4848514747977957643 + - rid: 4848514753014268040 + - rid: 4848514753014268041 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -733,6 +741,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957647 - rid: 4848514747977957648 @@ -754,6 +764,8 @@ MonoBehaviour: - rid: 4848514747977957664 - rid: 4848514747977957665 - rid: 4848514747977957666 + - rid: 4848514753014268042 + - rid: 4848514753014268043 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -925,6 +937,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957670 - rid: 4848514747977957671 @@ -946,6 +960,8 @@ MonoBehaviour: - rid: 4848514747977957687 - rid: 4848514747977957688 - rid: 4848514747977957689 + - rid: 4848514753014268044 + - rid: 4848514753014268045 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1117,6 +1133,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957693 - rid: 4848514747977957694 @@ -1138,6 +1156,8 @@ MonoBehaviour: - rid: 4848514747977957710 - rid: 4848514747977957711 - rid: 4848514747977957712 + - rid: 4848514753014268046 + - rid: 4848514753014268047 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1309,6 +1329,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957716 - rid: 4848514747977957717 @@ -1330,6 +1352,8 @@ MonoBehaviour: - rid: 4848514747977957733 - rid: 4848514747977957734 - rid: 4848514747977957735 + - rid: 4848514753014268048 + - rid: 4848514753014268049 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1500,6 +1524,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957739 - rid: 4848514747977957740 @@ -1521,6 +1547,8 @@ MonoBehaviour: - rid: 4848514747977957756 - rid: 4848514747977957757 - rid: 4848514747977957758 + - rid: 4848514753014268050 + - rid: 4848514753014268051 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1692,6 +1720,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957762 - rid: 4848514747977957763 @@ -1713,6 +1743,8 @@ MonoBehaviour: - rid: 4848514747977957779 - rid: 4848514747977957780 - rid: 4848514747977957781 + - rid: 4848514753014268052 + - rid: 4848514753014268053 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1883,6 +1915,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957785 - rid: 4848514747977957786 @@ -1904,6 +1938,8 @@ MonoBehaviour: - rid: 4848514747977957802 - rid: 4848514747977957803 - rid: 4848514747977957804 + - rid: 4848514753014268054 + - rid: 4848514753014268055 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2074,6 +2110,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957808 - rid: 4848514747977957809 @@ -2095,6 +2133,8 @@ MonoBehaviour: - rid: 4848514747977957825 - rid: 4848514747977957826 - rid: 4848514747977957827 + - rid: 4848514753014268056 + - rid: 4848514753014268057 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2297,6 +2337,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957832 - rid: 4848514747977957833 @@ -2318,6 +2360,8 @@ MonoBehaviour: - rid: 4848514747977957849 - rid: 4848514747977957850 - rid: 4848514747977957851 + - rid: 4848514753014268058 + - rid: 4848514753014268059 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2488,6 +2532,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957855 - rid: 4848514747977957856 @@ -2509,6 +2555,8 @@ MonoBehaviour: - rid: 4848514747977957872 - rid: 4848514747977957873 - rid: 4848514747977957874 + - rid: 4848514753014268060 + - rid: 4848514753014268061 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2679,6 +2727,8 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - UseFixedAngle + - FixedAngleY m_ValueList: - rid: 4848514747977957878 - rid: 4848514747977957879 @@ -2700,6 +2750,8 @@ MonoBehaviour: - rid: 4848514747977957895 - rid: 4848514747977957896 - rid: 4848514747977957897 + - rid: 4848514753014268062 + - rid: 4848514753014268063 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2754,7 +2806,7 @@ MonoBehaviour: - rid: 4848514747977957879 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: PlayerBloodDie - rid: 4848514747977957880 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2808,7 +2860,7 @@ MonoBehaviour: - rid: 4848514747977957892 type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 4 + m_Value: 0 - rid: 4848514747977957893 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2820,7 +2872,7 @@ MonoBehaviour: - rid: 4848514747977957895 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 4848514747977957896 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2832,3 +2884,107 @@ MonoBehaviour: - rid: 4848514747977957898 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: + - rid: 4848514753014268038 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268039 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268040 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268041 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268042 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268043 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268044 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268045 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268046 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268047 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268048 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268049 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268050 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268051 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268052 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268053 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268054 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268055 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268056 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268057 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268058 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268059 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268060 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268061 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268062 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514753014268063 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 diff --git a/Assets/10_FX/SFX/SwordBlood.mp3 b/Assets/10_FX/SFX/SwordBlood.mp3 new file mode 100644 index 00000000..cc82ec32 --- /dev/null +++ b/Assets/10_FX/SFX/SwordBlood.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f82e9518576499a6d683dbb1e305b6a8393a7b6ad2afbea13039d592c06066a6 +size 28421 diff --git a/Assets/10_FX/SFX/SwordBlood.mp3.meta b/Assets/10_FX/SFX/SwordBlood.mp3.meta new file mode 100644 index 00000000..c7bdb24b --- /dev/null +++ b/Assets/10_FX/SFX/SwordBlood.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: aec1ce801f6920549b5f5b06e8a53b07 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 7a5d3a2f..a353ef68 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb098997106afb79c71f61205140eeac72a2b88ac26c4559d5992211677f1b49 -size 915 +oid sha256:aea5b6027a45dd5282ed8bebc1d85cf5e253b1711ddc134976b7f8ce634b555f +size 1012