From 6591e1a66fb324f0e95fb9a762ccfa14bb9699f5 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Thu, 22 Aug 2024 19:39:15 +0900 Subject: [PATCH] =?UTF-8?q?Idx=20=EC=9E=90=EB=A3=8C=ED=98=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20int=20->=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01.Scenes/01.Tycoon.unity | 943 +----- .../01.Scenes/02.Combat/LowHealthPoint.asset | 48 + .../Npc/Customer/Conditional/OrderBeverage.cs | 4 +- .../Npc/Customer/Conditional/OrderFood.cs | 3 +- Assets/02.Scripts/Character/CharacterData.cs | 4 +- .../Character/Enemy/Boss/BossData.cs | 2 +- Assets/02.Scripts/Character/Inventory.cs | 2 +- Assets/02.Scripts/Character/Npc/Customer.cs | 2 +- .../02.Scripts/Character/Npc/CustomerData.cs | 2 +- .../Player/Tycoon/TycoonCarryHandler.cs | 2 +- .../Character/Player/Tycoon/TycoonPlayer.cs | 2 +- Assets/02.Scripts/DataManager.cs | 42 +- Assets/02.Scripts/Editor/JsonHelperEditor.cs | 4 +- Assets/02.Scripts/Interface/IIdx.cs | 2 +- Assets/02.Scripts/Item/Cocktail.meta | 8 + .../02.Scripts/Item/Cocktail/CocktailData.cs | 65 + .../Item/Cocktail/CocktailData.cs.meta | 2 + .../Item/Cocktail/CocktailIngredient.cs | 17 + .../Item/Cocktail/CocktailIngredient.cs.meta | 2 + Assets/02.Scripts/Item/DropItem.cs | 2 +- Assets/02.Scripts/Item/Food/FoodData.cs | 22 +- Assets/02.Scripts/Item/Food/Ingredient.cs | 4 +- Assets/02.Scripts/Item/ItemData.cs | 4 +- Assets/02.Scripts/Item/ItemDropTableSo.cs | 12 +- Assets/02.Scripts/Item/ItemManager.cs | 22 +- Assets/02.Scripts/Item/ItemSlot.cs | 4 +- Assets/02.Scripts/Liquid.cs | 7 +- Assets/02.Scripts/LiquidController.cs | 179 +- Assets/02.Scripts/Prop/DamageableProps.cs | 4 +- .../02.Scripts/Prop/SpineDamageableProps.cs | 2 +- Assets/02.Scripts/Prop/Tycoon/Bar.cs | 7 +- .../02.Scripts/Prop/Tycoon/BeverageMachine.cs | 2 +- Assets/02.Scripts/Prop/Tycoon/Cookware.cs | 6 +- Assets/02.Scripts/Prop/Tycoon/FireWood.cs | 2 +- .../ScriptableObject/Item/FoodDataTable.asset | 26 +- Assets/02.Scripts/Tycoon/CustomerManager.cs | 4 +- Assets/02.Scripts/TycoonCameraManager.cs | 2 +- Assets/02.Scripts/Ui/Tycoon/CookUi.cs | 2 +- .../02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs | 12 +- Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs | 8 +- Assets/03.Images/Props/Environment/Ice.png | Bin 0 -> 18227 bytes .../03.Images/Props/Environment/Ice.png.meta | 143 + Assets/04.Materials/Liquid3.mat | 7 +- Assets/05.Prefabs/Ice.prefab | 154 + Assets/05.Prefabs/Ice.prefab.meta | 7 + Assets/05.Prefabs/LiquidObject.prefab | 1 + Assets/09.Shaders/Liquid3.shadergraph | 2733 +++++++++++++++-- Assets/Resources/Excel/FoodDataTable.xlsx | Bin 11368 -> 11229 bytes Assets/Resources/JSON/FoodDataTable.json | 26 +- ProjectSettings/TagManager.asset | 3 + 50 files changed, 3309 insertions(+), 1254 deletions(-) create mode 100644 Assets/02.Scripts/Item/Cocktail.meta create mode 100644 Assets/02.Scripts/Item/Cocktail/CocktailData.cs create mode 100644 Assets/02.Scripts/Item/Cocktail/CocktailData.cs.meta create mode 100644 Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs create mode 100644 Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs.meta create mode 100644 Assets/03.Images/Props/Environment/Ice.png create mode 100644 Assets/03.Images/Props/Environment/Ice.png.meta create mode 100644 Assets/05.Prefabs/Ice.prefab create mode 100644 Assets/05.Prefabs/Ice.prefab.meta diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index c6acd8078..e66fa14f5 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -1785,134 +1785,6 @@ MonoBehaviour: - {fileID: 121952, guid: 720348da784b8fa49a7c48365da6f1b1, type: 3} - {fileID: 162630, guid: f40d1072f56eeb04f9c104b7c4a8811f, type: 3} m_position: 0 ---- !u!1 &165021634 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 165021641} - - component: {fileID: 165021640} - - component: {fileID: 165021637} - m_Layer: 0 - m_Name: UiCamera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &165021637 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 165021634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 1 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 8 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 1 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - m_Quality: 3 - m_FrameInfluence: 0.1 - m_JitterScale: 1 - m_MipBias: 0 - m_VarianceClampScale: 0.9 - m_ContrastAdaptiveSharpening: 0 ---- !u!20 &165021640 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 165021634} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 4 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0.019607844} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.1 - far clip plane: 300 - field of view: 30 - orthographic: 0 - orthographic size: 15.39 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 32 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &165021641 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 165021634} - serializedVersion: 2 - 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: 873223992} - m_LocalEulerAnglesHint: {x: 9.569, y: 87.98, z: 0} --- !u!1 &166220739 GameObject: m_ObjectHideFlags: 0 @@ -3513,9 +3385,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingLayerID: -403788685 + m_SortingLayer: 1 + m_SortingOrder: 11 m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3935,9 +3807,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingLayerID: -403788685 + m_SortingLayer: 1 + m_SortingOrder: 11 m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} m_FlipX: 0 @@ -4115,37 +3987,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 1 ---- !u!1 &427482134 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 427482135} - m_Layer: 0 - m_Name: Spawn - m_TagString: Untagged - m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &427482135 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427482134} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 331.56, y: 13.01, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 522284550} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &428517717 PrefabInstance: m_ObjectHideFlags: 0 @@ -4818,66 +4659,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} m_PrefabInstance: {fileID: 515003792} m_PrefabAsset: {fileID: 0} ---- !u!1 &522284549 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 522284550} - - component: {fileID: 522284551} - m_Layer: 7 - m_Name: Cup (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &522284550 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 522284549} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -44.2, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1035979622} - - {fileID: 1159534954} - - {fileID: 1674889822} - - {fileID: 1625870577} - - {fileID: 427482135} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &522284551 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 522284549} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 278ab2f13d3f1e24594035530325c0ac, type: 3} - m_Name: - m_EditorClassIdentifier: - _renderTexture: {fileID: 0} - _liquidRenderer: {fileID: 2105041734} - _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3} - _spawnTransform: {fileID: 427482135} - _spawnLocation: {fileID: 218784750} - _reachedCollider: {fileID: 1035979623} - _objectPoolCount: 10000 - _liquidColor: {r: 0, g: 0.7294118, b: 1, a: 1} - _pouringRate: 20 - _liquidsPerSecond: 100 - _currentLiquidAmount: 0 --- !u!1 &523582524 GameObject: m_ObjectHideFlags: 0 @@ -5216,7 +4997,7 @@ MonoBehaviour: NearClipPlane: 0.3 FarClipPlane: 300 Dutch: 0 - ModeOverride: 0 + ModeOverride: 2 PhysicalProperties: GateFit: 2 SensorSize: {x: 1, y: 1} @@ -5607,6 +5388,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 578755295} m_CullTransparentMesh: 1 +--- !u!1 &587277060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 587277061} + m_Layer: 5 + m_Name: BeverageUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &587277061 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587277060} + 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: + - {fileID: 1415103797} + m_Father: {fileID: 1049919592} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &593921700 GameObject: m_ObjectHideFlags: 0 @@ -6654,9 +6471,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingLayerID: -403788685 + m_SortingLayer: 1 + m_SortingOrder: 11 m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} m_FlipX: 0 @@ -7735,8 +7552,7 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_Cameras: - - {fileID: 165021640} + m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: serializedVersion: 2 @@ -7819,7 +7635,7 @@ Camera: m_Depth: 1 m_CullingMask: serializedVersion: 2 - m_Bits: 2147745751 + m_Bits: 2147745783 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -7843,8 +7659,7 @@ Transform: m_LocalPosition: {x: 300, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 165021641} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 9.569, y: 87.98, z: 0} --- !u!114 &873223993 @@ -7861,7 +7676,7 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 0 k__BackingField: {fileID: 873223991} - k__BackingField: {fileID: 165021640} + k__BackingField: {fileID: 0} cameraLocation: {fileID: 1634548838} k__BackingField: {fileID: 545850352} k__BackingField: {fileID: 735925261} @@ -8464,140 +8279,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1035979621 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1035979622} - - component: {fileID: 1035979624} - - component: {fileID: 1035979623} - m_Layer: 7 - m_Name: Reached - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1035979622 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035979621} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 324.4, y: -18.3, z: 0} - m_LocalScale: {x: 2, y: 20, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 522284550} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} ---- !u!61 &1035979623 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035979621} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &1035979624 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035979621} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!4 &1038321203 stripped Transform: m_CorrespondingSourceObject: {fileID: 6190127373159935981, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} @@ -8735,7 +8416,7 @@ GameObject: - component: {fileID: 1045118482} - component: {fileID: 1045118483} m_Layer: 7 - m_Name: Cup + m_Name: LiquidController m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8750,7 +8431,7 @@ Transform: m_GameObject: {fileID: 1045118481} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -54.6, y: 13.7, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -8776,15 +8457,18 @@ MonoBehaviour: m_EditorClassIdentifier: _renderTexture: {fileID: 2105041734} _liquidRenderer: {fileID: 379763496} - _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3} + _reachedCollider: {fileID: 400400199} _spawnTransform: {fileID: 1511911897} _spawnLocation: {fileID: 218784750} - _reachedCollider: {fileID: 400400199} - _objectPoolCount: 10000 - _liquidColor: {r: 0, g: 0.7294118, b: 1, a: 1} + _pushDirection: {x: -5, y: -1, z: 0} + _pushPower: 70 + _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3} + _liquidColor: {r: 1, g: 0.8431373, b: 0, a: 1} _pouringRate: 20 - _liquidsPerSecond: 100 - _currentLiquidAmount: 0 + _liquidsPerSecond: 80 + _colorLerpSpeed: 0.5 + _colorIntensity: 2 + _objectPoolCount: 10000 --- !u!1 &1049919588 GameObject: m_ObjectHideFlags: 0 @@ -8856,8 +8540,8 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 1 - m_Camera: {fileID: 165021640} - m_PlaneDistance: 10 + m_Camera: {fileID: 873223991} + m_PlaneDistance: 5 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -8866,7 +8550,7 @@ Canvas: m_VertexColorAlwaysGammaSpace: 1 m_AdditionalShaderChannelsFlag: -1 m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 + m_SortingLayerID: -403788685 m_SortingOrder: 10 m_TargetDisplay: 0 --- !u!224 &1049919592 @@ -8887,6 +8571,7 @@ RectTransform: - {fileID: 1987164072} - {fileID: 102499728} - {fileID: 1733600342} + - {fileID: 587277061} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -9678,140 +9363,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1154969371} m_CullTransparentMesh: 1 ---- !u!1 &1159534953 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1159534954} - - component: {fileID: 1159534956} - - component: {fileID: 1159534955} - m_Layer: 7 - m_Name: Wall - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1159534954 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159534953} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 315, y: -6.8, z: 0} - m_LocalScale: {x: 2, y: 25, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 522284550} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1159534955 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159534953} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &1159534956 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159534953} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1001 &1159737840 PrefabInstance: m_ObjectHideFlags: 0 @@ -12324,6 +11875,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1396147845} m_CullTransparentMesh: 1 +--- !u!1 &1415103796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1415103797} + - component: {fileID: 1415103799} + - component: {fileID: 1415103798} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1415103797 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415103796} + 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: 587277061} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1415103798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415103796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.5882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1415103799 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415103796} + m_CullTransparentMesh: 1 --- !u!1 &1418585147 GameObject: m_ObjectHideFlags: 0 @@ -13972,140 +13598,6 @@ MonoBehaviour: m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 ---- !u!1 &1625870574 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1625870577} - - component: {fileID: 1625870576} - - component: {fileID: 1625870575} - m_Layer: 7 - m_Name: Square (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &1625870575 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1625870574} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &1625870576 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1625870574} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.86666673, g: 0.86666673, b: 0.86666673, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1625870577 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1625870574} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0.38268343, w: 0.92387956} - m_LocalPosition: {x: 333.6, y: 12.3, z: 0} - m_LocalScale: {x: 2, y: 10, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 522284550} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} --- !u!1001 &1628404463 PrefabInstance: m_ObjectHideFlags: 0 @@ -14809,140 +14301,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1670140492} m_CullTransparentMesh: 1 ---- !u!1 &1674889821 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1674889822} - - component: {fileID: 1674889824} - - component: {fileID: 1674889823} - m_Layer: 7 - m_Name: Wall (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1674889822 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674889821} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 333.3, y: -6.8, z: 0} - m_LocalScale: {x: 2, y: 25, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 522284550} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1674889823 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674889821} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &1674889824 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674889821} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1676572567 GameObject: m_ObjectHideFlags: 0 @@ -15990,7 +15348,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!61 &1757976621 BoxCollider2D: m_ObjectHideFlags: 0 @@ -16078,9 +15436,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingLayerID: -403788685 + m_SortingLayer: 1 + m_SortingOrder: 11 m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Color: {r: 0.86666673, g: 0.86666673, b: 0.86666673, a: 1} m_FlipX: 0 @@ -16887,9 +16245,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingLayerID: -403788685 + m_SortingLayer: 1 + m_SortingOrder: 11 m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} m_FlipX: 0 @@ -21443,7 +20801,7 @@ PrefabInstance: - target: {fileID: 3235314206077419821, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: _liquidController2 value: - objectReference: {fileID: 522284551} + objectReference: {fileID: 0} - target: {fileID: 9041926907780427371, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: m_Name value: TycoonMap @@ -21481,8 +20839,7 @@ SceneRoots: - {fileID: 141729588} - {fileID: 852387592} - {fileID: 7827484746149782377} - - {fileID: 20736010} - {fileID: 5626406452199475265} - - {fileID: 218784750} - - {fileID: 522284550} - {fileID: 1045118482} + - {fileID: 20736010} + - {fileID: 218784750} diff --git a/Assets/01.Scenes/02.Combat/LowHealthPoint.asset b/Assets/01.Scenes/02.Combat/LowHealthPoint.asset index 2e4ef44f3..da6ea99e4 100644 --- a/Assets/01.Scenes/02.Combat/LowHealthPoint.asset +++ b/Assets/01.Scenes/02.Combat/LowHealthPoint.asset @@ -1,5 +1,52 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7988510701821828726 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 0 + skipIterations: + m_OverrideState: 0 + m_Value: 1 + threshold: + m_OverrideState: 0 + m_Value: 0.9 + intensity: + m_OverrideState: 0 + m_Value: 0 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + clamp: + m_OverrideState: 0 + m_Value: 65472 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + downscale: + m_OverrideState: 0 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dimension: 1 + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &-3394915221019087120 MonoBehaviour: m_ObjectHideFlags: 3 @@ -30,6 +77,7 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: 8563356217564074714} + - {fileID: -7988510701821828726} --- !u!114 &1921075280319716275 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs index 3ee4756df..5a75ace53 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs @@ -26,7 +26,7 @@ namespace BlueWater.BehaviorTrees.Actions { _foodBalloonUi = _customer.FoodBalloonUi; // TODO : 음료가 다양해질 때 수정해야함 - _foodBalloonUi.OrderFood(40001, _customerData.WaitTime, _customerData.HurryTime); + _foodBalloonUi.OrderFood("40001", _customerData.WaitTime, _customerData.HurryTime); _customer.OnInteraction += HandleBeverageInteraction; _customer.RegisterPlayerInteraction(); @@ -76,7 +76,7 @@ namespace BlueWater.BehaviorTrees.Actions } // TODO : 음료가 다양해질 때 수정해야함 - if (carriedBeverageData.Idx == 40001) + if (carriedBeverageData.Idx == "40001") { tycoonPlayer.GiveItem(); _foodBalloonUi.ReceiveFood(); diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs index c71ed8ef7..a9ecfd759 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using BehaviorDesigner.Runtime.Tasks; using BlueWater.Items; using BlueWater.Npcs.Customers; @@ -17,7 +16,7 @@ namespace BlueWater.BehaviorTrees.Actions private Customer _customer; private CustomerData _customerData; private FoodBalloonUi _foodBalloonUi; - private int _orderFoodIdx; + private string _orderFoodIdx; public override void OnAwake() { diff --git a/Assets/02.Scripts/Character/CharacterData.cs b/Assets/02.Scripts/Character/CharacterData.cs index 610ac6810..229d92f37 100644 --- a/Assets/02.Scripts/Character/CharacterData.cs +++ b/Assets/02.Scripts/Character/CharacterData.cs @@ -7,12 +7,12 @@ namespace BlueWater public class CharacterData { [field: SerializeField] - public int CharacterIdx { get; set; } + public string CharacterIdx { get; set; } [field: SerializeField] public string Name { get; set; } - public CharacterData(int characterIdx, string name) + public CharacterData(string characterIdx, string name) { CharacterIdx = characterIdx; Name = name; diff --git a/Assets/02.Scripts/Character/Enemy/Boss/BossData.cs b/Assets/02.Scripts/Character/Enemy/Boss/BossData.cs index 5eb3af79a..9b8090be4 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/BossData.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/BossData.cs @@ -15,7 +15,7 @@ namespace BlueWater.Enemies.Bosses public string DisplayName { get; private set; } [field: SerializeField] - public int CharacterIdx { get; private set; } + public string CharacterIdx { get; private set; } [field: SerializeField] public int MaxHealthPoint { get; private set; } diff --git a/Assets/02.Scripts/Character/Inventory.cs b/Assets/02.Scripts/Character/Inventory.cs index a5af81245..f65b76b98 100644 --- a/Assets/02.Scripts/Character/Inventory.cs +++ b/Assets/02.Scripts/Character/Inventory.cs @@ -31,7 +31,7 @@ namespace BlueWater public event Action OnChangeItemSlot; - public ItemSlot GetItemByIdx(int idx) + public ItemSlot GetItemByIdx(string idx) { return ItemSlotList.Find(i => i.Idx == idx); } diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs index c94896585..0e8d4b869 100644 --- a/Assets/02.Scripts/Character/Npc/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -178,7 +178,7 @@ namespace BlueWater.Npcs.Customers BarkTrigger = transform.Find("DialogueSystem").GetComponent(); PayMoneyParticle = transform.Find("PayMoneyParticle").GetComponent(); InteractionCanvas = transform.Find("InteractionCanvas").GetComponent(); - InteractionCanvas.worldCamera = TycoonCameraManager.Instance.UiCamera; + //InteractionCanvas.worldCamera = TycoonCameraManager.Instance.UiCamera; InteractionUi = InteractionCanvas.transform.Find("InteractionUi"); InteractionUi.localScale = Vector3.one * (1 / transform.localScale.x); FoodBalloonUi = InteractionCanvas.transform.Find("FoodBalloonUi").GetComponent(); diff --git a/Assets/02.Scripts/Character/Npc/CustomerData.cs b/Assets/02.Scripts/Character/Npc/CustomerData.cs index 1345bb0b9..4ef6021fc 100644 --- a/Assets/02.Scripts/Character/Npc/CustomerData.cs +++ b/Assets/02.Scripts/Character/Npc/CustomerData.cs @@ -12,7 +12,7 @@ namespace BlueWater.Npcs.Customers { [BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] - public int Idx { get; set; } + public string Idx { get; set; } [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] public string Name { get; set; } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonCarryHandler.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonCarryHandler.cs index 3aa4b14c1..071995f50 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonCarryHandler.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonCarryHandler.cs @@ -31,7 +31,7 @@ namespace BlueWater.Players.Tycoons _itemRenderer = transform.Find("VisualLook/Item").GetComponent(); } - public void CarryItem(int itemIdx, bool isUsingSprite = true, ItemQuality itemQuality = ItemQuality.Normal) + public void CarryItem(string itemIdx, bool isUsingSprite = true, ItemQuality itemQuality = ItemQuality.Normal) { if (_isCarriedItem) { diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 1d837e402..5e3fd5855 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -125,7 +125,7 @@ namespace BlueWater.Players.Tycoons public void GetMoney(int money) => DataManager.Instance.GetMoney(money); public bool IsCarriedItem() => TycoonCarryHandler.IsCarriedItem(); - public void CarryItem(int itemIdx, bool isUsingSprite = true, ItemQuality itemQuality = ItemQuality.Normal) + public void CarryItem(string itemIdx, bool isUsingSprite = true, ItemQuality itemQuality = ItemQuality.Normal) { TycoonCarryHandler.CarryItem(itemIdx, isUsingSprite, itemQuality); if (!isUsingSprite) diff --git a/Assets/02.Scripts/DataManager.cs b/Assets/02.Scripts/DataManager.cs index fd9503ac6..6673f4741 100644 --- a/Assets/02.Scripts/DataManager.cs +++ b/Assets/02.Scripts/DataManager.cs @@ -30,7 +30,7 @@ namespace BlueWater [field: Title("아이템 데이터")] [field: SerializeField] - public List FoodRecipes { get; private set; } = new(); + public List FoodRecipes { get; private set; } = new(); [field: Title("타이쿤 데이터")] [field: SerializeField] @@ -49,29 +49,29 @@ namespace BlueWater public void TestData() { - Inventory.AddItem(new ItemSlot(10107, 2)); - Inventory.AddItem(new ItemSlot(10108, 1)); - Inventory.AddItem(new ItemSlot(10109, 2)); - Inventory.AddItem(new ItemSlot(10201, 1)); - Inventory.AddItem(new ItemSlot(10404, 9)); - Inventory.AddItem(new ItemSlot(10503, 4)); - Inventory.AddItem(new ItemSlot(10507, 15)); - Inventory.AddItem(new ItemSlot(10508, 100)); - Inventory.AddItem(new ItemSlot(10603, 3)); - Inventory.AddItem(new ItemSlot(10701, 999)); - Inventory.AddItem(new ItemSlot(10704, 5396)); - Inventory.AddItem(new ItemSlot(10705, 66)); - Inventory.AddItem(new ItemSlot(10706, 35)); - Inventory.AddItem(new ItemSlot(60001, 2)); + Inventory.AddItem(new ItemSlot("10107", 2)); + Inventory.AddItem(new ItemSlot("10108", 1)); + Inventory.AddItem(new ItemSlot("10109", 2)); + Inventory.AddItem(new ItemSlot("10201", 1)); + Inventory.AddItem(new ItemSlot("10404", 9)); + Inventory.AddItem(new ItemSlot("10503", 4)); + Inventory.AddItem(new ItemSlot("10507", 15)); + Inventory.AddItem(new ItemSlot("10508", 100)); + Inventory.AddItem(new ItemSlot("10603", 3)); + Inventory.AddItem(new ItemSlot("10701", 999)); + Inventory.AddItem(new ItemSlot("10704", 5396)); + Inventory.AddItem(new ItemSlot("10705", 66)); + Inventory.AddItem(new ItemSlot("10706", 35)); + Inventory.AddItem(new ItemSlot("60001", 2)); - AddFoodRecipe(30001); - AddFoodRecipe(30002); - AddFoodRecipe(30004); - AddFoodRecipe(30005); - AddFoodRecipe(30006); + AddFoodRecipe("30001"); + AddFoodRecipe("30002"); + AddFoodRecipe("30004"); + AddFoodRecipe("30005"); + AddFoodRecipe("30006"); } - public void AddFoodRecipe(int idx) + public void AddFoodRecipe(string idx) { if (FoodRecipes.Contains(idx)) return; diff --git a/Assets/02.Scripts/Editor/JsonHelperEditor.cs b/Assets/02.Scripts/Editor/JsonHelperEditor.cs index 708e511f2..4ef4987ea 100644 --- a/Assets/02.Scripts/Editor/JsonHelperEditor.cs +++ b/Assets/02.Scripts/Editor/JsonHelperEditor.cs @@ -150,7 +150,7 @@ namespace BlueWater.Editors { existingData ??= new List(); - var newDataIdxSet = new HashSet(); + var newDataIdxSet = new HashSet(); foreach (var newDataItem in newData) { if (newDataItem != null) @@ -161,7 +161,7 @@ namespace BlueWater.Editors existingData.RemoveAll(item => item == null || !newDataIdxSet.Contains(item.Idx)); - var existingDataDict = new Dictionary(); + var existingDataDict = new Dictionary(); foreach (var data in existingData) { if (data != null) diff --git a/Assets/02.Scripts/Interface/IIdx.cs b/Assets/02.Scripts/Interface/IIdx.cs index 66cf602a2..f38cb6988 100644 --- a/Assets/02.Scripts/Interface/IIdx.cs +++ b/Assets/02.Scripts/Interface/IIdx.cs @@ -2,6 +2,6 @@ { public interface IIdx { - int Idx { get; } + string Idx { get; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Cocktail.meta b/Assets/02.Scripts/Item/Cocktail.meta new file mode 100644 index 000000000..d703590f8 --- /dev/null +++ b/Assets/02.Scripts/Item/Cocktail.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47b7c7086a4367c42888ee19cb8e46ab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Item/Cocktail/CocktailData.cs b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs new file mode 100644 index 000000000..d910a6b0a --- /dev/null +++ b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using BlueWater.Interfaces; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Items +{ + [Serializable] + public class CocktailData : IIdx + { + [BoxGroup("Json 데이터 영역")] + [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] + public string Idx { get; set; } + + [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] + public string Name { get; set; } + + [field: SerializeField, Tooltip("오차 범위"), BoxGroup("Json 데이터 영역")] + public int RatioRange { get; set; } + + [field: SerializeField, Tooltip("1번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx1 { get; set; } + + [field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public int IngredientRatio1 { get; set; } + + [field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx2 { get; set; } + + [field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public int IngredientRatio2 { get; set; } + + [field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx3 { get; set; } + + [field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public int IngredientRatio3 { get; set; } + + [field: SerializeField, Tooltip("4번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx4 { get; set; } + + [field: SerializeField, Tooltip("4번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public int IngredientRatio4 { get; set; } + + [field: SerializeField, Tooltip("5번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx5 { get; set; } + + [field: SerializeField, Tooltip("5번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public int IngredientRatio5 { get; set; } + + public List GetValidIngredients() + { + var ingredients = new List(5); + + if (!string.IsNullOrEmpty(IngredientIdx1)) ingredients.Add(new CocktailIngredient(IngredientIdx1, IngredientRatio1)); + if (!string.IsNullOrEmpty(IngredientIdx2)) ingredients.Add(new CocktailIngredient(IngredientIdx2, IngredientRatio2)); + if (!string.IsNullOrEmpty(IngredientIdx3)) ingredients.Add(new CocktailIngredient(IngredientIdx3, IngredientRatio3)); + if (!string.IsNullOrEmpty(IngredientIdx4)) ingredients.Add(new CocktailIngredient(IngredientIdx4, IngredientRatio4)); + if (!string.IsNullOrEmpty(IngredientIdx5)) ingredients.Add(new CocktailIngredient(IngredientIdx5, IngredientRatio5)); + + return ingredients; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Cocktail/CocktailData.cs.meta b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs.meta new file mode 100644 index 000000000..b47df0360 --- /dev/null +++ b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c7f4e50ba016a084a9215cbc874707b5 diff --git a/Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs b/Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs new file mode 100644 index 000000000..b28fb3076 --- /dev/null +++ b/Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs @@ -0,0 +1,17 @@ +using System; + +namespace BlueWater.Items +{ + [Serializable] + public class CocktailIngredient + { + public string Idx { get; set; } + public int Ratio { get; set; } + + public CocktailIngredient(string idx, int quantity) + { + Idx = idx; + Ratio = quantity; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs.meta b/Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs.meta new file mode 100644 index 000000000..cc294d8ac --- /dev/null +++ b/Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: db9868cd60ce5c749a33906472f0eb4d diff --git a/Assets/02.Scripts/Item/DropItem.cs b/Assets/02.Scripts/Item/DropItem.cs index acdc98507..30e316263 100644 --- a/Assets/02.Scripts/Item/DropItem.cs +++ b/Assets/02.Scripts/Item/DropItem.cs @@ -7,7 +7,7 @@ namespace BlueWater.Items public class DropItem { [field: SerializeField] - public int ItemIdx { get; set; } + public string ItemIdx { get; set; } [field: SerializeField] public int DropRate { get; set; } diff --git a/Assets/02.Scripts/Item/Food/FoodData.cs b/Assets/02.Scripts/Item/Food/FoodData.cs index a92fb0d17..40f293c4f 100644 --- a/Assets/02.Scripts/Item/Food/FoodData.cs +++ b/Assets/02.Scripts/Item/Food/FoodData.cs @@ -29,7 +29,7 @@ namespace BlueWater.Items { [BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] - public int Idx { get; set; } + public string Idx { get; set; } [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] public string Name { get; set; } @@ -47,31 +47,31 @@ namespace BlueWater.Items public int Plate { get; set; } [field: SerializeField, Tooltip("1번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientIdx1 { get; set; } + public string IngredientIdx1 { get; set; } [field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientQuantity1 { get; set; } [field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientIdx2 { get; set; } + public string IngredientIdx2 { get; set; } [field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientQuantity2 { get; set; } [field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientIdx3 { get; set; } + public string IngredientIdx3 { get; set; } [field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientQuantity3 { get; set; } [field: SerializeField, Tooltip("4번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientIdx4 { get; set; } + public string IngredientIdx4 { get; set; } [field: SerializeField, Tooltip("4번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientQuantity4 { get; set; } [field: SerializeField, Tooltip("5번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientIdx5 { get; set; } + public string IngredientIdx5 { get; set; } [field: SerializeField, Tooltip("5번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientQuantity5 { get; set; } @@ -80,11 +80,11 @@ namespace BlueWater.Items { var ingredients = new List(5); - if (IngredientIdx1 != 0) ingredients.Add(new Ingredient(IngredientIdx1, IngredientQuantity1)); - if (IngredientIdx2 != 0) ingredients.Add(new Ingredient(IngredientIdx2, IngredientQuantity2)); - if (IngredientIdx3 != 0) ingredients.Add(new Ingredient(IngredientIdx3, IngredientQuantity3)); - if (IngredientIdx4 != 0) ingredients.Add(new Ingredient(IngredientIdx4, IngredientQuantity4)); - if (IngredientIdx5 != 0) ingredients.Add(new Ingredient(IngredientIdx5, IngredientQuantity5)); + if (!string.IsNullOrEmpty(IngredientIdx1)) ingredients.Add(new Ingredient(IngredientIdx1, IngredientQuantity1)); + if (!string.IsNullOrEmpty(IngredientIdx2)) ingredients.Add(new Ingredient(IngredientIdx2, IngredientQuantity2)); + if (!string.IsNullOrEmpty(IngredientIdx3)) ingredients.Add(new Ingredient(IngredientIdx3, IngredientQuantity3)); + if (!string.IsNullOrEmpty(IngredientIdx4)) ingredients.Add(new Ingredient(IngredientIdx4, IngredientQuantity4)); + if (!string.IsNullOrEmpty(IngredientIdx5)) ingredients.Add(new Ingredient(IngredientIdx5, IngredientQuantity5)); return ingredients; } diff --git a/Assets/02.Scripts/Item/Food/Ingredient.cs b/Assets/02.Scripts/Item/Food/Ingredient.cs index b55d1cdae..ed3ca9bf7 100644 --- a/Assets/02.Scripts/Item/Food/Ingredient.cs +++ b/Assets/02.Scripts/Item/Food/Ingredient.cs @@ -5,10 +5,10 @@ namespace BlueWater.Items [Serializable] public class Ingredient { - public int Idx { get; set; } + public string Idx { get; set; } public int Quantity { get; set; } - public Ingredient(int idx, int quantity) + public Ingredient(string idx, int quantity) { Idx = idx; Quantity = quantity; diff --git a/Assets/02.Scripts/Item/ItemData.cs b/Assets/02.Scripts/Item/ItemData.cs index e3a2ac5ed..cde9ccceb 100644 --- a/Assets/02.Scripts/Item/ItemData.cs +++ b/Assets/02.Scripts/Item/ItemData.cs @@ -39,7 +39,7 @@ namespace BlueWater.Items { [BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] - public int Idx { get; set; } + public string Idx { get; set; } [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] public string Name { get; set; } @@ -70,7 +70,7 @@ namespace BlueWater.Items public Item ItemPrefab { get; set; } [JsonConstructor] - public ItemData(int idx, string name, ItemType type, IngredientType ingredientType, ItemQuality quality, int price, + public ItemData(string idx, string name, ItemType type, IngredientType ingredientType, ItemQuality quality, int price, int weight, string description, Sprite sprite, Item itemPrefab) { Idx = idx; diff --git a/Assets/02.Scripts/Item/ItemDropTableSo.cs b/Assets/02.Scripts/Item/ItemDropTableSo.cs index c37438469..32447d511 100644 --- a/Assets/02.Scripts/Item/ItemDropTableSo.cs +++ b/Assets/02.Scripts/Item/ItemDropTableSo.cs @@ -43,16 +43,16 @@ namespace BlueWater.Items private static List ParseJsonToCharacterDrops(string itemDropJsonString, string characterDataJsonString) { var newItemDropTables = new List(); - var itemDropTables = new Dictionary(); + var itemDropTables = new Dictionary(); var characterDataDictionary = ParseCharacterDataJson(characterDataJsonString); var jsonArray = JArray.Parse(itemDropJsonString); foreach (var element in jsonArray) { - var characterIdx = (int)element["CharacterIdx"]; + var characterIdx = (string)element["CharacterIdx"]; var dropItem = new DropItem { - ItemIdx = (int)element["ItemIdx"], + ItemIdx = (string)element["ItemIdx"], DropRate = (int)element["DropRate"], QuantityMin = (int)element["QuantityMin"], QuantityMax = (int)element["QuantityMax"] @@ -71,14 +71,14 @@ namespace BlueWater.Items return newItemDropTables; } - private static Dictionary ParseCharacterDataJson(string characterDataJsonString) + private static Dictionary ParseCharacterDataJson(string characterDataJsonString) { - var characterDataDictionary = new Dictionary(); + var characterDataDictionary = new Dictionary(); var jsonArray = JArray.Parse(characterDataJsonString); foreach (var element in jsonArray) { - var characterIdx = (int)element["CharacterIdx"]; + var characterIdx = (string)element["CharacterIdx"]; var name = (string)element["Name"]; characterDataDictionary[characterIdx] = name; } diff --git a/Assets/02.Scripts/Item/ItemManager.cs b/Assets/02.Scripts/Item/ItemManager.cs index 2aea6c2e8..5fe320760 100644 --- a/Assets/02.Scripts/Item/ItemManager.cs +++ b/Assets/02.Scripts/Item/ItemManager.cs @@ -12,15 +12,15 @@ namespace BlueWater.Items [SerializeField, Required] private ItemDataSo _itemDataSo; - private Dictionary _itemDataDictionary; + private Dictionary _itemDataDictionary; [SerializeField, Required] private ItemDropTableSo _itemDropTableSo; - private Dictionary _itemDropTableDictionary; + private Dictionary _itemDropTableDictionary; [SerializeField, Required] private FoodDataSo _foodDataSo; - private Dictionary _foodDataDictionary; + private Dictionary _foodDataDictionary; [field: SerializeField, Required] public ItemSlotDataSo ItemSlotDataSo { get; private set; } @@ -43,26 +43,26 @@ namespace BlueWater.Items private void Initialize() { - _itemDataDictionary = new Dictionary(_itemDataSo.ItemDataList.Count); + _itemDataDictionary = new Dictionary(_itemDataSo.ItemDataList.Count); foreach (var element in _itemDataSo.ItemDataList) { _itemDataDictionary.TryAdd(element.Idx, element); } - _itemDropTableDictionary = new Dictionary(_itemDropTableSo.ItemDropTables.Count); + _itemDropTableDictionary = new Dictionary(_itemDropTableSo.ItemDropTables.Count); foreach (var element in _itemDropTableSo.ItemDropTables) { _itemDropTableDictionary.TryAdd(element.CharacterData.CharacterIdx, element); } - _foodDataDictionary = new Dictionary(_foodDataSo.FoodDatas.Count); + _foodDataDictionary = new Dictionary(_foodDataSo.FoodDatas.Count); foreach (var element in _foodDataSo.FoodDatas) { _foodDataDictionary.TryAdd(element.Idx, element); } } - public void ItemDropRandomPosition(int idx, Vector3 dropPosition, float randomDropRadius = float.PositiveInfinity) + public void ItemDropRandomPosition(string idx, Vector3 dropPosition, float randomDropRadius = float.PositiveInfinity) { var itemDropTable = GetItemDropTableByIdx(idx); if (itemDropTable == null) return; @@ -103,7 +103,7 @@ namespace BlueWater.Items return positions.Any(pos => Vector3.Distance(position, pos) > _minSeparationDistance); } - public ItemData GetItemDataByIdx(int idx) + public ItemData GetItemDataByIdx(string idx) { if (_itemDataDictionary.TryGetValue(idx, out var itemData)) return itemData; @@ -111,9 +111,9 @@ namespace BlueWater.Items return null; } - public ItemDropTable GetItemDropTableByIdx(int idx) + public ItemDropTable GetItemDropTableByIdx(string idx) { - if (idx == 0) + if (string.IsNullOrEmpty(idx)) { Debug.Log("ItemDropTable이 비어있습니다."); return null; @@ -125,7 +125,7 @@ namespace BlueWater.Items return null; } - public FoodData GetFoodDataByIdx(int idx) + public FoodData GetFoodDataByIdx(string idx) { if (_foodDataDictionary.TryGetValue(idx, out var foodData)) return foodData; diff --git a/Assets/02.Scripts/Item/ItemSlot.cs b/Assets/02.Scripts/Item/ItemSlot.cs index d9dc18654..f6c919e7c 100644 --- a/Assets/02.Scripts/Item/ItemSlot.cs +++ b/Assets/02.Scripts/Item/ItemSlot.cs @@ -7,7 +7,7 @@ namespace BlueWater.Items public class ItemSlot { [field: SerializeField, Tooltip("아이템 인덱스")] - public int Idx { get; private set; } + public string Idx { get; private set; } [field: SerializeField, Tooltip("아이템 수량")] public int Quantity { get; set; } @@ -15,7 +15,7 @@ namespace BlueWater.Items [field: SerializeField, Tooltip("아이템 획득 시간")] public long AcquisitionTime { get; set; } - public ItemSlot(int idx, int quantity) + public ItemSlot(string idx, int quantity) { Idx = idx; Quantity = quantity; diff --git a/Assets/02.Scripts/Liquid.cs b/Assets/02.Scripts/Liquid.cs index e3abe699d..acd309fca 100644 --- a/Assets/02.Scripts/Liquid.cs +++ b/Assets/02.Scripts/Liquid.cs @@ -8,6 +8,9 @@ namespace BlueWater [SerializeField] private SpriteRenderer _spriteRenderer; + [SerializeField] + private Rigidbody2D _rigidbody2D; + [SerializeField, Range(0f, 2f)] private float _distanceThreshold = 0.5f; @@ -18,11 +21,13 @@ namespace BlueWater public void SetManagedPool(IObjectPool pool) => _managedPool = pool; public void Destroy() => _managedPool.Release(this); - public void Initialize(LiquidController liquidController, Collider2D targetCollider, Color color) + public void Initialize(LiquidController liquidController, Collider2D targetCollider, Color color, Vector3 pushForce) { _liquidController = liquidController; _targetCollider = targetCollider; _spriteRenderer.color = color; + _rigidbody2D.linearVelocity = Vector2.zero; + _rigidbody2D.AddForce(pushForce, ForceMode2D.Impulse); } private void Update() diff --git a/Assets/02.Scripts/LiquidController.cs b/Assets/02.Scripts/LiquidController.cs index e075a19d4..d168bea05 100644 --- a/Assets/02.Scripts/LiquidController.cs +++ b/Assets/02.Scripts/LiquidController.cs @@ -8,15 +8,19 @@ namespace BlueWater { public class LiquidController : MonoBehaviour { + #region Variables + + [Title("컴포넌트")] [SerializeField] private Renderer _renderTexture; [SerializeField] private Renderer _liquidRenderer; - [SerializeField, Required] - private Liquid _liquidObject; + [SerializeField] + private Collider2D _reachedCollider; + [Title("스폰 데이터")] [SerializeField, Required] private Transform _spawnTransform; @@ -24,42 +28,57 @@ namespace BlueWater private Transform _spawnLocation; [SerializeField] - private Collider2D _reachedCollider; + private Vector3 _pushDirection; [SerializeField] - private int _objectPoolCount = 1000; + private float _pushPower; + + [Title("액체")] + [SerializeField, Required, Tooltip("액체 프리팹")] + private Liquid _liquidObject; + + [SerializeField, Tooltip("떨어지는 액체의 색상")] + private Color _liquidColor = new(1f, 0.8431373f, 0f, 1f); + + [SerializeField, Tooltip("초당 생성되는 액체 수(ml)")] + private int _liquidsPerSecond = 80; [SerializeField] - private Color _liquidColor = new(0f, 0.7294118f, 1f, 1f); + private int _maxLiquidCount = 400; - [SerializeField, Tooltip("1초에 차는 %")] - private float _pouringRate = 20f; - - [SerializeField] - private int _liquidsPerSecond = 100; - - [SerializeField, Range(0f, 100f)] - private float _currentLiquidAmount; - - [SerializeField, Range(0f, 1f)] + [SerializeField, Range(0f, 1f), Tooltip("목표 색상으로 변경되는데 걸리는 시간")] private float _colorLerpSpeed = 0.5f; + + [SerializeField, Range(1f, 5f), Tooltip("목표 색상 * 밝기")] + private float _colorIntensity = 2f; + + [Title("오브젝트 풀링")] + [SerializeField, Tooltip("오브젝트 풀링 최대 개수")] + private int _objectPoolCount = 1000; private IObjectPool _objectPool; private List _activeLiquids = new(); - private Dictionary _colorTimes = new(); - + private Dictionary _colorCounts = new(); private Material _instanceMaterial; + private bool _isPouring; private float _startTime = float.PositiveInfinity; - private float _endTime = float.PositiveInfinity; + private int _instanceLiquidCount; + private float _currentLiquidAmount; + private float _liquidReachedTime; private float _timeInterval; - private float _liquidPerObject; private Color _currentMixedColor = Color.black; private Color _targetColor; - + // Hashes private static readonly int _liquidAmountHash = Shader.PropertyToID("_LiquidAmount"); private static readonly int _liquidColorHash = Shader.PropertyToID("_LiquidColor"); + private static readonly int _renderTextureColorHash = Shader.PropertyToID("_Color"); + + #endregion + + // Unity events + #region Unity events private void Awake() { @@ -72,7 +91,6 @@ namespace BlueWater _liquidRenderer.material = _instanceMaterial; _timeInterval = 1f / _liquidsPerSecond; - _liquidPerObject = _pouringRate / _liquidsPerSecond; _instanceMaterial.SetFloat(_liquidAmountHash, 0f); } @@ -80,7 +98,7 @@ namespace BlueWater { if (_isPouring) { - if (_currentLiquidAmount >= 100f) + if (_instanceLiquidCount >= _maxLiquidCount) { InActiveIsPouring(); return; @@ -90,41 +108,44 @@ namespace BlueWater { _objectPool.Get(); - if (_colorTimes.ContainsKey(_liquidColor)) + if (!_colorCounts.TryAdd(_liquidColor, 1)) { - _colorTimes[_liquidColor] += _timeInterval; - } - else - { - _colorTimes[_liquidColor] = _timeInterval; + _colorCounts[_liquidColor] += 1; } _startTime = Time.time; } } - if (_endTime + _colorLerpSpeed >= Time.time) + if (_liquidReachedTime + _colorLerpSpeed >= Time.time) { _currentMixedColor = Color.Lerp(_currentMixedColor, _targetColor, _colorLerpSpeed * Time.deltaTime); - _instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor); + _instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity); } } + #endregion + + // Initialize methods + #region Initialize methods + public void Initialize() { + _instanceLiquidCount = 0; + _currentLiquidAmount = 0f; _currentMixedColor = _liquidColor; - _instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor); + _instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity); } + #endregion + + // Object pooling system + #region Object pooling system + private Liquid CreateObject() { var instance = Instantiate(_liquidObject, _spawnTransform.position, Quaternion.identity, _spawnLocation); instance.SetManagedPool(_objectPool); - instance.Initialize(this, _reachedCollider, _liquidColor); - if (_renderTexture && _renderTexture.material.GetColor("_Color") != _liquidColor) - { - _renderTexture.material.SetColor("_Color", _liquidColor); - } return instance; } @@ -132,12 +153,13 @@ namespace BlueWater { liquid.transform.position = _spawnTransform.position; liquid.transform.rotation = Quaternion.identity; - liquid.Initialize(this, _reachedCollider, _liquidColor); - if (_renderTexture && _renderTexture.material.GetColor("_Color") != _liquidColor) - { - _renderTexture.material.SetColor("_Color", _liquidColor); - } liquid.gameObject.SetActive(true); + _instanceLiquidCount++; + liquid.Initialize(this, _reachedCollider, _liquidColor, _pushDirection.normalized * _pushPower); + if (_renderTexture && _renderTexture.material.GetColor(_renderTextureColorHash) != _liquidColor) + { + _renderTexture.material.SetColor(_renderTextureColorHash, _liquidColor); + } _activeLiquids.Add(liquid); } @@ -152,41 +174,28 @@ namespace BlueWater Destroy(liquid.gameObject); _activeLiquids.Remove(liquid); } - - private Color MixColorsByTime() - { - var totalTime = _colorTimes.Values.Sum(); - // 혼합된 색상 초기화 (검은색) - var mixedColor = Color.black; + #endregion - // 색상 혼합 - foreach (var element in _colorTimes) - { - var color = element.Key; - var time = element.Value; - var ratio = time / totalTime; - - mixedColor += color * ratio; - } - - mixedColor.a = 1f; - - return mixedColor; - } + // Custom methods + #region Custom methods [Button("기본 색상")] - private void DefaultColor() => _liquidColor = new Color(0f, 0.7294118f, 1f, 1f); + private void DefaultColor() => _liquidColor = new Color(1f, 0.8431373f, 0f, 1f); + /// + /// 술 제조 과정 초기화 함수 + /// public void ReleaseAllObject() { - // 뒤에서부터 Remove해야 오류가 없음 + // 리스트 삭제는 뒤에서부터 해야 오류가 없음 for (var i = _activeLiquids.Count - 1; i >= 0; i--) { _activeLiquids[i].Destroy(); } - _colorTimes.Clear(); + _colorCounts.Clear(); + _instanceLiquidCount = 0; _currentLiquidAmount = 0f; _instanceMaterial.SetFloat(_liquidAmountHash, 0f); } @@ -202,22 +211,48 @@ namespace BlueWater _isPouring = false; } + /// + /// 사용된 색상의 비율에 맞게 색을 혼합시키는 함수 + /// + private Color MixColorsByTime() + { + var totalCounts = _colorCounts.Values.Sum(); + + var mixedColor = Color.black; + + foreach (var element in _colorCounts) + { + var color = element.Key; + var count = element.Value; + var ratio = count / (float)totalCounts; + + mixedColor += color * ratio; + } + + mixedColor.a = 1f; + + return mixedColor; + } + + /// + /// 액체가 특정 오브젝트에 충돌했을 때, 실행해야하는 과정 + /// public void OnLiquidReached() { - _endTime = Time.time; - // 컵에 채워진 액체의 양을 증가시킴 - _currentLiquidAmount += _liquidPerObject; - _currentLiquidAmount = Mathf.Clamp(_currentLiquidAmount, 0f, 100f); - var liquidAmount = _currentLiquidAmount * 0.01f; + _liquidReachedTime = Time.time; + _currentLiquidAmount++; + var liquidAmount = Mathf.Clamp(_currentLiquidAmount / _maxLiquidCount, 0f, 1f); _instanceMaterial.SetFloat(_liquidAmountHash, liquidAmount); _targetColor = MixColorsByTime(); - //_instanceMaterial.SetColor(_liquidColorHash, MixColorsByTime()); - // 액체가 100%에 도달하면 pouring을 멈춤 - if (_currentLiquidAmount >= 100f) + if (liquidAmount >= 1f) { InActiveIsPouring(); } } + + #endregion + + } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/DamageableProps.cs b/Assets/02.Scripts/Prop/DamageableProps.cs index fb6d10588..a04c61e88 100644 --- a/Assets/02.Scripts/Prop/DamageableProps.cs +++ b/Assets/02.Scripts/Prop/DamageableProps.cs @@ -10,7 +10,7 @@ namespace BlueWater { [Title("드롭 아이템")] [SerializeField] - protected int CharacterIdx; + protected string CharacterIdx; [field: Title("체력")] [field: SerializeField] @@ -81,7 +81,7 @@ namespace BlueWater dieParticleInstance.Play(); } - if (CharacterIdx != 0) + if (!string.IsNullOrEmpty(CharacterIdx)) { ItemManager.Instance.ItemDropRandomPosition(CharacterIdx, transform.position, 0f); } diff --git a/Assets/02.Scripts/Prop/SpineDamageableProps.cs b/Assets/02.Scripts/Prop/SpineDamageableProps.cs index a6015e14f..6304225e8 100644 --- a/Assets/02.Scripts/Prop/SpineDamageableProps.cs +++ b/Assets/02.Scripts/Prop/SpineDamageableProps.cs @@ -62,7 +62,7 @@ namespace BlueWater _spineController.PlayAnimation(_dieAnimationName, false); - if (CharacterIdx != 0) + if (!string.IsNullOrEmpty(CharacterIdx)) { ItemManager.Instance.ItemDropRandomPosition(CharacterIdx, transform.position, 0f); } diff --git a/Assets/02.Scripts/Prop/Tycoon/Bar.cs b/Assets/02.Scripts/Prop/Tycoon/Bar.cs index 1e926785a..41691d623 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Bar.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Bar.cs @@ -22,7 +22,7 @@ namespace BlueWater.Tycoons PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Bar); TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Bar); _liquidController.Initialize(); - _liquidController2.Initialize(); + //_liquidController2.Initialize(); } public void Escape() @@ -30,18 +30,19 @@ namespace BlueWater.Tycoons PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Base); _liquidController.ReleaseAllObject(); + //_liquidController2.ReleaseAllObject(); } public void ActiveIsPouring() { _liquidController.ActiveIsPouring(); - _liquidController2.ActiveIsPouring(); + //_liquidController2.ActiveIsPouring(); } public void InActiveIsPouring() { _liquidController.InActiveIsPouring(); - _liquidController2.InActiveIsPouring(); + //_liquidController2.InActiveIsPouring(); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs index 349832852..caf57f1ec 100644 --- a/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs +++ b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs @@ -5,7 +5,7 @@ namespace BlueWater.Tycoons public class BeverageMachine : InteractionFurniture { [SerializeField] - private int _itemIdx = 40001; + private string _itemIdx = "40001"; public override void Interaction() { diff --git a/Assets/02.Scripts/Prop/Tycoon/Cookware.cs b/Assets/02.Scripts/Prop/Tycoon/Cookware.cs index f1d0b234d..ac6afadcc 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Cookware.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Cookware.cs @@ -35,7 +35,7 @@ namespace BlueWater.Tycoons [FormerlySerializedAs("_fireWoodIdx")] [SerializeField, BoxGroup("데이터")] - protected int FireWoodIdx = 70001; + protected string FireWoodIdx = "70001"; private Queue _cookedFoodDatas; private int _currentFireWoodCount; @@ -59,7 +59,7 @@ namespace BlueWater.Tycoons private void Update() { - if (!IsOpened || CurrentDailyFoodUi.FoodData is null or { Idx : 0 }) return; + if (!IsOpened || CurrentDailyFoodUi.FoodData == null || string.IsNullOrEmpty(CurrentDailyFoodUi.FoodData.Idx)) return; var level = _currentFireWoodCount / 5; var currentFireWoodLevel = CookwareDataSo.FireWoodLevel[level]; @@ -160,7 +160,7 @@ namespace BlueWater.Tycoons protected override void OpenTycoonSwitch() { - if (CurrentDailyFoodUi.FoodData is not null and not { Idx : 0 }) + if (CurrentDailyFoodUi.FoodData != null && !string.IsNullOrEmpty(CurrentDailyFoodUi.FoodData.Idx)) { CookGauge.enabled = true; FireWoodQuantity.enabled = true; diff --git a/Assets/02.Scripts/Prop/Tycoon/FireWood.cs b/Assets/02.Scripts/Prop/Tycoon/FireWood.cs index c18087abc..8539b528d 100644 --- a/Assets/02.Scripts/Prop/Tycoon/FireWood.cs +++ b/Assets/02.Scripts/Prop/Tycoon/FireWood.cs @@ -5,7 +5,7 @@ namespace BlueWater.Tycoons public class FireWood : InteractionFurniture { [SerializeField] - private int _itemIdx = 70001; + private string _itemIdx = "70001"; public override void Interaction() { diff --git a/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset index bea426c15..0e2b9b3e7 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset @@ -23,11 +23,11 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 10706 k__BackingField: 1 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 30002 k__BackingField: "\uC5BC\uC74C\uB3C4\uCE58 \uD325\uBE59\uC218" @@ -39,11 +39,11 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 10706 k__BackingField: 1 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 30003 k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4 \uD280\uAE40" @@ -57,9 +57,9 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 10704 k__BackingField: 1 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 30004 k__BackingField: "\uCF54\uBFD4\uC18C \uB4B7\uB2E4\uB9AC \uACE0\uAE30" @@ -73,9 +73,9 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 10701 k__BackingField: 1 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 30005 k__BackingField: "\uBC31\uC0C1\uC5B4 \uD1B5\uAD6C\uC774" @@ -91,7 +91,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 10704 k__BackingField: 1 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 30006 k__BackingField: "\uBC84\uD130 \uC870\uAC1C \uAD6C\uC774" @@ -105,7 +105,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 10705 k__BackingField: 1 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: 0 + k__BackingField: k__BackingField: 0 diff --git a/Assets/02.Scripts/Tycoon/CustomerManager.cs b/Assets/02.Scripts/Tycoon/CustomerManager.cs index 63bb92b00..a5a1d0186 100644 --- a/Assets/02.Scripts/Tycoon/CustomerManager.cs +++ b/Assets/02.Scripts/Tycoon/CustomerManager.cs @@ -15,7 +15,7 @@ namespace BlueWater.Tycoons [Title("손님 데이터")] [SerializeField, Required] private CustomerDataSo _customerDataSo; - private Dictionary _customerDatas; + private Dictionary _customerDatas; [SerializeField, Required] private Customer _customerPrefab; @@ -40,7 +40,7 @@ namespace BlueWater.Tycoons protected override void OnAwake() { - _customerDatas = new Dictionary(_customerDataSo.CustomerDatas.Count); + _customerDatas = new Dictionary(_customerDataSo.CustomerDatas.Count); foreach (var element in _customerDataSo.CustomerDatas) { _customerDatas.TryAdd(element.Idx, element); diff --git a/Assets/02.Scripts/TycoonCameraManager.cs b/Assets/02.Scripts/TycoonCameraManager.cs index 36138e93d..3741b8161 100644 --- a/Assets/02.Scripts/TycoonCameraManager.cs +++ b/Assets/02.Scripts/TycoonCameraManager.cs @@ -82,7 +82,7 @@ namespace BlueWater MainCamera = GetComponent(); _cinemachineBrain = GetComponent(); - UiCamera = MainCamera.transform.Find("UiCamera").GetComponent(); + //UiCamera = MainCamera.transform.Find("UiCamera").GetComponent(); BaseCamera = cameraLocation.Find("BaseCamera").GetComponent(); BarCamera = cameraLocation.Find("BarCamera").GetComponent(); diff --git a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs index 661aad91b..7b55348ad 100644 --- a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs @@ -194,7 +194,7 @@ namespace BlueWater.Uis public void CheckCookable() { - if (_selectedFoodData == null || _selectedFoodData.Idx == 0) + if (_selectedFoodData == null || string.IsNullOrEmpty(_selectedFoodData.Idx)) { _cookButton.interactable = false; _cookText.color = _cookButton.colors.disabledColor; diff --git a/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs index ee30cc35e..5bf08694e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs @@ -100,7 +100,7 @@ namespace BlueWater.Uis foreach (var element in selectedTypeItemSlotUis) { - if (!element.GetIsLocked() && element.FoodData is null or { Idx: 0 }) + if (!element.GetIsLocked() && element.FoodData == null || string.IsNullOrEmpty(element.FoodData.Idx)) { return true; } @@ -115,7 +115,7 @@ namespace BlueWater.Uis foreach (var element in selectedTypeItemSlotUis) { - if (!element.GetIsLocked() && element.FoodData is null or { Idx: 0 }) + if (!element.GetIsLocked() && element.FoodData == null || string.IsNullOrEmpty(element.FoodData.Idx)) { element.SetFoodData(selectedFoodData); DailyFoodSlotUis.Add(element); @@ -146,10 +146,10 @@ namespace BlueWater.Uis public bool CanOpen() { - return _grillFoodSlotUis.Any(slot => slot.FoodData is not null and not { Idx: 0 }) || - _soupFoodSlotUis.Any(slot => slot.FoodData is not null and not { Idx: 0 }) || - _skewerFoodSlotUis.Any(slot => slot.FoodData is not null and not { Idx: 0 }) || - _dessertPanFoodSlotUis.Any(slot => slot.FoodData is not null and not { Idx: 0 }); + return _grillFoodSlotUis.Any(slot => slot.FoodData != null && !string.IsNullOrEmpty(slot.FoodData.Idx)) || + _soupFoodSlotUis.Any(slot => slot.FoodData != null && !string.IsNullOrEmpty(slot.FoodData.Idx)) || + _skewerFoodSlotUis.Any(slot => slot.FoodData != null && !string.IsNullOrEmpty(slot.FoodData.Idx)) || + _dessertPanFoodSlotUis.Any(slot => slot.FoodData != null && !string.IsNullOrEmpty(slot.FoodData.Idx)); } public TycoonItemSlotUi InitializeGrill(Grill grill) diff --git a/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs index cfb67dfad..6cf298cd5 100644 --- a/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs @@ -56,7 +56,7 @@ namespace BlueWater.Uis public void ShowUi() => gameObject.SetActive(true); public void HideUi() => gameObject.SetActive(false); - public void SetFoodImage(int foodIdx) + public void SetFoodImage(string foodIdx) { _orderItemData = ItemManager.Instance.GetItemDataByIdx(foodIdx); if (_orderItemData == null) @@ -72,12 +72,12 @@ namespace BlueWater.Uis FoodImage.sprite = _orderItemData.Sprite; } - public void SetFoodImage(Sprite sprite) + public void SetFoodSprite(Sprite sprite) { FoodImage.sprite = sprite; } - public void OrderFood(int foodIdx, int waitTime, int hurryTime) + public void OrderFood(string foodIdx, int waitTime, int hurryTime) { _isOrdered = true; _isWaitTimeOver = false; @@ -99,7 +99,7 @@ namespace BlueWater.Uis _isOrdered = true; _isWaitTimeOver = false; _isFoodReceived = false; - SetFoodImage(DataManager.Instance.SpriteDataSo.Gold); + SetFoodSprite(DataManager.Instance.SpriteDataSo.Gold); ShowUi(); _tween = FillImage.DOFillAmount(1f, hurryTime) diff --git a/Assets/03.Images/Props/Environment/Ice.png b/Assets/03.Images/Props/Environment/Ice.png new file mode 100644 index 0000000000000000000000000000000000000000..c71d612846ebedf85f15a55e0ea0672a73dcc019 GIT binary patch literal 18227 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 literal 0 HcmV?d00001 diff --git a/Assets/03.Images/Props/Environment/Ice.png.meta b/Assets/03.Images/Props/Environment/Ice.png.meta new file mode 100644 index 000000000..34f19de50 --- /dev/null +++ b/Assets/03.Images/Props/Environment/Ice.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 5317214c6c3a1d74c97c68e6ba525593 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Liquid3.mat b/Assets/04.Materials/Liquid3.mat index ec8521ef1..2ba7c0bfd 100644 --- a/Assets/04.Materials/Liquid3.mat +++ b/Assets/04.Materials/Liquid3.mat @@ -118,10 +118,10 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _LiquidAmount: 0.662 + - _LiquidAmount: 1 - _LiquidFrequency: 18 - _LiquidSpeed: 3 - - _LiquidTopWidth: 5 + - _LiquidTopWidth: 15 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 @@ -138,6 +138,7 @@ Material: - _SrcBlendAlpha: 1 - _Surface: 0 - _Test: 0 + - _TopMaskHeight: 0.035 - _Visibility: 0.1 - _WaterFrequency: 10 - _WaterLevel: 1 @@ -152,7 +153,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FillAmount: {r: 0, g: 0, b: 0, a: 0} - _FormColor: {r: 0.4078431, g: 1.317647, b: 1.4980392, a: 0} - - _LiquidColor: {r: 0, g: 0.3513453, b: 1, a: 0} + - _LiquidColor: {r: 2, g: 1.6862745, b: 0, a: 0} - _LiquidTopColor: {r: 1, g: 1, b: 1, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _WaterColor: {r: 0, g: 1.5319147, b: 2, a: 0} diff --git a/Assets/05.Prefabs/Ice.prefab b/Assets/05.Prefabs/Ice.prefab new file mode 100644 index 000000000..b09c348ef --- /dev/null +++ b/Assets/05.Prefabs/Ice.prefab @@ -0,0 +1,154 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4182144982868500803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7412895653495447626} + - component: {fileID: 2516316322156046459} + - component: {fileID: 8452260105535798107} + - component: {fileID: 8043191264785836122} + m_Layer: 8 + m_Name: Ice + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7412895653495447626 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4182144982868500803} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 330.7, y: 17.7, z: 0} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2516316322156046459 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4182144982868500803} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: 5317214c6c3a1d74c97c68e6ba525593, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &8452260105535798107 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4182144982868500803} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 50 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 3 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &8043191264785836122 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4182144982868500803} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.45 diff --git a/Assets/05.Prefabs/Ice.prefab.meta b/Assets/05.Prefabs/Ice.prefab.meta new file mode 100644 index 000000000..7c7eaf35d --- /dev/null +++ b/Assets/05.Prefabs/Ice.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c5e5fa01b84c9f64ba05b7c9f481acc1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/LiquidObject.prefab b/Assets/05.Prefabs/LiquidObject.prefab index f7989ff79..b2c238b83 100644 --- a/Assets/05.Prefabs/LiquidObject.prefab +++ b/Assets/05.Prefabs/LiquidObject.prefab @@ -166,4 +166,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spriteRenderer: {fileID: 3772201455671009312} + _rigidbody2D: {fileID: 3470010340248184897} _distanceThreshold: 0.5 diff --git a/Assets/09.Shaders/Liquid3.shadergraph b/Assets/09.Shaders/Liquid3.shadergraph index 350c3fb6f..19ed30ae3 100644 --- a/Assets/09.Shaders/Liquid3.shadergraph +++ b/Assets/09.Shaders/Liquid3.shadergraph @@ -35,6 +35,9 @@ }, { "m_Id": "322483c4bb8149acb7d40d5e0420d93c" + }, + { + "m_Id": "df059041f593431981054ddea3a5107f" } ], "m_Keywords": [], @@ -269,11 +272,70 @@ }, { "m_Id": "baf76a4afc12454290429c96bed618a8" + }, + { + "m_Id": "5eb089d755c549508bb5f8e22152001b" + }, + { + "m_Id": "a4b3c331d70c4db9bfc360e9008cf54b" + }, + { + "m_Id": "6190f82409c04016a37ec77939018c53" + }, + { + "m_Id": "4de3bbef712a4eaba069e0ec25314dae" + }, + { + "m_Id": "84e44231cbec49bd9f3bdcb3ed2ab0d4" + }, + { + "m_Id": "01d1259f420e426399091c9a5ce75e1a" + }, + { + "m_Id": "4768904af7ef4db18a183030cfecc457" + }, + { + "m_Id": "6af564fe1b6e4eaca3bbd28f5acf50a4" + }, + { + "m_Id": "13d065f996e341ef9c402b5acf05afea" + }, + { + "m_Id": "ece8f1aee1274114a1608eed2aa7ebce" + }, + { + "m_Id": "dc3d3a7736634e0aa52951541f4df1c0" + }, + { + "m_Id": "d0452d70746c4e77a83aea226eca353e" + }, + { + "m_Id": "9a18ee89b96f4dc585f59258aea4209d" + }, + { + "m_Id": "9d693d00c47a410aa4f1ff73ff3c755b" + }, + { + "m_Id": "a80f5045148b4e6a8db99957f45731f7" } ], "m_GroupDatas": [], "m_StickyNoteDatas": [], "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "01d1259f420e426399091c9a5ce75e1a" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9a18ee89b96f4dc585f59258aea4209d" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -344,6 +406,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "13d065f996e341ef9c402b5acf05afea" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d0452d70746c4e77a83aea226eca353e" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -498,6 +574,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4de3bbef712a4eaba069e0ec25314dae" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "84e44231cbec49bd9f3bdcb3ed2ab0d4" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -554,6 +644,34 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5eb089d755c549508bb5f8e22152001b" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "273e59812e324666ba44bd5ecd49fa85" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5eb089d755c549508bb5f8e22152001b" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6190f82409c04016a37ec77939018c53" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -568,6 +686,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6190f82409c04016a37ec77939018c53" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c29478a866694141b2251a949eed0f87" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -596,6 +728,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6af564fe1b6e4eaca3bbd28f5acf50a4" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "13d065f996e341ef9c402b5acf05afea" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -619,9 +765,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "8f810de21465409ea89269c362558925" + "m_Id": "01d1259f420e426399091c9a5ce75e1a" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -722,6 +868,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "84e44231cbec49bd9f3bdcb3ed2ab0d4" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d0452d70746c4e77a83aea226eca353e" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -750,6 +910,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "8f810de21465409ea89269c362558925" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4768904af7ef4db18a183030cfecc457" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -792,6 +966,34 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "9a18ee89b96f4dc585f59258aea4209d" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9d693d00c47a410aa4f1ff73ff3c755b" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "9d693d00c47a410aa4f1ff73ff3c755b" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8f810de21465409ea89269c362558925" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -848,6 +1050,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a4b3c331d70c4db9bfc360e9008cf54b" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5eb089d755c549508bb5f8e22152001b" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -876,6 +1092,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a80f5045148b4e6a8db99957f45731f7" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5eb089d755c549508bb5f8e22152001b" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -901,7 +1131,7 @@ "m_Node": { "m_Id": "0fe8ff0156224e5abf372267f44612ac" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -943,7 +1173,7 @@ "m_Node": { "m_Id": "0fe8ff0156224e5abf372267f44612ac" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { @@ -971,7 +1201,7 @@ "m_Node": { "m_Id": "c0aecb09d13249d4b485b551cac8d473" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { @@ -983,21 +1213,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "273e59812e324666ba44bd5ecd49fa85" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "b949863778184adf8fd2ec59311a01f6" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "c29478a866694141b2251a949eed0f87" + "m_Id": "a4b3c331d70c4db9bfc360e9008cf54b" }, "m_SlotId": 0 } @@ -1007,7 +1223,7 @@ "m_Node": { "m_Id": "b9cb0b74b5ec40239a553ccc3b5d68bf" }, - "m_SlotId": 0 + "m_SlotId": 1 }, "m_InputSlot": { "m_Node": { @@ -1128,6 +1344,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d0452d70746c4e77a83aea226eca353e" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "01d1259f420e426399091c9a5ce75e1a" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1212,6 +1442,34 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "dc3d3a7736634e0aa52951541f4df1c0" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "84e44231cbec49bd9f3bdcb3ed2ab0d4" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "dc3d3a7736634e0aa52951541f4df1c0" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "13d065f996e341ef9c402b5acf05afea" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1279,7 +1537,7 @@ "m_Node": { "m_Id": "c0aecb09d13249d4b485b551cac8d473" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -1296,6 +1554,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ece8f1aee1274114a1608eed2aa7ebce" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "dc3d3a7736634e0aa52951541f4df1c0" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1369,8 +1641,8 @@ ], "m_VertexContext": { "m_Position": { - "x": 242.0001983642578, - "y": -250.99998474121095 + "x": 1086.9998779296875, + "y": -97.00000762939453 }, "m_Blocks": [ { @@ -1386,8 +1658,8 @@ }, "m_FragmentContext": { "m_Position": { - "x": 242.0001983642578, - "y": -51.000038146972659 + "x": 1086.9998779296875, + "y": 103.00003051757813 }, "m_Blocks": [ { @@ -1524,6 +1796,49 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "01d1259f420e426399091c9a5ce75e1a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2430.000244140625, + "y": 2793.000244140625, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "1580e15ba23748e4b1f0e2af78fd95f8" + }, + { + "m_Id": "fa60017cfb8944fb941e66ec745830d1" + }, + { + "m_Id": "4c1c8f52f0374d1da345318c3dfff4fb" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1560,10 +1875,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3728.999755859375, - "y": 57.00016403198242, + "x": -4066.999755859375, + "y": 65.00000762939453, "width": 207.999755859375, - "height": 301.9998474121094 + "height": 302.00006103515627 } }, "m_Slots": [ @@ -1651,6 +1966,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "0894fd1aaf3048e39bfc5b3134cbb962", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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", @@ -1663,10 +2002,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2425.999755859375, - "y": -533.0, - "width": 119.99951171875, - "height": 149.00003051757813 + "x": -2764.0, + "y": -524.9999389648438, + "width": 120.0, + "height": 148.99996948242188 } }, "m_Slots": [ @@ -1710,10 +2049,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 291.00006103515627, - "y": 2329.0, - "width": 207.99990844726563, - "height": 301.999755859375 + "x": 113.99980163574219, + "y": 2676.0, + "width": 208.00001525878907, + "height": 302.0 } }, "m_Slots": [ @@ -2126,10 +2465,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1782.0, - "y": 911.9999389648438, - "width": 208.0001220703125, - "height": 302.00006103515627 + "x": -1388.999755859375, + "y": 999.9999389648438, + "width": 208.0, + "height": 301.99993896484377 } }, "m_Slots": [ @@ -2259,6 +2598,45 @@ "m_Labels": [] } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.SampleGradient", + "m_ObjectId": "13d065f996e341ef9c402b5acf05afea", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Gradient", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3082.0, + "y": 3148.000244140625, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "f7cd4b0c202a499f8a50b421a27be561" + }, + { + "m_Id": "698602a264954379bad415de819cdf6f" + }, + { + "m_Id": "d6f1e3a7bdd84762ac0252ab0f9394bb" + } + ], + "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", @@ -2322,6 +2700,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "1580e15ba23748e4b1f0e2af78fd95f8", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TimeNode", @@ -2334,9 +2760,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1120.0, - "y": 1892.0, - "width": 123.99993896484375, + "x": -1297.0, + "y": 2239.0, + "width": 123.9998779296875, "height": 173.0 } }, @@ -2488,10 +2914,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -4499.0, - "y": -579.9999389648438, - "width": 208.0, - "height": 302.0000305175781 + "x": -4837.0, + "y": -572.0, + "width": 208.00048828125, + "height": 302.00006103515627 } }, "m_Slots": [ @@ -2715,9 +3141,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 290.9998779296875, - "y": 1934.0, - "width": 208.0, + "x": 113.99980163574219, + "y": 2281.0, + "width": 208.00001525878907, "height": 326.0 } }, @@ -2760,6 +3186,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "20c8d558c7b64ab58f7210d13d47c38f", + "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.Vector1MaterialSlot", @@ -2787,9 +3237,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1496.0, - "y": 2285.0, - "width": 123.9998779296875, + "x": -1673.0, + "y": 2632.0, + "width": 124.0, "height": 173.0 } }, @@ -2846,10 +3296,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2904.999755859375, - "y": 2285.0, - "width": 134.0, - "height": 33.999755859375 + "x": -2883.999755859375, + "y": 2267.999755859375, + "width": 147.0, + "height": 34.0 } }, "m_Slots": [ @@ -2870,6 +3320,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "259e137607c5466fae8a05e81ccf1d66", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2945,10 +3410,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2060.99951171875, - "y": 1821.9998779296875, - "width": 144.9996337890625, - "height": 136.0 + "x": -2076.0, + "y": 1928.9998779296875, + "width": 145.0, + "height": 136.0001220703125 } }, "m_Slots": [ @@ -3152,6 +3617,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "305f1b63b8e94c6b8ec55cb14139072e", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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.DivideNode", @@ -3164,8 +3653,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3136.999755859375, - "y": 2343.0, + "x": -3185.999755859375, + "y": 2269.999755859375, "width": 208.0, "height": 302.0 } @@ -3215,10 +3704,10 @@ "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "r": 0.0, - "g": 0.3513453006744385, - "b": 1.0, - "a": 0.0 + "r": 2.000000476837158, + "g": 1.6963355541229249, + "b": 0.0, + "a": 1.0 }, "isMainColor": false, "m_ColorMode": 1 @@ -3382,10 +3871,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3666.0, - "y": 1629.0, + "x": -3688.0, + "y": 1633.9998779296875, "width": 208.000244140625, - "height": 301.9998779296875 + "height": 302.0 } }, "m_Slots": [ @@ -3413,6 +3902,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "38d19402146048f8929b9d55970284d3", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.CategoryData", @@ -3451,6 +3988,9 @@ }, { "m_Id": "322483c4bb8149acb7d40d5e0420d93c" + }, + { + "m_Id": "df059041f593431981054ddea3a5107f" } ] } @@ -3497,9 +4037,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -852.9999389648438, - "y": 1914.0, - "width": 126.0, + "x": -1030.0, + "y": 2261.0, + "width": 125.99993896484375, "height": 118.0 } }, @@ -3540,10 +4080,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2397.0, - "y": -298.99981689453127, - "width": 208.0, - "height": 325.9998779296875 + "x": -2734.999755859375, + "y": -290.99993896484377, + "width": 207.999755859375, + "height": 325.99993896484377 } }, "m_Slots": [ @@ -3573,6 +4113,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3cad920200644891970c9bc7cd82cc01", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3684,6 +4239,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "413251e77d014f1d9b0354733c398cc5", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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.Vector2MaterialSlot", @@ -3832,6 +4411,66 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "4768904af7ef4db18a183030cfecc457", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1030.0, + "y": 1718.9998779296875, + "width": 208.00006103515626, + "height": 434.9998779296875 + } + }, + "m_Slots": [ + { + "m_Id": "ca181a7234274c698cf10819fe6c65ee" + }, + { + "m_Id": "507e2e9c3ffe462aa4d34126b9a63df3" + }, + { + "m_Id": "5946005813bc48edbd884b5b13c09c9d" + }, + { + "m_Id": "259e137607c5466fae8a05e81ccf1d66" + }, + { + "m_Id": "3cad920200644891970c9bc7cd82cc01" + }, + { + "m_Id": "b3a78d1544cf4732902084a60e794342" + }, + { + "m_Id": "ac68bf05511d4b58a79dfa7c17f132b2" + }, + { + "m_Id": "525e13d953684dbe9b811b04253b93fc" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -3854,6 +4493,31 @@ "m_Channel": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "4a3e17aae7b649a99c95a215877f6142", + "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": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", @@ -3997,6 +4661,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "4c1c8f52f0374d1da345318c3dfff4fb", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4036,6 +4748,85 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientNode", + "m_ObjectId": "4de3bbef712a4eaba069e0ec25314dae", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Gradient", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3320.000244140625, + "y": 2779.000244140625, + "width": 208.0, + "height": 104.0 + } + }, + "m_Slots": [ + { + "m_Id": "7d4f52df955b4145899f577054301896" + } + ], + "synonyms": [ + "ramp" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": 0.0, + "m_SerializableColorKeys": [ + { + "x": 0.19607843458652497, + "y": 0.19607843458652497, + "z": 0.19607843458652497, + "w": 0.0 + }, + { + "x": 0.7843137383460999, + "y": 0.7843137383460999, + "z": 0.7843137383460999, + "w": 0.10000763088464737 + }, + { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 0.5000076293945313 + }, + { + "x": 0.7843137383460999, + "y": 0.7843137383460999, + "z": 0.7843137383460999, + "w": 0.9000076055526733 + }, + { + "x": 0.19607843458652497, + "y": 0.19607843458652497, + "z": 0.19607843458652497, + "w": 1.0 + } + ], + "m_SerializableAlphaKeys": [ + { + "x": 1.0, + "y": 0.0 + }, + { + "x": 1.0, + "y": 1.0 + } + ], + "m_SerializableMode": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4072,10 +4863,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3135.999755859375, - "y": 1807.0, - "width": 208.0, - "height": 301.999755859375 + "x": -3058.999755859375, + "y": 1806.9998779296875, + "width": 207.999755859375, + "height": 301.9998779296875 } }, "m_Slots": [ @@ -4117,6 +4908,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "507e2e9c3ffe462aa4d34126b9a63df3", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4132,6 +4938,160 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientInputMaterialSlot", + "m_ObjectId": "51f008283a4f4cd78c5f8c3da8fde4ca", + "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.UVMaterialSlot", @@ -4166,10 +5126,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -646.1544189453125, - "y": -105.15444946289063, - "width": 208.0, - "height": 302.0 + "x": -983.9998779296875, + "y": -96.99998474121094, + "width": 207.999755859375, + "height": 302.00006103515627 } }, "m_Slots": [ @@ -4197,6 +5157,34 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "525e13d953684dbe9b811b04253b93fc", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "53e8de2c8de24ca5bf6a18a46cccc669", + "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", @@ -4335,10 +5323,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -816.40478515625, - "y": 1408.4818115234375, - "width": 0.0, - "height": 0.0 + "x": -806.9998779296875, + "y": 1603.9998779296875, + "width": 147.0, + "height": 34.0 } }, "m_Slots": [ @@ -4374,6 +5362,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5946005813bc48edbd884b5b13c09c9d", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4477,10 +5480,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3587.000244140625, - "y": -542.9998779296875, - "width": 208.000244140625, - "height": 325.9998779296875 + "x": -3924.999755859375, + "y": -534.9999389648438, + "width": 207.999755859375, + "height": 326.0000305175781 } }, "m_Slots": [ @@ -4510,6 +5513,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "5eb089d755c549508bb5f8e22152001b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2430.0, + "y": 1923.0, + "width": 126.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "f77f1bf161a44f2ca596f1ae15b60171" + }, + { + "m_Id": "c602d81f5ee448628edcf74eaf104d1c" + }, + { + "m_Id": "9db91adf85b74f8d9178d1941583053e" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -4543,10 +5589,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3346.999755859375, - "y": 2371.0, - "width": 155.0, - "height": 34.0 + "x": -3366.99951171875, + "y": 2269.999755859375, + "width": 155.999755859375, + "height": 34.000244140625 } }, "m_Slots": [ @@ -4588,6 +5634,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", + "m_ObjectId": "6190f82409c04016a37ec77939018c53", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Redirect Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2277.999755859375, + "y": 1194.9998779296875, + "width": 56.0, + "height": 24.0 + } + }, + "m_Slots": [ + { + "m_Id": "305f1b63b8e94c6b8ec55cb14139072e" + }, + { + "m_Id": "413251e77d014f1d9b0354733c398cc5" + } + ], + "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", @@ -4615,9 +5697,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1057.0, - "y": 2285.0, - "width": 127.9998779296875, + "x": -1234.0, + "y": 2632.0, + "width": 128.0, "height": 101.0 } }, @@ -4663,10 +5745,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3293.999755859375, - "y": 1843.0, - "width": 134.999755859375, - "height": 33.9998779296875 + "x": -3217.0, + "y": 1842.9998779296875, + "width": 135.0, + "height": 34.0 } }, "m_Slots": [ @@ -4757,6 +5839,88 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "698602a264954379bad415de819cdf6f", + "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.GradientNode", + "m_ObjectId": "6af564fe1b6e4eaca3bbd28f5acf50a4", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Gradient", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3320.0, + "y": 3134.000244140625, + "width": 208.0, + "height": 104.0 + } + }, + "m_Slots": [ + { + "m_Id": "e056037d9d2e43fc8e037a950f2f81c2" + } + ], + "synonyms": [ + "ramp" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": 0.0, + "m_SerializableColorKeys": [ + { + "x": 0.19607843458652497, + "y": 0.19607843458652497, + "z": 0.19607843458652497, + "w": 0.0 + }, + { + "x": 0.3921568691730499, + "y": 0.3921568691730499, + "z": 0.3921568691730499, + "w": 0.20000000298023225 + }, + { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + } + ], + "m_SerializableAlphaKeys": [ + { + "x": 1.0, + "y": 0.0 + }, + { + "x": 1.0, + "y": 1.0 + } + ], + "m_SerializableMode": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.AddNode", @@ -4769,9 +5933,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3172.999755859375, - "y": 154.00003051757813, - "width": 207.99951171875, + "x": -3511.0, + "y": 162.00003051757813, + "width": 208.000244140625, "height": 302.0000305175781 } }, @@ -4812,9 +5976,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1586.9998779296875, - "y": 1547.9998779296875, - "width": 136.0001220703125, + "x": -2625.000244140625, + "y": 2788.000244140625, + "width": 137.0, "height": 34.0 } }, @@ -4896,8 +6060,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3361.0, - "y": -462.9998779296875, + "x": -3698.999755859375, + "y": -454.9999084472656, "width": 159.0, "height": 33.99993896484375 } @@ -4960,10 +6124,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2785.0, - "y": -148.00001525878907, - "width": 208.000244140625, - "height": 302.00006103515627 + "x": -3122.999755859375, + "y": -139.9999237060547, + "width": 208.0, + "height": 301.99993896484377 } }, "m_Slots": [ @@ -5018,10 +6182,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2229.999755859375, - "y": -532.9999389648438, + "x": -2567.999755859375, + "y": -524.9999389648438, "width": 139.999755859375, - "height": 165.99996948242188 + "height": 166.00003051757813 } }, "m_Slots": [ @@ -5369,8 +6533,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -852.9999389648438, - "y": 2344.0, + "x": -1030.0, + "y": 2691.0, "width": 129.99993896484376, "height": 118.0 } @@ -5400,6 +6564,18 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientMaterialSlot", + "m_ObjectId": "7d4f52df955b4145899f577054301896", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -5476,9 +6652,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 187.0000457763672, - "y": 1170.0, - "width": 208.00001525878907, + "x": 114.00003814697266, + "y": 1166.0, + "width": 208.00003051757813, "height": 326.0 } }, @@ -5547,9 +6723,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1015.9999389648438, - "y": 2610.0, - "width": 125.99993896484375, + "x": -1193.0, + "y": 2957.0, + "width": 126.0, "height": 118.0 } }, @@ -5626,6 +6802,31 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "83803b1bd21746acb496e9a20df711cd", + "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.DynamicVectorMaterialSlot", @@ -5650,6 +6851,45 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.SampleGradient", + "m_ObjectId": "84e44231cbec49bd9f3bdcb3ed2ab0d4", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Gradient", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3082.000244140625, + "y": 2793.000244140625, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "51f008283a4f4cd78c5f8c3da8fde4ca" + }, + { + "m_Id": "8ce82f764f42483d9b45fa553d38f17e" + }, + { + "m_Id": "83803b1bd21746acb496e9a20df711cd" + } + ], + "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", @@ -5677,10 +6917,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3441.999755859375, - "y": 234.00001525878907, - "width": 208.000244140625, - "height": 124.99995422363281 + "x": -3779.999755859375, + "y": 242.00009155273438, + "width": 207.999755859375, + "height": 124.99996948242188 } }, "m_Slots": [ @@ -5745,10 +6985,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3997.0, - "y": -542.9998779296875, - "width": 208.0, - "height": 302.00006103515627 + "x": -4334.99951171875, + "y": -534.9999389648438, + "width": 207.99951171875, + "height": 302.0000305175781 } }, "m_Slots": [ @@ -5896,6 +7136,36 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8b3e982eef154f0ca335dbea8c36f9aa", + "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.Vector1MaterialSlot", + "m_ObjectId": "8ce82f764f42483d9b45fa553d38f17e", + "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.DynamicVectorMaterialSlot", @@ -6023,10 +7293,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1381.0, - "y": 1496.0, - "width": 208.0001220703125, - "height": 325.9998779296875 + "x": -1388.9998779296875, + "y": 1713.9998779296875, + "width": 207.999755859375, + "height": 326.0 } }, "m_Slots": [ @@ -6097,10 +7367,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1782.0, - "y": 1821.9998779296875, - "width": 208.0001220703125, - "height": 326.0001220703125 + "x": -1795.000244140625, + "y": 1936.0, + "width": 207.9998779296875, + "height": 326.0 } }, "m_Slots": [ @@ -6131,6 +7401,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "9164d3e11e904cd4835d5c432e5086c5", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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.DynamicVectorMaterialSlot", @@ -6189,10 +7483,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -859.0000610351563, - "y": -147.99998474121095, - "width": 137.99993896484376, - "height": 76.99998474121094 + "x": -1196.999755859375, + "y": -139.9999237060547, + "width": 137.999755859375, + "height": 76.99996948242188 } }, "m_Slots": [ @@ -6292,6 +7586,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", + "m_ObjectId": "9a18ee89b96f4dc585f59258aea4209d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Redirect Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1958.9998779296875, + "y": 2822.0, + "width": 56.0, + "height": 24.0 + } + }, + "m_Slots": [ + { + "m_Id": "9164d3e11e904cd4835d5c432e5086c5" + }, + { + "m_Id": "d872f459ad85444882c86698990ffd37" + } + ], + "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", @@ -6322,6 +7652,45 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9bea36e7a1754b0eaa8e1642fce94929", + "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.DynamicVectorMaterialSlot", + "m_ObjectId": "9c67b9959f2d495c9a0b8b1077df56e4", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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.Vector2MaterialSlot", @@ -6343,6 +7712,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", + "m_ObjectId": "9d693d00c47a410aa4f1ff73ff3c755b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Redirect Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1851.000244140625, + "y": 1795.0001220703125, + "width": 56.0, + "height": 24.0 + } + }, + "m_Slots": [ + { + "m_Id": "9c67b9959f2d495c9a0b8b1077df56e4" + }, + { + "m_Id": "bdad32c59cda420681315462f01cda6f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.VoronoiNode", @@ -6355,9 +7760,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 18.000001907348634, - "y": 2666.000244140625, - "width": 208.00003051757813, + "x": -159.0000762939453, + "y": 3013.0, + "width": 208.0, "height": 361.0 } }, @@ -6391,6 +7796,30 @@ "m_HashType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "9db91adf85b74f8d9178d1941583053e", + "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_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -6427,9 +7856,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2765.0, + "x": -2714.999755859375, "y": 2269.999755859375, - "width": 208.000244140625, + "width": 208.0, "height": 302.0 } }, @@ -6510,8 +7939,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -331.53033447265627, - "y": 2819.4697265625, + "x": -508.9999694824219, + "y": 3166.0, "width": 208.0, "height": 326.0 } @@ -6555,9 +7984,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3827.999755859375, - "y": 1709.0, - "width": 139.0, + "x": -3850.0, + "y": 1708.9998779296875, + "width": 140.0, "height": 34.0 } }, @@ -6624,6 +8053,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", + "m_ObjectId": "a4b3c331d70c4db9bfc360e9008cf54b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Redirect Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3906.0, + "y": 1946.0001220703125, + "width": 56.0, + "height": 24.0 + } + }, + "m_Slots": [ + { + "m_Id": "0894fd1aaf3048e39bfc5b3134cbb962" + }, + { + "m_Id": "efa8dfe25081407fa951f7c80eeaeb66" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -6684,9 +8149,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 694.0, - "y": 1558.0, - "width": 208.0, + "x": 445.00006103515627, + "y": 1638.0, + "width": 208.00030517578126, "height": 302.0001220703125 } }, @@ -6764,10 +8229,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -4229.0, - "y": -475.0, - "width": 124.0, - "height": 173.00006103515626 + "x": -4567.0, + "y": -466.9999084472656, + "width": 124.00048828125, + "height": 172.99996948242188 } }, "m_Slots": [ @@ -6797,6 +8262,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a80f5045148b4e6a8db99957f45731f7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2632.000244140625, + "y": 2006.0001220703125, + "width": 157.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "d1ecd1af83744240b5f72d4fd15d9e18" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "df059041f593431981054ddea3a5107f" + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -6837,9 +8338,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -595.9999389648438, - "y": 1923.0, - "width": 153.99996948242188, + "x": -773.0000610351563, + "y": 2270.0, + "width": 154.0, "height": 142.0 } }, @@ -6912,6 +8413,28 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "ac68bf05511d4b58a79dfa7c17f132b2", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVNode", @@ -6924,10 +8447,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -4436.99951171875, - "y": 900.9998779296875, - "width": 207.99951171875, - "height": 313.0001220703125 + "x": -4434.0, + "y": 955.0, + "width": 208.0, + "height": 313.0 } }, "m_Slots": [ @@ -7108,10 +8631,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -4064.0, - "y": 1607.0, - "width": 124.000244140625, - "height": 172.9998779296875 + "x": -4067.999755859375, + "y": 1633.9998779296875, + "width": 123.999755859375, + "height": 173.0 } }, "m_Slots": [ @@ -7177,10 +8700,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2004.0, - "y": 922.9999389648438, - "width": 155.0001220703125, - "height": 33.99993896484375 + "x": -1652.0001220703125, + "y": 1268.0, + "width": 155.999755859375, + "height": 34.0 } }, "m_Slots": [ @@ -7377,6 +8900,24 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "b3a78d1544cf4732902084a60e794342", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7427,8 +8968,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3999.999755859375, - "y": 1187.0, + "x": -4064.000244140625, + "y": 1170.0, "width": 120.0, "height": 149.0 } @@ -7474,9 +9015,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -827.0000610351563, - "y": 2783.000244140625, - "width": 124.0, + "x": -1004.0000610351563, + "y": 3130.0, + "width": 124.00006103515625, "height": 173.0 } }, @@ -7519,8 +9060,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -564.1543579101563, - "y": 2846.845703125, + "x": -741.000244140625, + "y": 3194.0, "width": 208.0, "height": 302.0 } @@ -7625,10 +9166,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3916.0, - "y": 71.0000991821289, + "x": -4254.0, + "y": 79.00006866455078, "width": 174.000244140625, - "height": 33.99993896484375 + "height": 33.99993133544922 } }, "m_Slots": [ @@ -7661,10 +9202,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2410.999755859375, - "y": 1957.9998779296875, + "x": -2429.999755859375, + "y": 2083.999755859375, "width": 208.0, - "height": 301.9998779296875 + "height": 302.0 } }, "m_Slots": [ @@ -7716,6 +9257,78 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "bdad32c59cda420681315462f01cda6f", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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.DynamicValueMaterialSlot", + "m_ObjectId": "bdeb5c5681b64b1094c7fa3ab04c1993", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -7779,6 +9392,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "bf1a3fc9f9eb4d85b003ead968b2e88d", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -7791,9 +9452,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3648.999755859375, - "y": 1214.0, - "width": 208.0, + "x": -3688.0, + "y": 1150.9998779296875, + "width": 208.000244140625, "height": 302.0 } }, @@ -7849,8 +9510,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3037.999755859375, - "y": 1407.0, + "x": -3058.999755859375, + "y": 1382.9998779296875, "width": 207.999755859375, "height": 278.0 } @@ -7885,10 +9546,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -93.99996185302735, - "y": 1166.0001220703125, - "width": 145.00015258789063, - "height": 135.9998779296875 + "x": -390.99993896484377, + "y": 1166.0, + "width": 144.99998474121095, + "height": 136.0 } }, "m_Slots": [ @@ -7988,6 +9649,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "c602d81f5ee448628edcf74eaf104d1c", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.10000000149011612, + "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.DynamicVectorMaterialSlot", @@ -8096,6 +9781,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "ca181a7234274c698cf10819fe6c65ee", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "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.Vector4MaterialSlot", @@ -8133,9 +9843,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1243.0, - "y": 2610.0, - "width": 124.0001220703125, + "x": -1421.0, + "y": 2957.0, + "width": 124.0, "height": 173.0 } }, @@ -8178,9 +9888,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -583.0003662109375, - "y": 1302.0, - "width": 208.00045776367188, + "x": -630.9999389648438, + "y": 1529.9998779296875, + "width": 208.00006103515626, "height": 302.0 } }, @@ -8344,6 +10054,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "d0452d70746c4e77a83aea226eca353e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2819.000244140625, + "y": 2970.000244140625, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "bf1a3fc9f9eb4d85b003ead968b2e88d" + }, + { + "m_Id": "bdeb5c5681b64b1094c7fa3ab04c1993" + }, + { + "m_Id": "38d19402146048f8929b9d55970284d3" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BranchNode", @@ -8356,10 +10109,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1110.0, - "y": -148.00003051757813, - "width": 208.0, - "height": 326.0 + "x": -1447.999755859375, + "y": -139.9999237060547, + "width": 207.999755859375, + "height": 325.99993896484377 } }, "m_Slots": [ @@ -8429,6 +10182,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d1ecd1af83744240b5f72d4fd15d9e18", + "m_Id": 0, + "m_DisplayName": "TopMaskHeight", + "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.DynamicValueMaterialSlot", @@ -8638,6 +10406,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "d6f1e3a7bdd84762ac0252ab0f9394bb", + "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.DynamicVectorMaterialSlot", @@ -8674,10 +10467,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2024.9998779296875, - "y": -298.99981689453127, - "width": 144.999755859375, - "height": 111.99992370605469 + "x": -2362.999755859375, + "y": -290.99993896484377, + "width": 145.0, + "height": 112.00001525878906 } }, "m_Slots": [ @@ -8702,6 +10495,30 @@ "m_DepthSamplingMode": 2 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "d872f459ad85444882c86698990ffd37", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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": 1, "m_Type": "UnityEditor.ShaderGraph.GradientNoiseNode", @@ -8714,9 +10531,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -350.0000915527344, - "y": 2391.0, - "width": 208.00001525878907, + "x": -526.9999389648438, + "y": 2738.0, + "width": 207.99996948242188, "height": 337.0 } }, @@ -8804,9 +10621,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1775.0, - "y": -230.99993896484376, - "width": 208.0001220703125, + "x": -2112.999755859375, + "y": -222.99996948242188, + "width": 208.0, "height": 302.0000305175781 } }, @@ -8876,10 +10693,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2765.0, - "y": 1558.0, - "width": 208.000244140625, - "height": 301.9998779296875 + "x": -2715.0, + "y": 1557.9998779296875, + "width": 208.0, + "height": 302.0 } }, "m_Slots": [ @@ -9013,6 +10830,53 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "dc3d3a7736634e0aa52951541f4df1c0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3512.000244140625, + "y": 2946.000244140625, + "width": 120.0, + "height": 148.999755859375 + } + }, + "m_Slots": [ + { + "m_Id": "20c8d558c7b64ab58f7210d13d47c38f" + }, + { + "m_Id": "f9caa4d0718e40749c3442581114980e" + }, + { + "m_Id": "8b3e982eef154f0ca335dbea8c36f9aa" + }, + { + "m_Id": "9bea36e7a1754b0eaa8e1642fce94929" + }, + { + "m_Id": "53e8de2c8de24ca5bf6a18a46cccc669" + } + ], + "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.DynamicValueMaterialSlot", @@ -9181,6 +11045,34 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "df059041f593431981054ddea3a5107f", + "m_Guid": { + "m_GuidSerialized": "b2a5faa3-666d-4a4d-9e6c-40099f2b4a10" + }, + "m_Name": "TopMaskHeight", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "TopMaskHeight", + "m_DefaultReferenceName": "_TopMaskHeight", + "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.05000000074505806, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -9256,6 +11148,18 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientMaterialSlot", + "m_ObjectId": "e056037d9d2e43fc8e037a950f2f81c2", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -9307,10 +11211,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -630.9999389648438, - "y": 723.0000610351563, - "width": 208.00009155273438, - "height": 301.99993896484377 + "x": -637.0001831054688, + "y": 653.0, + "width": 207.999755859375, + "height": 302.0 } }, "m_Slots": [ @@ -9350,9 +11254,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -350.0000915527344, - "y": 1923.0, - "width": 208.00001525878907, + "x": -526.9999389648438, + "y": 2270.0, + "width": 207.99996948242188, "height": 337.0 } }, @@ -9407,10 +11311,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1442.999755859375, - "y": -148.00001525878907, - "width": 144.9996337890625, - "height": 136.00018310546876 + "x": -1781.0, + "y": -139.9999237060547, + "width": 145.0, + "height": 135.99993896484376 } }, "m_Slots": [ @@ -9481,9 +11385,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1285.0, - "y": 2285.0, - "width": 125.9998779296875, + "x": -1462.0001220703125, + "y": 2632.0, + "width": 126.0001220703125, "height": 118.0 } }, @@ -9586,9 +11490,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3826.999755859375, - "y": 1302.0, - "width": 160.999755859375, + "x": -3850.0, + "y": 1169.9998779296875, + "width": 162.0, "height": 34.0 } }, @@ -9661,10 +11565,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3172.999755859375, - "y": -542.9998779296875, - "width": 207.99951171875, - "height": 336.9998779296875 + "x": -3511.0, + "y": -534.9999389648438, + "width": 208.000244140625, + "height": 337.0 } }, "m_Slots": [ @@ -9730,6 +11634,44 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVNode", + "m_ObjectId": "ece8f1aee1274114a1608eed2aa7ebce", + "m_Group": { + "m_Id": "" + }, + "m_Name": "UV", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3784.000244140625, + "y": 2946.000244140625, + "width": 208.0, + "height": 313.0 + } + }, + "m_Slots": [ + { + "m_Id": "4a3e17aae7b649a99c95a215877f6142" + } + ], + "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.DynamicVectorMaterialSlot", @@ -9775,6 +11717,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "efa8dfe25081407fa951f7c80eeaeb66", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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.ScreenPositionNode", @@ -9787,10 +11753,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2752.0, - "y": -584.9998779296875, - "width": 208.0, - "height": 313.0000305175781 + "x": -3090.0, + "y": -576.9999389648438, + "width": 208.000244140625, + "height": 313.0 } }, "m_Slots": [ @@ -9944,10 +11910,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -4696.0, - "y": -550.9999389648438, + "x": -5034.0, + "y": -542.9999389648438, "width": 162.0, - "height": 34.0001220703125 + "height": 34.000030517578128 } }, "m_Slots": [ @@ -9968,6 +11934,184 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f77f1bf161a44f2ca596f1ae15b60171", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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.GradientInputMaterialSlot", + "m_ObjectId": "f7cd4b0c202a499f8a50b421a27be561", + "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.ColorRGBMaterialSlot", @@ -10013,6 +12157,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f9caa4d0718e40749c3442581114980e", + "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.ShaderGraph.DynamicValueMaterialSlot", @@ -10073,9 +12232,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -595.9999389648438, - "y": 2391.0, - "width": 153.99996948242188, + "x": -773.0000610351563, + "y": 2738.0, + "width": 154.0, "height": 142.0 } }, @@ -10118,9 +12277,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3343.999755859375, - "y": 1407.0, - "width": 208.0, + "x": -3366.999755859375, + "y": 1382.9998779296875, + "width": 207.999755859375, "height": 302.0 } }, @@ -10149,6 +12308,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "fa60017cfb8944fb941e66ec745830d1", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", @@ -10175,9 +12382,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -97.99993896484375, - "y": 2144.0, - "width": 208.0, + "x": -275.0000305175781, + "y": 2491.0, + "width": 208.00001525878907, "height": 302.0 } }, diff --git a/Assets/Resources/Excel/FoodDataTable.xlsx b/Assets/Resources/Excel/FoodDataTable.xlsx index b3e49d4bf774e71fbec27d4d5c2528f65ce811ea..ad9d34fa789207ed470d3b044eb328e91d615d7c 100644 GIT binary patch delta 7920 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 AKL7v# delta 8130 zcmZWuWmp``wjBm{4U)m#H9>-FaCaxTyG!E`940_;hv2~j1RFe%0D)kGhM>XS0*`Z^ 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%0A^MuxSpgI0-?5U1J;7a%$DWUyhYx35 zeWTx#J3aO(=eF8&y-`?k5}hTIrC>C_77L@U%k`^5AKx632K=P7)d8=0jSHk4iibS@ z*_b9gccDT$nX@J7u1bfea%kkETF68*zY1Lb35 hg8UOm{@sBF>di(E`Db|lyS)zD%tnWj!1C9-{{pow=~Dmz diff --git a/Assets/Resources/JSON/FoodDataTable.json b/Assets/Resources/JSON/FoodDataTable.json index 65b8b7810..50c5fdd09 100644 --- a/Assets/Resources/JSON/FoodDataTable.json +++ b/Assets/Resources/JSON/FoodDataTable.json @@ -10,11 +10,11 @@ "IngredientQuantity1": 1, "IngredientIdx2": 10706, "IngredientQuantity2": 1, - "IngredientIdx3": 0, + "IngredientIdx3": "", "IngredientQuantity3": 0, - "IngredientIdx4": 0, + "IngredientIdx4": "", "IngredientQuantity4": 0, - "IngredientIdx5": 0, + "IngredientIdx5": "", "IngredientQuantity5": 0 }, { @@ -28,11 +28,11 @@ "IngredientQuantity1": 1, "IngredientIdx2": 10706, "IngredientQuantity2": 1, - "IngredientIdx3": 0, + "IngredientIdx3": "", "IngredientQuantity3": 0, - "IngredientIdx4": 0, + "IngredientIdx4": "", "IngredientQuantity4": 0, - "IngredientIdx5": 0, + "IngredientIdx5": "", "IngredientQuantity5": 0 }, { @@ -48,9 +48,9 @@ "IngredientQuantity2": 1, "IngredientIdx3": 10704, "IngredientQuantity3": 1, - "IngredientIdx4": 0, + "IngredientIdx4": "", "IngredientQuantity4": 0, - "IngredientIdx5": 0, + "IngredientIdx5": "", "IngredientQuantity5": 0 }, { @@ -66,9 +66,9 @@ "IngredientQuantity2": 1, "IngredientIdx3": 10701, "IngredientQuantity3": 1, - "IngredientIdx4": 0, + "IngredientIdx4": "", "IngredientQuantity4": 0, - "IngredientIdx5": 0, + "IngredientIdx5": "", "IngredientQuantity5": 0 }, { @@ -86,7 +86,7 @@ "IngredientQuantity3": 1, "IngredientIdx4": 10704, "IngredientQuantity4": 1, - "IngredientIdx5": 0, + "IngredientIdx5": "", "IngredientQuantity5": 0 }, { @@ -102,9 +102,9 @@ "IngredientQuantity2": 1, "IngredientIdx3": 10705, "IngredientQuantity3": 1, - "IngredientIdx4": 0, + "IngredientIdx4": "", "IngredientQuantity4": 0, - "IngredientIdx5": 0, + "IngredientIdx5": "", "IngredientQuantity5": 0 } ] \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index f650f7f1b..d370eb355 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -45,5 +45,8 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + - name: Ui + uniqueID: 3891178611 + locked: 0 m_RenderingLayers: - Default