diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 02358e6ae..3f91ad218 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -118,136 +118,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &9151229 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9151230} - - component: {fileID: 9151233} - - component: {fileID: 9151232} - - component: {fileID: 9151231} - m_Layer: 9 - m_Name: VisualLook - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9151230 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9151229} - 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: 1288799788} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9151231 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9151229} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: ad9bc316ced5375449444c992ee73cee, type: 2} - initialSkinName: 02 - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: idle - loop: 1 - timeScale: 1 ---- !u!23 &9151232 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9151229} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c5ff73efdfe597a488e245216fd5d707, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &9151233 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9151229} - m_Mesh: {fileID: 0} --- !u!1 &20736009 GameObject: m_ObjectHideFlags: 0 @@ -367,7 +237,7 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f1852e60e7132046b79863fb1d23af0, type: 3} ---- !u!1 &119395937 +--- !u!1 &165021634 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -375,99 +245,126 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 119395941} - - component: {fileID: 119395940} - - component: {fileID: 119395939} - - component: {fileID: 119395938} - m_Layer: 5 - m_Name: WorldSpaceCanvas - m_TagString: Untagged + - 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 &119395938 +--- !u!114 &165021637 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 119395937} + m_GameObject: {fileID: 165021634} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 1 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: serializedVersion: 2 - m_Bits: 16383 ---- !u!114 &119395939 -MonoBehaviour: + 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: 119395937} + m_GameObject: {fileID: 165021634} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!223 &119395940 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 119395937} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: -1197429611 - m_SortingOrder: 0 + 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 ---- !u!224 &119395941 -RectTransform: + 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: 119395937} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 960, y: 540} - m_SizeDelta: {x: 1920, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} + m_Father: {fileID: 873223992} + m_LocalEulerAnglesHint: {x: 9.569, y: 87.98, z: 0} --- !u!1 &166220739 GameObject: m_ObjectHideFlags: 0 @@ -777,299 +674,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &211259724 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 211259727} - - component: {fileID: 211259726} - - component: {fileID: 211259725} - - component: {fileID: 211259728} - - component: {fileID: 211259730} - - component: {fileID: 211259732} - - component: {fileID: 211259729} - - component: {fileID: 211259731} - m_Layer: 9 - m_Name: TycoonPlayer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!136 &211259725 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211259724} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.25 - m_Height: 1 - m_Direction: 1 - m_Center: {x: 0, y: 0.5, z: 0} ---- !u!54 &211259726 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211259724} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!4 &211259727 +--- !u!4 &211259727 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + m_PrefabInstance: {fileID: 5626406452199475265} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211259724} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2, y: 0, z: 0.14} - m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 988649516} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &211259728 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211259724} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - m_NotificationBehavior: 2 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 211259729} - m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp - m_MethodName: OnMove - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_ActionId: 52dbe09f-4e34-4a14-a772-54f5d5d97787 - m_ActionName: 'Tycoon/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d]' - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 211259729} - m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp - m_MethodName: OnInteraction - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_ActionId: 31e27536-38f7-4c48-ad94-663c23a8c2a8 - m_ActionName: 'Tycoon/Interaction[/Keyboard/e]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 58dbe258-7d9d-4d57-a59d-9165662f3d4b - m_ActionName: 'Combat/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 472e0ca2-cdfb-496f-bf8c-c25a4b0a6c8b - m_ActionName: 'Combat/Attack[/Mouse/leftButton,/Keyboard/k]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: aaf44bb4-bce6-4abe-bb2a-ec5f15b43c8f - m_ActionName: 'Combat/Dash[/Keyboard/space]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: ebdb638c-8057-4b32-8cb5-b4e5039b4969 - m_ActionName: 'Combat/ActivateMainSkill[/Mouse/rightButton]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: d7467711-57a8-4a31-a2ba-d14040cff3e7 - m_ActionName: 'Combat/OpenMenu[/Keyboard/escape]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 65cfde9b-38e6-4d35-b2a6-f48dbbeeead6 - m_ActionName: 'Combat/OpenItemInventory[/Keyboard/i]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 494568c8-7762-428e-8e8c-1920adfcc29a - m_ActionName: 'CombatUi/Cancel[/Keyboard/escape]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 5df8fd65-01b8-4cfe-b110-5ff2cfdd437f - m_ActionName: 'CombatUi/InteractionUi[/Keyboard/e]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 04886026-3576-4662-8c73-dab606c598ed - m_ActionName: 'CombatUi/CloseItemInventory[/Keyboard/i]' - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 211259729} - m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp - m_MethodName: OnOpenRestaurantUpgrade - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_ActionId: a0f02877-2c29-4c32-8898-f0074336c625 - m_ActionName: 'Tycoon/RestaurantUpgrade[/Keyboard/b]' - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 211259729} - m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp - m_MethodName: OnCloseRestaurantUpgrade - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_ActionId: 013e4058-f4a2-46fc-b3f7-a7f94a4d4644 - m_ActionName: 'TycoonUi/CloseRestaurantUpgrade[/Keyboard/b]' - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 211259729} - m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp - m_MethodName: OnCancel - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_ActionId: 43781cf6-335d-402e-957c-7a27f3e627b6 - m_ActionName: 'TycoonUi/Cancel[/Keyboard/escape]' - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: Tycoon - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &211259729 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211259724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2bc02c60fe9bf724885e9f5713f900ee, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &211259730 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211259724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe62039701799b0468ff96958a2912a6, type: 3} - m_Name: - m_EditorClassIdentifier: - k__BackingField: {fileID: 211259726} - k__BackingField: {fileID: 211259725} - k__BackingField: {fileID: 211259728} - k__BackingField: {fileID: 988649516} - k__BackingField: {fileID: 988649517} - k__BackingField: {fileID: 211259729} - k__BackingField: {fileID: 211259731} ---- !u!114 &211259731 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211259724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cb167e66df896c745a538310e5a52f61, type: 3} - m_Name: - m_EditorClassIdentifier: - k__BackingField: 7 ---- !u!114 &211259732 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211259724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} - m_Name: - m_EditorClassIdentifier: - _skeletonAnimation: {fileID: 988649517} - _initialSkinName: 01 --- !u!1 &355668242 GameObject: m_ObjectHideFlags: 0 @@ -1180,7 +789,7 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: -2, y: 20.000006, z: -34.501015} + m_LocalPosition: {x: -2, y: 20.000006, z: -36.080013} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1411,6 +1020,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 571612559} m_CullTransparentMesh: 1 +--- !u!1 &771203781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 771203782} + m_Layer: 5 + m_Name: AddCustomer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &771203782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 771203781} + 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: 1471657121} + m_Father: {fileID: 1987164072} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -40} + m_SizeDelta: {x: 140, y: 40} + m_Pivot: {x: 1, y: 1} --- !u!1 &850434286 GameObject: m_ObjectHideFlags: 0 @@ -1587,7 +1232,8 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_Cameras: [] + m_Cameras: + - {fileID: 165021640} m_RendererIndex: -1 m_VolumeLayerMask: serializedVersion: 2 @@ -1670,7 +1316,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 16375 + m_Bits: 65495 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -1691,10 +1337,11 @@ Transform: m_GameObject: {fileID: 873223985} serializedVersion: 2 m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: -2, y: 20.000006, z: -34.501015} + m_LocalPosition: {x: -2, y: 20.000006, z: -36.080013} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 165021641} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 9.569, y: 87.98, z: 0} --- !u!114 &873223993 @@ -1802,136 +1449,6 @@ Transform: - {fileID: 1028035736} m_Father: {fileID: 1253205195} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &988649515 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 988649516} - - component: {fileID: 988649519} - - component: {fileID: 988649518} - - component: {fileID: 988649517} - m_Layer: 9 - m_Name: VisualLook - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &988649516 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 988649515} - 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: 211259727} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &988649517 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 988649515} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: ad9bc316ced5375449444c992ee73cee, type: 2} - initialSkinName: 01 - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: idle - loop: 1 - timeScale: 1 ---- !u!23 &988649518 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 988649515} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c5ff73efdfe597a488e245216fd5d707, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &988649519 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 988649515} - m_Mesh: {fileID: 0} --- !u!1 &1028035735 GameObject: m_ObjectHideFlags: 0 @@ -1969,6 +1486,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} m_PrefabInstance: {fileID: 1328652233} m_PrefabAsset: {fileID: 0} +--- !u!1 &1038321202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1038321203} + m_Layer: 0 + m_Name: CustomerSpawn + m_TagString: Untagged + m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1038321203 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038321202} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -19} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1520533432} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1049919588 GameObject: m_ObjectHideFlags: 0 @@ -2038,9 +1586,9 @@ Canvas: m_GameObject: {fileID: 1049919588} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 + m_RenderMode: 1 + m_Camera: {fileID: 165021640} + m_PlaneDistance: 10 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -2065,7 +1613,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1496452082} - - {fileID: 1849823320} + - {fileID: 1987164072} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2086,7 +1634,144 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 + k__BackingField: {fileID: 1049919591} k__BackingField: {fileID: 1496452083} +--- !u!1 &1070845212 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1070845213} + - component: {fileID: 1070845215} + - component: {fileID: 1070845214} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1070845213 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070845212} + 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: 1471657121} + 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 &1070845214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070845212} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC190\uB2D8 \uCD94\uAC00" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 27.6 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 36 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1070845215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070845212} + m_CullTransparentMesh: 1 --- !u!1 &1178042444 GameObject: m_ObjectHideFlags: 0 @@ -2194,7 +1879,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2, y: 2, z: 0.20000005} + m_Size: {x: 4, y: 4, z: 0.20000005} m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &1222632320 GameObject: @@ -2347,257 +2032,9 @@ Transform: m_Children: - {fileID: 461791772} - {fileID: 923706278} + - {fileID: 1520533432} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1288799782 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1288799788} - - component: {fileID: 1288799787} - - component: {fileID: 1288799786} - - component: {fileID: 1288799785} - - component: {fileID: 1288799784} - - component: {fileID: 1288799783} - - component: {fileID: 1288799791} - - component: {fileID: 1288799790} - - component: {fileID: 1288799789} - m_Layer: 9 - m_Name: Customer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1288799783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288799782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 77f586f285b3847808d79083bd19ef1f, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 1073741824 - quality: 0 - splitAtEveryPortal: 0 - accountForGridPenalties: 0 ---- !u!114 &1288799784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288799782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 1073741824 - radius: 0.25 - height: 1 - canMove: 1 - maxSpeed: 3 - gravity: {x: NaN, y: NaN, z: NaN} - groundMask: - serializedVersion: 2 - m_Bits: 4294967295 - endReachedDistance: 0.1 - whenCloseToDestination: 0 - rvoDensityBehavior: - enabled: 1 - densityThreshold: 0.5 - returnAfterBeingPushedAway: 0 - progressAverage: 0 - lastJobDensityResult: 0 - centerOffsetCompatibility: NaN - repathRateCompatibility: NaN - canSearchCompability: 0 - orientation: 0 - enableRotation: 1 - autoRepath: - mode: 2 - period: 0.5 - sensitivity: 10 - maximumPeriod: 2 - visualizeSensitivity: 0 - targetCompatibility: {fileID: 0} - maxAcceleration: -2.5 - rotationSpeed: 360 - slowdownDistance: 0.3 - pickNextWaypointDist: 0.5 - alwaysDrawGizmos: 0 - slowWhenNotFacingTarget: 1 - preventMovingBackwards: 0 - constrainInsideGraph: 0 ---- !u!114 &1288799785 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288799782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 373b52eb9bf8c40f785bb6947a1aee66, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 1073741824 - drawGizmos: 1 - detailedGizmos: 0 - startEndModifier: - addPoints: 0 - exactStartPoint: 3 - exactEndPoint: 3 - useRaycasting: 0 - mask: - serializedVersion: 2 - m_Bits: 4294967295 - useGraphRaycasting: 0 - traversableTags: -1 - tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - graphMask: - value: 1 ---- !u!136 &1288799786 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288799782} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.25 - m_Height: 1 - m_Direction: 1 - m_Center: {x: 0, y: 0.5, z: 0} ---- !u!54 &1288799787 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288799782} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!4 &1288799788 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288799782} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.91, y: 0, z: -10} - m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 9151230} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1288799789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288799782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 75b48aa4b99043cb9e665a892ec46c75, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1288799790 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288799782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} - m_Name: - m_EditorClassIdentifier: - _skeletonAnimation: {fileID: 9151231} - _initialSkinName: 02 ---- !u!114 &1288799791 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288799782} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3} - m_Name: - m_EditorClassIdentifier: - startWhenEnabled: 1 - asynchronousLoad: 0 - pauseWhenDisabled: 0 - restartWhenComplete: 0 - logTaskChanges: 0 - group: 0 - resetValuesOnRestart: 0 - externalBehavior: {fileID: 11400000, guid: c50cf2007f7d1f94387bc84bc9f7489a, type: 2} - mBehaviorSource: - behaviorName: Behavior - behaviorDescription: - mTaskData: - types: [] - parentIndex: - startIndex: - variableStartIndex: - JSONSerialization: '{"EntryTask":{"Type":"BehaviorDesigner.Runtime.Tasks.EntryTask","NodeData":{"Offset":"(548.5,30)"},"ID":0,"Name":"Entry","Instant":true},"RootTask":{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-301.5,250)"},"ID":1,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None"}}' - fieldSerializationData: - typeName: [] - fieldNameHash: - startIndex: - dataPosition: - unityObjects: [] - byteData: - byteDataArray: - Version: 1.7.9 - gizmoViewMode: 2 - showBehaviorDesignerGizmo: 0 --- !u!1001 &1328652233 PrefabInstance: m_ObjectHideFlags: 0 @@ -2606,46 +2043,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1028035736} m_Modifications: - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalScale.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalPosition.y - value: 0.675 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -2660,14 +2057,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4833254060163934334, guid: bc2abb0d190003240b86437081f20536, type: 3} propertyPath: m_Name - value: Table 1 + value: CustomerTable01 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - insertIndex: -1 - addedObject: {fileID: 1405443879} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc2abb0d190003240b86437081f20536, type: 3} --- !u!1001 &1395162455 @@ -2727,68 +2121,139 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fbb4ace392baa04da5f5cb3ad6e12e0, type: 3} ---- !u!1001 &1405443878 -PrefabInstance: +--- !u!1 &1471657120 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1028043511} - m_Modifications: - - target: {fileID: 831341234050110097, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_Name - value: Food01 (1) - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalPosition.x - value: -0.182 - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalPosition.y - value: 0.186 - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalPosition.z - value: -0.001 - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9099f584471d4754eb2b3889944ef711, type: 3} ---- !u!4 &1405443879 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5864287296959896452, guid: 9099f584471d4754eb2b3889944ef711, type: 3} - m_PrefabInstance: {fileID: 1405443878} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1471657121} + - component: {fileID: 1471657124} + - component: {fileID: 1471657123} + - component: {fileID: 1471657122} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1471657121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471657120} + 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: 1070845213} + m_Father: {fileID: 771203782} + 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 &1471657122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471657120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1471657123} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1665075871} + m_TargetAssemblyTypeName: BlueWater.CustomerManager, Assembly-CSharp + m_MethodName: InstantiateCustomer + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1471657123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471657120} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1471657124 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471657120} + m_CullTransparentMesh: 1 --- !u!1001 &1472541870 PrefabInstance: m_ObjectHideFlags: 0 @@ -2846,6 +2311,43 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4f3702d2bd51af41ac161d64cfc9ba5, type: 3} +--- !u!1 &1475033963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1475033964} + m_Layer: 5 + m_Name: UpgradeInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1475033964 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475033963} + 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: 1849823320} + - {fileID: 1769137579} + m_Father: {fileID: 1987164072} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 140, y: 40} + m_Pivot: {x: 1, y: 1} --- !u!1 &1496452081 GameObject: m_ObjectHideFlags: 0 @@ -2898,6 +2400,38 @@ MonoBehaviour: m_EditorClassIdentifier: SwitchMapsOpened: 2 SwitchMapsClosed: 1 +--- !u!1 &1520533431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1520533432} + m_Layer: 0 + m_Name: Spawns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1520533432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520533431} + 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: + - {fileID: 1038321203} + m_Father: {fileID: 1253205195} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1572330888 GameObject: m_ObjectHideFlags: 0 @@ -3029,7 +2563,7 @@ GameObject: m_Component: - component: {fileID: 1619849090} - component: {fileID: 1619849089} - - component: {fileID: 1619849088} + - component: {fileID: 1619849091} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -3037,36 +2571,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1619849088 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1619849087} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_MoveRepeatDelay: 0.5 - m_MoveRepeatRate: 0.1 - m_XRTrackingOrigin: {fileID: 0} - m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_DeselectOnBackgroundClick: 1 - m_PointerBehavior: 0 - m_CursorLockBehavior: 0 --- !u!114 &1619849089 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3097,6 +2601,36 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1619849091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1619849087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 --- !u!1001 &1628404463 PrefabInstance: m_ObjectHideFlags: 0 @@ -3186,6 +2720,99 @@ Transform: - {fileID: 545850348} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1665075867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1665075868} + - component: {fileID: 1665075869} + - component: {fileID: 1665075871} + - component: {fileID: 1665075870} + - component: {fileID: 1665075872} + m_Layer: 0 + m_Name: RestaurantManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1665075868 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665075867} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1665075869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665075867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a961f486af9bbe4583b1037d23298cc, type: 3} + m_Name: + m_EditorClassIdentifier: + _persistent: 0 + k__BackingField: {fileID: 1665075871} + k__BackingField: {fileID: 1665075870} + k__BackingField: {fileID: 1665075872} +--- !u!114 &1665075870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665075867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1f3fbad52bf14f4a919767bb32ac24f, type: 3} + m_Name: + m_EditorClassIdentifier: + _customerTables: [] +--- !u!114 &1665075871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665075867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7ab08469541b2aa45818fa36bbcb9cf7, type: 3} + m_Name: + m_EditorClassIdentifier: + _customerPrefab: {fileID: -2302002259734456648, guid: 23195e611c71ad44b8a1ccb2b6e0efe5, type: 3} + _customerSpawnTransform: {fileID: 1038321203} + _checkEmptySeatInterval: 0.5 + _instanceCustomers: [] +--- !u!114 &1665075872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665075867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 609e0561d4d85804ab33cccbbbfc7927, type: 3} + m_Name: + m_EditorClassIdentifier: + _foodBalloonUiPrefab: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} --- !u!1 &1746385716 GameObject: m_ObjectHideFlags: 0 @@ -3232,7 +2859,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABIIewe1u78wAIAAP0FAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI56UKhQLd2y7Qdg9tUemqh6UHJx6IhbEjfxRoxX/fGcdAoBJSwpt5M2++8sWkdhUU3th7K8WjEcB+thi9sx+tk/EBtnxp9Ex+wsHnTQpfkhOPPi/cS4N4h2jOrMFbWfzSS0XOGYJBy4Wx64lYwsg47xBecOUATdZ4YmuEvlpsmwi79PykZ2uPbwVoD/bk1e5dDfrD7qBzM5y0s0HitLOrzhkt6ELxdQWC5J/YvUOSXu2msbDkQfzCKCVdUsX8ropVj3jlAtaEDkJyrDLqIf8S5LL0+Oe6SX5eLBz4VInlu7G02Kw6Kvtt6g6uuVvVuj64CpSnO+xFTXXQx2/2fm1eWLN+OOTtZJTDl7JYvfBdwZ1vtLgJj8+FB73hasVzBW8l6Cdzb03QAo3eBqIGB9fjRqhjbaMSitXJr9Z6AYbq+1Ab09nH6rczD9Wxjuyqd0L/OnAzZWLzU0iyJOSWQoLFwf3BeuIOuZQIUdKI/Fe+bC5bMtxJ6zyakp6Eku8UJwQCdAGp721y0CQvN8FSLDaJWqkZwY+M1RDhJLACzZXfTTGiv1yBC1tD14XljtPdJXXJdjinC0qET/5ZdmGams1x2BaX18WNPrz9e6chuNJsHsGVz8ErqRvdJsMTNnhktK43t9nMA20W7IIXDZqHrQ8WxtzzmA3l4IKJJhV7GRk6KEW7HAuIirAA+r1Tf0uOeVWE2ZPR8fLOnlH+MkhxfiEs4wN+K/LFzXUn7w+GebubdyEvoJtnfQH92w6LJyQ1tpurad2vNCXcLn2qReO5UMQXcJ4Hy3WcvLB8cy8/16YxeakXZlZYAP1cRzgWCxaT4MdFTITEMmfgvdRxL9nXnClTrEDMj4HmsbGTrbd8fooyZ5X8MJ6QORvFb+GcEXy8SFzdDwkbSn4WDBSODsSrVLDmFZmyPdv/B1BLAwQUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAatWKkstKs7Mz1OyUjDVM9Qz1FFQSi9KLMgoBgqAOaWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7B7W7vzAAgAA/QUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJAAAAAAAAAAAAAAADQMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADDAwAAAAA= + dataString: UEsDBBQAAAgIAABIIez+cF9vwAIAAP8FAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wWFQoHubRdou4e2qHTVw9KDE0+IhbEjfxRo1f++M04ggUqREr2ZN/PmK59MaldC5o29s1I8GAHsZ4fRN/vRaYz3sOdro5fyA44+r1L4gpx49HnmXhrE+0RzZgveyuyXXityThAMWubGbudiDVPjvEM458oBmqzxxNYIfXbYviYc6vcHvTtf+JWB9mAbr+6wNx5NBuP+9WTeTcY1p5v0+me0oDPFtyUIkt+wh8ckw8pNY2G1B/Ezo5R0tSrmD2WsespLF7AmdBCSY5VRD/kXINeFvyQ/5bkDQpPeNVXKDzNpsV1VXPbbVD3ccreplL1zFSjTYDKMqqqwD9/so8qcW7O9P2VOqCRfyGzzzA8Zd77V5DY8O5ce9I6rDU8VvBagH82dNUELNHobiBocXM1aoU7VTQvINo1fpfUCDOX3sbbm8xWr3y89lKc6kt6wQf86cEtlYvvrkGSpkRsKCRZH9wfriVvk6kSIkkbkv/B1e91qw620zqOp1lOj5LvACYEAnUHd9y45aJKXmmApFptHrdSM4KfGaohwLbAEzZU/LDCiP1uC77aWrgvLLafLq9XVtuNBXVAi3PgnyYVpYXanYVtcXxd3+vj1742G4AqzewBXPAWvpG51mwyP2OCp0bra3HYzj7RlsDnPWjQPex8szLjnMRvKwQUTbSr2MjJ0UIp2ORYQFWEB9LxRfwuOeVWE2aPR8fbO3lH+OkhxfiEs4WN+I9L8+qqfjsaTtDtIB5BmMEiTkYDRTZ/FE5Ia283VoupXPSXcLt3UovFcKOIzOM+D5TpOXli+u5MfW9OavNS5WWYWQD9VEU7FgsUk+HsRcyGxzCV4L3XcS/a5YspkGxCrU6BVbOx87y1fNVFWrJTvxhOyYtP4N1wxgk8Xiav7LmFHyc+CgcLRgXiRCra8JFPyxb7+A1BLAwQUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAatWKkstKs7Mz1OyUjDVM9Qz1FFQSi9KLMgoBgqAOaWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7P5wX2/AAgAA/wUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJAAAAAAAAAAAAAAADQMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADDAwAAAAA= file_cachedStartup: {fileID: 0} cacheStartup: 0 showNavGraphs: 1 @@ -3243,7 +2870,7 @@ MonoBehaviour: manualDebugFloorRoof: 0 showSearchTree: 0 unwalkableNodeDebugSize: 0.3 - logPathResults: 1 + logPathResults: 0 maxNearestNodeDistance: 100 scanOnStartup: 1 fullGetNearestSearch: 0 @@ -3293,7 +2920,7 @@ MonoBehaviour: heuristic: 2 heuristicScale: 1 threadCount: 1 - maxFrameTime: 1 + maxFrameTime: 10 batchGraphUpdates: 0 graphUpdateBatchingInterval: 0.2 navmeshUpdates: @@ -3329,12 +2956,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1769137578} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1849823320} + m_Father: {fileID: 1475033964} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3388,12 +3015,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 + m_fontSize: 20 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 30 + m_fontSizeMax: 20 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -3465,18 +3092,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1849823319} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1769137579} - m_Father: {fileID: 1049919592} + m_Children: [] + m_Father: {fileID: 1475033964} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -100, y: -30} - m_SizeDelta: {x: 200, y: 60} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1849823321 MonoBehaviour: @@ -3547,6 +3173,104 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1987164071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1987164072} + m_Layer: 5 + m_Name: TemporaryInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1987164072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987164071} + 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: 1475033964} + - {fileID: 771203782} + 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!1001 &5626406452199475265 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2768568390039878737, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_Name + value: TycoonPlayer + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalPosition.z + value: -1.439 + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6379312009059766371, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -3560,7 +3284,6 @@ SceneRoots: - {fileID: 1231728096} - {fileID: 1619849090} - {fileID: 1746385717} - - {fileID: 119395941} - {fileID: 1049919592} - {fileID: 1896021280} - {fileID: 1395162455} @@ -3569,8 +3292,8 @@ SceneRoots: - {fileID: 1628404463} - {fileID: 91463582} - {fileID: 1472541870} + - {fileID: 1665075868} - {fileID: 852387592} - {fileID: 1253205195} - {fileID: 20736010} - - {fileID: 211259727} - - {fileID: 1288799788} + - {fileID: 5626406452199475265} diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index b4e1b8791..5828b7396 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -351,7 +351,7 @@ RectTransform: 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: -61.722} + m_AnchoredPosition: {x: 0, y: -61.721985} m_SizeDelta: {x: 0, y: -123.44324} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &97995585 @@ -717,7 +717,8 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_Cameras: [] + m_Cameras: + - {fileID: 1286270532} m_RendererIndex: -1 m_VolumeLayerMask: serializedVersion: 2 @@ -800,7 +801,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 16375 + m_Bits: 65495 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -824,7 +825,8 @@ Transform: m_LocalPosition: {x: 0, y: 15.000004, z: -30.98076} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1286270534} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 9.569, y: 87.98, z: 0} --- !u!114 &191889763 @@ -3759,7 +3761,7 @@ MonoBehaviour: IsHidden: 0 - Type: 0 Name: - GameObject: {fileID: 0} + GameObject: {fileID: 1286270531} Ordinal: 14 Priority: 0 IconType: 290000 @@ -3843,7 +3845,7 @@ MonoBehaviour: IsHidden: 0 - Type: 0 Name: - GameObject: {fileID: 2046550838} + GameObject: {fileID: 0} Ordinal: 21 Priority: 0 IconType: 161000 @@ -4463,7 +4465,6 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 0 k__BackingField: {fileID: 1033584369} - k__BackingField: {fileID: 2046550841} k__BackingField: {fileID: 1049575630} k__BackingField: {fileID: 1286436776} k__BackingField: {fileID: 119873275} @@ -4491,7 +4492,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 16383 + m_Bits: 65535 --- !u!114 &1033584368 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4524,9 +4525,9 @@ Canvas: m_GameObject: {fileID: 1033584364} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 + m_RenderMode: 1 + m_Camera: {fileID: 1286270532} + m_PlaneDistance: 10 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -4535,7 +4536,7 @@ Canvas: m_VertexColorAlwaysGammaSpace: 1 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: -1197429611 + m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!224 &1033584370 @@ -5911,6 +5912,134 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1271651065} m_CullTransparentMesh: 0 +--- !u!1 &1286270531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1286270534} + - component: {fileID: 1286270532} + - component: {fileID: 1286270533} + m_Layer: 0 + m_Name: UiCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &1286270532 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1286270531} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + 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.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + 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!114 &1286270533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1286270531} + 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: 0 + 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!4 &1286270534 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1286270531} + 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: 191889762} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1286436773 GameObject: m_ObjectHideFlags: 0 @@ -10448,107 +10577,6 @@ Transform: - {fileID: 285952513} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2046550838 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2046550842} - - component: {fileID: 2046550841} - - component: {fileID: 2046550840} - - component: {fileID: 2046550839} - m_Layer: 5 - m_Name: WorldSpaceCanvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2046550839 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2046550838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 16383 ---- !u!114 &2046550840 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2046550838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!223 &2046550841 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2046550838} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 191889761} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: -1197429611 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &2046550842 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2046550838} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 960, y: 540} - m_SizeDelta: {x: 1920, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2049200270 GameObject: m_ObjectHideFlags: 0 @@ -10767,7 +10795,7 @@ RectTransform: 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: -61.722} + m_AnchoredPosition: {x: 0, y: -61.721985} m_SizeDelta: {x: 0, y: -123.44324} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2067074638 @@ -13941,7 +13969,7 @@ RectTransform: 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: -61.722} + m_AnchoredPosition: {x: 0, y: -61.721985} m_SizeDelta: {x: 0, y: -123.44324} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2966234199996893336 @@ -19446,7 +19474,7 @@ RectTransform: 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: -61.722} + m_AnchoredPosition: {x: 0, y: -61.722015} m_SizeDelta: {x: 0, y: -123.44324} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8579188508793467001 @@ -19997,7 +20025,7 @@ RectTransform: 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: -61.722} + m_AnchoredPosition: {x: 0, y: -61.721985} m_SizeDelta: {x: 0, y: -123.44324} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &8931135120116411784 @@ -20239,7 +20267,6 @@ SceneRoots: - {fileID: 882036795} - {fileID: 269653247} - {fileID: 166638083} - - {fileID: 2046550842} - {fileID: 1033584370} - {fileID: 1719893244} - {fileID: 1731091154544500521} diff --git a/Assets/02.Scripts/BehaviorTree/Action/HasReachedDestination.cs b/Assets/02.Scripts/BehaviorTree/Action/HasReachedDestination.cs new file mode 100644 index 000000000..aed6206e9 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Action/HasReachedDestination.cs @@ -0,0 +1,27 @@ +using System; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Enemies; +using Action = BehaviorDesigner.Runtime.Tasks.Action; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom")] + [Serializable] + public class HasReachedDestination : Action + { + private AiMovement _aiMovement; + + public override void OnAwake() + { + _aiMovement = transform.GetComponent(); + } + + public override TaskStatus OnUpdate() + { + if (!_aiMovement.HasReachedDestination()) return TaskStatus.Running; + + _aiMovement.StopMove(); + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Action/HasReachedDestination.cs.meta b/Assets/02.Scripts/BehaviorTree/Action/HasReachedDestination.cs.meta new file mode 100644 index 000000000..ce5ec37b4 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Action/HasReachedDestination.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ab106312d55853e458ff07c775c8a9e0 +timeCreated: 1717197290 diff --git a/Assets/02.Scripts/BehaviorTree/Action/Move.cs b/Assets/02.Scripts/BehaviorTree/Action/Move.cs new file mode 100644 index 000000000..7184fe69c --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Action/Move.cs @@ -0,0 +1,50 @@ +using System; +using BehaviorDesigner.Runtime; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Enemies; +using UnityEngine; +using Action = BehaviorDesigner.Runtime.Tasks.Action; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom")] + [Serializable] + public class Move : Action + { + [field: SerializeField] + public bool UseMovePosition { get; set; } + + [field: SerializeField] + public SharedVector3 MovePosition { get; set; } + + [field: SerializeField] + public SharedCollider Target { get; set; } + + private AiMovement _aiMovement; + + public override void OnAwake() + { + _aiMovement = transform.GetComponent(); + } + + public override void OnStart() + { + if (UseMovePosition) + { + _aiMovement.Move(MovePosition.Value); + } + else + { + _aiMovement.MoveTarget(Target.Value); + } + } + + public override TaskStatus OnUpdate() + { + if (!_aiMovement.HasReachedDestination()) return TaskStatus.Running; + + _aiMovement.StopMove(); + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/Move.cs.meta b/Assets/02.Scripts/BehaviorTree/Action/Move.cs.meta similarity index 100% rename from Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/Move.cs.meta rename to Assets/02.Scripts/BehaviorTree/Action/Move.cs.meta diff --git a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/SelfStun.cs b/Assets/02.Scripts/BehaviorTree/Action/SelfStun.cs similarity index 91% rename from Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/SelfStun.cs rename to Assets/02.Scripts/BehaviorTree/Action/SelfStun.cs index 3412c3bbd..1daacd50a 100644 --- a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/SelfStun.cs +++ b/Assets/02.Scripts/BehaviorTree/Action/SelfStun.cs @@ -4,9 +4,9 @@ using BlueWater.Interfaces; using UnityEngine; using Action = BehaviorDesigner.Runtime.Tasks.Action; -namespace BlueWater.BehaviorTrees.Enemies.Bosses.Actions +namespace BlueWater.BehaviorTrees.Actions { - [TaskCategory("Custom/Enemy/Boss")] + [TaskCategory("Custom")] [Serializable] public class SelfStun : Action { diff --git a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/SelfStun.cs.meta b/Assets/02.Scripts/BehaviorTree/Action/SelfStun.cs.meta similarity index 100% rename from Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/SelfStun.cs.meta rename to Assets/02.Scripts/BehaviorTree/Action/SelfStun.cs.meta diff --git a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/Move.cs b/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/Move.cs deleted file mode 100644 index e6b62304f..000000000 --- a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/Move.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using BehaviorDesigner.Runtime; -using BehaviorDesigner.Runtime.Tasks; -using BlueWater.Enemies.Bosses; -using Action = BehaviorDesigner.Runtime.Tasks.Action; - -namespace BlueWater.BehaviorTrees.Enemies.Bosses.Actions -{ - [TaskCategory("Custom/Enemy/Boss")] - [Serializable] - public class Move : Action - { - public bool UseMovePosition; - public SharedVector3 MovePosition; - public SharedCollider Target; - - private Boss _boss; - - public override void OnAwake() - { - _boss = transform.GetComponent(); - } - - public override void OnStart() - { - var movePosition = UseMovePosition ? MovePosition.Value : Target.Value.transform.position; - _boss.Move(movePosition); - } - - public override TaskStatus OnUpdate() - { - if (!_boss.HasReachedDestination()) return TaskStatus.Running; - - _boss.StopMove(); - return TaskStatus.Success; - } - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/MoveTarget.cs b/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/MoveTarget.cs deleted file mode 100644 index 1062de2d3..000000000 --- a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/MoveTarget.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using BehaviorDesigner.Runtime.Tasks; -using BlueWater.Enemies.Bosses; -using Action = BehaviorDesigner.Runtime.Tasks.Action; - -namespace BlueWater.BehaviorTrees.Enemies.Bosses.Actions -{ - [TaskCategory("Custom/Enemy/Boss")] - [Serializable] - public class MoveTarget : Action - { - private Boss _boss; - - public override void OnAwake() - { - _boss = transform.GetComponent(); - } - - public override void OnStart() - { - _boss.MoveTarget(_boss.Target); - } - - public override TaskStatus OnUpdate() - { - if (!_boss.HasReachedDestination()) return TaskStatus.Running; - - _boss.StopMove(); - return TaskStatus.Success; - } - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/MoveTarget.cs.meta b/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/MoveTarget.cs.meta deleted file mode 100644 index 2a28ba61a..000000000 --- a/Assets/02.Scripts/BehaviorTree/Enemy/Boss/Action/MoveTarget.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: dd381b6ff9d541de871ac5ac61a51b4d -timeCreated: 1717192447 \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc.meta b/Assets/02.Scripts/BehaviorTree/Npc.meta new file mode 100644 index 000000000..b18f35f6c --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d4352668096fd14caf02dfde1cd3699 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer.meta new file mode 100644 index 000000000..654f0fa67 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3db198fe8d622d942b804d61e92af323 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action.meta new file mode 100644 index 000000000..73cc438cf --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69a3833b632382a4081f86827f8673b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs new file mode 100644 index 000000000..5de42157c --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs @@ -0,0 +1,33 @@ +using System; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Customers; +using Action = BehaviorDesigner.Runtime.Tasks.Action; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Customer")] + [Serializable] + public class FindTable : Action + { + private Customer _customer; + + public override void OnAwake() + { + _customer = GetComponent(); + } + + public override void OnStart() + { + RestaurantManager.Instance.CustomerManager.TryFindEmptySeat(_customer); + } + + public override TaskStatus OnUpdate() + { + if (_customer.TableSeat == null) return TaskStatus.Running; + + _customer.SetFoodBalloonUi(RestaurantManager.Instance.FoodBalloonUiManager.InstantiateFoodBalloon()); + _customer.FoodBalloonUi.Initialize(_customer, _customer.TableSeat); + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs.meta new file mode 100644 index 000000000..274e65c30 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 145fe14973b413b4794df3725aba7288 \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs new file mode 100644 index 000000000..1408e5c85 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs @@ -0,0 +1,42 @@ +using System; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Customers; +using Action = BehaviorDesigner.Runtime.Tasks.Action; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Customer")] + [Serializable] + public class OrderFood : Action + { + private Customer _customer; + private FoodBalloonUi _foodBalloonUi; + + public override void OnAwake() + { + _customer = GetComponent(); + } + + public override void OnStart() + { + _foodBalloonUi = _customer.FoodBalloonUi; + _foodBalloonUi.OrderFood(40001, 15f); + } + + public override TaskStatus OnUpdate() + { + if (_foodBalloonUi.IsFoodReceive()) + { + return TaskStatus.Success; + } + + if (_foodBalloonUi.IsWaitTimeOver()) + { + _foodBalloonUi.CancelOrder(); + return TaskStatus.Failure; + } + + return TaskStatus.Running; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs.meta new file mode 100644 index 000000000..794e3d22e --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 89034dc11e0becb4aa6550820f9cf31c diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs new file mode 100644 index 000000000..bc3da40b7 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs @@ -0,0 +1,29 @@ +using System; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Customers; +using Action = BehaviorDesigner.Runtime.Tasks.Action; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Customer")] + [Serializable] + public class SetTableSeatPositionAndDirection : Action + { + private Customer _customer; + + public override void OnAwake() + { + _customer = GetComponent(); + } + + public override void OnStart() + { + _customer.SetTableSeatPositionAndDirection(); + } + + public override TaskStatus OnUpdate() + { + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs.meta new file mode 100644 index 000000000..7a74a4345 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 05d0d1b953aeefe48a8e62dfe7f2ee0c diff --git a/Assets/02.Scripts/Character/AiMovement.cs b/Assets/02.Scripts/Character/AiMovement.cs index 093aac951..41fe7f2bb 100644 --- a/Assets/02.Scripts/Character/AiMovement.cs +++ b/Assets/02.Scripts/Character/AiMovement.cs @@ -1,3 +1,4 @@ +using System; using Pathfinding; using UnityEngine; @@ -18,8 +19,9 @@ namespace BlueWater.Enemies private void Awake() { InitializeComponents(); + StopMove(); } - + #endregion // Initialize methods @@ -78,7 +80,11 @@ namespace BlueWater.Enemies public bool HasReachedDestination() { - return _iAstarAi is { pathPending: false, reachedEndOfPath: true }; + if (_iAstarAi == null) return false; + if (_iAstarAi.pathPending) return false; + + var distanceToDestination = Vector3.Distance(_iAstarAi.position, _iAstarAi.destination); + return distanceToDestination < 0.5f && _iAstarAi.reachedEndOfPath; } public void SetMoveSpeed(float speed) diff --git a/Assets/02.Scripts/Character/Npc.meta b/Assets/02.Scripts/Character/Npc.meta new file mode 100644 index 000000000..bea6f6db4 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c495cafe421fde4299f1eee23e64fda +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs new file mode 100644 index 000000000..bfc30aec9 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -0,0 +1,168 @@ +using BehaviorDesigner.Runtime; +using BlueWater.Enemies; +using BlueWater.Players; +using BlueWater.Players.Tycoons; +using Pathfinding; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Npcs.Customers +{ + public class Customer : MonoBehaviour + { + // Variables + #region Variables + + // Components + [field: SerializeField] + public Rigidbody Rigidbody { get; private set; } + + [field: SerializeField] + public CapsuleCollider CharacterCollider { get; private set; } + + [field: SerializeField] + public BehaviorTree BehaviorTree { get; private set; } + + [field: SerializeField] + public Transform VisualLook { get; private set; } + + [field: SerializeField] + public MeshRenderer MeshRenderer { get; private set; } + + // Classes + [field: SerializeField, Required] + public SpineController SpineController { get; private set; } + + [field: SerializeField, Required] + public AiMovement AIMovement { get; private set; } + + [field: SerializeField] + public FoodBalloonUi FoodBalloonUi { get; private set; } + + private IAstarAI _astarAi; + public TableSeat TableSeat { get; private set; } + + private bool _isMoving; + public bool IsMoving + { + get => _isMoving; + set + { + if (_isMoving == value) return; + + _isMoving = value; + SpineController.PlayAnimation(_isMoving + ? TycoonPlayerSpineAnimation.run.ToString() + : TycoonPlayerSpineAnimation.idle.ToString(), true); + } + } + + private Vector3 _currentDirection = Vector3.right; + public Vector3 CurrentDirection + { + get => _currentDirection; + set + { + if (value == Vector3.zero) return; + + _currentDirection = value; + } + } + + private bool _isQuitting; + + #endregion + + // Unity events + #region Unity events + + private void Awake() + { + InitializeComponents(); + } + + private void OnApplicationQuit() + { + _isQuitting = true; + } + + private void Update() + { + HandleMovement(); + FlipVisualLook(); + } + + private void OnDestroy() + { + if (_isQuitting) return; + + RestaurantManager.Instance.CustomerManager.UnregisterCustomer(this); + } + + #endregion + + // Initialize methods + #region Initialize methods + + [Button("컴포넌트 초기화")] + protected virtual void InitializeComponents() + { + Rigidbody = GetComponent(); + CharacterCollider = GetComponent(); + BehaviorTree = GetComponent(); + VisualLook = transform.Find("VisualLook"); + MeshRenderer = VisualLook.GetComponent(); + + SpineController = GetComponent(); + AIMovement = GetComponent(); + + _astarAi = GetComponent(); + } + + public void Initialize() + { + BehaviorTree.EnableBehavior(); + } + + #endregion + + // Methods + #region Methods + + private void HandleMovement() + { + if (!_astarAi.canMove || _astarAi.isStopped) + { + IsMoving = false; + return; + } + + CurrentDirection = _astarAi.velocity.normalized; + IsMoving = _astarAi.velocity != Vector3.zero || _astarAi.velocity != Vector3.positiveInfinity; + } + + private void FlipVisualLook() + { + var localScale = VisualLook.localScale; + localScale.x = CurrentDirection.x switch + { + > 0.01f => -Mathf.Abs(localScale.x), + < -0.01f => Mathf.Abs(localScale.x), + _ => localScale.x + }; + VisualLook.localScale = localScale; + } + + public void SetFoodBalloonUi(FoodBalloonUi foodBalloonUi) => FoodBalloonUi = foodBalloonUi; + public void SetTableSeat(TableSeat tableSeat) => TableSeat = tableSeat; + public void SetCurrentDirection(Vector3 normalDirection) => CurrentDirection = normalDirection; + + public void SetTableSeatPositionAndDirection() + { + transform.position = TableSeat.SeatTransform.position; + SetCurrentDirection(TableSeat.TableDirection); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs.meta b/Assets/02.Scripts/Character/Npc/Customer.cs.meta new file mode 100644 index 000000000..3cd7e5b6c --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8ed3a2b9a6425d147bc79e8a53a4fea1 \ No newline at end of file diff --git a/Assets/02.Scripts/Item/ItemData.cs b/Assets/02.Scripts/Item/ItemData.cs index c81d68559..15a6d1545 100644 --- a/Assets/02.Scripts/Item/ItemData.cs +++ b/Assets/02.Scripts/Item/ItemData.cs @@ -9,6 +9,8 @@ namespace BlueWater.Items None = 0, FoodIngredient, Currency, + Dish, + Drink, Quest = 9 } diff --git a/Assets/02.Scripts/Item/ItemManager.cs b/Assets/02.Scripts/Item/ItemManager.cs index 795337826..4262974f3 100644 --- a/Assets/02.Scripts/Item/ItemManager.cs +++ b/Assets/02.Scripts/Item/ItemManager.cs @@ -74,5 +74,14 @@ namespace BlueWater.Items DataManager.Instance.CombatInventory.AddItem(itemSlot); CombatUiManager.Instance.ItemLootUi.ShowLootInfoUi(ItemDictionary[itemSlot.Idx], itemSlot.Count); } + + public ItemData GetItemDataByIdx(int idx) + { + if (ItemDictionary.TryGetValue(idx, out var itemData)) return itemData; + + Debug.LogError($"{idx}와 일치하는 아이템이 없습니다."); + return null; + + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/NewBlueWater.inputactions b/Assets/02.Scripts/NewBlueWater.inputactions index df1c4d3c3..12795d915 100644 --- a/Assets/02.Scripts/NewBlueWater.inputactions +++ b/Assets/02.Scripts/NewBlueWater.inputactions @@ -1,6 +1,522 @@ { "name": "NewBlueWater", "maps": [ + { + "name": "UI", + "id": "95c73f0d-8a82-4f9c-bdc9-28535156bb45", + "actions": [ + { + "name": "Navigate", + "type": "PassThrough", + "id": "66824a18-0819-44a4-92c2-6395511e3d0d", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Submit", + "type": "Button", + "id": "93ed1c14-2900-4d30-91fb-a9f2353a9540", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "3c7c74ba-0c86-4e21-ab91-2b1e674cf243", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "52083aa7-62f5-41d7-b37e-4db100ef2cda", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Click", + "type": "PassThrough", + "id": "42e6067b-0d00-4787-92d8-ddf60510de83", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "30ef3965-cc51-452e-8df9-6a3567a53f4d", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "b99f7e4b-30f0-4936-9e55-c383951d6f58", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "4849bf4c-7b3b-43c4-8bbf-7178f536fb94", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "49ed4722-bfe5-47b7-b724-008d9ca57edc", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "7f4f45c6-67b1-47bf-9a74-fea6f6b5fde1", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "68f33c93-5b1d-4ff6-a0df-88fe9c9ffe18", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "bc00964e-93a2-48d2-9273-ea4e6513e547", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "66eb74c2-93bf-45c9-9951-7ec804948839", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "3d345213-92b9-47c7-bbb4-d842b902130d", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "6f56870d-cb44-470a-97a2-b72ca3887720", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "e0dd59de-4c62-4cdc-831b-e5978c0d4a92", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "bca7d290-ac04-4946-909d-6dc428e3ac69", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "a63c1db9-3d8f-4b55-a2eb-00d0f18ce97e", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "14c6b2c9-b0a0-4e2b-8bbe-a8ef2d16a7e4", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9d0d06f9-134e-4c1d-a227-232914165bfe", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "830d828a-15ae-40b0-8953-11d652c5c9cb", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "d474c596-e31e-4a09-8de6-3626149f4620", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "b1f5a532-6ccc-4f1c-8aba-6adf4434ce6a", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "cc7d3125-c956-4edb-a1bb-fdf64e779486", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "55a6c89d-c3b8-493c-b948-3663d1a8e9fb", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "99a79ff1-a85a-4408-984f-a876db0b52f2", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "2d43c161-3247-4448-aab1-5955cf3b5adc", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "edff0cf4-58f9-4cbf-a238-6fc6d3460ca0", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "edb9a0d2-10cd-4d52-80ba-2853f19379a2", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "a396bfb3-496b-4e9c-8ba6-d45f992f9fd2", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "5bd0f70f-9a13-49b1-b702-3761e0b1e9b1", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "8f0fffbe-70a3-4d80-9aa3-2d3cb3f5e233", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "da2f24a1-f25d-430b-87c1-b98c1378d884", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "322efc49-f595-4a8f-bef8-b1704e3adb5d", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "cbe38f31-ad3c-4dbb-baea-1cd71cd718b6", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "72484d32-8160-4712-9ef5-e77f92cbbb91", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "20d5e954-9c1d-4804-b3d7-9ab950f3bf31", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "52185e99-0d40-418f-ba3c-84696fd36125", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "30b6b020-dc4a-4982-92d2-04780876ad7d", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "05e54274-5a9f-4ad5-8231-89c1d09ddaa6", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "06ea9db2-4480-401a-8473-81f404cddbb3", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5f297987-851f-45cc-945b-2e6928e73780", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "06e98d63-e839-466d-930b-00b12f5028f8", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c0c154c1-af84-4600-95f3-7f263b0835c9", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8204e79d-d81e-426b-89c3-deb0558500d2", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7a1f05a6-2b37-402c-ac17-9e2b08f49f61", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "19ad5d36-d49d-4766-999c-2f60959653bc", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "74b04011-3702-40bb-ad4a-85fe684aab04", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, { "name": "Tycoon", "id": "0f443e63-5820-47dc-a258-14653b45aecc", diff --git a/Assets/02.Scripts/Prop/Restaurant.meta b/Assets/02.Scripts/Prop/Restaurant.meta new file mode 100644 index 000000000..569839c89 --- /dev/null +++ b/Assets/02.Scripts/Prop/Restaurant.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d86c40272e7564e48bca70b44e1b3198 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs b/Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs new file mode 100644 index 000000000..59b9ea75c --- /dev/null +++ b/Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs @@ -0,0 +1,29 @@ +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +namespace BlueWater +{ + public class CustomerTable : MonoBehaviour + { + [SerializeField] + private List _tableSeats; + + private void OnEnable() + { + RestaurantManager.Instance.CustomerTableManager.RegisterTable(this); + } + + private void OnDisable() + { + if (!RestaurantManager.Instance) return; + + RestaurantManager.Instance.CustomerTableManager.UnregisterTable(this); + } + + public TableSeat FindEmptySeat() + { + return _tableSeats.FirstOrDefault(tableSeat => !tableSeat.IsReserved && !tableSeat.IsOccupied && tableSeat.IsCleaned); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs.meta b/Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs.meta new file mode 100644 index 000000000..dc822a8af --- /dev/null +++ b/Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 353433a78f14e1b42bef6e12dd1f5700 \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Restaurant/TableSeat.cs b/Assets/02.Scripts/Prop/Restaurant/TableSeat.cs new file mode 100644 index 000000000..765fd0297 --- /dev/null +++ b/Assets/02.Scripts/Prop/Restaurant/TableSeat.cs @@ -0,0 +1,48 @@ +using System; +using UnityEngine; + +namespace BlueWater +{ + [Serializable] + public class TableSeat + { + [field: SerializeField] + public bool IsOccupied { get; private set; } + + [field: SerializeField] + public bool IsReserved { get; private set; } + + [field: SerializeField] + public bool IsCleaned { get; private set; } = true; + + [field: SerializeField] + public Transform SeatTransform { get; private set; } + + [field: SerializeField] + public SpriteRenderer Food { get; private set; } + + [field: SerializeField] + public Vector3 TableDirection; + + public void ReserveSeat() => IsReserved = true; + public void UnreserveSeat() => IsReserved = false; + + public void OccupySeat() => IsOccupied = true; + public void VacateSeat() => IsOccupied = false; + + public void CleanTable() => IsCleaned = true; + public void DirtyTable() => IsCleaned = false; + + public void SetFood(Sprite sprite) + { + Food.sprite = sprite; + DirtyTable(); + } + + public void CleanUpFood() + { + Food.sprite = null; + CleanTable(); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Restaurant/TableSeat.cs.meta b/Assets/02.Scripts/Prop/Restaurant/TableSeat.cs.meta new file mode 100644 index 000000000..706b3f336 --- /dev/null +++ b/Assets/02.Scripts/Prop/Restaurant/TableSeat.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a2680665f39463b4aa942cfae231132c diff --git a/Assets/02.Scripts/Restaurant.meta b/Assets/02.Scripts/Restaurant.meta new file mode 100644 index 000000000..e66319f3f --- /dev/null +++ b/Assets/02.Scripts/Restaurant.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1418574dc476ee445ba113f7fe04d855 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Restaurant/CustomerManager.cs b/Assets/02.Scripts/Restaurant/CustomerManager.cs new file mode 100644 index 000000000..447028370 --- /dev/null +++ b/Assets/02.Scripts/Restaurant/CustomerManager.cs @@ -0,0 +1,100 @@ +using System.Collections; +using System.Collections.Generic; +using BlueWater.Npcs.Customers; +using BlueWater.Utility; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater +{ + public class CustomerManager : MonoBehaviour + { + [Title("손님 데이터")] + [SerializeField, Required] + private Customer _customerPrefab; + + [SerializeField, Required] + private Transform _customerSpawnTransform; + + [Title("대기중인 손님 정보")] + [SerializeField] + private float _checkEmptySeatInterval = 0.5f; + + [SerializeField] + private List _instanceCustomers = new(); + + [ShowInInspector] + private Queue _waitingCustomers = new(); + + private CustomerTableManager _customerTableManager; + private Coroutine _findEmptySeatCoroutineInstance; + + private void Start() + { + _customerTableManager = RestaurantManager.Instance.CustomerTableManager; + } + + public void InstantiateCustomer() + { + var newCustomer = Instantiate(_customerPrefab, _customerSpawnTransform.position, Quaternion.identity); + newCustomer.Initialize(); + RegisterCustomer(newCustomer); + } + + public void TryFindEmptySeat(Customer customer) + { + // 이미 대기열에 사람들이 있는 경우, 새로운 손님도 바로 대기열에 넣는다. + if (_waitingCustomers.Count > 0) + { + _waitingCustomers.Enqueue(customer); + return; + } + + // 대기열에는 아무도 없는 경우 + var emptySeat = _customerTableManager.FindEmptySeat(); + if (emptySeat == null) + { + // 내가 첫 대기열 손님이 된다. + _waitingCustomers.Enqueue(customer); + Utils.StartUniqueCoroutine(this, ref _findEmptySeatCoroutineInstance, CheckEmptySeatCoroutine()); + return; + } + + customer.SetTableSeat(emptySeat); + emptySeat.ReserveSeat(); + customer.AIMovement.Move(emptySeat.SeatTransform.position); + } + + private IEnumerator CheckEmptySeatCoroutine() + { + var checkEmptySeatInterval = new WaitForSeconds(_checkEmptySeatInterval); + while (_waitingCustomers.Count > 0) + { + var emptySeat = _customerTableManager.FindEmptySeat(); + if (emptySeat != null) + { + var customer = _waitingCustomers.Dequeue(); + customer.SetTableSeat(emptySeat); + emptySeat.ReserveSeat(); + customer.AIMovement.Move(emptySeat.SeatTransform.position); + + continue; + } + + yield return checkEmptySeatInterval; + } + + _findEmptySeatCoroutineInstance = null; + } + + public void RegisterCustomer(Customer customer) + { + Utils.RegisterList(_instanceCustomers, customer); + } + + public void UnregisterCustomer(Customer customer) + { + Utils.UnregisterList(_instanceCustomers, customer); + } + } +} diff --git a/Assets/02.Scripts/Restaurant/CustomerManager.cs.meta b/Assets/02.Scripts/Restaurant/CustomerManager.cs.meta new file mode 100644 index 000000000..cab23f766 --- /dev/null +++ b/Assets/02.Scripts/Restaurant/CustomerManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7ab08469541b2aa45818fa36bbcb9cf7 \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/CustomerTableManager.cs b/Assets/02.Scripts/Restaurant/CustomerTableManager.cs new file mode 100644 index 000000000..8b890d14b --- /dev/null +++ b/Assets/02.Scripts/Restaurant/CustomerTableManager.cs @@ -0,0 +1,29 @@ +using System.Collections.Generic; +using System.Linq; +using BlueWater.Utility; +using UnityEngine; + +namespace BlueWater +{ + public class CustomerTableManager : MonoBehaviour + { + [SerializeField] + private List _customerTables; + + public void RegisterTable(CustomerTable table) + { + Utils.RegisterList(_customerTables, table); + } + + public void UnregisterTable(CustomerTable table) + { + Utils.UnregisterList(_customerTables, table); + } + + public TableSeat FindEmptySeat() + { + return _customerTables.Select(customerTables => customerTables.FindEmptySeat()) + .FirstOrDefault(emptySeat => emptySeat != null); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/CustomerTableManager.cs.meta b/Assets/02.Scripts/Restaurant/CustomerTableManager.cs.meta new file mode 100644 index 000000000..0079d3f3c --- /dev/null +++ b/Assets/02.Scripts/Restaurant/CustomerTableManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f1f3fbad52bf14f4a919767bb32ac24f \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/FoodBalloonUi.cs b/Assets/02.Scripts/Restaurant/FoodBalloonUi.cs new file mode 100644 index 000000000..5f5e69158 --- /dev/null +++ b/Assets/02.Scripts/Restaurant/FoodBalloonUi.cs @@ -0,0 +1,127 @@ +using BlueWater.Items; +using BlueWater.Npcs.Customers; +using DG.Tweening; +using Sirenix.OdinInspector; +using UnityEngine; +using UnityEngine.UI; + +namespace BlueWater +{ + public class FoodBalloonUi : MonoBehaviour + { + [field: Title("컴포넌트")] + [field: SerializeField, Required] + public Image FillImage { get; private set; } + + [field: SerializeField, Required] + public Image FoodImage { get; private set; } + + [SerializeField] + private Customer _customer; + + [SerializeField] + private Vector3 _offset = new(-0.2f, 1.5f, 0f); + + [Title("주문 정보")] + [SerializeField, Tooltip("주문을 시작하고나서, 재촉하지 않는 최소한의 기다리는 시간")] + private float _defaultWaitTime = 5f; + + [SerializeField, DisableIf("@true"), Tooltip("_defaultWaitTime시간이 지나고, 재촉하는 시간")] + private float _customerWaitTime; + + [SerializeField, DisableIf("@true")] + private bool _isOrdered; + + [SerializeField, DisableIf("@true")] + private bool _isWaitTimeOver; + + [SerializeField, DisableIf("@true")] + private bool _isFoodReceived; + + private Tween _tween; + private TableSeat _tableSeat; + private ItemData _orderItemData; + + private void Awake() + { + InitializeComponents(); + } + + private void LateUpdate() + { + if (!gameObject.activeSelf || !_customer) return; + + transform.position = _customer.transform.TransformPoint(_offset); + } + + private void OnDestroy() + { + _tween.Kill(); + } + + [Button("컴포넌트 초기화")] + private void InitializeComponents() + { + FillImage = transform.Find("Background/FillImage").GetComponent(); + FoodImage = transform.Find("FoodImage").GetComponent(); + } + + public void Initialize(Customer customer, TableSeat tableSeat) + { + _customer = customer; + _tableSeat = tableSeat; + HideUi(); + } + + public void ShowUi() => gameObject.SetActive(true); + public void HideUi() => gameObject.SetActive(false); + + private void SetFoodImage(int foodIdx) + { + _orderItemData = ItemManager.Instance.GetItemDataByIdx(foodIdx); + if (_orderItemData == null) + { + Debug.LogError($"{foodIdx} 해당 음식을 등록할 수 없습니다."); + return; + } + + if (_orderItemData.Sprite == null) + { + Debug.LogWarning($"{_orderItemData.Sprite} 해당 음식의 이미지가 없습니다."); + } + FoodImage.sprite = _orderItemData.Sprite; + } + + public void OrderFood(int foodIdx, float waitTime) + { + _isOrdered = true; + _isWaitTimeOver = false; + _isFoodReceived = false; + SetFoodImage(foodIdx); + _customerWaitTime = waitTime; + ShowUi(); + + _tween = FillImage.DOFillAmount(1f, _customerWaitTime) + .SetEase(Ease.Linear) + .SetDelay(_defaultWaitTime) + .OnComplete(OnTweenComplete) + .SetAutoKill(false); + _tween.Restart(); + } + + private void OnTweenComplete() + { + _isWaitTimeOver = true; + HideUi(); + } + + public bool IsWaitTimeOver() => _isOrdered && _isWaitTimeOver; + public bool IsFoodReceive() => _isFoodReceived; + + public void CancelOrder() + { + _tableSeat.UnreserveSeat(); + _tableSeat.VacateSeat(); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/FoodBalloonUi.cs.meta b/Assets/02.Scripts/Restaurant/FoodBalloonUi.cs.meta new file mode 100644 index 000000000..8cf0aac62 --- /dev/null +++ b/Assets/02.Scripts/Restaurant/FoodBalloonUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4132c767aaeea7f43b8b894bde7b7351 \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs b/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs new file mode 100644 index 000000000..c6a623da6 --- /dev/null +++ b/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs @@ -0,0 +1,23 @@ +using BlueWater.Uis; +using UnityEngine; + +namespace BlueWater +{ + public class FoodBalloonUiManager : MonoBehaviour + { + [SerializeField] + private FoodBalloonUi _foodBalloonUiPrefab; + + private Transform _instanceLocation; + + private void Start() + { + _instanceLocation = TycoonUiManager.Instance.MainCanvas.transform; + } + + public FoodBalloonUi InstantiateFoodBalloon() + { + return Instantiate(_foodBalloonUiPrefab, Vector3.zero, Quaternion.identity, _instanceLocation); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs.meta b/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs.meta new file mode 100644 index 000000000..b841725b1 --- /dev/null +++ b/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 609e0561d4d85804ab33cccbbbfc7927 \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/RestaurantManager.cs b/Assets/02.Scripts/Restaurant/RestaurantManager.cs new file mode 100644 index 000000000..0d2b06a45 --- /dev/null +++ b/Assets/02.Scripts/Restaurant/RestaurantManager.cs @@ -0,0 +1,30 @@ +using UnityEngine; +using Sirenix.OdinInspector; + +namespace BlueWater +{ + public class RestaurantManager : Singleton + { + [field: SerializeField] + public CustomerManager CustomerManager { get; private set; } + + [field: SerializeField] + public CustomerTableManager CustomerTableManager { get; private set; } + + [field: SerializeField] + public FoodBalloonUiManager FoodBalloonUiManager { get; private set; } + + protected override void OnAwake() + { + InitializeComponents(); + } + + [Button("컴포넌트 초기화")] + private void InitializeComponents() + { + CustomerManager = GetComponent(); + CustomerTableManager = GetComponent(); + FoodBalloonUiManager = GetComponent(); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/RestaurantManager.cs.meta b/Assets/02.Scripts/Restaurant/RestaurantManager.cs.meta new file mode 100644 index 000000000..44a85abde --- /dev/null +++ b/Assets/02.Scripts/Restaurant/RestaurantManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7a961f486af9bbe4583b1037d23298cc \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset index 6230c192a..ee9ad0e60 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: ItemTable m_EditorClassIdentifier: k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10101 k__BackingField: "\uD0B9\uD06C\uB7A9" k__BackingField: 1 k__BackingField: 1 @@ -21,7 +21,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10102 k__BackingField: "\uACF5\uB8E1 \uACE0\uAE30" k__BackingField: 1 k__BackingField: 1 @@ -29,7 +29,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10103 k__BackingField: "\uB7A8\uACE0\uAE30" k__BackingField: 1 k__BackingField: 1 @@ -37,7 +37,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10104 k__BackingField: "\uB2ED\uACE0\uAE30" k__BackingField: 1 k__BackingField: 1 @@ -45,7 +45,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10105 k__BackingField: "\uBC40\uACE0\uAE30" k__BackingField: 1 k__BackingField: 1 @@ -53,7 +53,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10106 k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4" k__BackingField: 1 k__BackingField: 1 @@ -61,7 +61,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10107 k__BackingField: "\uCF54\uBFD4\uC18C \uB2E4\uB9AC\uC0B4" k__BackingField: 1 k__BackingField: 1 @@ -69,7 +69,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10201 k__BackingField: "\uBC31\uC0C1\uC5B4" k__BackingField: 1 k__BackingField: 2 @@ -77,7 +77,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10202 k__BackingField: "\uB2C8\uBAA8" k__BackingField: 1 k__BackingField: 2 @@ -85,7 +85,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10203 k__BackingField: "\uD574\uD30C\uB9AC" k__BackingField: 1 k__BackingField: 2 @@ -93,7 +93,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10204 k__BackingField: "\uAC00\uC624\uB9AC" k__BackingField: 1 k__BackingField: 2 @@ -101,7 +101,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10205 k__BackingField: "\uC6B0\uB7ED" k__BackingField: 1 k__BackingField: 2 @@ -109,7 +109,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10301 k__BackingField: "\uB370\uC2A4\uB3C4\uC5B4\uC758 \uC54C" k__BackingField: 1 k__BackingField: 3 @@ -117,7 +117,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10302 k__BackingField: "\uACF5\uB8E1\uC54C" k__BackingField: 1 k__BackingField: 3 @@ -125,7 +125,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10401 k__BackingField: "\uBA54\uB860" k__BackingField: 1 k__BackingField: 4 @@ -133,7 +133,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10402 k__BackingField: "\uD1A0\uB9C8\uD1A0" k__BackingField: 1 k__BackingField: 4 @@ -141,7 +141,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10403 k__BackingField: "\uC0AC\uACFC" k__BackingField: 1 k__BackingField: 4 @@ -149,7 +149,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10404 k__BackingField: "\uB808\uBAAC" k__BackingField: 1 k__BackingField: 4 @@ -157,7 +157,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10405 k__BackingField: "\uD1A0\uB9C8\uD1A0" k__BackingField: 1 k__BackingField: 4 @@ -165,7 +165,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10501 k__BackingField: "\uB9C8\uB298" k__BackingField: 1 k__BackingField: 5 @@ -173,7 +173,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10502 k__BackingField: "\uC591\uD30C" k__BackingField: 1 k__BackingField: 5 @@ -181,7 +181,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10503 k__BackingField: "\uB300\uD30C" k__BackingField: 1 k__BackingField: 5 @@ -189,7 +189,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10504 k__BackingField: "\uD30C\uC2AC\uB9AC" k__BackingField: 1 k__BackingField: 5 @@ -197,7 +197,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10505 k__BackingField: "\uB2E4\uC2DC\uB9C8" k__BackingField: 1 k__BackingField: 5 @@ -205,7 +205,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10506 k__BackingField: "\uD30C\uD504\uB9AC\uCE74" k__BackingField: 1 k__BackingField: 5 @@ -213,7 +213,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10507 k__BackingField: "\uBC30\uCD94" k__BackingField: 1 k__BackingField: 5 @@ -221,7 +221,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10508 k__BackingField: "\uBE0C\uB85C\uCF5C\uB9AC" k__BackingField: 1 k__BackingField: 5 @@ -229,7 +229,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10509 k__BackingField: "\uAE7B\uC78E" k__BackingField: 1 k__BackingField: 5 @@ -237,7 +237,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10601 k__BackingField: "\uC9C4\uC8FC \uC870\uAC1C" k__BackingField: 1 k__BackingField: 6 @@ -245,7 +245,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10602 k__BackingField: "\uBC14\uB2E4 \uC870\uAC1C" k__BackingField: 1 k__BackingField: 6 @@ -253,7 +253,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10603 k__BackingField: "\uAC70\uB300 \uC870\uAC1C" k__BackingField: 1 k__BackingField: 6 @@ -261,7 +261,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10701 k__BackingField: "\uC18C\uAE08" k__BackingField: 1 k__BackingField: 7 @@ -269,7 +269,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10702 k__BackingField: "\uACE0\uCDA7\uAC00\uB8E8" k__BackingField: 1 k__BackingField: 7 @@ -277,7 +277,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10703 k__BackingField: "\uD6C4\uCD94" k__BackingField: 1 k__BackingField: 7 @@ -285,7 +285,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10704 k__BackingField: "\uAC04\uC7A5" k__BackingField: 1 k__BackingField: 7 @@ -293,7 +293,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10705 k__BackingField: "\uBC84\uD130" k__BackingField: 1 k__BackingField: 7 @@ -301,7 +301,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 10706 k__BackingField: "\uC124\uD0D5" k__BackingField: 1 k__BackingField: 7 @@ -309,7 +309,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 20001 k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uB3D9)" k__BackingField: 2 k__BackingField: 0 @@ -317,7 +317,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 20002 k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uC740)" k__BackingField: 2 k__BackingField: 0 @@ -325,7 +325,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 20003 k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uAE08)" k__BackingField: 2 k__BackingField: 0 @@ -333,7 +333,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: - - k__BackingField: 0 + - k__BackingField: 20004 k__BackingField: "\uBBF8\uBBF9" k__BackingField: 2 k__BackingField: 0 @@ -341,3 +341,19 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: {fileID: 0} k__BackingField: + - k__BackingField: 30201 + k__BackingField: "\uCF54\uCF54\uB11B\uAC8C\uC0B4\uC2A4\uD29C" + k__BackingField: 3 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: 03de9c442181996409543cd79d5bfff3, type: 3} + k__BackingField: + - k__BackingField: 40001 + k__BackingField: "\uB9E5\uC8FC" + k__BackingField: 4 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 1484297983, guid: 392baff6d0b9a054fb64806241db3101, type: 3} + k__BackingField: diff --git a/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs b/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs index cbe8befd0..353115294 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs @@ -16,9 +16,6 @@ namespace BlueWater.Uis [field: SerializeField] public Canvas MainCanvas { get; private set; } - [field: SerializeField] - public Canvas WorldSpaceCanvas { get; private set; } - [field: SerializeField] public CombatSkillUi CombatSkillUi { get; private set; } @@ -86,7 +83,6 @@ namespace BlueWater.Uis private void InitializeComponents() { MainCanvas = GetComponent(); - WorldSpaceCanvas = GameObject.Find("WorldSpaceCanvas").GetComponent(); CombatSkillUi = MainCanvas.transform.Find("CombatSkillUi").GetComponent(); FieldBossHealthPointUi = MainCanvas.transform.Find("FieldBossHealthPointUi").GetComponent(); PlayerHealthPointUi = MainCanvas.transform.Find("PlayerHealthPointUi").GetComponent(); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs index 6a432aa5d..de9929791 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs @@ -8,6 +8,10 @@ namespace BlueWater.Uis { // Variables #region Variables + + [field: SerializeField] + public Canvas MainCanvas { get; private set; } + [field: SerializeField] public RestaurantUpgradeUi RestaurantUpgradeUi { get; private set; } @@ -44,6 +48,7 @@ namespace BlueWater.Uis [Button("셋팅 초기화")] private void InitializeComponents() { + MainCanvas = GetComponent(); RestaurantUpgradeUi = GetComponentInChildren(true); PopupUiList = new List(8); diff --git a/Assets/02.Scripts/Utility/Utils.cs b/Assets/02.Scripts/Utility/Utils.cs index 775436a30..1bba38da0 100644 --- a/Assets/02.Scripts/Utility/Utils.cs +++ b/Assets/02.Scripts/Utility/Utils.cs @@ -1,5 +1,6 @@ using System; using System.Collections; +using System.Collections.Generic; using UnityEngine; namespace BlueWater.Utility @@ -31,5 +32,27 @@ namespace BlueWater.Utility coroutineField = null; } } + + public static void RegisterList(List list, T item) + { + if (list.Contains(item)) + { + Debug.LogError($"{item}은 이미 {list}안에 등록되어 있습니다."); + return; + } + + list.Add(item); + } + + public static void UnregisterList(List list, T item) + { + if (!list.Contains(item)) + { + Debug.LogError($"{item}은 {list}안에 없습니다."); + return; + } + + list.Remove(item); + } } } \ No newline at end of file diff --git a/Assets/03.Images/Items.meta b/Assets/03.Images/Items.meta new file mode 100644 index 000000000..5f53ef0bb --- /dev/null +++ b/Assets/03.Images/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87dc2573a1fd0a34cb6cea6234f7105e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods.meta b/Assets/03.Images/Items/Foods.meta new file mode 100644 index 000000000..9c6182a9b --- /dev/null +++ b/Assets/03.Images/Items/Foods.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fd21596e78fada479c8f3a0d2d9d185 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/CoconutCrapStew.png b/Assets/03.Images/Items/Foods/CoconutCrapStew.png new file mode 100644 index 000000000..2f4fc4be6 Binary files /dev/null and b/Assets/03.Images/Items/Foods/CoconutCrapStew.png differ diff --git a/Assets/03.Images/Items/Foods/CoconutCrapStew.png.meta b/Assets/03.Images/Items/Foods/CoconutCrapStew.png.meta new file mode 100644 index 000000000..dd1858751 --- /dev/null +++ b/Assets/03.Images/Items/Foods/CoconutCrapStew.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 03de9c442181996409543cd79d5bfff3 +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: 2408 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Furniture/Table01.png.meta b/Assets/03.Images/Props/Furniture/Table01.png.meta index 1b701d1c9..21ab60867 100644 --- a/Assets/03.Images/Props/Furniture/Table01.png.meta +++ b/Assets/03.Images/Props/Furniture/Table01.png.meta @@ -46,8 +46,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.15} spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -127,7 +127,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/03.Images/Ui/TalkBubble.png b/Assets/03.Images/Ui/TalkBubble.png new file mode 100644 index 000000000..641bc3c05 Binary files /dev/null and b/Assets/03.Images/Ui/TalkBubble.png differ diff --git a/Assets/03.Images/Ui/TalkBubble.png.meta b/Assets/03.Images/Ui/TalkBubble.png.meta new file mode 100644 index 000000000..6e348bf43 --- /dev/null +++ b/Assets/03.Images/Ui/TalkBubble.png.meta @@ -0,0 +1,233 @@ +fileFormatVersion: 2 +guid: 006ddfea49149f948a7f39950227d31d +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: 2 + 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: + - serializedVersion: 2 + name: TalkBubble_0 + rect: + serializedVersion: 2 + x: 0 + y: 512 + width: 512 + height: 512 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7bbcf914c39c2dc4e96da90edf5f3343 + internalID: 458048236 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: TalkBubble_1 + rect: + serializedVersion: 2 + x: 512 + y: 512 + width: 512 + height: 512 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fcb10e5e067c662479a5b13a4dbe898a + internalID: 81306884 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: TalkBubble_2 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 512 + height: 512 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bb342b4551c8c84429f22bcef407f98c + internalID: -1245914369 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: TalkBubble_3 + rect: + serializedVersion: 2 + x: 512 + y: 0 + width: 512 + height: 512 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7280cf7ad507a9e4e8ad6cfe76b4e8f3 + internalID: -473816185 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 260e119b21a8b8e4a9ea4ccc3eca2a0e + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + TalkBubble_0: 458048236 + TalkBubble_1: 81306884 + TalkBubble_2: -1245914369 + TalkBubble_3: -473816185 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab index b097c05b7..7d19e2db3 100644 --- a/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab @@ -414,7 +414,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} m_Name: m_EditorClassIdentifier: - _animator: {fileID: 0} + _animator: {fileID: 310644174614533744} --- !u!114 &6865346796134993564 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/MiniSandMole.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/MiniSandMole.prefab index 2f5f6bb58..333b02884 100644 --- a/Assets/05.Prefabs/Characters/Enemies/Bosses/MiniSandMole.prefab +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/MiniSandMole.prefab @@ -169,7 +169,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} m_Name: m_EditorClassIdentifier: - _animator: {fileID: 0} + _animator: {fileID: 3828261860699135666} --- !u!114 &7340811205062043670 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Characters/Npcs.meta b/Assets/05.Prefabs/Characters/Npcs.meta new file mode 100644 index 000000000..95a0bc0df --- /dev/null +++ b/Assets/05.Prefabs/Characters/Npcs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bf3598c5f4025f40bf9bcc9b7b5467f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab new file mode 100644 index 000000000..ad9abd732 --- /dev/null +++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab @@ -0,0 +1,403 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &813964778509222274 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3748026497419659573} + - component: {fileID: 479823629690914954} + - component: {fileID: 2588384133887034894} + - component: {fileID: 2961986041977982893} + m_Layer: 9 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3748026497419659573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + 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: 2397117528733804567} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &479823629690914954 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Mesh: {fileID: 0} +--- !u!23 &2588384133887034894 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c5ff73efdfe597a488e245216fd5d707, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &2961986041977982893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: ad9bc316ced5375449444c992ee73cee, type: 2} + initialSkinName: 02 + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: idle + loop: 1 + timeScale: 1 +--- !u!1 &7260635347182713621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2397117528733804567} + - component: {fileID: 5913499722605887790} + - component: {fileID: 3035760932289101816} + - component: {fileID: 944025264553094021} + - component: {fileID: 6606567362296327409} + - component: {fileID: 957405049979454141} + - component: {fileID: 2615952973387112450} + - component: {fileID: 5279376384905517670} + - component: {fileID: 17978457728262906} + - component: {fileID: -2302002259734456648} + m_Layer: 9 + m_Name: Customer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2397117528733804567 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 3748026497419659573} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &5913499722605887790 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!136 &3035760932289101816 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.25 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0.5, z: 0} +--- !u!114 &944025264553094021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 373b52eb9bf8c40f785bb6947a1aee66, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + drawGizmos: 1 + detailedGizmos: 0 + startEndModifier: + addPoints: 0 + exactStartPoint: 3 + exactEndPoint: 3 + useRaycasting: 0 + mask: + serializedVersion: 2 + m_Bits: 4294967295 + useGraphRaycasting: 0 + traversableTags: -1 + tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + graphMask: + value: 1 +--- !u!114 &6606567362296327409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + radius: 0.25 + height: 1 + canMove: 1 + maxSpeed: 3 + gravity: {x: NaN, y: NaN, z: NaN} + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + endReachedDistance: 0.1 + whenCloseToDestination: 0 + rvoDensityBehavior: + enabled: 1 + densityThreshold: 0.5 + returnAfterBeingPushedAway: 0 + progressAverage: 0 + lastJobDensityResult: 0 + centerOffsetCompatibility: NaN + repathRateCompatibility: NaN + canSearchCompability: 0 + orientation: 0 + enableRotation: 0 + autoRepath: + mode: 2 + period: 0.5 + sensitivity: 10 + maximumPeriod: 2 + visualizeSensitivity: 0 + targetCompatibility: {fileID: 0} + maxAcceleration: -2.5 + rotationSpeed: 360 + slowdownDistance: 0.3 + pickNextWaypointDist: 0.5 + alwaysDrawGizmos: 0 + slowWhenNotFacingTarget: 1 + preventMovingBackwards: 0 + constrainInsideGraph: 0 +--- !u!114 &957405049979454141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 77f586f285b3847808d79083bd19ef1f, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + quality: 0 + splitAtEveryPortal: 0 + accountForGridPenalties: 0 +--- !u!114 &2615952973387112450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3} + m_Name: + m_EditorClassIdentifier: + startWhenEnabled: 0 + asynchronousLoad: 0 + pauseWhenDisabled: 0 + restartWhenComplete: 0 + logTaskChanges: 0 + group: 0 + resetValuesOnRestart: 0 + externalBehavior: {fileID: 11400000, guid: c50cf2007f7d1f94387bc84bc9f7489a, type: 2} + mBehaviorSource: + behaviorName: Customer + behaviorDescription: + mTaskData: + types: [] + parentIndex: + startIndex: + variableStartIndex: + JSONSerialization: '{"EntryTask":{"Type":"BehaviorDesigner.Runtime.Tasks.EntryTask","NodeData":{"Offset":"(548.5,30)"},"ID":0,"Name":"Entry","Instant":true},"RootTask":{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-301.5,250)"},"ID":1,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None"},"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true,"GameObjectmValue":0}]}' + fieldSerializationData: + typeName: [] + fieldNameHash: + startIndex: + dataPosition: + unityObjects: + - {fileID: 7260635347182713621} + byteData: + byteDataArray: + Version: 1.7.9 + gizmoViewMode: 2 + showBehaviorDesignerGizmo: 0 +--- !u!114 &5279376384905517670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: + _skeletonAnimation: {fileID: 2961986041977982893} + _initialSkinName: 02 +--- !u!114 &17978457728262906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75b48aa4b99043cb9e665a892ec46c75, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-2302002259734456648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed3a2b9a6425d147bc79e8a53a4fea1, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 5913499722605887790} + k__BackingField: {fileID: 3035760932289101816} + k__BackingField: {fileID: 2615952973387112450} + k__BackingField: {fileID: 3748026497419659573} + k__BackingField: {fileID: 2588384133887034894} + k__BackingField: {fileID: 5279376384905517670} + k__BackingField: {fileID: 17978457728262906} + k__BackingField: {fileID: 0} diff --git a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab.meta b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab.meta new file mode 100644 index 000000000..516614ccd --- /dev/null +++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 23195e611c71ad44b8a1ccb2b6e0efe5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab new file mode 100644 index 000000000..16f53c8bd --- /dev/null +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -0,0 +1,469 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &569530817952539991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6509241874729291456} + - component: {fileID: 6379312009059766371} + - component: {fileID: 5910700114136101566} + - component: {fileID: 7125556968546628472} + m_Layer: 9 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6509241874729291456 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569530817952539991} + 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: 2798544366308408093} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6379312009059766371 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569530817952539991} + m_Mesh: {fileID: 0} +--- !u!23 &5910700114136101566 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569530817952539991} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c5ff73efdfe597a488e245216fd5d707, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &7125556968546628472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569530817952539991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: ad9bc316ced5375449444c992ee73cee, type: 2} + initialSkinName: 01 + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: idle + loop: 1 + timeScale: 1 +--- !u!1 &2768568390039878737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2798544366308408093} + - component: {fileID: 6925146187533612706} + - component: {fileID: 2935942385829016914} + - component: {fileID: 6054159730444663926} + - component: {fileID: 1063431021331126030} + - component: {fileID: 6662554121718997272} + - component: {fileID: 1674052485383758547} + - component: {fileID: 4836489897218844789} + m_Layer: 9 + m_Name: TycoonPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2798544366308408093 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2768568390039878737} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2, y: 0, z: -1.439} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 6509241874729291456} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &6925146187533612706 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2768568390039878737} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!136 &2935942385829016914 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2768568390039878737} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.25 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0.5, z: 0} +--- !u!114 &6054159730444663926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2768568390039878737} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1674052485383758547} + m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp + m_MethodName: OnMove + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 52dbe09f-4e34-4a14-a772-54f5d5d97787 + m_ActionName: 'Tycoon/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1674052485383758547} + m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp + m_MethodName: OnInteraction + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 31e27536-38f7-4c48-ad94-663c23a8c2a8 + m_ActionName: 'Tycoon/Interaction[/Keyboard/e]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 58dbe258-7d9d-4d57-a59d-9165662f3d4b + m_ActionName: 'Combat/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 472e0ca2-cdfb-496f-bf8c-c25a4b0a6c8b + m_ActionName: 'Combat/Attack[/Mouse/leftButton,/Keyboard/k]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: aaf44bb4-bce6-4abe-bb2a-ec5f15b43c8f + m_ActionName: 'Combat/Dash[/Keyboard/space]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: ebdb638c-8057-4b32-8cb5-b4e5039b4969 + m_ActionName: 'Combat/ActivateMainSkill[/Mouse/rightButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: d7467711-57a8-4a31-a2ba-d14040cff3e7 + m_ActionName: 'Combat/OpenMenu[/Keyboard/escape]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 65cfde9b-38e6-4d35-b2a6-f48dbbeeead6 + m_ActionName: 'Combat/OpenItemInventory[/Keyboard/i]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 494568c8-7762-428e-8e8c-1920adfcc29a + m_ActionName: 'CombatUi/Cancel[/Keyboard/escape]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 5df8fd65-01b8-4cfe-b110-5ff2cfdd437f + m_ActionName: 'CombatUi/InteractionUi[/Keyboard/e]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 04886026-3576-4662-8c73-dab606c598ed + m_ActionName: 'CombatUi/CloseItemInventory[/Keyboard/i]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1674052485383758547} + m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp + m_MethodName: OnOpenRestaurantUpgrade + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: a0f02877-2c29-4c32-8898-f0074336c625 + m_ActionName: 'Tycoon/RestaurantUpgrade[/Keyboard/b]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1674052485383758547} + m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp + m_MethodName: OnCloseRestaurantUpgrade + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 013e4058-f4a2-46fc-b3f7-a7f94a4d4644 + m_ActionName: 'TycoonUi/CloseRestaurantUpgrade[/Keyboard/b]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1674052485383758547} + m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp + m_MethodName: OnCancel + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 43781cf6-335d-402e-957c-7a27f3e627b6 + m_ActionName: 'TycoonUi/Cancel[/Keyboard/escape]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 70079543-a5e9-4137-85af-1ad206da8794 + m_ActionName: 'CombatTitle/MoveScene[/Keyboard/anyKey,/Mouse/leftButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 66824a18-0819-44a4-92c2-6395511e3d0d + m_ActionName: 'UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 93ed1c14-2900-4d30-91fb-a9f2353a9540 + m_ActionName: 'UI/Submit[/Keyboard/enter]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 3c7c74ba-0c86-4e21-ab91-2b1e674cf243 + m_ActionName: 'UI/Cancel[/Keyboard/escape]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 52083aa7-62f5-41d7-b37e-4db100ef2cda + m_ActionName: 'UI/Point[/Mouse/position]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 42e6067b-0d00-4787-92d8-ddf60510de83 + m_ActionName: 'UI/Click[/Mouse/leftButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 30ef3965-cc51-452e-8df9-6a3567a53f4d + m_ActionName: 'UI/ScrollWheel[/Mouse/scroll]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: b99f7e4b-30f0-4936-9e55-c383951d6f58 + m_ActionName: 'UI/MiddleClick[/Mouse/middleButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 4849bf4c-7b3b-43c4-8bbf-7178f536fb94 + m_ActionName: 'UI/RightClick[/Mouse/rightButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 49ed4722-bfe5-47b7-b724-008d9ca57edc + m_ActionName: UI/TrackedDevicePosition + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7f4f45c6-67b1-47bf-9a74-fea6f6b5fde1 + m_ActionName: UI/TrackedDeviceOrientation + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Tycoon + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &1063431021331126030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2768568390039878737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe62039701799b0468ff96958a2912a6, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 6925146187533612706} + k__BackingField: {fileID: 2935942385829016914} + k__BackingField: {fileID: 6054159730444663926} + k__BackingField: {fileID: 6509241874729291456} + k__BackingField: {fileID: 7125556968546628472} + k__BackingField: {fileID: 1674052485383758547} + k__BackingField: {fileID: 4836489897218844789} +--- !u!114 &6662554121718997272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2768568390039878737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: + _skeletonAnimation: {fileID: 7125556968546628472} + _initialSkinName: 01 +--- !u!114 &1674052485383758547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2768568390039878737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bc02c60fe9bf724885e9f5713f900ee, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4836489897218844789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2768568390039878737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb167e66df896c745a538310e5a52f61, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 7 diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab.meta b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab.meta new file mode 100644 index 000000000..d989aa25d --- /dev/null +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9ce588004bafc1e4e9617fdaa2d77c8d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/CustomerTable01.prefab b/Assets/05.Prefabs/Props/Furniture/CustomerTable01.prefab new file mode 100644 index 000000000..88faed7b1 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable01.prefab @@ -0,0 +1,499 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1588431825011835429 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5161556643231822994} + m_Layer: 8 + m_Name: TableSeats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5161556643231822994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588431825011835429} + 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: + - {fileID: 72918880234409943} + - {fileID: 6987995983662494743} + m_Father: {fileID: 1871400395928592747} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3340968160590317205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8314409288261864133} + m_Layer: 8 + m_Name: Seat02 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8314409288261864133 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3340968160590317205} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6987995983662494743} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3430995138614654016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6567810361177397306} + - component: {fileID: 1936537098954677604} + m_Layer: 8 + m_Name: Food01 + m_TagString: Untagged + m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6567810361177397306 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3430995138614654016} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.22, y: 0.5, z: -0.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 72918880234409943} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1936537098954677604 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3430995138614654016} + 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: 5 + m_Sprite: {fileID: 0} + 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: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4112995265026884530 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4988586968480553054} + m_Layer: 8 + m_Name: Seat01 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4988586968480553054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4112995265026884530} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 72918880234409943} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7259785794916276111 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 72918880234409943} + m_Layer: 8 + m_Name: TableSeat01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &72918880234409943 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7259785794916276111} + 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: + - {fileID: 4988586968480553054} + - {fileID: 6567810361177397306} + m_Father: {fileID: 5161556643231822994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8221302613581290258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6322245974481813927} + - component: {fileID: 231587957349564794} + m_Layer: 8 + m_Name: Food02 + m_TagString: Untagged + m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6322245974481813927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8221302613581290258} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.22, y: 0.5, z: -0.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6987995983662494743} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &231587957349564794 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8221302613581290258} + 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: 5 + m_Sprite: {fileID: 0} + 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: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8821924279338320136 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6987995983662494743} + m_Layer: 8 + m_Name: TableSeat02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6987995983662494743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8821924279338320136} + 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: + - {fileID: 8314409288261864133} + - {fileID: 6322245974481813927} + m_Father: {fileID: 5161556643231822994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8587436911065349023 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Size.x + value: 10.24 + objectReference: {fileID: 0} + - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Size.y + value: 10.24 + objectReference: {fileID: 0} + - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} + - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_SortingOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} + - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Name + value: CustomerTable01 + objectReference: {fileID: 0} + - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Size.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Size.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Size.z + value: 0.51575303 + objectReference: {fileID: 0} + - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Center.y + value: 0.35 + objectReference: {fileID: 0} + - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Center.z + value: 0.15787654 + objectReference: {fileID: 0} + - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + insertIndex: -1 + addedObject: {fileID: 5161556643231822994} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + insertIndex: -1 + addedObject: {fileID: 8002493057690629947} + m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} +--- !u!4 &1871400395928592747 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + m_PrefabInstance: {fileID: 8587436911065349023} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4833254060163934334 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + m_PrefabInstance: {fileID: 8587436911065349023} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8002493057690629947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4833254060163934334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 353433a78f14e1b42bef6e12dd1f5700, type: 3} + m_Name: + m_EditorClassIdentifier: + _tableSeats: + - k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: {fileID: 4988586968480553054} + k__BackingField: {fileID: 1936537098954677604} + TableDirection: {x: 1, y: 0, z: 0} + - k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: {fileID: 8314409288261864133} + k__BackingField: {fileID: 231587957349564794} + TableDirection: {x: -1, y: 0, z: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Table 1.prefab.meta b/Assets/05.Prefabs/Props/Furniture/CustomerTable01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Table 1.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/CustomerTable01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Table 1.prefab b/Assets/05.Prefabs/Props/Furniture/Table 1.prefab deleted file mode 100644 index 1b579a431..000000000 --- a/Assets/05.Prefabs/Props/Furniture/Table 1.prefab +++ /dev/null @@ -1,107 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &8587436911065349023 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.x - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_SortingOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Name - value: Table 1 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 0.70173335 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.z - value: 0.51575303 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.y - value: 0.01670909 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.z - value: 0.15787654 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_IsTrigger - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} diff --git a/Assets/05.Prefabs/Uis/FoodBalloonUi.prefab b/Assets/05.Prefabs/Uis/FoodBalloonUi.prefab new file mode 100644 index 000000000..56aacd267 --- /dev/null +++ b/Assets/05.Prefabs/Uis/FoodBalloonUi.prefab @@ -0,0 +1,287 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &271498015662217203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2641341650102689817} + - component: {fileID: 2829248495233098512} + m_Layer: 5 + m_Name: FoodBalloonUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2641341650102689817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 271498015662217203} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1610583026884195458} + - {fileID: 6400894162898819538} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2829248495233098512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 271498015662217203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 2173167918881327799} + k__BackingField: {fileID: 8218406547424483500} + _customer: {fileID: 0} + _offset: {x: -0.2, y: 1.5, z: 0} + _defaultWaitTime: 5 + _customerWaitTime: 0 + _isOrdered: 0 + _isWaitTimeOver: 0 + _isFoodReceived: 0 +--- !u!1 &2909533541407981610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1610583026884195458} + - component: {fileID: 7139087245191076382} + - component: {fileID: 4586681201290156434} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1610583026884195458 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2909533541407981610} + 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: 6751494179874491372} + m_Father: {fileID: 2641341650102689817} + 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!222 &7139087245191076382 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2909533541407981610} + m_CullTransparentMesh: 1 +--- !u!114 &4586681201290156434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2909533541407981610} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -473816185, guid: 006ddfea49149f948a7f39950227d31d, type: 3} + 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!1 &3361235759547244541 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6400894162898819538} + - component: {fileID: 7693093380867172793} + - component: {fileID: 8218406547424483500} + m_Layer: 5 + m_Name: FoodImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6400894162898819538 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3361235759547244541} + 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: 2641341650102689817} + 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: 6} + m_SizeDelta: {x: -60, y: -60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7693093380867172793 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3361235759547244541} + m_CullTransparentMesh: 1 +--- !u!114 &8218406547424483500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3361235759547244541} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + 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!1 &7379103909061988499 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6751494179874491372} + - component: {fileID: 6775969391593346456} + - component: {fileID: 2173167918881327799} + m_Layer: 5 + m_Name: FillImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6751494179874491372 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7379103909061988499} + 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: 1610583026884195458} + 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!222 &6775969391593346456 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7379103909061988499} + m_CullTransparentMesh: 1 +--- !u!114 &2173167918881327799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7379103909061988499} + 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.854902, g: 0.427451, b: 0.4156863, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -473816185, guid: 006ddfea49149f948a7f39950227d31d, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/05.Prefabs/Uis/FoodBalloonUi.prefab.meta b/Assets/05.Prefabs/Uis/FoodBalloonUi.prefab.meta new file mode 100644 index 000000000..d2645361f --- /dev/null +++ b/Assets/05.Prefabs/Uis/FoodBalloonUi.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bb0dfd08f3e9d944f808e61d886581e7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/11.BehaviorTree/Customer.asset b/Assets/11.BehaviorTree/Customer.asset index 7db9782b0..cecc72ef1 100644 --- a/Assets/11.BehaviorTree/Customer.asset +++ b/Assets/11.BehaviorTree/Customer.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Customer m_EditorClassIdentifier: mBehaviorSource: - behaviorName: Behavior + behaviorName: Customer behaviorDescription: mTaskData: types: [] @@ -21,10 +21,18 @@ MonoBehaviour: startIndex: variableStartIndex: JSONSerialization: '{"EntryTask":{"Type":"BehaviorDesigner.Runtime.Tasks.EntryTask","NodeData":{"Offset":"(548.5,0)"},"ID":0,"Name":"Entry","Instant":true},"RootTask":{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-2.878418,152.4463)","Comment":"\uc190\ub2d8\uc758 - \ud55c \uc2f8\uc774\ud074"},"ID":1,"Name":"Customer Cycle","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-436.8421,145.263184)","Comment":"\uc790\ub9ac\ub97c - \ucc3e\ub294\ub2e4"},"ID":2,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-136.8421,145.263184)","Comment":"\uc74c\ub8cc\ub97c - \uc8fc\ubb38\ud55c\ub2e4"},"ID":3,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(160,150)","Comment":"\uc74c\uc2dd\uc744 - \uc8fc\ubb38\ud55c\ub2e4"},"ID":4,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(450,150)","Comment":"\uacc4\uc0b0\ud55c\ub2e4"},"ID":5,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(700,150)","Comment":"\ud1f4\uc7a5\ud55c\ub2e4"},"ID":6,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None"}]}}' + \ud55c \uc2f8\uc774\ud074"},"ID":1,"Name":"Customer Cycle","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-712.8185,150)","Comment":"\uc790\ub9ac\ub97c + \ucc3e\ub294\ub2e4"},"ID":2,"Name":"Find Empty Table Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.FindTable","NodeData":{"Offset":"(-237.57135,147)","Comment":"\ube48\uc790\ub9ac\ub97c + \ucc3e\uc744 \ub54c\uae4c\uc9c0 \ub300\uae30"},"ID":3,"Name":"Find Table","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.HasReachedDestination","NodeData":{"Offset":"(4.428632,152)","Comment":"\ub3c4\ucc29\ud560 + \ub54c\uae4c\uc9c0 \ub300\uae30"},"ID":4,"Name":"Has Reached Destination","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.SetTableSeatPositionAndDirection","NodeData":{"Offset":"(250,150)","Comment":"\ud14c\uc774\ube14 + \uc88c\uc11d\uc5d0 \uc704\uce58\ud558\uace0, \ud14c\uc774\ube14\uc744 \ubc14\ub77c\ubd04"},"ID":5,"Name":"Set + Table Seat Position And Direction","Instant":true}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-140,150)","Comment":"\uc74c\ub8cc\ub97c + \uc8fc\ubb38\ud55c\ub2e4"},"ID":6,"Name":"Order Drink Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-1.223877,154.022858)"},"ID":7,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-127.381042,151.88)"},"ID":8,"Name":"Order + Success Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OrderFood","NodeData":{"Offset":"(-105.555573,145.555237)","Comment":"\uc74c\ub8cc\ub97c + \uc8fc\ubb38\ud558\uace0 \uae30\ub2e4\ub9b0\ub2e4"},"ID":9,"Name":"Order + Food","Instant":true}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(166.6665,147.777832)"},"ID":10,"Name":"Order + Failure Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(-120.441589,149.5423)"},"ID":11,"Name":"Move","Instant":true,"Booleank__BackingField":true,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,-19)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.UnityGameObject.Destroy","NodeData":{"Offset":"(116.929504,154.032043)"},"ID":12,"Name":"Destroy","Instant":true,"SharedGameObjecttargetGameObject":{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},"Singletime":0}]}]}]}]},"DetachedTasks":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1652.77856,300)","Comment":"\ud1f4\uc7a5\ud55c\ub2e4"},"ID":13,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1402.77844,300)","Comment":"\uacc4\uc0b0\ud55c\ub2e4"},"ID":14,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1112.77722,300)","Comment":"\uc74c\uc2dd\uc744 + \uc8fc\ubb38\ud55c\ub2e4"},"ID":15,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"}],"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true}]}' fieldSerializationData: typeName: [] fieldNameHash: diff --git a/Assets/11.BehaviorTree/MiniSandMole.asset b/Assets/11.BehaviorTree/MiniSandMole.asset index d5e4e87f1..cad39679f 100644 --- a/Assets/11.BehaviorTree/MiniSandMole.asset +++ b/Assets/11.BehaviorTree/MiniSandMole.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: MiniSandMole m_EditorClassIdentifier: mBehaviorSource: - behaviorName: SandMole + behaviorName: MiniSandMole behaviorDescription: mTaskData: types: [] @@ -28,7 +28,7 @@ MonoBehaviour: Behavior Tree","Instant":true,"SharedGameObjectbehaviorGameObject":{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},"SharedIntgroup":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolpauseBehavior":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1.07836533,154.29248)"},"ID":8,"Name":"Skill Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-0.5132599,154.740326)"},"ID":9,"Name":"Single Roll","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.ActivateSkill","NodeData":{"Offset":"(-155.2381,150)"},"ID":10,"Name":"Activate - Skill","Instant":true,"BossSkillName_bossSkillName":"SingleRoll"},{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.SelfStun","NodeData":{"Offset":"(4.942749,145.861938)"},"ID":11,"Name":"Self + Skill","Instant":true,"BossSkillName_bossSkillName":"SingleRoll"},{"Type":"BlueWater.BehaviorTrees.Actions.SelfStun","NodeData":{"Offset":"(0,150)"},"ID":11,"Name":"Self Stun","Instant":true,"Single_stunDuration":3},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(134.9425,145.861938)"},"ID":12,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]}]}]}]},"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":"CurrentHealthPoint","IsShared":true,"Int32mValue":0},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true}]}' fieldSerializationData: typeName: [] diff --git a/Assets/11.BehaviorTree/Rhinoceros.asset b/Assets/11.BehaviorTree/Rhinoceros.asset index 240153e27..350e414a7 100644 --- a/Assets/11.BehaviorTree/Rhinoceros.asset +++ b/Assets/11.BehaviorTree/Rhinoceros.asset @@ -21,8 +21,7 @@ MonoBehaviour: startIndex: variableStartIndex: JSONSerialization: '{"EntryTask":{"Type":"BehaviorDesigner.Runtime.Tasks.EntryTask","NodeData":{"Offset":"(707.6564,145.842773)"},"ID":0,"Name":"Entry","Instant":true},"RootTask":{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(3.069271,152.681244)"},"ID":1,"Name":"Start - Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-213.843628,152.842773)"},"ID":2,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.MoveTarget","NodeData":{"Offset":"(-60,150)"},"ID":3,"Name":"Move - Target","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(89.99982,145.294128)"},"ID":4,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BehaviorDesigner.Runtime.Tasks.Repeater","NodeData":{"Offset":"(242.734253,146.666718)"},"ID":5,"Name":"Repeater","Instant":true,"SharedIntcount":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolrepeatForever":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedBoolendOnFailure":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-3.44348145,154.9137)"},"ID":6,"Name":"Die + Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-213.843628,152.842773)"},"ID":2,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(-60,150)"},"ID":3,"Name":"Move","Instant":true,"Booleank__BackingField":false,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,0)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true}},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(89.99982,145.294128)"},"ID":4,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BehaviorDesigner.Runtime.Tasks.Repeater","NodeData":{"Offset":"(242.734253,146.666718)"},"ID":5,"Name":"Repeater","Instant":true,"SharedIntcount":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolrepeatForever":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedBoolendOnFailure":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-3.44348145,154.9137)"},"ID":6,"Name":"Die Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-547.465149,148.989136)"},"ID":7,"Name":"Die Sequence","Instant":true,"AbortTypeabortType":"LowerPriority","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedInt","NodeData":{"Offset":"(-104.999634,149.904846)","Comment":"CurrentHealthPoint == 0"},"ID":8,"Name":"Compare Shared Int","Instant":true,"SharedIntvariable":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":"CurrentHealthPoint","IsShared":true,"Int32mValue":0},"SharedIntcompareTo":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0}},{"Type":"BehaviorDesigner.Runtime.Tasks.StopBehaviorTree","NodeData":{"Offset":"(93.47067,153.019165)"},"ID":9,"Name":"Stop @@ -41,14 +40,13 @@ MonoBehaviour: Skill","Instant":true,"BossSkillName_bossSkillName":"SeismicThrust"},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(138.695557,145.216064)"},"ID":24,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(100,150)"},"ID":25,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1.4637413,149.411728)"},"ID":26,"Name":"Meteor Swing","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Conditionals.CanSkill","NodeData":{"Offset":"(-210,150)"},"ID":27,"Name":"Can Skill","Instant":true,"BossSkillName_bossSkillName":"MeteorSwing"},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-64.02417,148.139359)"},"ID":28,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-104.997131,153.633057)"},"ID":29,"Name":"Move - Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.Move","NodeData":{"Offset":"(-102.194824,145.121338)"},"ID":30,"Name":"Move","Instant":true,"BooleanUseMovePosition":false,"SharedVector3MovePosition":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,0)"},"SharedColliderTarget":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true}},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(102.927307,153.901367)"},"ID":31,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BlueWater.BehaviorTrees.Actions.ReturnSuccess","NodeData":{"Offset":"(110,150)"},"ID":32,"Name":"Return + Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(-100,150)"},"ID":30,"Name":"Move","Instant":true,"Booleank__BackingField":false,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,0)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true}},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(102.927307,153.901367)"},"ID":31,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BlueWater.BehaviorTrees.Actions.ReturnSuccess","NodeData":{"Offset":"(110,150)"},"ID":32,"Name":"Return Success","Instant":true}]},{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.ActivateSkill","NodeData":{"Offset":"(87.43816,150)"},"ID":33,"Name":"Activate Skill","Instant":true,"BossSkillName_bossSkillName":"MeteorSwing"},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(244.149719,151.666656)"},"ID":34,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(728.971252,147.857132)"},"ID":35,"Name":"Sky Fall Smash","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Conditionals.CanSkill","NodeData":{"Offset":"(-170,150)"},"ID":36,"Name":"Can Skill","Instant":true,"BossSkillName_bossSkillName":"SkyFallSmash"},{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.ActivateSkill","NodeData":{"Offset":"(0,150)"},"ID":37,"Name":"Activate Skill","Instant":true,"BossSkillName_bossSkillName":"SkyFallSmash"},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(180,148.387054)"},"ID":38,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1291.7854,152.801758)"},"ID":39,"Name":"Move - Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.MoveTarget","NodeData":{"Offset":"(-90,150)"},"ID":40,"Name":"Move - Target","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(112.150757,148.38623)"},"ID":41,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]}]}]}]}]}]},"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":"CurrentHealthPoint","IsShared":true,"Int32mValue":0},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true}]}' + Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(-90,150)"},"ID":40,"Name":"Move","Instant":true,"Booleank__BackingField":false,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,0)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true}},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(112.150757,148.38623)"},"ID":41,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]}]}]}]}]}]},"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":"CurrentHealthPoint","IsShared":true,"Int32mValue":0},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true}]}' fieldSerializationData: typeName: [] fieldNameHash: diff --git a/Assets/11.BehaviorTree/SandMole.asset b/Assets/11.BehaviorTree/SandMole.asset index ec81a0d3c..581ad7ede 100644 --- a/Assets/11.BehaviorTree/SandMole.asset +++ b/Assets/11.BehaviorTree/SandMole.asset @@ -38,7 +38,7 @@ MonoBehaviour: Roll","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.ActivateSkill","NodeData":{"Offset":"(-383.3333,150)"},"ID":21,"Name":"Activate Skill","Instant":true,"BossSkillName_bossSkillName":"SingleRoll"},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-233.333313,150)"},"ID":22,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":0.5},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.ActivateSkill","NodeData":{"Offset":"(-84.2857,148.095215)"},"ID":23,"Name":"Activate Skill","Instant":true,"BossSkillName_bossSkillName":"SingleRoll"},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(65.71442,148.095215)"},"ID":24,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":0.5},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.ActivateSkill","NodeData":{"Offset":"(222.6831,147.804932)"},"ID":25,"Name":"Activate - Skill","Instant":true,"BossSkillName_bossSkillName":"SingleRoll"},{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.SelfStun","NodeData":{"Offset":"(370,150)"},"ID":26,"Name":"Self + Skill","Instant":true,"BossSkillName_bossSkillName":"SingleRoll"},{"Type":"BlueWater.BehaviorTrees.Actions.SelfStun","NodeData":{"Offset":"(370,150)"},"ID":26,"Name":"Self Stun","Instant":true,"Single_stunDuration":4},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(496.964966,145.486084)"},"ID":27,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-532.630249,202.105347)"},"ID":28,"Name":"Gate Of Spikes","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.ActivateSkill","NodeData":{"Offset":"(-70,150)"},"ID":29,"Name":"Activate Skill","Instant":true,"BossSkillName_bossSkillName":"GateOfSpikes"},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(80,150)"},"ID":30,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-232.630539,202.105347)"},"ID":31,"Name":"Multi @@ -48,7 +48,7 @@ MonoBehaviour: Skill","Instant":true,"BossSkillName_bossSkillName":"SingleRoll"},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(70,150)"},"ID":36,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":3},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(281.537964,160)"},"ID":37,"Name":"Case2 Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(3.58260536,189.3617)"},"ID":38,"Name":"Spike Barrage","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.ActivateSkill","NodeData":{"Offset":"(-117.619049,150)"},"ID":39,"Name":"Activate - Skill","Instant":true,"BossSkillName_bossSkillName":"SpikeBarrage"},{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.SelfStun","NodeData":{"Offset":"(2.2166748,148.095215)"},"ID":40,"Name":"Self + Skill","Instant":true,"BossSkillName_bossSkillName":"SpikeBarrage"},{"Type":"BlueWater.BehaviorTrees.Actions.SelfStun","NodeData":{"Offset":"(0,150)"},"ID":40,"Name":"Self Stun","Instant":true,"Single_stunDuration":4},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(115.714287,150)"},"ID":41,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(328.2801,192.40271)"},"ID":42,"Name":"Gate Of Spikes","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Enemies.Bosses.Actions.ActivateSkill","NodeData":{"Offset":"(-73.52939,150)"},"ID":43,"Name":"Activate Skill","Instant":true,"BossSkillName_bossSkillName":"GateOfSpikes"},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(76.47061,150)"},"ID":44,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(664.709656,192.40271)"},"ID":45,"Name":"Single diff --git a/Assets/Behavior Designer/Editor/Object Drawers/MoveDrawer.cs b/Assets/Behavior Designer/Editor/Object Drawers/MoveDrawer.cs index 895ca7796..4ab2c0390 100644 --- a/Assets/Behavior Designer/Editor/Object Drawers/MoveDrawer.cs +++ b/Assets/Behavior Designer/Editor/Object Drawers/MoveDrawer.cs @@ -1,7 +1,7 @@ using BehaviorDesigner.Runtime; +using BlueWater.BehaviorTrees.Actions; using UnityEngine; using UnityEditor; -using BlueWater.BehaviorTrees.Enemies.Bosses.Actions; namespace BehaviorDesigner.Editor.ObjectDrawers { diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset new file mode 100644 index 000000000..91f67d8a1 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 1726182683, guid: a4865f1ab4504ed8a368670db22f409c, type: 3} + m_Name: AOTGenerationConfig + m_EditorClassIdentifier: + automateBeforeBuilds: 0 + deleteDllAfterBuilds: 1 + AutomateForAllAOTPlatforms: 1 + automateForPlatforms: 0900000014000000 + lastScan: 0 + supportSerializedTypes: [] diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset.meta new file mode 100644 index 000000000..044512cae --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dae120ab8916868488759c99347f3fa5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset new file mode 100644 index 000000000..4393db143 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 772478971, guid: a4865f1ab4504ed8a368670db22f409c, type: 3} + m_Name: ColorPaletteManager + m_EditorClassIdentifier: + colorPalettes: + - name: Country + showAlpha: 0 + colors: + - {r: 0.776, g: 0.651, b: 0.349, a: 1} + - {r: 0.863, g: 0.761, b: 0.631, a: 1} + - {r: 0.91, g: 0.831, b: 0.686, a: 1} + - {r: 0.961, g: 0.902, b: 0.788, a: 1} + - {r: 0.753, g: 0.714, b: 0.667, a: 1} + - {r: 0.478, g: 0.573, b: 0.431, a: 1} + - {r: 0.314, g: 0.427, b: 0.31, a: 1} + - {r: 0.596, g: 0.345, b: 0.235, a: 1} + - {r: 0.545, g: 0.329, b: 0.318, a: 1} + - {r: 0.647, g: 0.204, b: 0.227, a: 1} + - {r: 0.435, g: 0.161, b: 0.063, a: 1} + - {r: 0.357, g: 0.333, b: 0.278, a: 1} + - {r: 0.976, g: 0.98, b: 0.961, a: 1} + - {r: 0.165, g: 0.271, b: 0.11, a: 1} + - name: Beach + showAlpha: 0 + colors: + - {r: 0.996, g: 0.906, b: 0.459, a: 1} + - {r: 0.314, g: 0.592, b: 0.035, a: 1} + - {r: 0.486, g: 0.953, b: 0.875, a: 1} + - {r: 0.996, g: 0.82, b: 0.212, a: 1} + - {r: 1, g: 0.769, b: 0.165, a: 1} + - {r: 0.804, g: 0.835, b: 0.753, a: 1} + - {r: 1, g: 0.769, b: 0.165, a: 1} + - {r: 1, g: 0.702, b: 0.063, a: 1} + - {r: 1, g: 0.898, b: 0.569, a: 1} + - name: Fall + showAlpha: 0 + colors: + - {r: 0.82, g: 0.722, b: 0.318, a: 1} + - {r: 0.537, g: 0.192, b: 0.153, a: 1} + - {r: 0.996, g: 0.812, b: 0.012, a: 1} + - {r: 1, g: 0.431, b: 0.02, a: 1} + - {r: 0.937, g: 0.267, b: 0.094, a: 1} + - {r: 0.42, g: 0.212, b: 0.18, a: 1} + - {r: 0.992, g: 0.651, b: 0.004, a: 1} + - {r: 0.89, g: 0.353, b: 0.086, a: 1} + - {r: 1, g: 0.443, b: 0.004, a: 1} + - {r: 0.682, g: 0.275, b: 0.137, a: 1} + - {r: 0.306, g: 0.231, b: 0.114, a: 1} + - {r: 0.384, g: 0.416, b: 0.082, a: 1} + - {r: 0.165, g: 0.157, b: 0.008, a: 1} + - {r: 0.906, g: 0.635, b: 0.227, a: 1} + - {r: 0.82, g: 0.722, b: 0.318, a: 1} + - {r: 0.745, g: 0.435, b: 0.031, a: 1} + - {r: 0.765, g: 0.682, b: 0.569, a: 1} + - {r: 0.18, g: 0.149, b: 0.075, a: 1} + - {r: 0.702, g: 0.451, b: 0.059, a: 1} + - name: Passion + showAlpha: 0 + colors: + - {r: 0.925, g: 0.682, b: 0.624, a: 1} + - {r: 0.188, g: 0.114, b: 0.224, a: 1} + - {r: 0.349, g: 0.11, b: 0.231, a: 1} + - {r: 0.435, g: 0.267, b: 0.357, a: 1} + - name: Sepia + showAlpha: 0 + colors: + - {r: 0.353, g: 0.098, b: 0.02, a: 1} + - {r: 0.663, g: 0.188, b: 0.114, a: 1} + - {r: 0.906, g: 0.643, b: 0.082, a: 1} + - {r: 0.996, g: 0.839, b: 0.322, a: 1} + - {r: 0.486, g: 0.392, b: 0.02, a: 1} + - {r: 0.294, g: 0.235, b: 0.012, a: 1} + - name: Floral + showAlpha: 0 + colors: + - {r: 0.855, g: 0.518, b: 0.412, a: 1} + - {r: 0.827, g: 0.294, b: 0.333, a: 1} + - {r: 0.737, g: 0.118, b: 0.208, a: 1} + - {r: 0.549, g: 0.149, b: 0.235, a: 1} + - {r: 0.949, g: 0.925, b: 0.784, a: 1} + - {r: 0.945, g: 0.882, b: 0.69, a: 1} + - {r: 0.871, g: 0.812, b: 0.698, a: 1} + - {r: 0.4, g: 0.196, b: 0.243, a: 1} + - {r: 0.271, g: 0.157, b: 0.227, a: 1} + - name: Underwater + showAlpha: 0 + colors: + - {r: 0.663, g: 0.416, b: 0.733, a: 1} + - {r: 0.2, g: 0.6, b: 0.698, a: 1} + - {r: 0.11, g: 0.49, b: 0.698, a: 1} + - {r: 0.439, g: 0.627, b: 0.227, a: 1} + - {r: 0, g: 0.357, b: 0.604, a: 1} + - {r: 0.067, g: 0.271, b: 0.353, a: 1} + - name: Breeze + showAlpha: 0 + colors: + - {r: 0.706, g: 1, b: 0, a: 1} + - {r: 0.651, g: 1, b: 0.404, a: 1} + - {r: 0.122, g: 1, b: 0.514, a: 1} + - {r: 0.216, g: 0.894, b: 0.961, a: 1} + - {r: 0.4, g: 1, b: 0.882, a: 1} + - {r: 0.027, g: 0.792, b: 0.8, a: 1} + - name: Clovers + showAlpha: 0 + colors: + - {r: 0.431, g: 0.549, b: 0.102, a: 1} + - {r: 0.671, g: 0.714, b: 0.071, a: 1} + - {r: 0.969, g: 0.949, b: 0.831, a: 1} + - {r: 0.886, g: 0.902, b: 0.702, a: 1} + - {r: 0.753, g: 0.824, b: 0.627, a: 1} + - {r: 0.404, g: 0.6, b: 0.4, a: 1} + - name: Tropical + showAlpha: 0 + colors: + - {r: 0.953, g: 0.647, b: 0.804, a: 1} + - {r: 0.965, g: 0.741, b: 0.871, a: 1} + - {r: 0.949, g: 0.549, b: 0.643, a: 1} + - {r: 0.992, g: 0.659, b: 0.498, a: 1} + - {r: 0.976, g: 0.792, b: 0.729, a: 1} + - {r: 0.984, g: 0.855, b: 0.725, a: 1} + - {r: 0.259, g: 0.882, b: 0.663, a: 1} + - {r: 0.349, g: 0.753, b: 0.78, a: 1} + - {r: 0.725, g: 0.976, b: 0.91, a: 1} + - {r: 0.647, g: 0.745, b: 0.957, a: 1} + - {r: 0.725, g: 0.863, b: 0.973, a: 1} + - {r: 0.89, g: 0.945, b: 0.996, a: 1} diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset.meta new file mode 100644 index 000000000..8f428dbbb --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69b5f9f24da837f4e85ee2005031925d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset new file mode 100644 index 000000000..338ffe3db --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 188390376, guid: a4865f1ab4504ed8a368670db22f409c, type: 3} + m_Name: ImportSettingsConfig + m_EditorClassIdentifier: + automateBeforeBuild: 1 diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset.meta new file mode 100644 index 000000000..091b81fac --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5326502ca62bf6d41b950edd7818c302 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources.meta new file mode 100644 index 000000000..ad5ed2278 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4f2ee608df8ffa540b659476f2abb8c0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix.meta new file mode 100644 index 000000000..d2235aa90 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edb3b072d45b7154fb874a86e3538d00 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset new file mode 100644 index 000000000..0e48b68bd --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 1549551891, guid: 74721b9f0af448f5ae2e91102a1a5edd, type: 3} + m_Name: GlobalSerializationConfig + m_EditorClassIdentifier: + HideSerializationCautionaryMessage: 0 + HidePrefabCautionaryMessage: 0 + HideOdinSerializeAttributeWarningMessages: 0 + HideNonSerializedShowInInspectorWarningMessages: 0 + buildSerializationFormat: 0 + editorSerializationFormat: 2 + loggingPolicy: 0 + errorHandlingPolicy: 0 diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta new file mode 100644 index 000000000..dce387768 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2d1ccfbef8449e4d81fd463069bfbf1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Excel/ItemTable.xlsx b/Assets/Resources/Excel/ItemTable.xlsx index ac8c67774..6d1e6d1f7 100644 Binary files a/Assets/Resources/Excel/ItemTable.xlsx and b/Assets/Resources/Excel/ItemTable.xlsx differ diff --git a/Assets/Resources/JSON/ItemDropTable.json b/Assets/Resources/JSON/ItemDropTable.json index 3684140de..c0ca8421a 100644 --- a/Assets/Resources/JSON/ItemDropTable.json +++ b/Assets/Resources/JSON/ItemDropTable.json @@ -17,7 +17,8 @@ "ItemIdx4": 0, "ItemProb4": 0, "ItemMin4": 0, - "ItemMax4": 0 + "ItemMax4": 0, + "Description": "" }, { "Idx": 1000002, @@ -37,7 +38,8 @@ "ItemIdx4": 0, "ItemProb4": 0, "ItemMin4": 0, - "ItemMax4": 0 + "ItemMax4": 0, + "Description": "" }, { "Idx": 1000003, @@ -57,7 +59,8 @@ "ItemIdx4": 0, "ItemProb4": 0, "ItemMin4": 0, - "ItemMax4": 0 + "ItemMax4": 0, + "Description": "" }, { "Idx": 2000001, @@ -77,7 +80,8 @@ "ItemIdx4": 0, "ItemProb4": 0, "ItemMin4": 0, - "ItemMax4": 0 + "ItemMax4": 0, + "Description": "" }, { "Idx": 2000002, @@ -97,7 +101,8 @@ "ItemIdx4": 0, "ItemProb4": 0, "ItemMin4": 0, - "ItemMax4": 0 + "ItemMax4": 0, + "Description": "" }, { "Idx": 3000001, @@ -117,6 +122,7 @@ "ItemIdx4": 20003, "ItemProb4": 10, "ItemMin4": 1, - "ItemMax4": 1 + "ItemMax4": 1, + "Description": "" } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/ItemTable.json b/Assets/Resources/JSON/ItemTable.json index 24c2f4d91..a6dfe5d81 100644 --- a/Assets/Resources/JSON/ItemTable.json +++ b/Assets/Resources/JSON/ItemTable.json @@ -5,7 +5,8 @@ "Category": 1, "Type": 1, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10102, @@ -13,7 +14,8 @@ "Category": 1, "Type": 1, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10103, @@ -21,7 +23,8 @@ "Category": 1, "Type": 1, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10104, @@ -29,7 +32,8 @@ "Category": 1, "Type": 1, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10105, @@ -37,7 +41,8 @@ "Category": 1, "Type": 1, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10106, @@ -45,7 +50,8 @@ "Category": 1, "Type": 1, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10107, @@ -53,7 +59,8 @@ "Category": 1, "Type": 1, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10201, @@ -61,7 +68,8 @@ "Category": 1, "Type": 2, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10202, @@ -69,7 +77,8 @@ "Category": 1, "Type": 2, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10203, @@ -77,7 +86,8 @@ "Category": 1, "Type": 2, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10204, @@ -85,7 +95,8 @@ "Category": 1, "Type": 2, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10205, @@ -93,7 +104,8 @@ "Category": 1, "Type": 2, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10301, @@ -101,7 +113,8 @@ "Category": 1, "Type": 3, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10302, @@ -109,7 +122,8 @@ "Category": 1, "Type": 3, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10401, @@ -117,7 +131,8 @@ "Category": 1, "Type": 4, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10402, @@ -125,7 +140,8 @@ "Category": 1, "Type": 4, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10403, @@ -133,7 +149,8 @@ "Category": 1, "Type": 4, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10404, @@ -141,7 +158,8 @@ "Category": 1, "Type": 4, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10405, @@ -149,7 +167,8 @@ "Category": 1, "Type": 4, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10501, @@ -157,7 +176,8 @@ "Category": 1, "Type": 5, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10502, @@ -165,7 +185,8 @@ "Category": 1, "Type": 5, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10503, @@ -173,7 +194,8 @@ "Category": 1, "Type": 5, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10504, @@ -181,7 +203,8 @@ "Category": 1, "Type": 5, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10505, @@ -189,7 +212,8 @@ "Category": 1, "Type": 5, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10506, @@ -197,7 +221,8 @@ "Category": 1, "Type": 5, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10507, @@ -205,7 +230,8 @@ "Category": 1, "Type": 5, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10508, @@ -213,7 +239,8 @@ "Category": 1, "Type": 5, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10509, @@ -221,7 +248,8 @@ "Category": 1, "Type": 5, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10601, @@ -229,7 +257,8 @@ "Category": 1, "Type": 6, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10602, @@ -237,7 +266,8 @@ "Category": 1, "Type": 6, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10603, @@ -245,7 +275,8 @@ "Category": 1, "Type": 6, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10701, @@ -253,7 +284,8 @@ "Category": 1, "Type": 7, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10702, @@ -261,7 +293,8 @@ "Category": 1, "Type": 7, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10703, @@ -269,7 +302,8 @@ "Category": 1, "Type": 7, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10704, @@ -277,7 +311,8 @@ "Category": 1, "Type": 7, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10705, @@ -285,7 +320,8 @@ "Category": 1, "Type": 7, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 10706, @@ -293,7 +329,8 @@ "Category": 1, "Type": 7, "Price": 100, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 20001, @@ -301,7 +338,8 @@ "Category": 2, "Type": 0, "Price": 500, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 20002, @@ -309,7 +347,8 @@ "Category": 2, "Type": 0, "Price": 1000, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 20003, @@ -317,7 +356,8 @@ "Category": 2, "Type": 0, "Price": 2000, - "Weight": 100 + "Weight": 100, + "Desciption": "" }, { "Idx": 20004, @@ -325,6 +365,25 @@ "Category": 2, "Type": 0, "Price": 0, - "Weight": 100 + "Weight": 100, + "Desciption": "" + }, + { + "Idx": 30201, + "Name": "코코넛게살스튜", + "Category": 3, + "Type": 2, + "Price": 0, + "Weight": 0, + "Desciption": "" + }, + { + "Idx": 40001, + "Name": "맥주", + "Category": 4, + "Type": 0, + "Price": 0, + "Weight": 0, + "Desciption": "" } ] \ No newline at end of file diff --git a/Assets/Restaurant Bundle 2D/Original Artwork/food-icon.psd.meta b/Assets/Restaurant Bundle 2D/Original Artwork/food-icon.psd.meta index d3ac99a01..c3ec55b96 100644 --- a/Assets/Restaurant Bundle 2D/Original Artwork/food-icon.psd.meta +++ b/Assets/Restaurant Bundle 2D/Original Artwork/food-icon.psd.meta @@ -50,12 +50,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -86,7 +86,7 @@ TextureImporter: overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 @@ -99,7 +99,7 @@ TextureImporter: overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -112,7 +112,7 @@ TextureImporter: overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 4 buildTarget: WindowsStoreApps maxTextureSize: 2048 @@ -125,10 +125,1528 @@ TextureImporter: overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: food-icon_0 + rect: + serializedVersion: 2 + x: 0 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b59aec85ac212ce4ca1ad2d4fdf97e50 + internalID: -1243252602 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_1 + rect: + serializedVersion: 2 + x: 200 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 69fe63f6c70415c43bfd1358681f0be6 + internalID: 351367219 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_2 + rect: + serializedVersion: 2 + x: 400 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d1e70c8b152426248826bc597d76082c + internalID: -683927081 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_3 + rect: + serializedVersion: 2 + x: 600 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e2b6f3d5c7b673948a1f28c62c60c538 + internalID: -412064832 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_4 + rect: + serializedVersion: 2 + x: 800 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 98bbf6d6cd1c91c49863c8a1be773fd7 + internalID: -2125166585 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_5 + rect: + serializedVersion: 2 + x: 1000 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fa09c3558629c9846b8384ada1e66771 + internalID: 1484297983 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_6 + rect: + serializedVersion: 2 + x: 1200 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3768566e2a8fda0468cd4ac7084a576a + internalID: 102211339 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_7 + rect: + serializedVersion: 2 + x: 1400 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 42206d4dea2668a4a8d2a5259cf8873d + internalID: -2014589551 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_8 + rect: + serializedVersion: 2 + x: 1600 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7bacda8933ad2604b88e1c7d5593697d + internalID: 790826274 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_9 + rect: + serializedVersion: 2 + x: 1800 + y: 1200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 55bbd8571c0fb9841999283018e2fdfe + internalID: 298192204 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_10 + rect: + serializedVersion: 2 + x: 0 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 58ab03660b195cc4ba39550ffc1f2caf + internalID: 871325393 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_11 + rect: + serializedVersion: 2 + x: 200 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1691d95c91554c54c871d40b1002e6dc + internalID: 1695622985 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_12 + rect: + serializedVersion: 2 + x: 400 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d008da8b67271f9448fb9ab895643e89 + internalID: -1528400590 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_13 + rect: + serializedVersion: 2 + x: 600 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b815fcf85d54e794dab62f30f63a9377 + internalID: -185545764 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_14 + rect: + serializedVersion: 2 + x: 800 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7c52177b7b499f640b02daaf848b4d8d + internalID: 43789908 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_15 + rect: + serializedVersion: 2 + x: 1000 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 94278ae42e4e2ba42980e89c7e386d14 + internalID: -964359742 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_16 + rect: + serializedVersion: 2 + x: 1200 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0b9be34acd60098469a389d5ea30181c + internalID: 1709127436 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_17 + rect: + serializedVersion: 2 + x: 1400 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7fd0ee76127d1bf4a9141e28479d0dea + internalID: -1251715284 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_18 + rect: + serializedVersion: 2 + x: 1600 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 61428d2a0f177154c9d654434dd81531 + internalID: -573829418 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_19 + rect: + serializedVersion: 2 + x: 1800 + y: 1000 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4d9369e64110bce408fa90648ad82710 + internalID: 376518776 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_20 + rect: + serializedVersion: 2 + x: 0 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a65676828cead684780f136cd0c8a637 + internalID: -229012628 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_21 + rect: + serializedVersion: 2 + x: 200 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 936d8df6ef5495a46a679b9e40bac2fd + internalID: 15914017 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_22 + rect: + serializedVersion: 2 + x: 400 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5744bb040f2f78445be62e6ca4bd4df3 + internalID: 2133051666 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_23 + rect: + serializedVersion: 2 + x: 600 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9041d7c460c08674898ab6644a488636 + internalID: -1886815449 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_24 + rect: + serializedVersion: 2 + x: 800 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4a234cefd793cb94f844b2ec52e68421 + internalID: -1375752585 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_25 + rect: + serializedVersion: 2 + x: 1000 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0b0bfd025f01e0c4eb9e8ed2b0963593 + internalID: 1053852664 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_26 + rect: + serializedVersion: 2 + x: 1200 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ad9ca15c30ddaf5499c65331c32ab2c0 + internalID: 1828572616 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_27 + rect: + serializedVersion: 2 + x: 1400 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ab2569ef375ed2242a1914d0df524f55 + internalID: 1354963998 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_28 + rect: + serializedVersion: 2 + x: 1600 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c03eb4d5529a5a94ba7b5f94bce552ad + internalID: 1806238525 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_29 + rect: + serializedVersion: 2 + x: 1800 + y: 800 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2a304f19ea257194d9bd42a54ec1d597 + internalID: 636452897 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_30 + rect: + serializedVersion: 2 + x: 0 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 15098b15fb55a0a4db3e2807efe55638 + internalID: 100668197 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_31 + rect: + serializedVersion: 2 + x: 200 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9bdc765eecf44c04cb175cbd044b31b1 + internalID: -1609316297 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_32 + rect: + serializedVersion: 2 + x: 400 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e95cb25415df856449776b3dc3027839 + internalID: 1612750543 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_33 + rect: + serializedVersion: 2 + x: 600 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ac77da4351ffd554fafdf03b77d63461 + internalID: 2066814467 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_34 + rect: + serializedVersion: 2 + x: 800 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0b1b97d47cff20c4d8720594ca7d6f02 + internalID: -983966558 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_35 + rect: + serializedVersion: 2 + x: 1000 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 94ec8f419ffd23c45b822736f0a4058b + internalID: 1748844378 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_36 + rect: + serializedVersion: 2 + x: 1200 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4e2609cae12f1c24bb4d54973b3a75db + internalID: 820408918 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_37 + rect: + serializedVersion: 2 + x: 1400 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 19a40f7bfa224ad4e95df51a5bd05d4d + internalID: -1184256271 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_38 + rect: + serializedVersion: 2 + x: 1600 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0606e1beb3d5a8d469d7b7d05b49afcb + internalID: -1930458560 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_39 + rect: + serializedVersion: 2 + x: 1800 + y: 600 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9f8645334749ccd48a6b16e82bebee8a + internalID: 1914961283 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_40 + rect: + serializedVersion: 2 + x: 0 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 81d4285e6b3a73d488c4f657b7d80287 + internalID: -1029048611 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_41 + rect: + serializedVersion: 2 + x: 200 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 67786d9c090361f4b90b1c0335192914 + internalID: 1911381626 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_42 + rect: + serializedVersion: 2 + x: 400 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8e34713b5051e8e47a926794cbbcc5d6 + internalID: 1519329866 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_43 + rect: + serializedVersion: 2 + x: 600 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6cff8c8361eccd742abc7c39ed567bc3 + internalID: 1726953740 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_44 + rect: + serializedVersion: 2 + x: 800 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 63616a710b001064584bb5615e1bdf2d + internalID: 1295142130 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_45 + rect: + serializedVersion: 2 + x: 1000 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 814215b05a6a5154fbd1677e458e5cfa + internalID: 1786559066 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_46 + rect: + serializedVersion: 2 + x: 1200 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6b6cc998e5a81fa49869e0ff4644de21 + internalID: 810180273 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_47 + rect: + serializedVersion: 2 + x: 1400 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ca17071f8bc22d1479e8614c3c1fe809 + internalID: -114669052 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_48 + rect: + serializedVersion: 2 + x: 1600 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d968701c7747b1f44bbe086fc3a585d8 + internalID: -1351248346 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_49 + rect: + serializedVersion: 2 + x: 1800 + y: 400 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 35e3e65c66f23e1449b0a9ed15f5f3a0 + internalID: -891322076 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_50 + rect: + serializedVersion: 2 + x: 0 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2089db9bcb7f4bd4e90a3461dc5c6aed + internalID: 1904380157 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_51 + rect: + serializedVersion: 2 + x: 200 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 03d06f3382813ff499bd7eb71abf92ed + internalID: 978969420 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_52 + rect: + serializedVersion: 2 + x: 400 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7ec2e4cdb0862a941bb2d384b41cb525 + internalID: -256841978 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_53 + rect: + serializedVersion: 2 + x: 600 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: efd4603fb799222478fdf0dd9e429815 + internalID: 1310197263 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_54 + rect: + serializedVersion: 2 + x: 800 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dfc8f9d728bcb134e81f43f8cad47ddf + internalID: -642565903 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_55 + rect: + serializedVersion: 2 + x: 1000 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2782ab82b2063134e9b639ca77719176 + internalID: -49319392 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_56 + rect: + serializedVersion: 2 + x: 1200 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f4d238a347a228248bce092172f28950 + internalID: -1223605584 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_57 + rect: + serializedVersion: 2 + x: 1400 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 794dbacfd4968604780af713376ea20c + internalID: -217404058 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_58 + rect: + serializedVersion: 2 + x: 1600 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 52032b9fb98cb814baaed845e47e6b9e + internalID: -1110073461 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_59 + rect: + serializedVersion: 2 + x: 1800 + y: 200 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b470f0c2c65f4aa4e891fcb427ea8b55 + internalID: 625220295 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_60 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c39cc2f40a92dce48b6810aaf507d757 + internalID: 187316587 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_61 + rect: + serializedVersion: 2 + x: 200 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c94de8d646879b945a2e710a0360a528 + internalID: 1525906009 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_62 + rect: + serializedVersion: 2 + x: 400 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8b2e26dde2beca74292d1a2db3421c0a + internalID: 1367020359 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_63 + rect: + serializedVersion: 2 + x: 600 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 674a76c1b1b291e44b9c676d016957e6 + internalID: 893811201 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_64 + rect: + serializedVersion: 2 + x: 800 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fca1edd33b3f89f4ca5d527c5b6d20d3 + internalID: 1970813209 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_65 + rect: + serializedVersion: 2 + x: 1000 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d6f636be9ccd2b84fb740e8705427e8f + internalID: 1171410595 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_66 + rect: + serializedVersion: 2 + x: 1200 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ad3f9da7010fb684ca522044a498a464 + internalID: 1336011380 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_67 + rect: + serializedVersion: 2 + x: 1400 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4c3bc8705fd78264db1b685bcd509eb1 + internalID: 850772652 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: food-icon_68 + rect: + serializedVersion: 2 + x: 1600 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7cc46a69ce82ac44aba2a8ee469353e3 + internalID: 1579517081 + vertices: [] + indices: + edges: [] + weights: [] outline: [] customData: physicsShape: [] @@ -140,7 +1658,76 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + food-icon_0: -1243252602 + food-icon_1: 351367219 + food-icon_10: 871325393 + food-icon_11: 1695622985 + food-icon_12: -1528400590 + food-icon_13: -185545764 + food-icon_14: 43789908 + food-icon_15: -964359742 + food-icon_16: 1709127436 + food-icon_17: -1251715284 + food-icon_18: -573829418 + food-icon_19: 376518776 + food-icon_2: -683927081 + food-icon_20: -229012628 + food-icon_21: 15914017 + food-icon_22: 2133051666 + food-icon_23: -1886815449 + food-icon_24: -1375752585 + food-icon_25: 1053852664 + food-icon_26: 1828572616 + food-icon_27: 1354963998 + food-icon_28: 1806238525 + food-icon_29: 636452897 + food-icon_3: -412064832 + food-icon_30: 100668197 + food-icon_31: -1609316297 + food-icon_32: 1612750543 + food-icon_33: 2066814467 + food-icon_34: -983966558 + food-icon_35: 1748844378 + food-icon_36: 820408918 + food-icon_37: -1184256271 + food-icon_38: -1930458560 + food-icon_39: 1914961283 + food-icon_4: -2125166585 + food-icon_40: -1029048611 + food-icon_41: 1911381626 + food-icon_42: 1519329866 + food-icon_43: 1726953740 + food-icon_44: 1295142130 + food-icon_45: 1786559066 + food-icon_46: 810180273 + food-icon_47: -114669052 + food-icon_48: -1351248346 + food-icon_49: -891322076 + food-icon_5: 1484297983 + food-icon_50: 1904380157 + food-icon_51: 978969420 + food-icon_52: -256841978 + food-icon_53: 1310197263 + food-icon_54: -642565903 + food-icon_55: -49319392 + food-icon_56: -1223605584 + food-icon_57: -217404058 + food-icon_58: -1110073461 + food-icon_59: 625220295 + food-icon_6: 102211339 + food-icon_60: 187316587 + food-icon_61: 1525906009 + food-icon_62: 1367020359 + food-icon_63: 893811201 + food-icon_64: 1970813209 + food-icon_65: 1171410595 + food-icon_66: 1336011380 + food-icon_67: 850772652 + food-icon_68: 1579517081 + food-icon_7: -2014589551 + food-icon_8: 790826274 + food-icon_9: 298192204 mipmapLimitGroupName: pSDRemoveMatte: 1 userData: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 2b94b2bf1..0d3c43527 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -44,8 +44,5 @@ TagManager: - name: Default uniqueID: 0 locked: 0 - - name: Tes - uniqueID: 1882568271 - locked: 0 m_RenderingLayers: - Default