diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 6a46c019a..55799cf9c 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -118,6 +118,142 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &321671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 321672} + - component: {fileID: 321674} + - component: {fileID: 321673} + m_Layer: 5 + m_Name: CompleteText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &321672 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321671} + 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: 1795654740} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 8} + m_SizeDelta: {x: 0, y: 10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &321673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321671} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC131\uACF5!\n\uB9DD\uB839 \uB9E5\uC8FC" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278255615 + m_fontColor: {r: 1, g: 1, b: 0, 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: 3 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 3 + m_fontStyle: 0 + 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 &321674 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321671} + m_CullTransparentMesh: 1 --- !u!1 &4966468 GameObject: m_ObjectHideFlags: 0 @@ -1129,7 +1265,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.x - value: -13 + value: -9.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.y @@ -1137,7 +1273,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.z - value: 4.47 + value: -1.5900002 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalRotation.w @@ -2423,7 +2559,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.x - value: -14 + value: -10.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.y @@ -2431,7 +2567,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.z - value: 4.47 + value: -1.5900002 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalRotation.w @@ -2578,7 +2714,7 @@ GameObject: m_Component: - component: {fileID: 218784750} m_Layer: 0 - m_Name: Instances + m_Name: LiquidInstances m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2593,11 +2729,11 @@ Transform: m_GameObject: {fileID: 218784749} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 150, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1247057679} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &230908402 GameObject: @@ -3047,6 +3183,42 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} m_PrefabInstance: {fileID: 278514937} m_PrefabAsset: {fileID: 0} +--- !u!1 &282398543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 282398544} + m_Layer: 5 + m_Name: PouringPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &282398544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282398543} + 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: 963867003} + m_Father: {fileID: 1172519049} + 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 &308211526 PrefabInstance: m_ObjectHideFlags: 0 @@ -3512,55 +3684,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 346596724} m_CullTransparentMesh: 1 ---- !u!1 &355668242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 355668244} - - component: {fileID: 355668243} - m_Layer: 3 - m_Name: PostProcessingVolume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &355668243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 355668242} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: da9f66a87cd612d4e847d191aa6df602, type: 2} ---- !u!4 &355668244 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 355668242} - 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!1 &357166929 GameObject: m_ObjectHideFlags: 0 @@ -5213,7 +5336,7 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -4.78, y: 12.855751, z: -20.08089} + m_LocalPosition: {x: -4.78, y: 9.641813, z: -16.250668} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5308,7 +5431,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 886251e9a18ece04ea8e61686c173e1b, type: 3} m_Name: m_EditorClassIdentifier: - CameraDistance: 20 + CameraDistance: 15 DeadZoneDepth: 0 Composition: ScreenPosition: {x: 0, y: 0} @@ -6696,7 +6819,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.x - value: -15 + value: -11.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.y @@ -6704,7 +6827,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.z - value: 4.47 + value: -1.5900002 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalRotation.w @@ -7665,7 +7788,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.x - value: -12 + value: -8.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.y @@ -7673,7 +7796,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.z - value: 4.47 + value: -1.5900002 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalRotation.w @@ -8525,7 +8648,7 @@ Transform: m_GameObject: {fileID: 873223985} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -4.78, y: 12.855751, z: -20.08089} + m_LocalPosition: {x: -4.78, y: 9.641813, z: -16.250668} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8836,12 +8959,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963867002} - 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: 1172519049} + m_Father: {fileID: 282398544} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -8895,12 +9018,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 3.45 + m_fontSize: 3 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 1 - m_fontSizeMax: 10 + m_fontSizeMax: 3 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -9311,16 +9434,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _liquidPanel: {fileID: 1247057678} + _shaker: {fileID: 1321215892} _renderTexture: {fileID: 2105041734} _liquidRenderer: {fileID: 1947402520} _reachedCollider: {fileID: 2070548849} _amountText: {fileID: 963867004} + _completeCocktailImage: {fileID: 1821459832} + _completeText: {fileID: 321673} _spawnTransform: {fileID: 970735072} _spawnLocation: {fileID: 218784750} _pushDirection: {x: -5, y: -1, z: 0} _pushPower: 50 _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3} - _liquidColor: {r: 1, g: 0.8431373, b: 0, a: 1} _liquidsPerSecond: 80 _maxLiquidCount: 400 _colorLerpSpeed: 0.5 @@ -9709,6 +9834,7 @@ RectTransform: m_Children: - {fileID: 1701236784} - {fileID: 437358691} + - {fileID: 879980064258291461} - {fileID: 1496452082} - {fileID: 1987164072} - {fileID: 102499728} @@ -10952,7 +11078,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 963867003} + - {fileID: 282398544} + - {fileID: 1795654740} m_Father: {fileID: 1730992467} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -11699,6 +11826,7 @@ Transform: - {fileID: 2070548848} - {fileID: 970735072} - {fileID: 1730992467} + - {fileID: 218784750} m_Father: {fileID: 1006730365} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1256380695 @@ -14098,7 +14226,7 @@ Transform: m_GameObject: {fileID: 1400792457} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.61, y: 0, z: 3.6} + m_LocalPosition: {x: -10.25, y: 0, z: -1.52} m_LocalScale: {x: 10, y: 2, z: 5} m_ConstrainProportionsScale: 0 m_Children: [] @@ -14280,6 +14408,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1418585147} m_CullTransparentMesh: 1 +--- !u!1001 &1425009442 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6468678730395126332, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + propertyPath: m_Name + value: PostProcessingVolume + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} --- !u!1001 &1438594026 PrefabInstance: m_ObjectHideFlags: 0 @@ -16711,6 +16896,7 @@ MonoBehaviour: k__BackingField: {fileID: 1665075870} k__BackingField: {fileID: 1665075872} _dailyBgm: TycoonDailyBgm1 + _levelDataSo: {fileID: 11400000, guid: 702b1ed0ce71d1b4aa1ddbce67e475a1, type: 2} --- !u!114 &1665075870 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18679,6 +18865,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1786369329} m_CullTransparentMesh: 1 +--- !u!1 &1795654739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1795654740} + m_Layer: 5 + m_Name: CompletePanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1795654740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795654739} + 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: 1821459831} + - {fileID: 321672} + m_Father: {fileID: 1172519049} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1795712517 GameObject: m_ObjectHideFlags: 0 @@ -19042,6 +19265,81 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &1821459830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1821459831} + - component: {fileID: 1821459833} + - component: {fileID: 1821459832} + m_Layer: 5 + m_Name: CompleteCocktailImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1821459831 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821459830} + 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: 1795654740} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1821459832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821459830} + 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1821459833 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821459830} + m_CullTransparentMesh: 1 --- !u!1 &1834176991 GameObject: m_ObjectHideFlags: 0 @@ -20113,7 +20411,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.x - value: -16 + value: -12.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.y @@ -20121,7 +20419,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalPosition.z - value: 4.47 + value: -1.59 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} propertyPath: m_LocalRotation.w @@ -22381,6 +22679,32 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} m_PrefabInstance: {fileID: 2130676465} m_PrefabAsset: {fileID: 0} +--- !u!222 &16727924107195264 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3792880111283348690} + m_CullTransparentMesh: 1 +--- !u!1 &135487092092002148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6276399602897512740} + - component: {fileID: 3853165253458544694} + - component: {fileID: 8473124052126015697} + m_Layer: 5 + m_Name: HealthPoint (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &604670658564826510 PrefabInstance: m_ObjectHideFlags: 0 @@ -22483,6 +22807,150 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} m_PrefabInstance: {fileID: 604670658564826510} m_PrefabAsset: {fileID: 0} +--- !u!224 &879980064258291461 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9026075076208309556} + 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: 6232410505084427856} + 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!114 &940439429949179844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9026075076208309556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95a0ff880fd9f5942880892d403f67be, type: 3} + m_Name: + m_EditorClassIdentifier: + _healthPointLayout: {fileID: 6232410505084427856} + _healthPointPrefab: {fileID: 7026391210700039621, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + _maxHeartCount: 2 + _healthPointImageList: [] + _fullHeart: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} + _halfHeart: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} + _emptyHeart: {fileID: 21300000, guid: b519b8a1ceacfad4c834eb059d4004a7, type: 3} +--- !u!114 &2303015978777994192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7746817464983166053} + 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: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, 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 &3792880111283348690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7086445590676017810} + - component: {fileID: 16727924107195264} + - component: {fileID: 4671580787319069543} + m_Layer: 5 + m_Name: HealthPoint (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &3853165253458544694 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135487092092002148} + m_CullTransparentMesh: 1 +--- !u!224 &4429608632879786533 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7746817464983166053} + 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: 6232410505084427856} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4671580787319069543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3792880111283348690} + 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: 21300000, guid: b519b8a1ceacfad4c834eb059d4004a7, 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!1001 &5626406452199475265 PrefabInstance: m_ObjectHideFlags: 0 @@ -24300,6 +24768,133 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} +--- !u!224 &6232410505084427856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6899510603013594002} + 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: 6276399602897512740} + - {fileID: 4429608632879786533} + - {fileID: 7086445590676017810} + m_Father: {fileID: 879980064258291461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -80, y: -75} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0} +--- !u!224 &6276399602897512740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135487092092002148} + 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: 6232410505084427856} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6852878673495722807 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7746817464983166053} + m_CullTransparentMesh: 1 +--- !u!1 &6899510603013594002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6232410505084427856} + - component: {fileID: 6899510603013594003} + m_Layer: 5 + m_Name: HealthPointLayout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &6899510603013594003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6899510603013594002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 2 + m_StartCorner: 1 + m_StartAxis: 0 + m_CellSize: {x: 60, y: 60} + m_Spacing: {x: 0, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 +--- !u!224 &7086445590676017810 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3792880111283348690} + 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: 6232410505084427856} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7746817464983166053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4429608632879786533} + - component: {fileID: 6852878673495722807} + - component: {fileID: 2303015978777994192} + m_Layer: 5 + m_Name: HealthPoint (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &7827484746149782377 PrefabInstance: m_ObjectHideFlags: 0 @@ -24478,6 +25073,53 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} +--- !u!114 &8473124052126015697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135487092092002148} + 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: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, 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 &9026075076208309556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 879980064258291461} + - component: {fileID: 940439429949179844} + m_Layer: 5 + m_Name: PlayerHealthPointUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -24488,7 +25130,7 @@ SceneRoots: - {fileID: 1985878520} - {fileID: 1774013120} - {fileID: 1634548838} - - {fileID: 355668244} + - {fileID: 1425009442} - {fileID: 1222632321} - {fileID: 1231728096} - {fileID: 1619849090} @@ -24515,4 +25157,3 @@ SceneRoots: - {fileID: 828349206} - {fileID: 1006730365} - {fileID: 20736010} - - {fileID: 218784750} diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index 3d0994e68..9dc40bd4e 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -752,62 +752,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 104504150} m_CullTransparentMesh: 0 ---- !u!1 &119873273 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 119873274} - - component: {fileID: 119873275} - m_Layer: 5 - m_Name: PlayerHealthPointUi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &119873274 +--- !u!224 &119873274 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + m_PrefabInstance: {fileID: 2991762615616799771} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 119873273} - 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: 478100612} - m_Father: {fileID: 1033584370} - 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 &119873275 +--- !u!114 &119873275 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 940439430324203188, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + m_PrefabInstance: {fileID: 2991762615616799771} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 119873273} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 95a0ff880fd9f5942880892d403f67be, type: 3} m_Name: m_EditorClassIdentifier: - _healthPointLayout: {fileID: 478100612} - _healthPointPrefab: {fileID: 7026391210700039621, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - _maxHeartCount: 2 - _healthPointImageList: [] - _fullHeart: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} - _halfHeart: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} - _emptyHeart: {fileID: 21300000, guid: b519b8a1ceacfad4c834eb059d4004a7, type: 3} --- !u!1 &162376353 GameObject: m_ObjectHideFlags: 0 @@ -3087,71 +3047,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 473280139} m_CullTransparentMesh: 0 ---- !u!1 &478100611 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 478100612} - - component: {fileID: 478100613} - m_Layer: 5 - m_Name: HealthPointLayout - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &478100612 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 478100611} - 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: 790974532} - - {fileID: 1511319439} - - {fileID: 1096489939} - m_Father: {fileID: 119873274} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 170, y: -130} - m_SizeDelta: {x: 60, y: 60} - m_Pivot: {x: 0, y: 0} ---- !u!114 &478100613 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 478100611} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 10 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &481231814 GameObject: m_ObjectHideFlags: 0 @@ -4837,11 +4732,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 736767085} m_CullTransparentMesh: 0 ---- !u!224 &790974532 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - m_PrefabInstance: {fileID: 721538019690271624} - m_PrefabAsset: {fileID: 0} --- !u!1 &793017943 GameObject: m_ObjectHideFlags: 0 @@ -6543,112 +6433,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4019578663844880581, guid: ccb8b4cf4e054704a8bfa9e1334764a7, type: 3} m_PrefabInstance: {fileID: 7155618029629697249} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1096489938 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 478100612} - m_Modifications: - - target: {fileID: 1582184245155240560, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: b519b8a1ceacfad4c834eb059d4004a7, type: 3} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7026391210700039621, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Name - value: HealthPoint (3) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} ---- !u!224 &1096489939 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - m_PrefabInstance: {fileID: 1096489938} - m_PrefabAsset: {fileID: 0} --- !u!1 &1111610237 GameObject: m_ObjectHideFlags: 0 @@ -10712,112 +10496,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484753224} m_CullTransparentMesh: 1 ---- !u!1001 &1511319438 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 478100612} - m_Modifications: - - target: {fileID: 1582184245155240560, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7026391210700039621, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Name - value: HealthPoint (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} ---- !u!224 &1511319439 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - m_PrefabInstance: {fileID: 1511319438} - m_PrefabAsset: {fileID: 0} --- !u!1 &1512206133 GameObject: m_ObjectHideFlags: 0 @@ -15427,103 +15105,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1001 &721538019690271624 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 478100612} - m_Modifications: - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7026391210700039621, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} - propertyPath: m_Name - value: HealthPoint (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} --- !u!224 &724108661525278474 RectTransform: m_ObjectHideFlags: 0 @@ -17533,6 +17114,103 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &2991762615616799771 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1033584370} + m_Modifications: + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 879980064875257461, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9026075075559676996, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} + propertyPath: m_Name + value: PlayerHealthPointUi + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4b432bbf05a7bc74bb0dd15b5afd23d1, type: 3} --- !u!222 &3020655370704658913 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs index 5a75ace53..3a91356ee 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs @@ -14,7 +14,7 @@ namespace BlueWater.BehaviorTrees.Actions { private Customer _customer; private CustomerData _customerData; - private FoodBalloonUi _foodBalloonUi; + private BalloonUi _balloonUi; public override void OnAwake() { @@ -24,9 +24,9 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { - _foodBalloonUi = _customer.FoodBalloonUi; + _balloonUi = _customer.BalloonUi; // TODO : 음료가 다양해질 때 수정해야함 - _foodBalloonUi.OrderFood("40001", _customerData.WaitTime, _customerData.HurryTime); + _balloonUi.OrderItem("40001", _customerData.WaitTime, _customerData.HurryTime); _customer.OnInteraction += HandleBeverageInteraction; _customer.RegisterPlayerInteraction(); @@ -35,21 +35,21 @@ namespace BlueWater.BehaviorTrees.Actions public override TaskStatus OnUpdate() { - if (_foodBalloonUi.IsFoodReceive()) + if (_balloonUi.IsFoodReceive()) { _customer.OnInteraction -= HandleBeverageInteraction; _customer.UnregisterPlayerInteraction(); return TaskStatus.Success; } - if (_foodBalloonUi.IsWaitTimeOver()) + if (_balloonUi.IsWaitTimeOver()) { _customer.OnInteraction -= HandleBeverageInteraction; _customer.UnregisterPlayerInteraction(); _customer.AddHappyPoint(-3); if (_customer.HappyPoint <= 0) { - _foodBalloonUi.CancelOrder(); + _balloonUi.CancelOrder(); var barkName = _customer.HappyPoint switch { >= 3 => "SatisfactoryEvaluation", @@ -79,9 +79,10 @@ namespace BlueWater.BehaviorTrees.Actions if (carriedBeverageData.Idx == "40001") { tycoonPlayer.GiveItem(); - _foodBalloonUi.ReceiveFood(); - _customer.SetFood(carriedBeverageData); - if (carriedBeverageData.Quality == ItemQuality.High) + _balloonUi.ReceiveFood(); + var itemData = ItemManager.Instance.GetItemDataByIdx(carriedBeverageData.Idx); + _customer.SetFood(itemData); + if (itemData.Quality == ItemQuality.High) { _customer.AddHappyPoint(1); } diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs index a9ecfd759..23f03f3db 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs @@ -15,7 +15,7 @@ namespace BlueWater.BehaviorTrees.Actions { private Customer _customer; private CustomerData _customerData; - private FoodBalloonUi _foodBalloonUi; + private BalloonUi _balloonUi; private string _orderFoodIdx; public override void OnAwake() @@ -28,8 +28,8 @@ namespace BlueWater.BehaviorTrees.Actions { SetPreferredFoods(); - _foodBalloonUi = _customer.FoodBalloonUi; - _foodBalloonUi.OrderFood(_orderFoodIdx, _customerData.WaitTime, _customerData.HurryTime); + _balloonUi = _customer.BalloonUi; + _balloonUi.OrderItem(_orderFoodIdx, _customerData.WaitTime, _customerData.HurryTime); _customer.OnInteraction += HandleFoodInteraction; _customer.RegisterPlayerInteraction(); _customer.Bark("OrderFood", BarkOrder.FirstValid); @@ -37,21 +37,21 @@ namespace BlueWater.BehaviorTrees.Actions public override TaskStatus OnUpdate() { - if (_foodBalloonUi.IsFoodReceive()) + if (_balloonUi.IsFoodReceive()) { _customer.OnInteraction -= HandleFoodInteraction; _customer.UnregisterPlayerInteraction(); return TaskStatus.Success; } - if (_foodBalloonUi.IsWaitTimeOver()) + if (_balloonUi.IsWaitTimeOver()) { _customer.OnInteraction -= HandleFoodInteraction; _customer.UnregisterPlayerInteraction(); _customer.AddHappyPoint(-3); if (_customer.HappyPoint <= 0) { - _foodBalloonUi.CancelOrder(); + _balloonUi.CancelOrder(); var barkName = _customer.HappyPoint switch { >= 3 => "SatisfactoryEvaluation", @@ -80,9 +80,10 @@ namespace BlueWater.BehaviorTrees.Actions if (carriedFoodData.Idx == _orderFoodIdx) { tycoonPlayer.GiveItem(); - _foodBalloonUi.ReceiveFood(); - _customer.SetFood(carriedFoodData); - if (carriedFoodData.Quality == ItemQuality.High) + _balloonUi.ReceiveFood(); + var itemData = ItemManager.Instance.GetItemDataByIdx(carriedFoodData.Idx); + _customer.SetFood(itemData); + if (itemData.Quality == ItemQuality.High) { _customer.AddHappyPoint(1); } diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/PayMoney.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/PayMoney.cs index 3de82b9d2..0b28463a2 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/PayMoney.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/PayMoney.cs @@ -12,7 +12,7 @@ namespace BlueWater.BehaviorTrees.Actions { private Customer _customer; private CustomerData _customerData; - private FoodBalloonUi _foodBalloonUi; + private BalloonUi _balloonUi; private int _goldIdx; private bool _isPaidMoney; @@ -24,8 +24,8 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { - _foodBalloonUi = _customer.FoodBalloonUi; - _foodBalloonUi.PayMoney(_customerData.WaitTime, _customerData.HurryTime); + _balloonUi = _customer.BalloonUi; + _balloonUi.PayMoney(_customerData.WaitTime, _customerData.HurryTime); _customer.OnInteraction += HandlePayMoneyInteraction; _customer.RegisterPlayerInteraction(); } @@ -37,12 +37,12 @@ namespace BlueWater.BehaviorTrees.Actions return TaskStatus.Success; } - if (_foodBalloonUi.IsWaitTimeOver()) + if (_balloonUi.IsWaitTimeOver()) { _customer.OnInteraction -= HandlePayMoneyInteraction; _customer.UnregisterPlayerInteraction(); - _foodBalloonUi.CancelOrder(); - _foodBalloonUi.HideUi(); + _balloonUi.CancelOrder(); + _balloonUi.HideUi(); // _customer.AddHappyPoint(-3); // if (_customer.HappyPoint <= 0) // { @@ -85,11 +85,11 @@ namespace BlueWater.BehaviorTrees.Actions var paidAmount = foodPrice + tipAmount; tycoonPlayer.GetMoney(paidAmount); _customer.PayMoney(foodPrice, tipAmount); - _foodBalloonUi.HideUi(); + _balloonUi.HideUi(); _customer.OnInteraction -= HandlePayMoneyInteraction; _customer.Bark(barkName, BarkOrder.FirstValid); _customer.UnregisterPlayerInteraction(); - _foodBalloonUi.CancelOrder(); + _balloonUi.CancelOrder(); _isPaidMoney = true; } diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs index 7917a683f..45dd6f0ba 100644 --- a/Assets/02.Scripts/Character/Npc/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -60,7 +60,7 @@ namespace BlueWater.Npcs.Customers public Transform InteractionUi { get; private set; } [field: SerializeField] - public FoodBalloonUi FoodBalloonUi { get; private set; } + public BalloonUi BalloonUi { get; private set; } [field: SerializeField] public PayMoneyUi PayMoneyUi { get; private set; } @@ -181,7 +181,7 @@ namespace BlueWater.Npcs.Customers //InteractionCanvas.worldCamera = TycoonCameraManager.Instance.UiCamera; InteractionUi = InteractionCanvas.transform.Find("InteractionUi"); InteractionUi.localScale = Vector3.one * (1 / transform.localScale.x); - FoodBalloonUi = InteractionCanvas.transform.Find("FoodBalloonUi").GetComponent(); + BalloonUi = InteractionCanvas.transform.Find("FoodBalloonUi").GetComponent(); PayMoneyUi = InteractionCanvas.transform.Find("PayMoneyUi").GetComponent(); SpineController = GetComponent(); @@ -231,7 +231,7 @@ namespace BlueWater.Npcs.Customers public void SetTableSeat(TableSeat tableSeat) { TableSeat = tableSeat; - FoodBalloonUi.Initialize(TableSeat); + BalloonUi.Initialize(TableSeat); } public void SetCurrentDirection(Vector3 normalDirection) => CurrentDirection = normalDirection; diff --git a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs index 3e4935b34..5299f6fb2 100644 --- a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs +++ b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs @@ -51,9 +51,9 @@ namespace BlueWater.Players private void Start() { - if (CombatUiManager.Instance) + _playerHealthPointUi = FindAnyObjectByType(); + if (_playerHealthPointUi) { - _playerHealthPointUi = CombatUiManager.Instance.PlayerHealthPointUi; OnHealthChanged += _playerHealthPointUi.SetCurrentHealthPoint; } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonCarryHandler.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonCarryHandler.cs deleted file mode 100644 index 071995f50..000000000 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonCarryHandler.cs +++ /dev/null @@ -1,94 +0,0 @@ -using BlueWater.Items; -using Sirenix.OdinInspector; -using UnityEngine; - -namespace BlueWater.Players.Tycoons -{ - public class TycoonCarryHandler : MonoBehaviour - { - [SerializeField] - private SpriteRenderer _itemRenderer; - - [SerializeField] - private bool _isCarriedItem; - - private ItemData _currentItemData; - private ItemManager _itemManager; - - private void Awake() - { - InitializeComponents(); - } - - private void Start() - { - _itemManager = ItemManager.Instance; - } - - [Button("컴포넌트 초기화")] - private void InitializeComponents() - { - _itemRenderer = transform.Find("VisualLook/Item").GetComponent(); - } - - public void CarryItem(string itemIdx, bool isUsingSprite = true, ItemQuality itemQuality = ItemQuality.Normal) - { - if (_isCarriedItem) - { - Debug.Log("이미 아이템을 들고 있습니다."); - return; - } - - _currentItemData = new ItemData(_itemManager.GetItemDataByIdx(itemIdx)) - { - Quality = itemQuality - }; - - if (_currentItemData == null) - { - Debug.LogError($"{itemIdx} 해당 아이템을 등록할 수 없습니다."); - return; - } - - if (isUsingSprite) - { - var itemSprite = _currentItemData.Sprite; - if (!itemSprite) - { - Debug.LogWarning($"{itemSprite} 해당 아이템의 이미지가 없습니다."); - } - _itemRenderer.sprite = itemSprite; - } - _isCarriedItem = true; - } - - public void GiveItem() - { - if (!_isCarriedItem || _currentItemData == null) - { - Debug.Log("들고있는 아이템이 없거나, 현재 아이템 데이터가 비어있습니다."); - return; - } - - _currentItemData = null; - _itemRenderer.sprite = null; - _isCarriedItem = false; - } - - public void DiscardItem() - { - if (!_isCarriedItem || _currentItemData == null) - { - Debug.Log("들고있는 아이템이 없거나, 현재 아이템 데이터가 비어있습니다."); - return; - } - - _currentItemData = null; - _itemRenderer.sprite = null; - _isCarriedItem = false; - } - - public ItemData GetCurrentItemData() => _currentItemData; - public bool IsCarriedItem() => _isCarriedItem; - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs index e7e4644a5..32a88b4b4 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs @@ -12,7 +12,7 @@ namespace BlueWater.Players.Tycoons public Rigidbody Rigidbody { get; private set; } private Transform _visualLook; private SpineController _spineController; - private TycoonCarryHandler _tycoonCarryHandler; + private TycoonPickupHandler _tycoonPickupHandler; // Move [field: SerializeField, Range(1f, 20f), Tooltip("이동 속도")] @@ -33,11 +33,11 @@ namespace BlueWater.Players.Tycoons string animationName; if (_isMoving) { - animationName = _tycoonCarryHandler.IsCarriedItem() ? TycoonPlayerSpineAnimation.ServingSide : TycoonPlayerSpineAnimation.RunSide; + animationName = _tycoonPickupHandler.IsPickedUpItem() ? TycoonPlayerSpineAnimation.ServingSide : TycoonPlayerSpineAnimation.RunSide; } else { - animationName = _tycoonCarryHandler.IsCarriedItem() ? TycoonPlayerSpineAnimation.IdleServingUpside : TycoonPlayerSpineAnimation.IdleSide; + animationName = _tycoonPickupHandler.IsPickedUpItem() ? TycoonPlayerSpineAnimation.IdleServingUpside : TycoonPlayerSpineAnimation.IdleSide; } if (animationName == previousAnimationName) return; @@ -76,7 +76,7 @@ namespace BlueWater.Players.Tycoons private void Awake() { _spineController = GetComponent(); - _tycoonCarryHandler = GetComponent(); + _tycoonPickupHandler = GetComponent(); } private void Update() diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs new file mode 100644 index 000000000..775b2c836 --- /dev/null +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs @@ -0,0 +1,83 @@ +using BlueWater.Interfaces; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Players.Tycoons +{ + public class TycoonPickupHandler : MonoBehaviour + { + [SerializeField] + private SpriteRenderer _itemRenderer; + + [SerializeField] + private bool _isPickedUpItem; + + private IPickup _currentPickupItem; + + private void Awake() + { + InitializeComponents(); + } + + private void Start() + { + TycoonEvents.OnCocktailCompleted += PickupItem; + TycoonEvents.OnCocktailDiscarded += DiscardItem; + } + + private void OnDestroy() + { + TycoonEvents.OnCocktailCompleted -= PickupItem; + TycoonEvents.OnCocktailDiscarded -= DiscardItem; + } + + [Button("컴포넌트 초기화")] + private void InitializeComponents() + { + _itemRenderer = transform.Find("VisualLook/Item").GetComponent(); + } + + public void PickupItem(IPickup item) + { + if (_isPickedUpItem) + { + Debug.Log("이미 아이템을 들고 있습니다."); + return; + } + + _currentPickupItem = item; + _itemRenderer.enabled = false; + //_itemRenderer.sprite = item.Sprite; + _isPickedUpItem = true; + } + + public void GiveItem() + { + if (!_isPickedUpItem || _currentPickupItem == null) + { + Debug.Log("들고있는 아이템이 없거나, 현재 아이템 데이터가 비어있습니다."); + return; + } + + _currentPickupItem = null; + _itemRenderer.sprite = null; + _isPickedUpItem = false; + } + + public void DiscardItem() + { + if (!_isPickedUpItem || _currentPickupItem == null) + { + Debug.Log("들고있는 아이템이 없거나, 현재 아이템 데이터가 비어있습니다."); + return; + } + + _currentPickupItem = null; + _itemRenderer.sprite = null; + _isPickedUpItem = false; + } + + public IPickup GetCurrentPickupItem() => _currentPickupItem; + public bool IsPickedUpItem() => _isPickedUpItem; + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonCarryHandler.cs.meta b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs.meta similarity index 100% rename from Assets/02.Scripts/Character/Player/Tycoon/TycoonCarryHandler.cs.meta rename to Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs.meta diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 5e3fd5855..3609af58d 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -1,3 +1,4 @@ +using BlueWater.Interfaces; using BlueWater.Items; using BlueWater.Uis; using Sirenix.OdinInspector; @@ -42,7 +43,7 @@ namespace BlueWater.Players.Tycoons public SkeletonAnimation SkeletonAnimation { get; private set; } [field: SerializeField] - public FoodBalloonUi FoodBalloonUi { get; private set; } + public BalloonUi BalloonUi { get; private set; } [field: SerializeField] public TycoonInput TycoonInput { get; private set; } @@ -51,7 +52,7 @@ namespace BlueWater.Players.Tycoons public TycoonMovement TycoonMovement { get; private set; } [field: SerializeField] - public TycoonCarryHandler TycoonCarryHandler { get; private set; } + public TycoonPickupHandler TycoonPickupHandler { get; private set; } #endregion @@ -92,11 +93,11 @@ namespace BlueWater.Players.Tycoons PlayerInput = GetComponent(); VisualLook = transform.Find("VisualLook"); SkeletonAnimation = VisualLook.GetComponent(); - FoodBalloonUi = transform.Find("Canvas/FoodBalloonUi").GetComponent(); + BalloonUi = transform.Find("Canvas/BalloonUi").GetComponent(); TycoonInput = GetComponent(); TycoonMovement = GetComponent(); - TycoonCarryHandler = GetComponent(); + TycoonPickupHandler = GetComponent(); } private void InitializeChileComponents() @@ -123,32 +124,32 @@ namespace BlueWater.Players.Tycoons // Wrapping public void GetMoney(int money) => DataManager.Instance.GetMoney(money); - public bool IsCarriedItem() => TycoonCarryHandler.IsCarriedItem(); + public bool IsCarriedItem() => TycoonPickupHandler.IsPickedUpItem(); - public void CarryItem(string itemIdx, bool isUsingSprite = true, ItemQuality itemQuality = ItemQuality.Normal) - { - TycoonCarryHandler.CarryItem(itemIdx, isUsingSprite, itemQuality); - if (!isUsingSprite) - { - FoodBalloonUi.SetFoodImage(GetCurrentItemData().Idx); - FoodBalloonUi.ShowUi(); - } - } + // public void CarryItem(IPickup item) + // { + // TycoonCarryHandler.CarryItem(item); + // // if (!isUsingSprite) + // // { + // // FoodBalloonUi.SetFoodImage(GetCurrentItemData().Idx); + // // FoodBalloonUi.ShowUi(); + // // } + // } public void GiveItem() { - TycoonCarryHandler.GiveItem(); - FoodBalloonUi.HideUi(); - FoodBalloonUi.SetFoodImage(null); + TycoonPickupHandler.GiveItem(); + BalloonUi.HideUi(); + BalloonUi.SetItemImage(null); } - public void DiscardItem() - { - TycoonCarryHandler.DiscardItem(); - FoodBalloonUi.HideUi(); - FoodBalloonUi.SetFoodImage(null); - } - public ItemData GetCurrentItemData() => TycoonCarryHandler.GetCurrentItemData(); + // public void DiscardItem() + // { + // TycoonCarryHandler.DiscardItem(); + // BalloonUi.HideUi(); + // BalloonUi.SetItemImage(null); + // } + public IPickup GetCurrentItemData() => TycoonPickupHandler.GetCurrentPickupItem(); #endregion } diff --git a/Assets/02.Scripts/Interface/IPickup.cs b/Assets/02.Scripts/Interface/IPickup.cs new file mode 100644 index 000000000..01ff90103 --- /dev/null +++ b/Assets/02.Scripts/Interface/IPickup.cs @@ -0,0 +1,7 @@ +namespace BlueWater.Interfaces +{ + public interface IPickup : IIdx, ISprite + { + + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Interface/IPickup.cs.meta b/Assets/02.Scripts/Interface/IPickup.cs.meta new file mode 100644 index 000000000..e25f72dd5 --- /dev/null +++ b/Assets/02.Scripts/Interface/IPickup.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 93cc9ac7df9bd614d95805d0fdfcb2b6 +timeCreated: 1716899052 diff --git a/Assets/02.Scripts/Interface/ISprite.cs b/Assets/02.Scripts/Interface/ISprite.cs new file mode 100644 index 000000000..d7794463b --- /dev/null +++ b/Assets/02.Scripts/Interface/ISprite.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace BlueWater.Interfaces +{ + public interface ISprite + { + Sprite Sprite { get; } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Interface/ISprite.cs.meta b/Assets/02.Scripts/Interface/ISprite.cs.meta new file mode 100644 index 000000000..6253e2488 --- /dev/null +++ b/Assets/02.Scripts/Interface/ISprite.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 66904096aaaca614d88d13a6a40d42b5 +timeCreated: 1716899052 diff --git a/Assets/02.Scripts/Item/Cocktail/CocktailData.cs b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs index 22546007f..89be2205a 100644 --- a/Assets/02.Scripts/Item/Cocktail/CocktailData.cs +++ b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace BlueWater.Items { [Serializable] - public class CocktailData : IIdx + public class CocktailData : IPickup { [BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] diff --git a/Assets/02.Scripts/Item/ItemData.cs b/Assets/02.Scripts/Item/ItemData.cs index cde9ccceb..a554633c0 100644 --- a/Assets/02.Scripts/Item/ItemData.cs +++ b/Assets/02.Scripts/Item/ItemData.cs @@ -35,7 +35,7 @@ namespace BlueWater.Items } [Serializable] - public class ItemData : IIdx + public class ItemData : IPickup { [BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] diff --git a/Assets/02.Scripts/LiquidController.cs b/Assets/02.Scripts/LiquidController.cs index 4d1a6328c..4134e5988 100644 --- a/Assets/02.Scripts/LiquidController.cs +++ b/Assets/02.Scripts/LiquidController.cs @@ -1,3 +1,4 @@ +using System.Collections; using System.Collections.Generic; using System.Linq; using BlueWater.Items; @@ -7,7 +8,7 @@ using Sirenix.OdinInspector; using TMPro; using UnityEngine; using UnityEngine.Pool; -using UnityEngine.Serialization; +using UnityEngine.UI; namespace BlueWater { @@ -18,6 +19,9 @@ namespace BlueWater [Title("컴포넌트")] [SerializeField] private GameObject _liquidPanel; + + [SerializeField] + private GameObject _shaker; [SerializeField] private Renderer _renderTexture; @@ -30,6 +34,12 @@ namespace BlueWater [SerializeField] private TMP_Text _amountText; + + [SerializeField] + private Image _completeCocktailImage; + + [SerializeField] + private TMP_Text _completeText; [Title("스폰 데이터")] [SerializeField, Required] @@ -74,11 +84,12 @@ namespace BlueWater private IObjectPool _objectPool; private List _activeLiquids = new(); - private Dictionary _liquidDataCounts = new(); + private Dictionary _liquidDataCounts = new(7); private Material _instanceMaterial; private Tween _showTween; private Tween _hideTween; - + + private bool _isShowingPanel; private bool _isPouring; private float _startTime = float.PositiveInfinity; private int _instanceLiquidCount; @@ -102,10 +113,10 @@ namespace BlueWater { _objectPool = new ObjectPool(CreateObject, OnGetObject, OnReleaseObject, OnDestroyObject, maxSize: _objectPoolCount); - _hideTween = _liquidPanel.transform.DOMoveX(-150f, _moveDuration).From(-249f).Pause() + _hideTween = _liquidPanel.transform.DOMoveX(-150f, _moveDuration).Pause() .SetAutoKill(false); - _showTween = _liquidPanel.transform.DOMoveX(-249f, _moveDuration).From(-150f).Pause() + _showTween = _liquidPanel.transform.DOMoveX(-249f, _moveDuration).Pause() .SetAutoKill(false); } @@ -119,6 +130,10 @@ namespace BlueWater _instanceMaterial.SetFloat(_liquidAmountHash, 0f); _timeInterval = 1f / _liquidsPerSecond; + _shaker.SetActive(true); + _amountText.enabled = true; + _completeCocktailImage.enabled = false; + _completeText.enabled = false; _instanceLiquidCount = 0; SetCurrentAmount(0f); } @@ -137,7 +152,7 @@ namespace BlueWater // 술이 완성되었을 때 if (_instanceLiquidCount >= _maxLiquidCount) { - CompleteLiquid(); + StartCoroutine(nameof(CompleteCocktail)); return; } @@ -242,6 +257,10 @@ namespace BlueWater { if (_instanceLiquidCount == 0) { + _shaker.SetActive(true); + _amountText.enabled = true; + _completeCocktailImage.enabled = false; + _completeText.enabled = false; _currentMixedColor = _currentBarrel.GetLiquidData().Color; _instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity); } @@ -276,11 +295,13 @@ namespace BlueWater /// /// 술을 완성한 경우 /// - private void CompleteLiquid() + private IEnumerator CompleteCocktail() { InActiveIsPouring(); - // TODO : 완성된 음료를 데이터베이스와 비교하기 - var currentCocktailIngredients = new List(5); + + yield return new WaitUntil(() => _currentLiquidAmount >= _maxLiquidCount); + + var currentCocktailIngredients = new List(7); foreach (var element in _liquidDataCounts) { var idx = element.Key.Idx; @@ -342,12 +363,26 @@ namespace BlueWater if (matchingCocktail == null) { matchingCocktail = ItemManager.Instance.GetCocktailDataByIdx("Cocktail000"); + _completeText.text = "실패"; } + else + { + _completeText.text = $"성공!\n{matchingCocktail.Name}"; + } + + // TODO : 음료 제조 성공, 실패 연출 추가 + _shaker.SetActive(false); + _amountText.enabled = false; + _completeCocktailImage.sprite = matchingCocktail.Sprite; + _completeCocktailImage.enabled = true; + _completeText.enabled = true; + + // 1. 플레이어 음료 들기 + TycoonEvents.OnCocktailCompleted?.Invoke(matchingCocktail); - Debug.Log($"{matchingCocktail.Idx} 음료 완성"); - - - // TODO : 플레이어 이벤트를 통해 음료 들기 + yield return new WaitForSeconds(1f); + + HidePanel(); } /// @@ -392,12 +427,18 @@ namespace BlueWater public void ShowPanel() { + if (_isShowingPanel) return; + + _isShowingPanel = true; _hideTween.Pause(); _showTween.Restart(); } public void HidePanel() { + if (!_isShowingPanel) return; + + _isShowingPanel = false; _showTween.Pause(); _hideTween.Restart(); } diff --git a/Assets/02.Scripts/LiquidInteractionRegion.cs b/Assets/02.Scripts/LiquidInteractionRegion.cs index 095128577..d4e238c7d 100644 --- a/Assets/02.Scripts/LiquidInteractionRegion.cs +++ b/Assets/02.Scripts/LiquidInteractionRegion.cs @@ -6,6 +6,8 @@ namespace BlueWater { private void OnTriggerEnter(Collider other) { + if (GameManager.Instance.CurrentTycoonPlayer.IsCarriedItem()) return; + TycoonEvents.OnLiquidRegionEntered?.Invoke(); } diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index d32e8ef58..15f51c8d9 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -41,7 +41,7 @@ namespace BlueWater.Tycoons /// public override bool CanInteraction() { - return true; + return !CurrentTycoonPlayer.IsCarriedItem(); } public bool CanConsume(int amount) diff --git a/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs index caf57f1ec..cc83c72e0 100644 --- a/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs +++ b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs @@ -1,21 +1,21 @@ -using UnityEngine; - -namespace BlueWater.Tycoons -{ - public class BeverageMachine : InteractionFurniture - { - [SerializeField] - private string _itemIdx = "40001"; - - public override void Interaction() - { - // TODO : 미니게임을 시작하고, 성공 여부에 따라 음식 품질 부여 - CurrentTycoonPlayer.CarryItem(_itemIdx); - } - - public override bool CanInteraction() - { - return !CurrentTycoonPlayer.IsCarriedItem(); - } - } -} \ No newline at end of file +// using UnityEngine; +// +// namespace BlueWater.Tycoons +// { +// public class BeverageMachine : InteractionFurniture +// { +// [SerializeField] +// private string _itemIdx = "40001"; +// +// public override void Interaction() +// { +// // TODO : 미니게임을 시작하고, 성공 여부에 따라 음식 품질 부여 +// CurrentTycoonPlayer.CarryItem(_itemIdx); +// } +// +// public override bool CanInteraction() +// { +// return !CurrentTycoonPlayer.IsCarriedItem(); +// } +// } +// } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Cookware.cs b/Assets/02.Scripts/Prop/Tycoon/Cookware.cs index ac6afadcc..ab74970f8 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Cookware.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Cookware.cs @@ -128,7 +128,7 @@ namespace BlueWater.Tycoons else { var foodData = _cookedFoodDatas.Dequeue(); - CurrentTycoonPlayer.CarryItem(foodData.Idx, false); + //CurrentTycoonPlayer.CarryItem(foodData.Idx, false); } } diff --git a/Assets/02.Scripts/Prop/Tycoon/FireWood.cs b/Assets/02.Scripts/Prop/Tycoon/FireWood.cs index 8539b528d..1d09b2520 100644 --- a/Assets/02.Scripts/Prop/Tycoon/FireWood.cs +++ b/Assets/02.Scripts/Prop/Tycoon/FireWood.cs @@ -1,20 +1,20 @@ -using UnityEngine; - -namespace BlueWater.Tycoons -{ - public class FireWood : InteractionFurniture - { - [SerializeField] - private string _itemIdx = "70001"; - - public override void Interaction() - { - CurrentTycoonPlayer.CarryItem(_itemIdx); - } - - public override bool CanInteraction() - { - return IsOpened && !CurrentTycoonPlayer.IsCarriedItem(); - } - } -} \ No newline at end of file +// using UnityEngine; +// +// namespace BlueWater.Tycoons +// { +// public class FireWood : InteractionFurniture +// { +// [SerializeField] +// private string _itemIdx = "70001"; +// +// public override void Interaction() +// { +// CurrentTycoonPlayer.CarryItem(_itemIdx); +// } +// +// public override bool CanInteraction() +// { +// return IsOpened && !CurrentTycoonPlayer.IsCarriedItem(); +// } +// } +// } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index 7ba64db6e..da6345a23 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -4,7 +4,8 @@ namespace BlueWater.Tycoons { public override void Interaction() { - CurrentTycoonPlayer.DiscardItem(); + TycoonEvents.OnCocktailDiscarded?.Invoke(); + //CurrentTycoonPlayer.DiscardItem(); } public override bool CanInteraction() diff --git a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset index 2b6e03411..29d474dfb 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset @@ -40,7 +40,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 06a07650d842ee94390ca2505955e94d, type: 3} - k__BackingField: Cocktail002 k__BackingField: "\uCE75\uD14C\uC77CB" k__BackingField: 0 @@ -54,7 +54,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 19df9fcd0ddf5754890f7ea9c127b905, type: 3} - k__BackingField: Cocktail003 k__BackingField: "\uCE75\uD14C\uC77CC" k__BackingField: 0 @@ -68,7 +68,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: a51b37c5e512c7e488e80f986f5f8aac, type: 3} - k__BackingField: Cocktail004 k__BackingField: "\uCE75\uD14C\uC77CD" k__BackingField: 0 @@ -82,7 +82,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: d74e702a3e490a54e8a159128222f175, type: 3} - k__BackingField: Cocktail005 k__BackingField: "\uCE75\uD14C\uC77CE" k__BackingField: 0 @@ -96,7 +96,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: bff0ff1345b7ae446b330a01e6ef7bd3, type: 3} - k__BackingField: Cocktail006 k__BackingField: "\uCE75\uD14C\uC77CAC" k__BackingField: 5 @@ -110,7 +110,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 006a36cba2a146247a1d25b9e246faaa, type: 3} - k__BackingField: Cocktail007 k__BackingField: "\uCE75\uD14C\uC77CBD" k__BackingField: 5 @@ -124,7 +124,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 31d7e535d499d5f43ab64731acc3eec3, type: 3} - k__BackingField: Cocktail008 k__BackingField: "\uCE75\uD14C\uC77CCD" k__BackingField: 5 @@ -138,7 +138,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 997d0aea13894a9428bf9d9f7fb66762, type: 3} - k__BackingField: Cocktail009 k__BackingField: "\uCE75\uD14C\uC77CABE" k__BackingField: 10 @@ -152,7 +152,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 3d04bfa220b9ebe40a4ae3f0a68c0911, type: 3} - k__BackingField: Cocktail010 k__BackingField: "\uCE75\uD14C\uC77CCDE" k__BackingField: 10 @@ -166,7 +166,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 09168d6395b3e9b41b195a2aa8ae0a82, type: 3} - k__BackingField: Cocktail011 k__BackingField: "\uCE75\uD14C\uC77CB1" k__BackingField: 10 diff --git a/Assets/02.Scripts/Tycoon/TycoonData.cs b/Assets/02.Scripts/Tycoon/TycoonData.cs index a0d7904e2..e0edb6111 100644 --- a/Assets/02.Scripts/Tycoon/TycoonData.cs +++ b/Assets/02.Scripts/Tycoon/TycoonData.cs @@ -27,7 +27,7 @@ namespace BlueWater.Tycoons if (foodData == null) return; FoodRecipes.Add(idx); - TycoonEvents.OnFoodRecipeAcquired?.Invoke(idx); + //TycoonEvents.OnFoodRecipeAcquired?.Invoke(idx); } public void AddDrinkRecipe(string idx) diff --git a/Assets/02.Scripts/Tycoon/TycoonEvents.cs b/Assets/02.Scripts/Tycoon/TycoonEvents.cs index 21f50d0bd..13caba042 100644 --- a/Assets/02.Scripts/Tycoon/TycoonEvents.cs +++ b/Assets/02.Scripts/Tycoon/TycoonEvents.cs @@ -11,10 +11,12 @@ namespace BlueWater public static Action OnLiquidRegionEntered; public static Action OnLiquidRegionExited; - - - + + public static Action OnCocktailCompleted; + public static Action OnCocktailDiscarded; + + // 요리 - public static Action OnFoodRecipeAcquired; + //public static Action OnFoodRecipeAcquired; } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs similarity index 51% rename from Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs rename to Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs index 6cf298cd5..609cc29e2 100644 --- a/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs @@ -1,3 +1,4 @@ +using BlueWater.Interfaces; using BlueWater.Items; using BlueWater.Tycoons; using DG.Tweening; @@ -7,14 +8,17 @@ using UnityEngine.UI; namespace BlueWater.Uis { - public class FoodBalloonUi : MonoBehaviour + public class BalloonUi : MonoBehaviour { - [field: Title("컴포넌트")] - [field: SerializeField, Required] - public Image FillImage { get; private set; } + [Title("컴포넌트")] + [SerializeField, Required] + private Image _fillImage; - [field: SerializeField, Required] - public Image FoodImage { get; private set; } + [SerializeField, Required] + private Image _itemImage; + + [SerializeField] + private GameObject _panel; [Title("주문 정보")] [SerializeField, DisableIf("@true")] @@ -24,7 +28,7 @@ namespace BlueWater.Uis private bool _isWaitTimeOver; [SerializeField, DisableIf("@true")] - private bool _isFoodReceived; + private bool _isItemReceived; private Tween _tween; private TableSeat _tableSeat; @@ -34,17 +38,26 @@ namespace BlueWater.Uis { InitializeComponents(); } + + private void Start() + { + TycoonEvents.OnCocktailCompleted += SetItemImage; + TycoonEvents.OnCocktailDiscarded += DiscardItem; + } private void OnDestroy() { + TycoonEvents.OnCocktailCompleted -= SetItemImage; + TycoonEvents.OnCocktailDiscarded -= DiscardItem; _tween.Kill(); } [Button("컴포넌트 초기화")] private void InitializeComponents() { - FillImage = transform.Find("Background/FillImage").GetComponent(); - FoodImage = transform.Find("FoodImage").GetComponent(); + _fillImage = transform.Find("Panel/FillImage").GetComponent(); + _itemImage = transform.Find("Panel/FoodImage").GetComponent(); + _panel = transform.Find("Panel").gameObject; } public void Initialize(TableSeat tableSeat) @@ -53,39 +66,48 @@ namespace BlueWater.Uis HideUi(); } - public void ShowUi() => gameObject.SetActive(true); - public void HideUi() => gameObject.SetActive(false); + public void ShowUi() => _panel.SetActive(true); + public void HideUi() => _panel.SetActive(false); - public void SetFoodImage(string foodIdx) + public void SetItemImage(IPickup item) { - _orderItemData = ItemManager.Instance.GetItemDataByIdx(foodIdx); - if (_orderItemData == null) + //_orderItemData = ItemManager.Instance.GetItemDataByIdx(foodIdx); + // if (_orderItemData == null) + // { + // Debug.LogError($"{foodIdx} 해당 음식을 등록할 수 없습니다."); + // return; + // } + + if (!item.Sprite) { - Debug.LogError($"{foodIdx} 해당 음식을 등록할 수 없습니다."); - return; + Debug.LogWarning($"{item.Sprite} 해당 음식의 이미지가 없습니다."); } - if (!_orderItemData.Sprite) - { - Debug.LogWarning($"{_orderItemData.Sprite} 해당 음식의 이미지가 없습니다."); - } - FoodImage.sprite = _orderItemData.Sprite; + SetItemSprite(item.Sprite); + ShowUi(); } - public void SetFoodSprite(Sprite sprite) + public void SetItemSprite(Sprite sprite) { - FoodImage.sprite = sprite; + _itemImage.sprite = sprite; } - public void OrderFood(string foodIdx, int waitTime, int hurryTime) + public void DiscardItem() { + HideUi(); + SetItemImage(null); + } + + public void OrderItem(string itemIdx, int waitTime, int hurryTime) + { + _orderItemData = ItemManager.Instance.GetItemDataByIdx(itemIdx); _isOrdered = true; _isWaitTimeOver = false; - _isFoodReceived = false; - SetFoodImage(foodIdx); + _isItemReceived = false; + SetItemImage(_orderItemData); ShowUi(); - _tween = FillImage.DOFillAmount(1f, hurryTime) + _tween = _fillImage.DOFillAmount(1f, hurryTime) .From(0f) .SetEase(Ease.Linear) .SetDelay(waitTime) @@ -98,11 +120,11 @@ namespace BlueWater.Uis { _isOrdered = true; _isWaitTimeOver = false; - _isFoodReceived = false; - SetFoodSprite(DataManager.Instance.SpriteDataSo.Gold); + _isItemReceived = false; + SetItemSprite(DataManager.Instance.SpriteDataSo.Gold); ShowUi(); - _tween = FillImage.DOFillAmount(1f, hurryTime) + _tween = _fillImage.DOFillAmount(1f, hurryTime) .From(0f) .SetEase(Ease.Linear) .SetDelay(waitTime) @@ -118,7 +140,7 @@ namespace BlueWater.Uis } public bool IsWaitTimeOver() => _isOrdered && _isWaitTimeOver; - public bool IsFoodReceive() => _isFoodReceived; + public bool IsFoodReceive() => _isItemReceived; public void CancelOrder() { @@ -130,7 +152,7 @@ namespace BlueWater.Uis _tableSeat.DirtyTable(); _tween.Kill(); HideUi(); - _isFoodReceived = true; + _isItemReceived = true; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs.meta rename to Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs.meta diff --git a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs index c58dfb72f..e288e471d 100644 --- a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs @@ -62,13 +62,13 @@ namespace BlueWater.Uis private void Start() { - TycoonEvents.OnFoodRecipeAcquired += AddFoodRecipe; + //TycoonEvents.OnFoodRecipeAcquired += AddFoodRecipe; _dataManager.Inventory.OnChangeItemSlot += OnInventoryChange; } private void OnDestroy() { - TycoonEvents.OnFoodRecipeAcquired -= AddFoodRecipe; + //TycoonEvents.OnFoodRecipeAcquired -= AddFoodRecipe; _dataManager.Inventory.OnChangeItemSlot -= OnInventoryChange; } diff --git a/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs b/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs index 0ca8b60dd..9f14887b7 100644 --- a/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs @@ -53,7 +53,7 @@ namespace BlueWater.Uis Destroy(indicator.gameObject); return; } - var target = customer.FoodBalloonUi.transform; + var target = customer.BalloonUi.transform; var screenPosition = _mainCamera.WorldToScreenPoint(target.position); if (!target.gameObject.activeSelf) diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta index 358b5027b..d44ebfa94 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta index d82ed322d..5c0f6d53c 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta index e0bfd0494..41ff6023f 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta index 225bc4f83..5cf7436f1 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta index 9362e4c8d..719cefd20 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + alignment: 9 + spritePivot: {x: 0.5, y: 0.08} + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta index b625f35e8..1cee2478f 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta index 0502434e1..62958f942 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta index 417d80f91..68d9b4d83 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta index c8067b5ca..f77ad4377 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta index 598eca195..f5b18f2c4 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index f932ff794..5aac607a0 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -231,6 +231,7 @@ GameObject: - component: {fileID: 2935942385829016914} - component: {fileID: 6054159730444663926} - component: {fileID: 1063431021331126030} + - component: {fileID: 3359549505901716120} - component: {fileID: 6662554121718997272} - component: {fileID: 1674052485383758547} - component: {fileID: 4836489897218844789} @@ -548,10 +549,27 @@ MonoBehaviour: k__BackingField: {fileID: 6054159730444663926} k__BackingField: {fileID: 6509241874729291456} k__BackingField: {fileID: 7125556968546628472} - k__BackingField: {fileID: 2412195434237916265} + k__BackingField: {fileID: 0} k__BackingField: {fileID: 1674052485383758547} k__BackingField: {fileID: 4836489897218844789} k__BackingField: {fileID: 909302231676134912} +--- !u!114 &3359549505901716120 +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: 6ff2dc3fa7a6be445bf8e71043f86d2e, type: 3} + m_Name: + m_EditorClassIdentifier: + _spriteRenderer: {fileID: 5527707380059080408} + k__BackingField: 10 + k__BackingField: 4 + k__BackingField: 0 + k__BackingField: 0 --- !u!114 &6662554121718997272 MonoBehaviour: m_ObjectHideFlags: 0 @@ -596,7 +614,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb167e66df896c745a538310e5a52f61, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: 12 + k__BackingField: 7 --- !u!114 &909302231676134912 MonoBehaviour: m_ObjectHideFlags: 0 @@ -723,9 +741,13 @@ PrefabInstance: m_Modifications: - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} propertyPath: m_Name - value: FoodBalloonUi + value: BalloonUi objectReference: {fileID: 0} - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1505211282054036597, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} @@ -826,17 +848,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} ---- !u!114 &2412195434237916265 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - m_PrefabInstance: {fileID: 448763968479860601} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &2494354617667434336 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} diff --git a/Assets/05.Prefabs/Uis/FoodBalloonUi.prefab b/Assets/05.Prefabs/Uis/BalloonUi.prefab similarity index 85% rename from Assets/05.Prefabs/Uis/FoodBalloonUi.prefab rename to Assets/05.Prefabs/Uis/BalloonUi.prefab index 56aacd267..3cd1ee94f 100644 --- a/Assets/05.Prefabs/Uis/FoodBalloonUi.prefab +++ b/Assets/05.Prefabs/Uis/BalloonUi.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2641341650102689817} - component: {fileID: 2829248495233098512} m_Layer: 5 - m_Name: FoodBalloonUi + m_Name: BalloonUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -29,8 +29,7 @@ RectTransform: m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 1610583026884195458} - - {fileID: 6400894162898819538} + - {fileID: 674323407039969650} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -50,15 +49,50 @@ MonoBehaviour: 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 + _fillImage: {fileID: 2173167918881327799} + _itemImage: {fileID: 8218406547424483500} + _panel: {fileID: 1505211282054036597} _isOrdered: 0 _isWaitTimeOver: 0 - _isFoodReceived: 0 + _isItemReceived: 0 +--- !u!1 &1505211282054036597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 674323407039969650} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &674323407039969650 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1505211282054036597} + 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: 1610583026884195458} + - {fileID: 6751494179874491372} + - {fileID: 6400894162898819538} + 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!1 &2909533541407981610 GameObject: m_ObjectHideFlags: 0 @@ -84,13 +118,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2909533541407981610} - 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: 6751494179874491372} - m_Father: {fileID: 2641341650102689817} + m_Children: [] + m_Father: {fileID: 674323407039969650} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -160,12 +193,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3361235759547244541} - 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: 2641341650102689817} + m_Father: {fileID: 674323407039969650} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -240,7 +273,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1610583026884195458} + m_Father: {fileID: 674323407039969650} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/05.Prefabs/Uis/FoodBalloonUi.prefab.meta b/Assets/05.Prefabs/Uis/BalloonUi.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Uis/FoodBalloonUi.prefab.meta rename to Assets/05.Prefabs/Uis/BalloonUi.prefab.meta diff --git a/Assets/05.Prefabs/Uis/PlayerHealthPointUi.prefab b/Assets/05.Prefabs/Uis/PlayerHealthPointUi.prefab new file mode 100644 index 000000000..f614d7e69 --- /dev/null +++ b/Assets/05.Prefabs/Uis/PlayerHealthPointUi.prefab @@ -0,0 +1,437 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6899510603462767330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6232410504416114464} + - component: {fileID: 7088576196078217141} + m_Layer: 5 + m_Name: HealthPointLayout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6232410504416114464 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6899510603462767330} + 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: 6276399603260653652} + - {fileID: 4429608632515511125} + - {fileID: 7086445591134895074} + m_Father: {fileID: 879980064875257461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 170, y: -130} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0} +--- !u!114 &7088576196078217141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6899510603462767330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &9026075075559676996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 879980064875257461} + - component: {fileID: 940439430324203188} + m_Layer: 5 + m_Name: PlayerHealthPointUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &879980064875257461 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9026075075559676996} + 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: 6232410504416114464} + m_Father: {fileID: 0} + 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 &940439430324203188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9026075075559676996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95a0ff880fd9f5942880892d403f67be, type: 3} + m_Name: + m_EditorClassIdentifier: + _healthPointLayout: {fileID: 6232410504416114464} + _healthPointPrefab: {fileID: 7026391210700039621, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + _maxHeartCount: 2 + _healthPointImageList: [] + _fullHeart: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} + _halfHeart: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} + _emptyHeart: {fileID: 21300000, guid: b519b8a1ceacfad4c834eb059d4004a7, type: 3} +--- !u!1001 &720849601358467280 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6232410504416114464} + m_Modifications: + - target: {fileID: 1582184245155240560, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7026391210700039621, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Name + value: HealthPoint (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} +--- !u!224 &4429608632515511125 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + m_PrefabInstance: {fileID: 720849601358467280} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6134401636981352551 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6232410504416114464} + m_Modifications: + - target: {fileID: 1582184245155240560, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b519b8a1ceacfad4c834eb059d4004a7, type: 3} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7026391210700039621, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Name + value: HealthPoint (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} +--- !u!224 &7086445591134895074 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + m_PrefabInstance: {fileID: 6134401636981352551} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6945563682942374865 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6232410504416114464} + m_Modifications: + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7026391210700039621, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + propertyPath: m_Name + value: HealthPoint (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} +--- !u!224 &6276399603260653652 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} + m_PrefabInstance: {fileID: 6945563682942374865} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Uis/PlayerHealthPointUi.prefab.meta b/Assets/05.Prefabs/Uis/PlayerHealthPointUi.prefab.meta new file mode 100644 index 000000000..dd87c3167 --- /dev/null +++ b/Assets/05.Prefabs/Uis/PlayerHealthPointUi.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4b432bbf05a7bc74bb0dd15b5afd23d1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: