diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index ce8e8319b..1496893c1 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -900,7 +900,7 @@ GameObject: - component: {fileID: 41694533} - component: {fileID: 41694532} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -948,7 +948,7 @@ MonoBehaviour: m_text: "\uB9DB" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2624,7 +2624,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 189461008} - - component: {fileID: 189461009} + - component: {fileID: 189461010} m_Layer: 5 m_Name: Slider m_TagString: Untagged @@ -2654,7 +2654,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 17.5} m_SizeDelta: {x: 0, y: 35} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &189461009 +--- !u!114 &189461010 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2663,48 +2663,17 @@ MonoBehaviour: m_GameObject: {fileID: 189461007} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Script: {fileID: 11500000, guid: d0b242c6d3d747f48ab34ff4e8485aaf, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 753409885} - m_FillRect: {fileID: 888142005} - m_HandleRect: {fileID: 753409884} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 1 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] + _fillRect: {fileID: 888142005} + _fill: {fileID: 888142006} + _handleRect: {fileID: 753409884} + _minValue: -40 + _maxValue: 40 + _value: 0 + _minColor: {r: 0, g: 0, b: 1, a: 1} + _maxColor: {r: 1, g: 0, b: 0, a: 1} --- !u!1 &192760793 GameObject: m_ObjectHideFlags: 0 @@ -3366,7 +3335,7 @@ GameObject: - component: {fileID: 232070480} - component: {fileID: 232070479} m_Layer: 5 - m_Name: DrinkRecipeSlotPanel + m_Name: LiquidRecipeSlotPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3492,6 +3461,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 41694531} + - {fileID: 1246654257} - {fileID: 542337066} m_Father: {fileID: 1536229209} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4609,7 +4579,7 @@ GameObject: - component: {fileID: 373047581} - component: {fileID: 373047580} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4657,7 +4627,7 @@ MonoBehaviour: m_text: "\uB3C4\uC218(Alc)" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6824,48 +6794,17 @@ MonoBehaviour: m_GameObject: {fileID: 542337065} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Script: {fileID: 11500000, guid: d0b242c6d3d747f48ab34ff4e8485aaf, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1115716617} - m_FillRect: {fileID: 1709763750} - m_HandleRect: {fileID: 1115716616} - m_Direction: 0 - m_MinValue: -40 - m_MaxValue: 40 - m_WholeNumbers: 0 - m_Value: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] + _fillRect: {fileID: 1709763750} + _fill: {fileID: 1709763751} + _handleRect: {fileID: 1115716616} + _minValue: -40 + _maxValue: 40 + _value: 0 + _minColor: {r: 0, g: 0, b: 1, a: 1} + _maxColor: {r: 1, g: 0, b: 0, a: 1} --- !u!1 &545850347 GameObject: m_ObjectHideFlags: 0 @@ -7555,6 +7494,7 @@ MonoBehaviour: m_EditorClassIdentifier: SwitchMapsOpened: 6 SwitchMapsClosed: 1 + _cocktailStatusUi: {fileID: 1034828056} --- !u!1 &593921700 GameObject: m_ObjectHideFlags: 0 @@ -8158,6 +8098,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 626632725} m_CullTransparentMesh: 1 +--- !u!1 &636369267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 636369268} + - component: {fileID: 636369270} + - component: {fileID: 636369269} + m_Layer: 5 + m_Name: TemperatureText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &636369268 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636369267} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1769309953} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -15} + m_SizeDelta: {x: 200, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &636369269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636369267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4285053125 + m_fontColor: {r: 0.77254903, g: 0.72156864, b: 0.40784314, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &636369270 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636369267} + m_CullTransparentMesh: 1 --- !u!1001 &639093258 PrefabInstance: m_ObjectHideFlags: 0 @@ -9176,8 +9252,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 1291358110} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 15, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -9570,7 +9646,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3986470523429011170, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Name - value: DrinkRecipeSlotUi (6) + value: LiquidRecipeSlotUi (6) objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Pivot.x @@ -10830,6 +10906,7 @@ GameObject: - component: {fileID: 888142005} - component: {fileID: 888142007} - component: {fileID: 888142006} + - component: {fileID: 888142008} m_Layer: 5 m_Name: Fill m_TagString: Untagged @@ -10851,8 +10928,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 1874385399} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -2} m_SizeDelta: {x: 0, y: -6} m_Pivot: {x: 0.5, y: 0.5} @@ -10869,7 +10946,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.11532307, g: 0, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -10894,6 +10971,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 888142004} m_CullTransparentMesh: 1 +--- !u!114 &888142008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888142004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &891021167 GameObject: m_ObjectHideFlags: 0 @@ -11839,6 +11929,7 @@ GameObject: - component: {fileID: 1034828053} - component: {fileID: 1034828055} - component: {fileID: 1034828054} + - component: {fileID: 1034828056} m_Layer: 5 m_Name: CocktailStatusUi m_TagString: Untagged @@ -11904,6 +11995,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1034828052} m_CullTransparentMesh: 1 +--- !u!114 &1034828056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034828052} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6deeba2587097647a0eeb3e8436bd9d, type: 3} + m_Name: + m_EditorClassIdentifier: + _alcoholSlider: {fileID: 1416715679} + _alcoholText: {fileID: 1247402275} + _temperatureSlider: {fileID: 189461010} + _temperatureText: {fileID: 636369269} + _bitterSweetSlider: {fileID: 542337067} + _bitterSweetText: {fileID: 1246654258} + _scentSlider: {fileID: 827145304} + _scentText: {fileID: 1791114417} --- !u!4 &1038321203 stripped Transform: m_CorrespondingSourceObject: {fileID: 6190127373159935981, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} @@ -12080,6 +12191,7 @@ MonoBehaviour: _renderTexture: {fileID: 2105041734} _liquidRenderer: {fileID: 379763496} _reachedCollider: {fileID: 400400199} + _amountText: {fileID: 1231981356} _spawnTransform: {fileID: 1511911897} _spawnLocation: {fileID: 218784750} _pushDirection: {x: -5, y: -1, z: 0} @@ -12495,7 +12607,7 @@ RectTransform: m_Father: {fileID: 798464074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -2} m_SizeDelta: {x: 0, y: -6} m_Pivot: {x: 0.5, y: 0.5} @@ -12912,7 +13024,7 @@ GameObject: - component: {fileID: 1084981645} - component: {fileID: 1084981644} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -12960,7 +13072,7 @@ MonoBehaviour: m_text: "\uC628\uB3C4" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -13693,7 +13805,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3986470523429011170, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Name - value: DrinkRecipeSlotUi (5) + value: LiquidRecipeSlotUi (5) objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Pivot.x @@ -14635,7 +14747,7 @@ GameObject: - component: {fileID: 1231981357} - component: {fileID: 1231981356} m_Layer: 5 - m_Name: Text (TMP) + m_Name: CocktailAmount m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -15014,6 +15126,278 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ccb8b4cf4e054704a8bfa9e1334764a7, type: 3} +--- !u!1 &1246654256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1246654257} + - component: {fileID: 1246654259} + - component: {fileID: 1246654258} + m_Layer: 5 + m_Name: BitterSweetText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1246654257 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246654256} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00012012168} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 242154402} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -15} + m_SizeDelta: {x: 200, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1246654258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246654256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC5C6\uC74C" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4285053125 + m_fontColor: {r: 0.77254903, g: 0.72156864, b: 0.40784314, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1246654259 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246654256} + m_CullTransparentMesh: 1 +--- !u!1 &1247402273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1247402274} + - component: {fileID: 1247402276} + - component: {fileID: 1247402275} + m_Layer: 5 + m_Name: AlcoholText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1247402274 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247402273} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1423213612} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -15} + m_SizeDelta: {x: 200, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1247402275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247402273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0(Alc) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4285053125 + m_fontColor: {r: 0.7725491, g: 0.72156864, b: 0.40784317, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1247402276 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247402273} + m_CullTransparentMesh: 1 --- !u!1 &1253837989 GameObject: m_ObjectHideFlags: 0 @@ -15068,7 +15452,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Content: {fileID: 214971302} m_Horizontal: 0 - m_Vertical: 1 + m_Vertical: 0 m_MovementType: 1 m_Elasticity: 0.1 m_Inertia: 1 @@ -15631,7 +16015,7 @@ GameObject: - component: {fileID: 1284216892} - component: {fileID: 1284216891} m_Layer: 5 - m_Name: DrinkRecipeSlotPanel + m_Name: LiquidRecipeSlotPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -16068,7 +16452,7 @@ GameObject: - component: {fileID: 1323941956} - component: {fileID: 1323941955} m_Layer: 5 - m_Name: DrinkRecipePanel + m_Name: LiquidRecipeUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -16308,7 +16692,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3986470523429011170, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Name - value: DrinkRecipeSlotUi (1) + value: LiquidRecipeSlotUi (1) objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Pivot.x @@ -17749,9 +18133,9 @@ MonoBehaviour: m_HandleRect: {fileID: 2015403565} m_Direction: 0 m_MinValue: 0 - m_MaxValue: 1 + m_MaxValue: 80 m_WholeNumbers: 0 - m_Value: 1 + m_Value: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -17876,6 +18260,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 373047579} + - {fileID: 1247402274} - {fileID: 1416715678} m_Father: {fileID: 1536229209} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -18111,7 +18496,7 @@ GameObject: - component: {fileID: 1445275841} - component: {fileID: 1445275840} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -18159,7 +18544,7 @@ MonoBehaviour: m_text: "\uD5A5" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -19441,7 +19826,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3986470523429011170, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Name - value: DrinkRecipeSlotUi (4) + value: LiquidRecipeSlotUi (4) objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Pivot.x @@ -20074,7 +20459,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} propertyPath: m_LocalPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} propertyPath: m_LocalPosition.z @@ -21297,7 +21682,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 1092202749} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -2} m_SizeDelta: {x: 0, y: -6} @@ -21315,7 +21700,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.11532307, g: 0, b: 1, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -22557,6 +22942,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1084981643} + - {fileID: 636369268} - {fileID: 189461008} m_Father: {fileID: 1536229209} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -22991,6 +23377,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1786369329} m_CullTransparentMesh: 1 +--- !u!1 &1791114415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1791114416} + - component: {fileID: 1791114418} + - component: {fileID: 1791114417} + m_Layer: 5 + m_Name: ScentText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1791114416 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1791114415} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000144146} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1891278322} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -15} + m_SizeDelta: {x: 200, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1791114417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1791114415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC5C6\uC74C" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4285053125 + m_fontColor: {r: 0.77254903, g: 0.72156864, b: 0.40784314, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1791114418 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1791114415} + m_CullTransparentMesh: 1 --- !u!1 &1795712517 GameObject: m_ObjectHideFlags: 0 @@ -23568,7 +24090,7 @@ GameObject: - component: {fileID: 1835523530} - component: {fileID: 1835523529} m_Layer: 5 - m_Name: DrinkImage + m_Name: LiquidImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -23754,7 +24276,7 @@ GameObject: - component: {fileID: 1858488037} - component: {fileID: 1858488036} m_Layer: 5 - m_Name: DrinkRecipeSlotUiList + m_Name: LiquidRecipeSlotUiList m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -24442,7 +24964,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3986470523429011170, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Name - value: DrinkRecipeSlotUi (2) + value: LiquidRecipeSlotUi (2) objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Pivot.x @@ -24565,6 +25087,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1445275839} + - {fileID: 1791114416} - {fileID: 827145303} m_Father: {fileID: 1536229209} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -24694,7 +25217,7 @@ MonoBehaviour: m_EditorClassIdentifier: SwitchMapsOpened: 2 SwitchMapsClosed: 1 - _drinkRecipeSlotUiPrefab: {fileID: 282528693430034096, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} + liquidRecipeSlotUiPrefab: {fileID: 282528693430034096, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} _drinkRecipeSpawnLocation: {fileID: 1858488035} _recipeName: {fileID: 713557315} _drinkImage: {fileID: 1835523529} @@ -25835,8 +26358,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 746944827} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 15, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -26825,7 +27348,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3986470523429011170, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Name - value: DrinkRecipeSlotUi (3) + value: LiquidRecipeSlotUi (3) objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Pivot.x @@ -26927,7 +27450,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3986470523429011170, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Name - value: DrinkRecipeSlotUi + value: LiquidRecipeSlotUi objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_Pivot.x @@ -29175,7 +29698,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} propertyPath: m_LocalPosition.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/02.Scripts/LiquidController.cs b/Assets/02.Scripts/LiquidController.cs index 7b62d82cc..4678de922 100644 --- a/Assets/02.Scripts/LiquidController.cs +++ b/Assets/02.Scripts/LiquidController.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using Sirenix.OdinInspector; +using TMPro; using UnityEngine; using UnityEngine.Pool; @@ -20,6 +21,9 @@ namespace BlueWater [SerializeField] private Collider2D _reachedCollider; + + [SerializeField] + private TMP_Text _amountText; [Title("스폰 데이터")] [SerializeField, Required] @@ -142,7 +146,7 @@ namespace BlueWater public void Initialize() { _instanceLiquidCount = 0; - _currentLiquidAmount = 0f; + SetCurrentAmount(0f); _currentMixedColor = _liquidColor; _instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity); } @@ -206,7 +210,7 @@ namespace BlueWater _colorCounts.Clear(); _instanceLiquidCount = 0; - _currentLiquidAmount = 0f; + SetCurrentAmount(0f); _instanceMaterial.SetFloat(_liquidAmountHash, 0f); } @@ -220,6 +224,24 @@ namespace BlueWater { _isPouring = false; } + + private void SetCurrentAmount(float value) + { + _currentLiquidAmount = value; + + if (_amountText) + { + var percent = (int)(_currentLiquidAmount / _maxLiquidCount * 100); + _amountText.text = $"{percent}%"; + } + else + { + if (_amountText.enabled) + { + _amountText.enabled = false; + } + } + } /// /// 사용된 색상의 비율에 맞게 색을 혼합시키는 함수 @@ -250,7 +272,7 @@ namespace BlueWater public void OnLiquidReached() { _liquidReachedTime = Time.time; - _currentLiquidAmount++; + SetCurrentAmount(++_currentLiquidAmount); var liquidAmount = Mathf.Clamp(_currentLiquidAmount / _maxLiquidCount, 0f, 1f); _instanceMaterial.SetFloat(_liquidAmountHash, liquidAmount); _targetColor = MixColorsByTime(); diff --git a/Assets/02.Scripts/Ui/Tycoon/BarUi.cs b/Assets/02.Scripts/Ui/Tycoon/BarUi.cs index d2e95e744..ae4599347 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BarUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BarUi.cs @@ -1,13 +1,18 @@ using System.Collections.Generic; +using UnityEngine; namespace BlueWater.Uis { public class BarUi : SwitchActionPopupUi { + [SerializeField] + private CocktailStatusUi _cocktailStatusUi; + public override void Open(List popupUiList) { base.Open(popupUiList); + _cocktailStatusUi.ResetCocktailStatus(); TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Bar); TycoonEvents.OnDrinkUiOpened?.Invoke(); } diff --git a/Assets/02.Scripts/Ui/Tycoon/BrewingUi.cs b/Assets/02.Scripts/Ui/Tycoon/BrewingUi.cs index 5eb9a0321..7ffac9b6c 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BrewingUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BrewingUi.cs @@ -11,8 +11,8 @@ namespace BlueWater.Uis { public class BrewingUi : SwitchActionPopupUi { - [SerializeField, Required] - private DrinkRecipeSlotUi _drinkRecipeSlotUiPrefab; + [FormerlySerializedAs("_drinkRecipeSlotUiPrefab")] [SerializeField, Required] + private LiquidRecipeSlotUi liquidRecipeSlotUiPrefab; [SerializeField, Required] private Transform _drinkRecipeSpawnLocation; @@ -36,7 +36,7 @@ namespace BlueWater.Uis [SerializeField] private Brewing _currentBrewing; - private List _drinkRecipeSlotUis = new(); + private List _drinkRecipeSlotUis = new(); private void Start() { @@ -103,7 +103,7 @@ namespace BlueWater.Uis private void AddDrinkRecipe(string idx) { - var instance = Instantiate(_drinkRecipeSlotUiPrefab, _drinkRecipeSpawnLocation); + var instance = Instantiate(liquidRecipeSlotUiPrefab, _drinkRecipeSpawnLocation); instance.Initialize(idx); _drinkRecipeSlotUis.Add(instance); } diff --git a/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs b/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs new file mode 100644 index 000000000..88a1e9550 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs @@ -0,0 +1,62 @@ +using Sirenix.OdinInspector; +using UnityEngine; +using UnityEngine.UI; + +namespace BlueWater +{ + public class CenterSlider : MonoBehaviour + { + [SerializeField] + private RectTransform _fillRect; + + [SerializeField] + private Image _fill; + + [SerializeField] + private RectTransform _handleRect; + + [SerializeField] + private float _minValue; + + [SerializeField] + private float _maxValue = 1f; + + [SerializeField] + private float _value; + + [SerializeField] + private Color _minColor = Color.white; + + [SerializeField] + private Color _maxColor = Color.white; + + private readonly float _centerAnchorX = 0.5f; + + private void Start() + { + SetValue(_value); + } + + private void UpdateSlider(float value) + { + // 0 ~ 1값 + var normalizedValue = (value - _minValue) / (_maxValue - _minValue); + + _fill.color = normalizedValue < 0.5f ? _minColor : _maxColor; + + _handleRect.anchorMin = new Vector2(normalizedValue, 0f); + _handleRect.anchorMax = new Vector2(normalizedValue, 1f); + + _fillRect.anchorMin = new Vector2(Mathf.Clamp(_handleRect.anchorMin.x, 0, _centerAnchorX), 0); + _fillRect.anchorMax = new Vector2(Mathf.Clamp(_handleRect.anchorMin.x, _centerAnchorX, 1), 1); + } + + [Button("값 추가")] + public void SetValue(float value) + { + var newValue = Mathf.Clamp(value, _minValue, _maxValue); + _value = newValue; + UpdateSlider(_value); + } + } +} diff --git a/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs.meta b/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs.meta new file mode 100644 index 000000000..6b35c2245 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d0b242c6d3d747f48ab34ff4e8485aaf \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs b/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs new file mode 100644 index 000000000..f948ac7ef --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs @@ -0,0 +1,56 @@ +using Sirenix.OdinInspector; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace BlueWater.Uis +{ + public class CocktailStatusUi : MonoBehaviour + { + [Title("알코올")] + [SerializeField] + private Slider _alcoholSlider; + + [SerializeField] + private TMP_Text _alcoholText; + + [Title("온도")] + [SerializeField] + private CenterSlider _temperatureSlider; + + [SerializeField] + private TMP_Text _temperatureText; + + [Title("맛")] + [SerializeField] + private CenterSlider _bitterSweetSlider; + + [SerializeField] + private TMP_Text _bitterSweetText; + + [Title("향")] + [SerializeField] + private Slider _scentSlider; + + [SerializeField] + private TMP_Text _scentText; + + private const string AlcoholUnitText = "(alc)"; + + public void ResetCocktailStatus() + { + _alcoholSlider.value = 0f; + _temperatureSlider.SetValue(0f); + _bitterSweetSlider.SetValue(0f); + _scentSlider.value = 0f; + } + + public void SetCocktailStatus(float alcohol, float temperature, float bitterSweet, float scent) + { + _alcoholSlider.value = alcohol; + _temperatureSlider.SetValue(temperature); + _bitterSweetSlider.SetValue(bitterSweet); + _scentSlider.value = scent; + } + } +} diff --git a/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs.meta new file mode 100644 index 000000000..13eee6a53 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f6deeba2587097647a0eeb3e8436bd9d \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs similarity index 94% rename from Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs rename to Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs index 6cba59eac..adbf18286 100644 --- a/Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; namespace BlueWater.Uis { [Serializable] - public class DrinkRecipeSlotUi : MonoBehaviour + public class LiquidRecipeSlotUi : MonoBehaviour { [SerializeField] private Button _button; diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs.meta rename to Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs.meta diff --git a/Assets/02.Scripts/Ui/Tycoon/CocktailIngredientSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs similarity index 86% rename from Assets/02.Scripts/Ui/Tycoon/CocktailIngredientSlotUi.cs rename to Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs index a00cac6ac..c77c02455 100644 --- a/Assets/02.Scripts/Ui/Tycoon/CocktailIngredientSlotUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs @@ -6,7 +6,7 @@ using UnityEngine.UI; namespace BlueWater.Uis { [Serializable] - public class CocktailIngredientSlotUi : MonoBehaviour + public class LiquidSlotUi : MonoBehaviour { [SerializeField] private Button _button; diff --git a/Assets/02.Scripts/Ui/Tycoon/CocktailIngredientSlotUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/Tycoon/CocktailIngredientSlotUi.cs.meta rename to Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs.meta diff --git a/Assets/04.Materials/Uis/GradientSlider.mat b/Assets/04.Materials/Uis/GradientSlider.mat new file mode 100644 index 000000000..4c6bf07f1 --- /dev/null +++ b/Assets/04.Materials/Uis/GradientSlider.mat @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4409874377547118702 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GradientSlider + m_Shader: {fileID: -6465566751694194690, guid: ae82fd6780cf2e54b850202306896be6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _ColorMask: 15 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Surface: 0 + - _UIMaskSoftnessX: 1 + - _UIMaskSoftnessY: 1 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04.Materials/Uis/GradientSlider.mat.meta b/Assets/04.Materials/Uis/GradientSlider.mat.meta new file mode 100644 index 000000000..3d98e2ec8 --- /dev/null +++ b/Assets/04.Materials/Uis/GradientSlider.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65422bd8c2510674dbaf427e79c76269 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab similarity index 99% rename from Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab rename to Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab index 613b1a9c8..7a151a33d 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab @@ -89,7 +89,7 @@ GameObject: - component: {fileID: 3050633509931874182} - component: {fileID: 282528693430034096} m_Layer: 5 - m_Name: DrinkRecipeSlotUi + m_Name: LiquidRecipeSlotUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab.meta b/Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab.meta rename to Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab.meta diff --git a/Assets/09.Shaders/GradientSlider.shadergraph b/Assets/09.Shaders/GradientSlider.shadergraph new file mode 100644 index 000000000..87a12eb38 --- /dev/null +++ b/Assets/09.Shaders/GradientSlider.shadergraph @@ -0,0 +1,945 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "125e252b280d4043a3e232ad66365ff2", + "m_Properties": [ + { + "m_Id": "a128696d045141149cfb3bf816b54d80" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "b24d1c02f74d48e5a6cb3e41a064f0fa" + } + ], + "m_Nodes": [ + { + "m_Id": "40a37cf1d98f49d2a7766d6a9c7a304b" + }, + { + "m_Id": "0211643180e94c54bcd79ec77dc452ea" + }, + { + "m_Id": "482587c66b08454d8c0cf94bb2a533ec" + }, + { + "m_Id": "a5d899d55d4c42c2bee93c46b469c0a0" + }, + { + "m_Id": "1fe4e18012224bd086abad48cef570a5" + }, + { + "m_Id": "aae61fd383a145759ae1fa10631fabba" + }, + { + "m_Id": "5e0d5368f6144fa3a05f2b5e989e25ba" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1fe4e18012224bd086abad48cef570a5" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "40a37cf1d98f49d2a7766d6a9c7a304b" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5e0d5368f6144fa3a05f2b5e989e25ba" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1fe4e18012224bd086abad48cef570a5" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a5d899d55d4c42c2bee93c46b469c0a0" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1fe4e18012224bd086abad48cef570a5" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "aae61fd383a145759ae1fa10631fabba" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5e0d5368f6144fa3a05f2b5e989e25ba" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "40a37cf1d98f49d2a7766d6a9c7a304b" + }, + { + "m_Id": "0211643180e94c54bcd79ec77dc452ea" + }, + { + "m_Id": "482587c66b08454d8c0cf94bb2a533ec" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "72dd91f1183d498f819167fdf65ada12" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0211643180e94c54bcd79ec77dc452ea", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "38602216b85349ffa57dfa5856f2bf92" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "15ca3e2a6ecd4dc78b089a004c8dd832", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.SampleGradient", + "m_ObjectId": "1fe4e18012224bd086abad48cef570a5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Gradient", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -642.9998168945313, + "y": 199.99996948242188, + "width": 207.99993896484376, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "6fbe934ec4cb457d95fa2916f5121f30" + }, + { + "m_Id": "9b5d385653b04fa7bd2b3810f55e8013" + }, + { + "m_Id": "2e071c1ec2c647f997309f104913f763" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "254af246b3ae42258ec1d4d0e0049d97", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "2e071c1ec2c647f997309f104913f763", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "38602216b85349ffa57dfa5856f2bf92", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "40a37cf1d98f49d2a7766d6a9c7a304b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "15ca3e2a6ecd4dc78b089a004c8dd832" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "482587c66b08454d8c0cf94bb2a533ec", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "71bcf66d2c7a4dee9f08bc89a9774672" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5679351844564412ae5af9334f89321f", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "5e0d5368f6144fa3a05f2b5e989e25ba", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1009.9998779296875, + "y": 302.9999694824219, + "width": 120.00006103515625, + "height": 148.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "5679351844564412ae5af9334f89321f" + }, + { + "m_Id": "e037e7d258e34400b685169a0a598aa7" + }, + { + "m_Id": "254af246b3ae42258ec1d4d0e0049d97" + }, + { + "m_Id": "8c75f434bf6e4081990d03377c07f669" + }, + { + "m_Id": "70120b5270a3424b91d2fc6dac508a2b" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientInputMaterialSlot", + "m_ObjectId": "6fbe934ec4cb457d95fa2916f5121f30", + "m_Id": 0, + "m_DisplayName": "Gradient", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Gradient", + "m_StageCapability": 3, + "m_Value": { + "serializedVersion": "2", + "key0": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "key1": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "key2": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key3": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key4": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key5": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key6": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key7": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "ctime0": 0, + "ctime1": 65535, + "ctime2": 0, + "ctime3": 0, + "ctime4": 0, + "ctime5": 0, + "ctime6": 0, + "ctime7": 0, + "atime0": 0, + "atime1": 65535, + "atime2": 0, + "atime3": 0, + "atime4": 0, + "atime5": 0, + "atime6": 0, + "atime7": 0, + "m_Mode": 0, + "m_ColorSpace": -1, + "m_NumColorKeys": 2, + "m_NumAlphaKeys": 2 + }, + "m_DefaultValue": { + "serializedVersion": "2", + "key0": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "key1": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "key2": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key3": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key4": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key5": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key6": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key7": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "ctime0": 0, + "ctime1": 65535, + "ctime2": 0, + "ctime3": 0, + "ctime4": 0, + "ctime5": 0, + "ctime6": 0, + "ctime7": 0, + "atime0": 0, + "atime1": 65535, + "atime2": 0, + "atime3": 0, + "atime4": 0, + "atime5": 0, + "atime6": 0, + "atime7": 0, + "m_Mode": 0, + "m_ColorSpace": -1, + "m_NumColorKeys": 2, + "m_NumAlphaKeys": 2 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "70120b5270a3424b91d2fc6dac508a2b", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "71bcf66d2c7a4dee9f08bc89a9774672", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "72dd91f1183d498f819167fdf65ada12", + "m_Datas": [ + { + "m_Id": "e43fc642d054436484b7fc14464630de" + } + ], + "m_ActiveSubTarget": { + "m_Id": "c0126ad9f7e344cd93a205ece9acb55b" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8c75f434bf6e4081990d03377c07f669", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9b5d385653b04fa7bd2b3810f55e8013", + "m_Id": 1, + "m_DisplayName": "Time", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Time", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientShaderProperty", + "m_ObjectId": "a128696d045141149cfb3bf816b54d80", + "m_Guid": { + "m_GuidSerialized": "c67d0ed6-ff75-47f5-9414-be832a06c9e4" + }, + "m_Name": "Gradient", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Gradient", + "m_DefaultReferenceName": "_Gradient", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": false, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "serializedVersion": "2", + "key0": { + "r": 0.0, + "g": 0.0, + "b": 1.0, + "a": 1.0 + }, + "key1": { + "r": 0.0, + "g": 0.03921568766236305, + "b": 1.0, + "a": 1.0 + }, + "key2": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 0.0 + }, + "key3": { + "r": 1.0, + "g": 0.03921568766236305, + "b": 0.0, + "a": 0.0 + }, + "key4": { + "r": 1.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key5": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key6": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key7": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "ctime0": 0, + "ctime1": 29491, + "ctime2": 32768, + "ctime3": 36044, + "ctime4": 65535, + "ctime5": 0, + "ctime6": 0, + "ctime7": 0, + "atime0": 0, + "atime1": 65535, + "atime2": 0, + "atime3": 0, + "atime4": 0, + "atime5": 0, + "atime6": 0, + "atime7": 0, + "m_Mode": 0, + "m_ColorSpace": 1, + "m_NumColorKeys": 5, + "m_NumAlphaKeys": 2 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a5d899d55d4c42c2bee93c46b469c0a0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -800.9998779296875, + "y": 183.0, + "width": 113.0, + "height": 33.99998474121094 + } + }, + "m_Slots": [ + { + "m_Id": "fac570dcada74bb99f8f84df7704cf04" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a128696d045141149cfb3bf816b54d80" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVNode", + "m_ObjectId": "aae61fd383a145759ae1fa10631fabba", + "m_Group": { + "m_Id": "" + }, + "m_Name": "UV", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1250.9998779296875, + "y": 271.9999694824219, + "width": 208.0001220703125, + "height": 313.0000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "d0bf0b18495841e3b036937f9ecea82f" + } + ], + "synonyms": [ + "texcoords", + "coords", + "coordinates" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_OutputChannel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "b24d1c02f74d48e5a6cb3e41a064f0fa", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "a128696d045141149cfb3bf816b54d80" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalCanvasSubTarget", + "m_ObjectId": "c0126ad9f7e344cd93a205ece9acb55b" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "d0bf0b18495841e3b036937f9ecea82f", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e037e7d258e34400b685169a0a598aa7", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData", + "m_ObjectId": "e43fc642d054436484b7fc14464630de", + "m_Version": 0, + "m_AlphaClip": false, + "m_DisableTint": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientMaterialSlot", + "m_ObjectId": "fac570dcada74bb99f8f84df7704cf04", + "m_Id": 0, + "m_DisplayName": "Gradient", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3 +} + diff --git a/Assets/09.Shaders/GradientSlider.shadergraph.meta b/Assets/09.Shaders/GradientSlider.shadergraph.meta new file mode 100644 index 000000000..a42aa5249 --- /dev/null +++ b/Assets/09.Shaders/GradientSlider.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ae82fd6780cf2e54b850202306896be6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}