global_data_system #3
@ -15,7 +15,7 @@ MonoBehaviour:
|
||||
m_DefaultGroup: 30e7f67fe9aaa7849a34c9b6e2bc53ae
|
||||
m_currentHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
Hash: b999ffdad28e71d51bc1ab0c8e9efbfa
|
||||
m_OptimizeCatalogSize: 0
|
||||
m_BuildRemoteCatalog: 1
|
||||
m_CatalogRequestsTimeout: 0
|
||||
|
@ -14,7 +14,12 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_GroupName: GoogleSheetSprite_Group
|
||||
m_GUID: 30e7f67fe9aaa7849a34c9b6e2bc53ae
|
||||
m_SerializeEntries: []
|
||||
m_SerializeEntries:
|
||||
- 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:
|
||||
|
@ -4,9 +4,9 @@ SpriteAtlasImporter:
|
||||
externalObjects: {}
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
anisoLevel: 1
|
||||
compressionQuality: 50
|
||||
maxTextureSize: 2048
|
||||
anisoLevel: 0
|
||||
compressionQuality: 0
|
||||
maxTextureSize: 0
|
||||
textureCompression: 0
|
||||
filterMode: 1
|
||||
generateMipMaps: 0
|
||||
@ -17,10 +17,10 @@ SpriteAtlasImporter:
|
||||
packingSettings:
|
||||
serializedVersion: 2
|
||||
padding: 4
|
||||
blockOffset: 1
|
||||
blockOffset: 0
|
||||
allowAlphaSplitting: 0
|
||||
enableRotation: 1
|
||||
enableTightPacking: 1
|
||||
enableRotation: 0
|
||||
enableTightPacking: 0
|
||||
enableAlphaDilation: 0
|
||||
secondaryTextureSettings: {}
|
||||
variantMultiplier: 1
|
||||
|
8
Assets/_DDD/_Scripts/AssetManagement.meta
Normal file
8
Assets/_DDD/_Scripts/AssetManagement.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 01a783bbf1998df4fa67164cfc433324
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
36
Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs
Normal file
36
Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs
Normal file
@ -0,0 +1,36 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.AddressableAssets;
|
||||
using UnityEngine.ResourceManagement.AsyncOperations;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public class AssetManager : Singleton<AssetManager>, IManager
|
||||
{
|
||||
public void Init()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void PostInit()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// public AsyncOperationHandle LoadAsset(AssetReference assetRef)
|
||||
// {
|
||||
//
|
||||
// var handle = assetRef.LoadAssetAsync<ScriptableObject>();
|
||||
// }
|
||||
//
|
||||
// private void OnAssetLoaded(AsyncOperationHandle obj)
|
||||
// {
|
||||
//
|
||||
// }
|
||||
//
|
||||
// public void ReleaseAsset()
|
||||
// {
|
||||
// TestRef.ReleaseAsset();
|
||||
// }
|
||||
}
|
||||
}
|
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 38667042b7dae844b813b6d15d63ec65
|
8
Assets/_DDD/_Scripts/CameraSystem.meta
Normal file
8
Assets/_DDD/_Scripts/CameraSystem.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0abd16944f70d9c41ab64299ec5b98ff
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
8
Assets/_DDD/_Scripts/GameCharacter.meta
Normal file
8
Assets/_DDD/_Scripts/GameCharacter.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4cf45ebd41833374f85e75b759783eb3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
7
Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs
Normal file
7
Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs
Normal file
@ -0,0 +1,7 @@
|
||||
namespace DDD
|
||||
{
|
||||
public interface IGameCharacter
|
||||
{
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8651d2cc54cb48840be40c41a055ad32
|
@ -0,0 +1,7 @@
|
||||
namespace DDD
|
||||
{
|
||||
public interface IMovementConstraint
|
||||
{
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 86d2fc3f0d2f489e8552cdbb8fe7425d
|
||||
timeCreated: 1752053109
|
8
Assets/_DDD/_Scripts/GameData.meta
Normal file
8
Assets/_DDD/_Scripts/GameData.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 83806d7f5b542da4d8d30a863e9bdbbc
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
21
Assets/_DDD/_Scripts/GameData/DataManager.cs
Normal file
21
Assets/_DDD/_Scripts/GameData/DataManager.cs
Normal file
@ -0,0 +1,21 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public class DataManager : Singleton<DataManager>, IManager
|
||||
{
|
||||
public void Init()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void PostInit()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// GetItemType(id)
|
||||
// GetItemImage
|
||||
// GetItemName
|
||||
}
|
||||
}
|
2
Assets/_DDD/_Scripts/GameData/DataManager.cs.meta
Normal file
2
Assets/_DDD/_Scripts/GameData/DataManager.cs.meta
Normal file
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 07beed0d64f351c4e9b01784eebf0498
|
@ -1,6 +1,8 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.AddressableAssets;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
namespace DDD
|
||||
@ -18,17 +20,24 @@ public class GameFlowData : ScriptableObject
|
||||
{
|
||||
public GameFlowState CurrentGameState;
|
||||
}
|
||||
|
||||
[CreateAssetMenu(fileName = "GameFlowAssets", menuName = "GameFlow/GameFlowAssets")]
|
||||
public class GameFlowAssets : ScriptableObject
|
||||
{
|
||||
public Dictionary<GameFlowState, List<string>> FlowItems = new();
|
||||
public Dictionary<GameFlowState, List<AssetReference>> FlowAssets = new();
|
||||
}
|
||||
|
||||
[CreateAssetMenu(fileName = "GameFlowSceneMapping", menuName = "GameFlow/GameFlowSceneMapping")]
|
||||
public class GameFlowSceneMapping : ScriptableObject
|
||||
{
|
||||
public Dictionary<GameFlowState, Scene> FlowToSceneMapping = new Dictionary<GameFlowState, Scene>();
|
||||
public Dictionary<GameFlowState, Scene> FlowToSceneMapping = new();
|
||||
}
|
||||
|
||||
public class GameFlowManager : Singleton<GameFlowManager>, IManager
|
||||
{
|
||||
private GameFlowData _gameFlowData = null;
|
||||
|
||||
public GameFlowAssets GameFlowAssets = null;
|
||||
public GameFlowSceneMapping GameFlowSceneMapping;
|
||||
|
||||
public void Init()
|
||||
@ -38,19 +47,11 @@ public void Init()
|
||||
|
||||
public void PostInit()
|
||||
{
|
||||
SceneManager.Instance.OnSceneChanged += OnFlowSceneOpened;
|
||||
|
||||
if (IsGameStarted() == false)
|
||||
{
|
||||
Scene sceneToLoad;
|
||||
bool isSceneFound = GameFlowSceneMapping.FlowToSceneMapping.TryGetValue(_gameFlowData.CurrentGameState, out sceneToLoad);
|
||||
if (isSceneFound == false)
|
||||
{
|
||||
SceneManager.Instance.RequestSceneLoad(sceneToLoad);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Assert(false, "Scene not found!");
|
||||
}
|
||||
ChangeFlow(GameFlowState.ReadyForRestaurant);
|
||||
}
|
||||
}
|
||||
|
||||
@ -64,5 +65,96 @@ protected override void Awake()
|
||||
private void Start()
|
||||
{
|
||||
}
|
||||
|
||||
private bool CanChangeFlow(GameFlowState newFlowState)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public void ChangeFlow(GameFlowState newFlowState)
|
||||
{
|
||||
StartCoroutine(ChangeFlowCoroutine(newFlowState));
|
||||
}
|
||||
|
||||
private IEnumerator ChangeFlowCoroutine(GameFlowState newFlowState)
|
||||
{
|
||||
if (CanChangeFlow(newFlowState) == false)
|
||||
{
|
||||
Debug.LogError("Can't change flow");
|
||||
yield break;
|
||||
}
|
||||
|
||||
EndCurrentFlow();
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void EndCurrentFlow()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public IEnumerator ReadyNewFlow(GameFlowState newFlowState)
|
||||
{
|
||||
OpenFlowScene(newFlowState);
|
||||
|
||||
// Ready Assets
|
||||
if (GameFlowAssets.FlowItems.ContainsKey(newFlowState))
|
||||
{
|
||||
List<string> Items = GameFlowAssets.FlowItems[newFlowState];
|
||||
// Addressables.LoadAssetsAsync(Items, null);
|
||||
// TODO : 여러 에셋 로드하고, 콜백 받을때까지 기다리기
|
||||
|
||||
// Wait
|
||||
}
|
||||
|
||||
if (GameFlowAssets.FlowAssets.ContainsKey(newFlowState))
|
||||
{
|
||||
//List<AssetReference> Assets = GameFlowAssets.FlowItems[newFlowState];
|
||||
// Addressables.LoadAssetsAsync(Assets, )
|
||||
// TODO : 여러 에셋 로드하고, 콜백 받을때까지 기다리기
|
||||
|
||||
// Wait
|
||||
}
|
||||
|
||||
// Ready Scene
|
||||
GetFlowScene(newFlowState, out var flowScene);
|
||||
yield return new WaitUntil(() => _currentScene == flowScene );
|
||||
|
||||
StartFlow();
|
||||
}
|
||||
|
||||
public void OpenFlowScene(GameFlowState newFlowState)
|
||||
{
|
||||
if (GetFlowScene(newFlowState, out var sceneToLoad))
|
||||
{
|
||||
SceneManager.Instance.RequestSceneLoad(sceneToLoad);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Assert(false, "Scene not found!");
|
||||
}
|
||||
}
|
||||
|
||||
private Scene _currentScene;
|
||||
public void OnFlowSceneOpened(Scene newScene)
|
||||
{
|
||||
_currentScene = newScene;
|
||||
}
|
||||
|
||||
public bool GetFlowScene(GameFlowState flowState, out Scene scene)
|
||||
{
|
||||
if (GameFlowSceneMapping.FlowToSceneMapping.TryGetValue(flowState, out scene))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public void StartFlow()
|
||||
{
|
||||
// Broadcast new flow started
|
||||
}
|
||||
}
|
||||
}
|
@ -45,3 +45,10 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_persistent: 1
|
||||
GameFlowSceneMapping: {fileID: 0}
|
||||
FlowAsset:
|
||||
m_AssetGUID: e15933f76da90e742866563b5cd9e45f
|
||||
m_SubObjectName:
|
||||
m_SubObjectType:
|
||||
m_SubObjectGUID:
|
||||
m_EditorAssetChanged: 1
|
||||
|
@ -35,6 +35,8 @@ public class SceneDefinition : ScriptableObject
|
||||
|
||||
public class SceneManager : Singleton<SceneManager>, IManager
|
||||
{
|
||||
public Action<Scene> OnSceneChanged;
|
||||
|
||||
public void Init()
|
||||
{
|
||||
// Load Scene Data
|
||||
@ -142,7 +144,7 @@ public async Task ChangeScene(SceneType sceneType)
|
||||
|
||||
// 씬 로딩 후 초기화 작업
|
||||
CameraManager.Instance.ChangeScene(sceneType);
|
||||
KeyManager.Instance.ChangeScene(sceneType);
|
||||
InputManager.Instance.ChangeScene(sceneType);
|
||||
|
||||
CurrentSceneType = sceneType;
|
||||
|
||||
|
@ -9,6 +9,7 @@
|
||||
using UnityEngine;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.Linq;
|
||||
using DDD;
|
||||
using JetBrains.Annotations;
|
||||
using Sirenix.OdinInspector;
|
||||
using UnityEditor;
|
||||
@ -88,6 +89,8 @@ public static async Task<T> LoadSo<T>() where T : ScriptableObject
|
||||
[Button("데이터 최신화"), EnableIf(nameof(CanFetchData))]
|
||||
private async Task FetchGoogleSheet()
|
||||
{
|
||||
|
||||
|
||||
_availSheetArray = _availSheets.Split('/');
|
||||
|
||||
var prevLog = AssetDatabase.LoadAssetAtPath<GoogleSheetChangeLog>(ChangeLogAssetPath);
|
||||
|
8
Assets/_DDD/_Scripts/InputSystem.meta
Normal file
8
Assets/_DDD/_Scripts/InputSystem.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: aed2f49e843ad9a4a8dbbc13532b7183
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using UnityEngine.InputSystem;
|
||||
|
||||
@ -9,15 +10,17 @@ public enum InputActionMaps
|
||||
Ui = 1,
|
||||
Restaurant = 2,
|
||||
}
|
||||
|
||||
public static class RestaurantActions
|
||||
|
||||
[Flags]
|
||||
public enum RestaurantActions
|
||||
{
|
||||
public const string Move = "Move";
|
||||
public const string Dash = "Dash";
|
||||
public const string Interact = "Interact";
|
||||
None = 0,
|
||||
Move = 1<<0,
|
||||
Dash = 1<<1,
|
||||
Interact = 1<<2
|
||||
}
|
||||
|
||||
public class KeyManager : Singleton<KeyManager>
|
||||
public class InputManager : Singleton<InputManager>
|
||||
{
|
||||
private PlayerInput _currentPlayerInput;
|
||||
|
@ -0,0 +1,255 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &5259510642736920361
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1761643478070701343}
|
||||
- component: {fileID: 5176902543201676162}
|
||||
- component: {fileID: 5246526151924390639}
|
||||
- component: {fileID: 3365694194251356714}
|
||||
- component: {fileID: 127430239903465757}
|
||||
- component: {fileID: 3095965496140440094}
|
||||
m_Layer: 0
|
||||
m_Name: BaseRestaurantCharacter
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1761643478070701343
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5259510642736920361}
|
||||
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: 1111036208394089843}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &5176902543201676162
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5259510642736920361}
|
||||
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!136 &5246526151924390639
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5259510642736920361}
|
||||
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!114 &3365694194251356714
|
||||
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: 061fa444069fcd74c884c1b3379c41b8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &127430239903465757
|
||||
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: 38cb67223546879468e9c0655893e025, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &3095965496140440094
|
||||
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: e20368314a3139f4fb4b4e35af9fcf98, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &6791841979869644848
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1111036208394089843}
|
||||
- component: {fileID: 5817391387681993290}
|
||||
- component: {fileID: 8683566178618629536}
|
||||
- component: {fileID: 1741467189652270979}
|
||||
m_Layer: 0
|
||||
m_Name: VisualLook
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1111036208394089843
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6791841979869644848}
|
||||
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: 1761643478070701343}
|
||||
m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
|
||||
--- !u!33 &5817391387681993290
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6791841979869644848}
|
||||
m_Mesh: {fileID: 0}
|
||||
--- !u!23 &8683566178618629536
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6791841979869644848}
|
||||
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!114 &1741467189652270979
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6791841979869644848}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
skeletonDataAsset: {fileID: 0}
|
||||
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
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3db3fc62639929c4ba6031ca4ae6600c
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -42,8 +42,8 @@ private void Awake()
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_moveAction = KeyManager.Instance.GetAction(InputActionMaps.Restaurant, RestaurantActions.Move);
|
||||
_dashAction = KeyManager.Instance.GetAction(InputActionMaps.Restaurant, RestaurantActions.Dash);
|
||||
_moveAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Move));
|
||||
_dashAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Dash));
|
||||
|
||||
_moveAction.performed += OnMove;
|
||||
_moveAction.canceled += OnMove;
|
@ -0,0 +1,9 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public class RestaurantCharacter : MonoBehaviour, IGameCharacter
|
||||
{
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 061fa444069fcd74c884c1b3379c41b8
|
@ -0,0 +1,9 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public class RestaurantCharacterAnimation : MonoBehaviour
|
||||
{
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e20368314a3139f4fb4b4e35af9fcf98
|
@ -0,0 +1,9 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public class RestaurantCharacterMovement : MonoBehaviour
|
||||
{
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 38cb67223546879468e9c0655893e025
|
100
Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab
Normal file
100
Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab
Normal file
@ -0,0 +1,100 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &3275709266858077019
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: skeletonDataAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 57e95ec929c09d64c9f85a40f849786a, type: 2}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RestaurantPlayer
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 3365694194251356714, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
- {fileID: 127430239903465757, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
insertIndex: 3
|
||||
addedObject: {fileID: 4699468658517678862}
|
||||
- targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
insertIndex: 4
|
||||
addedObject: {fileID: 4956037093100801085}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
--- !u!1 &7316134055819320434 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
|
||||
m_PrefabInstance: {fileID: 3275709266858077019}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &4699468658517678862
|
||||
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: 2d4266c194d3fd346be961b537c811f1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &4956037093100801085
|
||||
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: 0a83ca1b1f17a934192ef91dd4f073b8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 29dcda970aef9584d9b157e766b8a278
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,9 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public class RestaurantPlayerCharacter : RestaurantCharacter
|
||||
{
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2d4266c194d3fd346be961b537c811f1
|
@ -0,0 +1,11 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public class RestaurantPlayerMovement : RestaurantCharacterMovement
|
||||
{
|
||||
// TODO : TryMove // 인풋에 등록할 함수
|
||||
// TODO : CanMove // Check IMovementConstraint
|
||||
// TODO : Move // 실제 트랜스레이션, 슬라이딩, 충돌
|
||||
}
|
||||
}
|
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0a83ca1b1f17a934192ef91dd4f073b8
|
Loading…
Reference in New Issue
Block a user