From 3d5090d9057e7d2235261a683519a44e1f4947d6 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Thu, 10 Jul 2025 20:06:51 +0900 Subject: [PATCH 01/18] =?UTF-8?q?DDD-29,=2030=20=EC=B9=B4=EB=A9=94?= =?UTF-8?q?=EB=9D=BC=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EC=B9=B4=EB=A9=94=EB=9D=BC=20=EB=A7=A4?= =?UTF-8?q?=EB=8B=88=EC=A0=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Addressables/Scenes/Restaurant.unity | 89 ++++--------------- .../_Scripts/CameraSystem/CameraGameObject.cs | 31 +++++++ .../CameraSystem/CameraGameObject.cs.meta | 2 + .../_Scripts/CameraSystem/CameraManager.cs | 55 ++++-------- .../CameraSystem}/CameraManager.prefab | 4 +- .../CameraSystem}/CameraManager.prefab.meta | 0 .../_Scripts/GenerateGoogleSheet/Prefab.meta | 8 ++ .../Prefab}/GoogleSheetManager.prefab | 0 .../Prefab}/GoogleSheetManager.prefab.meta | 0 9 files changed, 77 insertions(+), 112 deletions(-) create mode 100644 Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs create mode 100644 Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs.meta rename Assets/_DDD/{Persistance => _Scripts/CameraSystem}/CameraManager.prefab (98%) rename Assets/_DDD/{Persistance => _Scripts/CameraSystem}/CameraManager.prefab.meta (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab.meta rename Assets/_DDD/{Persistance => _Scripts/GenerateGoogleSheet/Prefab}/GoogleSheetManager.prefab (100%) rename Assets/_DDD/{Persistance => _Scripts/GenerateGoogleSheet/Prefab}/GoogleSheetManager.prefab.meta (100%) diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 6dab4c05b..e213676bc 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -4889,63 +4889,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1922601885 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3914215459674519121, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_Name - value: GameManager - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} --- !u!114 &1926192729 MonoBehaviour: m_ObjectHideFlags: 0 @@ -32569,9 +32512,9 @@ GameObject: - component: {fileID: 5019153103791118558} - component: {fileID: 3688312069522590479} - component: {fileID: 6463147863076644390} - - component: {fileID: 3956599978295396428} + - component: {fileID: 6463147863076644391} m_Layer: 0 - m_Name: BaseCam + m_Name: RestaurantBaseCamera m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -40437,20 +40380,6 @@ Transform: - {fileID: 4542424994289489336} m_Father: {fileID: 7160408128829955619} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &3956599978295396428 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3015334612608266903} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4d75924d76b05344aa410607bc57db98, type: 3} - m_Name: - m_EditorClassIdentifier: - BoundingVolume: {fileID: 0} - SlowingDistance: 0 --- !u!4 &3964656713841077124 Transform: m_ObjectHideFlags: 0 @@ -62175,6 +62104,19 @@ MonoBehaviour: DissipationDistance: 100 PropagationSpeed: 343 DefaultVelocity: {x: 0, y: -1, z: 0} +--- !u!114 &6463147863076644391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3015334612608266903} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b1ef0319328bf84a98bed912be4c61d, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: RestaurantBaseCamera --- !u!108 &6464483386687510218 Light: m_ObjectHideFlags: 0 @@ -85997,7 +85939,6 @@ SceneRoots: m_Roots: - {fileID: 1041959416} - {fileID: 45031421} - - {fileID: 1922601885} - {fileID: 1972254857} - {fileID: 1804444097} - {fileID: 5280945432206803416} diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs new file mode 100644 index 000000000..25fb47207 --- /dev/null +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs @@ -0,0 +1,31 @@ +using Unity.Cinemachine; +using UnityEngine; + +namespace DDD +{ + public class CameraGameObject : MonoBehaviour + { + [field: SerializeField] + public string Id { get; private set; } + + private CinemachineCamera _cinemachineCamera; + + private void Awake() + { + _cinemachineCamera = GetComponent(); + } + + private void Start() + { + CameraManager.Instance.RegisterCamera(this); + } + + private void OnDestroy() + { + CameraManager.Instance.UnRegisterCamera(this); + } + + public int GetPriority() => _cinemachineCamera.Priority; + public void SetPriority(int newPriority) => _cinemachineCamera.Priority = newPriority; + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs.meta b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs.meta new file mode 100644 index 000000000..e56b3c5b9 --- /dev/null +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1b1ef0319328bf84a98bed912be4c61d \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs index 617683359..271e7d645 100644 --- a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs @@ -1,61 +1,44 @@ -using System; using System.Collections.Generic; -using System.Threading.Tasks; using Sirenix.OdinInspector; using Unity.Cinemachine; -using UnityEngine; namespace DDD { - public enum CameraType - { - BaseCam = 0, - } - - public class CameraManager : Singleton + public class CameraManager : Singleton, IManager { [ShowInInspector, ReadOnly] - private Dictionary _cameraDict; + private Dictionary _cameraGameObjects; private CinemachineBrain _cinemachineBrain; - - protected override void OnAwake() + + public void Init() { - base.OnAwake(); - + _cameraGameObjects = new Dictionary(); _cinemachineBrain = GetComponent(); } - public void ChangeScene(SceneType sceneType) + public void PostInit() { - var foundCams = FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None); - _cameraDict = new Dictionary(foundCams.Length); + + } - foreach (var cam in foundCams) - { - if (Enum.TryParse(cam.name, out var type)) - { - if (!_cameraDict.TryAdd(type, cam)) - Debug.LogWarning($"중복된 CameraType: {type}"); - } - else - { - Debug.LogWarning($"Enum에 없는 카메라 이름: {cam.name}"); - } - } + public void RegisterCamera(CameraGameObject cameraGameObject) + { + _cameraGameObjects.TryAdd(cameraGameObject.Id, cameraGameObject); + } - if (sceneType == SceneType.Restaurant) - { - SwitchCamera(CameraType.BaseCam); - } + public void UnRegisterCamera(CameraGameObject cameraGameObject) + { + _cameraGameObjects.Remove(cameraGameObject.Id); } - public void SwitchCamera(CameraType cameraType, CinemachineBlendDefinition.Styles blendStyle = CinemachineBlendDefinition.Styles.Cut, float blendDuration = 1f) + public void SwitchCamera(CameraGameObject cameraGameObject, CinemachineBlendDefinition.Styles blendStyle = CinemachineBlendDefinition.Styles.Cut, float blendDuration = 1f) { _cinemachineBrain.DefaultBlend = new CinemachineBlendDefinition(blendStyle, blendDuration); - foreach (var pair in _cameraDict) + foreach (var item in _cameraGameObjects) { - pair.Value.Priority = (pair.Key == cameraType) ? 10 : 0; + int newPriority = item.Value.Id == cameraGameObject.Id ? 10 : 0; + item.Value.SetPriority(newPriority); } } } diff --git a/Assets/_DDD/Persistance/CameraManager.prefab b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab similarity index 98% rename from Assets/_DDD/Persistance/CameraManager.prefab rename to Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab index d7c6b130c..8fde022d3 100644 --- a/Assets/_DDD/Persistance/CameraManager.prefab +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab @@ -45,8 +45,8 @@ Camera: m_GameObject: {fileID: 7292682221138498026} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/Assets/_DDD/Persistance/CameraManager.prefab.meta b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab.meta similarity index 100% rename from Assets/_DDD/Persistance/CameraManager.prefab.meta rename to Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab.meta new file mode 100644 index 000000000..55278c40a --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3f6eaeb89086ab49a743c6cb3f4ddd2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Persistance/GoogleSheetManager.prefab b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab/GoogleSheetManager.prefab similarity index 100% rename from Assets/_DDD/Persistance/GoogleSheetManager.prefab rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab/GoogleSheetManager.prefab diff --git a/Assets/_DDD/Persistance/GoogleSheetManager.prefab.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab/GoogleSheetManager.prefab.meta similarity index 100% rename from Assets/_DDD/Persistance/GoogleSheetManager.prefab.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab/GoogleSheetManager.prefab.meta From f76256d49d0f70e79f2a658728d52a84d9487e14 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Fri, 11 Jul 2025 14:48:49 +0900 Subject: [PATCH 02/18] =?UTF-8?q?DDD-18=20=ED=94=8C=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=96=B4=20=EC=A1=B0=EC=9E=91=20=EB=B0=8F=20=EA=B2=8C=EC=9E=84?= =?UTF-8?q?=20=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetGroups/Group.asset | 29 +- .../States.meta => Addressables.meta} | 2 +- Assets/_DDD/Addressables/Sprites.meta | 8 + .../Addressables/Sprites/Items.spriteatlasv2 | 18 + .../Sprites/Items.spriteatlasv2.meta | 30 + Assets/_DDD/_Addressables/Prefabs.meta | 8 + .../Prefabs/CreateRestaurantPlayer.prefab | 47 + .../CreateRestaurantPlayer.prefab.meta | 7 + .../Prefabs}/RestaurantPlayer.prefab | 8 +- .../Prefabs}/RestaurantPlayer.prefab.meta | 0 .../_Addressables/Scenes/Restaurant.unity | 842 +----------------- Assets/_DDD/_Addressables/Scenes/Voyage.unity | 138 --- .../So/RestaurantPlayerDataSo.asset | 4 + .../Sprites => _Raw/Sprites/Items}/Gold.png | 0 .../Sprites/Items}/Gold.png.meta | 0 .../Sprites => _Raw/Sprites/Items}/Gold01.png | 0 .../Sprites/Items}/Gold01.png.meta | 0 .../_Scripts/AssetManagement/AssetManager.cs | 2 +- .../_Scripts/CameraSystem/CameraGameObject.cs | 12 +- .../_Scripts/CameraSystem/CameraManager.cs | 5 +- .../CameraSystem/CameraManager.prefab | 2 +- .../_Scripts/GameFlow/GameFlowAssetsSo.asset | 45 +- .../_DDD/_Scripts/GameFlow/GameFlowManager.cs | 58 +- .../_Scripts/GameFramework/FadeManager.cs | 54 ++ .../GameFramework/FadeManager.cs.meta | 2 + .../_Scripts/GameFramework/FadeManager.prefab | 206 +++++ .../GameFramework/FadeManager.prefab.meta | 7 + .../_Scripts/GameFramework/GameManager.cs | 2 - .../GameFramework/ManagerDefinitionSo.asset | 2 + .../_Scripts/GameFramework/SceneManager.cs | 11 +- .../BaseRestaurantCharacter.prefab | 95 ++ .../CreateRestaurantPlayer.cs | 26 + .../CreateRestaurantPlayer.cs.meta | 2 + .../Players/RestaurantPlayer/IStateMachine.cs | 9 - .../RestaurantPlayer/IStateMachine.cs.meta | 2 - .../RestaurantPlayer/PlayerStateMachine.cs | 19 - .../PlayerStateMachine.cs.meta | 2 - .../RestaurantPlayer/RestaurantPlayer.cs | 382 ++++---- .../RestaurantPlayer/RestaurantPlayerData.cs | 6 +- .../RestaurantPlayer/RestaurantPlayerView.cs | 114 +-- .../RestaurantPlayer/States/IdleState.cs | 32 - .../RestaurantPlayer/States/IdleState.cs.meta | 2 - .../RestaurantPlayer/States/WalkingState.cs | 32 - .../States/WalkingState.cs.meta | 2 - .../RestaurantCharacterAnimation.cs | 255 ++++++ .../RestaurantPlayerMovement.cs | 145 ++- .../RestaurantCharacter/SpineController.cs | 265 ------ .../SpineController.cs.meta | 2 - 48 files changed, 1303 insertions(+), 1638 deletions(-) rename Assets/_DDD/{_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States.meta => Addressables.meta} (77%) create mode 100644 Assets/_DDD/Addressables/Sprites.meta create mode 100644 Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2 create mode 100644 Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2.meta create mode 100644 Assets/_DDD/_Addressables/Prefabs.meta create mode 100644 Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab create mode 100644 Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta rename Assets/_DDD/{_Scripts/RestaurantCharacter => _Addressables/Prefabs}/RestaurantPlayer.prefab (95%) rename Assets/_DDD/{_Scripts/RestaurantCharacter => _Addressables/Prefabs}/RestaurantPlayer.prefab.meta (100%) rename Assets/_DDD/{_Addressables/Sprites => _Raw/Sprites/Items}/Gold.png (100%) rename Assets/_DDD/{_Addressables/Sprites => _Raw/Sprites/Items}/Gold.png.meta (100%) rename Assets/_DDD/{_Addressables/Sprites => _Raw/Sprites/Items}/Gold01.png (100%) rename Assets/_DDD/{_Addressables/Sprites => _Raw/Sprites/Items}/Gold01.png.meta (100%) create mode 100644 Assets/_DDD/_Scripts/GameFramework/FadeManager.cs create mode 100644 Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab create mode 100644 Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab.meta create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs.meta diff --git a/Assets/AddressableAssetsData/AssetGroups/Group.asset b/Assets/AddressableAssetsData/AssetGroups/Group.asset index 3da310b14..b89effa02 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Group.asset @@ -15,29 +15,48 @@ MonoBehaviour: m_GroupName: Group m_GUID: 30e7f67fe9aaa7849a34c9b6e2bc53ae m_SerializeEntries: + - m_GUID: 1aad5f6adfc7c7d44b36ce007d3c0f1e + m_Address: Items + m_ReadOnly: 0 + m_SerializedLabels: + - Atlas + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 29dcda970aef9584d9b157e766b8a278 + m_Address: RestaurantPlayer + m_ReadOnly: 0 + m_SerializedLabels: + - Prefab + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 2eb88deceda8c443db7ec557aaef30af m_Address: Entry m_ReadOnly: 0 m_SerializedLabels: - Scene FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 4c9d045012b65fc4b974bb4e132e6e6a + m_Address: CreateRestaurantPlayer + m_ReadOnly: 0 + m_SerializedLabels: + - Prefab + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: a60e7a432b7eb65419f3942f4f422fb4 m_Address: Voyage m_ReadOnly: 0 m_SerializedLabels: - Scene FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: ddb0db863be8f254bb8a8f07d39a960e + m_Address: RestaurantPlayerDataSo + m_ReadOnly: 0 + m_SerializedLabels: + - So + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: de073d0136201ac4cbb36dbeb4b76fb2 m_Address: Restaurant m_ReadOnly: 0 m_SerializedLabels: - Scene FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: e15933f76da90e742866563b5cd9e45f - m_Address: Gold - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: d12ffbb6f886d48418efb0b6d15ccb88, type: 2} m_SchemaSet: diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States.meta b/Assets/_DDD/Addressables.meta similarity index 77% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States.meta rename to Assets/_DDD/Addressables.meta index 9e2c22289..30c25eb10 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States.meta +++ b/Assets/_DDD/Addressables.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ef03a607bdc3e914aad8e99ab5c6f91b +guid: 190b0dbdbdc29b2459a7d0eae707f531 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/Addressables/Sprites.meta b/Assets/_DDD/Addressables/Sprites.meta new file mode 100644 index 000000000..7891908a4 --- /dev/null +++ b/Assets/_DDD/Addressables/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba3a9fb25b878f647b1df9cfebb30f5b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2 b/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2 new file mode 100644 index 000000000..23a8785da --- /dev/null +++ b/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2 @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!612988286 &1 +SpriteAtlasAsset: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 2 + m_MasterAtlas: {fileID: 0} + m_ImporterData: + packables: + - {fileID: 21300000, guid: 189d780f1507008429f2cdd1a2b4c9e8, type: 3} + - {fileID: 21300000, guid: e15933f76da90e742866563b5cd9e45f, type: 3} + - {fileID: 21300000, guid: 0db84c35b16f34681b0309b33d8760fe, type: 3} + m_IsVariant: 0 + m_ScriptablePacker: {fileID: 0} diff --git a/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2.meta b/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2.meta new file mode 100644 index 000000000..9caef868b --- /dev/null +++ b/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2.meta @@ -0,0 +1,30 @@ +fileFormatVersion: 2 +guid: b16c797aa0ede8947b35fd354145121e +SpriteAtlasImporter: + externalObjects: {} + textureSettings: + serializedVersion: 2 + anisoLevel: 0 + compressionQuality: 0 + maxTextureSize: 0 + textureCompression: 0 + filterMode: 1 + generateMipMaps: 0 + readable: 0 + crunchedCompression: 0 + sRGB: 1 + platformSettings: [] + packingSettings: + serializedVersion: 2 + padding: 4 + blockOffset: 0 + allowAlphaSplitting: 0 + enableRotation: 0 + enableTightPacking: 0 + enableAlphaDilation: 0 + secondaryTextureSettings: {} + variantMultiplier: 1 + bindAsDefault: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Prefabs.meta b/Assets/_DDD/_Addressables/Prefabs.meta new file mode 100644 index 000000000..f05457645 --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31fdb3fac3e3a964f9e5bf1aa25158af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab new file mode 100644 index 000000000..6888b5adb --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5717669528680924896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5172050782918397531} + - component: {fileID: 5336591719806944066} + m_Layer: 0 + m_Name: CreateRestaurantPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5172050782918397531 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5717669528680924896} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5336591719806944066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5717669528680924896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 246a7785bd15ac84b9f240005b987f1f, type: 3} + m_Name: + m_EditorClassIdentifier: + _spawnPosition: {x: 0, y: 0, z: 15} diff --git a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta b/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta new file mode 100644 index 000000000..3124860d8 --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c9d045012b65fc4b974bb4e132e6e6a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab similarity index 95% rename from Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab rename to Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index 47085849c..ca7f5ce53 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -52,6 +52,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3095965496140440094, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: _initialSkinName + value: Basic + objectReference: {fileID: 0} - target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_Name value: RestaurantPlayer @@ -63,10 +67,10 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} - insertIndex: 3 + insertIndex: 4 addedObject: {fileID: 4699468658517678862} - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} - insertIndex: 4 + insertIndex: 5 addedObject: {fileID: 4956037093100801085} m_SourcePrefab: {fileID: 100100000, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} --- !u!1 &7316134055819320434 stripped diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab.meta b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab.meta rename to Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab.meta diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index e213676bc..0cfc649ab 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -416,50 +416,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &121938432 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 121938434} - - component: {fileID: 121938433} - m_Layer: 0 - m_Name: Inventory - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &121938433 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 121938432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c667d81563204249aea17e2052c7e50, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &121938434 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 121938432} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 877873993} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &141274235 MonoBehaviour: m_ObjectHideFlags: 0 @@ -808,10 +764,10 @@ RectTransform: - {fileID: 1640982676} m_Father: {fileID: 1713185378} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 500, y: -100} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &296314362 MonoBehaviour: @@ -2014,7 +1970,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &788164720 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2246,8 +2202,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 121938434} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &883453358 @@ -2346,149 +2301,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &948964996 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 948964997} - - component: {fileID: 948965003} - - component: {fileID: 948965002} - - component: {fileID: 948965001} - - component: {fileID: 948965000} - m_Layer: 0 - m_Name: VisualLook - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &948964997 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948964996} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 968554881} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &948965000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948964996} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &948965001 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948964996} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 57e95ec929c09d64c9f85a40f849786a, type: 2} - initialSkinName: Basic - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: - loop: 1 - timeScale: 1 ---- !u!23 &948965002 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948964996} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &948965003 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948964996} - m_Mesh: {fileID: 0} --- !u!114 &954313032 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2525,140 +2337,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &968554876 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 968554881} - - component: {fileID: 968554883} - - component: {fileID: 968554882} - - component: {fileID: 968554884} - - component: {fileID: 968554885} - - component: {fileID: 968554886} - m_Layer: 0 - m_Name: RestaurantPlayer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &968554881 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968554876} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0, z: 15} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 948964997} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &968554882 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968554876} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Height: 0.1 - m_Direction: 1 - m_Center: {x: 0, y: 0.1, z: 0} ---- !u!54 &968554883 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968554876} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 116 - m_CollisionDetection: 1 ---- !u!114 &968554884 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968554876} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 620909d88f805ee4898b9af964a7f0e8, type: 3} - m_Name: - m_EditorClassIdentifier: - IsMoving: 0 - IsDashing: 0 - IsDashCoolDownActive: 0 ---- !u!114 &968554885 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968554876} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c665f9c268555a74a8a805d67d09c80e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &968554886 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968554876} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 06e836de83eb924449235839869a147c, type: 3} - m_Name: - m_EditorClassIdentifier: - _originalMaterial: {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} - _replacementMaterial: {fileID: 0} - _isSkinSet: 1 - _initialSkinName: Basic - _isRandomSkin: 0 - _isRandomRange: 0 - _randomRange: {x: 0, y: 0} - _randomStrings: [] --- !u!114 &985479691 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2726,7 +2404,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1015166833 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5016,67 +4694,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1972254857 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4059976348031579783, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_DefaultActionMap - value: df70fa95-8a34-4494-b137-73ab6b9c7d37 - objectReference: {fileID: 0} - - target: {fileID: 6312950592041400320, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_Name - value: KeyManager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f17834b768fb4724380bafc46049b63c, type: 3} --- !u!114 &1977940846 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21913,27 +21530,6 @@ Transform: - {fileID: 7000665217524502242} m_Father: {fileID: 3192988027884070626} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1771319329464945910 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8954672182622810066} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 44, y: 0, z: 25} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1771730087959953993 GameObject: m_ObjectHideFlags: 0 @@ -25361,23 +24957,6 @@ Transform: m_Children: [] m_Father: {fileID: 1920806406095033276} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2181005474682564920 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2845279302837869120} - - component: {fileID: 2297189639773934291} - m_Layer: 0 - m_Name: Grid Object Ghost - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: e03d6ecba68ab5d47ae39c20870a16e4, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!4 &2185030763711925164 Transform: m_ObjectHideFlags: 0 @@ -26475,21 +26054,6 @@ Light: m_LightUnit: 1 m_LuxAtDistance: 1 m_EnableSpotReflector: 1 ---- !u!114 &2297189639773934291 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2181005474682564920} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aaa500fa45d76b34e9104974d8fab70c, type: 3} - m_Name: - m_EditorClassIdentifier: - ghostObjectLayer: - serializedVersion: 2 - m_Bits: 4 --- !u!65 &2297771402022871221 BoxCollider: m_ObjectHideFlags: 0 @@ -28748,25 +28312,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 5 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &2621506066710331840 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4763878935355813204} - - component: {fileID: 4011341578346064693} - - component: {fileID: 7759589599513505956} - - component: {fileID: 5271584215083939538} - m_Layer: 0 - m_Name: Grid Manager - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: 24affbcac39faab4485a94d192e831c3, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!23 &2622785348478663979 MeshRenderer: m_ObjectHideFlags: 0 @@ -31258,21 +30803,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &2845279302837869120 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2181005474682564920} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4763878935355813204} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2849913003786355722 Transform: m_ObjectHideFlags: 0 @@ -31819,23 +31349,6 @@ Transform: m_Children: [] m_Father: {fileID: 3211503303673724826} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &2917450759388136202 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2976630059373737899} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.5, y: 0, z: 15.700001} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4763878935355813204} - - {fileID: 3110541919575609766} - m_Father: {fileID: 7627145480117215977} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2917543754014491348 Transform: m_ObjectHideFlags: 0 @@ -32241,22 +31754,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &2976630059373737899 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2917450759388136202} - m_Layer: 0 - m_Name: Grid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!114 &2978385039024061897 MonoBehaviour: m_ObjectHideFlags: 0 @@ -33086,21 +32583,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3110541919575609766 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8954672182622810066} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2917450759388136202} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3110981711583394591 SpriteRenderer: m_ObjectHideFlags: 0 @@ -33462,21 +32944,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &3160715917071968891 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9148521891413374300} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eae0c4b8fc4979e4d8d83b276761c814, type: 3} - m_Name: - m_EditorClassIdentifier: - ghostObjectLayer: - serializedVersion: 2 - m_Bits: 4 --- !u!1 &3162414746202592844 GameObject: m_ObjectHideFlags: 0 @@ -40123,21 +39590,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3926311914335318364 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9148521891413374300} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4763878935355813204} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3926429089597874348 GameObject: m_ObjectHideFlags: 0 @@ -40631,24 +40083,6 @@ Transform: - {fileID: 3708059010181611848} m_Father: {fileID: 4499449394227042963} m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} ---- !u!114 &4011341578346064693 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2621506066710331840} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 10b87f85c07a35e4189b1698dff30c8e, type: 3} - m_Name: - m_EditorClassIdentifier: - mouseColliderLayerMask: - serializedVersion: 2 - m_Bits: 2147483648 - easyGridBuilderProList: [] - activeGridSystem: {fileID: 0} - onGrid: 0 --- !u!23 &4015136994482710094 MeshRenderer: m_ObjectHideFlags: 0 @@ -44556,120 +43990,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.5, y: 1, z: 0.2} m_Center: {x: 0, y: 0.5, z: 0.1} ---- !u!114 &4490920062285985167 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8954672182622810066} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28061f5e303cbcf4e97fb0b9bef94f5f, type: 3} - m_Name: - m_EditorClassIdentifier: - gridEditorMode: 2 - buildableGridObjectTypeSOList: - - {fileID: 11400000, guid: db38344e6a3f47245936c7801e21da4a, type: 2} - - {fileID: 11400000, guid: 3ca29f507bc64be49b297cead4c98d9c, type: 2} - buildableEdgeObjectTypeSOList: [] - buildableFreeObjectTypeSOList: [] - gridAxis: 0 - gridWidth: 44 - gridLength: 25 - cellSize: 0.5 - gridOriginXZ: {x: -9.5, y: 0, z: 9.450001} - gridOriginXY: {x: -9.5, y: -6.25, z: 15.700001} - useHolderPositionAsOrigin: 1 - showVerticalGridData: 0 - verticalGridsCount: 1 - gridHeight: 2 - changeHeightWithInput: 1 - autoDetectHeight: 0 - autoDetectHeightLayerMask: - serializedVersion: 2 - m_Bits: 3221225473 - showBuildableDistanceData: 0 - useBuildableDistance: 0 - distanceCheckObject: {fileID: 0} - distanceMin: 0 - distanceMax: 50 - showGridObjectCollisionData: 0 - mouseColliderLayerMask: - serializedVersion: 2 - m_Bits: 2147483648 - freeObjectCollidingLayerMask: - serializedVersion: 2 - m_Bits: 3221225473 - colliderSizeMultiplier: 2 - lockColliderOnHeightChange: 0 - showCanvasGridData: 1 - showEditorAndRuntimeCanvasGrid: 0 - gridCanvasPrefab: {fileID: 7023326040891081457, guid: b008e2f959515844dac4c16b66bf9c2b, type: 3} - gridImageSprite: {fileID: 21300000, guid: 2eacf68fc32face47bf4335fb2cc57c1, type: 3} - showColor: {r: 0.6415094, g: 0.6415094, b: 0.6415094, a: 0.39215687} - hideColor: {r: 0.47058824, g: 0.47058824, b: 0.47058824, a: 0} - colorTransitionSpeed: 20 - showOnDefaultMode: 1 - showOnBuildMode: 1 - showOnDestructMode: 1 - showOnSelectedMode: 1 - lockCanvasGridOnHeightChange: 0 - showDebugGridData: 0 - showEditorAndRuntimeDebugGrid: 0 - editorGridLineColor: {r: 0.27802968, g: 1, b: 0, a: 1} - lockDebugGridOnHeightChange: 1 - showNodeGridData: 0 - showRuntimeNodeGrid: 0 - gridNodePrefab: - - {fileID: 7695809926237117888, guid: 7223ba8911998394d89308bd7b14aadd, type: 3} - - {fileID: 2555192278033704093, guid: 1e5873c3d2d49494395b19a5b78c1d35, type: 3} - - {fileID: 4722525440239903003, guid: 6107dac8e8a7bf74eb16182562da881d, type: 3} - gridNodeMarginPercentage: 95 - gridNodeLocalOffset: {x: 0, y: 0, z: 0} - showTextGridData: 0 - showRuntimeGridText: 0 - gridTextColor: {r: 0, g: 0, b: 0, a: 1} - gridTextSizeMultiplier: 1 - showCellValueText: 1 - gridTextPrefix: - gridTextSuffix: - gridTextLocalOffset: {x: 0, y: 0, z: 0} - showSaveAndLoadData: 0 - enableSaveAndLoad: 1 - uniqueSaveName: EasyGridBuilder_SaveData_ - saveLocation: /EasyGridBuilder Pro/LocalSaves/ - showConsoleText: 0 - showConsoleData: 0 - objectPlacement: 0 - objectDestruction: 0 - objectSelected: 0 - gridLevelChange: 0 - saveAndLoad: 1 - enableUnityEvents: 0 - showBaseEvent: 0 - OnSelectedBuildableChangedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnGridCellChangedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnActiveGridLevelChangedUnityEvent: - m_PersistentCalls: - m_Calls: [] - showObjectInteractEvents: 0 - OnObjectPlacedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnObjectRemovedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnObjectSelectedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnObjectDeselectedUnityEvent: - m_PersistentCalls: - m_Calls: [] --- !u!4 &4491378940361586220 Transform: m_ObjectHideFlags: 0 @@ -47049,24 +46369,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4763878935355813204 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2621506066710331840} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2845279302837869120} - - {fileID: 3926311914335318364} - - {fileID: 7553054689557630467} - m_Father: {fileID: 2917450759388136202} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4764451847785976625 Transform: m_ObjectHideFlags: 0 @@ -51352,21 +50654,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &5271584215083939538 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2621506066710331840} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ce04da996a952774f9fcff585ac87ccd, type: 3} - m_Name: - m_EditorClassIdentifier: - _buildableGridObjectTypeSOList: [] - _buildableEdgeObjectTypeSOList: [] - _buildableFreeObjectTypeSOList: [] --- !u!1 &5275416401350183943 GameObject: m_ObjectHideFlags: 0 @@ -58760,8 +58047,8 @@ MonoBehaviour: m_StreamingVersion: 20241001 m_LegacyPriority: 0 Target: - TrackingTarget: {fileID: 968554881} - LookAtTarget: {fileID: 968554881} + TrackingTarget: {fileID: 0} + LookAtTarget: {fileID: 0} CustomLookAtTarget: 1 Lens: FieldOfView: 35 @@ -60315,20 +59602,6 @@ Transform: - {fileID: 6859274816566502181} m_Father: {fileID: 6482072525005805910} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &6263033593499020960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7507660465387801097} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 419979f1ccdd2eb47a750a427788a53a, type: 3} - m_Name: - m_EditorClassIdentifier: - selectedObject: {fileID: 0} - deselectOnFalseSelect: 0 --- !u!1 &6265769743017788977 GameObject: m_ObjectHideFlags: 0 @@ -71001,18 +70274,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &7476665737616502578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8954672182622810066} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 0} - m_Name: - m_EditorClassIdentifier: --- !u!114 &7478249416128488248 MonoBehaviour: m_ObjectHideFlags: 0 @@ -71152,23 +70413,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &7507660465387801097 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7553054689557630467} - - component: {fileID: 6263033593499020960} - m_Layer: 0 - m_Name: Grid Object Selector - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: 4dde9464ddb31d6489f80535002aa3e2, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!4 &7512157961536089909 Transform: m_ObjectHideFlags: 0 @@ -71431,21 +70675,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7553054689557630467 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7507660465387801097} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4763878935355813204} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7555376018348149457 MeshFilter: m_ObjectHideFlags: 0 @@ -72130,7 +71359,6 @@ Transform: - {fileID: 6020240437717891290} - {fileID: 6816504441442965616} - {fileID: 613465926699939291} - - {fileID: 2917450759388136202} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7632545107564320626 @@ -72944,20 +72172,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &7759589599513505956 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2621506066710331840} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86635d7713df74b4d89c0ac4b1cb89f9, type: 3} - m_Name: - m_EditorClassIdentifier: - easyGridBuilderProInputsSO: {fileID: 11400000, guid: 747d9a1fc1b787747b790d7a3c2252a9, type: 2} - gridObjectSelector: {fileID: 6263033593499020960} --- !u!4 &7759967422652606161 Transform: m_ObjectHideFlags: 0 @@ -83673,25 +82887,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &8954672182622810066 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3110541919575609766} - - component: {fileID: 4490920062285985167} - - component: {fileID: 1771319329464945910} - - component: {fileID: 7476665737616502578} - m_Layer: 31 - m_Name: EGB Pro Grid XZ - m_TagString: Grid - m_Icon: {fileID: 2800000, guid: 7e4350e634f86ed4eb78f2b5857f4d89, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!4 &8954855718254133870 Transform: m_ObjectHideFlags: 0 @@ -85365,23 +84560,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 5 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &9148521891413374300 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3926311914335318364} - - component: {fileID: 3160715917071968891} - m_Layer: 0 - m_Name: Free Object Ghost - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: e03d6ecba68ab5d47ae39c20870a16e4, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!4 &9151080317827763244 Transform: m_ObjectHideFlags: 0 @@ -85939,13 +85117,11 @@ SceneRoots: m_Roots: - {fileID: 1041959416} - {fileID: 45031421} - - {fileID: 1972254857} - {fileID: 1804444097} - {fileID: 5280945432206803416} - {fileID: 1625822452} - {fileID: 1932987510} - {fileID: 877873993} - {fileID: 575217084} - - {fileID: 968554881} - {fileID: 7627145480117215977} - {fileID: 1785845839} diff --git a/Assets/_DDD/_Addressables/Scenes/Voyage.unity b/Assets/_DDD/_Addressables/Scenes/Voyage.unity index 8e24aa376..be4be430e 100644 --- a/Assets/_DDD/_Addressables/Scenes/Voyage.unity +++ b/Assets/_DDD/_Addressables/Scenes/Voyage.unity @@ -240,146 +240,8 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &961739749 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 961739753} - - component: {fileID: 961739752} - - component: {fileID: 961739751} - - component: {fileID: 961739750} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &961739750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961739749} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - m_Quality: 3 - m_FrameInfluence: 0.1 - m_JitterScale: 1 - m_MipBias: 0 - m_VarianceClampScale: 0.9 - m_ContrastAdaptiveSharpening: 0 ---- !u!81 &961739751 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961739749} - m_Enabled: 1 ---- !u!20 &961739752 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961739749} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &961739753 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961739749} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 961739753} - {fileID: 203844589} diff --git a/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset b/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset index 9ab4b53f0..7ecc3f51d 100644 --- a/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset +++ b/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset @@ -18,3 +18,7 @@ MonoBehaviour: DashSpeed: 20 DashTime: 0.2 DashCooldown: 0.5 + WalkingSfxName: + DashSfxName: + MoveActionReference: {fileID: -1680190386980627800, guid: 052faaac586de48259a63d0c4782560b, type: 3} + DashActionReference: {fileID: -8150158440837788775, guid: 052faaac586de48259a63d0c4782560b, type: 3} diff --git a/Assets/_DDD/_Addressables/Sprites/Gold.png b/Assets/_DDD/_Raw/Sprites/Items/Gold.png similarity index 100% rename from Assets/_DDD/_Addressables/Sprites/Gold.png rename to Assets/_DDD/_Raw/Sprites/Items/Gold.png diff --git a/Assets/_DDD/_Addressables/Sprites/Gold.png.meta b/Assets/_DDD/_Raw/Sprites/Items/Gold.png.meta similarity index 100% rename from Assets/_DDD/_Addressables/Sprites/Gold.png.meta rename to Assets/_DDD/_Raw/Sprites/Items/Gold.png.meta diff --git a/Assets/_DDD/_Addressables/Sprites/Gold01.png b/Assets/_DDD/_Raw/Sprites/Items/Gold01.png similarity index 100% rename from Assets/_DDD/_Addressables/Sprites/Gold01.png rename to Assets/_DDD/_Raw/Sprites/Items/Gold01.png diff --git a/Assets/_DDD/_Addressables/Sprites/Gold01.png.meta b/Assets/_DDD/_Raw/Sprites/Items/Gold01.png.meta similarity index 100% rename from Assets/_DDD/_Addressables/Sprites/Gold01.png.meta rename to Assets/_DDD/_Raw/Sprites/Items/Gold01.png.meta diff --git a/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs b/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs index edf4ddecb..680148187 100644 --- a/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs +++ b/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs @@ -25,7 +25,7 @@ public async void PostInit() } catch (Exception e) { - Debug.Assert(false, "Addressables initialization failed"); + Debug.Assert(false, $"Addressables initialization failed\n{e}"); } } diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs index 25fb47207..44484f659 100644 --- a/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs @@ -22,10 +22,20 @@ private void Start() private void OnDestroy() { - CameraManager.Instance.UnRegisterCamera(this); + if (CameraManager.Instance) + { + CameraManager.Instance.UnRegisterCamera(this); + } } public int GetPriority() => _cinemachineCamera.Priority; public void SetPriority(int newPriority) => _cinemachineCamera.Priority = newPriority; + public void SetFollowTarget(Transform target) => _cinemachineCamera.Follow = target; + public void SetLookAtTarget(Transform target) => _cinemachineCamera.LookAt = target; + public void SetFollowAndLookAtTarget(Transform target) + { + SetFollowTarget(target); + SetLookAtTarget(target); + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs index 271e7d645..33dd4de1a 100644 --- a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs @@ -7,13 +7,12 @@ namespace DDD public class CameraManager : Singleton, IManager { [ShowInInspector, ReadOnly] - private Dictionary _cameraGameObjects; + private Dictionary _cameraGameObjects = new(); private CinemachineBrain _cinemachineBrain; public void Init() { - _cameraGameObjects = new Dictionary(); _cinemachineBrain = GetComponent(); } @@ -41,5 +40,7 @@ public void SwitchCamera(CameraGameObject cameraGameObject, CinemachineBlendDefi item.Value.SetPriority(newPriority); } } + + public CameraGameObject GetCameraGameObject(string id) => _cameraGameObjects[id]; } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab index 8fde022d3..f1e6d992a 100644 --- a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab @@ -45,7 +45,7 @@ Camera: m_GameObject: {fileID: 7292682221138498026} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 2 + m_ClearFlags: 1 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset b/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset index e68c2d6c5..091263bb5 100644 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset @@ -56,7 +56,50 @@ MonoBehaviour: Data: 1 - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 1 + - Name: $v + Entry: 7 + Data: 3|System.Collections.Generic.List`1[[UnityEngine.AddressableAssets.AssetReference, + Unity.Addressables]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 4|UnityEngine.AddressableAssets.AssetReference, Unity.Addressables + - Name: m_AssetGUID + Entry: 1 + Data: 4c9d045012b65fc4b974bb4e132e6e6a + - Name: m_SubObjectName + Entry: 6 + Data: + - Name: m_SubObjectType + Entry: 6 + Data: + - Name: m_SubObjectGUID + Entry: 1 + Data: + - Name: m_EditorAssetChanged + Entry: 5 + Data: true + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs index ebc24fd2f..6ad63d9ca 100644 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using UnityEngine; -using UnityEngine.ResourceManagement.ResourceProviders; -using UnityEngine.SceneManagement; +using UnityEngine.AddressableAssets; namespace DDD { @@ -23,7 +22,7 @@ public class GameFlowManager : Singleton, IManager public void Init() { - + GameFlowDataSo.CurrentGameState = GameFlowState.None; } public async void PostInit() @@ -42,7 +41,7 @@ public async void PostInit() } } - public bool IsGameStarted() => GameFlowDataSo.CurrentGameState != GameFlowState.None; + private bool IsGameStarted() => GameFlowDataSo.CurrentGameState != GameFlowState.None; public async Task ChangeFlow(GameFlowState newFlowState) { @@ -62,33 +61,38 @@ private bool CanChangeFlow(GameFlowState newFlowState) return true; } - public void EndCurrentFlow() + private void EndCurrentFlow() { } - public async Task ReadyNewFlow(GameFlowState newFlowState) + private async Task ReadyNewFlow(GameFlowState newFlowState) { + GameFlowDataSo.CurrentGameState = newFlowState; + if (GameFlowAssetsSo.FlowItems.TryGetValue(newFlowState, out var stringKeys)) { - List> loadTasks = new(stringKeys.Count); foreach (var key in stringKeys) { - loadTasks.Add(AssetManager.LoadAsset(key)); + await AssetManager.LoadAsset(key); } - - await Task.WhenAll(loadTasks); } if (GameFlowAssetsSo.FlowAssets.TryGetValue(newFlowState, out var assetRefs)) { - List> loadTasks = new(assetRefs.Count); foreach (var assetRef in assetRefs) { - loadTasks.Add(AssetManager.LoadAsset(assetRef)); + var obj = await AssetManager.LoadAsset(assetRef); + + if (obj is GameObject prefab) + { + Instantiate(prefab); + } + else + { + Debug.LogWarning($"[ReadyNewFlow] Not a GameObject: {assetRef.RuntimeKey}"); + } } - - await Task.WhenAll(loadTasks); } OpenFlowScene(newFlowState); @@ -96,26 +100,36 @@ public async Task ReadyNewFlow(GameFlowState newFlowState) StartFlow(); } - public void OpenFlowScene(GameFlowState newFlowState) + private async void OpenFlowScene(GameFlowState newFlowState) { - if (GetFlowScene(newFlowState, out var sceneToLoad)) + try { - SceneManager.Instance.ActivateScene(sceneToLoad); + if (GetFlowScene(newFlowState, out var sceneToLoad)) + { + await FadeManager.Instance.FadeOut(); + SceneManager.Instance.ActivateScene(sceneToLoad); + await Task.Delay(1000); + await FadeManager.Instance.FadeIn(); + } + else + { + Debug.Assert(false, "Scene not found!"); + } } - else + catch (Exception e) { - Debug.Assert(false, "Scene not found!"); + Debug.LogError(e.Message); } } - public bool GetFlowScene(GameFlowState flowState, out SceneType sceneType) + private bool GetFlowScene(GameFlowState flowState, out SceneType sceneType) { return GameFlowSceneMappingSo.FlowToSceneMapping.TryGetValue(flowState, out sceneType); } - public void StartFlow() + private void StartFlow() { - // Broadcast new flow started + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs b/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs new file mode 100644 index 000000000..ff7a3f6b8 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs @@ -0,0 +1,54 @@ +using System.Threading.Tasks; +using DG.Tweening; +using UnityEngine; + +namespace DDD +{ + public class FadeManager : Singleton, IManager + { + [SerializeField] + private float _fadeOutDuration = 0.5f; + + [SerializeField] + private float _fadeInDuration = 1f; + + private CanvasGroup _canvasGroup; + + public void Init() + { + _canvasGroup = GetComponent(); + } + + public void PostInit() + { + _canvasGroup.alpha = 0f; + _canvasGroup.gameObject.SetActive(false); + } + + public async Task FadeOut() + { + _canvasGroup.gameObject.SetActive(true); + _canvasGroup.blocksRaycasts = true; + + await _canvasGroup.DOFade(1f, _fadeOutDuration) + .SetUpdate(true) + .AsyncWaitForCompletion(); + } + + public async Task FadeIn() + { + await _canvasGroup.DOFade(0f, _fadeInDuration) + .SetUpdate(true) + .AsyncWaitForCompletion(); + + _canvasGroup.blocksRaycasts = false; + _canvasGroup.gameObject.SetActive(false); + } + + public async Task FadeOutIn() + { + await FadeOut(); + await FadeIn(); + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta b/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta new file mode 100644 index 000000000..8c526c9c7 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 41f0ee0aabb2f954d918caa8d484f646 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab b/Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab new file mode 100644 index 000000000..69f67755e --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab @@ -0,0 +1,206 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &645007492175346922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8625885928614466139} + - component: {fileID: 5533625503660040844} + - component: {fileID: 2068856588424138268} + - component: {fileID: 827366504865157138} + - component: {fileID: 8205940526588409056} + - component: {fileID: 5136368050551183548} + m_Layer: 5 + m_Name: FadeManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8625885928614466139 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645007492175346922} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 2840604718763097518} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &5533625503660040844 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645007492175346922} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 6 + m_TargetDisplay: 0 +--- !u!114 &2068856588424138268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645007492175346922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 1 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &827366504865157138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645007492175346922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 55 +--- !u!225 &8205940526588409056 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645007492175346922} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &5136368050551183548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645007492175346922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41f0ee0aabb2f954d918caa8d484f646, type: 3} + m_Name: + m_EditorClassIdentifier: + _persistent: 1 +--- !u!1 &6954525544416039378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2840604718763097518} + - component: {fileID: 8274624108829164416} + - component: {fileID: 4134486114940038904} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2840604718763097518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6954525544416039378} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8625885928614466139} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8274624108829164416 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6954525544416039378} + m_CullTransparentMesh: 1 +--- !u!114 &4134486114940038904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6954525544416039378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab.meta b/Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab.meta new file mode 100644 index 000000000..64474a920 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0aa6654feb91ef040b8b99d4f64688fc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameFramework/GameManager.cs b/Assets/_DDD/_Scripts/GameFramework/GameManager.cs index 56b288405..cf3b1ceff 100644 --- a/Assets/_DDD/_Scripts/GameFramework/GameManager.cs +++ b/Assets/_DDD/_Scripts/GameFramework/GameManager.cs @@ -20,7 +20,6 @@ protected void Start() return; } - // Entry Scene에서 뭘 해야할까? // 매니저 초기화 _managerInstances = new List(_managerDefinitionSo.ManagerClasses.Count); @@ -42,7 +41,6 @@ protected void Start() manager.PostInit(); } } - // 초기 씬으로 보내주기 } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset b/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset index 24ae09132..1786b61ce 100644 --- a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset +++ b/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset @@ -17,3 +17,5 @@ MonoBehaviour: - {fileID: 4889131746858770208, guid: d90fdb17f0162334daadc6fc93e9a0e3, type: 3} - {fileID: 6471498998539637564, guid: fa2ad62c75b1549f09597e47ed5f7cfb, type: 3} - {fileID: 7665229218737596710, guid: 71b177c2a18314c588da30429451666a, type: 3} + - {fileID: 622422277636247943, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} + - {fileID: 5136368050551183548, guid: 0aa6654feb91ef040b8b99d4f64688fc, type: 3} diff --git a/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs b/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs index 3bb19f9ad..78a7f7e84 100644 --- a/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs +++ b/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs @@ -35,16 +35,7 @@ public async void PostInit() { if (sceneType == SceneType.Entry) continue; - var sceneInstance = await AssetManager.LoadScene(sceneType.ToString()); - if (sceneInstance.Scene.IsValid()) - { - _loadedScenes[sceneType] = sceneInstance; - - foreach (var go in sceneInstance.Scene.GetRootGameObjects()) - { - go.SetActive(false); - } - } + await PreloadSceneAsync(sceneType); } } catch (Exception e) diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab b/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab index b28ee57a8..3b974c2fe 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1761643478070701343} - component: {fileID: 5176902543201676162} - component: {fileID: 5246526151924390639} + - component: {fileID: 8352859907019760819} - component: {fileID: 3365694194251356714} - component: {fileID: 127430239903465757} - component: {fileID: 3095965496140440094} @@ -87,6 +88,92 @@ CapsuleCollider: m_Height: 0.1 m_Direction: 1 m_Center: {x: 0, y: 0.1, z: 0} +--- !u!114 &8352859907019760819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5259510642736920361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 351f2ccd-1f9f-44bf-9bec-d62ac5c5f408 + m_ActionName: 'Restaurant/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 6c2ab1b8-8984-453a-af3d-a3c78ae1679a + m_ActionName: 'Restaurant/Attack[/Mouse/leftButton,/Keyboard/enter]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: f1e71b7e-271b-4382-876a-260ea451296a + m_ActionName: 'Restaurant/Dash[/Keyboard/space]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 852140f2-7766-474d-8707-702459ba45f3 + m_ActionName: 'Restaurant/Interact[/Keyboard/e]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: c95b2375-e6d9-4b88-9c4c-c5e76515df4b + m_ActionName: 'Ui/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7607c7b6-cd76-4816-beef-bd0341cfe950 + m_ActionName: 'Ui/Submit[/Keyboard/enter]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 15cef263-9014-4fd5-94d9-4e4a6234a6ef + m_ActionName: 'Ui/Cancel[/Keyboard/escape]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 32b35790-4ed0-4e9a-aa41-69ac6d629449 + m_ActionName: 'Ui/Point[/Mouse/position]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 3c7022bf-7922-4f7c-a998-c437916075ad + m_ActionName: 'Ui/Click[/Mouse/leftButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 44b200b1-1557-4083-816c-b22cbdf77ddf + m_ActionName: 'Ui/RightClick[/Mouse/rightButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: dad70c86-b58c-4b17-88ad-f5e53adf419e + m_ActionName: 'Ui/MiddleClick[/Mouse/middleButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 0489e84a-4833-4c40-bfae-cea84b696689 + m_ActionName: 'Ui/ScrollWheel[/Mouse/scroll]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 24908448-c609-4bc3-a128-ea258674378a + m_ActionName: Ui/TrackedDevicePosition + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be + m_ActionName: Ui/TrackedDeviceOrientation + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Restaurant + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!114 &3365694194251356714 MonoBehaviour: m_ObjectHideFlags: 0 @@ -123,6 +210,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e20368314a3139f4fb4b4e35af9fcf98, type: 3} m_Name: m_EditorClassIdentifier: + _originalMaterial: {fileID: 0} + _replacementMaterial: {fileID: 0} + _isSkinSet: 1 + _initialSkinName: default + _isRandomSkin: 0 + _isRandomRange: 0 + _randomRange: {x: 0, y: 0} + _randomStrings: [] --- !u!1 &6791841979869644848 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs new file mode 100644 index 000000000..d1f62385d --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs @@ -0,0 +1,26 @@ +using System; +using UnityEngine; + +namespace DDD +{ + public class CreateRestaurantPlayer : MonoBehaviour + { + [SerializeField] + private Vector3 _spawnPosition; + + private async void Start() + { + try + { + var playerPrefab = await AssetManager.LoadAsset("RestaurantPlayer"); + var player = Instantiate(playerPrefab, _spawnPosition, playerPrefab.transform.rotation); + player.name = "RestaurantPlayer"; + CameraManager.Instance.GetCameraGameObject("RestaurantBaseCamera").SetFollowAndLookAtTarget(player.transform); + } + catch (Exception e) + { + Debug.LogError($"Create player failed\n{e.Message}"); + } + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs.meta new file mode 100644 index 000000000..8013e8ac6 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 246a7785bd15ac84b9f240005b987f1f \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs deleted file mode 100644 index 61b6b1e85..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace DDD -{ - public interface IStateMachine - { - void Enter(); - void Update(); - void Exit(); - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs.meta deleted file mode 100644 index f27309a77..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: c111bfa40d649ac4c9d401efa650734d \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs deleted file mode 100644 index 2b091c37a..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace DDD -{ - public class PlayerStateMachine - { - private IStateMachine _currentStateMachine; - - public void ChangeState(IStateMachine newStateMachine) - { - _currentStateMachine?.Exit(); - _currentStateMachine = newStateMachine; - _currentStateMachine.Enter(); - } - - public void Update() - { - _currentStateMachine?.Update(); - } - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs.meta deleted file mode 100644 index 10753e2e7..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 2887dac388e7a244585d84329954e38f \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs index 040ffcb4f..2e748c3f5 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs @@ -1,191 +1,191 @@ -using System.Collections; -using UnityEngine; -using UnityEngine.AddressableAssets; -using UnityEngine.InputSystem; -using UnityEngine.Serialization; - -namespace DDD -{ - public class RestaurantPlayer : MonoBehaviour - { - #region Variables - - private RestaurantPlayerDataSo _playerData; - private RestaurantPlayerView _playerView; - - private InputAction _moveAction; - private InputAction _dashAction; - private Coroutine _dashInstance; - - private Vector3 _inputDirection; - private Vector3 _currentDirection = Vector3.back; - - public bool IsMoving; - public bool IsDashing; - public bool IsDashCoolDownActive; - - private float _finalSpeed; - - private PlayerStateMachine _stateMachine; - - #endregion - - // Unity events - - #region Unity events - - private void Awake() - { - _playerData = Addressables.LoadAssetAsync("RestaurantPlayerDataSo").WaitForCompletion(); - _playerView = GetComponent(); - } - - private void Start() - { - _moveAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Move)); - _dashAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Dash)); - - _moveAction.performed += OnMove; - _moveAction.canceled += OnMove; - _dashAction.performed += OnDash; - - _stateMachine = new PlayerStateMachine(); - ChangeState(new IdleState(this, _playerView)); - } - - //public CellManager cellManager; - private void Update() - { - _stateMachine.Update(); - - FlipVisualLook(); - - //UpdateCell - //cellManager.SetupCell(transform.position); - } - - private void FixedUpdate() - { - if (!CanMove()) return; - - Move(); - } - - private void OnDestroy() - { - _moveAction.performed -= OnMove; - _moveAction.canceled -= OnMove; - _dashAction.performed -= OnDash; - } - - #endregion - - // Methods - #region Methods - - public void SetCurrentDirection(Vector3 normalDirection) - { - if (normalDirection == Vector3.zero) return; - - _currentDirection = normalDirection; - } - - private void FlipVisualLook() - { - Vector3 localScale = _playerView.GetLocalScale(); - localScale.x = _currentDirection.x switch - { - > 0.01f => -Mathf.Abs(localScale.x), - < -0.01f => Mathf.Abs(localScale.x), - _ => localScale.x - }; - _playerView.SetLocalScale(localScale); - } - - public void OnMove(InputAction.CallbackContext context) - { - var movementInput = _moveAction.ReadValue(); - _inputDirection = new Vector3(movementInput.x, 0, movementInput.y).normalized; - } - - public bool CanMove() - { - return _playerData.IsMoveEnabled && !IsDashing; - } - - public void Move() - { - SetCurrentDirection(_inputDirection); - IsMoving = _inputDirection != Vector3.zero; - - var finalVelocity = _inputDirection * _playerData.MoveSpeed; - _playerView.SetVelocity(finalVelocity); - } - - public void OnDash(InputAction.CallbackContext context) - { - if (!CanDash()) return; - - Dash(); - } - - public bool CanDash() - { - return _playerData.IsDashEnabled && !IsDashing && !IsDashCoolDownActive; - } - - public void Dash() - { - Utils.StartUniqueCoroutine(this, ref _dashInstance, DashCoroutine()); - } - - private IEnumerator DashCoroutine() - { - IsDashing = true; - IsDashCoolDownActive = true; - _playerView.PlayDashParticle(); - - AudioManager.Instance.PlaySfx(_playerData.DashSfxName); - - var dashDirection = _inputDirection; - if (dashDirection == Vector3.zero) - { - dashDirection = _currentDirection; - } - - var elapsedTime = 0f; - while (elapsedTime <= _playerData.DashTime) - { - var finalVelocity = dashDirection * _playerData.DashSpeed; - _playerView.SetVelocity(finalVelocity); - - elapsedTime += Time.fixedDeltaTime; - yield return new WaitForFixedUpdate(); - } - - EndDash(_playerData.DashCooldown); - } - - public void EndDash(float dashCooldown = float.PositiveInfinity) - { - Utils.EndUniqueCoroutine(this, ref _dashInstance); - _playerView.SetVelocity(Vector3.zero); - IsDashing = false; - - if (float.IsPositiveInfinity(dashCooldown)) - { - dashCooldown = _playerData.DashCooldown; - } - - // TODO : ui 연동 - StartCoroutine(Utils.CoolDownCoroutine(dashCooldown, () => IsDashCoolDownActive = false)); - } - - public void ChangeState(IStateMachine stateMachine) - { - _stateMachine.ChangeState(stateMachine); - } - - #endregion - } -} \ No newline at end of file +// using System.Collections; +// using UnityEngine; +// using UnityEngine.AddressableAssets; +// using UnityEngine.InputSystem; +// using UnityEngine.Serialization; +// +// namespace DDD +// { +// public class RestaurantPlayer : MonoBehaviour +// { +// #region Variables +// +// private RestaurantPlayerDataSo _playerData; +// private RestaurantPlayerView _playerView; +// +// private InputAction _moveAction; +// private InputAction _dashAction; +// private Coroutine _dashInstance; +// +// private Vector3 _inputDirection; +// private Vector3 _currentDirection = Vector3.back; +// +// public bool IsMoving; +// public bool IsDashing; +// public bool IsDashCoolDownActive; +// +// private float _finalSpeed; +// +// private PlayerStateMachine _stateMachine; +// +// #endregion +// +// // Unity events +// +// #region Unity events +// +// private void Awake() +// { +// _playerData = Addressables.LoadAssetAsync("RestaurantPlayerDataSo").WaitForCompletion(); +// _playerView = GetComponent(); +// } +// +// private void Start() +// { +// _moveAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Move)); +// _dashAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Dash)); +// +// _moveAction.performed += OnMove; +// _moveAction.canceled += OnMove; +// _dashAction.performed += OnDash; +// +// _stateMachine = new PlayerStateMachine(); +// ChangeState(new IdleState(this, _playerView)); +// } +// +// //public CellManager cellManager; +// private void Update() +// { +// _stateMachine.Update(); +// +// FlipVisualLook(); +// +// //UpdateCell +// //cellManager.SetupCell(transform.position); +// } +// +// private void FixedUpdate() +// { +// if (!CanMove()) return; +// +// Move(); +// } +// +// private void OnDestroy() +// { +// _moveAction.performed -= OnMove; +// _moveAction.canceled -= OnMove; +// _dashAction.performed -= OnDash; +// } +// +// #endregion +// +// // Methods +// #region Methods +// +// public void SetCurrentDirection(Vector3 normalDirection) +// { +// if (normalDirection == Vector3.zero) return; +// +// _currentDirection = normalDirection; +// } +// +// private void FlipVisualLook() +// { +// Vector3 localScale = _playerView.GetLocalScale(); +// localScale.x = _currentDirection.x switch +// { +// > 0.01f => -Mathf.Abs(localScale.x), +// < -0.01f => Mathf.Abs(localScale.x), +// _ => localScale.x +// }; +// _playerView.SetLocalScale(localScale); +// } +// +// public void OnMove(InputAction.CallbackContext context) +// { +// var movementInput = _moveAction.ReadValue(); +// _inputDirection = new Vector3(movementInput.x, 0, movementInput.y).normalized; +// } +// +// public bool CanMove() +// { +// return _playerData.IsMoveEnabled && !IsDashing; +// } +// +// public void Move() +// { +// SetCurrentDirection(_inputDirection); +// IsMoving = _inputDirection != Vector3.zero; +// +// var finalVelocity = _inputDirection * _playerData.MoveSpeed; +// _playerView.SetVelocity(finalVelocity); +// } +// +// public void OnDash(InputAction.CallbackContext context) +// { +// if (!CanDash()) return; +// +// Dash(); +// } +// +// public bool CanDash() +// { +// return _playerData.IsDashEnabled && !IsDashing && !IsDashCoolDownActive; +// } +// +// public void Dash() +// { +// Utils.StartUniqueCoroutine(this, ref _dashInstance, DashCoroutine()); +// } +// +// private IEnumerator DashCoroutine() +// { +// IsDashing = true; +// IsDashCoolDownActive = true; +// _playerView.PlayDashParticle(); +// +// AudioManager.Instance.PlaySfx(_playerData.DashSfxName); +// +// var dashDirection = _inputDirection; +// if (dashDirection == Vector3.zero) +// { +// dashDirection = _currentDirection; +// } +// +// var elapsedTime = 0f; +// while (elapsedTime <= _playerData.DashTime) +// { +// var finalVelocity = dashDirection * _playerData.DashSpeed; +// _playerView.SetVelocity(finalVelocity); +// +// elapsedTime += Time.fixedDeltaTime; +// yield return new WaitForFixedUpdate(); +// } +// +// EndDash(_playerData.DashCooldown); +// } +// +// public void EndDash(float dashCooldown = float.PositiveInfinity) +// { +// Utils.EndUniqueCoroutine(this, ref _dashInstance); +// _playerView.SetVelocity(Vector3.zero); +// IsDashing = false; +// +// if (float.IsPositiveInfinity(dashCooldown)) +// { +// dashCooldown = _playerData.DashCooldown; +// } +// +// // TODO : ui 연동 +// StartCoroutine(Utils.CoolDownCoroutine(dashCooldown, () => IsDashCoolDownActive = false)); +// } +// +// public void ChangeState(IStateMachine stateMachine) +// { +// _stateMachine.ChangeState(stateMachine); +// } +// +// #endregion +// } +// } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs index 7e701bdb2..7a9e804d7 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs @@ -1,4 +1,5 @@ using UnityEngine; +using UnityEngine.InputSystem; using UnityEngine.Serialization; namespace DDD @@ -12,9 +13,12 @@ public class RestaurantPlayerDataSo : ScriptableObject public bool IsDashEnabled = true; public float DashSpeed = 20f; public float DashTime = 0.2f; - public float DashCooldown = 0.5f; + public float DashCooldown = 2f; public string WalkingSfxName; public string DashSfxName; + + public InputActionReference MoveActionReference; + public InputActionReference DashActionReference; } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs index 4763694ef..def822db5 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs @@ -1,57 +1,57 @@ -using Spine; -using UnityEngine; - -namespace DDD -{ - public static class RestaurantSpineAnimation - { - public const string Idle = "Idle"; - public const string Walking = "RunFast"; - public const string ServingIdle = "Serving/ServingIdle"; - public const string Serving = "Serving/ServingFast"; - public const string Dash = "Dash"; - public const string CleaningFloor = "Cleaning/CleaningFloor"; - public const string CleaningTable = "Cleaning/CleaningTable"; - public const string MakingCocktail = "BeerMaker"; - public const string Pumping = "Attack/AttackWhip"; - public const string AttackSlime = "Attack/AttackSlime"; - public const string AttackLimeTree = "Attack/AttackBat"; - public const string CookingFried = "Cooking/CookingFried"; - public const string CookingStew = "Cooking/CookingStew"; - } - - public class RestaurantPlayerView : MonoBehaviour - { - private Rigidbody _rigidbody; - private Transform _visualLook; - private SpineController _spineController; - - private ParticleSystem _dashParticle; - - private void Awake() - { - _rigidbody = GetComponent(); - _visualLook = transform.Find("VisualLook"); - _spineController = GetComponent(); - } - - public void SetVelocity(Vector3 velocity) => _rigidbody.linearVelocity = velocity; - public Vector3 GetLocalScale() => _visualLook.localScale; - public void SetLocalScale(Vector3 localScale) => _visualLook.localScale = localScale; - - public void PlayDashParticle() - { - if (_dashParticle) - { - _dashParticle.Play(); - } - } - - public TrackEntry PlayAnimation(string animationName, bool isLoopActive, float speed = 1f, bool isReverse = false, int trackIndex = 0) - => _spineController.PlayAnimation(animationName, isLoopActive, speed, isReverse, trackIndex); - public TrackEntry PlayAnimationDuration(string animationName, bool isLoopActive, float duration, bool isReverse = false, int trackIndex = 0) => - _spineController.PlayAnimationDuration(animationName, isLoopActive, duration, isReverse, trackIndex); - public TrackEntry AddAnimation(string animationName, bool isLoopActive, int trackIndex = 0) - => _spineController.AddAnimation(animationName, isLoopActive, trackIndex); - } -} \ No newline at end of file +// using Spine; +// using UnityEngine; +// +// namespace DDD +// { +// public static class RestaurantSpineAnimation +// { +// public const string Idle = "Idle"; +// public const string Walking = "RunFast"; +// public const string ServingIdle = "Serving/ServingIdle"; +// public const string Serving = "Serving/ServingFast"; +// public const string Dash = "Dash"; +// public const string CleaningFloor = "Cleaning/CleaningFloor"; +// public const string CleaningTable = "Cleaning/CleaningTable"; +// public const string MakingCocktail = "BeerMaker"; +// public const string Pumping = "Attack/AttackWhip"; +// public const string AttackSlime = "Attack/AttackSlime"; +// public const string AttackLimeTree = "Attack/AttackBat"; +// public const string CookingFried = "Cooking/CookingFried"; +// public const string CookingStew = "Cooking/CookingStew"; +// } +// +// public class RestaurantPlayerView : MonoBehaviour +// { +// private Rigidbody _rigidbody; +// private Transform _visualLook; +// private SpineController _spineController; +// +// private ParticleSystem _dashParticle; +// +// private void Awake() +// { +// _rigidbody = GetComponent(); +// _visualLook = transform.Find("VisualLook"); +// _spineController = GetComponent(); +// } +// +// public void SetVelocity(Vector3 velocity) => _rigidbody.linearVelocity = velocity; +// public Vector3 GetLocalScale() => _visualLook.localScale; +// public void SetLocalScale(Vector3 localScale) => _visualLook.localScale = localScale; +// +// public void PlayDashParticle() +// { +// if (_dashParticle) +// { +// _dashParticle.Play(); +// } +// } +// +// public TrackEntry PlayAnimation(string animationName, bool isLoopActive, float speed = 1f, bool isReverse = false, int trackIndex = 0) +// => _spineController.PlayAnimation(animationName, isLoopActive, speed, isReverse, trackIndex); +// public TrackEntry PlayAnimationDuration(string animationName, bool isLoopActive, float duration, bool isReverse = false, int trackIndex = 0) => +// _spineController.PlayAnimationDuration(animationName, isLoopActive, duration, isReverse, trackIndex); +// public TrackEntry AddAnimation(string animationName, bool isLoopActive, int trackIndex = 0) +// => _spineController.AddAnimation(animationName, isLoopActive, trackIndex); +// } +// } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs deleted file mode 100644 index 76053badf..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace DDD -{ - public class IdleState : IStateMachine - { - private RestaurantPlayer _player; - private RestaurantPlayerView _view; - - public IdleState(RestaurantPlayer player, RestaurantPlayerView view) - { - _player = player; - _view = view; - } - - public void Enter() - { - _view.PlayAnimation(RestaurantSpineAnimation.Idle, true); - } - - public void Update() - { - if (_player.IsMoving) - { - _player.ChangeState(new WalkingState(_player, _view)); - } - } - - public void Exit() - { - - } - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs.meta deleted file mode 100644 index 4877fd7c5..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 8dd7a1f24d102af41848ae82fb8f8ca5 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs deleted file mode 100644 index 67beef702..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace DDD -{ - public class WalkingState : IStateMachine - { - private RestaurantPlayer _player; - private RestaurantPlayerView _view; - - public WalkingState(RestaurantPlayer player, RestaurantPlayerView view) - { - _player = player; - _view = view; - } - - public void Enter() - { - _view.PlayAnimation(RestaurantSpineAnimation.Walking, true); - } - - public void Update() - { - if (!_player.IsMoving) - { - _player.ChangeState(new IdleState(_player, _view)); - } - } - - public void Exit() - { - - } - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs.meta deleted file mode 100644 index 63ca6ff02..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 08926e2ade87cab459e625851316b00c diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs index 30f1645b9..b32361fa0 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs @@ -1,9 +1,264 @@ +using System.Collections.Generic; +using Sirenix.OdinInspector; +using Spine; +using Spine.Unity; using UnityEngine; +using AnimationState = Spine.AnimationState; namespace DDD { public class RestaurantCharacterAnimation : MonoBehaviour { + // Variables + #region Variables + private SkeletonAnimation _skeletonAnimation; + + [SerializeField, ReadOnly] + private Material _originalMaterial; + + [SerializeField] + private Material _replacementMaterial; + + private AnimationState _animationState; + + // Variables + [SerializeField] + private bool _isSkinSet = true; + + [SerializeField, ShowIf("@_isSkinSet && !_isRandomSkin")] + private string _initialSkinName = "default"; + + [SerializeField, ShowIf("@_isSkinSet")] + private bool _isRandomSkin; + + [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin")] + private bool _isRandomRange; + + [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin && _isRandomRange"), Tooltip("x <= 값 < y")] + private Vector2 _randomRange; + + [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin && !_isRandomRange")] + private List _randomStrings; + + private bool _customMaterialEnabled; + + #endregion + + // Unity events + #region Unity events + + private void Reset() + { + InitializeComponents(); + } + + private void Awake() + { + InitializeComponents(); + + if (!_isSkinSet) return; + + if (_isRandomSkin) + { + if (_isRandomRange) + { + SetRandomSkin(); + } + else + { + SetRandomStringListSkin(); + } + } + else + { + SetSkin(_initialSkinName); + } + } + + #endregion + + // Initialize methods + #region Initialize methods + + private void InitializeComponents() + { + _skeletonAnimation = transform.GetComponentInChildren(); + if (!_originalMaterial) + { + _originalMaterial = _skeletonAnimation.SkeletonDataAsset.atlasAssets[0].PrimaryMaterial; + } + + _animationState = _skeletonAnimation.AnimationState; + } + + #endregion + + // Methods + #region Methods + + /// 스파인 애니메이션 이름 + /// 반복 여부 + /// 애니메이션 속도 양수값 + /// true인 경우 자동으로 speed에 음수값(-1)을 넣음 + /// + /// + public TrackEntry PlayAnimation(string animationName, bool isLoopActive, float speed = 1f, bool isReverse = false, int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return null; + + if (string.IsNullOrEmpty(animationName)) + { + Debug.LogError($"{animationName}의 애니메이션은 존재하지 않습니다."); + return null; + } + + // 중복 체크 + var currentTrackEntry = _animationState.GetCurrent(trackIndex); + if (currentTrackEntry != null && currentTrackEntry.Animation.Name == animationName) + { + return currentTrackEntry; + } + + _animationState.TimeScale = isReverse ? -Mathf.Abs(speed) : Mathf.Abs(speed); + var trackEntry = _animationState.SetAnimation(trackIndex, animationName, isLoopActive); + + if (isReverse) + { + trackEntry.TrackTime = trackEntry.AnimationEnd; + } + + return trackEntry; + } + + public TrackEntry PlayAnimationDuration(string animationName, bool isLoopActive, float duration, bool isReverse = false, int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return null; + + if (string.IsNullOrEmpty(animationName)) + { + Debug.LogError($"{animationName}의 애니메이션은 존재하지 않습니다."); + return null; + } + + // 중복 체크 + var currentTrackEntry = _animationState.GetCurrent(trackIndex); + if (currentTrackEntry != null && currentTrackEntry.Animation.Name == animationName) + { + return currentTrackEntry; + } + + var findAnimation = _skeletonAnimation.Skeleton.Data.FindAnimation(animationName); + if (findAnimation == null) + { + Debug.LogError($"{animationName} 애니메이션을 찾을 수 없습니다."); + return null; + } + + var speed = findAnimation.Duration / duration; + _animationState.TimeScale = isReverse ? -Mathf.Abs(speed) : Mathf.Abs(speed); + var trackEntry = _animationState.SetAnimation(trackIndex, animationName, isLoopActive); + + if (isReverse) + { + trackEntry.TrackTime = trackEntry.AnimationEnd; + } + + return trackEntry; + } + + public TrackEntry AddAnimation(string animationName, bool isLoopActive, int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return null; + + if (string.IsNullOrEmpty(animationName)) + { + Debug.LogError($"{animationName} 애니메이션은 존재하지 않습니다."); + return null; + } + + var trackEntry = _animationState.AddAnimation(trackIndex, animationName, isLoopActive, 0); + + return trackEntry; + } + + public string GetCurrentSkin() + { + if (_skeletonAnimation == null) return null; + + return _skeletonAnimation.Skeleton.Skin.ToString(); + } + + public void SetSkin(string skinName) + { + if (_skeletonAnimation == null && _animationState == null) return; + + if (string.IsNullOrEmpty(skinName)) + { + Debug.LogError($"{skinName}의 스킨 이름은 존재하지 않습니다."); + return; + } + + _skeletonAnimation.Skeleton.SetSkin(skinName); + _skeletonAnimation.Skeleton.SetSlotsToSetupPose(); + _animationState.Apply(_skeletonAnimation.Skeleton); + } + + public void SetRandomSkin() + { + if (_skeletonAnimation == null || _skeletonAnimation.Skeleton == null) return; + + var skins = _skeletonAnimation.skeleton.Data.Skins; + var randomSkin = Random.Range((int)_randomRange.x, (int)_randomRange.y); + var randomSkinName = skins.Items[randomSkin].Name; + SetSkin(randomSkinName); + } + + public void SetRandomStringListSkin() + { + if (_skeletonAnimation == null || _skeletonAnimation.Skeleton == null) return; + + if (_randomStrings == null || _randomStrings.Count <= 0) + { + Debug.LogError("_randomStrings 설정 오류"); + return; + } + + var randomSkin = Random.Range(0, _randomStrings.Count); + var randomSkinName = _randomStrings[randomSkin]; + SetSkin(randomSkinName); + } + + public void EnableCustomMaterial() + { + if (_customMaterialEnabled) return; + + _skeletonAnimation.CustomMaterialOverride[_originalMaterial] = _replacementMaterial; + _customMaterialEnabled = true; + } + + public void DisableCustomMaterial() + { + if (!_customMaterialEnabled) return; + + _skeletonAnimation.CustomMaterialOverride.Remove(_originalMaterial); + _customMaterialEnabled = false; + } + + public bool IsAnimationComplete(int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return false; + + var currentTrackEntry = _animationState.GetCurrent(trackIndex); + if (currentTrackEntry == null) + { + Debug.LogWarning($"트랙 {trackIndex}에서 재생 중인 애니메이션이 없습니다."); + return false; + } + + return currentTrackEntry.IsComplete; + } + + #endregion } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs index 9d4df4ba4..d51695151 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs @@ -1,11 +1,150 @@ +using System; +using System.Collections; using UnityEngine; +using UnityEngine.InputSystem; namespace DDD { public class RestaurantPlayerMovement : RestaurantCharacterMovement { - // TODO : TryMove // 인풋에 등록할 함수 - // TODO : CanMove // Check IMovementConstraint - // TODO : Move // 실제 트랜스레이션, 슬라이딩, 충돌 + private Rigidbody _rigidbody; + private RestaurantCharacterAnimation _animation; + private Transform _visualLook; + + private RestaurantPlayerDataSo _playerData; + + private Vector3 _inputDirection; + private Vector3 _currentDirection; + private bool _isMoving; + private bool _isDashing; + private bool _isDashCooldown; + private bool _isInitialized; + + private void Awake() + { + _rigidbody = GetComponent(); + _animation = GetComponent(); + _visualLook = transform.Find("VisualLook"); + } + + private async void Start() + { + try + { + _playerData = await AssetManager.LoadAsset("RestaurantPlayerDataSo"); + + _playerData.MoveActionReference.action.performed += OnMove; + _playerData.MoveActionReference.action.canceled += OnMove; + _playerData.DashActionReference.action.performed += OnDash; + + _isInitialized = true; + } + catch (Exception e) + { + Debug.LogError($"_playerData load failed\n{e}"); + } + } + + private void Update() + { + if (_isInitialized == false) return; + + FlipVisualLook(); + } + + private void FixedUpdate() + { + if (_isInitialized == false) return; + + if (CanMove()) + { + Move(); + } + } + + private void OnDestroy() + { + if (_playerData) + { + _playerData.MoveActionReference.action.performed -= OnMove; + _playerData.MoveActionReference.action.canceled -= OnMove; + _playerData.DashActionReference.action.performed -= OnDash; + } + } + + public void SetCurrentDirection(Vector3 normalDirection) + { + if (_inputDirection == Vector3.zero) return; + + _currentDirection = normalDirection; + } + + private void FlipVisualLook() + { + Vector3 localScale = _visualLook.localScale; + localScale.x = _currentDirection.x switch + { + > 0.01f => -Mathf.Abs(localScale.x), + < -0.01f => Mathf.Abs(localScale.x), + _ => localScale.x + }; + _visualLook.localScale = localScale; + } + + private void OnMove(InputAction.CallbackContext context) + { + Vector2 movementInput = context.ReadValue(); + _inputDirection = new Vector3(movementInput.x, 0f, movementInput.y); + } + + private bool CanMove() + { + return _playerData.IsMoveEnabled && _isDashing == false; + } + + private void Move() + { + SetCurrentDirection(_inputDirection); + + _isMoving = _inputDirection != Vector3.zero; + string animationName = _isMoving ? "RunFast" : "Idle"; + _animation.PlayAnimation(animationName, true); + + Vector3 finalVelocity = _inputDirection * _playerData.MoveSpeed; + _rigidbody.linearVelocity = finalVelocity; + } + + private void OnDash(InputAction.CallbackContext context) + { + if (CanDash()) + { + StartCoroutine(DashCoroutine()); + } + } + + private bool CanDash() + { + return _playerData.IsDashEnabled && _isDashing == false && _isDashCooldown == false; + } + + private IEnumerator DashCoroutine() + { + // TODO : ui생기면 연동 + + _isDashing = true; + _isDashCooldown = true; + + _animation.PlayAnimationDuration("Dash", false, _playerData.DashTime); + + Vector3 dashVelocity = _currentDirection.normalized * _playerData.DashSpeed; + _rigidbody.linearVelocity = dashVelocity; + + yield return new WaitForSeconds(_playerData.DashTime); + + _isDashing = false; + + yield return new WaitForSeconds(_playerData.DashCooldown); + _isDashCooldown = false; + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs deleted file mode 100644 index a2266389c..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs +++ /dev/null @@ -1,265 +0,0 @@ -using System.Collections.Generic; -using Sirenix.OdinInspector; -using Spine; -using Spine.Unity; -using UnityEngine; -using AnimationState = Spine.AnimationState; -using Random = UnityEngine.Random; - -namespace DDD -{ - public class SpineController : MonoBehaviour - { - // Variables - #region Variables - - private SkeletonAnimation _skeletonAnimation; - - [SerializeField, ReadOnly] - private Material _originalMaterial; - - [SerializeField] - private Material _replacementMaterial; - - private AnimationState _animationState; - - // Variables - [SerializeField] - private bool _isSkinSet = true; - - [SerializeField, ShowIf("@_isSkinSet && !_isRandomSkin")] - private string _initialSkinName = "default"; - - [SerializeField, ShowIf("@_isSkinSet")] - private bool _isRandomSkin; - - [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin")] - private bool _isRandomRange; - - [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin && _isRandomRange"), Tooltip("x <= 값 < y")] - private Vector2 _randomRange; - - [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin && !_isRandomRange")] - private List _randomStrings; - - private bool _customMaterialEnabled; - - #endregion - - // Unity events - #region Unity events - - private void Reset() - { - InitializeComponents(); - } - - private void Awake() - { - InitializeComponents(); - - if (!_isSkinSet) return; - - if (_isRandomSkin) - { - if (_isRandomRange) - { - SetRandomSkin(); - } - else - { - SetRandomStringListSkin(); - } - } - else - { - SetSkin(_initialSkinName); - } - } - - #endregion - - // Initialize methods - #region Initialize methods - - private void InitializeComponents() - { - _skeletonAnimation = transform.GetComponentInChildren(); - if (!_originalMaterial) - { - _originalMaterial = _skeletonAnimation.SkeletonDataAsset.atlasAssets[0].PrimaryMaterial; - } - - _animationState = _skeletonAnimation.AnimationState; - } - - #endregion - - // Methods - #region Methods - - /// 스파인 애니메이션 이름 - /// 반복 여부 - /// 애니메이션 속도 양수값 - /// true인 경우 자동으로 speed에 음수값(-1)을 넣음 - /// - /// - public TrackEntry PlayAnimation(string animationName, bool isLoopActive, float speed = 1f, bool isReverse = false, int trackIndex = 0) - { - if (!_skeletonAnimation || _animationState == null) return null; - - if (string.IsNullOrEmpty(animationName)) - { - Debug.LogError($"{animationName}의 애니메이션은 존재하지 않습니다."); - return null; - } - - // 중복 체크 - var currentTrackEntry = _animationState.GetCurrent(trackIndex); - if (currentTrackEntry != null && currentTrackEntry.Animation.Name == animationName) - { - return currentTrackEntry; - } - - _animationState.TimeScale = isReverse ? -Mathf.Abs(speed) : Mathf.Abs(speed); - var trackEntry = _animationState.SetAnimation(trackIndex, animationName, isLoopActive); - - if (isReverse) - { - trackEntry.TrackTime = trackEntry.AnimationEnd; - } - - return trackEntry; - } - - public TrackEntry PlayAnimationDuration(string animationName, bool isLoopActive, float duration, bool isReverse = false, int trackIndex = 0) - { - if (!_skeletonAnimation || _animationState == null) return null; - - if (string.IsNullOrEmpty(animationName)) - { - Debug.LogError($"{animationName}의 애니메이션은 존재하지 않습니다."); - return null; - } - - // 중복 체크 - var currentTrackEntry = _animationState.GetCurrent(trackIndex); - if (currentTrackEntry != null && currentTrackEntry.Animation.Name == animationName) - { - return currentTrackEntry; - } - - var findAnimation = _skeletonAnimation.Skeleton.Data.FindAnimation(animationName); - if (findAnimation == null) - { - Debug.LogError($"{animationName} 애니메이션을 찾을 수 없습니다."); - return null; - } - - var speed = findAnimation.Duration / duration; - _animationState.TimeScale = isReverse ? -Mathf.Abs(speed) : Mathf.Abs(speed); - var trackEntry = _animationState.SetAnimation(trackIndex, animationName, isLoopActive); - - if (isReverse) - { - trackEntry.TrackTime = trackEntry.AnimationEnd; - } - - return trackEntry; - } - - public TrackEntry AddAnimation(string animationName, bool isLoopActive, int trackIndex = 0) - { - if (!_skeletonAnimation || _animationState == null) return null; - - if (string.IsNullOrEmpty(animationName)) - { - Debug.LogError($"{animationName} 애니메이션은 존재하지 않습니다."); - return null; - } - - var trackEntry = _animationState.AddAnimation(trackIndex, animationName, isLoopActive, 0); - - return trackEntry; - } - - public string GetCurrentSkin() - { - if (_skeletonAnimation == null) return null; - - return _skeletonAnimation.Skeleton.Skin.ToString(); - } - - public void SetSkin(string skinName) - { - if (_skeletonAnimation == null && _animationState == null) return; - - if (string.IsNullOrEmpty(skinName)) - { - Debug.LogError($"{skinName}의 스킨 이름은 존재하지 않습니다."); - return; - } - - _skeletonAnimation.Skeleton.SetSkin(skinName); - _skeletonAnimation.Skeleton.SetSlotsToSetupPose(); - _animationState.Apply(_skeletonAnimation.Skeleton); - } - - public void SetRandomSkin() - { - if (_skeletonAnimation == null || _skeletonAnimation.Skeleton == null) return; - - var skins = _skeletonAnimation.skeleton.Data.Skins; - var randomSkin = Random.Range((int)_randomRange.x, (int)_randomRange.y); - var randomSkinName = skins.Items[randomSkin].Name; - SetSkin(randomSkinName); - } - - public void SetRandomStringListSkin() - { - if (_skeletonAnimation == null || _skeletonAnimation.Skeleton == null) return; - - if (_randomStrings == null || _randomStrings.Count <= 0) - { - Debug.LogError("_randomStrings 설정 오류"); - return; - } - - var randomSkin = Random.Range(0, _randomStrings.Count); - var randomSkinName = _randomStrings[randomSkin]; - SetSkin(randomSkinName); - } - - public void EnableCustomMaterial() - { - if (_customMaterialEnabled) return; - - _skeletonAnimation.CustomMaterialOverride[_originalMaterial] = _replacementMaterial; - _customMaterialEnabled = true; - } - - public void DisableCustomMaterial() - { - if (!_customMaterialEnabled) return; - - _skeletonAnimation.CustomMaterialOverride.Remove(_originalMaterial); - _customMaterialEnabled = false; - } - - public bool IsAnimationComplete(int trackIndex = 0) - { - if (!_skeletonAnimation || _animationState == null) return false; - - var currentTrackEntry = _animationState.GetCurrent(trackIndex); - if (currentTrackEntry == null) - { - Debug.LogWarning($"트랙 {trackIndex}에서 재생 중인 애니메이션이 없습니다."); - return false; - } - - return currentTrackEntry.IsComplete; - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs.meta deleted file mode 100644 index 5243159ce..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 06e836de83eb924449235839869a147c \ No newline at end of file From a805d32f8a234f771ef751d56f1b7c790630a694 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 11:10:12 +0900 Subject: [PATCH 03/18] =?UTF-8?q?DDD-30=20SwitchCamera=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=EC=97=90=EC=84=9C=20id=EB=A5=BC=20=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EB=B0=9B=EC=95=84=EC=84=9C=20=EC=8A=A4=EC=9C=84=EC=B9=AD?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs index 33dd4de1a..edfd6fa79 100644 --- a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs @@ -31,12 +31,12 @@ public void UnRegisterCamera(CameraGameObject cameraGameObject) _cameraGameObjects.Remove(cameraGameObject.Id); } - public void SwitchCamera(CameraGameObject cameraGameObject, CinemachineBlendDefinition.Styles blendStyle = CinemachineBlendDefinition.Styles.Cut, float blendDuration = 1f) + public void SwitchCamera(string id, CinemachineBlendDefinition.Styles blendStyle = CinemachineBlendDefinition.Styles.Cut, float blendDuration = 1f) { _cinemachineBrain.DefaultBlend = new CinemachineBlendDefinition(blendStyle, blendDuration); foreach (var item in _cameraGameObjects) { - int newPriority = item.Value.Id == cameraGameObject.Id ? 10 : 0; + int newPriority = item.Value.Id == id ? 10 : 0; item.Value.SetPriority(newPriority); } } From ada20f3f91960c3a6dcadcc534d6aa6085dabfb0 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 13:15:15 +0900 Subject: [PATCH 04/18] =?UTF-8?q?Script=20=ED=8F=B4=EB=8D=94=20=EB=82=B4?= =?UTF-8?q?=EC=9D=98=20=EC=97=90=EC=85=8B=EB=93=A4=EC=9D=84=20ScriptAssets?= =?UTF-8?q?=20=ED=8F=B4=EB=8D=94=EB=A1=9C=20=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddressableAssetSettings.asset | 2 +- Assets/_DDD/Persistance/GameManager.prefab | 303 ------------------ .../_DDD/Persistance/GameManager.prefab.meta | 7 - Assets/_DDD/Persistance/KeyManager.prefab | 126 -------- .../{Persistance.meta => _ScriptAssets.meta} | 2 +- .../Prefabs.meta} | 2 +- .../Prefabs}/AssetManager.prefab | 0 .../Prefabs}/AssetManager.prefab.meta | 0 .../Prefabs}/BaseRestaurantCharacter.prefab | 0 .../BaseRestaurantCharacter.prefab.meta | 0 .../Prefabs}/CameraManager.prefab | 0 .../Prefabs}/CameraManager.prefab.meta | 0 .../Prefabs}/DataManager.prefab | 0 .../Prefabs}/DataManager.prefab.meta | 0 .../Prefabs}/FadeManager.prefab | 0 .../Prefabs}/FadeManager.prefab.meta | 0 .../Prefabs}/GameFlowManager.prefab | 0 .../Prefabs}/GameFlowManager.prefab.meta | 0 .../Prefabs}/GoogleSheetManager.prefab | 0 .../Prefabs}/GoogleSheetManager.prefab.meta | 0 .../Prefabs}/SceneManager.prefab | 0 .../Prefabs}/SceneManager.prefab.meta | 0 .../So.meta} | 5 +- .../So}/GameFlowAssetsSo.asset | 0 .../So}/GameFlowAssetsSo.asset.meta | 0 .../So}/GameFlowDataSo.asset | 0 .../So}/GameFlowDataSo.asset.meta | 0 .../So}/GameFlowSceneMappingSo.asset | 0 .../So}/GameFlowSceneMappingSo.asset.meta | 0 .../So}/ManagerDefinitionSo.asset | 0 .../So}/ManagerDefinitionSo.asset.meta | 0 31 files changed, 6 insertions(+), 441 deletions(-) delete mode 100644 Assets/_DDD/Persistance/GameManager.prefab delete mode 100644 Assets/_DDD/Persistance/GameManager.prefab.meta delete mode 100644 Assets/_DDD/Persistance/KeyManager.prefab rename Assets/_DDD/{Persistance.meta => _ScriptAssets.meta} (77%) rename Assets/_DDD/{_Scripts/GenerateGoogleSheet/Prefab.meta => _ScriptAssets/Prefabs.meta} (77%) rename Assets/_DDD/{_Scripts/AssetManagement => _ScriptAssets/Prefabs}/AssetManager.prefab (100%) rename Assets/_DDD/{_Scripts/AssetManagement => _ScriptAssets/Prefabs}/AssetManager.prefab.meta (100%) rename Assets/_DDD/{_Scripts/RestaurantCharacter => _ScriptAssets/Prefabs}/BaseRestaurantCharacter.prefab (100%) rename Assets/_DDD/{_Scripts/RestaurantCharacter => _ScriptAssets/Prefabs}/BaseRestaurantCharacter.prefab.meta (100%) rename Assets/_DDD/{_Scripts/CameraSystem => _ScriptAssets/Prefabs}/CameraManager.prefab (100%) rename Assets/_DDD/{_Scripts/CameraSystem => _ScriptAssets/Prefabs}/CameraManager.prefab.meta (100%) rename Assets/_DDD/{_Scripts/GameData => _ScriptAssets/Prefabs}/DataManager.prefab (100%) rename Assets/_DDD/{_Scripts/GameData => _ScriptAssets/Prefabs}/DataManager.prefab.meta (100%) rename Assets/_DDD/{_Scripts/GameFramework => _ScriptAssets/Prefabs}/FadeManager.prefab (100%) rename Assets/_DDD/{_Scripts/GameFramework => _ScriptAssets/Prefabs}/FadeManager.prefab.meta (100%) rename Assets/_DDD/{_Scripts/GameFlow => _ScriptAssets/Prefabs}/GameFlowManager.prefab (100%) rename Assets/_DDD/{_Scripts/GameFlow => _ScriptAssets/Prefabs}/GameFlowManager.prefab.meta (100%) rename Assets/_DDD/{_Scripts/GenerateGoogleSheet/Prefab => _ScriptAssets/Prefabs}/GoogleSheetManager.prefab (100%) rename Assets/_DDD/{_Scripts/GenerateGoogleSheet/Prefab => _ScriptAssets/Prefabs}/GoogleSheetManager.prefab.meta (100%) rename Assets/_DDD/{_Scripts/GameFramework => _ScriptAssets/Prefabs}/SceneManager.prefab (100%) rename Assets/_DDD/{_Scripts/GameFramework => _ScriptAssets/Prefabs}/SceneManager.prefab.meta (100%) rename Assets/_DDD/{Persistance/KeyManager.prefab.meta => _ScriptAssets/So.meta} (57%) rename Assets/_DDD/{_Scripts/GameFlow => _ScriptAssets/So}/GameFlowAssetsSo.asset (100%) rename Assets/_DDD/{_Scripts/GameFlow => _ScriptAssets/So}/GameFlowAssetsSo.asset.meta (100%) rename Assets/_DDD/{_Scripts/GameFlow => _ScriptAssets/So}/GameFlowDataSo.asset (100%) rename Assets/_DDD/{_Scripts/GameFlow => _ScriptAssets/So}/GameFlowDataSo.asset.meta (100%) rename Assets/_DDD/{_Scripts/GameFlow => _ScriptAssets/So}/GameFlowSceneMappingSo.asset (100%) rename Assets/_DDD/{_Scripts/GameFlow => _ScriptAssets/So}/GameFlowSceneMappingSo.asset.meta (100%) rename Assets/_DDD/{_Scripts/GameFramework => _ScriptAssets/So}/ManagerDefinitionSo.asset (100%) rename Assets/_DDD/{_Scripts/GameFramework => _ScriptAssets/So}/ManagerDefinitionSo.asset.meta (100%) diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 9b219c592..6eb783174 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 30e7f67fe9aaa7849a34c9b6e2bc53ae m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: afbba7cb45d674ec742903c98749be0a m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 1 m_CatalogRequestsTimeout: 0 diff --git a/Assets/_DDD/Persistance/GameManager.prefab b/Assets/_DDD/Persistance/GameManager.prefab deleted file mode 100644 index 308b0ca2a..000000000 --- a/Assets/_DDD/Persistance/GameManager.prefab +++ /dev/null @@ -1,303 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2921199875016320617 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3451175439771237481} - - component: {fileID: 8687549037951258247} - m_Layer: 5 - m_Name: FadePanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3451175439771237481 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2921199875016320617} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 6086450555564322231} - m_Father: {fileID: 8622113597181477381} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!225 &8687549037951258247 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2921199875016320617} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &3914215459674519121 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7699237936705830620} - - component: {fileID: 6109912877153005269} - m_Layer: 0 - m_Name: GameManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7699237936705830620 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3914215459674519121} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8622113597181477381} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6109912877153005269 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3914215459674519121} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 965655bbd1b2f224196ab3275ea13a57, type: 3} - m_Name: - m_EditorClassIdentifier: - _persistent: 1 - _fadeTime: 0.5 ---- !u!1 &4680256555074178633 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6086450555564322231} - - component: {fileID: 3974492216776796855} - - component: {fileID: 7549479812998329630} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6086450555564322231 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4680256555074178633} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3451175439771237481} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3974492216776796855 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4680256555074178633} - m_CullTransparentMesh: 1 ---- !u!114 &7549479812998329630 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4680256555074178633} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8696658071650620580 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8622113597181477381} - - component: {fileID: 53800116813670316} - - component: {fileID: 2006311345412223388} - - component: {fileID: 1580902596820736860} - - component: {fileID: 1026983698027542846} - - component: {fileID: 8727490508754097892} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8622113597181477381 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8696658071650620580} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3451175439771237481} - m_Father: {fileID: 7699237936705830620} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!223 &53800116813670316 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8696658071650620580} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 6 - m_TargetDisplay: 0 ---- !u!114 &2006311345412223388 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8696658071650620580} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 1 - m_MatchWidthOrHeight: 0.5 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &1580902596820736860 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8696658071650620580} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 55 ---- !u!114 &1026983698027542846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8696658071650620580} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: {x: 0, y: 0, z: 0, w: 0} - m_Softness: {x: 0, y: 0} ---- !u!225 &8727490508754097892 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8696658071650620580} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 diff --git a/Assets/_DDD/Persistance/GameManager.prefab.meta b/Assets/_DDD/Persistance/GameManager.prefab.meta deleted file mode 100644 index be0d5bd8f..000000000 --- a/Assets/_DDD/Persistance/GameManager.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9f16b0b665c13444aaced76f8dfe3136 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/Persistance/KeyManager.prefab b/Assets/_DDD/Persistance/KeyManager.prefab deleted file mode 100644 index 88331f2ea..000000000 --- a/Assets/_DDD/Persistance/KeyManager.prefab +++ /dev/null @@ -1,126 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &6312950592041400320 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 303053621953959099} - - component: {fileID: 7747801985118598547} - - component: {fileID: 4059976348031579783} - - component: {fileID: 1363992146627826562} - - component: {fileID: 8614123039900307451} - m_Layer: 0 - m_Name: KeyManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &303053621953959099 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6312950592041400320} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7747801985118598547 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6312950592041400320} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f3a9c6e7027b3d944ae69e5e7ccc7627, type: 3} - m_Name: - m_EditorClassIdentifier: - _persistent: 1 ---- !u!114 &4059976348031579783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6312950592041400320} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_NotificationBehavior: 0 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: [] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: Ui - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &1363992146627826562 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6312950592041400320} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!114 &8614123039900307451 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6312950592041400320} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_MoveRepeatDelay: 0.5 - m_MoveRepeatRate: 0.1 - m_XRTrackingOrigin: {fileID: 0} - m_ActionsAsset: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_MoveAction: {fileID: -8784545083839296357, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: 052faaac586de48259a63d0c4782560b, type: 3} - m_DeselectOnBackgroundClick: 1 - m_PointerBehavior: 0 - m_CursorLockBehavior: 0 - m_ScrollDeltaPerTick: 6 diff --git a/Assets/_DDD/Persistance.meta b/Assets/_DDD/_ScriptAssets.meta similarity index 77% rename from Assets/_DDD/Persistance.meta rename to Assets/_DDD/_ScriptAssets.meta index 8096ff9cd..298275c47 100644 --- a/Assets/_DDD/Persistance.meta +++ b/Assets/_DDD/_ScriptAssets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3c3d746a157af64695657762823e7cb +guid: 5632ce48fcc5f7e4394454e0e526865e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs.meta similarity index 77% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab.meta rename to Assets/_DDD/_ScriptAssets/Prefabs.meta index 55278c40a..ea43d1f25 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab.meta +++ b/Assets/_DDD/_ScriptAssets/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3f6eaeb89086ab49a743c6cb3f4ddd2 +guid: 3868c7217ab0c5042a1cc0cde0f21295 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Scripts/AssetManagement/AssetManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/AssetManager.prefab similarity index 100% rename from Assets/_DDD/_Scripts/AssetManagement/AssetManager.prefab rename to Assets/_DDD/_ScriptAssets/Prefabs/AssetManager.prefab diff --git a/Assets/_DDD/_Scripts/AssetManagement/AssetManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/AssetManager.prefab.meta similarity index 100% rename from Assets/_DDD/_Scripts/AssetManagement/AssetManager.prefab.meta rename to Assets/_DDD/_ScriptAssets/Prefabs/AssetManager.prefab.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab rename to Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab.meta rename to Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab.meta diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/CameraManager.prefab similarity index 100% rename from Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab rename to Assets/_DDD/_ScriptAssets/Prefabs/CameraManager.prefab diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/CameraManager.prefab.meta similarity index 100% rename from Assets/_DDD/_Scripts/CameraSystem/CameraManager.prefab.meta rename to Assets/_DDD/_ScriptAssets/Prefabs/CameraManager.prefab.meta diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/DataManager.prefab similarity index 100% rename from Assets/_DDD/_Scripts/GameData/DataManager.prefab rename to Assets/_DDD/_ScriptAssets/Prefabs/DataManager.prefab diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/DataManager.prefab.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameData/DataManager.prefab.meta rename to Assets/_DDD/_ScriptAssets/Prefabs/DataManager.prefab.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab rename to Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/FadeManager.prefab.meta rename to Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab.meta diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/GameFlowManager.prefab similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowManager.prefab rename to Assets/_DDD/_ScriptAssets/Prefabs/GameFlowManager.prefab diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/GameFlowManager.prefab.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowManager.prefab.meta rename to Assets/_DDD/_ScriptAssets/Prefabs/GameFlowManager.prefab.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab/GoogleSheetManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/GoogleSheetManager.prefab similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab/GoogleSheetManager.prefab rename to Assets/_DDD/_ScriptAssets/Prefabs/GoogleSheetManager.prefab diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab/GoogleSheetManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/GoogleSheetManager.prefab.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/Prefab/GoogleSheetManager.prefab.meta rename to Assets/_DDD/_ScriptAssets/Prefabs/GoogleSheetManager.prefab.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/SceneManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/SceneManager.prefab similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/SceneManager.prefab rename to Assets/_DDD/_ScriptAssets/Prefabs/SceneManager.prefab diff --git a/Assets/_DDD/_Scripts/GameFramework/SceneManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/SceneManager.prefab.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/SceneManager.prefab.meta rename to Assets/_DDD/_ScriptAssets/Prefabs/SceneManager.prefab.meta diff --git a/Assets/_DDD/Persistance/KeyManager.prefab.meta b/Assets/_DDD/_ScriptAssets/So.meta similarity index 57% rename from Assets/_DDD/Persistance/KeyManager.prefab.meta rename to Assets/_DDD/_ScriptAssets/So.meta index 6ffe2fa6f..804c29666 100644 --- a/Assets/_DDD/Persistance/KeyManager.prefab.meta +++ b/Assets/_DDD/_ScriptAssets/So.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: f17834b768fb4724380bafc46049b63c -PrefabImporter: +guid: b8acef4129b47dd41996237bc1a00772 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset b/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset rename to Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset.meta b/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset.meta rename to Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset.meta diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowDataSo.asset b/Assets/_DDD/_ScriptAssets/So/GameFlowDataSo.asset similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowDataSo.asset rename to Assets/_DDD/_ScriptAssets/So/GameFlowDataSo.asset diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowDataSo.asset.meta b/Assets/_DDD/_ScriptAssets/So/GameFlowDataSo.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowDataSo.asset.meta rename to Assets/_DDD/_ScriptAssets/So/GameFlowDataSo.asset.meta diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset b/Assets/_DDD/_ScriptAssets/So/GameFlowSceneMappingSo.asset similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset rename to Assets/_DDD/_ScriptAssets/So/GameFlowSceneMappingSo.asset diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset.meta b/Assets/_DDD/_ScriptAssets/So/GameFlowSceneMappingSo.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset.meta rename to Assets/_DDD/_ScriptAssets/So/GameFlowSceneMappingSo.asset.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset b/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset rename to Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset diff --git a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset.meta b/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset.meta rename to Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset.meta From 6f7a5e131cb07f163aaa733188ee498279869389 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 13:32:36 +0900 Subject: [PATCH 05/18] =?UTF-8?q?=EC=B9=B4=EB=A9=94=EB=9D=BC=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD=20string=20?= =?UTF-8?q?->=20enum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Scripts/CameraSystem/CameraGameObject.cs | 2 +- .../_Scripts/CameraSystem/CameraManager.cs | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs index 44484f659..7527a6413 100644 --- a/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs @@ -6,7 +6,7 @@ namespace DDD public class CameraGameObject : MonoBehaviour { [field: SerializeField] - public string Id { get; private set; } + public CameraType CameraType { get; private set; } private CinemachineCamera _cinemachineCamera; diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs index edfd6fa79..6c0a42cc6 100644 --- a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs @@ -4,10 +4,16 @@ namespace DDD { + public enum CameraType + { + None = 0, + RestaurantBaseCamera = 1 + } + public class CameraManager : Singleton, IManager { [ShowInInspector, ReadOnly] - private Dictionary _cameraGameObjects = new(); + private Dictionary _cameraGameObjects = new(); private CinemachineBrain _cinemachineBrain; @@ -23,24 +29,24 @@ public void PostInit() public void RegisterCamera(CameraGameObject cameraGameObject) { - _cameraGameObjects.TryAdd(cameraGameObject.Id, cameraGameObject); + _cameraGameObjects.TryAdd(cameraGameObject.CameraType, cameraGameObject); } public void UnRegisterCamera(CameraGameObject cameraGameObject) { - _cameraGameObjects.Remove(cameraGameObject.Id); + _cameraGameObjects.Remove(cameraGameObject.CameraType); } - public void SwitchCamera(string id, CinemachineBlendDefinition.Styles blendStyle = CinemachineBlendDefinition.Styles.Cut, float blendDuration = 1f) + public void SwitchCamera(CameraType cameraType, CinemachineBlendDefinition.Styles blendStyle = CinemachineBlendDefinition.Styles.Cut, float blendDuration = 1f) { _cinemachineBrain.DefaultBlend = new CinemachineBlendDefinition(blendStyle, blendDuration); foreach (var item in _cameraGameObjects) { - int newPriority = item.Value.Id == id ? 10 : 0; + int newPriority = item.Value.CameraType == cameraType ? 10 : 0; item.Value.SetPriority(newPriority); } } - public CameraGameObject GetCameraGameObject(string id) => _cameraGameObjects[id]; + public CameraGameObject GetCameraGameObject(CameraType cameraType) => _cameraGameObjects[cameraType]; } } \ No newline at end of file From 8a2abb5a401a5785b7e61db73b3c313a8eba4794 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 13:35:18 +0900 Subject: [PATCH 06/18] =?UTF-8?q?=EC=95=88=EC=93=B0=EB=8A=94=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8,=20=ED=8F=B4=EB=8D=94=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/Controllers.meta | 8 -------- .../_DDD/_Scripts/Controllers/TitleSystem.cs | 19 ------------------- .../_Scripts/Controllers/TitleSystem.cs.meta | 2 -- 3 files changed, 29 deletions(-) delete mode 100644 Assets/_DDD/_Scripts/Controllers.meta delete mode 100644 Assets/_DDD/_Scripts/Controllers/TitleSystem.cs delete mode 100644 Assets/_DDD/_Scripts/Controllers/TitleSystem.cs.meta diff --git a/Assets/_DDD/_Scripts/Controllers.meta b/Assets/_DDD/_Scripts/Controllers.meta deleted file mode 100644 index f720c5fb9..000000000 --- a/Assets/_DDD/_Scripts/Controllers.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bfa59972eae73774abfbd334a141be1c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/Controllers/TitleSystem.cs b/Assets/_DDD/_Scripts/Controllers/TitleSystem.cs deleted file mode 100644 index d463d86c4..000000000 --- a/Assets/_DDD/_Scripts/Controllers/TitleSystem.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UnityEngine; - -namespace DDD -{ - public class TitleSystem : MonoBehaviour - { - private GameObject _titlePanel; - - private void Awake() - { - _titlePanel = GameObject.Find("Uis/TitleCanvas/TitlePanel").gameObject; - } - - private void Start() - { - _titlePanel.SetActive(true); - } - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Controllers/TitleSystem.cs.meta b/Assets/_DDD/_Scripts/Controllers/TitleSystem.cs.meta deleted file mode 100644 index 9fc96a14c..000000000 --- a/Assets/_DDD/_Scripts/Controllers/TitleSystem.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: c837bbd9eecddc04f9c625fa14062a34 \ No newline at end of file From 5065d1a7388068c89c83319a5335f259a7e98fd6 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 13:39:09 +0900 Subject: [PATCH 07/18] =?UTF-8?q?Utilities.Constants=20=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EC=83=81=EC=88=98=EB=93=A4=EC=9D=84=20=EB=94=B0=EB=A1=9C=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=ED=95=98=EB=8A=94=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/GameData/DataManager.cs | 2 +- .../CreateRestaurantPlayer.cs | 6 +++--- .../RestaurantPlayerMovement.cs | 8 +++---- Assets/_DDD/_Scripts/Utilities/Constants.cs | 21 +++++++++++++++++++ .../_DDD/_Scripts/Utilities/Constants.cs.meta | 2 ++ 5 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 Assets/_DDD/_Scripts/Utilities/Constants.cs create mode 100644 Assets/_DDD/_Scripts/Utilities/Constants.cs.meta diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.cs b/Assets/_DDD/_Scripts/GameData/DataManager.cs index f91d28bb3..56bf9541f 100644 --- a/Assets/_DDD/_Scripts/GameData/DataManager.cs +++ b/Assets/_DDD/_Scripts/GameData/DataManager.cs @@ -17,7 +17,7 @@ public async void PostInit() { try { - ItemDataSo = await AssetManager.LoadAsset("ItemDataSo"); + ItemDataSo = await AssetManager.LoadAsset(DataConstants.ItemDataSo); } catch (Exception e) { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs index d1f62385d..e1ee7e7bc 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs @@ -12,10 +12,10 @@ private async void Start() { try { - var playerPrefab = await AssetManager.LoadAsset("RestaurantPlayer"); + var playerPrefab = await AssetManager.LoadAsset(CommonConstants.RestaurantPlayer); var player = Instantiate(playerPrefab, _spawnPosition, playerPrefab.transform.rotation); - player.name = "RestaurantPlayer"; - CameraManager.Instance.GetCameraGameObject("RestaurantBaseCamera").SetFollowAndLookAtTarget(player.transform); + player.name = CommonConstants.RestaurantPlayer; + CameraManager.Instance.GetCameraGameObject(CameraType.RestaurantBaseCamera).SetFollowAndLookAtTarget(player.transform); } catch (Exception e) { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs index d51695151..65b5f341f 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs @@ -24,14 +24,14 @@ private void Awake() { _rigidbody = GetComponent(); _animation = GetComponent(); - _visualLook = transform.Find("VisualLook"); + _visualLook = transform.Find(CommonConstants.VisualLook); } private async void Start() { try { - _playerData = await AssetManager.LoadAsset("RestaurantPlayerDataSo"); + _playerData = await AssetManager.LoadAsset(DataConstants.RestaurantPlayerDataSo); _playerData.MoveActionReference.action.performed += OnMove; _playerData.MoveActionReference.action.canceled += OnMove; @@ -107,7 +107,7 @@ private void Move() SetCurrentDirection(_inputDirection); _isMoving = _inputDirection != Vector3.zero; - string animationName = _isMoving ? "RunFast" : "Idle"; + string animationName = _isMoving ? RestaurantPlayerAnimation.Walk : RestaurantPlayerAnimation.Idle; _animation.PlayAnimation(animationName, true); Vector3 finalVelocity = _inputDirection * _playerData.MoveSpeed; @@ -134,7 +134,7 @@ private IEnumerator DashCoroutine() _isDashing = true; _isDashCooldown = true; - _animation.PlayAnimationDuration("Dash", false, _playerData.DashTime); + _animation.PlayAnimationDuration(RestaurantPlayerAnimation.Dash, false, _playerData.DashTime); Vector3 dashVelocity = _currentDirection.normalized * _playerData.DashSpeed; _rigidbody.linearVelocity = dashVelocity; diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs b/Assets/_DDD/_Scripts/Utilities/Constants.cs new file mode 100644 index 000000000..4a8cbeaae --- /dev/null +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs @@ -0,0 +1,21 @@ +namespace DDD +{ + public static class CommonConstants + { + public const string VisualLook = "VisualLook"; + public const string RestaurantPlayer = "RestaurantPlayer"; + } + + public static class DataConstants + { + public const string ItemDataSo = "ItemDataSo"; + public const string RestaurantPlayerDataSo = "RestaurantPlayerDataSo"; + } + + public static class RestaurantPlayerAnimation + { + public const string Idle = "Idle"; + public const string Walk = "RunFast"; + public const string Dash = "Dash"; + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs.meta b/Assets/_DDD/_Scripts/Utilities/Constants.cs.meta new file mode 100644 index 000000000..26446f490 --- /dev/null +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6e8cf38ab843c9e40a94a26ba7102dc4 \ No newline at end of file From bfb7ccbe4b53e8b7d24351ee5dce49a0316a52b6 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 14:07:15 +0900 Subject: [PATCH 08/18] =?UTF-8?q?SpineController=20=EC=B6=94=EA=B0=80,=20?= =?UTF-8?q?=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=EB=A1=9C=20=EA=B4=80=EB=A6=AC=20FlipVisualLo?= =?UTF-8?q?ok=20RestaurantPlayerCharacter=EC=97=90=EC=84=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Scripts/GameCharacter/SpineController.cs | 264 ++++++++++++++++++ .../GameCharacter/SpineController.cs.meta | 2 + .../RestaurantCharacterAnimation.cs | 255 +---------------- .../RestaurantPlayerCharacter.cs | 26 ++ .../RestaurantPlayerMovement.cs | 35 +-- 5 files changed, 308 insertions(+), 274 deletions(-) create mode 100644 Assets/_DDD/_Scripts/GameCharacter/SpineController.cs create mode 100644 Assets/_DDD/_Scripts/GameCharacter/SpineController.cs.meta diff --git a/Assets/_DDD/_Scripts/GameCharacter/SpineController.cs b/Assets/_DDD/_Scripts/GameCharacter/SpineController.cs new file mode 100644 index 000000000..ce05df758 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameCharacter/SpineController.cs @@ -0,0 +1,264 @@ +using System.Collections.Generic; +using Sirenix.OdinInspector; +using Spine; +using Spine.Unity; +using UnityEngine; +using AnimationState = Spine.AnimationState; + +namespace DDD +{ + public class SpineController : MonoBehaviour + { + // Variables + #region Variables + + private SkeletonAnimation _skeletonAnimation; + + [SerializeField, ReadOnly] + private Material _originalMaterial; + + [SerializeField] + private Material _replacementMaterial; + + private AnimationState _animationState; + + // Variables + [SerializeField] + private bool _isSkinSet = true; + + [SerializeField, ShowIf("@_isSkinSet && !_isRandomSkin")] + private string _initialSkinName = "default"; + + [SerializeField, ShowIf("@_isSkinSet")] + private bool _isRandomSkin; + + [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin")] + private bool _isRandomRange; + + [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin && _isRandomRange"), Tooltip("x <= 값 < y")] + private Vector2 _randomRange; + + [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin && !_isRandomRange")] + private List _randomStrings; + + private bool _customMaterialEnabled; + + #endregion + + // Unity events + #region Unity events + + private void Reset() + { + InitializeComponents(); + } + + private void Awake() + { + InitializeComponents(); + + if (!_isSkinSet) return; + + if (_isRandomSkin) + { + if (_isRandomRange) + { + SetRandomSkin(); + } + else + { + SetRandomStringListSkin(); + } + } + else + { + SetSkin(_initialSkinName); + } + } + + #endregion + + // Initialize methods + #region Initialize methods + + private void InitializeComponents() + { + _skeletonAnimation = transform.GetComponentInChildren(); + if (!_originalMaterial) + { + _originalMaterial = _skeletonAnimation.SkeletonDataAsset.atlasAssets[0].PrimaryMaterial; + } + + _animationState = _skeletonAnimation.AnimationState; + } + + #endregion + + // Methods + #region Methods + + /// 스파인 애니메이션 이름 + /// 반복 여부 + /// 애니메이션 속도 양수값 + /// true인 경우 자동으로 speed에 음수값(-1)을 넣음 + /// + /// + public TrackEntry PlayAnimation(string animationName, bool isLoopActive, float speed = 1f, bool isReverse = false, int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return null; + + if (string.IsNullOrEmpty(animationName)) + { + Debug.LogError($"{animationName}의 애니메이션은 존재하지 않습니다."); + return null; + } + + // 중복 체크 + var currentTrackEntry = _animationState.GetCurrent(trackIndex); + if (currentTrackEntry != null && currentTrackEntry.Animation.Name == animationName) + { + return currentTrackEntry; + } + + _animationState.TimeScale = isReverse ? -Mathf.Abs(speed) : Mathf.Abs(speed); + var trackEntry = _animationState.SetAnimation(trackIndex, animationName, isLoopActive); + + if (isReverse) + { + trackEntry.TrackTime = trackEntry.AnimationEnd; + } + + return trackEntry; + } + + public TrackEntry PlayAnimationDuration(string animationName, bool isLoopActive, float duration, bool isReverse = false, int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return null; + + if (string.IsNullOrEmpty(animationName)) + { + Debug.LogError($"{animationName}의 애니메이션은 존재하지 않습니다."); + return null; + } + + // 중복 체크 + var currentTrackEntry = _animationState.GetCurrent(trackIndex); + if (currentTrackEntry != null && currentTrackEntry.Animation.Name == animationName) + { + return currentTrackEntry; + } + + var findAnimation = _skeletonAnimation.Skeleton.Data.FindAnimation(animationName); + if (findAnimation == null) + { + Debug.LogError($"{animationName} 애니메이션을 찾을 수 없습니다."); + return null; + } + + var speed = findAnimation.Duration / duration; + _animationState.TimeScale = isReverse ? -Mathf.Abs(speed) : Mathf.Abs(speed); + var trackEntry = _animationState.SetAnimation(trackIndex, animationName, isLoopActive); + + if (isReverse) + { + trackEntry.TrackTime = trackEntry.AnimationEnd; + } + + return trackEntry; + } + + public TrackEntry AddAnimation(string animationName, bool isLoopActive, int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return null; + + if (string.IsNullOrEmpty(animationName)) + { + Debug.LogError($"{animationName} 애니메이션은 존재하지 않습니다."); + return null; + } + + var trackEntry = _animationState.AddAnimation(trackIndex, animationName, isLoopActive, 0); + + return trackEntry; + } + + public string GetCurrentSkin() + { + if (_skeletonAnimation == null) return null; + + return _skeletonAnimation.Skeleton.Skin.ToString(); + } + + public void SetSkin(string skinName) + { + if (_skeletonAnimation == null && _animationState == null) return; + + if (string.IsNullOrEmpty(skinName)) + { + Debug.LogError($"{skinName}의 스킨 이름은 존재하지 않습니다."); + return; + } + + _skeletonAnimation.Skeleton.SetSkin(skinName); + _skeletonAnimation.Skeleton.SetSlotsToSetupPose(); + _animationState.Apply(_skeletonAnimation.Skeleton); + } + + public void SetRandomSkin() + { + if (_skeletonAnimation == null || _skeletonAnimation.Skeleton == null) return; + + var skins = _skeletonAnimation.skeleton.Data.Skins; + var randomSkin = Random.Range((int)_randomRange.x, (int)_randomRange.y); + var randomSkinName = skins.Items[randomSkin].Name; + SetSkin(randomSkinName); + } + + public void SetRandomStringListSkin() + { + if (_skeletonAnimation == null || _skeletonAnimation.Skeleton == null) return; + + if (_randomStrings == null || _randomStrings.Count <= 0) + { + Debug.LogError("_randomStrings 설정 오류"); + return; + } + + var randomSkin = Random.Range(0, _randomStrings.Count); + var randomSkinName = _randomStrings[randomSkin]; + SetSkin(randomSkinName); + } + + public void EnableCustomMaterial() + { + if (_customMaterialEnabled) return; + + _skeletonAnimation.CustomMaterialOverride[_originalMaterial] = _replacementMaterial; + _customMaterialEnabled = true; + } + + public void DisableCustomMaterial() + { + if (!_customMaterialEnabled) return; + + _skeletonAnimation.CustomMaterialOverride.Remove(_originalMaterial); + _customMaterialEnabled = false; + } + + public bool IsAnimationComplete(int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return false; + + var currentTrackEntry = _animationState.GetCurrent(trackIndex); + if (currentTrackEntry == null) + { + Debug.LogWarning($"트랙 {trackIndex}에서 재생 중인 애니메이션이 없습니다."); + return false; + } + + return currentTrackEntry.IsComplete; + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameCharacter/SpineController.cs.meta b/Assets/_DDD/_Scripts/GameCharacter/SpineController.cs.meta new file mode 100644 index 000000000..fdf9d11ff --- /dev/null +++ b/Assets/_DDD/_Scripts/GameCharacter/SpineController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6d7e5480ae1ebf54b8537ad2a08696d2 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs index b32361fa0..f8f27f851 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs @@ -1,264 +1,27 @@ -using System.Collections.Generic; -using Sirenix.OdinInspector; -using Spine; -using Spine.Unity; using UnityEngine; -using AnimationState = Spine.AnimationState; namespace DDD { public class RestaurantCharacterAnimation : MonoBehaviour { - // Variables - #region Variables - - private SkeletonAnimation _skeletonAnimation; - - [SerializeField, ReadOnly] - private Material _originalMaterial; - - [SerializeField] - private Material _replacementMaterial; - - private AnimationState _animationState; - - // Variables - [SerializeField] - private bool _isSkinSet = true; - - [SerializeField, ShowIf("@_isSkinSet && !_isRandomSkin")] - private string _initialSkinName = "default"; - - [SerializeField, ShowIf("@_isSkinSet")] - private bool _isRandomSkin; - - [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin")] - private bool _isRandomRange; - - [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin && _isRandomRange"), Tooltip("x <= 값 < y")] - private Vector2 _randomRange; - - [SerializeField, ShowIf("@_isSkinSet && _isRandomSkin && !_isRandomRange")] - private List _randomStrings; - - private bool _customMaterialEnabled; - - #endregion - - // Unity events - #region Unity events - - private void Reset() - { - InitializeComponents(); - } + private RestaurantPlayerMovement _restaurantPlayerMovement; + private SpineController _spineController; private void Awake() { - InitializeComponents(); - - if (!_isSkinSet) return; - - if (_isRandomSkin) - { - if (_isRandomRange) - { - SetRandomSkin(); - } - else - { - SetRandomStringListSkin(); - } - } - else - { - SetSkin(_initialSkinName); - } + _restaurantPlayerMovement = GetComponent(); + _spineController = GetComponent(); } - #endregion - - // Initialize methods - #region Initialize methods - - private void InitializeComponents() + private void OnMove(bool isMoving) { - _skeletonAnimation = transform.GetComponentInChildren(); - if (!_originalMaterial) - { - _originalMaterial = _skeletonAnimation.SkeletonDataAsset.atlasAssets[0].PrimaryMaterial; - } - - _animationState = _skeletonAnimation.AnimationState; + string animationName = isMoving ? RestaurantPlayerAnimation.Walk : RestaurantPlayerAnimation.Idle; + _spineController.PlayAnimation(animationName, true); } - - #endregion - // Methods - #region Methods - - /// 스파인 애니메이션 이름 - /// 반복 여부 - /// 애니메이션 속도 양수값 - /// true인 경우 자동으로 speed에 음수값(-1)을 넣음 - /// - /// - public TrackEntry PlayAnimation(string animationName, bool isLoopActive, float speed = 1f, bool isReverse = false, int trackIndex = 0) + private void OnDash(float dashTime) { - if (!_skeletonAnimation || _animationState == null) return null; - - if (string.IsNullOrEmpty(animationName)) - { - Debug.LogError($"{animationName}의 애니메이션은 존재하지 않습니다."); - return null; - } - - // 중복 체크 - var currentTrackEntry = _animationState.GetCurrent(trackIndex); - if (currentTrackEntry != null && currentTrackEntry.Animation.Name == animationName) - { - return currentTrackEntry; - } - - _animationState.TimeScale = isReverse ? -Mathf.Abs(speed) : Mathf.Abs(speed); - var trackEntry = _animationState.SetAnimation(trackIndex, animationName, isLoopActive); - - if (isReverse) - { - trackEntry.TrackTime = trackEntry.AnimationEnd; - } - - return trackEntry; + _spineController.PlayAnimationDuration(RestaurantPlayerAnimation.Dash, false, duration:dashTime); } - - public TrackEntry PlayAnimationDuration(string animationName, bool isLoopActive, float duration, bool isReverse = false, int trackIndex = 0) - { - if (!_skeletonAnimation || _animationState == null) return null; - - if (string.IsNullOrEmpty(animationName)) - { - Debug.LogError($"{animationName}의 애니메이션은 존재하지 않습니다."); - return null; - } - - // 중복 체크 - var currentTrackEntry = _animationState.GetCurrent(trackIndex); - if (currentTrackEntry != null && currentTrackEntry.Animation.Name == animationName) - { - return currentTrackEntry; - } - - var findAnimation = _skeletonAnimation.Skeleton.Data.FindAnimation(animationName); - if (findAnimation == null) - { - Debug.LogError($"{animationName} 애니메이션을 찾을 수 없습니다."); - return null; - } - - var speed = findAnimation.Duration / duration; - _animationState.TimeScale = isReverse ? -Mathf.Abs(speed) : Mathf.Abs(speed); - var trackEntry = _animationState.SetAnimation(trackIndex, animationName, isLoopActive); - - if (isReverse) - { - trackEntry.TrackTime = trackEntry.AnimationEnd; - } - - return trackEntry; - } - - public TrackEntry AddAnimation(string animationName, bool isLoopActive, int trackIndex = 0) - { - if (!_skeletonAnimation || _animationState == null) return null; - - if (string.IsNullOrEmpty(animationName)) - { - Debug.LogError($"{animationName} 애니메이션은 존재하지 않습니다."); - return null; - } - - var trackEntry = _animationState.AddAnimation(trackIndex, animationName, isLoopActive, 0); - - return trackEntry; - } - - public string GetCurrentSkin() - { - if (_skeletonAnimation == null) return null; - - return _skeletonAnimation.Skeleton.Skin.ToString(); - } - - public void SetSkin(string skinName) - { - if (_skeletonAnimation == null && _animationState == null) return; - - if (string.IsNullOrEmpty(skinName)) - { - Debug.LogError($"{skinName}의 스킨 이름은 존재하지 않습니다."); - return; - } - - _skeletonAnimation.Skeleton.SetSkin(skinName); - _skeletonAnimation.Skeleton.SetSlotsToSetupPose(); - _animationState.Apply(_skeletonAnimation.Skeleton); - } - - public void SetRandomSkin() - { - if (_skeletonAnimation == null || _skeletonAnimation.Skeleton == null) return; - - var skins = _skeletonAnimation.skeleton.Data.Skins; - var randomSkin = Random.Range((int)_randomRange.x, (int)_randomRange.y); - var randomSkinName = skins.Items[randomSkin].Name; - SetSkin(randomSkinName); - } - - public void SetRandomStringListSkin() - { - if (_skeletonAnimation == null || _skeletonAnimation.Skeleton == null) return; - - if (_randomStrings == null || _randomStrings.Count <= 0) - { - Debug.LogError("_randomStrings 설정 오류"); - return; - } - - var randomSkin = Random.Range(0, _randomStrings.Count); - var randomSkinName = _randomStrings[randomSkin]; - SetSkin(randomSkinName); - } - - public void EnableCustomMaterial() - { - if (_customMaterialEnabled) return; - - _skeletonAnimation.CustomMaterialOverride[_originalMaterial] = _replacementMaterial; - _customMaterialEnabled = true; - } - - public void DisableCustomMaterial() - { - if (!_customMaterialEnabled) return; - - _skeletonAnimation.CustomMaterialOverride.Remove(_originalMaterial); - _customMaterialEnabled = false; - } - - public bool IsAnimationComplete(int trackIndex = 0) - { - if (!_skeletonAnimation || _animationState == null) return false; - - var currentTrackEntry = _animationState.GetCurrent(trackIndex); - if (currentTrackEntry == null) - { - Debug.LogWarning($"트랙 {trackIndex}에서 재생 중인 애니메이션이 없습니다."); - return false; - } - - return currentTrackEntry.IsComplete; - } - - #endregion } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs index 851c03542..d5da1909a 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs @@ -4,6 +4,32 @@ namespace DDD { public class RestaurantPlayerCharacter : RestaurantCharacter { + private RestaurantPlayerMovement _movement; + private Transform _visualLook; + + private void Awake() + { + _movement = GetComponent(); + + _visualLook = transform.Find(CommonConstants.VisualLook); + } + + private void Update() + { + FlipVisualLook(); + } + + private void FlipVisualLook() + { + Vector3 localScale = _visualLook.localScale; + localScale.x = _movement.GetCurrentDirection().x switch + { + > 0.01f => -Mathf.Abs(localScale.x), + < -0.01f => Mathf.Abs(localScale.x), + _ => localScale.x + }; + _visualLook.localScale = localScale; + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs index 65b5f341f..1b93152e0 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs @@ -8,8 +8,6 @@ namespace DDD public class RestaurantPlayerMovement : RestaurantCharacterMovement { private Rigidbody _rigidbody; - private RestaurantCharacterAnimation _animation; - private Transform _visualLook; private RestaurantPlayerDataSo _playerData; @@ -20,11 +18,12 @@ public class RestaurantPlayerMovement : RestaurantCharacterMovement private bool _isDashCooldown; private bool _isInitialized; + public Action OnMoving; + public Action OnDashing; + private void Awake() { _rigidbody = GetComponent(); - _animation = GetComponent(); - _visualLook = transform.Find(CommonConstants.VisualLook); } private async void Start() @@ -45,13 +44,6 @@ private async void Start() } } - private void Update() - { - if (_isInitialized == false) return; - - FlipVisualLook(); - } - private void FixedUpdate() { if (_isInitialized == false) return; @@ -78,18 +70,6 @@ public void SetCurrentDirection(Vector3 normalDirection) _currentDirection = normalDirection; } - - private void FlipVisualLook() - { - Vector3 localScale = _visualLook.localScale; - localScale.x = _currentDirection.x switch - { - > 0.01f => -Mathf.Abs(localScale.x), - < -0.01f => Mathf.Abs(localScale.x), - _ => localScale.x - }; - _visualLook.localScale = localScale; - } private void OnMove(InputAction.CallbackContext context) { @@ -107,8 +87,7 @@ private void Move() SetCurrentDirection(_inputDirection); _isMoving = _inputDirection != Vector3.zero; - string animationName = _isMoving ? RestaurantPlayerAnimation.Walk : RestaurantPlayerAnimation.Idle; - _animation.PlayAnimation(animationName, true); + OnMoving?.Invoke(_isMoving); Vector3 finalVelocity = _inputDirection * _playerData.MoveSpeed; _rigidbody.linearVelocity = finalVelocity; @@ -129,12 +108,10 @@ private bool CanDash() private IEnumerator DashCoroutine() { - // TODO : ui생기면 연동 - _isDashing = true; _isDashCooldown = true; - _animation.PlayAnimationDuration(RestaurantPlayerAnimation.Dash, false, _playerData.DashTime); + OnDashing?.Invoke(_playerData.DashTime); Vector3 dashVelocity = _currentDirection.normalized * _playerData.DashSpeed; _rigidbody.linearVelocity = dashVelocity; @@ -146,5 +123,7 @@ private IEnumerator DashCoroutine() yield return new WaitForSeconds(_playerData.DashCooldown); _isDashCooldown = false; } + + public Vector3 GetCurrentDirection() => _currentDirection; } } \ No newline at end of file From 510d2a1466b5be663be1441cc77b2ea3b55718f3 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 14:09:47 +0900 Subject: [PATCH 09/18] =?UTF-8?q?=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EC=94=AC=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20=EB=B9=8C=EB=93=9C?= =?UTF-8?q?=20=EC=94=AC=20=EA=B4=80=EB=A0=A8=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scenes.meta | 8 - Assets/_DDD/_Scenes/00.Title.unity | 1356 --------------------- Assets/_DDD/_Scenes/00.Title.unity.meta | 7 - ProjectSettings/EditorBuildSettings.asset | 7 +- 4 files changed, 5 insertions(+), 1373 deletions(-) delete mode 100644 Assets/_DDD/_Scenes.meta delete mode 100644 Assets/_DDD/_Scenes/00.Title.unity delete mode 100644 Assets/_DDD/_Scenes/00.Title.unity.meta diff --git a/Assets/_DDD/_Scenes.meta b/Assets/_DDD/_Scenes.meta deleted file mode 100644 index e59fb4597..000000000 --- a/Assets/_DDD/_Scenes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9c53962885c2c4f449125a979d6ad240 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Scenes/00.Title.unity b/Assets/_DDD/_Scenes/00.Title.unity deleted file mode 100644 index 6a7970bcb..000000000 --- a/Assets/_DDD/_Scenes/00.Title.unity +++ /dev/null @@ -1,1356 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 10 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 13 - m_BakeOnSceneLoad: 0 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &1061965 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1061969} - - component: {fileID: 1061968} - - component: {fileID: 1061967} - - component: {fileID: 1061966} - - component: {fileID: 1061971} - - component: {fileID: 1061970} - m_Layer: 5 - m_Name: TitleCanvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1061966 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 55 ---- !u!114 &1061967 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 1 - m_MatchWidthOrHeight: 0.5 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1061968 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061965} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 5 - m_TargetDisplay: 0 ---- !u!224 &1061969 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061965} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1773158346} - m_Father: {fileID: 169147215} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!225 &1061970 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061965} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &1061971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: {x: 0, y: 0, z: 0, w: 0} - m_Softness: {x: 0, y: 0} ---- !u!1 &169147214 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 169147215} - m_Layer: 0 - m_Name: Uis - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &169147215 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 169147214} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1061969} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &410087039 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 410087041} - - component: {fileID: 410087040} - - component: {fileID: 410087042} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &410087040 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 2 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 5000 - m_UseColorTemperature: 1 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ForceVisible: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_LightUnit: 1 - m_LuxAtDistance: 1 - m_EnableSpotReflector: 1 ---- !u!4 &410087041 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1849177619} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &410087042 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 1 ---- !u!1 &832575517 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 832575519} - - component: {fileID: 832575518} - m_Layer: 0 - m_Name: Global Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &832575518 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832575517} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} ---- !u!4 &832575519 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832575517} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1805027676} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &926593662 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 926593663} - - component: {fileID: 926593665} - - component: {fileID: 926593664} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &926593663 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 926593662} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1988737113} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &926593664 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 926593662} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - 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: - m_Calls: [] - m_text: "\uB808\uC2A4\uD1A0\uB791" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} - m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &926593665 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 926593662} - m_CullTransparentMesh: 1 ---- !u!1 &1247437489 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1247437490} - - component: {fileID: 1247437491} - m_Layer: 0 - m_Name: TitleSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1247437490 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247437489} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1292767722} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1247437491 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247437489} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c837bbd9eecddc04f9c625fa14062a34, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1292767721 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1292767722} - m_Layer: 0 - m_Name: Systems - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1292767722 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292767721} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1247437490} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1441270166 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6109912877153005269, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - m_PrefabInstance: {fileID: 4632309550138408214} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 965655bbd1b2f224196ab3275ea13a57, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1740173696 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1740173699} - - component: {fileID: 1740173700} - m_Layer: 0 - m_Name: TitleHierachyController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1740173699 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1740173696} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1740173700 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1740173696} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 848a85510b808ee4994e553f35ca73bd, type: 3} - m_Name: - m_EditorClassIdentifier: - Rules: - - Type: 0 - Name: - GameObject: {fileID: 1740173696} - Ordinal: 0 - Priority: 0 - IconType: 125250 - IconTexture: {fileID: 0} - IsIconRecursive: 0 - BackgroundType: 1000 - BackgroundTexture: {fileID: 0} - IsBackgroundRecursive: 0 - IsHidden: 0 - - Type: 0 - Name: - GameObject: {fileID: 0} - Ordinal: 1 - Priority: 0 - IconType: 138500 - IconTexture: {fileID: 0} - IsIconRecursive: 0 - BackgroundType: 13000 - BackgroundTexture: {fileID: 0} - IsBackgroundRecursive: 0 - IsHidden: 0 - - Type: 0 - Name: - GameObject: {fileID: 169147214} - Ordinal: 2 - Priority: 0 - IconType: 138500 - IconTexture: {fileID: 0} - IsIconRecursive: 0 - BackgroundType: 13000 - BackgroundTexture: {fileID: 0} - IsBackgroundRecursive: 0 - IsHidden: 0 - - Type: 0 - Name: - GameObject: {fileID: 1292767721} - Ordinal: 3 - Priority: 0 - IconType: 138500 - IconTexture: {fileID: 0} - IsIconRecursive: 0 - BackgroundType: 13000 - BackgroundTexture: {fileID: 0} - IsBackgroundRecursive: 0 - IsHidden: 0 - - Type: 0 - Name: - GameObject: {fileID: 1805027675} - Ordinal: 4 - Priority: 0 - IconType: 138500 - IconTexture: {fileID: 0} - IsIconRecursive: 0 - BackgroundType: 13000 - BackgroundTexture: {fileID: 0} - IsBackgroundRecursive: 0 - IsHidden: 0 - - Type: 0 - Name: - GameObject: {fileID: 1849177618} - Ordinal: 5 - Priority: 0 - IconType: 138500 - IconTexture: {fileID: 0} - IsIconRecursive: 0 - BackgroundType: 13000 - BackgroundTexture: {fileID: 0} - IsBackgroundRecursive: 0 - IsHidden: 0 ---- !u!1 &1773158345 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1773158346} - - component: {fileID: 1773158347} - m_Layer: 5 - m_Name: TitlePanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1773158346 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773158345} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1780132182} - - {fileID: 1988737113} - m_Father: {fileID: 1061969} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!225 &1773158347 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773158345} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &1780132181 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1780132182} - - component: {fileID: 1780132184} - - component: {fileID: 1780132183} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1780132182 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1780132181} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1773158346} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1780132183 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1780132181} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1780132184 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1780132181} - m_CullTransparentMesh: 1 ---- !u!1 &1805027675 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1805027676} - m_Layer: 0 - m_Name: BasicSettings - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1805027676 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1805027675} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 832575519} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1849177618 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1849177619} - m_Layer: 0 - m_Name: Lights - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1849177619 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1849177618} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 410087041} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1988737112 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1988737113} - - component: {fileID: 1988737116} - - component: {fileID: 1988737115} - - component: {fileID: 1988737114} - m_Layer: 5 - m_Name: RestaurantButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1988737113 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988737112} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 926593663} - m_Father: {fileID: 1773158346} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1988737114 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988737112} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1988737115} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1441270166} - m_TargetAssemblyTypeName: DDD.GameManager, Assembly-CSharp - m_MethodName: ChangeSceneByIndex - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 1 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1988737115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988737112} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - 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: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1988737116 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988737112} - m_CullTransparentMesh: 1 ---- !u!1001 &2114827066227012118 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4476251547817182662, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6237816563216546680, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} - propertyPath: m_Name - value: GoogleSheetManager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} ---- !u!1001 &4632309550138408214 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3914215459674519121, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_Name - value: GameManager - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7699237936705830620, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9f16b0b665c13444aaced76f8dfe3136, type: 3} ---- !u!1001 &7655364857355506341 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9396927 - objectReference: {fileID: 0} - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalRotation.x - value: 0.3420201 - objectReference: {fileID: 0} - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7292682221138498026, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - propertyPath: m_Name - value: CameraManager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} ---- !u!1001 &8527614763728088867 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 303053621953959099, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6312950592041400320, guid: f17834b768fb4724380bafc46049b63c, type: 3} - propertyPath: m_Name - value: KeyManager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f17834b768fb4724380bafc46049b63c, type: 3} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 1740173699} - - {fileID: 4632309550138408214} - - {fileID: 8527614763728088867} - - {fileID: 7655364857355506341} - - {fileID: 2114827066227012118} - - {fileID: 1292767722} - - {fileID: 1805027676} - - {fileID: 1849177619} - - {fileID: 169147215} diff --git a/Assets/_DDD/_Scenes/00.Title.unity.meta b/Assets/_DDD/_Scenes/00.Title.unity.meta deleted file mode 100644 index 9531828bc..000000000 --- a/Assets/_DDD/_Scenes/00.Title.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 99c9720ab356a0642a771bea13969a05 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 187cfa3b3..f8bb36eb6 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,11 +6,14 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/_DDD/_Scenes/00.Title.unity - guid: 99c9720ab356a0642a771bea13969a05 + path: Assets/_DDD/_Addressables/Scenes/Entry.unity + guid: 2eb88deceda8c443db7ec557aaef30af - enabled: 1 path: Assets/_DDD/_Addressables/Scenes/Restaurant.unity guid: de073d0136201ac4cbb36dbeb4b76fb2 + - enabled: 1 + path: Assets/_DDD/_Addressables/Scenes/Voyage.unity + guid: a60e7a432b7eb65419f3942f4f422fb4 m_configObjects: addressableimportsettingslist: {fileID: 11400000, guid: ded0fd49318dc504f89f2396f0d12d69, type: 2} com.unity.addressableassets: {fileID: 11400000, guid: 8aedbecfee36f6f47b57e6359672a64f, type: 2} From c1ac0130c54e6c2f63de341d6712255ea2cbba27 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 14:11:22 +0900 Subject: [PATCH 10/18] =?UTF-8?q?So=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RestaurantPlayerDataSo.cs | 23 +++++++++++++++++++ .../RestaurantPlayerDataSo.cs.meta | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerDataSo.cs create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerDataSo.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerDataSo.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerDataSo.cs new file mode 100644 index 000000000..5aad7b6c3 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerDataSo.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +namespace DDD +{ + [CreateAssetMenu(fileName = "RestaurantPlayerDataSo", menuName = "ScriptableObjects/RestaurantPlayerDataSo")] + public class RestaurantPlayerDataSo : ScriptableObject + { + public bool IsMoveEnabled = true; + public float MoveSpeed = 7f; + + public bool IsDashEnabled = true; + public float DashSpeed = 20f; + public float DashTime = 0.2f; + public float DashCooldown = 2f; + + public string WalkingSfxName; + public string DashSfxName; + + public InputActionReference MoveActionReference; + public InputActionReference DashActionReference; + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerDataSo.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerDataSo.cs.meta new file mode 100644 index 000000000..91a52aca2 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerDataSo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5583898a24cc9c7419aec8b01ee0fde4 \ No newline at end of file From 9a7e8f867a239cf1fa7b064216b76a9b38553940 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 14:11:31 +0900 Subject: [PATCH 11/18] =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20Player=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Scripts/RestaurantCharacter/Players.meta | 8 - .../Players/RestaurantPlayer.meta | 8 - .../RestaurantPlayer/RestaurantPlayer.cs | 191 ------------------ .../RestaurantPlayer/RestaurantPlayer.cs.meta | 2 - .../RestaurantPlayer/RestaurantPlayerData.cs | 24 --- .../RestaurantPlayerData.cs.meta | 2 - .../RestaurantPlayer/RestaurantPlayerView.cs | 57 ------ .../RestaurantPlayerView.cs.meta | 2 - 8 files changed, 294 deletions(-) delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs delete mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players.meta deleted file mode 100644 index dd673ee9c..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 67cd165408b4f85469fbe1b9ecf3b9e5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer.meta deleted file mode 100644 index 84d0c0b5b..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bc99ee6ab7cf7d34fb103aa950497c91 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs deleted file mode 100644 index 2e748c3f5..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs +++ /dev/null @@ -1,191 +0,0 @@ -// using System.Collections; -// using UnityEngine; -// using UnityEngine.AddressableAssets; -// using UnityEngine.InputSystem; -// using UnityEngine.Serialization; -// -// namespace DDD -// { -// public class RestaurantPlayer : MonoBehaviour -// { -// #region Variables -// -// private RestaurantPlayerDataSo _playerData; -// private RestaurantPlayerView _playerView; -// -// private InputAction _moveAction; -// private InputAction _dashAction; -// private Coroutine _dashInstance; -// -// private Vector3 _inputDirection; -// private Vector3 _currentDirection = Vector3.back; -// -// public bool IsMoving; -// public bool IsDashing; -// public bool IsDashCoolDownActive; -// -// private float _finalSpeed; -// -// private PlayerStateMachine _stateMachine; -// -// #endregion -// -// // Unity events -// -// #region Unity events -// -// private void Awake() -// { -// _playerData = Addressables.LoadAssetAsync("RestaurantPlayerDataSo").WaitForCompletion(); -// _playerView = GetComponent(); -// } -// -// private void Start() -// { -// _moveAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Move)); -// _dashAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Dash)); -// -// _moveAction.performed += OnMove; -// _moveAction.canceled += OnMove; -// _dashAction.performed += OnDash; -// -// _stateMachine = new PlayerStateMachine(); -// ChangeState(new IdleState(this, _playerView)); -// } -// -// //public CellManager cellManager; -// private void Update() -// { -// _stateMachine.Update(); -// -// FlipVisualLook(); -// -// //UpdateCell -// //cellManager.SetupCell(transform.position); -// } -// -// private void FixedUpdate() -// { -// if (!CanMove()) return; -// -// Move(); -// } -// -// private void OnDestroy() -// { -// _moveAction.performed -= OnMove; -// _moveAction.canceled -= OnMove; -// _dashAction.performed -= OnDash; -// } -// -// #endregion -// -// // Methods -// #region Methods -// -// public void SetCurrentDirection(Vector3 normalDirection) -// { -// if (normalDirection == Vector3.zero) return; -// -// _currentDirection = normalDirection; -// } -// -// private void FlipVisualLook() -// { -// Vector3 localScale = _playerView.GetLocalScale(); -// localScale.x = _currentDirection.x switch -// { -// > 0.01f => -Mathf.Abs(localScale.x), -// < -0.01f => Mathf.Abs(localScale.x), -// _ => localScale.x -// }; -// _playerView.SetLocalScale(localScale); -// } -// -// public void OnMove(InputAction.CallbackContext context) -// { -// var movementInput = _moveAction.ReadValue(); -// _inputDirection = new Vector3(movementInput.x, 0, movementInput.y).normalized; -// } -// -// public bool CanMove() -// { -// return _playerData.IsMoveEnabled && !IsDashing; -// } -// -// public void Move() -// { -// SetCurrentDirection(_inputDirection); -// IsMoving = _inputDirection != Vector3.zero; -// -// var finalVelocity = _inputDirection * _playerData.MoveSpeed; -// _playerView.SetVelocity(finalVelocity); -// } -// -// public void OnDash(InputAction.CallbackContext context) -// { -// if (!CanDash()) return; -// -// Dash(); -// } -// -// public bool CanDash() -// { -// return _playerData.IsDashEnabled && !IsDashing && !IsDashCoolDownActive; -// } -// -// public void Dash() -// { -// Utils.StartUniqueCoroutine(this, ref _dashInstance, DashCoroutine()); -// } -// -// private IEnumerator DashCoroutine() -// { -// IsDashing = true; -// IsDashCoolDownActive = true; -// _playerView.PlayDashParticle(); -// -// AudioManager.Instance.PlaySfx(_playerData.DashSfxName); -// -// var dashDirection = _inputDirection; -// if (dashDirection == Vector3.zero) -// { -// dashDirection = _currentDirection; -// } -// -// var elapsedTime = 0f; -// while (elapsedTime <= _playerData.DashTime) -// { -// var finalVelocity = dashDirection * _playerData.DashSpeed; -// _playerView.SetVelocity(finalVelocity); -// -// elapsedTime += Time.fixedDeltaTime; -// yield return new WaitForFixedUpdate(); -// } -// -// EndDash(_playerData.DashCooldown); -// } -// -// public void EndDash(float dashCooldown = float.PositiveInfinity) -// { -// Utils.EndUniqueCoroutine(this, ref _dashInstance); -// _playerView.SetVelocity(Vector3.zero); -// IsDashing = false; -// -// if (float.IsPositiveInfinity(dashCooldown)) -// { -// dashCooldown = _playerData.DashCooldown; -// } -// -// // TODO : ui 연동 -// StartCoroutine(Utils.CoolDownCoroutine(dashCooldown, () => IsDashCoolDownActive = false)); -// } -// -// public void ChangeState(IStateMachine stateMachine) -// { -// _stateMachine.ChangeState(stateMachine); -// } -// -// #endregion -// } -// } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs.meta deleted file mode 100644 index 5b9f457b2..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 620909d88f805ee4898b9af964a7f0e8 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs deleted file mode 100644 index 7a9e804d7..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs +++ /dev/null @@ -1,24 +0,0 @@ -using UnityEngine; -using UnityEngine.InputSystem; -using UnityEngine.Serialization; - -namespace DDD -{ - [CreateAssetMenu(fileName = "RestaurantPlayerDataSo", menuName = "ScriptableObjects/RestaurantPlayerDataSo")] - public class RestaurantPlayerDataSo : ScriptableObject - { - public bool IsMoveEnabled = true; - public float MoveSpeed = 7f; - - public bool IsDashEnabled = true; - public float DashSpeed = 20f; - public float DashTime = 0.2f; - public float DashCooldown = 2f; - - public string WalkingSfxName; - public string DashSfxName; - - public InputActionReference MoveActionReference; - public InputActionReference DashActionReference; - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs.meta deleted file mode 100644 index 91a52aca2..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 5583898a24cc9c7419aec8b01ee0fde4 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs deleted file mode 100644 index def822db5..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs +++ /dev/null @@ -1,57 +0,0 @@ -// using Spine; -// using UnityEngine; -// -// namespace DDD -// { -// public static class RestaurantSpineAnimation -// { -// public const string Idle = "Idle"; -// public const string Walking = "RunFast"; -// public const string ServingIdle = "Serving/ServingIdle"; -// public const string Serving = "Serving/ServingFast"; -// public const string Dash = "Dash"; -// public const string CleaningFloor = "Cleaning/CleaningFloor"; -// public const string CleaningTable = "Cleaning/CleaningTable"; -// public const string MakingCocktail = "BeerMaker"; -// public const string Pumping = "Attack/AttackWhip"; -// public const string AttackSlime = "Attack/AttackSlime"; -// public const string AttackLimeTree = "Attack/AttackBat"; -// public const string CookingFried = "Cooking/CookingFried"; -// public const string CookingStew = "Cooking/CookingStew"; -// } -// -// public class RestaurantPlayerView : MonoBehaviour -// { -// private Rigidbody _rigidbody; -// private Transform _visualLook; -// private SpineController _spineController; -// -// private ParticleSystem _dashParticle; -// -// private void Awake() -// { -// _rigidbody = GetComponent(); -// _visualLook = transform.Find("VisualLook"); -// _spineController = GetComponent(); -// } -// -// public void SetVelocity(Vector3 velocity) => _rigidbody.linearVelocity = velocity; -// public Vector3 GetLocalScale() => _visualLook.localScale; -// public void SetLocalScale(Vector3 localScale) => _visualLook.localScale = localScale; -// -// public void PlayDashParticle() -// { -// if (_dashParticle) -// { -// _dashParticle.Play(); -// } -// } -// -// public TrackEntry PlayAnimation(string animationName, bool isLoopActive, float speed = 1f, bool isReverse = false, int trackIndex = 0) -// => _spineController.PlayAnimation(animationName, isLoopActive, speed, isReverse, trackIndex); -// public TrackEntry PlayAnimationDuration(string animationName, bool isLoopActive, float duration, bool isReverse = false, int trackIndex = 0) => -// _spineController.PlayAnimationDuration(animationName, isLoopActive, duration, isReverse, trackIndex); -// public TrackEntry AddAnimation(string animationName, bool isLoopActive, int trackIndex = 0) -// => _spineController.AddAnimation(animationName, isLoopActive, trackIndex); -// } -// } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs.meta deleted file mode 100644 index 259bb9960..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: c665f9c268555a74a8a805d67d09c80e \ No newline at end of file From 6e730835b8f89a5269a6d236e3d1120b1bbf1d7a Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 14:14:17 +0900 Subject: [PATCH 12/18] =?UTF-8?q?=EC=B9=B4=EB=A9=94=EB=9D=BC=20=EC=98=A4?= =?UTF-8?q?=EB=B8=8C=EC=A0=9D=ED=8A=B8=20enum=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=94=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Addressables/Scenes/Restaurant.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 0cfc649ab..01a05a0c9 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -61389,7 +61389,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1b1ef0319328bf84a98bed912be4c61d, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: RestaurantBaseCamera + k__BackingField: 1 --- !u!108 &6464483386687510218 Light: m_ObjectHideFlags: 0 From 5edb192b6352e559f1314965dbfe9ae5a0456a0a Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 14:20:20 +0900 Subject: [PATCH 13/18] =?UTF-8?q?Manager=20=ED=8C=8C=EC=9D=BC=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD=20->=20IManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/GameFramework/{Manager.cs => IManager.cs} | 0 .../_Scripts/GameFramework/{Manager.cs.meta => IManager.cs.meta} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Assets/_DDD/_Scripts/GameFramework/{Manager.cs => IManager.cs} (100%) rename Assets/_DDD/_Scripts/GameFramework/{Manager.cs.meta => IManager.cs.meta} (100%) diff --git a/Assets/_DDD/_Scripts/GameFramework/Manager.cs b/Assets/_DDD/_Scripts/GameFramework/IManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Manager.cs rename to Assets/_DDD/_Scripts/GameFramework/IManager.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Manager.cs.meta b/Assets/_DDD/_Scripts/GameFramework/IManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Manager.cs.meta rename to Assets/_DDD/_Scripts/GameFramework/IManager.cs.meta From 88604b44893da64baac068dc5f33021a922a8b84 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 14:57:10 +0900 Subject: [PATCH 14/18] =?UTF-8?q?GameFlow=20=EB=B0=8F=20SceneManager=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_DDD/_Scripts/GameFlow/GameFlowManager.cs | 5 +--- .../Scene/FadeSceneTransitionHandlerSo.cs | 23 +++++++++++++++++++ .../FadeSceneTransitionHandlerSo.cs.meta | 2 ++ .../GameFramework/{ => Scene}/SceneManager.cs | 17 ++++++++++++-- .../{ => Scene}/SceneManager.cs.meta | 0 .../Scene/SceneTransitionHandler.cs | 11 +++++++++ .../Scene/SceneTransitionHandler.cs.meta | 2 ++ .../Scene/SceneTransitionHandlerSo.cs | 11 +++++++++ .../Scene/SceneTransitionHandlerSo.cs.meta | 2 ++ 9 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs create mode 100644 Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs.meta rename Assets/_DDD/_Scripts/GameFramework/{ => Scene}/SceneManager.cs (84%) rename Assets/_DDD/_Scripts/GameFramework/{ => Scene}/SceneManager.cs.meta (100%) create mode 100644 Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs create mode 100644 Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs create mode 100644 Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs index 6ad63d9ca..a60d6aaf6 100644 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs @@ -106,10 +106,7 @@ private async void OpenFlowScene(GameFlowState newFlowState) { if (GetFlowScene(newFlowState, out var sceneToLoad)) { - await FadeManager.Instance.FadeOut(); - SceneManager.Instance.ActivateScene(sceneToLoad); - await Task.Delay(1000); - await FadeManager.Instance.FadeIn(); + await SceneManager.Instance.ActivateScene(sceneToLoad); } else { diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs b/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs new file mode 100644 index 000000000..ed8a033cb --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs @@ -0,0 +1,23 @@ +using System.Threading.Tasks; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "FadeSceneTransitionHandlerSo", menuName = "GameFramework/FadeSceneTransitionHandlerSo")] + public class FadeSceneTransitionHandlerSo : SceneTransitionHandler + { + [SerializeField] + private float _delayBeforeFadeIn = 1f; + + public override async Task OnBeforeSceneActivate(SceneType sceneType) + { + await FadeManager.Instance.FadeOut(); + } + + public override async Task OnAfterSceneActivate(SceneType sceneType) + { + await Task.Delay((int)(_delayBeforeFadeIn * 1000)); + await FadeManager.Instance.FadeIn(); + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs.meta b/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs.meta new file mode 100644 index 000000000..d5e49e45f --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 703a11d70c312b940b49b9a0f89746d1 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs similarity index 84% rename from Assets/_DDD/_Scripts/GameFramework/SceneManager.cs rename to Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs index 78a7f7e84..ef559c9d9 100644 --- a/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs +++ b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using UnityEngine; using UnityEngine.ResourceManagement.ResourceProviders; @@ -15,10 +16,12 @@ public enum SceneType public class SceneManager : Singleton, IManager { + [SerializeField] + private SceneTransitionHandlerSo _sceneTransitionHandlerSo; + private Dictionary _loadedScenes; private SceneInstance _currentSceneInstance; - public Action OnSceneChanged; public void Init() @@ -69,8 +72,13 @@ public async Task PreloadSceneAsync(SceneType sceneType) } } - public void ActivateScene(SceneType sceneType) + public async Task ActivateScene(SceneType sceneType) { + foreach (var handler in _sceneTransitionHandlerSo.Handlers.Where(handler => handler != null)) + { + await handler.OnBeforeSceneActivate(sceneType); + } + if (_loadedScenes.TryGetValue(sceneType, out var sceneInstance)) { foreach (var root in sceneInstance.Scene.GetRootGameObjects()) @@ -85,6 +93,11 @@ public void ActivateScene(SceneType sceneType) { Debug.LogError($"[SceneManager] Scene not loaded: {sceneType}"); } + + foreach (var handler in _sceneTransitionHandlerSo.Handlers.Where(handler => handler != null)) + { + await handler.OnAfterSceneActivate(sceneType); + } } public void DeactivateScene(SceneType sceneType) diff --git a/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs.meta b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/SceneManager.cs.meta rename to Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs new file mode 100644 index 000000000..7dce93b25 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs @@ -0,0 +1,11 @@ +using System.Threading.Tasks; +using UnityEngine; + +namespace DDD +{ + public abstract class SceneTransitionHandler : ScriptableObject + { + public abstract Task OnBeforeSceneActivate(SceneType sceneType); + public abstract Task OnAfterSceneActivate(SceneType sceneType); + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs.meta b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs.meta new file mode 100644 index 000000000..53eb1a1d7 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 23db33a4e8a50464e8b57e36db4b0f25 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs new file mode 100644 index 000000000..8e27b2ba7 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "SceneTransitionHandlerSo", menuName = "GameFramework/SceneTransitionHandlerSo")] + public class SceneTransitionHandlerSo : ScriptableObject + { + public List Handlers = new(); + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs.meta b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs.meta new file mode 100644 index 000000000..836b515f4 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c8d0f2d4eb3cfdc45a258a64641fe3e8 \ No newline at end of file From 97cf6c1b53ee69cd583d91e9b6742a964b18cc13 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 14:57:29 +0900 Subject: [PATCH 15/18] =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EA=B0=9C=EC=84=A0?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=97=90=EC=85=8B=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_ScriptAssets/Prefabs/SceneManager.prefab | 2 +- .../So/FadeSceneTransitionHandlerSo.asset | 14 ++++++++++++++ .../So/FadeSceneTransitionHandlerSo.asset.meta | 8 ++++++++ .../So/SceneTransitionHandlerSo.asset | 15 +++++++++++++++ .../So/SceneTransitionHandlerSo.asset.meta | 8 ++++++++ Assets/_DDD/_Scripts/GameFramework/Scene.meta | 8 ++++++++ 6 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 Assets/_DDD/_ScriptAssets/So/FadeSceneTransitionHandlerSo.asset create mode 100644 Assets/_DDD/_ScriptAssets/So/FadeSceneTransitionHandlerSo.asset.meta create mode 100644 Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset create mode 100644 Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset.meta create mode 100644 Assets/_DDD/_Scripts/GameFramework/Scene.meta diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/SceneManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/SceneManager.prefab index 725e83efd..c1068251c 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/SceneManager.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/SceneManager.prefab @@ -45,4 +45,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 1 - _fadeTime: 0.5 + _sceneTransitionHandlerSo: {fileID: 11400000, guid: fbf73e00393e9004c984635e41c81ff0, type: 2} diff --git a/Assets/_DDD/_ScriptAssets/So/FadeSceneTransitionHandlerSo.asset b/Assets/_DDD/_ScriptAssets/So/FadeSceneTransitionHandlerSo.asset new file mode 100644 index 000000000..137f610b4 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/So/FadeSceneTransitionHandlerSo.asset @@ -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: 703a11d70c312b940b49b9a0f89746d1, type: 3} + m_Name: FadeSceneTransitionHandlerSo + m_EditorClassIdentifier: diff --git a/Assets/_DDD/_ScriptAssets/So/FadeSceneTransitionHandlerSo.asset.meta b/Assets/_DDD/_ScriptAssets/So/FadeSceneTransitionHandlerSo.asset.meta new file mode 100644 index 000000000..d9ed6052f --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/So/FadeSceneTransitionHandlerSo.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2540a16dfa42fb64abe19dda610933fa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset b/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset new file mode 100644 index 000000000..63637150c --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset @@ -0,0 +1,15 @@ +%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: c8d0f2d4eb3cfdc45a258a64641fe3e8, type: 3} + m_Name: SceneTransitionHandlerSo + m_EditorClassIdentifier: + Handlers: [] diff --git a/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset.meta b/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset.meta new file mode 100644 index 000000000..3a6ac4f17 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fbf73e00393e9004c984635e41c81ff0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene.meta b/Assets/_DDD/_Scripts/GameFramework/Scene.meta new file mode 100644 index 000000000..49f2cf2e7 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/Scene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2426db0b60a2114ea125d793d3c6741 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From c66c9a201ecaa0a66fb57e1066c86de529501023 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 15:37:43 +0900 Subject: [PATCH 16/18] =?UTF-8?q?=EB=A0=88=EC=8A=A4=ED=86=A0=EB=9E=91=20?= =?UTF-8?q?=ED=94=8C=EB=A0=88=EC=9D=B4=EC=96=B4=20=EC=95=A0=EB=8B=88?= =?UTF-8?q?=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RestaurantCharacterAnimation.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs index f8f27f851..b2dd01dc4 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs @@ -13,6 +13,21 @@ private void Awake() _spineController = GetComponent(); } + private void Start() + { + _restaurantPlayerMovement.OnMoving += OnMove; + _restaurantPlayerMovement.OnDashing += OnDash; + } + + private void OnDestroy() + { + if (_restaurantPlayerMovement) + { + _restaurantPlayerMovement.OnMoving -= OnMove; + _restaurantPlayerMovement.OnDashing -= OnDash; + } + } + private void OnMove(bool isMoving) { string animationName = isMoving ? RestaurantPlayerAnimation.Walk : RestaurantPlayerAnimation.Idle; From 2d123da297a0b409485f0cdccb93ea2a613306b2 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 15:38:22 +0900 Subject: [PATCH 17/18] =?UTF-8?q?=EA=B2=8C=EC=9E=84=20=ED=94=8C=EB=A1=9C?= =?UTF-8?q?=EC=9A=B0=20=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_DDD/_Scripts/GameFlow/GameFlowManager.cs | 9 ++----- .../_Scripts/GameFlow/GameFlowReadyHandler.cs | 10 ++++++++ .../GameFlow/GameFlowReadyHandler.cs.meta | 2 ++ .../CreateRestaurantPlayer.cs | 24 +++++++------------ 4 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 Assets/_DDD/_Scripts/GameFlow/GameFlowReadyHandler.cs create mode 100644 Assets/_DDD/_Scripts/GameFlow/GameFlowReadyHandler.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs index a60d6aaf6..109080e86 100644 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs @@ -31,7 +31,6 @@ public async void PostInit() { if (IsGameStarted() == false) { - await Task.Delay(3000); await ChangeFlow(GameFlowState.ReadyForRestaurant); } } @@ -84,13 +83,9 @@ private async Task ReadyNewFlow(GameFlowState newFlowState) { var obj = await AssetManager.LoadAsset(assetRef); - if (obj is GameObject prefab) + if (obj is GameFlowReadyHandler handler) { - Instantiate(prefab); - } - else - { - Debug.LogWarning($"[ReadyNewFlow] Not a GameObject: {assetRef.RuntimeKey}"); + await handler.OnReadyNewFlow(newFlowState); } } } diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowReadyHandler.cs b/Assets/_DDD/_Scripts/GameFlow/GameFlowReadyHandler.cs new file mode 100644 index 000000000..3f79cd3b7 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowReadyHandler.cs @@ -0,0 +1,10 @@ +using System.Threading.Tasks; +using UnityEngine; + +namespace DDD +{ + public abstract class GameFlowReadyHandler : ScriptableObject + { + public abstract Task OnReadyNewFlow(GameFlowState newFlowState); + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowReadyHandler.cs.meta b/Assets/_DDD/_Scripts/GameFlow/GameFlowReadyHandler.cs.meta new file mode 100644 index 000000000..af1144a50 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowReadyHandler.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b072e73316b7d534b8ec18ffa0b8bfa2 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs index e1ee7e7bc..81e29ce4e 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs @@ -1,26 +1,20 @@ -using System; +using System.Threading.Tasks; using UnityEngine; namespace DDD { - public class CreateRestaurantPlayer : MonoBehaviour + [CreateAssetMenu(fileName = "CreateRestaurantPlayer", menuName = "GameFlow/CreateRestaurantPlayer")] + public class CreateRestaurantPlayer : GameFlowReadyHandler { [SerializeField] private Vector3 _spawnPosition; - - private async void Start() + + public override async Task OnReadyNewFlow(GameFlowState newFlowState) { - try - { - var playerPrefab = await AssetManager.LoadAsset(CommonConstants.RestaurantPlayer); - var player = Instantiate(playerPrefab, _spawnPosition, playerPrefab.transform.rotation); - player.name = CommonConstants.RestaurantPlayer; - CameraManager.Instance.GetCameraGameObject(CameraType.RestaurantBaseCamera).SetFollowAndLookAtTarget(player.transform); - } - catch (Exception e) - { - Debug.LogError($"Create player failed\n{e.Message}"); - } + var playerPrefab = await AssetManager.LoadAsset(CommonConstants.RestaurantPlayer); + var player = Instantiate(playerPrefab, _spawnPosition, playerPrefab.transform.rotation); + player.name = CommonConstants.RestaurantPlayer; + CameraManager.Instance.GetCameraGameObject(CameraType.RestaurantBaseCamera).SetFollowAndLookAtTarget(player.transform); } } } \ No newline at end of file From 2f125ba73c2036b7871da57e779a2001e21be414 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 14 Jul 2025 15:38:36 +0900 Subject: [PATCH 18/18] =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=97=90=EC=85=8B=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetGroups/Group.asset | 4 +- .../Prefabs/CreateRestaurantPlayer.prefab | 47 ------------------- .../Prefabs/RestaurantPlayer.prefab | 23 +++++++++ .../So/CreateRestaurantPlayer.asset | 15 ++++++ .../CreateRestaurantPlayer.asset.meta} | 5 +- .../_ScriptAssets/So/GameFlowAssetsSo.asset | 2 +- .../So/SceneTransitionHandlerSo.asset | 3 +- 7 files changed, 46 insertions(+), 53 deletions(-) delete mode 100644 Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab create mode 100644 Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset rename Assets/_DDD/_Addressables/{Prefabs/CreateRestaurantPlayer.prefab.meta => So/CreateRestaurantPlayer.asset.meta} (52%) diff --git a/Assets/AddressableAssetsData/AssetGroups/Group.asset b/Assets/AddressableAssetsData/AssetGroups/Group.asset index b89effa02..8966ac8c3 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Group.asset @@ -33,11 +33,11 @@ MonoBehaviour: m_SerializedLabels: - Scene FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 4c9d045012b65fc4b974bb4e132e6e6a + - m_GUID: 47e757b9a170ab649af14c4d7b80ac41 m_Address: CreateRestaurantPlayer m_ReadOnly: 0 m_SerializedLabels: - - Prefab + - So FlaggedDuringContentUpdateRestriction: 0 - m_GUID: a60e7a432b7eb65419f3942f4f422fb4 m_Address: Voyage diff --git a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab deleted file mode 100644 index 6888b5adb..000000000 --- a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab +++ /dev/null @@ -1,47 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &5717669528680924896 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5172050782918397531} - - component: {fileID: 5336591719806944066} - m_Layer: 0 - m_Name: CreateRestaurantPlayer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5172050782918397531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717669528680924896} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5336591719806944066 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717669528680924896} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 246a7785bd15ac84b9f240005b987f1f, type: 3} - m_Name: - m_EditorClassIdentifier: - _spawnPosition: {x: 0, y: 0, z: 15} diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index ca7f5ce53..80a6c7d75 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -72,6 +72,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: 5 addedObject: {fileID: 4956037093100801085} + - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1115647804376030753} m_SourcePrefab: {fileID: 100100000, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} --- !u!1 &7316134055819320434 stripped GameObject: @@ -102,3 +105,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a83ca1b1f17a934192ef91dd4f073b8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1115647804376030753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316134055819320434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d7e5480ae1ebf54b8537ad2a08696d2, type: 3} + m_Name: + m_EditorClassIdentifier: + _originalMaterial: {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} + _replacementMaterial: {fileID: 0} + _isSkinSet: 1 + _initialSkinName: Basic + _isRandomSkin: 0 + _isRandomRange: 0 + _randomRange: {x: 0, y: 0} + _randomStrings: [] diff --git a/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset b/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset new file mode 100644 index 000000000..169223f05 --- /dev/null +++ b/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset @@ -0,0 +1,15 @@ +%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: 246a7785bd15ac84b9f240005b987f1f, type: 3} + m_Name: CreateRestaurantPlayer + m_EditorClassIdentifier: + _spawnPosition: {x: 0, y: 0, z: 15} diff --git a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta b/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset.meta similarity index 52% rename from Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta rename to Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset.meta index 3124860d8..abd9dd5aa 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CreateRestaurantPlayer.prefab.meta +++ b/Assets/_DDD/_Addressables/So/CreateRestaurantPlayer.asset.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 4c9d045012b65fc4b974bb4e132e6e6a -PrefabImporter: +guid: 47e757b9a170ab649af14c4d7b80ac41 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset b/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset index 091263bb5..d9e999837 100644 --- a/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset +++ b/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset @@ -75,7 +75,7 @@ MonoBehaviour: Data: 4|UnityEngine.AddressableAssets.AssetReference, Unity.Addressables - Name: m_AssetGUID Entry: 1 - Data: 4c9d045012b65fc4b974bb4e132e6e6a + Data: 47e757b9a170ab649af14c4d7b80ac41 - Name: m_SubObjectName Entry: 6 Data: diff --git a/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset b/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset index 63637150c..85ea2d811 100644 --- a/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset +++ b/Assets/_DDD/_ScriptAssets/So/SceneTransitionHandlerSo.asset @@ -12,4 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c8d0f2d4eb3cfdc45a258a64641fe3e8, type: 3} m_Name: SceneTransitionHandlerSo m_EditorClassIdentifier: - Handlers: [] + Handlers: + - {fileID: 11400000, guid: 2540a16dfa42fb64abe19dda610933fa, type: 2}