diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index 1ee3367a0..0cb7c8be6 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -320,7 +320,7 @@ namespace BlueWater.Npcs.Customers int tip; if (IsServedPlayer) { - if (TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.ServingBonus) + if (TycoonManager.Instance.TycoonStatus.ContainsPassiveCard(PassiveCard.ServingBonus)) { TycoonManager.Instance.TycoonStageController.ServingBonus(); } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 926f9aed3..d1ecd40ab 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -182,7 +182,7 @@ namespace BlueWater.Players.Tycoons InteractionCanvas.BalloonUi.SetItemImage(cocktailData); TycoonPickupHandler.PickupItem(cocktailData, isMadePlayer); - if (TycoonManager.Instance.TycoonStatus.CurrentPassiveCard != PassiveCard.MakingBonus || cocktailData.Idx == "Cocktail000") return; + if (!TycoonManager.Instance.TycoonStatus.ContainsPassiveCard(PassiveCard.MakingBonus) || cocktailData.Idx == "Cocktail000") return; var tip = (int)(TycoonManager.Instance.GetCurrentLevelData().Gold * TycoonManager.Instance.TycoonStatus.TipMultiplier); if (tip > 0) diff --git a/Assets/02.Scripts/PlayerInputKeyManager.cs b/Assets/02.Scripts/PlayerInputKeyManager.cs index c29fdf753..6f309a052 100644 --- a/Assets/02.Scripts/PlayerInputKeyManager.cs +++ b/Assets/02.Scripts/PlayerInputKeyManager.cs @@ -42,9 +42,6 @@ namespace BlueWater { [SerializeField] private PlayerInput _currentPlayerInput; - - [SerializeField] - private InputActionMaps _initializedActionMap; private Vector3 _lastMousePosition; //마우스 이동 감지용 private bool _isKey = false; //키보드 입력상태 == true / 마우스 입력상태 == false (중복 방직용) @@ -104,10 +101,15 @@ namespace BlueWater await Task.Delay(1000); DisableAllActionMaps(); - SwitchCurrentActionMap(_initializedActionMap); - - if (SceneManager.GetActiveScene().name == "01.Tycoon") + string currentSceneName = SceneManager.GetActiveScene().name; + + if (currentSceneName == SceneName.TycoonTile) { + SwitchCurrentActionMap(InputActionMaps.TycoonUi); + } + else if (currentSceneName == SceneName.Tycoon) + { + SwitchCurrentActionMap(InputActionMaps.Tycoon); EventManager.InvokeInitializedPlayerInput(); } } diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index c71a51873..b419296d2 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -108,7 +108,7 @@ namespace BlueWater.Tycoons { if (_isPlayerInteracting) { - if (TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.CleaningBonus) + if (TycoonManager.Instance.TycoonStatus.ContainsPassiveCard(PassiveCard.CleaningBonus)) { TycoonManager.Instance.TycoonStageController.CleaningBonus(); } diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index 11a983119..4f74e19c1 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -152,13 +152,12 @@ namespace BlueWater.Tycoons public override bool CanInteraction() { return CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpAnything() && - ((TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.RandomChange && _canInteraction) || - TycoonManager.Instance.TycoonStatus.CurrentPassiveCard != PassiveCard.RandomChange); + ((_isChanged && _canInteraction) || !_isChanged); } public override void ShowInteractionUi() { - if (TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.RandomChange) + if (_isChanged) { UpdateLocalizedString("InteractionTrashCanChange"); } diff --git a/Assets/02.Scripts/SceneController.cs b/Assets/02.Scripts/SceneController.cs index fa3b56ffa..3a56b2610 100644 --- a/Assets/02.Scripts/SceneController.cs +++ b/Assets/02.Scripts/SceneController.cs @@ -5,6 +5,14 @@ using UnityEngine.UI; namespace BlueWater { + public static class SceneName + { + public static string CombatTile = "00.CombatTitle"; + public static string TycoonTile = "00.TycoonTitle"; + public static string Tycoon = "01.Tycoon"; + public static string Combat = "02.Combat"; + } + public class SceneController : Singleton { [SerializeField] @@ -49,6 +57,12 @@ namespace BlueWater SceneManager.LoadScene(currentSceneName); } + public void LoadScene(string sceneName) + { + VisualFeedbackManager.Instance.ResetTimeScale(); + SceneManager.LoadScene(sceneName); + } + public void MoveMainMenu() { VisualFeedbackManager.Instance.ResetTimeScale(); diff --git a/Assets/02.Scripts/Tycoon/TycoonCardController.cs b/Assets/02.Scripts/Tycoon/TycoonCardController.cs index 475117b9e..62cb4b71e 100644 --- a/Assets/02.Scripts/Tycoon/TycoonCardController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonCardController.cs @@ -144,24 +144,24 @@ namespace BlueWater.Tycoons _tycoonStatus.BartenderMakingReduction += 1; break; case "PassiveDoubleServing": - _tycoonStatus.CurrentPassiveCard = PassiveCard.DoubleServing; + _tycoonStatus.AddPassiveCard(PassiveCard.DoubleServing); break; case "PassiveRandomChange": - _tycoonStatus.CurrentPassiveCard = PassiveCard.RandomChange; + _tycoonStatus.AddPassiveCard(PassiveCard.RandomChange); EventManager.InvokeChangedRandomBox(); break; case "PassiveGoldAutoGain": - _tycoonStatus.CurrentPassiveCard = PassiveCard.GoldAutoGain; + _tycoonStatus.AddPassiveCard(PassiveCard.GoldAutoGain); EventManager.InvokeGainAutoMoneyCounter(_tycoonManager.TycoonStageController.StageDataSo.AutoGainWaitTime); break; case "PassiveMakingBonus": - _tycoonStatus.CurrentPassiveCard = PassiveCard.MakingBonus; + _tycoonStatus.AddPassiveCard(PassiveCard.MakingBonus); break; case "PassiveServingBonus": - _tycoonStatus.CurrentPassiveCard = PassiveCard.ServingBonus; + _tycoonStatus.AddPassiveCard(PassiveCard.ServingBonus); break; case "PassiveCleaningBonus": - _tycoonStatus.CurrentPassiveCard = PassiveCard.CleaningBonus; + _tycoonStatus.AddPassiveCard(PassiveCard.CleaningBonus); break; default: Debug.Log("Not Found Card : IDX" + currentTycoonCard.CardDataForIdx.Idx); return; } diff --git a/Assets/02.Scripts/Tycoon/TycoonStatus.cs b/Assets/02.Scripts/Tycoon/TycoonStatus.cs index e1ea9073c..017888087 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStatus.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStatus.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using Sirenix.OdinInspector; using UnityEngine; @@ -304,12 +305,8 @@ namespace BlueWater.Tycoons set => _bartenderMakingReduction = value; } - public PassiveCard _currentPassiveCard; - public PassiveCard CurrentPassiveCard - { - get => _currentPassiveCard; - set => _currentPassiveCard = value; - } + [field: ShowInInspector] + public HashSet CurrentPassiveCard { get; } = new(6); public void Initialize() { @@ -332,7 +329,6 @@ namespace BlueWater.Tycoons ServerTipMultiplier = 0f; CleanerCleaningReduction = 0; BartenderMakingReduction = 0; - CurrentPassiveCard = PassiveCard.None; } public void Dispose() @@ -381,5 +377,20 @@ namespace BlueWater.Tycoons } private void AddGold(int addedGold, bool isTip) => CurrentGold += addedGold; + + public void AddPassiveCard(PassiveCard card) + { + CurrentPassiveCard.Add(card); + } + + public void RemovePassiveCard(PassiveCard card) + { + if (CurrentPassiveCard.Contains(card)) + { + CurrentPassiveCard.Remove(card); + } + } + + public bool ContainsPassiveCard(PassiveCard card) => CurrentPassiveCard.Contains(card); } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs b/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs index 30c874124..e4d8dff21 100644 --- a/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs +++ b/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs @@ -17,14 +17,9 @@ namespace BlueWater.Titles [SerializeField] private Color _highlightedColor; - private Color _originalColor; + private Color _originalColor = Color.white; private bool _isQuitting; - private void Start() - { - _originalColor = _selectedImage.color; - } - private void OnApplicationQuit() { _isQuitting = true; diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index 984f8620d..a3ec71a02 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -73,8 +73,6 @@ namespace BlueWater.Titles if (_isTitleScene) { - VisualFeedbackManager.Instance.ResetTimeScale(); - _sceneController = SceneController.Instance; _startGameButton.onClick.AddListener(_sceneController.FadeIn); //수정 diff --git a/Assets/03.Images/Props/Furniture/Vomiting.png b/Assets/03.Images/Props/Furniture/Vomiting.png index 1398e05b4..d5c22af16 100644 Binary files a/Assets/03.Images/Props/Furniture/Vomiting.png and b/Assets/03.Images/Props/Furniture/Vomiting.png differ diff --git a/Assets/03.Images/Ui/Title/GameLogo.png.meta b/Assets/03.Images/Ui/Title/GameLogo.png.meta index 3cc03a1e7..f1bb2a750 100644 --- a/Assets/03.Images/Ui/Title/GameLogo.png.meta +++ b/Assets/03.Images/Ui/Title/GameLogo.png.meta @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -93,6 +93,32 @@ TextureImporter: 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: @@ -101,11 +127,11 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 0 + y: 540 width: 3840 - height: 2160 + height: 1260 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] diff --git a/Assets/04.Materials/Outline/OutlineUnlit.mat b/Assets/04.Materials/Outline/OutlineUnlit.mat index b55457ce6..0c26142c6 100644 --- a/Assets/04.Materials/Outline/OutlineUnlit.mat +++ b/Assets/04.Materials/Outline/OutlineUnlit.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaThreshold: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab index 564533218..c193eeba0 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab @@ -16,6 +16,22 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x value: 0.5 diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab index 9efb334d6..61f4712f0 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab @@ -1522,7 +1522,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -320} + m_AnchoredPosition: {x: 0, y: -350} m_SizeDelta: {x: 83.71, y: 120} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5205768152149774126 @@ -5554,11 +5554,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 5750355406028635963} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 399.76233, y: 220} - m_SizeDelta: {x: 691, y: 388} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -189.99997} + m_SizeDelta: {x: 700, y: 260} + m_Pivot: {x: 0, y: 1} --- !u!222 &5735658224767224140 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5587,7 +5587,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: eb4a1d1ac72fc2146900660db8bdfc6f, type: 3} + m_Sprite: {fileID: 1875588740, guid: eb4a1d1ac72fc2146900660db8bdfc6f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9544,11 +9544,11 @@ RectTransform: - {fileID: 3809829019576091026} m_Father: {fileID: 5750355406028635963} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 421, y: -225} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 170, y: -450} m_SizeDelta: {x: 500, y: 500} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &6344500107423022425 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9564,7 +9564,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 20 + m_Top: 50 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 @@ -11429,7 +11429,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -200} + m_AnchoredPosition: {x: 0, y: -230} m_SizeDelta: {x: 83.71, y: 120} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1470126346877250000 @@ -12304,7 +12304,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -80} + m_AnchoredPosition: {x: 0, y: -110} m_SizeDelta: {x: 179.24, y: 120} m_Pivot: {x: 0, y: 0.5} --- !u!222 &80049197063144741 diff --git a/Assets/06.Sounds/Bgm/Nameless_Tavern_Volume_Down.mp3 b/Assets/06.Sounds/Bgm/Nameless_Tavern_Volume_Down.mp3 new file mode 100644 index 000000000..832e92128 Binary files /dev/null and b/Assets/06.Sounds/Bgm/Nameless_Tavern_Volume_Down.mp3 differ diff --git a/Assets/06.Sounds/Bgm/이름 없는 선술집(Nameless Tavern)|HliM Original BGM.mp3.meta b/Assets/06.Sounds/Bgm/Nameless_Tavern_Volume_Down.mp3.meta similarity index 100% rename from Assets/06.Sounds/Bgm/이름 없는 선술집(Nameless Tavern)|HliM Original BGM.mp3.meta rename to Assets/06.Sounds/Bgm/Nameless_Tavern_Volume_Down.mp3.meta diff --git a/Assets/06.Sounds/Bgm/Old Castle_Volume_Down.mp3 b/Assets/06.Sounds/Bgm/Old Castle_Volume_Down.mp3 new file mode 100644 index 000000000..e0ea1f5d8 Binary files /dev/null and b/Assets/06.Sounds/Bgm/Old Castle_Volume_Down.mp3 differ diff --git a/Assets/06.Sounds/Bgm/오래된 성(Old Castle)|HliM Original BGM.mp3.meta b/Assets/06.Sounds/Bgm/Old Castle_Volume_Down.mp3.meta similarity index 100% rename from Assets/06.Sounds/Bgm/오래된 성(Old Castle)|HliM Original BGM.mp3.meta rename to Assets/06.Sounds/Bgm/Old Castle_Volume_Down.mp3.meta diff --git a/Assets/06.Sounds/Bgm/오래된 성(Old Castle)|HliM Original BGM.mp3 b/Assets/06.Sounds/Bgm/오래된 성(Old Castle)|HliM Original BGM.mp3 deleted file mode 100644 index fc1f6a5c2..000000000 Binary files a/Assets/06.Sounds/Bgm/오래된 성(Old Castle)|HliM Original BGM.mp3 and /dev/null differ diff --git a/Assets/06.Sounds/Bgm/이름 없는 선술집(Nameless Tavern)|HliM Original BGM.mp3 b/Assets/06.Sounds/Bgm/이름 없는 선술집(Nameless Tavern)|HliM Original BGM.mp3 deleted file mode 100644 index 2531cd330..000000000 Binary files a/Assets/06.Sounds/Bgm/이름 없는 선술집(Nameless Tavern)|HliM Original BGM.mp3 and /dev/null differ diff --git a/Assets/09.Shaders/OutlineUnlit.shadergraph b/Assets/09.Shaders/OutlineUnlit.shadergraph index cfecd92ac..017167d00 100644 --- a/Assets/09.Shaders/OutlineUnlit.shadergraph +++ b/Assets/09.Shaders/OutlineUnlit.shadergraph @@ -14,6 +14,9 @@ }, { "m_Id": "594a27ff8c7b4846b2db3e6ff31bbee9" + }, + { + "m_Id": "4d49c2986bdc476faa742bc5e12ba9b7" } ], "m_Keywords": [], @@ -161,6 +164,9 @@ }, { "m_Id": "e0c4b0e238e84aa2bdfb17d0da0f7f3e" + }, + { + "m_Id": "4bc9397715a8478196eff2c48bb83747" } ], "m_GroupDatas": [ @@ -331,6 +337,20 @@ "m_SlotId": 814628614 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4bc9397715a8478196eff2c48bb83747" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e0c4b0e238e84aa2bdfb17d0da0f7f3e" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1336,6 +1356,21 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "29ae6a010b11412f8f711e1e864e9b8c", + "m_Id": 0, + "m_DisplayName": "AlphaThreshold", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", @@ -1813,6 +1848,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "4bc9397715a8478196eff2c48bb83747", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -191.0, + "y": 417.0, + "width": 157.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "29ae6a010b11412f8f711e1e864e9b8c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "4d49c2986bdc476faa742bc5e12ba9b7" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.AddNode", @@ -1856,6 +1927,34 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "4d49c2986bdc476faa742bc5e12ba9b7", + "m_Guid": { + "m_GuidSerialized": "70611f65-cb21-4d25-8812-aea6ef3db965" + }, + "m_Name": "AlphaThreshold", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "AlphaThreshold", + "m_DefaultReferenceName": "_AlphaThreshold", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.5, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4592,6 +4691,9 @@ }, { "m_Id": "594a27ff8c7b4846b2db3e6ff31bbee9" + }, + { + "m_Id": "4d49c2986bdc476faa742bc5e12ba9b7" } ] } diff --git a/Assets/10.Fonts/Hahmlet-Medium SDF.asset b/Assets/10.Fonts/Hahmlet-Medium SDF.asset index 73d8417a7..ece0c4ecf 100644 --- a/Assets/10.Fonts/Hahmlet-Medium SDF.asset +++ b/Assets/10.Fonts/Hahmlet-Medium SDF.asset @@ -74710,7 +74710,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.1 + - _OutlineWidth: 0.2 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.8 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8eeb51df8..a521c7cb7 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.4.23 + bundleVersion: 0.3.4.24 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}