diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index b0929b104..d7297a59b 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -123,6 +123,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 668700138157159316, guid: 680ce017bd2b7d34a99245242d032120, type: 3} m_PrefabInstance: {fileID: 1179122867} m_PrefabAsset: {fileID: 0} +--- !u!114 &36953787 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7629976349863100293, guid: 9246d6576382b724b978b10dd59f0204, type: 3} + m_PrefabInstance: {fileID: 1332793830} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6aff73d268584edba076603861b2ea73, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &67330819 GameObject: m_ObjectHideFlags: 0 @@ -1245,6 +1256,142 @@ MonoBehaviour: FrequencyGain: 1 Duration: 1 m_NoiseOffsets: {x: 0, y: 0, z: 0} +--- !u!1 &302589364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 302589365} + - component: {fileID: 302589367} + - component: {fileID: 302589366} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &302589365 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 302589364} + 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: 1899485663} + 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 &302589366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 302589364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uBAA8\uB798 \uB450\uB354\uC9C0 \uC774\uB3D9" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + 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: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &302589367 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 302589364} + m_CullTransparentMesh: 0 --- !u!1 &305420765 GameObject: m_ObjectHideFlags: 0 @@ -1395,6 +1542,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 305420765} m_CullTransparentMesh: 0 +--- !u!1 &334228572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 334228573} + - component: {fileID: 334228575} + - component: {fileID: 334228574} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &334228573 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334228572} + 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: 1899485663} + 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 &334228574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334228572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.36862746, g: 0.29411766, b: 0.28235295, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c145c383dcd344d4e8014fd1813b8f9a, 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 &334228575 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334228572} + m_CullTransparentMesh: 0 --- !u!1 &349901980 GameObject: m_ObjectHideFlags: 0 @@ -2559,7 +2781,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: 508, y: -200.91458} + m_AnchoredPosition: {x: 508, y: -135.91458} m_SizeDelta: {x: 500, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &613412025 @@ -2628,7 +2850,7 @@ MonoBehaviour: m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 2 + m_IntArgument: 3 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -3004,6 +3226,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 672714555} m_CullTransparentMesh: 1 +--- !u!114 &690823801 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6585123087190923213, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + m_PrefabInstance: {fileID: 1213070729} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45ca5fc4b0d9415ca599aa7cd17f3370, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &704479487 GameObject: m_ObjectHideFlags: 0 @@ -3079,6 +3312,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 704479487} m_CullTransparentMesh: 0 +--- !u!114 &728440691 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3649566415687085120, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} + m_PrefabInstance: {fileID: 1042335352} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ee06be52139d1b4ca488075a3520f3e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &736767085 GameObject: m_ObjectHideFlags: 0 @@ -3793,7 +4037,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: 508, y: -590.91455} + m_AnchoredPosition: {x: 508, y: -655.91455} m_SizeDelta: {x: 500, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &827511721 @@ -4169,6 +4413,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 134332083069605836, guid: 15c02fef22ba8d0488bd2517167c117c, type: 3} m_PrefabInstance: {fileID: 1731091154544500521} m_PrefabAsset: {fileID: 0} +--- !u!114 &1011270532 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7772076497191242295, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} + m_PrefabInstance: {fileID: 370354194} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45ca5fc4b0d9415ca599aa7cd17f3370, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1033584364 GameObject: m_ObjectHideFlags: 0 @@ -4919,6 +5174,63 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1213070729 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalPosition.x + value: 800 + objectReference: {fileID: 0} + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424010737098975716, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_Name + value: SandMoleMapController + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} --- !u!1 &1243437081 GameObject: m_ObjectHideFlags: 0 @@ -5178,7 +5490,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: 508, y: -460.91458} + m_AnchoredPosition: {x: 508, y: -525.91455} m_SizeDelta: {x: 500, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1245318498 @@ -7344,7 +7656,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uBCF4\uC2A4 \uC2A4\uD14C\uC774\uC9C01 \uC774\uB3D9" + m_text: "\uD0C0\uC774\uD0C4 \uC2AC\uB77C\uC784 \uC774\uB3D9" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} @@ -8212,6 +8524,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 + k__BackingField: {fileID: 728440691} + k__BackingField: {fileID: 36953787} + k__BackingField: {fileID: 1011270532} + k__BackingField: {fileID: 690823801} --- !u!4 &1597727070 Transform: m_ObjectHideFlags: 0 @@ -8373,7 +8689,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uBCF4\uC2A4 \uC2A4\uD14C\uC774\uC9C02 \uC774\uB3D9" + m_text: "\uCF54\uBFD4\uC18C \uC774\uB3D9" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} @@ -9559,6 +9875,156 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1883145819} m_CullTransparentMesh: 0 +--- !u!1 &1899485662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1899485663} + - component: {fileID: 1899485667} + - component: {fileID: 1899485666} + - component: {fileID: 1899485665} + - component: {fileID: 1899485664} + m_Layer: 5 + m_Name: MoveBossStage3Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1899485663 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899485662} + 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: 334228573} + - {fileID: 302589365} + m_Father: {fileID: 2063410650} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 508, y: -395.91458} + m_SizeDelta: {x: 500, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1899485664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899485662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5f45762bc9a84906b62fb6b794a6feb, type: 3} + m_Name: + m_EditorClassIdentifier: + Color1: {r: 0.09019609, g: 0.1118031, b: 0.49019608, a: 1} + Color2: {r: 1, g: 1, b: 1, a: 1} + Angle: -90 +--- !u!114 &1899485665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899485662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + 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: 1899485666} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1033584365} + m_TargetAssemblyTypeName: BlueWaterProject.CombatUiManager, Assembly-CSharp + m_MethodName: MoveSelectStage + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 5 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1899485666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899485662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.16078432, b: 0.16078432, 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: 21300000, guid: b12baf9fad9d8415baf1395873c5d570, 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 &1899485667 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899485662} + m_CullTransparentMesh: 0 --- !u!1 &1921707981 GameObject: m_ObjectHideFlags: 0 @@ -10175,6 +10641,7 @@ RectTransform: m_Children: - {fileID: 613412024} - {fileID: 2124681503} + - {fileID: 1899485663} - {fileID: 1245318497} - {fileID: 827511720} m_Father: {fileID: 1113438219} @@ -10579,7 +11046,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: 508, y: -330.91458} + m_AnchoredPosition: {x: 508, y: -265.91458} m_SizeDelta: {x: 500, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2124681504 @@ -10648,7 +11115,7 @@ MonoBehaviour: m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 3 + m_IntArgument: 4 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -19772,5 +20239,6 @@ SceneRoots: - {fileID: 1042335352} - {fileID: 1332793830} - {fileID: 370354194} + - {fileID: 1213070729} - {fileID: 1383322271} - {fileID: 582179850} diff --git a/Assets/02.Scripts/Character/AiMovement.cs b/Assets/02.Scripts/Character/AiMovement.cs index 25ba45f04..093aac951 100644 --- a/Assets/02.Scripts/Character/AiMovement.cs +++ b/Assets/02.Scripts/Character/AiMovement.cs @@ -1,4 +1,4 @@ -using Pathfinding; +using Pathfinding; using UnityEngine; namespace BlueWater.Enemies @@ -10,14 +10,24 @@ namespace BlueWater.Enemies private IAstarAI _iAstarAi; + #endregion + + // Unity events + #region Unity events + + private void Awake() + { + InitializeComponents(); + } + #endregion // Initialize methods #region Initialize methods - public void InitializeComponents(IAstarAI iAstartAi) + private void InitializeComponents() { - _iAstarAi = iAstartAi; + _iAstarAi = GetComponent(); } #endregion diff --git a/Assets/02.Scripts/Character/AiMovement.cs.meta b/Assets/02.Scripts/Character/AiMovement.cs.meta index 365a15418..eede8b03c 100644 --- a/Assets/02.Scripts/Character/AiMovement.cs.meta +++ b/Assets/02.Scripts/Character/AiMovement.cs.meta @@ -1,3 +1,2 @@ fileFormatVersion: 2 -guid: 75b48aa4b99043cb9e665a892ec46c75 -timeCreated: 1717081113 \ No newline at end of file +guid: 75b48aa4b99043cb9e665a892ec46c75 \ No newline at end of file diff --git a/Assets/02.Scripts/Character/AnimationController.cs b/Assets/02.Scripts/Character/AnimationController.cs index 39314e9fa..4a1b2ce43 100644 --- a/Assets/02.Scripts/Character/AnimationController.cs +++ b/Assets/02.Scripts/Character/AnimationController.cs @@ -12,14 +12,24 @@ namespace BlueWater // Components private Animator _animator; + #endregion + + // Unity events + #region Unity events + + private void Awake() + { + InitializeComponents(); + } + #endregion // Initialize methods #region Initialize Methdos - public void InitializeComponents(Animator animator) + public void InitializeComponents() { - _animator = animator; + _animator = GetComponentInChildren(); } #endregion diff --git a/Assets/02.Scripts/Character/Enemy/Boss/Boss.cs b/Assets/02.Scripts/Character/Enemy/Boss/Boss.cs index b2aeb7acf..6241f734e 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/Boss.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/Boss.cs @@ -8,8 +8,9 @@ namespace BlueWater.Enemies.Bosses public enum BossType { None = 0, - Slime, - Rhinoceros + TitanSlime, + Rhinoceros, + SandMole } public enum BossSkillName @@ -136,9 +137,6 @@ namespace BlueWater.Enemies.Bosses BossSkillController = GetComponent(); IAstarAi = GetComponent(); - - AnimationController.InitializeComponents(Animator); - AIMovement.InitializeComponents(IAstarAi); } #endregion @@ -147,6 +145,8 @@ namespace BlueWater.Enemies.Bosses #region Methods // Abstract methods + public virtual void Initialize() { } + protected abstract void HandleDie(); // Wrapping diff --git a/Assets/02.Scripts/Character/Enemy/Boss/Rhinoceros/Rhinoceros.cs b/Assets/02.Scripts/Character/Enemy/Boss/Rhinoceros/Rhinoceros.cs index b1bf95563..71c2e3266 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/Rhinoceros/Rhinoceros.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/Rhinoceros/Rhinoceros.cs @@ -1,5 +1,4 @@ using BlueWater.Maps; -using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Enemies.Bosses.Rhinoceros @@ -20,7 +19,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros #region Variables public RhinocerosData RhinocerosData { get; private set; } - private RhinocerosMapController _rhinocerosMapController; + public BossMapController BossMapController { get; private set; } private bool _isMoving; public bool IsMoving @@ -70,13 +69,13 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros base.InitializeComponents(); RhinocerosData = BossData as RhinocerosData; - _rhinocerosMapController = FindAnyObjectByType(); + BossMapController = MapManager.Instance.RhinocerosMapController; } - public void Initialize() + public override void Initialize() { BossHealthPoint.InitializeComponents(true, CharacterCollider, SpriteRenderer, RhinocerosData.MaxHealthPoint, - RhinocerosData.DisplayName, _rhinocerosMapController.ParticleInstantiateLocation); + RhinocerosData.DisplayName, BossMapController.ParticleInstantiateLocation); BossSkillController.Initialize(BossData.SkillDataList); SetMoveSpeed(RhinocerosData.MoveSpeed); StopMove(); @@ -98,7 +97,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros } AnimationController.SetAnimationTrigger("isDead"); - _rhinocerosMapController.MapClear(); + BossMapController.MapClear(); } private void FlipVisualLook() diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole.meta b/Assets/02.Scripts/Character/Enemy/Boss/SandMole.meta new file mode 100644 index 000000000..9ba9fc7cc --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8043c4132b3a42e48bfc0d42e7bb443f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs new file mode 100644 index 000000000..ee0ab300b --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs @@ -0,0 +1,124 @@ +using BlueWater.Maps; +using UnityEngine; + +namespace BlueWater.Enemies.Bosses.SandMole +{ + public enum SandMoleSkill + { + None = 0, + } + + public class Rhinoceros : Boss + { + // Variables + #region Variables + + public SandMoleData SandMoleData { get; private set; } + public BossMapController BossMapController { get; private set; } + + private bool _isMoving; + public bool IsMoving + { + get => _isMoving; + set + { + _isMoving = value; + AnimationController.SetAnimationParameter("isMoving", _isMoving); + } + } + + private Vector3 _currentDirection = Vector3.right; + public Vector3 CurrentDirection + { + get => _currentDirection; + set + { + if (value == Vector3.zero) return; + + _currentDirection = value; + AnimationController.SetAnimationParameter("xDirection", _currentDirection.x); + AnimationController.SetAnimationParameter("zDirection", _currentDirection.z); + } + } + + #endregion + + // Unity events + #region Unity events + + protected override void Update() + { + base.Update(); + + HandleMovement(); + FlipVisualLook(); + } + + #endregion + + // Initialize methods + #region Initialize methods + + protected override void InitializeComponents() + { + base.InitializeComponents(); + + SandMoleData = BossData as SandMoleData; + BossMapController = MapManager.Instance.SandMoleMapController; + } + + public override void Initialize() + { + BossHealthPoint.InitializeComponents(true, CharacterCollider, SpriteRenderer, SandMoleData.MaxHealthPoint, + SandMoleData.DisplayName, BossMapController.ParticleInstantiateLocation); + BossSkillController.Initialize(BossData.SkillDataList); + SetMoveSpeed(SandMoleData.MoveSpeed); + StopMove(); + BehaviorTree.EnableBehavior(); + } + + #endregion + + // Methods + #region Methods + + protected override void HandleDie() + { + StopMove(); + + if (Rigidbody) + { + Rigidbody.isKinematic = true; + } + + AnimationController.SetAnimationTrigger("isDead"); + BossMapController.MapClear(); + } + + private void FlipVisualLook() + { + var localScale = VisualLook.localScale; + localScale.x = CurrentDirection.x switch + { + > 0.01f => Mathf.Abs(localScale.x), + < -0.01f => -Mathf.Abs(localScale.x), + _ => localScale.x + }; + VisualLook.localScale = localScale; + } + + private void HandleMovement() + { + if (!IAstarAi.canMove || IAstarAi.isStopped) + { + IsMoving = false; + return; + } + + CurrentDirection = IAstarAi.velocity.normalized; + IsMoving = IAstarAi.velocity != Vector3.zero || IAstarAi.velocity != Vector3.positiveInfinity; + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs.meta b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs.meta new file mode 100644 index 000000000..44af7cd9a --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4e606f828f61d0241be522a81ccc2915 +timeCreated: 1717140083 diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMoleData.cs b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMoleData.cs new file mode 100644 index 000000000..00c58b71c --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMoleData.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +namespace BlueWater.Enemies.Bosses.SandMole +{ + [CreateAssetMenu(fileName = "SandMoleData", menuName = "ScriptableObjects/Enemy/SandMoleData")] + public class SandMoleData : BossData + { + [field: SerializeField] + public float MoveSpeed { get; private set; } = 3f; + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMoleData.cs.meta b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMoleData.cs.meta new file mode 100644 index 000000000..ae87eec52 --- /dev/null +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMoleData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 32c16666a1f9189489ca45f420907595 +timeCreated: 1717087643 diff --git a/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs b/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs index 10a3bfa0f..447312f39 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs @@ -31,7 +31,7 @@ namespace BlueWater.Enemies.Bosses.TitanSlime _rabbit = VisualLook.Find("Rabbit").GetComponent(); TitanSlimeData = BossData as TitanSlimeData; - _titanSlimeMapController = FindAnyObjectByType(); + _titanSlimeMapController = MapManager.Instance.TitanSlimeMapController; } public void Initialize(int level, bool hasRabbit) diff --git a/Assets/02.Scripts/Character/Enemy/EnemyManager.cs b/Assets/02.Scripts/Character/Enemy/EnemyManager.cs index 619aa079d..f20c06215 100644 --- a/Assets/02.Scripts/Character/Enemy/EnemyManager.cs +++ b/Assets/02.Scripts/Character/Enemy/EnemyManager.cs @@ -37,12 +37,27 @@ namespace BlueWater.Enemies } } + // Public Instantiate + public Boss InstantiateBoss(BossType bossType, Vector3 spawnPosition, Transform instantiateLocation = null) + { + if (!BossConfigurationDictionary.TryGetValue(bossType, out var bossConfiguration)) + { + Debug.LogError($"보스 생성 오류 : 키값 {bossType}을(를) 확인해주세요."); + return null; + } + + var instantiateBoss = Instantiate(bossConfiguration, spawnPosition, Quaternion.identity, instantiateLocation).GetComponent(); + instantiateBoss.Initialize(); + + return instantiateBoss; + } + // TitanSlime public TitanSlime InstantiateTitanSlime(Vector3 spawnPosition, int level, bool hasRabbit, Transform instantiateLocation = null) { - if (!BossConfigurationDictionary.TryGetValue(BossType.Slime, out var titanSlimeObject)) + if (!BossConfigurationDictionary.TryGetValue(BossType.TitanSlime, out var titanSlimeObject)) { - Debug.LogError($"보스 생성 오류 : 키값 {BossType.Slime}을(를) 확인해주세요."); + Debug.LogError($"보스 생성 오류 : 키값 {BossType.TitanSlime}을(를) 확인해주세요."); return null; } @@ -60,20 +75,5 @@ namespace BlueWater.Enemies instantiateBossLeft.AddForce(_leftSplitDirection * _splitPower, ForceMode.Impulse); instantiateBossRight.AddForce(_rightSplitDirection * _splitPower, ForceMode.Impulse); } - - // Rhinoceros - public Rhinoceros InstantiateRhinoceros(Vector3 spawnPosition, Transform instantiateLocation = null) - { - if (!BossConfigurationDictionary.TryGetValue(BossType.Rhinoceros, out var bossConfiguration)) - { - Debug.LogError($"보스 생성 오류 : 키값 {BossType.Rhinoceros}을(를) 확인해주세요."); - return null; - } - - var instantiateBoss = Instantiate(bossConfiguration, spawnPosition, Quaternion.identity, instantiateLocation).GetComponent(); - instantiateBoss.Initialize(); - - return instantiateBoss; - } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs b/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs index 72f11dc61..43a91affa 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs @@ -109,7 +109,6 @@ namespace BlueWater.Players.Combat { CombatInput.InitializeComponents(PlayerInput); CombatMovement.InitializeComponents(Rigidbody, VisualLook, AnimationController); - AnimationController.InitializeComponents(Animator); CombatAttacker.InitializeComponents(Rigidbody, AnimationController, CombatMovement); PlayerHealthPoint.InitializeComponents(SpriteRenderer); CombatStatus.InitializeComponents(SpriteRenderer); diff --git a/Assets/02.Scripts/DataManager.cs b/Assets/02.Scripts/DataManager.cs index 764f96efd..8e084d943 100644 --- a/Assets/02.Scripts/DataManager.cs +++ b/Assets/02.Scripts/DataManager.cs @@ -6,10 +6,12 @@ namespace BlueWater { public enum SaveStage { - FirstTutorial = 0, + None = 0, + FirstTutorial, SecondTutorial, - Slime, - Rhinoceros + TitanSlime, + Rhinoceros, + SandMole } public class DataManager : Singleton diff --git a/Assets/02.Scripts/Map/BossMapController.cs b/Assets/02.Scripts/Map/BossMapController.cs index 5176536a2..341832dea 100644 --- a/Assets/02.Scripts/Map/BossMapController.cs +++ b/Assets/02.Scripts/Map/BossMapController.cs @@ -1,15 +1,21 @@ using System.Collections; +using BlueWater.Audios; +using BlueWater.Enemies; +using BlueWater.Enemies.Bosses; using BlueWater.Uis; using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Maps { - public abstract class BossMapController : MapController + public class BossMapController : MapController { [SerializeField, Required] protected Transform BossSpawnTransform; + [SerializeField] + protected BossType BossType; + public override void InitializeMap() { AllDestroyObjects(); @@ -25,8 +31,20 @@ namespace BlueWater.Maps GameManager.Instance.InstantiateCombatPlayer(PlayerSpawnTransform.position); } + DataManager.Instance.CurrentSaveStage = SaveStage; + if (!string.IsNullOrEmpty(BGMName)) + { + AudioManager.Instance.PlayBgm(BGMName); + } + + InitializeBoss(); // 보스 override로 추가 } + + protected virtual void InitializeBoss() + { + EnemyManager.Instance.InstantiateBoss(BossType, BossSpawnTransform.position, EnemyInstantiateLocation); + } public override void MapClear() { @@ -35,7 +53,6 @@ namespace BlueWater.Maps protected virtual IEnumerator MapClearCoroutine() { - AllDestroyEnemy(); VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f); CombatUiManager.Instance.FadeInOut(); diff --git a/Assets/02.Scripts/Map/FirstTutorialMapController.cs b/Assets/02.Scripts/Map/FirstTutorialMapController.cs index 100043b61..26b5a5c7e 100644 --- a/Assets/02.Scripts/Map/FirstTutorialMapController.cs +++ b/Assets/02.Scripts/Map/FirstTutorialMapController.cs @@ -7,7 +7,8 @@ namespace BlueWater.Maps { public class FirstTutorialMapController : MapController { - [SerializeField, Required] protected List enemySpawnTransformList; + [SerializeField, Required] + protected List EnemySpawnTransformList; // TODO : Enemy 생성 후 추가 //[SerializeField, Required] protected Ork orkPrefab; //[SerializeField, Required] protected MagicOrk magicOrkPrefab; @@ -31,8 +32,11 @@ namespace BlueWater.Maps //InstantiateFieldMinion(enemySpawnTransformList[0].position, orkPrefab); //InstantiateFieldMinion(enemySpawnTransformList[1].position, magicOrkPrefab); - DataManager.Instance.CurrentSaveStage = SaveStage.FirstTutorial; - AudioManager.Instance.PlayBgm("TutorialStage"); + DataManager.Instance.CurrentSaveStage = SaveStage; + if (!string.IsNullOrEmpty(BGMName)) + { + AudioManager.Instance.PlayBgm(BGMName); + } } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Map/MapController.cs b/Assets/02.Scripts/Map/MapController.cs index 61c8cd41e..72e52c0bd 100644 --- a/Assets/02.Scripts/Map/MapController.cs +++ b/Assets/02.Scripts/Map/MapController.cs @@ -1,5 +1,4 @@ using System.Collections; -using System.Collections.Generic; using BlueWater.Uis; using Sirenix.OdinInspector; using UnityEngine; @@ -18,6 +17,12 @@ namespace BlueWater.Maps [field: SerializeField] public Transform ParticleInstantiateLocation { get; private set; } + + [SerializeField] + protected SaveStage SaveStage; + + [SerializeField] + protected string BGMName; public abstract void InitializeMap(); diff --git a/Assets/02.Scripts/Map/MapManager.cs b/Assets/02.Scripts/Map/MapManager.cs index 7d8bd2fa0..b4eeb8123 100644 --- a/Assets/02.Scripts/Map/MapManager.cs +++ b/Assets/02.Scripts/Map/MapManager.cs @@ -1,18 +1,60 @@ +using System; +using UnityEngine; + namespace BlueWater.Maps { public class MapManager : Singleton { + [field: SerializeField] + public FirstTutorialMapController FirstTutorialMapController { get; private set; } + + [field: SerializeField] + public TitanSlimeMapController TitanSlimeMapController { get; private set; } + + [field: SerializeField] + public BossMapController RhinocerosMapController { get; private set; } + + [field: SerializeField] + public BossMapController SandMoleMapController { get; private set; } + private MapController _currentMapController; - public void InitMap(MapController newMapController) + public void InitializeMap() { + MapController newMapController = null; + switch (DataManager.Instance.CurrentSaveStage) + { + case SaveStage.None: + break; + case SaveStage.FirstTutorial: + newMapController = FirstTutorialMapController; + break; + case SaveStage.SecondTutorial: + //MapController = FindAnyObjectByType(); + break; + case SaveStage.TitanSlime: + newMapController = TitanSlimeMapController; + break; + case SaveStage.Rhinoceros: + newMapController = RhinocerosMapController; + break; + case SaveStage.SandMole: + newMapController = SandMoleMapController; + break; + default: + throw new ArgumentOutOfRangeException(); + } + if (_currentMapController != null) { _currentMapController.AllDestroyObjects(); } _currentMapController = newMapController; - _currentMapController.InitializeMap(); + if (_currentMapController != null) + { + _currentMapController.InitializeMap(); + } } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Map/RhinocerosMapController.cs b/Assets/02.Scripts/Map/RhinocerosMapController.cs deleted file mode 100644 index 30b343e14..000000000 --- a/Assets/02.Scripts/Map/RhinocerosMapController.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Collections; -using BlueWater.Audios; -using BlueWater.Enemies; -using BlueWater.Uis; -using UnityEngine; - -namespace BlueWater.Maps -{ - public class RhinocerosMapController : BossMapController - { - public override void InitializeMap() - { - base.InitializeMap(); - - DataManager.Instance.CurrentSaveStage = SaveStage.Rhinoceros; - AudioManager.Instance.PlayBgm("Stage2"); - EnemyManager.Instance.InstantiateRhinoceros(BossSpawnTransform.position, EnemyInstantiateLocation); - } - - protected override IEnumerator MapClearCoroutine() - { - VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f); - CombatUiManager.Instance.FadeInOut(); - - var elapsedTime = 0f; - while (elapsedTime <= 3f) - { - elapsedTime += Time.unscaledDeltaTime; - yield return null; - } - AllDestroyEnemy(); - VisualFeedbackManager.Instance.SetBaseTimeScale(1f); - - elapsedTime = 0f; - while (elapsedTime <= 2f) - { - elapsedTime += Time.unscaledDeltaTime; - yield return null; - } - - CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList); - } - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Map/RhinocerosMapController.cs.meta b/Assets/02.Scripts/Map/RhinocerosMapController.cs.meta deleted file mode 100644 index 7b99fd460..000000000 --- a/Assets/02.Scripts/Map/RhinocerosMapController.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 372e12b84435f0d4b8f49f18636929dd -timeCreated: 1717153632 diff --git a/Assets/02.Scripts/Map/TitanSlimeMapController.cs b/Assets/02.Scripts/Map/TitanSlimeMapController.cs index fa1a9663d..36038a167 100644 --- a/Assets/02.Scripts/Map/TitanSlimeMapController.cs +++ b/Assets/02.Scripts/Map/TitanSlimeMapController.cs @@ -1,17 +1,40 @@ -using BlueWater.Audios; +using System.Collections; using BlueWater.Enemies; +using BlueWater.Uis; +using UnityEngine; namespace BlueWater.Maps { public class TitanSlimeMapController : BossMapController { - public override void InitializeMap() + protected override void InitializeBoss() { - base.InitializeMap(); - - DataManager.Instance.CurrentSaveStage = SaveStage.Slime; - AudioManager.Instance.PlayBgm("Stage1"); EnemyManager.Instance.InstantiateTitanSlime(BossSpawnTransform.position, 1, true, EnemyInstantiateLocation); } + + protected override IEnumerator MapClearCoroutine() + { + AllDestroyEnemy(); + VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f); + CombatUiManager.Instance.FadeInOut(); + + var elapsedTime = 0f; + while (elapsedTime <= 3f) + { + elapsedTime += Time.unscaledDeltaTime; + yield return null; + } + AllDestroyEnemy(); + VisualFeedbackManager.Instance.SetBaseTimeScale(1f); + + elapsedTime = 0f; + while (elapsedTime <= 2f) + { + elapsedTime += Time.unscaledDeltaTime; + yield return null; + } + + CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BossConfiguration.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BossConfiguration.asset index f5c828b5c..43a63683f 100644 --- a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BossConfiguration.asset +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/BossConfiguration.asset @@ -17,3 +17,5 @@ MonoBehaviour: k__BackingField: {fileID: 9154244493302919714, guid: 19f03cc49f91ee348af2c91c15a5e0d6, type: 3} - k__BackingField: 2 k__BackingField: {fileID: 4623786526972472839, guid: b3fede52cd9ea854fab2ad603b53dd77, type: 3} + - k__BackingField: 3 + k__BackingField: {fileID: 4623786526972472839, guid: e3a389dac3e524844ac42dabd7207e64, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset new file mode 100644 index 000000000..a2730288f --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 32c16666a1f9189489ca45f420907595, type: 3} + m_Name: SandMoleData + m_EditorClassIdentifier: + k__BackingField: SandMole + k__BackingField: "\uBAA8\uB798 \uB450\uB354\uC9C0" + k__BackingField: 1000 + k__BackingField: + serializedVersion: 2 + m_Bits: 2048 + k__BackingField: [] + k__BackingField: 3 diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset.meta b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset.meta new file mode 100644 index 000000000..c123ca8f8 --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac684afe9ab056d4eb4a6b2fedfcf6d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SlimeData.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/TitanSlimeData.asset similarity index 99% rename from Assets/02.Scripts/ScriptableObject/Enemy/Boss/SlimeData.asset rename to Assets/02.Scripts/ScriptableObject/Enemy/Boss/TitanSlimeData.asset index 7c04db62d..d431ee2e5 100644 --- a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SlimeData.asset +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/TitanSlimeData.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7a4386091087b4408530b40873da7fe, type: 3} - m_Name: SlimeData + m_Name: TitanSlimeData m_EditorClassIdentifier: k__BackingField: TitanSlime k__BackingField: "\uD0C0\uC774\uD0C4 \uC2AC\uB77C\uC784" diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SlimeData.asset.meta b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/TitanSlimeData.asset.meta similarity index 100% rename from Assets/02.Scripts/ScriptableObject/Enemy/Boss/SlimeData.asset.meta rename to Assets/02.Scripts/ScriptableObject/Enemy/Boss/TitanSlimeData.asset.meta diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/MeteorSwing.cs b/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/MeteorSwing.cs index 4cb275ed6..979a23828 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/MeteorSwing.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/MeteorSwing.cs @@ -48,7 +48,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros.Skills _animationController = _rhinoceros.AnimationController; _targetCollider = _rhinoceros.Target; _targetLayer = _rhinoceros.TargetLayer; - _particleInstantiateLocation = FindAnyObjectByType().ParticleInstantiateLocation; + _particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstantiateLocation; } _meteorSwingData = (MeteorSwingData)SkillData; HitColliders = new Collider[4]; diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/SeismicThrust.cs b/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/SeismicThrust.cs index cffe67045..e148139ea 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/SeismicThrust.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/SeismicThrust.cs @@ -49,7 +49,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros.Skills _rhinoceros = SkillUser.GetComponent(); _targetCollider = _rhinoceros.Target; _targetLayer = _rhinoceros.TargetLayer; - _particleInstantiateLocation = FindAnyObjectByType().ParticleInstantiateLocation; + _particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstantiateLocation; } _seismicThrustData = (SeismicThrustData)SkillData; RaycastHits = new RaycastHit[4]; diff --git a/Assets/02.Scripts/Ui/Combat/CombatTutorialUi.cs b/Assets/02.Scripts/Ui/Combat/CombatTutorialUi.cs index d2c979e40..91b818d3a 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatTutorialUi.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatTutorialUi.cs @@ -65,7 +65,7 @@ namespace BlueWater.Uis //PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Combat); //PlayerInputKeyManager.Instance.EnableAllActions(); - CombatUiManager.Instance.MoveSelectStage(0); + CombatUiManager.Instance.MoveSelectStage((int)SaveStage.FirstTutorial); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs b/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs index a5b1aefc0..f4575f11b 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs @@ -146,44 +146,19 @@ namespace BlueWater.Uis public void RestartCurrentStage() { - MapController MapController = null; - // TODO : 세컨드 맵 추가 - switch (DataManager.Instance.CurrentSaveStage) - { - case SaveStage.FirstTutorial: - MapController = FindAnyObjectByType(); - break; - // case SaveStage.SecondTutorial: - // MapController = FindAnyObjectByType(); - // break; - case SaveStage.Slime: - MapController = FindAnyObjectByType(); - break; - case SaveStage.Rhinoceros: - MapController = FindAnyObjectByType(); - break; - default: - throw new ArgumentOutOfRangeException(); - } - - if (MapController != null) - { - MapManager.Instance.InitMap(MapController); - } + MapManager.Instance.InitializeMap(); CloseAllPopup(); } public void MoveNextStage() { DataManager.Instance.CurrentSaveStage++; - RestartCurrentStage(); } public void MoveSelectStage(int stage) { DataManager.Instance.CurrentSaveStage = (SaveStage)stage; - RestartCurrentStage(); } diff --git a/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel.meta b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel.meta new file mode 100644 index 000000000..dd03da33f --- /dev/null +++ b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5dea34ea566ffe741859414ed84c50e8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrel.png b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrel.png new file mode 100644 index 000000000..a47b6eb93 Binary files /dev/null and b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrel.png differ diff --git a/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrel.png.meta b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrel.png.meta new file mode 100644 index 000000000..83968b96f --- /dev/null +++ b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrel.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: f691e5a4b4704ba4fa8eae85f615ec6e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrelBody.png b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrelBody.png new file mode 100644 index 000000000..c4b9ea537 Binary files /dev/null and b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrelBody.png differ diff --git a/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrelBody.png.meta b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrelBody.png.meta new file mode 100644 index 000000000..14e8cc507 --- /dev/null +++ b/Assets/03.Images/Characters/Enemies/Bosses/GhostBarrel/GhostBarrelBody.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 070f6e614aa8e4f4382b51ed0d20a1d7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Characters/Enemies/Bosses/SandMole.meta b/Assets/03.Images/Characters/Enemies/Bosses/SandMole.meta new file mode 100644 index 000000000..0726a79f2 --- /dev/null +++ b/Assets/03.Images/Characters/Enemies/Bosses/SandMole.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a5b444c0a718624683970d24fb5a5bc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Characters/Enemies/Bosses/SandMole/SandMole.png b/Assets/03.Images/Characters/Enemies/Bosses/SandMole/SandMole.png new file mode 100644 index 000000000..7ba38858b Binary files /dev/null and b/Assets/03.Images/Characters/Enemies/Bosses/SandMole/SandMole.png differ diff --git a/Assets/03.Images/Characters/Enemies/Bosses/SandMole/SandMole.png.meta b/Assets/03.Images/Characters/Enemies/Bosses/SandMole/SandMole.png.meta new file mode 100644 index 000000000..f983e4364 --- /dev/null +++ b/Assets/03.Images/Characters/Enemies/Bosses/SandMole/SandMole.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 884b7fc30283f3e4aad173e3e7bef059 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Maps/Combat/GroundBlue1.png b/Assets/03.Images/Maps/Combat/GroundBlue1.png new file mode 100644 index 000000000..aa507a690 Binary files /dev/null and b/Assets/03.Images/Maps/Combat/GroundBlue1.png differ diff --git a/Assets/03.Images/Maps/Combat/GroundBlue1.png.meta b/Assets/03.Images/Maps/Combat/GroundBlue1.png.meta new file mode 100644 index 000000000..803a20c8f --- /dev/null +++ b/Assets/03.Images/Maps/Combat/GroundBlue1.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: b6ebe79d23afa6846929e91ecb098d02 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Maps/Combat/GroundGreen.png b/Assets/03.Images/Maps/Combat/GroundGreen.png deleted file mode 100644 index f6032fc4c..000000000 Binary files a/Assets/03.Images/Maps/Combat/GroundGreen.png and /dev/null differ diff --git a/Assets/03.Images/Maps/Combat/GroundGreen1.png b/Assets/03.Images/Maps/Combat/GroundGreen1.png new file mode 100644 index 000000000..ac3e4d594 Binary files /dev/null and b/Assets/03.Images/Maps/Combat/GroundGreen1.png differ diff --git a/Assets/03.Images/Maps/Combat/GroundGreen.png.meta b/Assets/03.Images/Maps/Combat/GroundGreen1.png.meta similarity index 100% rename from Assets/03.Images/Maps/Combat/GroundGreen.png.meta rename to Assets/03.Images/Maps/Combat/GroundGreen1.png.meta diff --git a/Assets/03.Images/Maps/Combat/GroundRed.png b/Assets/03.Images/Maps/Combat/GroundRed.png deleted file mode 100644 index 062e92c41..000000000 Binary files a/Assets/03.Images/Maps/Combat/GroundRed.png and /dev/null differ diff --git a/Assets/03.Images/Maps/Combat/GroundRed1.png b/Assets/03.Images/Maps/Combat/GroundRed1.png new file mode 100644 index 000000000..7b31a1979 Binary files /dev/null and b/Assets/03.Images/Maps/Combat/GroundRed1.png differ diff --git a/Assets/03.Images/Maps/Combat/GroundRed.png.meta b/Assets/03.Images/Maps/Combat/GroundRed1.png.meta similarity index 100% rename from Assets/03.Images/Maps/Combat/GroundRed.png.meta rename to Assets/03.Images/Maps/Combat/GroundRed1.png.meta diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab index ba5864523..0e892011a 100644 --- a/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab @@ -178,6 +178,7 @@ GameObject: - component: {fileID: 4032255264356834775} - component: {fileID: 9052061988704076548} - component: {fileID: 6377054450616127915} + - component: {fileID: -3401764490790336446} - component: {fileID: 6865346796134993564} - component: {fileID: 4159255405813448884} m_Layer: 10 @@ -366,6 +367,18 @@ MonoBehaviour: _attackedParticle: {fileID: 0} _dieParticle: {fileID: 0} _particleInstantiateLocation: {fileID: 0} +--- !u!114 &-3401764490790336446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7170637981020870835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &6865346796134993564 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/Rhinoceros.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/Rhinoceros.prefab index 254fef68c..02332298e 100644 --- a/Assets/05.Prefabs/Characters/Enemies/Bosses/Rhinoceros.prefab +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/Rhinoceros.prefab @@ -115,9 +115,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} insertIndex: 3 addedObject: {fileID: 1110469622569527304} - - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} - insertIndex: -1 - addedObject: {fileID: 1713714627538766898} - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} insertIndex: -1 addedObject: {fileID: 3829196869920039026} @@ -191,18 +188,6 @@ MonoBehaviour: Version: 1.7.9 gizmoViewMode: 2 showBehaviorDesignerGizmo: 0 ---- !u!114 &1713714627538766898 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4623786526972472839} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &3829196869920039026 MonoBehaviour: m_ObjectHideFlags: 0 @@ -223,7 +208,7 @@ MonoBehaviour: k__BackingField: {fileID: 2875096611673055428} k__BackingField: {fileID: 5897569616117255232} k__BackingField: {fileID: 11400000, guid: c8e21ded50a36a549b51c846cf3640b3, type: 2} - k__BackingField: {fileID: 1713714627538766898} + k__BackingField: {fileID: 8314565348215340790} k__BackingField: {fileID: 8923351760400967455} k__BackingField: {fileID: 9002511558952892456} k__BackingField: {fileID: 1878389004569703936} @@ -243,6 +228,17 @@ CapsuleCollider: m_CorrespondingSourceObject: {fileID: 4832858849328938018, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} m_PrefabInstance: {fileID: 2569800677110986420} m_PrefabAsset: {fileID: 0} +--- !u!114 &8314565348215340790 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -3401764490790336446, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + m_PrefabInstance: {fileID: 2569800677110986420} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4623786526972472839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!212 &8411583502041648826 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 6274137400612009998, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/SandMole.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/SandMole.prefab new file mode 100644 index 000000000..4436cdd15 --- /dev/null +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/SandMole.prefab @@ -0,0 +1,167 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2569800677110986420 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 310644174614533744, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: b72997f7313898044ab80e696c84e390, type: 2} + - target: {fileID: 3476210053167940160, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4159255405813448884, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: _skillList.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4159255405813448884, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: '_skillList.Array.data[0]' + value: + objectReference: {fileID: 7464818668275774481, guid: c068e12b504a1ca48bf609ee2724abc8, type: 3} + - target: {fileID: 4159255405813448884, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: '_skillList.Array.data[1]' + value: + objectReference: {fileID: 7464818668275774481, guid: c068e12b504a1ca48bf609ee2724abc8, type: 3} + - target: {fileID: 4159255405813448884, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: '_skillList.Array.data[2]' + value: + objectReference: {fileID: 7464818668275774481, guid: c068e12b504a1ca48bf609ee2724abc8, type: 3} + - target: {fileID: 4159255405813448884, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: '_skillList.Array.data[3]' + value: + objectReference: {fileID: 7464818668275774481, guid: c068e12b504a1ca48bf609ee2724abc8, type: 3} + - target: {fileID: 4159255405813448884, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: '_skillList.Array.data[4]' + value: + objectReference: {fileID: 7464818668275774481, guid: c068e12b504a1ca48bf609ee2724abc8, type: 3} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalScale.x + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalScale.y + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalScale.z + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6274137400612009998, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_Size.y + value: 0.55 + objectReference: {fileID: 0} + - target: {fileID: 6274137400612009998, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + - target: {fileID: 6274137400612009998, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6377054450616127915, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: k__BackingField + value: 700 + objectReference: {fileID: 0} + - target: {fileID: 7170637981020870835, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_Name + value: SandMole + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + insertIndex: 3 + addedObject: {fileID: 1110469622569527304} + m_SourcePrefab: {fileID: 100100000, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} +--- !u!1 &4623786526972472839 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7170637981020870835, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + m_PrefabInstance: {fileID: 2569800677110986420} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1110469622569527304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4623786526972472839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3} + m_Name: + m_EditorClassIdentifier: + startWhenEnabled: 0 + asynchronousLoad: 0 + pauseWhenDisabled: 0 + restartWhenComplete: 0 + logTaskChanges: 0 + group: 0 + resetValuesOnRestart: 0 + externalBehavior: {fileID: 0} + mBehaviorSource: + behaviorName: SandMole + behaviorDescription: + mTaskData: + types: [] + parentIndex: + startIndex: + variableStartIndex: + JSONSerialization: '{}' + fieldSerializationData: + typeName: [] + fieldNameHash: + startIndex: + dataPosition: + unityObjects: [] + byteData: + byteDataArray: + Version: 1.7.9 + gizmoViewMode: 2 + showBehaviorDesignerGizmo: 0 diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/SandMole.prefab.meta b/Assets/05.Prefabs/Characters/Enemies/Bosses/SandMole.prefab.meta new file mode 100644 index 000000000..0405dbe72 --- /dev/null +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/SandMole.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e3a389dac3e524844ac42dabd7207e64 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab index a905bd8f4..5b3d7d074 100644 --- a/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab @@ -197,9 +197,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} insertIndex: 3 addedObject: {fileID: 3336831312449989230} - - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} - insertIndex: -1 - addedObject: {fileID: 7797932167748790014} - targetCorrespondingSourceObject: {fileID: 7170637981020870835, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} insertIndex: -1 addedObject: {fileID: 656862713763374453} @@ -252,6 +249,17 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 6274137400612009998, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} m_PrefabInstance: {fileID: 2056264439854344849} m_PrefabAsset: {fileID: 0} +--- !u!114 &5495465377430151891 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -3401764490790336446, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + m_PrefabInstance: {fileID: 2056264439854344849} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9154244493302919714} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!136 &6888416268787095219 stripped CapsuleCollider: m_CorrespondingSourceObject: {fileID: 4832858849328938018, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} @@ -316,18 +324,6 @@ MonoBehaviour: Version: 1.7.9 gizmoViewMode: 2 showBehaviorDesignerGizmo: 0 ---- !u!114 &7797932167748790014 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9154244493302919714} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &656862713763374453 MonoBehaviour: m_ObjectHideFlags: 0 @@ -342,13 +338,13 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: {fileID: 7439961924219752693} k__BackingField: {fileID: 6888416268787095219} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 3336831312449989230} k__BackingField: {fileID: 3221387912671045841} k__BackingField: {fileID: 5448061580005708447} k__BackingField: {fileID: 1785378898368314593} k__BackingField: {fileID: 7996411433804189797} k__BackingField: {fileID: 11400000, guid: c9c36628b677b854999f97966b3c5b14, type: 2} - k__BackingField: {fileID: 7797932167748790014} + k__BackingField: {fileID: 5495465377430151891} k__BackingField: {fileID: 4969309465389398842} k__BackingField: {fileID: 4886349608629249037} k__BackingField: {fileID: 2680193030030060069} diff --git a/Assets/05.Prefabs/Maps/FirstTutorialMapController.prefab b/Assets/05.Prefabs/Maps/FirstTutorialMapController.prefab index 37b55ad20..7349077ae 100644 --- a/Assets/05.Prefabs/Maps/FirstTutorialMapController.prefab +++ b/Assets/05.Prefabs/Maps/FirstTutorialMapController.prefab @@ -85,8 +85,9 @@ MonoBehaviour: PlayerSpawnTransform: {fileID: 3415171223847061781} EnemyInstantiateLocation: {fileID: 616987793931928346} k__BackingField: {fileID: 3030394091931252869} - EnemyInstanceList: [] - enemySpawnTransformList: [] + SaveStage: 1 + BGMName: TutorialStage + EnemySpawnTransformList: [] --- !u!4 &3030394091931252869 stripped Transform: m_CorrespondingSourceObject: {fileID: 5292453453235858255, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} diff --git a/Assets/05.Prefabs/Maps/MapController.prefab b/Assets/05.Prefabs/Maps/MapController.prefab index 50afe980b..2e3cc508c 100644 --- a/Assets/05.Prefabs/Maps/MapController.prefab +++ b/Assets/05.Prefabs/Maps/MapController.prefab @@ -60,8 +60,8 @@ Transform: m_GameObject: {fileID: 1393939264629856146} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 5.5} - m_LocalScale: {x: 12, y: 5, z: 2.5} + m_LocalPosition: {x: 0, y: 0, z: 6.25} + m_LocalScale: {x: 18, y: 5, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3687127944708873980} @@ -199,8 +199,8 @@ Transform: m_GameObject: {fileID: 2252011116647396897} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.5, y: 0, z: 0} - m_LocalScale: {x: 1, y: 5, z: 12} + m_LocalPosition: {x: -7, y: 0, z: 0} + m_LocalScale: {x: 4, y: 5, z: 18} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3687127944708873980} @@ -590,8 +590,8 @@ Transform: m_GameObject: {fileID: 5194988466372041496} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -5.5} - m_LocalScale: {x: 12, y: 5, z: 2.5} + m_LocalPosition: {x: 0, y: 0, z: -6.25} + m_LocalScale: {x: 18, y: 5, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3687127944708873980} @@ -698,7 +698,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 25, y: 25, z: 1} + m_LocalScale: {x: 25, y: 21.25, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2986811746704976679} @@ -777,7 +777,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 0.85, z: 0.20000005} + m_Size: {x: 1, y: 1, z: 0.20000005} m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &5527726676081256856 GameObject: @@ -1090,8 +1090,8 @@ Transform: m_GameObject: {fileID: 9198442223207540368} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.5, y: 0, z: 0} - m_LocalScale: {x: 1, y: 5, z: 12} + m_LocalPosition: {x: 7, y: 0, z: 0} + m_LocalScale: {x: 4, y: 5, z: 18} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3687127944708873980} diff --git a/Assets/05.Prefabs/Maps/RhinocerosMapController.prefab b/Assets/05.Prefabs/Maps/RhinocerosMapController.prefab index 1e98536bf..ca9124529 100644 --- a/Assets/05.Prefabs/Maps/RhinocerosMapController.prefab +++ b/Assets/05.Prefabs/Maps/RhinocerosMapController.prefab @@ -2916,13 +2916,16 @@ MonoBehaviour: m_GameObject: {fileID: 105140074300305660} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 372e12b84435f0d4b8f49f18636929dd, type: 3} + m_Script: {fileID: 11500000, guid: 45ca5fc4b0d9415ca599aa7cd17f3370, type: 3} m_Name: m_EditorClassIdentifier: PlayerSpawnTransform: {fileID: 2849157954692818502} EnemyInstantiateLocation: {fileID: 27273469593611337} k__BackingField: {fileID: 2513291633537767382} + SaveStage: 4 + BGMName: Stage2 BossSpawnTransform: {fileID: 1204009204749076978} + BossType: 2 --- !u!4 &552333954124801105 stripped Transform: m_CorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} @@ -3022,6 +3025,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7557375837466550001} m_Modifications: + - target: {fileID: 746926837324079264, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3} + propertyPath: k__BackingField + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3} propertyPath: m_LocalScale.x value: 11.42 @@ -3178,6 +3185,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8470785318154757585} m_Modifications: + - target: {fileID: 746926837324079264, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3} + propertyPath: k__BackingField + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1375792957138567903, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3} propertyPath: m_CastShadows value: 3 @@ -3264,6 +3275,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7557375837466550001} m_Modifications: + - target: {fileID: 746926837324079264, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3} + propertyPath: k__BackingField + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3} propertyPath: m_LocalScale.x value: 6.87 diff --git a/Assets/05.Prefabs/Maps/SandMoleMapController.prefab b/Assets/05.Prefabs/Maps/SandMoleMapController.prefab new file mode 100644 index 000000000..9c4871a99 --- /dev/null +++ b/Assets/05.Prefabs/Maps/SandMoleMapController.prefab @@ -0,0 +1,863 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &316225229665130246 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 12214026721498088} + - component: {fileID: 3158961154181537013} + - component: {fileID: 1579451175132699519} + m_Layer: 0 + m_Name: GroundFog (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &12214026721498088 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316225229665130246} + serializedVersion: 2 + m_LocalRotation: {x: -0.89120054, y: 0, z: 0, w: 0.45360953} + m_LocalPosition: {x: 0.46, y: 12.35, z: 11.35} + m_LocalScale: {x: 5, y: 1, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5591840841030008137} + m_LocalEulerAnglesHint: {x: -126.049, y: 0, z: 0} +--- !u!33 &3158961154181537013 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316225229665130246} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1579451175132699519 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316225229665130246} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4ec0be38d1bee9d4897511f6325eb5e9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &527968627281291490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9110149285681616722} + - component: {fileID: 7915287326972947266} + - component: {fileID: 1956263596326986001} + - component: {fileID: 7104050275008449213} + m_Layer: 7 + m_Name: Wall (4) + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9110149285681616722 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527968627281291490} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} + m_LocalPosition: {x: -5, y: 0, z: -5} + m_LocalScale: {x: 9, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} +--- !u!33 &7915287326972947266 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527968627281291490} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1956263596326986001 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527968627281291490} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &7104050275008449213 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527968627281291490} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1250334033574271766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9203013126190605548} + - component: {fileID: 8674975795360865975} + - component: {fileID: 6859180600645780772} + m_Layer: 0 + m_Name: GroundFog (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9203013126190605548 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1250334033574271766} + serializedVersion: 2 + m_LocalRotation: {x: -0.5936553, y: -0.4494903, z: -0.46541741, w: 0.47845432} + m_LocalPosition: {x: -15.12, y: 12.35, z: 10.37} + m_LocalScale: {x: 5, y: 1, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5591840841030008137} + m_LocalEulerAnglesHint: {x: -99.434, y: -48.348, z: -32.605} +--- !u!33 &8674975795360865975 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1250334033574271766} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6859180600645780772 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1250334033574271766} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4ec0be38d1bee9d4897511f6325eb5e9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3576121860620050639 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2371715650716152918} + - component: {fileID: 3693660804402665553} + - component: {fileID: 8581638676630051161} + - component: {fileID: 579589595945511466} + m_Layer: 7 + m_Name: Wall (7) + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2371715650716152918 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3576121860620050639} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} + m_LocalPosition: {x: 5, y: 0, z: -5} + m_LocalScale: {x: 9, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} +--- !u!33 &3693660804402665553 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3576121860620050639} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8581638676630051161 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3576121860620050639} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &579589595945511466 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3576121860620050639} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6878346579007020644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8675617410349964222} + - component: {fileID: 5064655652176112744} + - component: {fileID: 3923569007199779618} + - component: {fileID: 5850474432247577565} + m_Layer: 7 + m_Name: Wall (5) + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8675617410349964222 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878346579007020644} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} + m_LocalPosition: {x: 5, y: 0, z: 5} + m_LocalScale: {x: 9, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} +--- !u!33 &5064655652176112744 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878346579007020644} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3923569007199779618 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878346579007020644} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &5850474432247577565 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878346579007020644} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7619121463401286315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1634167220817088965} + - component: {fileID: 5883491723928623040} + - component: {fileID: 8697289849610035235} + m_Layer: 0 + m_Name: GroundFog (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1634167220817088965 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7619121463401286315} + serializedVersion: 2 + m_LocalRotation: {x: 0.13880256, y: -0, z: -0, w: 0.9903201} + m_LocalPosition: {x: 0, y: 2.71, z: -19.85} + m_LocalScale: {x: 5, y: 1, z: 1.5694938} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5591840841030008137} + m_LocalEulerAnglesHint: {x: 15.957, y: 0, z: 0} +--- !u!33 &5883491723928623040 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7619121463401286315} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8697289849610035235 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7619121463401286315} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4ec0be38d1bee9d4897511f6325eb5e9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8345533875491524569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3406627660418635767} + - component: {fileID: 2610884345639726499} + - component: {fileID: 3065305067449202302} + - component: {fileID: 2344744131327218458} + m_Layer: 7 + m_Name: Wall (6) + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3406627660418635767 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8345533875491524569} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} + m_LocalPosition: {x: -5, y: 0, z: 5} + m_LocalScale: {x: 9, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} +--- !u!33 &2610884345639726499 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8345533875491524569} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3065305067449202302 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8345533875491524569} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2344744131327218458 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8345533875491524569} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &2424043105665738113 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2688871614312994883, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3586112574380059702, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.z + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4835769001966080896, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4986893797161030022, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5069614002474882010, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalScale.y + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 6511453854817970958, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.z + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 7396433262681865224, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b6ebe79d23afa6846929e91ecb098d02, type: 3} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7639058301001315723, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.y + value: -0.28 + objectReference: {fileID: 0} + - target: {fileID: 7702874292798655589, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Name + value: SandMoleMapController + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 9110149285681616722} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 8675617410349964222} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 3406627660418635767} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 2371715650716152918} + - targetCorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1634167220817088965} + - targetCorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 12214026721498088} + - targetCorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 9203013126190605548} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7702874292798655589, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 6585123087190923213} + m_SourcePrefab: {fileID: 100100000, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} +--- !u!4 &1335494345527737213 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5354947371749406033 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7778690860228022480, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5424010737098975716 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7702874292798655589, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6585123087190923213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5424010737098975716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45ca5fc4b0d9415ca599aa7cd17f3370, type: 3} + m_Name: + m_EditorClassIdentifier: + PlayerSpawnTransform: {fileID: 7906706039042621278} + EnemyInstantiateLocation: {fileID: 5354947371749406033} + k__BackingField: {fileID: 7552954649617714894} + SaveStage: 5 + BGMName: + BossSpawnTransform: {fileID: 6522622582430961898} + BossType: 3 +--- !u!4 &5591840841030008137 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6522622582430961898 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8874040642671342955, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7552954649617714894 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5292453453235858255, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7906706039042621278 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5483604360458066655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Maps/SandMoleMapController.prefab.meta b/Assets/05.Prefabs/Maps/SandMoleMapController.prefab.meta new file mode 100644 index 000000000..4a9977a60 --- /dev/null +++ b/Assets/05.Prefabs/Maps/SandMoleMapController.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 39e32b91cc570794e9e843b39f89e400 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab b/Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab index 0a9197275..74dee4b66 100644 --- a/Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab +++ b/Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab @@ -2885,7 +2885,10 @@ MonoBehaviour: PlayerSpawnTransform: {fileID: 7906706039042621278} EnemyInstantiateLocation: {fileID: 5354947371749406033} k__BackingField: {fileID: 7552954649617714894} + SaveStage: 3 + BGMName: Stage1 BossSpawnTransform: {fileID: 6522622582430961898} + BossType: 1 --- !u!4 &5591840841030008137 stripped Transform: m_CorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}