iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.5.8

Browse Source
This commit is contained in:
NTG_Lenovo 2024-12-03 17:02:15 +09:00
parent 2c0fcd5e48
commit 8d012763bb
58 changed files with 321 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Assets/02.Scripts/Audio/AudioManager.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
@ -6,6 +7,22 @@ using UnityEngine.SceneManagement;
namespace BlueWater.Audios
{
[Serializable]
public class SfxPitch
{
[field: SerializeField]
public bool IsIgnoreTimeScale { get; set; }
[field: SerializeField]
public float PitchValue { get; set; }
public SfxPitch(bool isIgnoreTimeScale, float pitchValue)
{
IsIgnoreTimeScale = isIgnoreTimeScale;
PitchValue = pitchValue;
}
}
public class AudioManager : Singleton<AudioManager>
{
[Title("오디오 데이터")]
@ -37,10 +54,10 @@ namespace BlueWater.Audios
private Dictionary<string, AudioClip> _bgmDictionary;
private Dictionary<string, AudioClip> _sfxDictionary;
private Dictionary<AudioSource, SfxPitch> _sfxPitchDictionary;
private Dictionary<string, float> _sfxPlayTimeDictionary;
private AudioSource _bgmAudioSource;
private Dictionary<AudioSource, float> _sfxPitchDictionary;
private Dictionary<string, float> _sfxPlayTimeDictionary;
protected override void OnAwake()
{
@ -84,13 +101,13 @@ namespace BlueWater.Audios
_bgmAudioSource.outputAudioMixerGroup = _bgmMixerGroup;
_bgmAudioSource.loop = true;
_sfxPitchDictionary = new Dictionary<AudioSource, float>(_sfxChannelCount);
_sfxPitchDictionary = new Dictionary<AudioSource, SfxPitch>(_sfxChannelCount);
for (var i = 0; i < _sfxChannelCount; i++)
{
var sfxAudioSource = gameObject.AddComponent<AudioSource>();
sfxAudioSource.outputAudioMixerGroup = _sfxMixerGroup;
sfxAudioSource.loop = false;
_sfxPitchDictionary[sfxAudioSource] = sfxAudioSource.pitch;
_sfxPitchDictionary[sfxAudioSource] = new SfxPitch(false, sfxAudioSource.pitch);
}
}
@ -131,15 +148,14 @@ namespace BlueWater.Audios
if (ignoreTimeScale)
{
// TimeScale의 영향을 받지 않는 pitch 설정
_sfxPitchDictionary[availableSfxAudioSource] = duration.HasValue ? value.length / duration.Value : 1f;
availableSfxAudioSource.pitch = _sfxPitchDictionary[availableSfxAudioSource];
_sfxPitchDictionary[availableSfxAudioSource] = new SfxPitch(true, 1f);
availableSfxAudioSource.pitch = 1f;
}
else
{
// TimeScale의 영향을 받는 pitch 설정
_sfxPitchDictionary[availableSfxAudioSource] = duration.HasValue ? value.length / duration.Value : 1f;
availableSfxAudioSource.pitch = _sfxPitchDictionary[availableSfxAudioSource] * Time.timeScale;
float pitch = duration.HasValue ? value.length / duration.Value : 1f;
_sfxPitchDictionary[availableSfxAudioSource] = new SfxPitch(false, pitch);
availableSfxAudioSource.pitch = _sfxPitchDictionary[availableSfxAudioSource].PitchValue * Time.timeScale;
}
availableSfxAudioSource.Play();
@ -223,7 +239,9 @@ namespace BlueWater.Audios
{
foreach (var element in _sfxPitchDictionary)
{
element.Key.pitch = element.Value * pitch;
if (element.Value.IsIgnoreTimeScale) continue;
element.Key.pitch = element.Value.PitchValue * pitch;
}
}
}

1
Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs
View File

@ -169,6 +169,7 @@ namespace BlueWater.Players.Tycoons
{
int saveGold = Mathf.RoundToInt(TycoonManager.Instance.TycoonStatus.CurrentGold * TycoonManager.Instance.TycoonStatus.EndGoldMultiplier);
ES3.Save(SaveData.EndGold, saveGold);
ES3.Save(SaveData.CompleteFirstGame, true);
}
public void MakeCocktailCompleted(CocktailData cocktailData, bool isMadePlayer)

18
Assets/02.Scripts/EventManager.cs
View File

@ -19,22 +19,10 @@ namespace BlueWater
OnChangedDisplay?.Invoke();
}
public static Action OnInitializedPlayerInput;
public static void InvokeInitializedPlayerInput()
public static Action OnInitializedScene;
public static void InvokeInitializedScene()
{
OnInitializedPlayerInput?.Invoke();
}
public static Action<float> OnCameraZoomOut;
public static void InvokeCameraZoomOut(float value)
{
OnCameraZoomOut?.Invoke(value);
}
public static Action<float> OnCameraZoomIn;
public static void InvokeCameraZoomIn(float value)
{
OnCameraZoomIn?.Invoke(value);
OnInitializedScene?.Invoke();
}
// Ui

52
Assets/02.Scripts/PlayerInputKeyManager.cs
View File

@ -1,5 +1,3 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.InputSystem;
@ -49,11 +47,6 @@ namespace BlueWater
[SerializeField]
private PlayerInput _currentPlayerInput;
private Vector3 _lastMousePosition; //마우스 이동 감지용
private bool _isKey = false; //키보드 입력상태 == true / 마우스 입력상태 == false (중복 방직용)
private readonly List<Action> _onActionKeyboard = new List<Action>();
private readonly List<Action> _onActionMouse = new List<Action>();
protected override void OnAwake()
{
base.OnAwake();
@ -68,30 +61,6 @@ namespace BlueWater
SceneManager.sceneLoaded += OnSceneLoaded;
}
// public void Update()
// {
// bool CheckMouse(){return Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1)||Input.GetMouseButtonDown(2);}
//
// if(!_isKey && Input.anyKeyDown && !CheckMouse()) //키보드 감지 (최초)
// {
// foreach (var element in _onActionKeyboard)
// {
// element?.Invoke();
// }
// _lastMousePosition = Input.mousePosition;
// _isKey = true;
// }
// else if (_isKey && (Input.anyKeyDown && CheckMouse() || (_isKey && Input.mousePosition != _lastMousePosition))) //마우스 감지 (최초)
// {
// foreach (var element in _onActionMouse)
// {
// element?.Invoke();
// }
// _lastMousePosition = Input.mousePosition;
// _isKey = false;
// }
// }
private async void OnSceneLoaded(Scene scene, LoadSceneMode mode)
{
await Initialize();
@ -116,30 +85,9 @@ namespace BlueWater
else if (currentSceneName == SceneName.Tycoon)
{
SwitchCurrentActionMap(InputActionMaps.Tycoon);
EventManager.InvokeInitializedPlayerInput();
}
}
public void AddOnActionKeyboard(Action action)
{
_onActionKeyboard.Add(action);
}
public void AddOnActionMouse(Action action)
{
_onActionMouse.Add(action);
}
public void RemoveOnActionKeyboard(Action action)
{
_onActionKeyboard.Remove(action);
}
public void RemoveOnActionMouse(Action action)
{
_onActionMouse.Remove(action);
}
/// <summary>
/// 현재 실행되고 있는 PlayerInput을 관리할 수 있게
/// PlayerInput 컴포넌트를 받아와서 사용하는 경우에 필수로 호출

15
Assets/02.Scripts/SaveData.cs
View File

@ -2,12 +2,13 @@ namespace BlueWater
{
public static class SaveData
{
public static string Locale = "Locale";
public static string EndGold = "EndGold";
public static string ScreenMode = "ScreenMode";
public static string Resolution = "Resolution";
public static string MasterVolume = "MasterVolume";
public static string BgmVolume = "BgmVolume";
public static string SfxVolume = "SfxVolume";
public const string Locale = "Locale";
public const string EndGold = "EndGold";
public const string ScreenMode = "ScreenMode";
public const string Resolution = "Resolution";
public const string MasterVolume = "MasterVolume";
public const string BgmVolume = "BgmVolume";
public const string SfxVolume = "SfxVolume";
public const string CompleteFirstGame = "CompleteFirstGame";
}
}

15
Assets/02.Scripts/SceneController.cs
View File

@ -95,18 +95,13 @@ namespace BlueWater
_fadeOut.Restart();
await _fadeOut.AsyncWaitForCompletion();
// _fadeOut.Restart();
// _loadingPanelFadeOut.Restart();
// Task[] fadeOutTasks =
// {
// _fadeOut.AsyncWaitForCompletion(),
// _loadingPanelFadeOut.AsyncWaitForCompletion()
// };
//await Task.WhenAll(fadeOutTasks);
PopupUiController.ClearPopup();
VisualFeedbackManager.Instance.ResetTimeScale();
if (sceneName == SceneName.Tycoon)
{
EventManager.InvokeInitializedScene();
}
}
}
}

2
Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset
View File

@ -93,3 +93,5 @@ MonoBehaviour:
<Clip>k__BackingField: {fileID: 8300000, guid: f556df27b6add5a49979cc7a158f6110, type: 3}
- <SfxName>k__BackingField: RareRewardBox
<Clip>k__BackingField: {fileID: 8300000, guid: 3f98ecaf35492e744bb4dc943e1a39b1, type: 3}
- <SfxName>k__BackingField: SelectedButton01
<Clip>k__BackingField: {fileID: 8300000, guid: 80adc41542bc901439938907231717a8, type: 3}

5
Assets/02.Scripts/Ui/Title/TitleMenuButton.cs
View File

@ -1,3 +1,4 @@
using BlueWater.Audios;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.EventSystems;
@ -16,6 +17,9 @@ namespace BlueWater.Titles
[SerializeField]
private Color _highlightedColor;
[SerializeField]
private string _selectedSfxName = "SelectedButton01";
private Color _originalColor = Color.white;
private bool _isQuitting;
@ -38,6 +42,7 @@ namespace BlueWater.Titles
public void OnSelect(BaseEventData eventData)
{
AudioManager.Instance.PlaySfx(_selectedSfxName, ignoreTimeScale:true);
_selectedImage.color = _originalColor;
_selectedImage.enabled = true;
}

12
Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs
View File

@ -53,7 +53,6 @@ namespace BlueWater.Uis
private List<TycoonCard> _tycoonCards = new(5);
private LevelData _currentLevelData;
private TycoonManager _tycoonManager;
private TycoonCardController _tycoonCardController;
private Sequence _failedPurchaseSequence;
@ -71,7 +70,7 @@ namespace BlueWater.Uis
private void Awake()
{
EventManager.OnInitializedPlayerInput += CreateCard;
EventManager.OnInitializedScene += CreateCard;
}
private void Start()
@ -98,7 +97,7 @@ namespace BlueWater.Uis
{
_failedPurchaseSequence.Kill();
EventManager.OnInitializedPlayerInput -= CreateCard;
EventManager.OnInitializedScene -= CreateCard;
}
public override void Open()
@ -125,9 +124,14 @@ namespace BlueWater.Uis
{
if (!Application.isPlaying) return;
if (!ES3.Load(SaveData.CompleteFirstGame, false))
{
EventManager.InvokeTycoonGameStarted();
return;
}
Utils.StartUniqueCoroutine(this, ref _changeGoldInstance, AnimateGoldChange());
_currentLevelData = TycoonManager.Instance.GetCurrentLevelData();
_tycoonCardController.DestroyCardList(_tycoonCards);
for (int i = 0; i < _tycoonCards.Capacity; i++)
{

1
Assets/04.Materials/Outline/BarrelOutlineUnlit.mat
View File

@ -84,6 +84,7 @@ Material:
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaThreshold: 0.5
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1

105
Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab
View File

@ -5109,6 +5109,7 @@ Transform:
- {fileID: 5128199735897506476}
- {fileID: 11141612720054821}
- {fileID: 1376671198123935973}
- {fileID: 512977381636670004}
- {fileID: 4715404908742687508}
- {fileID: 869534564193479129}
- {fileID: 4307167678708421440}
@ -7035,6 +7036,84 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3}
m_PrefabInstance: {fileID: 689594917335105277}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &695120074272338147
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3500050107750040134}
m_Modifications:
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalScale.x
value: 1.0377901
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalScale.y
value: 1.0377901
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalScale.z
value: 1.0377901
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.x
value: 4.272
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.z
value: -5.131
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6075426784951483330, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_Name
value: Box (9)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
--- !u!4 &512977381636670004 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
m_PrefabInstance: {fileID: 695120074272338147}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &768054145390819379
PrefabInstance:
m_ObjectHideFlags: 0
@ -9386,7 +9465,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.x
value: 6.2999997
value: 2.96
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.y
@ -9394,7 +9473,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.z
value: -2.553
value: -3.443
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalRotation.w
@ -9709,6 +9788,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1653087204473300138, guid: 18213e533ac275e429ee601785bff676, type: 3}
propertyPath: managedReferences[5889118636641091760].m_Value
value:
objectReference: {fileID: 0}
- target: {fileID: 5897095096647521783, guid: 18213e533ac275e429ee601785bff676, type: 3}
propertyPath: m_Name
value: SlimeGarnish
@ -10875,7 +10958,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.x
value: -3.04
value: -2.346
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.y
@ -10883,7 +10966,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.z
value: -5.27
value: -5.169
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalRotation.w
@ -12988,7 +13071,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.x
value: -3.5699997
value: -0.92
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.y
@ -12996,7 +13079,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalPosition.z
value: -3.5423727
value: -3.41
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
propertyPath: m_LocalRotation.w
@ -14491,6 +14574,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1653087204473300138, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3}
propertyPath: managedReferences[5889118636641091760].m_Value
value:
objectReference: {fileID: 0}
- target: {fileID: 5897095096647521783, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3}
propertyPath: m_Name
value: LimeTreeGarnish
@ -15309,7 +15396,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 809828747251277026, guid: 9e5375e8c94af9f49a9661227294f024, type: 3}
propertyPath: m_LocalPosition.z
value: -13.971
value: -14.045
objectReference: {fileID: 0}
- target: {fileID: 809828747251277026, guid: 9e5375e8c94af9f49a9661227294f024, type: 3}
propertyPath: m_LocalRotation.w
@ -16229,7 +16316,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3}
propertyPath: m_LocalPosition.x
value: -7.03
value: -7.24
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3}
propertyPath: m_LocalPosition.y
@ -16237,7 +16324,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3}
propertyPath: m_LocalPosition.z
value: -14
value: -14.07
objectReference: {fileID: 0}
- target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3}
propertyPath: m_LocalRotation.w

36
Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab
View File

@ -96,8 +96,40 @@ PrefabInstance:
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
insertIndex: -1
addedObject: {fileID: 2170066264100983348}
m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
--- !u!1 &6075426784951483330 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
m_PrefabInstance: {fileID: 6949017745149437987}
m_PrefabAsset: {fileID: 0}
--- !u!136 &2170066264100983348
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6075426784951483330}
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.8
m_Direction: 0
m_Center: {x: 0, y: 0.2, z: 0.2}

36
Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab
View File

@ -100,8 +100,40 @@ PrefabInstance:
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
insertIndex: 1
addedObject: {fileID: 8672178933073810756}
m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
--- !u!1 &6075426784951483330 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
m_PrefabInstance: {fileID: 6949017745149437987}
m_PrefabAsset: {fileID: 0}
--- !u!136 &8672178933073810756
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6075426784951483330}
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.8
m_Direction: 0
m_Center: {x: 0, y: 0.2, z: 0.2}

4
Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab
View File

@ -234,6 +234,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Height
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_SizeDelta.x
value: -180

0
Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab.meta
View File

14
Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab
View File

@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7986070582027999988}
- component: {fileID: 2234961990804426782}
- component: {fileID: 937530840197856001}
- component: {fileID: 5891094220003351037}
m_Layer: 8
m_Name: BaseInteractionFurniture
@ -36,8 +36,8 @@ Transform:
- {fileID: 1180174675498993111}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2234961990804426782
BoxCollider:
--- !u!136 &937530840197856001
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -54,9 +54,11 @@ BoxCollider:
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 0.5}
m_Center: {x: 0, y: 0.5, z: 0.25}
serializedVersion: 2
m_Radius: 0.15
m_Height: 1
m_Direction: 0
m_Center: {x: 0, y: 0.15, z: 0.15}
--- !u!210 &5891094220003351037
SortingGroup:
m_ObjectHideFlags: 0

8
Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab
View File

@ -1562,7 +1562,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 353433a78f14e1b42bef6e12dd1f5700, type: 3}
m_Name:
m_EditorClassIdentifier:
_collider: {fileID: 8857736056138880520}
_collider: {fileID: 7560392866728606999}
_visualLookObject: {fileID: 672328621937310823}
_carpetRenderer: {fileID: 7588633447038655794}
<TableSeats>k__BackingField:
@ -1583,9 +1583,9 @@ SortingGroup:
m_SortingLayer: 0
m_SortingOrder: 5
m_SortAtRoot: 0
--- !u!65 &8857736056138880520 stripped
BoxCollider:
m_CorrespondingSourceObject: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- !u!136 &7560392866728606999 stripped
CapsuleCollider:
m_CorrespondingSourceObject: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8710013924293209931

4
Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab
View File

@ -183,6 +183,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Height
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40

4
Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab
View File

@ -407,7 +407,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.z
value: 0.2
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsActive
@ -696,7 +696,7 @@ MonoBehaviour:
<OutlineMaterial>k__BackingField: {fileID: 0}
<LocalizeStringEvent>k__BackingField: {fileID: 1653087204473300138}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.9
<InteractionMessage>k__BackingField:
IsOpened: 0
SpineController: {fileID: 3688680572007923171}

6
Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab
View File

@ -270,6 +270,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Height
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
@ -441,8 +445,6 @@ MonoBehaviour:
<IsActivated>k__BackingField: 0
<IsAutoSupply>k__BackingField: 0
_liquidImage: {fileID: 6817574259189873408}
_fill: {fileID: 7052380446467937511}
_colorIntensity: 2
<IsMoldy>k__BackingField: 0
_playerHoldingTime: 3
--- !u!114 &7478245182548380060

4
Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab
View File

@ -8,6 +8,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40

4
Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab
View File

@ -102,6 +102,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -50
objectReference: {fileID: 0}
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40

5
Assets/05.Prefabs/Props/Furniture/Interactions/RandomChangeTrashCan.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old.meta
View File

@ -1,6 +1,7 @@
fileFormatVersion: 2
guid: eaa55356a4b11e047a47332f0d6a9d1a
PrefabImporter:
guid: d38201631f17f58499429d506ba04198
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:

0
Assets/05.Prefabs/Props/Furniture/Interactions/Bar01.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Bar01.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Bar01.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Bar01.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable01.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/BartenderTable01.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable01.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/BartenderTable01.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/BeverageMachine.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/BeverageMachine.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Board.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Board.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Board.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Board.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Brewing.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Brewing.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Brewing.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Brewing.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/FireWood.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/FireWood.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Grill.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Grill.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Grill.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Grill.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Pot.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Pot.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/PowerSwitch.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/PowerSwitch.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable01.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/ServingTable01.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable01.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/ServingTable01.prefab.meta
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Skewer.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Skewer.prefab
View File

0
Assets/05.Prefabs/Props/Furniture/Interactions/Skewer.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/Old/Skewer.prefab.meta
View File

4
Assets/05.Prefabs/Props/Furniture/Interactions/Pump.prefab
View File

@ -116,6 +116,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40

204
Assets/05.Prefabs/Props/Furniture/Interactions/RandomChangeTrashCan.prefab
View File

@ -1,204 +0,0 @@
%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: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsActive
value: 0
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: 3efc550bddc68a345b5400a832fb9a6a, type: 3}
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Name
value: RandomChangeTrashCan
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: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 3efc550bddc68a345b5400a832fb9a6a, 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: 2724648112398126851}
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 5411673223561907087}
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 &2724648112398126851
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: bfafa6669b5fa8a48b8e610286e1a192, 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}
<LocalizeStringEvent>k__BackingField: {fileID: 5411673223561907087}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.7
<InteractionMessage>k__BackingField:
IsOpened: 0
--- !u!114 &5411673223561907087
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: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
m_Name:
m_EditorClassIdentifier:
m_StringReference:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_FormatArguments: []
m_UpdateString:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: BlueWater.Tycoons.InteractionFurniture, Assembly-CSharp
m_MethodName: set_InteractionMessage
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
references:
version: 2
RefIds: []
--- !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:

4
Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab
View File

@ -102,6 +102,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -50
objectReference: {fileID: 0}
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40

4
Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab
View File

@ -203,6 +203,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Height
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40

0
Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab.meta
View File

6
Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab
View File

@ -116,6 +116,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Height
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
@ -386,7 +390,7 @@ MonoBehaviour:
physicsMovementRelativeTo: {fileID: 0}
updateTiming: 1
unscaledTime: 0
_animationName: TrashcanCloseStop
_animationName: TrashCanCloseStop
loop: 0
timeScale: 1
--- !u!33 &2469795103172270817

4
Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab
View File

@ -8,6 +8,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40

8
Assets/06.Sounds/Sfx/Uis.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 481707ec9952c0040a4ddea47c5294d3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/06.Sounds/Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav Normal file
View File

Binary file not shown.

23
Assets/06.Sounds/Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 80adc41542bc901439938907231717a8
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/08.Spines/Props/Barrel/Barrel.skel.bytes
View File

Binary file not shown.

2
ProjectSettings/ProjectSettings.asset
View File

@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 0.3.5.6
bundleVersion: 0.3.5.8
preloadedAssets:
- {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
- {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}

6
ProjectSettings/TimeManager.asset
View File

@ -3,7 +3,11 @@
--- !u!5 &1
TimeManager:
m_ObjectHideFlags: 0
Fixed Timestep: 0.02
Fixed Timestep:
m_Count: 2822399
m_Rate:
m_Denominator: 1
m_Numerator: 141120000
Maximum Allowed Timestep: 0.33333334
m_TimeScale: 1
Maximum Particle Timestep: 0.03