diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 822abcc78..1a76b0066 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -8611,7 +8611,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.y - value: -228 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2110439177749794880, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -8771,7 +8771,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3452187879713479394, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x - value: -86.475 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3452187879713479394, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y @@ -8803,7 +8803,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.y - value: 93 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4279912165921265520, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -8839,11 +8839,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4687311156951528065, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x - value: 76.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4687311156951528065, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4687311156951528065, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.x @@ -8867,7 +8867,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5585061895982209044, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x - value: -105 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5585061895982209044, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y @@ -8975,7 +8975,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.y - value: -14 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7251394016730184706, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -8991,11 +8991,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7251394016730184706, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7251394016730184706, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7251394016730184706, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.x @@ -9011,7 +9011,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.y - value: -121 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7755035229607891740, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -9051,7 +9051,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x - value: -41.855 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y @@ -9063,11 +9063,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x - value: -0.000030517578 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8446992353823355261, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -9079,7 +9079,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8446992353823355261, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x - value: -40.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8446992353823355261, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y @@ -9195,7 +9195,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x - value: -41.855 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index caeafdbe8..d03264d48 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -174,12 +174,7 @@ namespace BlueWater.Players.Tycoons private void Die() { - int currentGold = TycoonManager.Instance.TycoonStatus.CurrentGold; - float endGoldMultiplier = -0.5f + TycoonManager.Instance.TycoonStatus.EndGoldMultiplier; - int addedGold = Mathf.RoundToInt(currentGold * endGoldMultiplier); - int saveGold = currentGold + addedGold; - ES3.Save(SaveData.EndGold, saveGold); - ES3.Save(SaveData.CompleteFirstGame, true); + } public void MakeCocktailCompleted(CocktailData cocktailData, bool isMadePlayer) diff --git a/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs b/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs index e95357c75..3bdf7a60d 100644 --- a/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs @@ -169,8 +169,15 @@ namespace BlueWater.Tycoons if (CurrentAmount <= 0) return 0; if (CurrentAmount >= MaxFill) return 4; - float range = MaxFill / 3f; - return (int)(CurrentAmount / range) + 1; + int range = (int)(MaxFill / 3f); + int level = CurrentAmount / range; + + return level switch + { + 0 => 1, + 1 => 2, + _ => 3 + }; } private void IdleAnimation() diff --git a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs index 6b6556fb5..fe7bfef87 100644 --- a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs @@ -273,8 +273,16 @@ namespace BlueWater.Tycoons if (CurrentAmount <= 0) return 0; if (CurrentAmount >= MaxFill) return 5; - int range = MaxFill / 5; - return CurrentAmount / range + 1; + int range = (int)(MaxFill / 4f); + int level = CurrentAmount / range; + + return level switch + { + 0 => 1, + 1 => 2, + 2 => 3, + _ => 4 + }; } private void IdleAnimation() diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index f3fb0192d..a3289160b 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -1,4 +1,5 @@ using System.Collections; +using System.Collections.Generic; using BlueWater.Audios; using BlueWater.Uis; using BlueWater.Utility; @@ -64,7 +65,8 @@ namespace BlueWater.Titles private TycoonTutorial _tycoonTutorial; public Material inkMaterialInstance { get; private set; } - + + private Queue _waitingTutorials = new(); private PlayerInputKeyManager _playerInputKeyManager; private InputAction _interactionEAction; private InputAction _openAction; @@ -74,6 +76,7 @@ namespace BlueWater.Titles private bool _onButtonClicked; private Coroutine _inkCoroutine; + private Coroutine _waitingTutorialInstance; private void Start() { @@ -299,11 +302,33 @@ namespace BlueWater.Titles public void ShowTutorialUiByName(string tutorialName) { - _titleMenuUiPanel.SetActive(false); - _tycoonTutorial.ShowUiByName(tutorialName); - _panel.SetActive(true); + _waitingTutorials.Enqueue(tutorialName); + + if (_waitingTutorialInstance == null) + { + Utils.StartUniqueCoroutine(this, ref _waitingTutorialInstance, WaitingTutorial()); + } + } + + private IEnumerator WaitingTutorial() + { + WaitForSeconds waitTime = new WaitForSeconds(0.2f); + while (_waitingTutorials.Count > 0) + { + if (PopupUiController.IsPausedPopupList()) yield return waitTime; + + string tutorialName = _waitingTutorials.Dequeue(); + + _titleMenuUiPanel.SetActive(false); + _tycoonTutorial.ShowUiByName(tutorialName); + _panel.SetActive(true); - Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(1f)); + Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(1f)); + + yield return waitTime; + } + + _waitingTutorialInstance = null; } private IEnumerator MoveInkBackground(float pos) diff --git a/Assets/02.Scripts/Ui/Tycoon/Bill.cs b/Assets/02.Scripts/Ui/Tycoon/Bill.cs index 4e35e9f55..539e173fa 100644 --- a/Assets/02.Scripts/Ui/Tycoon/Bill.cs +++ b/Assets/02.Scripts/Ui/Tycoon/Bill.cs @@ -247,7 +247,7 @@ namespace BlueWater _sliderTween?.Kill(); _moveSequence?.Kill(); _arrivedSequence?.Kill(); - CurrentBillInfo.ResetData(); + CurrentBillInfo?.ResetData(); _removeEvent?.Invoke(); Destroy(gameObject); } diff --git a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs index 793e64f5f..6da0347ee 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs @@ -160,6 +160,7 @@ namespace BlueWater.Uis AudioManager.Instance.PlaySfx(_closeManualSfxName, ignoreTimeScale: true); _panel.SetActive(false); CloseSwitch(InputActionMaps.Tycoon); + EventSystem.current.SetSelectedGameObject(null); } public override void EnableInput() diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs index 7ade27d18..9040e418c 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs @@ -84,6 +84,7 @@ namespace BlueWater.Uis AudioManager.Instance.PlaySfx(_cardOpenAllSfxName, ignoreTimeScale: true); CloseSwitch(InputActionMaps.Tycoon); _panel.SetActive(false); + EventSystem.current.SetSelectedGameObject(null); } public override void EnableInput() diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs index d79c86e5a..1923ae3eb 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs @@ -449,6 +449,13 @@ namespace BlueWater.Uis private void SetResultData() { + int currentGold = TycoonManager.Instance.TycoonStatus.CurrentGold; + float endGoldMultiplier = -0.5f + TycoonManager.Instance.TycoonStatus.EndGoldMultiplier; + int addedGold = Mathf.RoundToInt(currentGold * endGoldMultiplier); + int saveGold = currentGold + addedGold; + ES3.Save(SaveData.EndGold, saveGold); + ES3.Save(SaveData.CompleteFirstGame, true); + Dictionary selectedCards = TycoonManager.Instance.TycoonCardController.SelectedCard; foreach (var element in selectedCards) { @@ -478,7 +485,6 @@ namespace BlueWater.Uis _goldSpentText.text = _goldSpent.ToString("N0"); _totalGoldText.text = $"{Utils.GetLocalizedString("TotalGold")} : {ES3.Load(SaveData.EndGold, 0):N0}"; - float endGoldMultiplier = -0.5f + TycoonManager.Instance.TycoonStatus.EndGoldMultiplier; int percent = Mathf.RoundToInt(endGoldMultiplier * 100); char sign = percent >= 0 ? '+' : '-'; _minusPercentText.color = percent >= 0 ? Color.blue : Color.red; diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index 7db3e3c95..e15ded25e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -66,6 +66,7 @@ namespace BlueWater.Uis { CloseSwitch(InputActionMaps.Tycoon); _panel.SetActive(false); + EventSystem.current.SetSelectedGameObject(null); } public override void EnableInput() diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs index cbe50068e..73b49d008 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs @@ -144,6 +144,7 @@ namespace BlueWater.Uis await Task.Delay(100); } + EventSystem.current.SetSelectedGameObject(null); EventManager.InvokeTycoonGameStarted(); } diff --git a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs index d3816c638..ca20c4f81 100644 --- a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs @@ -4,6 +4,7 @@ using BlueWater.Tycoons; using UnityEngine; using UnityEngine.UI; using Spine.Unity; +using UnityEngine.EventSystems; using UnityEngine.InputSystem; namespace BlueWater.Uis @@ -58,6 +59,7 @@ namespace BlueWater.Uis { _panel.SetActive(false); CloseSwitch(InputActionMaps.Tycoon); + EventSystem.current.SetSelectedGameObject(null); } public override void DisableInput() @@ -158,12 +160,14 @@ namespace BlueWater.Uis if (!ES3.Load(SaveData.TutorialH, false)) { - Invoke(nameof(InvokeTutorialH), 0.1f); + EventManager.InvokeTutorial(TutorialName.TutorialH); + ES3.Save(SaveData.TutorialH, true); } if (!ES3.Load(SaveData.TutorialI, false)) { - Invoke(nameof(InvokeTutorialI), 0.2f); + EventManager.InvokeTutorial(TutorialName.TutorialI); + ES3.Save(SaveData.TutorialI, true); } } }; diff --git a/Assets/02.Scripts/Utility/Utils.cs b/Assets/02.Scripts/Utility/Utils.cs index 065b3f358..eb5947c1b 100644 --- a/Assets/02.Scripts/Utility/Utils.cs +++ b/Assets/02.Scripts/Utility/Utils.cs @@ -60,7 +60,7 @@ namespace BlueWater.Utility list.Remove(item); } - public static Vector3 RandomPositionOnGraph(int graphIndex = 0) + public static Vector3 RandomPositionOnGraph(int graphIndex = 0, float radius = 0.5f) { // 그래프 인덱스가 유효한지 검사 if (graphIndex < 0 || graphIndex >= AstarPath.active.data.graphs.Length) @@ -87,11 +87,36 @@ namespace BlueWater.Utility throw new Exception("이동 가능한 노드가 없습니다."); } - // walkable한 노드 중 하나를 무작위로 선택 - GraphNode randomNode = walkableNodes[Random.Range(0, walkableNodes.Count)]; + LayerMask propsLayerMask = LayerMask.GetMask("Props"); + // 반복적으로 랜덤 위치를 가져와 조건을 만족하는지 확인 + for (int attempt = 0; attempt < 100000; attempt++) + { + // walkable한 노드 중 하나를 무작위로 선택 + GraphNode randomNode = walkableNodes[Random.Range(0, walkableNodes.Count)]; - // 선택한 노드의 위치 반환 - return (Vector3)randomNode.position; + // 선택한 노드의 위치를 Vector3로 변환 + Vector3 randomPosition = (Vector3)randomNode.position; + + // 반경과 Props 레이어가 설정되어 있다면 검사 + if (radius > 0) + { + // 반경 내 Props 레이어 오브젝트가 있는지 검사 + Collider[] results = new Collider[1]; + var size = Physics.OverlapSphereNonAlloc(randomPosition, radius, results, propsLayerMask, QueryTriggerInteraction.Collide); + + // Props가 발견되면 다시 시도 + if (size > 0) + { + continue; + } + } + + // 조건을 만족하면 위치 반환 + return randomPosition; + } + + // 반복 시도 후에도 유효한 위치를 찾지 못한 경우 예외 처리 + throw new Exception("조건을 만족하는 유효한 위치를 찾지 못했습니다."); } public static string GetLocalizedString(string key) diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index bb2941452..4ab7fdb18 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -339,7 +339,7 @@ CapsuleCollider: m_Enabled: 1 serializedVersion: 2 m_Radius: 0.05 - m_Height: 0.15 + m_Height: 0.05 m_Direction: 0 m_Center: {x: 0, y: 0.05, z: 0.05} --- !u!114 &1063431021331126030 @@ -402,10 +402,10 @@ MonoBehaviour: k__BackingField: 4 k__BackingField: 0 k__BackingField: 0 - _flashTime: 0.1 + _flashTime: 0.2 _isShaking: 1 - _shakingPower: 1 - _shakingDuration: 0.25 + _shakingPower: 5 + _shakingDuration: 0.5 attackedSfxName: TycoonPlayerAttacked heartRecoverySfxName: HeartRecovery --- !u!114 &1674052485383758547 diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index 832f8d9b1..b5d9a0758 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -338,6 +338,7 @@ Transform: - {fileID: 4821354755446076213} - {fileID: 3412269095196659005} - {fileID: 6801639188594848360} + - {fileID: 8661086398735869157} m_Father: {fileID: 2700294535905665279} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &500613869848024704 @@ -40838,6 +40839,114 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 16, y: 18, z: 0.20000005} m_Center: {x: 0, y: 0, z: 0.1} +--- !u!1 &6947995992644025633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8661086398735869157} + - component: {fileID: 8403611044283772799} + - component: {fileID: 2282320268323166317} + - component: {fileID: 1295249609660648831} + m_Layer: 19 + m_Name: SpawnObstacle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8661086398735869157 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6947995992644025633} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.55, y: 0, z: -14.89} + m_LocalScale: {x: 20, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3043377211119969757} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8403611044283772799 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6947995992644025633} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2282320268323166317 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6947995992644025633} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &1295249609660648831 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6947995992644025633} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &6980906008572417858 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab index 3f916b7d0..7fa22b7ad 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab @@ -2757,7 +2757,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 139.2, y: -35} - m_SizeDelta: {x: 68.4, y: 70} + m_SizeDelta: {x: 0, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2424559561377138911 CanvasRenderer: @@ -7793,7 +7793,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -8131,7 +8131,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -8330,7 +8330,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 410} + m_AnchoredPosition: {x: 0, y: 405} m_SizeDelta: {x: 1000, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4327469554350876183 @@ -8632,7 +8632,7 @@ MonoBehaviour: m_Spacing: 65 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 @@ -10392,7 +10392,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} diff --git a/Assets/13.Localization/StringDataTable.csv b/Assets/13.Localization/StringDataTable.csv index c5a1b2a69..d30788525 100644 --- a/Assets/13.Localization/StringDataTable.csv +++ b/Assets/13.Localization/StringDataTable.csv @@ -255,5 +255,5 @@ TutorialTitleH,펌프,Pump,水泵,水泵,ポンプ,Bomba,Насос,Pompe TutorialTitleI,특별한 보물 상자,Special Treasure Chest,特殊宝箱,特殊寶箱,特別な宝箱,Cofre del Tesoro Especial,Особый сундук с сокровищами,Coffre au Trésor Spécial TutorialTitleJ,재료 조합,Ingredient Combination,材料组合,材料組合,材料の組み合わせ,Combinación de Ingredientes,Комбинация ингредиентов,Combinaison d'Ingrédients HowToPlay,플레이 방법,How To Play,遊戲方法,游戏方法,遊び方,Cómo Jugar,Как Играть,Comment Jouer -Previous,이전,Previous,上一个,上一個,前へ (まえへ),Anterior," Предыдущий",Précédent +Previous,이전,Previous,上一个,上一個,前へ (まえへ),Anterior,Предыдущий,Précédent Next,다음,Next,下一个,下一個,次へ (つぎへ),Siguiente,Следующий,Suivant diff --git a/Assets/13.Localization/Tables/StringDataTable_ru.asset b/Assets/13.Localization/Tables/StringDataTable_ru.asset index b6e05101b..a617e4395 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ru.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ru.asset @@ -908,7 +908,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 13642850898870272 - m_Localized: "\t\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0438\u0439" + m_Localized: "\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0438\u0439" m_Metadata: m_Items: [] - m_Id: 13642850919841792 diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 000000000..62ce7303c --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta new file mode 100644 index 000000000..a6bbef241 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 234f4d47697e60e449c7e4d259bf6746 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/google-services-desktop.json.meta b/Assets/StreamingAssets/google-services-desktop.json.meta index 58d7b403a..6f440b6c8 100644 --- a/Assets/StreamingAssets/google-services-desktop.json.meta +++ b/Assets/StreamingAssets/google-services-desktop.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1749b8ae8b64425409cb6ecf3f12a008 +guid: 23460d99ae43ad64cb59d8ca61972063 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 22006d257..678c1739b 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -36,24 +36,24 @@ MonoBehaviour: - rid: 5032277253446697243 - rid: 5032277253446697244 - rid: 5032277253446697245 - - rid: 1415126835994558594 + - rid: 2144060224732659841 - rid: 5032277253446697247 - rid: 5032277253446697248 - - rid: 1415126835994558595 - - rid: 1415126835994558596 + - rid: 2144060224732659842 + - rid: 2144060224732659843 - rid: 5032277253446697251 - - rid: 1415126835994558597 + - rid: 2144060224732659844 - rid: 5032277253446697253 - - rid: 1415126835994558598 + - rid: 2144060224732659845 - rid: 5032277253446697255 - - rid: 1415126835994558599 - - rid: 1415126835994558600 + - rid: 2144060224732659846 + - rid: 2144060224732659847 - rid: 5032277253446697258 - rid: 5032277253446697259 - - rid: 1415126835994558601 - - rid: 1415126835994558602 + - rid: 2144060224732659848 + - rid: 2144060224732659849 - rid: 5032277253446697262 - - rid: 1415126835994558603 + - rid: 2144060224732659850 m_RuntimeSettings: m_List: - rid: 5032277253446697243 @@ -90,7 +90,7 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 1415126835994558594 + - rid: 2144060224732659841 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -105,14 +105,14 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 1415126835994558595 + - rid: 2144060224732659842 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 1415126835994558596 + - rid: 2144060224732659843 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -120,7 +120,7 @@ MonoBehaviour: m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} - - rid: 1415126835994558597 + - rid: 2144060224732659844 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -132,7 +132,7 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 1415126835994558598 + - rid: 2144060224732659845 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -145,7 +145,7 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 1415126835994558599 + - rid: 2144060224732659846 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -155,7 +155,7 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 1415126835994558600 + - rid: 2144060224732659847 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -168,19 +168,19 @@ MonoBehaviour: skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3} renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3} renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3} - - rid: 1415126835994558601 + - rid: 2144060224732659848 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 1415126835994558602 + - rid: 2144060224732659849 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 1415126835994558603 + - rid: 2144060224732659850 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 919595329..1f8ac15c6 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.5.20 + bundleVersion: 0.3.5.23 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}