레스토랑 수정 및 호감도 맵 추가

Assets/02.Scripts/BlueWater/Character/Player/Tycoon/TycoonPlayer.cs

@@ -6,6 +6,7 @@ using DDD.Uis;
 using Sirenix.OdinInspector;
 using Spine.Unity;
 using UnityEngine;
+using UnityEngine.Serialization;
 
 namespace DDD.Players.Tycoons
 {
@@ -74,7 +75,10 @@ namespace DDD.Players.Tycoons
         private Transform _restaurantSpawnLocation;
         
         [SerializeField]
-        private Transform _favorabilitySpawnLocation;
+        private Transform _favorabilitySpawnLocation01;
+        
+        [SerializeField]
+        private Transform _favorabilitySpawnLocation02;
         
         public Material MaterialInstance { get; protected set; }
         
@@ -124,7 +128,8 @@ namespace DDD.Players.Tycoons
             EventManager.OnPickupMealKit += PickupCook;
             EventManager.OnServedCookToCustomer += ServedCook;
             EventManager.OnMoveRestaurant += MoveRestaurant;
-            EventManager.OnMoveFavorability += MoveFavorability;
+            EventManager.OnMoveFavorability01 += MoveFavorability01;
+            EventManager.OnMoveFavorability02 += MoveFavorability02;
 
             TycoonMovement.OnSucceedDash += DashSucceed;
             
@@ -161,7 +166,8 @@ namespace DDD.Players.Tycoons
             EventManager.OnPickupMealKit -= PickupCook;
             EventManager.OnServedCookToCustomer -= ServedCook;
             EventManager.OnMoveRestaurant -= MoveRestaurant;
-            EventManager.OnMoveFavorability -= MoveFavorability;
+            EventManager.OnMoveFavorability01 -= MoveFavorability01;
+            EventManager.OnMoveFavorability02 -= MoveFavorability02;
             
             TycoonMovement.OnSucceedDash -= DashSucceed;
         }
@@ -289,10 +295,16 @@ namespace DDD.Players.Tycoons
             Teleport(_restaurantSpawnLocation.position);
         }
 
-        public void MoveFavorability()
+        public void MoveFavorability01()
         {
             VisualLook.rotation = Quaternion.Euler(new Vector3(0f, 0f, 0f));
-            Teleport(_favorabilitySpawnLocation.position);
+            Teleport(_favorabilitySpawnLocation01.position);
+        }
+        
+        public void MoveFavorability02()
+        {
+            VisualLook.rotation = Quaternion.Euler(new Vector3(0f, 0f, 0f));
+            Teleport(_favorabilitySpawnLocation02.position);
         }
 
         #endregion

Assets/02.Scripts/BlueWater/TycoonCameraManager.cs

@@ -10,7 +10,8 @@ namespace DDD
     public enum TycoonCameraType
     {
         Base = 0,
-        Favorability
+        Favorability01 = 1,
+        Favorability02 = 2
     }
     
     public class TycoonCameraManager : Singleton<TycoonCameraManager>
@@ -35,7 +36,10 @@ namespace DDD
         public CinemachineCamera BaseCamera { get; private set; }
         
         [field: SerializeField]
-        public CinemachineCamera FavorabilityCamera { get; private set; }
+        public CinemachineCamera FavorabilityCamera01 { get; private set; }
+        
+        [field: SerializeField]
+        public CinemachineCamera FavorabilityCamera02 { get; private set; }
 
         [SerializeField]
         private Transform _confinerCollider;
@@ -91,7 +95,8 @@ namespace DDD
         private void Start()
         {
             EventManager.OnMoveRestaurant += MoveRestaurant;
-            EventManager.OnMoveFavorability += MoveFavorability;
+            EventManager.OnMoveFavorability01 += MoveFavorability01;
+            EventManager.OnMoveFavorability02 += MoveFavorability02;
             
             _zoomInAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.ZoomIn);
             _zoomOutAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.ZoomOut);
@@ -127,7 +132,8 @@ namespace DDD
         private void OnDestroy()
         {
             EventManager.OnMoveRestaurant -= MoveRestaurant;
-            EventManager.OnMoveFavorability -= MoveFavorability;
+            EventManager.OnMoveFavorability01 -= MoveFavorability01;
+            EventManager.OnMoveFavorability02 -= MoveFavorability02;
             
             _zoomInAction.performed -= OnZoomChanged;
             _zoomOutAction.performed -= OnZoomChanged;
@@ -152,7 +158,8 @@ namespace DDD
             _baseCameraComposer = BaseCamera.GetComponent<CinemachinePositionComposer>();
             
             _cinemachineCameras.Add(BaseCamera);
-            _cinemachineCameras.Add(FavorabilityCamera);
+            _cinemachineCameras.Add(FavorabilityCamera01);
+            _cinemachineCameras.Add(FavorabilityCamera02);
 
             SetMainCamera(TycoonCameraType.Base);
         }
@@ -172,7 +179,8 @@ namespace DDD
             var newMainCamera = tycoonCameraType switch
             {
                 TycoonCameraType.Base => BaseCamera,
-                TycoonCameraType.Favorability => FavorabilityCamera,
+                TycoonCameraType.Favorability01 => FavorabilityCamera01,
+                TycoonCameraType.Favorability02 => FavorabilityCamera02,
                 _ => throw new ArgumentOutOfRangeException(nameof(tycoonCameraType), tycoonCameraType, null)
             };
 
@@ -216,10 +224,16 @@ namespace DDD
             SetMainCamera(TycoonCameraType.Base);
         }
 
-        public void MoveFavorability()
+        public void MoveFavorability01()
         {
             _cinemachineBrain.DefaultBlend = new CinemachineBlendDefinition(CinemachineBlendDefinition.Styles.Cut, 0f);
-            SetMainCamera(TycoonCameraType.Favorability);
+            SetMainCamera(TycoonCameraType.Favorability01);
+        }
+        
+        public void MoveFavorability02()
+        {
+            _cinemachineBrain.DefaultBlend = new CinemachineBlendDefinition(CinemachineBlendDefinition.Styles.Cut, 0f);
+            SetMainCamera(TycoonCameraType.Favorability02);
         }
 
         #endregion

Assets/02.Scripts/DDD/Ui/DevelopmentUi.cs

@@ -25,9 +25,14 @@ public class DevelopmentUi : MonoBehaviour
         EventManager.InvokeMoveRestaurant();
     }
 
-    public void MoveFavorability()
+    public void MoveFavorability01()
     {
-        EventManager.InvokeMoveFavorability();
+        EventManager.InvokeMoveFavorability01();
+    }
+    
+    public void MoveFavorability02()
+    {
+        EventManager.InvokeMoveFavorability02();
     }
     
     public void CreateServer()

Assets/02.Scripts/EventManager.cs

@@ -28,10 +28,16 @@ public static class EventManager
         OnMoveRestaurant?.Invoke();
     }
     
-    public static Action OnMoveFavorability;
+    public static Action OnMoveFavorability01;
-    public static void InvokeMoveFavorability()
+    public static void InvokeMoveFavorability01()
     {
-        OnMoveFavorability?.Invoke();
+        OnMoveFavorability01?.Invoke();
+    }
+    
+    public static Action OnMoveFavorability02;
+    public static void InvokeMoveFavorability02()
+    {
+        OnMoveFavorability02?.Invoke();
     }
 
     public static Action OnChangedDisplay;

Assets/03.Images/DDD/Props/Environments/Cabinet03.png.meta

@@ -46,7 +46,7 @@ TextureImporter:
   spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
-  alignment: 0
+  alignment: 7
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}

Assets/05.Prefabs/DDD/Props/Environments/Box01.prefab

@@ -0,0 +1,87 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &129321299893172345
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 655b549abbb84c2409890662d705a0c5, type: 3}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2}
+    - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Name
+      value: Box01
+      objectReference: {fileID: 0}
+    - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Size.y
+      value: 0.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Size.z
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Center.y
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Center.z
+      value: 0.05
+      objectReference: {fileID: 0}
+    - target: {fileID: 8884531212319162473, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 655b549abbb84c2409890662d705a0c5, type: 3}
+    - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}

Assets/05.Prefabs/DDD/Props/Environments/Box01.prefab.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 25d4f771628ec0047988c07656f78300
+guid: 3690bae3972b7c24487cae534bc8055c
-folderAsset: yes
+PrefabImporter:
-DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/05.Prefabs/DDD/Props/Environments/Cabinet03.prefab

@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &129321299893172345
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 696bf3142b2f2ab40a694fad42e4d5bc, type: 3}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2}
+    - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Name
+      value: Cabinet03
+      objectReference: {fileID: 0}
+    - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 2.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 2.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8884531212319162473, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 696bf3142b2f2ab40a694fad42e4d5bc, type: 3}
+    - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}

Assets/05.Prefabs/DDD/Props/Environments/Cabinet03.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 16e0db4821205224697cb3164ce50a2b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/05.Prefabs/DDD/Props/Environments/Frame01.prefab

@@ -8,10 +8,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 833125971660403034, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_SortingOrder
+      value: 4
+      objectReference: {fileID: 0}
     - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 21300000, guid: 6dd5fb245b018f0409f54119bdbb6d99, type: 3}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_SortingOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
       propertyPath: m_WasSpriteAssigned
       value: 1

Assets/05.Prefabs/DDD/Props/Environments/Frame02.prefab

@@ -8,6 +8,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 833125971660403034, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_SortingOrder
+      value: 4
+      objectReference: {fileID: 0}
     - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
       propertyPath: m_Sprite
       value: 

Assets/05.Prefabs/DDD/Props/Environments/Frame03.prefab

@@ -0,0 +1,75 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &129321299893172345
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 833125971660403034, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_SortingOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 44cd3e9972db77842b1cc8fa3b2cce96, type: 3}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2}
+    - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Name
+      value: Frame03
+      objectReference: {fileID: 0}
+    - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8884531212319162473, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 44cd3e9972db77842b1cc8fa3b2cce96, type: 3}
+    - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}

Assets/05.Prefabs/DDD/Props/Environments/Frame03.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 88fb7d39cab322744ab8c88516125122
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: