From dddc685f336d0d3044784ffb2f587742fff41a12 Mon Sep 17 00:00:00 2001 From: sharedacc520k Date: Thu, 2 Apr 2026 18:04:00 +0900 Subject: [PATCH] =?UTF-8?q?2026-04-02=20=ED=83=80=EC=9E=84=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=20(=EC=A7=84=ED=96=89=EC=A4=91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/GameScene.unity | 4 +- .../Managers/Local/InventoryManager.cs | 4 +- .../Managers/Local/ItemEffectManager.cs | 13 - .../02_Scripts/Managers/UI/InGameUIManager.cs | 1 + .../Controllers/PlayerCharacterController.cs | 8 +- .../02_Scripts/Player/Status/PlayerHealth.cs | 23 +- Assets/02_Scripts/UI/Health.meta | 8 + Assets/02_Scripts/UI/Health/UserHealthUI.cs | 12 + .../02_Scripts/UI/Health/UserHealthUI.cs.meta | 2 + .../02_Scripts/UI/Inventory/InventorySlot.cs | 1 - Assets/02_Scripts/_Shared/Status/Health.cs | 2 + .../FeMale/Textures/Gold/Gold_IL.png | 3 + .../FeMale/Textures/Gold/Gold_IL.png.meta | 189 ++++++++++++ .../Editor/BoZo_MagicaClothSupportEditor.cs | 4 +- Assets/08_UI/Health/Textures/UI_ManaBar.png | 3 + .../08_UI/Health/Textures/UI_ManaBar.png.meta | 143 +++++++++ .../Health/Textures/UI_ManaBar_Background.png | 3 + .../Textures/UI_ManaBar_Background.png.meta | 143 +++++++++ .../08_UI/Health/Textures/UI_StaminaBar.png | 3 + .../Health/Textures/UI_StaminaBar.png.meta | 143 +++++++++ .../Textures/UI_StaminaBar_Background.png | 3 + .../UI_StaminaBar_Background.png.meta | 143 +++++++++ Assets/09_Timelines.meta | 8 + Assets/09_Timelines/Signals.meta | 8 + .../Signals/Signal_PlayerStart.signal | 14 + .../Signals/Signal_PlayerStart.signal.meta | 8 + Assets/09_Timelines/Timeline_Intro.playable | 289 ++++++++++++++++++ .../09_Timelines/Timeline_Intro.playable.meta | 8 + ProjectSettings/TimelineSettings.asset | 3 + 29 files changed, 1172 insertions(+), 24 deletions(-) create mode 100644 Assets/02_Scripts/UI/Health.meta create mode 100644 Assets/02_Scripts/UI/Health/UserHealthUI.cs create mode 100644 Assets/02_Scripts/UI/Health/UserHealthUI.cs.meta create mode 100644 Assets/05_Characters/FeMale/Textures/Gold/Gold_IL.png create mode 100644 Assets/05_Characters/FeMale/Textures/Gold/Gold_IL.png.meta create mode 100644 Assets/08_UI/Health/Textures/UI_ManaBar.png create mode 100644 Assets/08_UI/Health/Textures/UI_ManaBar.png.meta create mode 100644 Assets/08_UI/Health/Textures/UI_ManaBar_Background.png create mode 100644 Assets/08_UI/Health/Textures/UI_ManaBar_Background.png.meta create mode 100644 Assets/08_UI/Health/Textures/UI_StaminaBar.png create mode 100644 Assets/08_UI/Health/Textures/UI_StaminaBar.png.meta create mode 100644 Assets/08_UI/Health/Textures/UI_StaminaBar_Background.png create mode 100644 Assets/08_UI/Health/Textures/UI_StaminaBar_Background.png.meta create mode 100644 Assets/09_Timelines.meta create mode 100644 Assets/09_Timelines/Signals.meta create mode 100644 Assets/09_Timelines/Signals/Signal_PlayerStart.signal create mode 100644 Assets/09_Timelines/Signals/Signal_PlayerStart.signal.meta create mode 100644 Assets/09_Timelines/Timeline_Intro.playable create mode 100644 Assets/09_Timelines/Timeline_Intro.playable.meta create mode 100644 ProjectSettings/TimelineSettings.asset diff --git a/Assets/01_Scenes/GameScene.unity b/Assets/01_Scenes/GameScene.unity index 1d2e39c..610d5fc 100644 --- a/Assets/01_Scenes/GameScene.unity +++ b/Assets/01_Scenes/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b040501cc4e6f6e7f473da354d39e21b9966b2b9bcd4430b76a30b9eb9ac6fe4 -size 454833 +oid sha256:50a1bb266a096622511d6751e0921d713bc33588a1c4b9ef35098311ca181f1e +size 482220 diff --git a/Assets/02_Scripts/Managers/Local/InventoryManager.cs b/Assets/02_Scripts/Managers/Local/InventoryManager.cs index cbfda70..a0e4f03 100644 --- a/Assets/02_Scripts/Managers/Local/InventoryManager.cs +++ b/Assets/02_Scripts/Managers/Local/InventoryManager.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using Unity.VisualScripting; using Unity.VisualScripting.Antlr3.Runtime.Misc; using UnityEngine; @@ -245,8 +246,9 @@ public async Awaitable AddItemAsync(ItemInstance item) // 원래 item의 수량을 조절해서 보냄 item.CurrentStack = actualAmountToTake; - // bool serverResult = await DataManager.Instance.SaveItemToServer(item); + await Task.Yield(); //임시코드 bool serverResult = true; // 테스트용 + // bool serverResult = await DataManager.Instance.SaveItemToServer(item); // 서버 저장 성공 시에만 실제 로컬 배열에 데이터 기입 if (serverResult) diff --git a/Assets/02_Scripts/Managers/Local/ItemEffectManager.cs b/Assets/02_Scripts/Managers/Local/ItemEffectManager.cs index 5f9b882..1c553fb 100644 --- a/Assets/02_Scripts/Managers/Local/ItemEffectManager.cs +++ b/Assets/02_Scripts/Managers/Local/ItemEffectManager.cs @@ -15,21 +15,15 @@ public void OnSceneLoaded(Scene scene, LoadSceneMode mode) public void ItemUse(ItemInstance item) { - Debug.Log("아이템 사용"); - switch(item.Data.ItemEffectType) { case ItemEffectType.RECOVERY_HP: { - Debug.Log($"전 HP : {GameManager.Instance.Level.CurrentCharacter.GetComponent().CurrentHP}"); RecoveryHPHealthEffect(GameManager.Instance.Level.CurrentCharacter.GetComponent(), item.Data.RecoveryHP, item.Data.ItemEffectVisual); - Debug.Log($"후 HP : {GameManager.Instance.Level.CurrentCharacter.GetComponent().CurrentHP}"); } break; case ItemEffectType.INTERVAL_DAMAGE: { - Debug.Log("틱데미지 아이템 타입임"); - IntervalDamageHealthEffect(GameManager.Instance.Level.CurrentCharacter.GetComponent(), item.Data.IntervalDamage, item.Data.IntervalDamageTime, item.Data.ItemEffectVisual); } break; @@ -65,20 +59,13 @@ public async void IntervalDamage(Health health, float damage,float time, GameObj float tickDamage = damage / time; - Debug.Log($"damage: {damage}"); - Debug.Log($"time: {time}"); - Debug.Log($"tickDamage: {tickDamage}"); - Debug.Log($"CurrentHP : {health.CurrentHP}"); - try { while (time > 0) { - Debug.Log($"진입"); health.ChangeHP(health.CurrentHP - Mathf.FloorToInt(tickDamage)); //소수점 전부 버림 if (health.CurrentHP <= 0) break; time--; - Debug.Log($"중독 HP : {GameManager.Instance.Level.CurrentCharacter.GetComponent().CurrentHP}"); await Task.Delay(1000, token); } } diff --git a/Assets/02_Scripts/Managers/UI/InGameUIManager.cs b/Assets/02_Scripts/Managers/UI/InGameUIManager.cs index df9d1b9..44cd228 100644 --- a/Assets/02_Scripts/Managers/UI/InGameUIManager.cs +++ b/Assets/02_Scripts/Managers/UI/InGameUIManager.cs @@ -3,6 +3,7 @@ public class InGameUIManager : BaseUIManager { + public UserHealthUI UserHealth; public InteractionUI Interaction; public SplitWindowUI SplitWindow; public TooltipUI Tooltip; diff --git a/Assets/02_Scripts/Player/Controllers/PlayerCharacterController.cs b/Assets/02_Scripts/Player/Controllers/PlayerCharacterController.cs index e0a9c08..50ab0bd 100644 --- a/Assets/02_Scripts/Player/Controllers/PlayerCharacterController.cs +++ b/Assets/02_Scripts/Player/Controllers/PlayerCharacterController.cs @@ -121,6 +121,11 @@ private void Start() SetCursorLockState(true); } + public void PlayerStart() + { + Debug.Log("플레이 시작!!"); + } + private void Update() { //캐릭터 컨트롤러는 FixedUpdate보다 Update에서 하는게 권장됨 @@ -134,9 +139,6 @@ private void Update() TickTimer(); //PlayerDebug(); - - - Debug.Log($"InteractionTargetsCount : {InteractionTargets.Count}"); } private void FixedUpdate() diff --git a/Assets/02_Scripts/Player/Status/PlayerHealth.cs b/Assets/02_Scripts/Player/Status/PlayerHealth.cs index 715dddf..6989fb1 100644 --- a/Assets/02_Scripts/Player/Status/PlayerHealth.cs +++ b/Assets/02_Scripts/Player/Status/PlayerHealth.cs @@ -1,15 +1,34 @@ using UnityEngine; +using UnityEngine.UI; public class PlayerHealth : Health { [SerializeField] PlayerStat _pstat; + public Image UI_HPBar { get; private set; } + public Image UI_MPBar { get; private set; } + public Image UI_StaminaBar { get; private set; } + public PlayerStat Pstat { get { return _pstat; } } - void Start() + private void Awake() { _pstat = GetComponent(); - currentHp = _pstat.MaxHp; // 스태틱 데이터를 가져와 초기화 + } + + private void Start() + { + maxHp = _pstat.MaxHp; + currentHp = _pstat.MaxHp; + + UI_HPBar = GameManager.Instance.InGameUI.UserHealth.UI_HPBar; + UI_MPBar = GameManager.Instance.InGameUI.UserHealth.UI_MPBar; + UI_StaminaBar = GameManager.Instance.InGameUI.UserHealth.UI_StaminaBar; + } + + private void Update() + { + UI_HPBar.fillAmount = (float)currentHp / (float)maxHp; } public void TakeDamage(int damage) diff --git a/Assets/02_Scripts/UI/Health.meta b/Assets/02_Scripts/UI/Health.meta new file mode 100644 index 0000000..4c2da10 --- /dev/null +++ b/Assets/02_Scripts/UI/Health.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1cab689eef132148a28349a68b53300 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/UI/Health/UserHealthUI.cs b/Assets/02_Scripts/UI/Health/UserHealthUI.cs new file mode 100644 index 0000000..d51df9d --- /dev/null +++ b/Assets/02_Scripts/UI/Health/UserHealthUI.cs @@ -0,0 +1,12 @@ +using UnityEngine; +using UnityEngine.UI; + +public class UserHealthUI : MonoBehaviour +{ + [SerializeField] private Image _ui_HPBar; + [SerializeField] private Image _ui_MPBar; + [SerializeField] private Image _ui_StaminaBar; + public Image UI_HPBar { get { return _ui_HPBar; } private set { _ui_HPBar = value; } } + public Image UI_MPBar { get { return _ui_MPBar; } private set { _ui_MPBar = value; } } + public Image UI_StaminaBar { get { return _ui_StaminaBar; } private set { _ui_StaminaBar = value; } } +} diff --git a/Assets/02_Scripts/UI/Health/UserHealthUI.cs.meta b/Assets/02_Scripts/UI/Health/UserHealthUI.cs.meta new file mode 100644 index 0000000..02e4682 --- /dev/null +++ b/Assets/02_Scripts/UI/Health/UserHealthUI.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 014ee681cdfcb10419634aa9b5ce429b \ No newline at end of file diff --git a/Assets/02_Scripts/UI/Inventory/InventorySlot.cs b/Assets/02_Scripts/UI/Inventory/InventorySlot.cs index 40d6fec..f02859b 100644 --- a/Assets/02_Scripts/UI/Inventory/InventorySlot.cs +++ b/Assets/02_Scripts/UI/Inventory/InventorySlot.cs @@ -37,7 +37,6 @@ private void Start() { if (currentItem != null) SetItem(currentItem); - } public void ClearSlot() diff --git a/Assets/02_Scripts/_Shared/Status/Health.cs b/Assets/02_Scripts/_Shared/Status/Health.cs index bb94ea3..b0514f4 100644 --- a/Assets/02_Scripts/_Shared/Status/Health.cs +++ b/Assets/02_Scripts/_Shared/Status/Health.cs @@ -2,7 +2,9 @@ public class Health : MonoBehaviour { + protected int maxHp; protected int currentHp; + public int CurrentHP { get { return currentHp; } } public void ChangeHP(int newHp) diff --git a/Assets/05_Characters/FeMale/Textures/Gold/Gold_IL.png b/Assets/05_Characters/FeMale/Textures/Gold/Gold_IL.png new file mode 100644 index 0000000..a59e0ea --- /dev/null +++ b/Assets/05_Characters/FeMale/Textures/Gold/Gold_IL.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21c6ad8fc42da76fe42b74572f2dbc753835f02e955d5c150d90943458b23002 +size 1012116 diff --git a/Assets/05_Characters/FeMale/Textures/Gold/Gold_IL.png.meta b/Assets/05_Characters/FeMale/Textures/Gold/Gold_IL.png.meta new file mode 100644 index 0000000..558a8fe --- /dev/null +++ b/Assets/05_Characters/FeMale/Textures/Gold/Gold_IL.png.meta @@ -0,0 +1,189 @@ +fileFormatVersion: 2 +guid: d274b66d1bb1bdb49b2c1a83a8df9c7f +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: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: iOS + 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: + - serializedVersion: 2 + name: Gold_IL_Face + rect: + serializedVersion: 2 + x: 261 + y: 869 + width: 360 + height: 360 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6c540e877cd810e468fefa00bf635eee + internalID: 335679724 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Gold_IL_Fullbody + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 848 + height: 1241 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f8ffb7c2340dfa64a8d1dd0a003ba8b1 + internalID: -1345217150 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: c6bfc0df19443f145ae48475a398ecf4 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Gold_IL_Face: 335679724 + Gold_IL_Fullbody: -1345217150 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05_Characters/_Shared/Models/BMAC/Scripts/ThirdParty/MagicaCloth/Editor/BoZo_MagicaClothSupportEditor.cs b/Assets/05_Characters/_Shared/Models/BMAC/Scripts/ThirdParty/MagicaCloth/Editor/BoZo_MagicaClothSupportEditor.cs index e95aeac..b2ef9c2 100644 --- a/Assets/05_Characters/_Shared/Models/BMAC/Scripts/ThirdParty/MagicaCloth/Editor/BoZo_MagicaClothSupportEditor.cs +++ b/Assets/05_Characters/_Shared/Models/BMAC/Scripts/ThirdParty/MagicaCloth/Editor/BoZo_MagicaClothSupportEditor.cs @@ -51,9 +51,9 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); //base.OnInspectorGUI(); - return; -#endif +#else EditorGUILayout.LabelField("MagicaCloth2 Not Installed"); +#endif } } diff --git a/Assets/08_UI/Health/Textures/UI_ManaBar.png b/Assets/08_UI/Health/Textures/UI_ManaBar.png new file mode 100644 index 0000000..a324549 --- /dev/null +++ b/Assets/08_UI/Health/Textures/UI_ManaBar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b94f8e9ba84a0f5436236a10d7647bcf04a8b5d18d502249868bff9313259b91 +size 13474 diff --git a/Assets/08_UI/Health/Textures/UI_ManaBar.png.meta b/Assets/08_UI/Health/Textures/UI_ManaBar.png.meta new file mode 100644 index 0000000..d9e0cfd --- /dev/null +++ b/Assets/08_UI/Health/Textures/UI_ManaBar.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: f3c9c078bfc079045b6badc1bdf0768a +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: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 10, y: 10, z: 10, w: 10} + 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: iOS + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_UI/Health/Textures/UI_ManaBar_Background.png b/Assets/08_UI/Health/Textures/UI_ManaBar_Background.png new file mode 100644 index 0000000..07736cd --- /dev/null +++ b/Assets/08_UI/Health/Textures/UI_ManaBar_Background.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:636c75392471a2eb85f77e384e38cf4e92075fc976edb62534e01d4e86a240b8 +size 437 diff --git a/Assets/08_UI/Health/Textures/UI_ManaBar_Background.png.meta b/Assets/08_UI/Health/Textures/UI_ManaBar_Background.png.meta new file mode 100644 index 0000000..ae68d04 --- /dev/null +++ b/Assets/08_UI/Health/Textures/UI_ManaBar_Background.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 91bacd7b18fc21147922aa7f24b34af5 +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: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 10, y: 10, z: 10, w: 10} + 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: iOS + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_UI/Health/Textures/UI_StaminaBar.png b/Assets/08_UI/Health/Textures/UI_StaminaBar.png new file mode 100644 index 0000000..0895619 --- /dev/null +++ b/Assets/08_UI/Health/Textures/UI_StaminaBar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51a4ac7e5461d4930e526dcb76c7edf84b41ab772a10b4d74c6c55bb564f06e2 +size 3292 diff --git a/Assets/08_UI/Health/Textures/UI_StaminaBar.png.meta b/Assets/08_UI/Health/Textures/UI_StaminaBar.png.meta new file mode 100644 index 0000000..2a09b18 --- /dev/null +++ b/Assets/08_UI/Health/Textures/UI_StaminaBar.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: ff0cc0a18e4d2b643a8a6a0a3f63b6b0 +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: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 10, y: 10, z: 10, w: 10} + 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: iOS + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_UI/Health/Textures/UI_StaminaBar_Background.png b/Assets/08_UI/Health/Textures/UI_StaminaBar_Background.png new file mode 100644 index 0000000..07736cd --- /dev/null +++ b/Assets/08_UI/Health/Textures/UI_StaminaBar_Background.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:636c75392471a2eb85f77e384e38cf4e92075fc976edb62534e01d4e86a240b8 +size 437 diff --git a/Assets/08_UI/Health/Textures/UI_StaminaBar_Background.png.meta b/Assets/08_UI/Health/Textures/UI_StaminaBar_Background.png.meta new file mode 100644 index 0000000..a0e5bdc --- /dev/null +++ b/Assets/08_UI/Health/Textures/UI_StaminaBar_Background.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 6b9a28b162518f2429874dd2cd86fb2b +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: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 10, y: 10, z: 10, w: 10} + 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: iOS + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/09_Timelines.meta b/Assets/09_Timelines.meta new file mode 100644 index 0000000..dfd8cd0 --- /dev/null +++ b/Assets/09_Timelines.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64f2ecb02e73d334b8d93eabd725a9a3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/09_Timelines/Signals.meta b/Assets/09_Timelines/Signals.meta new file mode 100644 index 0000000..f69d5eb --- /dev/null +++ b/Assets/09_Timelines/Signals.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf5d6842132bbda4aa46847ceed55013 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/09_Timelines/Signals/Signal_PlayerStart.signal b/Assets/09_Timelines/Signals/Signal_PlayerStart.signal new file mode 100644 index 0000000..7a9a5b7 --- /dev/null +++ b/Assets/09_Timelines/Signals/Signal_PlayerStart.signal @@ -0,0 +1,14 @@ +%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: 11500000, guid: d6fa2d92fc1b3f34da284357edf89c3b, type: 3} + m_Name: Signal_PlayerStart + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalAsset diff --git a/Assets/09_Timelines/Signals/Signal_PlayerStart.signal.meta b/Assets/09_Timelines/Signals/Signal_PlayerStart.signal.meta new file mode 100644 index 0000000..395ef12 --- /dev/null +++ b/Assets/09_Timelines/Signals/Signal_PlayerStart.signal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98df81495ebc0a04f8782de67b948a54 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/09_Timelines/Timeline_Intro.playable b/Assets/09_Timelines/Timeline_Intro.playable new file mode 100644 index 0000000..355d48a --- /dev/null +++ b/Assets/09_Timelines/Timeline_Intro.playable @@ -0,0 +1,289 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7033760462103893829 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3} + m_Name: CinemachineShot + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineShot + DisplayName: + VirtualCamera: + exposedName: e2e80c1d70a239748883081fc3d9c27f + defaultValue: {fileID: 0} +--- !u!114 &-1594761906183646253 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: 05acc715f855ced458d76ee6f8ac6c61, type: 3} + m_Name: Cinemachine Track + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineTrack + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: -7033760462103893829} + m_Duration: 5 + m_TimeScale: 1 + m_ParentTrack: {fileID: -1594761906183646253} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: 1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Cine_Intro1 + - m_Version: 1 + m_Start: 4 + m_ClipIn: 0 + m_Asset: {fileID: -528668559861406524} + m_Duration: 5 + m_TimeScale: 1 + m_ParentTrack: {fileID: -1594761906183646253} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 1 + m_BlendOutDuration: 1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Cine_Intro2 + - m_Version: 1 + m_Start: 8 + m_ClipIn: 0 + m_Asset: {fileID: 1526602648766726249} + m_Duration: 2 + m_TimeScale: 1 + m_ParentTrack: {fileID: -1594761906183646253} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: FreeCamera + m_Markers: + m_Objects: [] + TrackPriority: 0 +--- !u!114 &-528668559861406524 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3} + m_Name: CinemachineShot + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineShot + DisplayName: + VirtualCamera: + exposedName: 0a4568204aabbcc46bdc59760e38a62a + defaultValue: {fileID: 0} +--- !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: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: Timeline_Intro + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.TimelineAsset + m_Version: 0 + m_Tracks: + - {fileID: -1594761906183646253} + - {fileID: 4893851994543193904} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} +--- !u!114 &1526602648766726249 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3} + m_Name: CinemachineShot + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineShot + DisplayName: + VirtualCamera: + exposedName: caa6ae7d95d03d14d938c4eb2dc11bee + defaultValue: {fileID: 0} +--- !u!114 &4893851994543193904 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: b46e36075dd1c124a8422c228e75e1fb, type: 3} + m_Name: Signal Track + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalTrack + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: + - {fileID: 8199540842076326334} +--- !u!114 &8199540842076326334 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} + m_Name: Signal Emitter + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalEmitter + m_Time: 9 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 11400000, guid: 98df81495ebc0a04f8782de67b948a54, type: 2} diff --git a/Assets/09_Timelines/Timeline_Intro.playable.meta b/Assets/09_Timelines/Timeline_Intro.playable.meta new file mode 100644 index 0000000..4bbde30 --- /dev/null +++ b/Assets/09_Timelines/Timeline_Intro.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecd8ad50b2e6ae94facb74f2856a637b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..988752f --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de43ff94910a26c658e7228213b553ac66f7c5d27cb513c3bc6ba2924eb0455c +size 482