0.3.3.9 업데이트
@ -5716,7 +5716,7 @@ RectTransform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 437358690}
|
m_GameObject: {fileID: 437358690}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: -0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
@ -5726,7 +5726,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 50, y: -30}
|
m_AnchoredPosition: {x: 290, y: -30}
|
||||||
m_SizeDelta: {x: 156.65, y: 50}
|
m_SizeDelta: {x: 156.65, y: 50}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &437358692
|
--- !u!114 &437358692
|
||||||
@ -6983,10 +6983,10 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 437358691}
|
|
||||||
- {fileID: 787877602}
|
- {fileID: 787877602}
|
||||||
- {fileID: 795005108}
|
- {fileID: 795005108}
|
||||||
- {fileID: 1289750986}
|
- {fileID: 1289750986}
|
||||||
|
- {fileID: 437358691}
|
||||||
m_Father: {fileID: 588336991}
|
m_Father: {fileID: 588336991}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
@ -16664,6 +16664,18 @@ PrefabInstance:
|
|||||||
propertyPath: _instanceLocation
|
propertyPath: _instanceLocation
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 410235870}
|
objectReference: {fileID: 410235870}
|
||||||
|
- target: {fileID: 4119089025960676272, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7640850047456124134, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8858452115783968250, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 9041926907780427371, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
|
- target: {fileID: 9041926907780427371, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: NewTycoonMap
|
value: NewTycoonMap
|
||||||
@ -22659,6 +22671,7 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
<StageDataSo>k__BackingField: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2}
|
<StageDataSo>k__BackingField: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2}
|
||||||
|
_mushroomObject: {fileID: 9017181398980009727, guid: 6ae3ef0fd03a4f14bb60802eb4fc0fa8, type: 3}
|
||||||
--- !u!114 &1665075873
|
--- !u!114 &1665075873
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -15,7 +15,7 @@ namespace BlueWater.BehaviorTrees.Actions
|
|||||||
|
|
||||||
public override void OnStart()
|
public override void OnStart()
|
||||||
{
|
{
|
||||||
if (_crew.CrewInteraction != null)
|
if (_crew.CrewInteraction != null && _crew.CrewInteraction.CenterTransform)
|
||||||
{
|
{
|
||||||
_crew.AIMovement.Move(_crew.CrewInteraction.CenterTransform.position);
|
_crew.AIMovement.Move(_crew.CrewInteraction.CenterTransform.position);
|
||||||
}
|
}
|
||||||
|
@ -95,7 +95,6 @@ namespace BlueWater.Npcs.Crews
|
|||||||
|
|
||||||
protected virtual void Update()
|
protected virtual void Update()
|
||||||
{
|
{
|
||||||
//CurrentAnimationState.UpdateState(this);
|
|
||||||
HandleMovement();
|
HandleMovement();
|
||||||
FlipVisualLook();
|
FlipVisualLook();
|
||||||
}
|
}
|
||||||
|
@ -439,6 +439,23 @@ namespace BlueWater.Npcs.Customers
|
|||||||
{
|
{
|
||||||
var spawnPosition = transform.position + new Vector3(0f, 0f, 0.1f);
|
var spawnPosition = transform.position + new Vector3(0f, 0f, 0.1f);
|
||||||
Instantiate(_vomiting, spawnPosition, _vomiting.transform.rotation);
|
Instantiate(_vomiting, spawnPosition, _vomiting.transform.rotation);
|
||||||
|
TycoonStageController.VomitCount++;
|
||||||
|
if (TycoonStageController.VomitCount >= 3)
|
||||||
|
{
|
||||||
|
// TODO : 80% 곰팡이, 20% 버섯
|
||||||
|
var random = Random.Range(0, 101);
|
||||||
|
if (random <= 20)
|
||||||
|
{
|
||||||
|
print("버섯 생성");
|
||||||
|
EventManager.InvokeCreateMushroom();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print("곰팡이 생성");
|
||||||
|
EventManager.InvokeCreateMold();
|
||||||
|
}
|
||||||
|
TycoonStageController.VomitCount = 0;
|
||||||
|
}
|
||||||
IsVomited = true;
|
IsVomited = true;
|
||||||
StateMachineController.TransitionToState(IdleState, this);
|
StateMachineController.TransitionToState(IdleState, this);
|
||||||
}
|
}
|
||||||
|
@ -125,6 +125,14 @@ namespace BlueWater.Players.Tycoons
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void OnManual(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
if (context.performed)
|
||||||
|
{
|
||||||
|
TycoonUiManager.Instance.ManualBook.Open();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void OnZoomOut(InputAction.CallbackContext context)
|
public void OnZoomOut(InputAction.CallbackContext context)
|
||||||
{
|
{
|
||||||
var value = context.ReadValue<float>();
|
var value = context.ReadValue<float>();
|
||||||
@ -154,22 +162,6 @@ namespace BlueWater.Players.Tycoons
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bar
|
|
||||||
public void OnPour(InputAction.CallbackContext context)
|
|
||||||
{
|
|
||||||
var bar = FindAnyObjectByType<Bar>();
|
|
||||||
if (!bar) return;
|
|
||||||
|
|
||||||
if (context.performed)
|
|
||||||
{
|
|
||||||
bar.ActiveIsPouring();
|
|
||||||
}
|
|
||||||
else if (context.canceled)
|
|
||||||
{
|
|
||||||
bar.InActiveIsPouring();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Methods
|
#region Methods
|
||||||
|
@ -256,6 +256,20 @@ namespace BlueWater
|
|||||||
OnAutoSupplyBarrels?.Invoke();
|
OnAutoSupplyBarrels?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 버섯 생성 이벤트
|
||||||
|
public static Action OnCreateMushroom;
|
||||||
|
public static void InvokeCreateMushroom()
|
||||||
|
{
|
||||||
|
OnCreateMushroom?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 곰팡이 생성 이벤트
|
||||||
|
public static Action OnCreateMold;
|
||||||
|
public static void InvokeCreateMold()
|
||||||
|
{
|
||||||
|
OnCreateMold?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -58,7 +58,7 @@ namespace BlueWater.Tycoons
|
|||||||
EventManager.OnAddBarrels += AddCurrentAmount;
|
EventManager.OnAddBarrels += AddCurrentAmount;
|
||||||
EventManager.OnAutoSupplyBarrels += AutoSupply;
|
EventManager.OnAutoSupplyBarrels += AutoSupply;
|
||||||
|
|
||||||
_liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.Lock;
|
_liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock;
|
||||||
InteractionMessage = $"{_liquidData.Name} 따르기";
|
InteractionMessage = $"{_liquidData.Name} 따르기";
|
||||||
_instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity);
|
_instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity);
|
||||||
}
|
}
|
||||||
@ -144,7 +144,7 @@ namespace BlueWater.Tycoons
|
|||||||
public void Activate()
|
public void Activate()
|
||||||
{
|
{
|
||||||
IsActivated = true;
|
IsActivated = true;
|
||||||
_liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.Lock;
|
_liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock;
|
||||||
SetCurrentAmount(_liquidData.GetMaxAmount());
|
SetCurrentAmount(_liquidData.GetMaxAmount());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,9 +7,6 @@ namespace BlueWater.Tycoons
|
|||||||
{
|
{
|
||||||
public class CustomerTable : MonoBehaviour
|
public class CustomerTable : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField]
|
|
||||||
private GameObject _carpetObject;
|
|
||||||
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
private List<TableSeat> _tableSeats;
|
private List<TableSeat> _tableSeats;
|
||||||
|
|
||||||
@ -59,13 +56,11 @@ namespace BlueWater.Tycoons
|
|||||||
public void Show()
|
public void Show()
|
||||||
{
|
{
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
_carpetObject.SetActive(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Hide()
|
public void Hide()
|
||||||
{
|
{
|
||||||
gameObject.SetActive(false);
|
gameObject.SetActive(false);
|
||||||
_carpetObject.SetActive(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
88
Assets/02.Scripts/Prop/Tycoon/Mushroom.cs
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
|
||||||
|
using System;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace BlueWater.Tycoons
|
||||||
|
{
|
||||||
|
[Serializable]
|
||||||
|
public class Mushroom : InteractionFurniture
|
||||||
|
{
|
||||||
|
[SerializeField]
|
||||||
|
private float _playerHoldingTime = 3f;
|
||||||
|
|
||||||
|
private Sprite _mushroomSprite;
|
||||||
|
private bool _isPlayerInteracting;
|
||||||
|
|
||||||
|
protected override void OnEnable()
|
||||||
|
{
|
||||||
|
base.OnEnable();
|
||||||
|
|
||||||
|
Initialize();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
if (InteractionCanvas.BalloonUi.IsWaitTimeOver())
|
||||||
|
{
|
||||||
|
Destroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (IsShowing)
|
||||||
|
{
|
||||||
|
EventManager.InvokeHoldInteracting(HoldingElapsedTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (HoldingElapsedTime >= 1f)
|
||||||
|
{
|
||||||
|
TycoonManager.Instance.TycoonStatus.CurrentPlayerHealth++;
|
||||||
|
|
||||||
|
Destroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_isPlayerInteracting)
|
||||||
|
{
|
||||||
|
HoldingElapsedTime += Time.deltaTime / _playerHoldingTime;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (HoldingElapsedTime > 0f)
|
||||||
|
{
|
||||||
|
HoldingElapsedTime -= Time.deltaTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Initialize()
|
||||||
|
{
|
||||||
|
_mushroomSprite = VisualLook.GetComponent<SpriteRenderer>().sprite;
|
||||||
|
InteractionCanvas.BalloonUi.OrderItem(_mushroomSprite, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.MushroomWaitTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Interaction()
|
||||||
|
{
|
||||||
|
GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = true;
|
||||||
|
_isPlayerInteracting = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void CancelInteraction()
|
||||||
|
{
|
||||||
|
GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = false;
|
||||||
|
_isPlayerInteracting = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanInteraction()
|
||||||
|
{
|
||||||
|
return !GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpAnything();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Destroy()
|
||||||
|
{
|
||||||
|
if (_isPlayerInteracting)
|
||||||
|
{
|
||||||
|
GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Destroy(gameObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
2
Assets/02.Scripts/Prop/Tycoon/Mushroom.cs.meta
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6fe2e54f1eabe774a99eaf6fe7068379
|
@ -24,7 +24,7 @@ namespace BlueWater.Tycoons
|
|||||||
private float _crewHoldingTime = 9f;
|
private float _crewHoldingTime = 9f;
|
||||||
|
|
||||||
private LevelData _currentLevelData;
|
private LevelData _currentLevelData;
|
||||||
private Sprite vomitingImage;
|
private Sprite _vomitingImage;
|
||||||
private Coroutine _findCleanerCrewInstance;
|
private Coroutine _findCleanerCrewInstance;
|
||||||
private bool _isPlayerInteracting;
|
private bool _isPlayerInteracting;
|
||||||
private bool _isCrewInteracting;
|
private bool _isCrewInteracting;
|
||||||
@ -100,9 +100,8 @@ namespace BlueWater.Tycoons
|
|||||||
|
|
||||||
public void Initialize()
|
public void Initialize()
|
||||||
{
|
{
|
||||||
InteractionMessage = "치우기";
|
_vomitingImage = VisualLook.GetComponent<SpriteRenderer>().sprite;
|
||||||
vomitingImage = VisualLook.GetComponent<SpriteRenderer>().sprite;
|
InteractionCanvas.BalloonUi.OrderItem(_vomitingImage, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingWaitTime);
|
||||||
InteractionCanvas.BalloonUi.OrderItem(vomitingImage, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingWaitTime);
|
|
||||||
var crewController = TycoonManager.Instance.CrewController;
|
var crewController = TycoonManager.Instance.CrewController;
|
||||||
Utils.StartUniqueCoroutine(this, ref _findCleanerCrewInstance,
|
Utils.StartUniqueCoroutine(this, ref _findCleanerCrewInstance,
|
||||||
crewController.FindClosestCrewCoroutine(CenterTransform.position, crewController.CleanerCrews, crew => crew.OnMission(this)));
|
crewController.FindClosestCrewCoroutine(CenterTransform.position, crewController.CleanerCrews, crew => crew.OnMission(this)));
|
||||||
|
@ -15,4 +15,6 @@ MonoBehaviour:
|
|||||||
<Gold>k__BackingField: {fileID: 21300000, guid: 51c11bee66d04f64d8d44afcb9975321, type: 3}
|
<Gold>k__BackingField: {fileID: 21300000, guid: 51c11bee66d04f64d8d44afcb9975321, type: 3}
|
||||||
<EmptyBeerGlass>k__BackingField: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3}
|
<EmptyBeerGlass>k__BackingField: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3}
|
||||||
<FullBeerGlass>k__BackingField: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3}
|
<FullBeerGlass>k__BackingField: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3}
|
||||||
<Lock>k__BackingField: {fileID: 21300000, guid: c0cab5e7cc9fc5147b3f0aef86b2feab, type: 3}
|
<BarrelLock>k__BackingField: {fileID: 21300000, guid: c0cab5e7cc9fc5147b3f0aef86b2feab, type: 3}
|
||||||
|
<ServingTable>k__BackingField: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3}
|
||||||
|
<BartenderTable>k__BackingField: {fileID: 21300000, guid: e9275315ca60c1f479efa8f9393c7627, type: 3}
|
||||||
|
@ -17,3 +17,4 @@ MonoBehaviour:
|
|||||||
<VomitingWaitTime>k__BackingField: 20
|
<VomitingWaitTime>k__BackingField: 20
|
||||||
<DirtyTablePercent>k__BackingField: 100
|
<DirtyTablePercent>k__BackingField: 100
|
||||||
<DirtyTableWaitTime>k__BackingField: 30
|
<DirtyTableWaitTime>k__BackingField: 30
|
||||||
|
<MushroomWaitTime>k__BackingField: 30
|
||||||
|
@ -15,6 +15,12 @@ namespace BlueWater
|
|||||||
public Sprite FullBeerGlass { get; private set; }
|
public Sprite FullBeerGlass { get; private set; }
|
||||||
|
|
||||||
[field: SerializeField]
|
[field: SerializeField]
|
||||||
public Sprite Lock { get; private set; }
|
public Sprite BarrelLock { get; private set; }
|
||||||
|
|
||||||
|
[field: SerializeField]
|
||||||
|
public Sprite ServingTable { get; private set; }
|
||||||
|
|
||||||
|
[field: SerializeField]
|
||||||
|
public Sprite BartenderTable { get; private set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -19,5 +19,8 @@ namespace BlueWater.Tycoons
|
|||||||
|
|
||||||
[field: SerializeField]
|
[field: SerializeField]
|
||||||
public int DirtyTableWaitTime { get; private set; } = 30;
|
public int DirtyTableWaitTime { get; private set; } = 30;
|
||||||
|
|
||||||
|
[field: SerializeField]
|
||||||
|
public int MushroomWaitTime { get; private set; } = 30;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -13,21 +13,35 @@ namespace BlueWater.Tycoons
|
|||||||
[field: SerializeField, Required]
|
[field: SerializeField, Required]
|
||||||
public StageDataSo StageDataSo { get; private set; }
|
public StageDataSo StageDataSo { get; private set; }
|
||||||
|
|
||||||
|
[SerializeField]
|
||||||
|
private Mushroom _mushroomObject;
|
||||||
|
|
||||||
public Dictionary<string, int> InstanceCocktailDatas { get; private set; } = new();
|
public Dictionary<string, int> InstanceCocktailDatas { get; private set; } = new();
|
||||||
|
|
||||||
|
public static int VomitCount;
|
||||||
|
|
||||||
private bool _isClosedTime;
|
private bool _isClosedTime;
|
||||||
private TycoonManager _tycoonManager;
|
private TycoonManager _tycoonManager;
|
||||||
|
private AstarPath _astarPath;
|
||||||
private Coroutine _startStageCoroutineInstance;
|
private Coroutine _startStageCoroutineInstance;
|
||||||
private TimeSpan _closedTime;
|
private TimeSpan _closedTime;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
_astarPath = FindAnyObjectByType<AstarPath>();
|
||||||
|
}
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
_tycoonManager = TycoonManager.Instance;
|
_tycoonManager = TycoonManager.Instance;
|
||||||
|
|
||||||
|
VomitCount = 0;
|
||||||
|
|
||||||
EventManager.OnInitializedPlayerInput += StartStage;
|
EventManager.OnInitializedPlayerInput += StartStage;
|
||||||
EventManager.OnMakeCocktailCompleted += AddInstanceCocktail;
|
EventManager.OnMakeCocktailCompleted += AddInstanceCocktail;
|
||||||
EventManager.OnCocktailServedToCustomer += RemoveInstanceCocktail;
|
EventManager.OnCocktailServedToCustomer += RemoveInstanceCocktail;
|
||||||
EventManager.OnCocktailDiscarded += RemoveInstanceCocktail;
|
EventManager.OnCocktailDiscarded += RemoveInstanceCocktail;
|
||||||
|
EventManager.OnCreateMushroom += CreateMushroom;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
@ -36,6 +50,7 @@ namespace BlueWater.Tycoons
|
|||||||
EventManager.OnMakeCocktailCompleted -= AddInstanceCocktail;
|
EventManager.OnMakeCocktailCompleted -= AddInstanceCocktail;
|
||||||
EventManager.OnCocktailServedToCustomer -= RemoveInstanceCocktail;
|
EventManager.OnCocktailServedToCustomer -= RemoveInstanceCocktail;
|
||||||
EventManager.OnCocktailDiscarded -= RemoveInstanceCocktail;
|
EventManager.OnCocktailDiscarded -= RemoveInstanceCocktail;
|
||||||
|
EventManager.OnCreateMushroom -= CreateMushroom;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void StartStage()
|
private void StartStage()
|
||||||
@ -102,5 +117,12 @@ namespace BlueWater.Tycoons
|
|||||||
}
|
}
|
||||||
print("\n");
|
print("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void CreateMushroom()
|
||||||
|
{
|
||||||
|
var spawnPosition = Utils.RandomPositionOnGraph();
|
||||||
|
var mushroom = Instantiate(_mushroomObject, spawnPosition, _mushroomObject.transform.rotation);
|
||||||
|
mushroom.Initialize();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -21,12 +21,6 @@ namespace BlueWater.Uis
|
|||||||
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
private float _duration = 2f;
|
private float _duration = 2f;
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private float _shakeAmount = 0.1f;
|
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private int _shakeVibrato = 4;
|
|
||||||
|
|
||||||
public void Initialize(int gold)
|
public void Initialize(int gold)
|
||||||
{
|
{
|
||||||
|
@ -17,12 +17,6 @@ namespace BlueWater
|
|||||||
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
private float _duration = 2f;
|
private float _duration = 2f;
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private float _shakeAmount = 0.1f;
|
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private int _shakeVibrato = 4;
|
|
||||||
|
|
||||||
public void Initialize(int addedLiquid)
|
public void Initialize(int addedLiquid)
|
||||||
{
|
{
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Pathfinding;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using Random = UnityEngine.Random;
|
||||||
|
|
||||||
namespace BlueWater.Utility
|
namespace BlueWater.Utility
|
||||||
{
|
{
|
||||||
@ -54,5 +56,39 @@ namespace BlueWater.Utility
|
|||||||
|
|
||||||
list.Remove(item);
|
list.Remove(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Vector3 RandomPositionOnGraph(int graphIndex = 0)
|
||||||
|
{
|
||||||
|
// 그래프 인덱스가 유효한지 검사
|
||||||
|
if (graphIndex < 0 || graphIndex >= AstarPath.active.data.graphs.Length)
|
||||||
|
{
|
||||||
|
throw new Exception("유효하지 않은 그래프 인덱스입니다.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 특정 그래프를 가져와 모든 walkable 노드를 수집
|
||||||
|
List<GraphNode> walkableNodes = new List<GraphNode>();
|
||||||
|
NavGraph graph = AstarPath.active.data.graphs[graphIndex];
|
||||||
|
|
||||||
|
graph.GetNodes(node =>
|
||||||
|
{
|
||||||
|
if (node.Walkable)
|
||||||
|
{
|
||||||
|
walkableNodes.Add(node);
|
||||||
|
}
|
||||||
|
return true; // 모든 노드를 반복하도록 true 반환
|
||||||
|
});
|
||||||
|
|
||||||
|
// walkable한 노드가 없을 경우 Vector3.zero 반환
|
||||||
|
if (walkableNodes.Count == 0)
|
||||||
|
{
|
||||||
|
throw new Exception("이동 가능한 노드가 없습니다.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// walkable한 노드 중 하나를 무작위로 선택
|
||||||
|
GraphNode randomNode = walkableNodes[Random.Range(0, walkableNodes.Count)];
|
||||||
|
|
||||||
|
// 선택한 노드의 위치 반환
|
||||||
|
return (Vector3)randomNode.position;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
BIN
Assets/03.Images/Props/Furniture/BartenderTable.png
Normal file
After Width: | Height: | Size: 87 KiB |
BIN
Assets/03.Images/Props/Furniture/LiquidBarrelDirty.png
Normal file
After Width: | Height: | Size: 201 KiB |
143
Assets/03.Images/Props/Furniture/LiquidBarrelDirty.png.meta
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ba260ff89030fda4b99b2bb66f6da61d
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 7
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 512
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: WindowsStoreApps
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/03.Images/Props/Furniture/Mushroom.png
Normal file
After Width: | Height: | Size: 154 KiB |
143
Assets/03.Images/Props/Furniture/Mushroom.png.meta
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9b1a96853ff579e448f90dd066ea0eb0
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 7
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 512
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: WindowsStoreApps
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 89 KiB |
Before Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 85 KiB |
Before Width: | Height: | Size: 314 KiB After Width: | Height: | Size: 128 KiB |
@ -47,8 +47,8 @@ TextureImporter:
|
|||||||
spriteExtrude: 1
|
spriteExtrude: 1
|
||||||
spriteMeshType: 1
|
spriteMeshType: 1
|
||||||
alignment: 9
|
alignment: 9
|
||||||
spritePivot: {x: 0.5, y: 0.3}
|
spritePivot: {x: 0.5, y: 0.27}
|
||||||
spritePixelsToUnits: 1024
|
spritePixelsToUnits: 512
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
alphaUsage: 1
|
alphaUsage: 1
|
||||||
|
Before Width: | Height: | Size: 174 KiB After Width: | Height: | Size: 174 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 13 KiB |
@ -54,10 +54,9 @@ MonoBehaviour:
|
|||||||
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
|
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
|
||||||
<EnableInteraction>k__BackingField: 1
|
<EnableInteraction>k__BackingField: 1
|
||||||
<InteractionRadius>k__BackingField: 0.6
|
<InteractionRadius>k__BackingField: 0.6
|
||||||
<InteractionMessage>k__BackingField:
|
<InteractionMessage>k__BackingField: Cleaning up table
|
||||||
IsOpened: 0
|
IsOpened: 0
|
||||||
_payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3}
|
_payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3}
|
||||||
_instanceLocation: {fileID: 0}
|
|
||||||
_offset: {x: 0, y: 1.5, z: 0}
|
_offset: {x: 0, y: 1.5, z: 0}
|
||||||
<IsOccupied>k__BackingField: 0
|
<IsOccupied>k__BackingField: 0
|
||||||
<IsReserved>k__BackingField: 0
|
<IsReserved>k__BackingField: 0
|
||||||
@ -383,10 +382,9 @@ MonoBehaviour:
|
|||||||
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
|
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
|
||||||
<EnableInteraction>k__BackingField: 1
|
<EnableInteraction>k__BackingField: 1
|
||||||
<InteractionRadius>k__BackingField: 0.6
|
<InteractionRadius>k__BackingField: 0.6
|
||||||
<InteractionMessage>k__BackingField:
|
<InteractionMessage>k__BackingField: Cleaning up table
|
||||||
IsOpened: 0
|
IsOpened: 0
|
||||||
_payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3}
|
_payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3}
|
||||||
_instanceLocation: {fileID: 0}
|
|
||||||
_offset: {x: 0, y: 1.5, z: 0}
|
_offset: {x: 0, y: 1.5, z: 0}
|
||||||
<IsOccupied>k__BackingField: 0
|
<IsOccupied>k__BackingField: 0
|
||||||
<IsReserved>k__BackingField: 0
|
<IsReserved>k__BackingField: 0
|
||||||
|
221
Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab
Normal file
@ -0,0 +1,221 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1001 &7343451337687172630
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransformParent: {fileID: 0}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 40
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1702261025824090784, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_SortingOrder
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_IsTrigger
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalScale.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalScale.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalScale.z
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 80
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_Sprite
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 21300000, guid: 9b1a96853ff579e448f90dd066ea0eb0, type: 3}
|
||||||
|
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_WasSpriteAssigned
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: 'm_Materials.Array.data[0]'
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
- target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Mushroom
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5024482427928425524, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_Sprite
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 21300000, guid: a327d1fc80d90bd438cfcd1ad2b219c7, type: 3}
|
||||||
|
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_Color.b
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_Color.g
|
||||||
|
value: 0.026785713
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_Color.r
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_FillAmount
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_FillMethod
|
||||||
|
value: 4
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_FillOrigin
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 90
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalScale.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalScale.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalScale.z
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_Sprite
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3}
|
||||||
|
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_Sprite
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 21300000, guid: 9b1a96853ff579e448f90dd066ea0eb0, type: 3}
|
||||||
|
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_WasSpriteAssigned
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents:
|
||||||
|
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
insertIndex: -1
|
||||||
|
addedObject: {fileID: 9017181398980009727}
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
--- !u!1 &5897095096647521783 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 7343451337687172630}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &9017181398980009727
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5897095096647521783}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 6fe2e54f1eabe774a99eaf6fe7068379, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
<CenterTransform>k__BackingField: {fileID: 5927803667513949971}
|
||||||
|
<VisualLook>k__BackingField: {fileID: 6077686033771388879}
|
||||||
|
<InteractionCanvas>k__BackingField: {fileID: 6533109861150454071}
|
||||||
|
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
|
||||||
|
<EnableInteraction>k__BackingField: 1
|
||||||
|
<InteractionRadius>k__BackingField: 0.6
|
||||||
|
<InteractionMessage>k__BackingField: Cleaning up mushroom
|
||||||
|
IsOpened: 0
|
||||||
|
_playerHoldingTime: 3
|
||||||
|
--- !u!4 &5927803667513949971 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 7343451337687172630}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!212 &6077686033771388879 stripped
|
||||||
|
SpriteRenderer:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 7343451337687172630}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &6533109861150454071 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 7343451337687172630}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6ae3ef0fd03a4f14bb60802eb4fc0fa8
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -26,7 +26,7 @@ Transform:
|
|||||||
m_GameObject: {fileID: 6373979881487551315}
|
m_GameObject: {fileID: 6373979881487551315}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0.679, z: -0}
|
m_LocalPosition: {x: 0, y: 0.438, z: -0}
|
||||||
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
||||||
m_ConstrainProportionsScale: 1
|
m_ConstrainProportionsScale: 1
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@ -130,7 +130,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_Sprite
|
propertyPath: m_Sprite
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 21300000, guid: 2c91f9927b2422c4382675d00e294834, type: 3}
|
objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3}
|
||||||
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_WasSpriteAssigned
|
propertyPath: m_WasSpriteAssigned
|
||||||
value: 1
|
value: 1
|
||||||
@ -143,6 +143,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ServingTable02
|
value: ServingTable02
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 1.3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_LocalEulerAnglesHint.x
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
value: 30
|
value: 30
|
||||||
@ -153,15 +157,15 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_LocalScale.x
|
propertyPath: m_LocalScale.x
|
||||||
value: 0.7
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_LocalScale.y
|
propertyPath: m_LocalScale.y
|
||||||
value: 0.7
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_LocalScale.z
|
propertyPath: m_LocalScale.z
|
||||||
value: 0.7
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
@ -206,7 +210,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_Sprite
|
propertyPath: m_Sprite
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 21300000, guid: 2c91f9927b2422c4382675d00e294834, type: 3}
|
objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3}
|
||||||
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_WasSpriteAssigned
|
propertyPath: m_WasSpriteAssigned
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -12,6 +12,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.x
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
value: 40
|
value: 40
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1702261025824090784, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
|
propertyPath: m_SortingOrder
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
- target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 1
|
value: 1
|
||||||
@ -203,10 +207,9 @@ MonoBehaviour:
|
|||||||
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
|
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
|
||||||
<EnableInteraction>k__BackingField: 1
|
<EnableInteraction>k__BackingField: 1
|
||||||
<InteractionRadius>k__BackingField: 0.5
|
<InteractionRadius>k__BackingField: 0.5
|
||||||
<InteractionMessage>k__BackingField: "\uCE58\uC6B0\uAE30"
|
<InteractionMessage>k__BackingField: Cleaning up vomiting
|
||||||
IsOpened: 0
|
IsOpened: 0
|
||||||
_payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3}
|
_payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3}
|
||||||
_instanceLocation: {fileID: 0}
|
|
||||||
_offset: {x: 0, y: 1.5, z: 0}
|
_offset: {x: 0, y: 1.5, z: 0}
|
||||||
_playerHoldingTime: 3
|
_playerHoldingTime: 3
|
||||||
_crewHoldingTime: 9
|
_crewHoldingTime: 9
|
||||||
|