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 000000000..c71d61284 Binary files /dev/null and b/Assets/03.Images/Props/Environment/Ice.png differ 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 b3e49d4bf..ad9d34fa7 100644 Binary files a/Assets/Resources/Excel/FoodDataTable.xlsx and b/Assets/Resources/Excel/FoodDataTable.xlsx differ 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