diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 173bae287..c59838c31 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -325,7 +325,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 380.16498, y: -40} + m_AnchoredPosition: {x: 376.95502, y: -40} m_SizeDelta: {x: 89.91, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2500241 @@ -704,8 +704,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 32.55, y: -25} - m_SizeDelta: {x: 65.1, y: 50} + m_AnchoredPosition: {x: 31.15, y: -25} + m_SizeDelta: {x: 62.3, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &12804393 MonoBehaviour: @@ -916,6 +916,114 @@ RectTransform: m_AnchoredPosition: {x: 120, y: 60} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0, y: 0.5} +--- !u!1 &36683365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 36683366} + - component: {fileID: 36683368} + - component: {fileID: 36683367} + m_Layer: 0 + m_Name: Reaper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &36683366 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36683365} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 224855552} + 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: 10} + m_SizeDelta: {x: 0, y: -10} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &36683367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36683365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} + additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2} + multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} + screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} + initialSkinName: Reaper + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: Idle + startingLoop: 1 + timeScale: 1 + freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 100, y: 90} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 50, y: 50} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 + disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + tintBlack: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 + addNormals: 0 + calculateTangents: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 1 +--- !u!222 &36683368 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36683365} + m_CullTransparentMesh: 0 --- !u!1 &36890403 GameObject: m_ObjectHideFlags: 0 @@ -1279,8 +1387,8 @@ RectTransform: m_GameObject: {fileID: 59395253} 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_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1020820158} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1309,7 +1417,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 90f596bc1a735a544985584af0b4180a, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2} multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} @@ -1435,6 +1543,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 65069261} m_CullTransparentMesh: 1 +--- !u!1 &66305887 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 66305888} + - component: {fileID: 66305890} + - component: {fileID: 66305889} + m_Layer: 0 + m_Name: BigCatCountText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &66305888 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66305887} + 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: 1456473589} + 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: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &66305889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66305887} + 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: 17 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 19.5 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 10 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + 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: 10, w: 5} + 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 &66305890 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66305887} + m_CullTransparentMesh: 1 --- !u!1 &74742330 GameObject: m_ObjectHideFlags: 0 @@ -1510,6 +1754,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 74742330} m_CullTransparentMesh: 1 +--- !u!1 &79379951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 79379952} + - component: {fileID: 79379954} + - component: {fileID: 79379953} + m_Layer: 0 + m_Name: Cat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &79379952 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79379951} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1362304708} + 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: 10} + m_SizeDelta: {x: 0, y: -10} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &79379953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79379951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} + additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2} + multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} + screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} + initialSkinName: Cat + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: Idle + startingLoop: 1 + timeScale: 1 + freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 100, y: 90} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 50, y: 50} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 + disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + tintBlack: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 + addNormals: 0 + calculateTangents: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 1 +--- !u!222 &79379954 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79379951} + m_CullTransparentMesh: 0 --- !u!1 &82702149 GameObject: m_ObjectHideFlags: 0 @@ -1918,6 +2270,96 @@ RectTransform: m_AnchoredPosition: {x: 420, y: -740} m_SizeDelta: {x: 500, y: 200} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &101386953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 101386954} + - component: {fileID: 101386957} + - component: {fileID: 101386956} + - component: {fileID: 101386955} + m_Layer: 0 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &101386954 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101386953} + 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: 523716906} + m_Father: {fileID: 576950865} + 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: -17, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &101386955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101386953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &101386956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101386953} + 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: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &101386957 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101386953} + m_CullTransparentMesh: 1 --- !u!1 &112100208 GameObject: m_ObjectHideFlags: 0 @@ -2191,6 +2633,81 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4adbdb8a3e6e56a48bda3ac6f71ca7d6, type: 3} +--- !u!1 &120387391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 120387392} + - component: {fileID: 120387394} + - component: {fileID: 120387393} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &120387392 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120387391} + 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: 1 + m_Children: [] + m_Father: {fileID: 224855552} + 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 &120387393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120387391} + 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: -470869312, guid: 7a2ad0f9c5cea4e4a93b16927cbe345d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &120387394 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120387391} + m_CullTransparentMesh: 1 --- !u!1 &128638923 GameObject: m_ObjectHideFlags: 0 @@ -3997,6 +4514,44 @@ Transform: m_Children: [] m_Father: {fileID: 1247057679} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &224855551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224855552} + m_Layer: 0 + m_Name: ReaperPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224855552 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 224855551} + 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: 1 + m_Children: + - {fileID: 120387392} + - {fileID: 36683366} + - {fileID: 1801694554} + m_Father: {fileID: 523716906} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 230, y: -170} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 0.5} --- !u!1 &238295948 GameObject: m_ObjectHideFlags: 0 @@ -4738,7 +5293,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 65.1, y: 50} + m_SizeDelta: {x: 63.7, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &317738612 MonoBehaviour: @@ -5239,7 +5794,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -620} - m_SizeDelta: {x: 455.12, y: 80} + m_SizeDelta: {x: 451.91, y: 80} m_Pivot: {x: 0, y: 1} --- !u!114 &360332282 MonoBehaviour: @@ -5356,6 +5911,81 @@ RectTransform: m_AnchoredPosition: {x: 375, y: -820} m_SizeDelta: {x: 400, y: 80} m_Pivot: {x: 0, y: 1} +--- !u!1 &364785868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 364785869} + - component: {fileID: 364785871} + - component: {fileID: 364785870} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &364785869 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364785868} + 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: 1859753382} + 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: -25} + m_SizeDelta: {x: 0, y: -50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &364785870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364785868} + 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: -1008828825, guid: f801c7a39de0a8346834c71f800a1b89, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 0.4 +--- !u!222 &364785871 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364785868} + m_CullTransparentMesh: 1 --- !u!224 &390190191 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} @@ -5740,7 +6370,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 295.21, y: -40} + m_AnchoredPosition: {x: 292, y: -40} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &397830968 @@ -6549,68 +7179,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 457110616} m_CullTransparentMesh: 1 ---- !u!1 &457281263 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 457281264} - - component: {fileID: 457281265} - m_Layer: 0 - m_Name: CustomerContents - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &457281264 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 457281263} - 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: 1664966044} - - {fileID: 1020820158} - m_Father: {fileID: 1859753382} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -200, y: -25} - m_SizeDelta: {x: -400, y: -50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &457281265 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 457281263} - 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: 15 - m_Bottom: 0 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 100, y: 100} - m_Spacing: {x: 20, y: 20} - m_Constraint: 0 - m_ConstraintCount: 2 --- !u!1 &458189251 GameObject: m_ObjectHideFlags: 0 @@ -6769,11 +7337,21 @@ MonoBehaviour: _playTimeText: {fileID: 1702222118} _textPanel: {fileID: 506336967} _customerPanel: {fileID: 1859753381} - _customerContents: {fileID: 457281263} + _customerContents: {fileID: 523716905} + _bigCatPanel: {fileID: 1456473588} + _bigCatText: {fileID: 66305889} _casperPanel: {fileID: 1664966043} _casperText: {fileID: 2133606848} + _casperBlackPanel: {fileID: 1815122252} + _casperBlackText: {fileID: 1775296412} + _catPanel: {fileID: 1362304707} + _catText: {fileID: 2073585777} _pumpkinPanel: {fileID: 1020820157} _pumpkinText: {fileID: 482237047} + _reaperPanel: {fileID: 224855551} + _reaperText: {fileID: 1801694555} + _witchPanel: {fileID: 1650262934} + _witchText: {fileID: 1969196291} _serviceTitlePanel: {fileID: 486516631} _serviceContents: {fileID: 803247301} _goodServingPanel: {fileID: 1055757104} @@ -7421,7 +7999,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 97.66, y: 50} + m_SizeDelta: {x: 94.16, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &486516633 MonoBehaviour: @@ -7557,6 +8135,114 @@ RectTransform: m_AnchoredPosition: {x: 440, y: -200} m_SizeDelta: {x: 800, y: 700} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &515830651 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 515830652} + - component: {fileID: 515830654} + - component: {fileID: 515830653} + m_Layer: 0 + m_Name: Witch + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &515830652 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515830651} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1650262935} + 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: 10} + m_SizeDelta: {x: 0, y: -10} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &515830653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515830651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} + additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2} + multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} + screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} + initialSkinName: Witch + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: Idle + startingLoop: 1 + timeScale: 1 + freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 100, y: 90} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 50, y: 50} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 + disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + tintBlack: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 + addNormals: 0 + calculateTangents: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 1 +--- !u!222 &515830654 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515830651} + m_CullTransparentMesh: 0 --- !u!1 &520472643 GameObject: m_ObjectHideFlags: 0 @@ -7592,8 +8278,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 48.83, y: -25} - m_SizeDelta: {x: 97.66, y: 50} + m_AnchoredPosition: {x: 47.08, y: -25} + m_SizeDelta: {x: 94.16, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &520472645 MonoBehaviour: @@ -7844,6 +8530,88 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} m_PrefabInstance: {fileID: 523077441} m_PrefabAsset: {fileID: 0} +--- !u!1 &523716905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 523716906} + - component: {fileID: 523716908} + - component: {fileID: 523716907} + m_Layer: 0 + m_Name: CustomerContents + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &523716906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523716905} + 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: 1456473589} + - {fileID: 1664966044} + - {fileID: 1815122253} + - {fileID: 1362304708} + - {fileID: 1020820158} + - {fileID: 224855552} + - {fileID: 1650262935} + m_Father: {fileID: 101386954} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 330} + m_Pivot: {x: 0, y: 1} +--- !u!114 &523716907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523716905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &523716908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523716905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 0 + m_Top: 10 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 100, y: 100} + m_Spacing: {x: 10, y: 10} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &524864262 GameObject: m_ObjectHideFlags: 0 @@ -9024,7 +9792,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -9080,6 +9848,74 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} m_PrefabInstance: {fileID: 571403219} m_PrefabAsset: {fileID: 0} +--- !u!1 &576950864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 576950865} + - component: {fileID: 576950866} + m_Layer: 0 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &576950865 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576950864} + 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: 101386954} + - {fileID: 1116646557} + m_Father: {fileID: 1859753382} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 7.5, y: -22.5} + m_SizeDelta: {x: -15, y: -75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &576950866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576950864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 523716906} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 101386954} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1116646558} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &587565434 GameObject: m_ObjectHideFlags: 0 @@ -9656,11 +10492,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_LocalPosition.x @@ -9720,6 +10556,81 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} m_PrefabInstance: {fileID: 617149344} m_PrefabAsset: {fileID: 0} +--- !u!1 &624707118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 624707119} + - component: {fileID: 624707121} + - component: {fileID: 624707120} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &624707119 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 624707118} + 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: 1815122253} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &624707120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 624707118} + 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: -470869312, guid: 7a2ad0f9c5cea4e4a93b16927cbe345d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &624707121 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 624707118} + m_CullTransparentMesh: 1 --- !u!1 &666339244 GameObject: m_ObjectHideFlags: 0 @@ -11645,11 +12556,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_LocalPosition.x @@ -12231,8 +13142,8 @@ RectTransform: m_GameObject: {fileID: 821361347} 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_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1664966044} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12261,7 +13172,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 90f596bc1a735a544985584af0b4180a, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2} multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} @@ -12735,8 +13646,8 @@ MonoBehaviour: k__BackingField: {fileID: 613509651} _confinerCollider: {fileID: 1589932376} _transparencySortAxis: {x: 0, y: 0, z: 0} - _cameraDistance: {x: 5, y: 10} - _initializedDistance: 7 + _cameraDistance: {x: 3, y: 10} + _initializedDistance: 6 _zoomPower: 0.5 _zoomLerpSpeed: 5 _zoomOutConfinerScale: {x: 1, y: 1, z: 0} @@ -12953,6 +13864,114 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15c02fef22ba8d0488bd2517167c117c, type: 3} +--- !u!1 &878297866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 878297867} + - component: {fileID: 878297869} + - component: {fileID: 878297868} + m_Layer: 0 + m_Name: CasperBlack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &878297867 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878297866} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1815122253} + 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: 10} + m_SizeDelta: {x: 0, y: -10} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &878297868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878297866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} + additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2} + multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} + screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} + initialSkinName: CasperBlack + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: Idle + startingLoop: 1 + timeScale: 1 + freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 100, y: 90} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 50, y: 50} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 + disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + tintBlack: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 + addNormals: 0 + calculateTangents: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 1 +--- !u!222 &878297869 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878297866} + m_CullTransparentMesh: 0 --- !u!1 &887608711 GameObject: m_ObjectHideFlags: 0 @@ -13626,11 +14645,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -120 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -14490,11 +15509,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 120 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -14581,11 +15600,11 @@ RectTransform: - {fileID: 1390149474} - {fileID: 59395254} - {fileID: 482237046} - m_Father: {fileID: 457281264} + m_Father: {fileID: 523716906} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120, y: -65} + m_AnchoredPosition: {x: 120, y: -170} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!1 &1024788552 @@ -14905,6 +15924,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045083343} m_CullTransparentMesh: 1 +--- !u!1 &1048730009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1048730010} + - component: {fileID: 1048730012} + - component: {fileID: 1048730011} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1048730010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1048730009} + 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: 1456473589} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1048730011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1048730009} + 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: -470869312, guid: 7a2ad0f9c5cea4e4a93b16927cbe345d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1048730012 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1048730009} + m_CullTransparentMesh: 1 --- !u!1 &1049919588 GameObject: m_ObjectHideFlags: 0 @@ -15101,8 +16195,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 32.55, y: -25} - m_SizeDelta: {x: 65.1, y: 50} + m_AnchoredPosition: {x: 31.85, y: -25} + m_SizeDelta: {x: 63.7, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1057389866 MonoBehaviour: @@ -15412,11 +16506,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_LocalPosition.x @@ -15785,6 +16879,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1108220445} m_CullTransparentMesh: 1 +--- !u!1 &1116646556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1116646557} + - component: {fileID: 1116646560} + - component: {fileID: 1116646559} + - component: {fileID: 1116646558} + m_Layer: 0 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1116646557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116646556} + 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: 1642640525} + m_Father: {fileID: 576950865} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -10, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1116646558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116646556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1791917413} + m_HandleRect: {fileID: 1791917412} + m_Direction: 2 + m_Value: 1 + m_Size: 0.6818182 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1116646559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116646556} + 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: -253798138, guid: 9c75448aaba29644fb4aabe6a37bcec6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1116646560 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116646556} + m_CullTransparentMesh: 1 --- !u!1 &1118217337 GameObject: m_ObjectHideFlags: 0 @@ -16129,6 +17349,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120635348} m_CullTransparentMesh: 1 +--- !u!1 &1131995072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1131995073} + - component: {fileID: 1131995075} + - component: {fileID: 1131995074} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1131995073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1131995072} + 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: 1 + m_Children: [] + m_Father: {fileID: 1650262935} + 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 &1131995074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1131995072} + 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: -470869312, guid: 7a2ad0f9c5cea4e4a93b16927cbe345d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1131995075 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1131995072} + m_CullTransparentMesh: 1 --- !u!1001 &1136323432 PrefabInstance: m_ObjectHideFlags: 0 @@ -20449,11 +21744,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_LocalPosition.x @@ -20749,6 +22044,44 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1362014170} m_CullTransparentMesh: 1 +--- !u!1 &1362304707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1362304708} + m_Layer: 0 + m_Name: CatPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1362304708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1362304707} + 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: 1 + m_Children: + - {fileID: 1682876233} + - {fileID: 79379952} + - {fileID: 2073585776} + m_Father: {fileID: 523716906} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -170} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 0.5} --- !u!1001 &1362588138 PrefabInstance: m_ObjectHideFlags: 0 @@ -22271,6 +23604,44 @@ MonoBehaviour: m_EditorClassIdentifier: propertyName: _OffsetX propertyValue: -1 +--- !u!1 &1456473588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1456473589} + m_Layer: 0 + m_Name: BigCatPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1456473589 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456473588} + 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: 1 + m_Children: + - {fileID: 1048730010} + - {fileID: 2043182521} + - {fileID: 66305888} + m_Father: {fileID: 523716906} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -60} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 0.5} --- !u!4 &1463369138 stripped Transform: m_CorrespondingSourceObject: {fileID: 6190127373159935981, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} @@ -22358,11 +23729,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_LocalPosition.x @@ -23209,11 +24580,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_LocalPosition.x @@ -24390,11 +25761,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_LocalPosition.x @@ -24631,6 +26002,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1642317689} m_CullTransparentMesh: 1 +--- !u!1 &1642640524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1642640525} + m_Layer: 0 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1642640525 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642640524} + 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: 1791917412} + m_Father: {fileID: 1116646557} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1645076291 GameObject: m_ObjectHideFlags: 0 @@ -24808,6 +26215,44 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!1 &1650262934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1650262935} + m_Layer: 0 + m_Name: WitchPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1650262935 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1650262934} + 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: 1 + m_Children: + - {fileID: 1131995073} + - {fileID: 515830652} + - {fileID: 1969196290} + m_Father: {fileID: 523716906} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -280} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 0.5} --- !u!1 &1660957531 GameObject: m_ObjectHideFlags: 0 @@ -24918,8 +26363,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 32.55, y: -25} - m_SizeDelta: {x: 65.1, y: 50} + m_AnchoredPosition: {x: 31.85, y: -25} + m_SizeDelta: {x: 63.7, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1664928566 MonoBehaviour: @@ -25091,11 +26536,11 @@ RectTransform: - {fileID: 2122433093} - {fileID: 821361348} - {fileID: 2133606847} - m_Father: {fileID: 457281264} + m_Father: {fileID: 523716906} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -65} + m_AnchoredPosition: {x: 120, y: -60} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!1 &1665075867 @@ -25438,11 +26883,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -60 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -25577,6 +27022,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1680811643} m_CullTransparentMesh: 1 +--- !u!1 &1682876232 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1682876233} + - component: {fileID: 1682876235} + - component: {fileID: 1682876234} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1682876233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682876232} + 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: 1362304708} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1682876234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682876232} + 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: -470869312, guid: 7a2ad0f9c5cea4e4a93b16927cbe345d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1682876235 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682876232} + m_CullTransparentMesh: 1 --- !u!1 &1695865858 GameObject: m_ObjectHideFlags: 0 @@ -25974,11 +27494,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_LocalPosition.x @@ -27319,6 +28839,142 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1775296410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1775296411} + - component: {fileID: 1775296413} + - component: {fileID: 1775296412} + m_Layer: 0 + m_Name: CasperBlackCountText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1775296411 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1775296410} + 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: 1815122253} + 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: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1775296412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1775296410} + 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: 17 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 19.5 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 10 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + 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: 10, w: 5} + 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 &1775296413 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1775296410} + m_CullTransparentMesh: 1 --- !u!1 &1790674787 GameObject: m_ObjectHideFlags: 0 @@ -27431,6 +29087,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1790674787} m_CullTransparentMesh: 1 +--- !u!1 &1791917411 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1791917412} + - component: {fileID: 1791917414} + - component: {fileID: 1791917413} + m_Layer: 0 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1791917412 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1791917411} + 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: 1642640525} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.3181818} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1791917413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1791917411} + 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: 1678378241, guid: 78925fb45c6c09e42a2b053dacc9c696, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1791917414 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1791917411} + m_CullTransparentMesh: 1 --- !u!1 &1795654739 GameObject: m_ObjectHideFlags: 0 @@ -27468,6 +29199,142 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1801694553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1801694554} + - component: {fileID: 1801694556} + - component: {fileID: 1801694555} + m_Layer: 0 + m_Name: ReaperCountText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1801694554 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801694553} + 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: 224855552} + 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: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1801694555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801694553} + 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: 3 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 19.5 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 10 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + 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: 10, w: 5} + 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 &1801694556 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801694553} + m_CullTransparentMesh: 1 --- !u!1 &1810507245 GameObject: m_ObjectHideFlags: 0 @@ -27864,6 +29731,44 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} m_PrefabInstance: {fileID: 1814318817} m_PrefabAsset: {fileID: 0} +--- !u!1 &1815122252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1815122253} + m_Layer: 0 + m_Name: CasperBlackPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1815122253 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815122252} + 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: 1 + m_Children: + - {fileID: 624707119} + - {fileID: 878297867} + - {fileID: 1775296411} + m_Father: {fileID: 523716906} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 230, y: -60} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 0.5} --- !u!1 &1821239282 GameObject: m_ObjectHideFlags: 0 @@ -28307,14 +30212,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 364785869} - {fileID: 2046315140} - - {fileID: 457281264} + - {fileID: 576950865} m_Father: {fileID: 506336968} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 300} + m_AnchoredPosition: {x: -205, y: 0} + m_SizeDelta: {x: -410, y: 300} m_Pivot: {x: 0.5, y: 1} --- !u!1 &1861226430 GameObject: @@ -28415,7 +30321,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 65.1, y: 50} + m_SizeDelta: {x: 63.7, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &1876905825 MonoBehaviour: @@ -28503,11 +30409,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -29927,6 +31833,142 @@ RectTransform: m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 120, y: 150} m_Pivot: {x: 0, y: 0.5} +--- !u!1 &1969196289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1969196290} + - component: {fileID: 1969196292} + - component: {fileID: 1969196291} + m_Layer: 0 + m_Name: WitchCountText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1969196290 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969196289} + 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: 1650262935} + 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: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1969196291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969196289} + 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: 3 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 19.5 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 10 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + 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: 10, w: 5} + 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 &1969196292 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969196289} + m_CullTransparentMesh: 1 --- !u!1 &1978426833 GameObject: m_ObjectHideFlags: 0 @@ -30743,11 +32785,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_LocalPosition.x @@ -31278,6 +33320,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036761461} m_CullTransparentMesh: 1 +--- !u!1 &2043182520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2043182521} + - component: {fileID: 2043182523} + - component: {fileID: 2043182522} + m_Layer: 0 + m_Name: BigCat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2043182521 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043182520} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1456473589} + 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: 10} + m_SizeDelta: {x: 0, y: -10} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &2043182522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043182520} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} + additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2} + multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} + screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} + initialSkinName: BigCat + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: Idle + startingLoop: 1 + timeScale: 1 + freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 100, y: 90} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 50, y: 50} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 + disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + tintBlack: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 + addNormals: 0 + calculateTangents: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 1 +--- !u!222 &2043182523 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043182520} + m_CullTransparentMesh: 0 --- !u!1 &2046315139 GameObject: m_ObjectHideFlags: 0 @@ -31315,7 +33465,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 65.1, y: 50} + m_SizeDelta: {x: 62.3, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &2046315141 MonoBehaviour: @@ -31391,8 +33541,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 162.605, y: -40} - m_SizeDelta: {x: 265.21, y: 40} + m_AnchoredPosition: {x: 161, y: -40} + m_SizeDelta: {x: 262, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2053120675 MonoBehaviour: @@ -31702,6 +33852,142 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2073585775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2073585776} + - component: {fileID: 2073585778} + - component: {fileID: 2073585777} + m_Layer: 0 + m_Name: CatCountText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2073585776 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073585775} + 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: 1362304708} + 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: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &2073585777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073585775} + 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: 17 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 19.5 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 10 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + 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: 10, w: 5} + 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 &2073585778 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073585775} + m_CullTransparentMesh: 1 --- !u!1 &2081236852 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs index 9641c467f..2b24817c5 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs @@ -24,6 +24,12 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { + if (!_customer.CanVomit) + { + _canVomit = false; + return; + } + _customer.MoveMoneyCounter(); var random = Random.Range(0f, 100f); if (random <= TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingPercent) diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index b7a9c469e..d772d0979 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -21,7 +21,7 @@ namespace BlueWater.Npcs.Customers { public const string Idle = "Idle"; public const string Walk = "Run"; - public const string Happy = "Happy"; + public const string Happy = "HappyIdle"; public const string HappyRun = "HappyRun"; public const string Upset = "Upset"; public const string UpsetRun = "UpsetRun"; @@ -30,6 +30,30 @@ namespace BlueWater.Npcs.Customers public const string VomitingIdle = "VomitingIdle"; public const string VomitingRun = "VomitingRun"; } + + public static class CatSpineAnimation + { + public const string Idle = "Cat/Idle"; + public const string Walk = "Cat/Run"; + public const string Happy = "Cat/HappyIdle"; + public const string HappyRun = "Cat/HappyRun"; + public const string Upset = "Cat/Upset"; + public const string UpsetRun = "Cat/UpsetRun"; + public const string Vomiting = "Cat/Vomiting"; + public const string VomitingForm = "Cat/VomitingForm"; + public const string VomitingIdle = "Cat/VomitingIdle"; + public const string VomitingRun = "Cat/VomitingRun"; + } + + public static class WitchSpineAnimation + { + public const string Idle = "Witch/Idle"; + public const string Walk = "Witch/Run"; + public const string Happy = "Witch/HappyIdle"; + public const string HappyRun = "Witch/HappyRun"; + public const string Upset = "Witch/Upset"; + public const string UpsetRun = "Witch/UpsetRun"; + } public enum CustomerInteractionType { @@ -39,8 +63,13 @@ namespace BlueWater.Npcs.Customers public enum CustomerSkin { - Casper = 0, - PumkinHead = 1 + BigCat = 0, + Casper = 1, + CasperBlack = 2, + Cat = 3, + PumkinHead = 4, + Reaper = 5, + Witch = 6 } public class Customer : MonoBehaviour, IPlayerInteraction, ICrewInteraction @@ -99,7 +128,6 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public string InteractionMessage { get; set; } - [field: Title("실시간 데이터")] [field: SerializeField] public LevelData CurrentLevelData { get; private set; } @@ -127,6 +155,7 @@ namespace BlueWater.Npcs.Customers private CustomerInteractionType _customerInteractionType; public bool IsMoving { get; private set; } + public bool CanVomit { get; private set; } public bool IsVomited { get; private set; } [SerializeField] @@ -148,7 +177,16 @@ namespace BlueWater.Npcs.Customers } } - public int CustomerSkin { get; private set; } + [Title("스킨 연출")] + [field: SerializeField] + public CustomerSkin CustomerSkin { get; private set; } + + [SerializeField] + private Vector3 _bigSize = new(1.5f, 1.5f, 1.5f); + + [SerializeField] + private Vector3 _smallSize = new(0.5f, 0.5f, 0.5f); + public int HurryTime { get; private set; } private IAstarAI _astarAi; @@ -197,10 +235,20 @@ namespace BlueWater.Npcs.Customers { if (element.ToString().Equals(currentSkinName)) { - CustomerSkin = (int)element; - return; + CustomerSkin = element; + break; } } + + if (CustomerSkin is CustomerSkin.BigCat or CustomerSkin.Witch) + { + CanVomit = false; + transform.localScale = _bigSize; + } + else + { + CanVomit = true; + } } private void Update() @@ -407,14 +455,14 @@ namespace BlueWater.Npcs.Customers public virtual void ShowInteractionUi() { - SpineController.EnableCustomMaterial(); + //SpineController.EnableCustomMaterial(); EventManager.InvokeShowInteractionUi(InteractionMessage); EventManager.InvokeHoldInteracting(0f); } public virtual void HideInteractionUi() { - SpineController.DisableCustomMaterial(); + //SpineController.DisableCustomMaterial(); EventManager.InvokeHideInteractionUi(); } diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs index 16794c105..f738c221a 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs @@ -6,7 +6,18 @@ namespace BlueWater.Npcs.Customers { public void EnterState(Customer character) { - character.SpineController.PlayAnimation(CustomerSpineAnimation.Happy, true); + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.Happy, true); + } + else if (character.CustomerSkin == CustomerSkin.Witch) + { + character.SpineController.PlayAnimation(WitchSpineAnimation.Happy, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Happy, true); + } } public void UpdateState(Customer character) diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs index 8a65fd876..6e740f4c7 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs @@ -8,16 +8,62 @@ namespace BlueWater.Npcs.Customers { if (character.IsVomited) { - character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingIdle, true); + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.VomitingIdle, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingIdle, true); + } } else if (character.IsReceivedItem) { - character.SpineController.PlayAnimation(character.IsOrderedCorrected ? - CustomerSpineAnimation.Happy : CustomerSpineAnimation.Upset, true); + if (character.IsOrderedCorrected) + { + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.Happy, true); + } + else if (character.CustomerSkin == CustomerSkin.Witch) + { + character.SpineController.PlayAnimation(WitchSpineAnimation.Happy, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Happy, true); + } + } + else + { + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.Upset, true); + } + else if (character.CustomerSkin == CustomerSkin.Witch) + { + character.SpineController.PlayAnimation(WitchSpineAnimation.Upset, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Upset, true); + } + } } else if (!character.IsReceivedItem) { - character.SpineController.PlayAnimation(CustomerSpineAnimation.Idle, true); + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.Idle, true); + } + else if (character.CustomerSkin == CustomerSkin.Witch) + { + character.SpineController.PlayAnimation(WitchSpineAnimation.Idle, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Idle, true); + } } } @@ -25,6 +71,18 @@ namespace BlueWater.Npcs.Customers { if (character.IsMoving) { + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.Idle, true); + } + else if (character.CustomerSkin == CustomerSkin.Witch) + { + character.SpineController.PlayAnimation(WitchSpineAnimation.Idle, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Idle, true); + } character.StateMachineController.TransitionToState(character.WalkingState, character); } } diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs index 2764a9211..059d7913e 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs @@ -6,7 +6,18 @@ namespace BlueWater.Npcs.Customers { public void EnterState(Customer character) { - character.SpineController.PlayAnimation(CustomerSpineAnimation.Upset, true); + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.Upset, true); + } + else if (character.CustomerSkin == CustomerSkin.Witch) + { + character.SpineController.PlayAnimation(WitchSpineAnimation.Upset, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Upset, true); + } } public void UpdateState(Customer character) diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs index 7916f29ab..d824d1bd9 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs @@ -10,7 +10,14 @@ namespace BlueWater.Npcs.Customers public void EnterState(Customer character) { - character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingForm, false); + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.VomitingForm, false); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingForm, false); + } } public void UpdateState(Customer character) @@ -18,7 +25,14 @@ namespace BlueWater.Npcs.Customers if (!_isVomiting && character.SpineController.IsAnimationComplete()) { AudioManager.Instance.PlaySfx(_vomitSfxName); - character.SpineController.PlayAnimation(CustomerSpineAnimation.Vomiting, false); + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.Vomiting, false); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Vomiting, false); + } _isVomiting = true; } diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs index 06fa7e685..b47f7340c 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs @@ -8,16 +8,62 @@ namespace BlueWater.Npcs.Customers { if (character.IsVomited) { - character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingRun, true); + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.VomitingRun, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingRun, true); + } } else if (character.IsReceivedItem) { - character.SpineController.PlayAnimation(character.IsOrderedCorrected ? - CustomerSpineAnimation.HappyRun : CustomerSpineAnimation.UpsetRun, true); + if (character.IsOrderedCorrected) + { + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.HappyRun, true); + } + else if (character.CustomerSkin == CustomerSkin.Witch) + { + character.SpineController.PlayAnimation(WitchSpineAnimation.HappyRun, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.HappyRun, true); + } + } + else + { + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.UpsetRun, true); + } + else if (character.CustomerSkin == CustomerSkin.Witch) + { + character.SpineController.PlayAnimation(WitchSpineAnimation.UpsetRun, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.UpsetRun, true); + } + } } else if (!character.IsReceivedItem) { - character.SpineController.PlayAnimation(CustomerSpineAnimation.Walk, true); + if (character.CustomerSkin == CustomerSkin.Cat) + { + character.SpineController.PlayAnimation(CatSpineAnimation.Walk, true); + } + else if (character.CustomerSkin == CustomerSkin.Witch) + { + character.SpineController.PlayAnimation(WitchSpineAnimation.Walk, true); + } + else + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Walk, true); + } } } diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index e582732ac..16d52ab7d 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -232,8 +232,8 @@ namespace BlueWater } // 손님이 퇴장하기 전에 스킨을 확인하는 이벤트 - public static Action OnCheckedSkin; - public static void InvokeCheckedSkin(int skinIndex) + public static Action OnCheckedSkin; + public static void InvokeCheckedSkin(CustomerSkin skinIndex) { OnCheckedSkin?.Invoke(skinIndex); } diff --git a/Assets/02.Scripts/Tycoon/LevelData.cs b/Assets/02.Scripts/Tycoon/LevelData.cs index 7e89af113..f0329623d 100644 --- a/Assets/02.Scripts/Tycoon/LevelData.cs +++ b/Assets/02.Scripts/Tycoon/LevelData.cs @@ -8,8 +8,9 @@ namespace BlueWater { public enum RewardBoxType { - Normal = 0, - Rare = 1 + None = 0, + Normal = 1, + Rare = 2 } [Serializable] diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index 679940669..54ab54ef7 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using BlueWater.Audios; using BlueWater.Items; using BlueWater.Utility; using Sirenix.OdinInspector; @@ -157,7 +156,7 @@ namespace BlueWater.Tycoons [Button("노말 상자 생성")] public void CreateChest(LevelData levelData) { - if (levelData.Idx == "1") return; + if (levelData.Idx == "1" || levelData.RewardBoxType == RewardBoxType.None) return; var spawnPosition = Utils.RandomPositionOnGraph(1); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs index 9acbb8da4..6684b5ea1 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs @@ -2,12 +2,14 @@ using System; using System.Collections; using System.Collections.Generic; using BlueWater.Audios; +using BlueWater.Npcs.Customers; using BlueWater.Tycoons; using BlueWater.Utility; using UnityEngine; using Sirenix.OdinInspector; using TMPro; using UnityEngine.InputSystem; +using UnityEngine.Serialization; using UnityEngine.UI; namespace BlueWater.Uis @@ -63,6 +65,13 @@ namespace BlueWater.Uis [SerializeField] private GameObject _customerContents; + + [SerializeField] + private GameObject _bigCatPanel; + + [SerializeField] + private TMP_Text _bigCatText; + private int _bigCatCount; [SerializeField] private GameObject _casperPanel; @@ -71,6 +80,20 @@ namespace BlueWater.Uis private TMP_Text _casperText; private int _casperCount; + [SerializeField] + private GameObject _casperBlackPanel; + + [SerializeField] + private TMP_Text _casperBlackText; + private int _casperBlackCount; + + [SerializeField] + private GameObject _catPanel; + + [SerializeField] + private TMP_Text _catText; + private int _catCount; + [SerializeField] private GameObject _pumpkinPanel; @@ -78,6 +101,20 @@ namespace BlueWater.Uis private TMP_Text _pumpkinText; private int _pumpkinCount; + [SerializeField] + private GameObject _reaperPanel; + + [SerializeField] + private TMP_Text _reaperText; + private int _reaperCount; + + [SerializeField] + private GameObject _witchPanel; + + [SerializeField] + private TMP_Text _witchText; + private int _witchCount; + [Title("서비스")] [SerializeField] private GameObject _serviceTitlePanel; @@ -220,8 +257,13 @@ namespace BlueWater.Uis _mainMenuButton.onClick.AddListener(() => SceneController.Instance.LoadScene(SceneName.TycoonTile)); _restartButton.onClick.AddListener(SceneController.Instance.RestartCurrentScene); + _bigCatCount = 0; _casperCount = 0; + _casperBlackCount = 0; + _catCount = 0; _pumpkinCount = 0; + _reaperCount = 0; + _witchCount = 0; _goodServingCount = 0; _failedServingCount = 0; _missServingCount = 0; @@ -311,8 +353,13 @@ namespace BlueWater.Uis _textPanel.SetActive(true); _customerPanel.SetActive(true); _customerContents.SetActive(true); + _bigCatPanel.SetActive(true); _casperPanel.SetActive(true); + _casperBlackPanel.SetActive(true); + _catPanel.SetActive(true); _pumpkinPanel.SetActive(true); + _reaperPanel.SetActive(true); + _witchPanel.SetActive(true); yield return panelWaitingTime; _serviceTitlePanel.SetActive(true); @@ -375,8 +422,13 @@ namespace BlueWater.Uis _textPanel.SetActive(isActive); _customerPanel.SetActive(isActive); _customerContents.SetActive(isActive); + _bigCatPanel.SetActive(isActive); _casperPanel.SetActive(isActive); + _casperBlackPanel.SetActive(isActive); + _catPanel.SetActive(isActive); _pumpkinPanel.SetActive(isActive); + _reaperPanel.SetActive(isActive); + _witchPanel.SetActive(isActive); _serviceTitlePanel.SetActive(isActive); _serviceContents.SetActive(isActive); _goodServingPanel.SetActive(isActive); @@ -412,8 +464,13 @@ namespace BlueWater.Uis _roundText.text = $"{Utils.GetLocalizedString("Round")} : {TycoonManager.Instance.GetCurrentLevelData().Idx}"; _playTimeText.text = $"{Utils.GetLocalizedString("PlayTime")} : {Mathf.FloorToInt(_playTime / 60f):D2} : {Mathf.FloorToInt(_playTime % 60f):D2}"; + _bigCatText.text = _bigCatCount.ToString(); _casperText.text = _casperCount.ToString(); + _casperBlackText.text = _casperBlackCount.ToString(); + _catText.text = _catCount.ToString(); _pumpkinText.text = _pumpkinCount.ToString(); + _reaperText.text = _reaperCount.ToString(); + _witchText.text = _witchCount.ToString(); _goodServingText.text = _goodServingCount.ToString(); _failedServingText.text = _failedServingCount.ToString(); _missServingText.text = _missServingCount.ToString(); @@ -448,17 +505,32 @@ namespace BlueWater.Uis SetActiveUi(true); } - private void AddCustomerCount(int skinIndex) + private void AddCustomerCount(CustomerSkin skinIndex) { switch (skinIndex) { - case 0: + case CustomerSkin.BigCat: + _bigCatCount++; + break; + case CustomerSkin.Casper: _casperCount++; break; - case 1: + case CustomerSkin.CasperBlack: + _casperBlackCount++; + break; + case CustomerSkin.Cat: + _catCount++; + break; + case CustomerSkin.PumkinHead: _pumpkinCount++; break; - default:; + case CustomerSkin.Reaper: + _reaperCount++; + break; + case CustomerSkin.Witch: + _witchCount++; + break; + default: throw new Exception("손님 스킨 인덱스 오류"); } } diff --git a/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat b/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat index a3aa7d6ef..e7d948af8 100644 --- a/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat +++ b/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 1a4f3c20594f16b49ba571734aa21edd, type: 3} + m_Texture: {fileID: 2800000, guid: f8793b351e8b00242aa8e46a47765795, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -132,7 +132,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab index a9dcf102d..f1d086a83 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab @@ -255,7 +255,10 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: eaf5a1e524cd8ae439ec7b6036090474, type: 2} + - {fileID: 2100000, guid: b5430080246bbb048b939d6a0a5621cd, type: 2} + - {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2} + - {fileID: 2100000, guid: 0bc9c8216989ef64ab468d6aa08cca35, type: 2} + - {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -289,7 +292,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} m_Name: m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 90f596bc1a735a544985584af0b4180a, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} initialSkinName: Casper fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 @@ -716,7 +719,6 @@ MonoBehaviour: returnAfterBeingPushedAway: 0 progressAverage: 0 lastJobDensityResult: 0 - centerOffsetCompatibility: NaN repathRateCompatibility: NaN canSearchCompability: 0 orientation: 0 @@ -727,7 +729,6 @@ MonoBehaviour: sensitivity: 10 maximumPeriod: 2 visualizeSensitivity: 0 - targetCompatibility: {fileID: 0} maxAcceleration: -2.5 rotationSpeed: 360 slowdownDistance: 1 @@ -811,7 +812,7 @@ MonoBehaviour: _initialSkinName: Casper _isRandomSkin: 1 _isRandomRange: 1 - _randomRange: {x: 1, y: 3} + _randomRange: {x: 0, y: 7} _randomStrings: [] --- !u!114 &17978457728262906 MonoBehaviour: @@ -852,7 +853,6 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 1 k__BackingField: - _vomiting: {fileID: 7264946127367919962, guid: d02f28b2bb526af478050f2f027be8e9, type: 3} k__BackingField: k__BackingField: k__BackingField: 0 @@ -890,6 +890,9 @@ MonoBehaviour: _customerInteractionType: 0 _succeedServingSfxName: SucceedServing _failedServingSfxName: FailedServing + k__BackingField: 0 + _bigSize: {x: 1.4, y: 1.5, z: 1.5} + _smallSize: {x: 0.5, y: 0.5, z: 0.5} --- !u!114 &2085349091043731492 MonoBehaviour: m_ObjectHideFlags: 0 @@ -998,8 +1001,8 @@ MonoBehaviour: m_Calls: [] m_text: "\uBB50\uAC00 \uC88B\uC744\uAE4C.." m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index 649d9340a..fab757e0c 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -8547,18 +8547,6 @@ PrefabInstance: propertyPath: Idx value: LiquidA objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} - propertyPath: m_LocalScale.x - value: 5.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} - propertyPath: m_LocalScale.y - value: 5.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} - propertyPath: m_LocalScale.z - value: 5.5 - objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} propertyPath: m_LocalPosition.x value: 1.2 @@ -8599,6 +8587,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3229405889651544752, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} propertyPath: m_Name value: LiquidA @@ -15430,10 +15422,14 @@ PrefabInstance: propertyPath: m_Name value: MoneyCounter objectReference: {fileID: 0} + - target: {fileID: 7103883662070814397, guid: 9e5375e8c94af9f49a9661227294f024, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} - target: {fileID: 7103883662070814397, guid: 9e5375e8c94af9f49a9661227294f024, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} + objectReference: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab index 34ea31664..72e029337 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab @@ -324,15 +324,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x - value: 6 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.y - value: 6 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.z - value: 6 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt b/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt index c9655107e..c8cbbcba0 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt @@ -1,170 +1,171 @@ Guest.png -size:2033,2033 +size:2008,2030 filter:Linear,Linear -scale:0.65 -BigCat/Body -bounds:2,795,429,595 -BigCat/Eyes -bounds:523,1545,486,339 -rotate:90 -BigCat/Eyes_upset -bounds:864,1545,486,339 -rotate:90 BigCat/Hand_Left -bounds:1194,1399,144,189 +bounds:2,733,222,290 rotate:90 BigCat/Hand_Right -bounds:1538,685,136,196 +bounds:1274,1540,209,301 rotate:90 BigCat/Mouse -bounds:627,803,220,85 +bounds:2,1817,338,131 BigCat/Upset_mouse -bounds:1531,1348,127,53 -Black/Body -bounds:421,293,400,500 +bounds:525,1946,195,82 Black/Eyes -bounds:1901,80,227,100 -rotate:90 +bounds:1624,1714,349,154 Black/Gliter -bounds:1736,618,291,157 +bounds:353,415,448,242 Black/Gliter2 -bounds:1619,526,157,103 -rotate:90 +bounds:1764,1870,242,158 Black/Hand_Left -bounds:1063,804,139,185 +bounds:977,1352,214,285 +rotate:90 Black/Hand_Right -bounds:1342,662,139,185 +bounds:1264,1324,214,285 rotate:90 Black/Mouse -bounds:1973,1575,112,51 -rotate:90 +bounds:175,1950,173,78 Black/Sword -bounds:1712,1341,307,203 -Cat/Body -bounds:2,259,534,417 -rotate:90 +bounds:314,101,473,312 Cat/Eyes -bounds:1273,6,304,118 -rotate:90 +bounds:602,1577,467,182 +Cat/Eyes_upset +bounds:1528,1085,467,217 Cat/Eyes_vomiting -bounds:1453,1546,304,142 +bounds:986,886,467,219 Cat/Eyes_vomiting2 -bounds:1267,312,304,176 -rotate:90 +bounds:1110,359,467,270 Cat/Face -bounds:1646,1691,198,181 -rotate:90 -Cat/Tail -bounds:1204,803,213,332 -rotate:90 +bounds:803,375,305,279 Cat/vomitiong1 -bounds:594,42,139,249 -Cat/vomitiong2 -bounds:297,7,149,250 -Cat/vomitiong3 -bounds:448,41,144,250 -Guest2/Pumkinhead -bounds:2,7,293,250 -Heart -bounds:1863,450,166,166 -Reaper/Body -bounds:823,304,442,497 -Reaper/Eyes -bounds:1538,921,205,96 -Reaper/Eyes_Upset -bounds:1538,823,205,96 -Reaper/Eyes_Vomiting -bounds:1759,1891,244,140 -Reaper/Gliter1 -bounds:735,45,246,132 +bounds:1551,1304,214,383 rotate:90 +Cat/vomitiong2 +bounds:1256,631,229,384 +rotate:90 +Cat/vomitiong3 +bounds:1455,862,221,385 +rotate:90 +Heart +bounds:646,659,256,256 +Reaper/Eyes +bounds:639,1767,316,147 +Reaper/Eyes_Upset +bounds:957,1761,316,147 +Reaper/Eyes_Vomiting +bounds:1150,1107,376,215 +Reaper/Gliter1 +bounds:2,1418,379,203 Reaper/Gliter2 -bounds:1205,1546,246,132 +bounds:596,1372,379,203 Reaper/Hand_Left -bounds:1807,309,139,185 +bounds:2,1202,214,285 rotate:90 Reaper/Hand_Right -bounds:1619,195,139,185 +bounds:289,1176,214,285 rotate:90 -Reaper/Mask -bounds:1205,1680,351,225 -rotate:90 -Reaper/Scythe -bounds:2,1392,519,639 Upset01 -bounds:1445,529,124,131 -Upset02 -bounds:1385,1401,111,143 -Witch/Accessory -bounds:1588,336,217,188 -Witch/Body -bounds:869,2,300,402 +bounds:1071,1568,191,201 rotate:90 -Witch/Body_upset -bounds:835,991,300,402 +Upset02 +bounds:2,1644,171,220 +rotate:90 +Witch/Accessory +bounds:1579,329,334,289 Witch/Eyes -bounds:523,1394,149,137 +bounds:383,1392,229,211 rotate:90 Witch/Eyes_upset1 -bounds:1498,1403,212,141 +bounds:2,957,326,217 Witch/Eyes_upset2 -bounds:1759,1546,212,141 +bounds:330,937,326,217 Witch/Eyes_upset3 -bounds:1445,312,212,141 -rotate:90 -Witch/Hair_Back -bounds:1531,1019,320,213 -rotate:90 -Witch/Hair_Front -bounds:1393,13,297,224 -rotate:90 +bounds:658,917,326,217 Witch/Hat -bounds:1137,1018,375,211 -rotate:90 +bounds:1366,2,577,325 Witch/Hat_Back -bounds:1350,1023,374,179 -rotate:90 +bounds:789,82,575,275 Witch/Head -bounds:1829,1689,202,200 +bounds:2,155,310,308 casper/Eyes -bounds:835,891,226,98 +bounds:1275,1751,347,151 casper/Eyes_Vomiting -bounds:1746,1214,244,125 +bounds:1577,1520,376,192 casper/Face_Upset -bounds:1746,935,227,156 -casper/Gliter1 -bounds:1432,1690,341,212 -rotate:90 +bounds:1642,620,349,240 casper/Gliter2 -bounds:1724,539,137,77 +bounds:1227,1910,211,118 casper/Mouse -bounds:1646,1982,111,49 +bounds:2,1952,171,76 casper/Mouse_Upset -bounds:1975,979,112,51 -rotate:90 +bounds:350,1950,173,78 casper/Mouse_Vomiting -bounds:1120,1395,148,72 -rotate:90 +bounds:722,1917,228,111 casper/Vomiting/01 -bounds:433,800,192,88 +bounds:342,1808,295,136 casper/Vomiting/02 -bounds:849,808,209,81 +bounds:1440,1904,322,124 casper/Vomiting/03 -bounds:1267,624,177,73 -rotate:90 +bounds:952,1916,273,112 casper/Vomiting/Eyes_Vomiting2 -bounds:1746,1093,244,119 +bounds:224,1623,376,183 casper/Vomiting/Vomiting -bounds:662,1395,148,227 +bounds:294,707,228,350 rotate:90 casper/Vomiting/Vomiting2 -bounds:891,1395,148,227 +bounds:904,656,228,350 rotate:90 -casper/body -bounds:433,890,400,500 casper/face -bounds:1745,777,227,156 +bounds:2,465,349,240 casper/left -bounds:1619,8,139,185 +bounds:576,1156,214,285 +rotate:90 casper/right -bounds:1760,8,139,185 +bounds:863,1136,214,285 +rotate:90 + +Guest_2.png +size:1993,1951 +filter:Linear,Linear +BigCat/Eyes +bounds:623,619,748,521 +BigCat/Eyes_upset +bounds:1373,392,748,521 +rotate:90 +Black/Body +bounds:2,2,615,770 +rotate:90 +Cat/Tail +bounds:528,1622,327,510 +rotate:90 +Guest2/Pumkinhead +bounds:544,1235,451,385 +Reaper/Mask +bounds:2,1274,540,346 +Witch/Body +bounds:997,1142,461,619 +rotate:90 +Witch/Body_upset +bounds:2,772,461,619 +rotate:90 +Witch/Hair_Back +bounds:1040,1622,492,327 +Witch/Hair_Front +bounds:1534,1605,457,344 +casper/Gliter1 +bounds:2,1623,524,326 + +Guest_3.png +size:1945,1759 +filter:Linear,Linear +BigCat/Body +bounds:803,841,660,916 +Cat/Body +bounds:1301,17,822,642 +rotate:90 +Reaper/Body +bounds:2,7,680,765 +Reaper/Scythe +bounds:2,774,799,983 +casper/body +bounds:684,2,615,770 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest.png b/Assets/08.Spines/Characters/Npcs/Customers/Guest.png index a45099ced..09a97c16a 100644 Binary files a/Assets/08.Spines/Characters/Npcs/Customers/Guest.png and b/Assets/08.Spines/Characters/Npcs/Customers/Guest.png differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes b/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes index 3a32b4c13..1774d4184 100644 Binary files a/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes and b/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png b/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png new file mode 100644 index 000000000..97883b0b3 Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png.meta new file mode 100644 index 000000000..22385a1c9 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: da55c6e632938384f86998fd4af15571 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png b/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png new file mode 100644 index 000000000..ea0944f7b Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png.meta new file mode 100644 index 000000000..b9e358c26 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 693b3fc6909cc664d9a477c9036987b2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset index 1dd4a9d85..8a7c35500 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset @@ -16,4 +16,6 @@ MonoBehaviour: onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 4aec2ab48721652439bb877430ab355a, type: 3} materials: - - {fileID: 2100000, guid: 86834288f1ca9884daab639810d1ddef, type: 2} + - {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2} + - {fileID: 2100000, guid: 0bc9c8216989ef64ab468d6aa08cca35, type: 2} + - {fileID: 2100000, guid: b5430080246bbb048b939d6a0a5621cd, type: 2} diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest.mat similarity index 97% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat rename to Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest.mat index c10973a23..79407008f 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Guest_Material + m_Name: Guest_Guest m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest.mat.meta similarity index 79% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest.mat.meta index fa2f4c0fc..b933f8043 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 86834288f1ca9884daab639810d1ddef +guid: d018debe5b8bedf4c8f19cba9e4facec NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat new file mode 100644 index 000000000..aef6a0ff1 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Guest_Guest_2 + m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: da55c6e632938384f86998fd4af15571, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _DoubleSidedLighting: 0 + - _LightAffectsAdditive: 0 + - _ReceiveShadows: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _TintBlack: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat.meta new file mode 100644 index 000000000..801a2ec40 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0bc9c8216989ef64ab468d6aa08cca35 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat new file mode 100644 index 000000000..c7d2614e3 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Guest_Guest_3 + m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 693b3fc6909cc664d9a477c9036987b2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _DoubleSidedLighting: 0 + - _LightAffectsAdditive: 0 + - _ReceiveShadows: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _TintBlack: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat.meta new file mode 100644 index 000000000..b8e0c3028 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5430080246bbb048b939d6a0a5621cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset b/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset index a5bc44283..e77ea16ba 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: atlasAssets: - {fileID: 11400000, guid: 62de5342effc1a04c8da3a3b926d1044, type: 2} - scale: 0.01 + scale: 0.001 skeletonJSON: {fileID: 4900000, guid: acf01b6c27b441946b118a4b68e9b602, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 28c9a6464..ff2fc5453 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.5.17 + bundleVersion: 0.3.5.18 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}