diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 3f91ad218..beb93b5e7 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -788,13 +788,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 545850347} serializedVersion: 2 - m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: -2, y: 20.000006, z: -36.080013} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: -2, y: 25.711502, z: -32.08078} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1634548838} - m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!114 &545850349 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1336,8 +1336,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873223985} serializedVersion: 2 - m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: -2, y: 20.000006, z: -36.080013} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: -2, y: 25.711502, z: -32.08078} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index 5828b7396..c5c774339 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -134,6 +134,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6aff73d268584edba076603861b2ea73, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &56352880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 56352881} + - component: {fileID: 56352883} + - component: {fileID: 56352882} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &56352881 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56352880} + 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: 457545154} + 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 &56352882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56352880} + 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 &56352883 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56352880} + m_CullTransparentMesh: 0 --- !u!1 &67330819 GameObject: m_ObjectHideFlags: 0 @@ -240,6 +315,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 67330819} m_CullTransparentMesh: 0 +--- !u!1 &70049815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 70049816} + - component: {fileID: 70049818} + - component: {fileID: 70049817} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &70049816 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70049815} + 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: 1464378975} + 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 &70049817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70049815} + 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: "\uD0C0\uC774\uD2C0 \uD654\uBA74\uC73C\uB85C" + 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 &70049818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70049815} + m_CullTransparentMesh: 0 --- !u!1 &96992132 GameObject: m_ObjectHideFlags: 0 @@ -405,6 +616,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 97995583} m_CullTransparentMesh: 0 +--- !u!1 &104504150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 104504151} + - component: {fileID: 104504153} + - component: {fileID: 104504152} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &104504151 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 104504150} + 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: 965024375} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 200, y: 0} + m_SizeDelta: {x: 300, y: 125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &104504152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 104504150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uAC1C\uBC1C\uC790 \uBA54\uB274" + 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: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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 &104504153 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 104504150} + m_CullTransparentMesh: 0 --- !u!1 &119873273 GameObject: m_ObjectHideFlags: 0 @@ -461,6 +808,147 @@ MonoBehaviour: _fullHeart: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} _halfHeart: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} _emptyHeart: {fileID: 21300000, guid: b519b8a1ceacfad4c834eb059d4004a7, type: 3} +--- !u!1 &162376353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 162376354} + - component: {fileID: 162376356} + - component: {fileID: 162376355} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &162376354 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 162376353} + 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: 288894975} + 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 &162376355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 162376353} + 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: "\uCF54\uBFD4\uC18C \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 &162376356 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 162376353} + m_CullTransparentMesh: 0 +--- !u!4 &164065895 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2176103224221138801, guid: 9246d6576382b724b978b10dd59f0204, type: 3} + m_PrefabInstance: {fileID: 1332793830} + m_PrefabAsset: {fileID: 0} --- !u!1 &166638081 GameObject: m_ObjectHideFlags: 0 @@ -492,7 +980,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABIIeynmcrVuAIAAP0FAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5y0KtGWrve0CbfdAi0qrHpYehmRCLIwd+aNAK/77zjiBBJAiJXrz5vnNh/MtpHYlpt7YByuziclQ/OoI/hY/Ok3wEbewNHomv/DAeZeZL5gEkfMCXhrCe5zmzBq9lelvvVRMTggMWubGrsfZEofGeUdwDsohhazxnK0J+u6IbZ2wq99f/O7s6StF7dFesq6Sbu+EGHSqYF1ixoYbfv+2TujfRpqmUmoG56dGKelqH8LvyljnEEoXqAoiZBKorugg6Q4IKFAuC8/p3du2wHOeO/SRds31wW4kLTWp0hZ/TNW5NbhV5e4TVODTru9uorNKeHIRH1Th3Jr14/HshPvgC5muXmCXgvOt1rbhUWO/F5u0AbWChcL3AvWTebAm6IyC3gZODQ77o5bUsbphgemq4VVez8BQXo6pNaN9rH4781ge60i6Nw365tDNlIkjOBjgUA31WRMtze8vFRSXx9UnEcomSeAVlu0tqwP30jpPodpQjTJ3SiPCDHWKdeOvmKDZ38IEy1piHM1yN4IfGqsxwnXRJWpQfjclRX+yBZexlq+zyD3whavd1bHDPTpLiXDDT5Kz0NRsjtO2tMMuLvbh698HT8EVZjNBVzwHr6TGphgOPFGDh0branXbzTykzYLNIW2ledz6YHEEHuJpZIc2LGunUi9jhg5K8TLHAqIjKoCfD+5vAXSuirB4MjpewJN3tL8MMju9IiLv59c5DPqDBAY5YHo1yAc/+4ve4g5u8rsMQMQ7JDW1G9S06lc9Jdqu9mg0XRiWrHYmkE3KmEAZfwYWNg/ya21aCyB1bmapRdTPp0IOOZN+Ndk4kyQzQ++ljuspvudCmXSF2fwoNI/9HW+9hXmjMhel/DSekbkYxn/hXDB8vJm0wZ8SN3z4iRgqmiBmr1LhGkoOJXux/w9QSwMEFAAACAgAAEgh7DnCb3q3AgAA8wUAAAsAJABncmFwaDEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAWVUTW/iMBD9K5XP2ypQQGhvu0DbPbRFpaselh6MMyEWjh35o0Ar/vvOOIYEKiElvPl682YmX0xqV4Pwxt5bmT+aHNjPK0bv7MdVa3yAHV8bvZCfcPR5k7kvyYlHnxfupUG8R2HOVOCtFL/0WpFzhmDQsjC2muVrmBjnHcIFVw7QZI2naI3Q1xXbpYB9en7S8+qAbwK0B9t6DbKj33V20ztzDVooXtWQE+U2oj9MAf1hdNPYTPKgeGGUki4xYX5fx04nvHYB+0CHXHLsLHK4xb8lyHXp059T8HNROCC0d0PlLN9PpUWJmrzst2l0q7jbNMw+uApU6XY8iKyatI/f7KPGXFhTPRwr96IGvpRi88L3gjvfEbYLT1vqvSjQlqsNXyl4K0E/mXtrgs7R6G2g0OCgP+2kOnU3KUFsWr+G6wUY6u+j7MznELvfLTzUpz6ym0GL/nXgFspE+Y8EyJSgPuUEi7P7gw3F1XGpEqJEEhO88nV3x5LhTlrn0ZQIJZR85zgiyEELSMJfk4MmfisTLOVis0iW1Ah+YqyGCKema9Bc+f0cM/ruFmTfbR1eF5Y7TueW2CXb8YouQiLc+mfZhWlutqdpW9xfF5f6+PbvnabgSrN9BFc+B6+khrYZMjyhwBOjdbO6XTGPYYtgCy46YR52PliYcs9jNaSDG5Z3Q1HLGKGDUrTMsYHICBug3zvpW3KsqyLMnoyOx3f2jPTXQebnJ8J6w2IlRsM+H2WjYijG1zBc8VUhxsUYxiIbDVi8IalRbq7mjV5pSrhd3dFoPBhKuVCywqWo4wfA8u29/KxMZ/BSF2YhLIB+Pk/gwGIN/Lzks1xilwvwXuq4luxryZQRG8iXp0TLqOts5y1ftlmWrJYfxhOyZJP4BVwygk8XiZv7IWFLxc+SgcLJQf4qFVS8JlN2YIf/UEsDBBQAAAgIAABIIexrVpLCvQIAAPcFAAALACQAZ3JhcGgyLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v2kAQ/Stoz01kDKRRby2QpAcSFFrlUHLYeMd4xbJr7UeARPz3zqwXbIiEZPPm682bGX8yqV0NhTf23koxMwLYjx6jd/at1xofYMdXRi/kBxx9XqTwFTnx6PPMvTSI9ynMmQ14K4ufeqXIOUMwaFkau5mKFYyN8w7hkisHaLLGU7RG6LPHdilgn54f9Owd8K0A7cG2XjfZ0e8qu+6fuQZdKL6pQRDlNiIfpYB8FN00NpM8KL4wSkmXmDC/r2OnY167gH2gg5AcO4scbvBvBXJVefwz6AY/laUDQvvXVM7y/URalKjJy36ZRrcNd+uG2TtXgSoNboeRVZN29sV+05hLazYPx8r9qIGvZLF+5vuCO98RtgtPWur9KNCWqzV/U/BSgX4099YELdDobaDQ4CCfdFKduhtXUKxbv4brBRjqr6PszOcQu98tPNSnPrLrYYv+deAWykT5jwTIlKCccoLF2f3GhuLquFQJUSKJCf7wVXfHkuFOWufRlAgllHznOCIQoAtIwl+RgyZ+byZYysWmkSypEfzYWA0RTk3XoLny+zlm9N0tyL7aOrwuLHeczi2xS7bjFV2ERLj1z7IL09xsT9O2uL8uLvXx7d8rTcFVZjsDVz0Fr6SGthkyPKLAY6N1s7pdMY9hi2BLXnTCPOx8sDDhnsdqSAc3THRDUcsYoYNStMyxgcgIG6DfK+lbcayrIswejY7Hd/aM9FdBivMTYWLIv98OIC/7WQH87fZqlJfDUuRDnuf5aDQYsHhDUqPcXM0bvdKUcLt024vGe6GMz5XUpqBNmfE6fgQs397Lj43pDF/q0iwKC6CfmiSnfsFiHfzEiKmQ2OkCvJc6rib7XDJlijWI5SnRMmo73XnLl22WJavlu/GELNk4fgWXjODTVeL2vkvYUvGzZKBweiD+SAUbXpMpO7DDf1BLAwQUAAAICAAASCHsrh69cL0CAAAABgAACwAkAGdyYXBoMy5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BZVRNb+IwEP0ryOctChTo7t52gbZ7oEWFVQ9LDyYeiIWxI38UaMV/3xnHkEClSInevDd+8+F8MqldCbk39sFKMTEC2M8Wo2/2rVUHH2HP10bP5AecOK9S+IJIPHJeuJcG8Q7JnNmCtzL/pdeKyBmCQcuVsduxWMPQOO8QXnHlAEPWeFJrhD5bbJ8Eh/T+oHfriF85aA+2ZnWzE+8ma3cuqEHnim9LEGS5oegnQbcfaRqLSQzS50Yp6ZIT5g9lrHTISxewDiQIybGy6CFrDxAoQK4LT/J2v5ngebVy4CPtlirkh5G02KYqN/ttqt5tudtU7t65CnTa7fdedFYlnnyJD6rwyprt4/ns2AdfyHzzwg85d77R3CY8qu13YpN2XG34UsFrAfrJPFgTtMCgt4GkwUF31Eh1rm5YQL6peZXXKzCUX8fZmNExVr+feSjPdWTtXo3+deBmysQRnAxQKEFdygkW5/cHC4rr49JJiJJJTDDn6+aepcC9tM5jKBlKKHGnOCIQoHNIjb8hgiZ/SxMs5WLjaJa6EfzQWA0RTkWXoLnyhylm9Bdb8DXW8HUVued05ZK7FDvdpCtJhGt+ll2FpmZ3nrbFHXZxsU9f/95oCq4wuwm44jl4JTXUxVDgCRs8NFpXq9ts5kk2C3bF84bMw94HCyPueTwN7eCGiaYUexkVOihFyxwLiI6wAHreqL8Fx3NVhNmT0fECXryj/XWQ4vKKsOXdXReWot8b/Mh6d3B7w3Gsg36/1xFLvuzlGYt3SGpsN1fTql9pSrhdzdFovDCUcga50WIe0CdKJryMfwPLdw/yY2saGyD1ysxyC6CfLzM5ICX+a8RYSEwzA++ljvvJPhdMmXwDYnFOtIgNHu+95Ys6y4KV8t14QhZsGH+HC0bw+WriCr9L2NHhF8lA4QhBzKWCLS8plB3Z8T9QSwMEFAAACAgAAEgh7E9V51nEAgAACAYAAAsAJABncmFwaDQuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAWVUTW/iMBD9K8jnLQpf3e7edoG2e6BFpaselh7ceEIsjB35o0Ar/vvOOIYEKkVK9ObN+M2bcT6Z1K6C3Bt7Z6WYGQHsZ4fRN/vWaYL3sOMroxfyA46cFyl8SSQeOU/cS4N4j9Kc2YC3Mv+lV4rIGYJBy8LYzVSsYGycdwgXXDnAkDWesjVCnx22Swn79P6gd+eAXzloD7ZhXWdH3lXW7Z1Rg84V31QgSHKT0R+lhP4o0jQ2kxiUnxulpEtKmN9XsdMxr1zAPpAgJMfOooase41ACXJVekrvjtoFHovCgY+0AXXI9xNp0aa6Nvttau823K1rde9cBTptcDOMyurCsy/x6zpcWLO5P50dffClzNdPfJ9z51vmtuFJI78XTdpyteZvCl5K0A/mzpqgBQa9DZQaHPQnrVKn7sYl5OuGV2u9AEP1dZytGR1i97uFh+rUR9YdNuhfB26hTBzBUQCFEtSnmmBxfn+wobg+Lp2EKInEAs981d6zFLiV1nkMJUEJJe4cRwQCdA7J+CsiaNL3ZoKlWmwaxZIbwY+N1RDh1HQFmiu/n2NFf7YFX2MtXReRW05XLqlLseNNukiJcMPPsovQ3GxP07a4wy4u9vHr3ytNwZVmOwNXPgavpIamGQo8oMFjo3W9um0zj2mLYAuet9I87HywMOGex9NQDm6YaKeilzFDB6VomWMDURE2QM8r+VtyPFdFmD0YHS/g2TvKXwUpzq8IGxQ9gJsfPTEcioyP3q563wshhqIYDvv9XlEULN4hqdFurua1X2lKuF3t0Wi8MFTyqZTa5LQqM17dSlBihunkCP0VLN/eyY+NaW2C1IVZ5BZAP55XdGDxUPzniKmQ2PYCvJc67in7XDJl8jWI5anQMho93XnLl02VJavku/GELNk4/haXjODTFcVVfpewpcPPioHCUYJ4lgo2vKJQdmCH/1BLAwQUAAAICAAASCHsAQh4KMsAAABvAQAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAbWPwU4DMQxEf6XKma0Sx3ZSfqA3xB314MR2uwe21bYgIcS/sxHfwG088zTWfIdPW+/zdQnPO9qnfXrahfMqt8t9GOP4mHXot+Dg2YWBo7CL9YmdC7TUqqBXFQkbnshbZwLhyE69TkZNmvfq1WqPjANSlFKzgafYTVqdCBxdAQUAiHIeUCsFrCkhHyIWy9P20pgIk26N2OOAsiezekiKqFGoTam4KqojAiR3D6eNenzd7EXe7W/HqzwuPi86L+f9cZ31OOaOsn8PTj+/UEsBAi0AFAAACAgAAEgh7KeZytW4AgAA/QUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7DnCb3q3AgAA8wUAAAsAJAAAAAAAAAAAAAAABQMAAGdyYXBoMS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7GtWksK9AgAA9wUAAAsAJAAAAAAAAAAAAAAACQYAAGdyYXBoMi5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7K4evXC9AgAAAAYAAAsAJAAAAAAAAAAAAAAAEwkAAGdyYXBoMy5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7E9V51nEAgAACAYAAAsAJAAAAAAAAAAAAAAAHQwAAGdyYXBoNC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7AEIeCjLAAAAbwEAAAkAJAAAAAAAAAAAAAAALg8AAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAABgAGACwCAABEEAAAAAA= + dataString: UEsDBBQAAAgIAABIIeyZdS6MuQIAAPUFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SuVz9sq0ILQ3naBtntoi0pXPSw9GGdCLBw78keBVvz3nXEMCSAhJbz5evNmJt9MaleD8MY+WJk/mRzYzytG7+zHVWt8hC1fGT2XX3DweZe5L8mJR59X7qVBvEdhzlTgrRS/9EqRc4Zg0LIwtprmKxgb5x3CBVcO0GSNp2iN0PcV26aAXXp+0fNqj28CtAd76XWd3fROHIMWilc15ES49e8PUkC/cdPYSvKgeGGUki7xYH5Xxz7HvHYBu0CHXHLsKzK4xb8lyFXp059j8EtROCC0d0PlLN9NpEWBmrzst2lUq7hbN8w+uQpU6XZ0F1k1aZ8u7MPGXFhTPR4q9zLSwJdSrF/5TnDnO7J24UlLvRcF2nC15ksF7yXoZ/NgTdA5Gr0NFBoc9CedVMfuxiWIdevXcD0DQ305os589rH77dxDfewju7lr0b8O3FyZKP+BAJkS1KecYHF2f7ChuDguVUKUSGKCN77qblgy3EvrPJoSoYSS7wxHBDloAUn4a3LQxG9pgqVcbBrJkhrBj43VEOHUdA2aK7+bYUbf3YLs0tbhdWa553RsiV2yHW7oLCTCrX+WnZlmZnOctsX9dXGpD2//PmgKrjSbJ3DlS/BKamibIcMzCjw2Wjer2xXzEDYPtuCiE+Zh64OFCfc8VkM6uGF5NxS1jBE6KEXLHBuIjLAB+n2QviXHuirC7NnoeHwnz0h/FWR+eiKsNyiWYjjo82E2LAZidA2DJV8WYlSMYCSy4R2LNyQ1ys3VrNErTQm3S7e9aLwXyvgmPddzJStcjDp+BCzfPMivynSGL3Vh5sIC6JcmybFfsFgHPzH5NJfY6Ry8lzquJvteMGXEGvLFMdEiajvdessXbZYFq+Wn8YQs2Dh+AxeM4ONV4vZ+SthQ8ZNkoHB6kL9JBRWvyZTt2f4/UEsDBBQAAAgIAABIIexAxy1huAIAAPgFAAALACQAZ3JhcGgxLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v2kAQ/Stoz01kDLRRby2QpAcSFFLlUHLYeMd4xbJr7UeARPz3zqwXbIiEZPPm682bGX8yqV0NhTf2zkoxMwLYzx6jd/at1xrvYcdXRi/kBxx9XqTwFTnx6PPEvTSI9ynMmQ14K4tfeqXIOUMwaFkau5mKFYyN8w7hkisHaLLGU7RG6LPHdilgn54f9Owd8K0A7cG2Xnl29LvKrvtnrkEXim9qEES5EzFKAfkoumlsJnlQfGGUki4xYX5fx07HvHYB+0AHITl2FjlQpgrkqvLpzyn4sSwdEJpfE275fiItStTkZb9No9uGu3XD7J2rQJUGN8PIqkk7+2L/3phLazb3x8r9qIGvZLF+4vuCO98RtgtPWur9KNCWqzV/U/BSgX4wd9YELdDobaDQ4CCfdFKduhtXUKxbv4brBRjqr6PszOcQu98tPNSnPrLrYYv+deAWykT5jwTIlKCccoLF2f3BhuLquFQJUSKJCZ75qrtjyXArrfNoSoQSSr5zHBEI0AUk4a/IQRO/NxMs5WLTSJbUCH5srIYIp6Zr0Fz5/Rwz+u4WZF9tHV4XlltO55bYJdvxii5CItz6Z9mFaW62p2lb3F8Xl/r49u+VpuAqs52Bqx6DV1JD2wwZHlDgsdG6Wd2umMewRbAlLzphHnY+WJhwz2M1pIMbJrqhqGWM0EEpWubYQGSEDdDvlfStONZVEWYPRsfjO3tG+qsgxfmJMDHkP24GkJf9rAD+dnM1ysthKfIhz/N8NBoMWLwhqVFuruaNXmlKuF3d0Wg8GEr5VEltClqVGa/jV8Dy7Z382JjO9KUuzaKwAPrxPIsDi4XwGyOmQmKrC/Be6rib7HPJlCnWIJanRMso7nTnLV+2WZaslu/GE7Jk4/gZXDKCT2eJ6/suYUvFz5KBwvGBeJYKNrwmU3Zgh/9QSwMEFAAACAgAAEgh7G/Zci64AgAA9AUAAAsAJABncmFwaDIuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAWVU227iMBD9FeTnbZXQK/u2C7Tdh7aodNWHpQ8mnhALY0e+FGjFv++MY0igUqREZ87MnLnli0ntaii8sfdWikcjgP3sMfpmP3qt8QE2fGH0VH7CnvMmha+IxCPnhXtpEM/JzZkVeCuLX3qhiJwhGLQsjV2NxQKGxnmHcMmVAzRZ48lbI/TVY5vksE3vT3r3dvhVgPZgW1Y/2/POsvM8URGM5KALxVc1CBLd8blKLv2rSNNYTmJQhMIoJV3Swvy2jrUOee0CVoIEITnWFlUQvwK5qDyF6zo/l6UDn/Rbvh1Jiy1qorLfpunbirtlo+uDq0B5Lm4vo6Ym6OM3+3VjLq1ZPezz5rEHvpLF8oVvC+58p7FdeHQsPOg1V0s+V/BWgX4y99YELdDobSDX4KA/6oQ61DasoFi2vEbrCRjq76PM21HuYvWbqYf6UEd2ftmifx24qTKx+SkkWRIyoJBgcXB/sJ64OS4lQpQ0ov8rX3RXLBnupHUeTUlPQok7wQmBAF1A6vsZETTJm5tgKRYbR63UjOCHxmqIcBJYg+bKbycY0Z+uwImto+vEcsfp2pK6ZNsf0YlLhFt+lp2YJmZ9GLbF5XVxo/df/95pCK4y60dw1XPwSupOt8nwhA0eGq2bze02c+82DbbkRcfNw8YHCyPuecyGcnDBRNcVexk9dFCKdjkWEBVhAfS8U38rjnlVhNmT0fHyjt5R/iJIcXwh7DLLeXE7z8v+YJ5fZPOzm2xwcw03+Vzk82KQD1g8Iamx3VxNmn6lKeF26bYWjedCEadc439R4VrU8f4tX9/Lz5XpjF7q0kwLC6CfmxCHasFiFvy7iLGQWOcUvJc6Lib7mjFliiWI2SHQLHZ2vPGWz9ooM1bLD+MJmbFh/AXOGMGHk8Td/ZCwpuRHwUDh7EC8SgUrXpMp27Hdf1BLAwQUAAAICAAASCHsLznszKMAAADzAAAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAZWOzQ6CMBCEX8X0LKTbP4ovwM14Nxx22y70IBJAE2N8d2l8Am8zO19m5y2eaVnzfRKng62hhuNBDAvO47ofdDGPHIu+CrBMwVmFTjq2wVfJEhIHzz75IJ0ROx4NNl4nxSBDQvKVVWw4KoNKKWu1LpCRgMETsGoJtKSqkW3jUgMUgUILreh3anvN6Yy39Pt+wW3kPMU8DXW35NiVkaXsz6D/fAFQSwECLQAUAAAICAAASCHsmXUujLkCAAD1BQAACwAkAAAAAAAAAAAAAAAAAAAAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAASCHsQMctYbgCAAD4BQAACwAkAAAAAAAAAAAAAAAGAwAAZ3JhcGgxLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAASCHsb9lyLrgCAAD0BQAACwAkAAAAAAAAAAAAAAALBgAAZ3JhcGgyLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAASCHsLznszKMAAADzAAAACQAkAAAAAAAAAAAAAAAQCQAAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsFBgAAAAAEAAQAcgEAAP4JAAAAAA== file_cachedStartup: {fileID: 4900000, guid: 6667cce87a89cd645becd4a92e85c888, type: 3} cacheStartup: 0 showNavGraphs: 1 @@ -821,8 +1309,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 191889754} serializedVersion: 2 - m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: 0, y: 15.000004, z: -30.98076} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 19.283628, z: -27.981337} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -844,6 +1332,81 @@ MonoBehaviour: _maskLayer: serializedVersion: 2 m_Bits: 1024 +--- !u!1 &212063320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 212063321} + - component: {fileID: 212063323} + - component: {fileID: 212063322} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &212063321 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 212063320} + 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: 408283094} + 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 &212063322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 212063320} + 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 &212063323 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 212063320} + m_CullTransparentMesh: 0 --- !u!1 &235144445 GameObject: m_ObjectHideFlags: 0 @@ -919,6 +1482,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 235144445} m_CullTransparentMesh: 0 +--- !u!1 &249834837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 249834838} + - component: {fileID: 249834840} + - component: {fileID: 249834839} + m_Layer: 5 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &249834838 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249834837} + 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: 1798817340} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -123} + m_SizeDelta: {x: 0, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &249834839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249834837} + 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: 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: 6e4f4c0390c77404fbc0e6716111c623, 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 &249834840 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249834837} + m_CullTransparentMesh: 0 --- !u!1 &254742834 GameObject: m_ObjectHideFlags: 0 @@ -1117,13 +1755,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 285952512} serializedVersion: 2 - m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: 0, y: 15.000004, z: -30.98076} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 19.283628, z: -27.981337} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2043119555} - m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!114 &285952516 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1274,7 +1912,7 @@ MonoBehaviour: FrequencyGain: 1 Duration: 1 m_NoiseOffsets: {x: 0, y: 0, z: 0} ---- !u!1 &302589364 +--- !u!1 &288894974 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1282,133 +1920,147 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 302589365} - - component: {fileID: 302589367} - - component: {fileID: 302589366} + - component: {fileID: 288894975} + - component: {fileID: 288894979} + - component: {fileID: 288894978} + - component: {fileID: 288894977} + - component: {fileID: 288894976} m_Layer: 5 - m_Name: NameText + m_Name: MoveBossStage2Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &302589365 +--- !u!224 &288894975 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 302589364} + m_GameObject: {fileID: 288894974} 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_Children: + - {fileID: 1295781450} + - {fileID: 162376354} + m_Father: {fileID: 1066172617} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 508, y: -230.91458} + m_SizeDelta: {x: 500, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &302589366 +--- !u!114 &288894976 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 302589364} + m_GameObject: {fileID: 288894974} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + 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 &288894977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288894974} + 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: 288894978} + 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: 4 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &288894978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288894974} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_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_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 + 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 &288894979 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 302589364} + m_GameObject: {fileID: 288894974} m_CullTransparentMesh: 0 --- !u!1 &305420765 GameObject: @@ -1560,81 +2212,6 @@ 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 @@ -1723,34 +2300,6 @@ PrefabInstance: propertyPath: m_Name value: RhinocerosMapController objectReference: {fileID: 0} - - target: {fileID: 191353948487808808, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} - propertyPath: m_LocalPosition.x - value: 600 - objectReference: {fileID: 0} - - target: {fileID: 191353948487808808, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 191353948487808808, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 191353948487808808, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 191353948487808808, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 191353948487808808, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 191353948487808808, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 191353948487808808, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -1763,11 +2312,33 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 284323772270769874, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 1027831058511141546, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} + propertyPath: _targetTransform + value: + objectReference: {fileID: 1213070731} + - target: {fileID: 3004542854390892992, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} + propertyPath: _targetTransform + value: + objectReference: {fileID: 164065895} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} +--- !u!4 &370354195 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1077648107908657283, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} + m_PrefabInstance: {fileID: 370354194} + m_PrefabAsset: {fileID: 0} +--- !u!4 &370354196 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2955841396437132265, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} + m_PrefabInstance: {fileID: 370354194} + m_PrefabAsset: {fileID: 0} --- !u!1 &405332041 GameObject: m_ObjectHideFlags: 0 @@ -1843,6 +2414,292 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 405332041} m_CullTransparentMesh: 0 +--- !u!1 &408283093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 408283094} + - component: {fileID: 408283098} + - component: {fileID: 408283097} + - component: {fileID: 408283096} + - component: {fileID: 408283095} + m_Layer: 5 + m_Name: QuitGameButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &408283094 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408283093} + 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: 212063321} + - {fileID: 601644359} + m_Father: {fileID: 1066172617} + 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: -670.91455} + m_SizeDelta: {x: 500, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &408283095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408283093} + 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 &408283096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408283093} + 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: 408283097} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1033584365} + m_TargetAssemblyTypeName: BlueWaterProject.CombatUiManager, Assembly-CSharp + m_MethodName: QuitGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &408283097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408283093} + 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 &408283098 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408283093} + m_CullTransparentMesh: 0 +--- !u!1 &418044501 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 418044502} + - component: {fileID: 418044504} + - component: {fileID: 418044503} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &418044502 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 418044501} + 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: 1283203100} + 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 &418044503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 418044501} + 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: "\uC804\uCCB4 \uB9F5 \uD558\uB4DC \uB9AC\uC14B" + 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 &418044504 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 418044501} + m_CullTransparentMesh: 0 --- !u!1 &443429113 GameObject: m_ObjectHideFlags: 0 @@ -1895,6 +2752,156 @@ MonoBehaviour: m_EditorClassIdentifier: SwitchMapsOpened: 5 SwitchMapsClosed: 4 +--- !u!1 &457545153 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 457545154} + - component: {fileID: 457545158} + - component: {fileID: 457545157} + - component: {fileID: 457545156} + - component: {fileID: 457545155} + m_Layer: 5 + m_Name: MoveBossStage3Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &457545154 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457545153} + 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: 56352881} + - {fileID: 1620351022} + m_Father: {fileID: 1066172617} + 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: -340.91458} + m_SizeDelta: {x: 500, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &457545155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457545153} + 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 &457545156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457545153} + 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: 457545157} + 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 &457545157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457545153} + 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 &457545158 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457545153} + m_CullTransparentMesh: 0 --- !u!1 &473280139 GameObject: m_ObjectHideFlags: 0 @@ -2292,6 +3299,156 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 485942903} m_CullTransparentMesh: 0 +--- !u!1 &503862321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 503862322} + - component: {fileID: 503862324} + - component: {fileID: 503862323} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &503862322 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503862321} + 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: 2041358635} + 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 &503862323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503862321} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.5882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &503862324 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503862321} + m_CullTransparentMesh: 0 +--- !u!1 &503995827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 503995828} + - component: {fileID: 503995830} + - component: {fileID: 503995829} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &503995828 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503995827} + 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: 1858792702} + 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 &503995829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503995827} + 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: 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: 25c38e8fff88e4a3193f2b5d3705db38, 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 &503995830 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503995827} + m_CullTransparentMesh: 0 --- !u!1 &514305979 GameObject: m_ObjectHideFlags: 0 @@ -2672,6 +3829,142 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &601644358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 601644359} + - component: {fileID: 601644361} + - component: {fileID: 601644360} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &601644359 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601644358} + 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: 408283094} + 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 &601644360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601644358} + 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: "\uAC8C\uC784 \uC885\uB8CC" + 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 &601644361 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601644358} + m_CullTransparentMesh: 0 --- !u!1001 &606452583 PrefabInstance: m_ObjectHideFlags: 0 @@ -2761,156 +4054,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7e26271972658154fa0725b5a06a9d0f, type: 3} ---- !u!1 &613412023 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 613412024} - - component: {fileID: 613412028} - - component: {fileID: 613412027} - - component: {fileID: 613412026} - - component: {fileID: 613412025} - m_Layer: 5 - m_Name: MoveBossStage1Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &613412024 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613412023} - 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: 1320091619} - - {fileID: 1498167943} - 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: -135.91458} - m_SizeDelta: {x: 500, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &613412025 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613412023} - 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 &613412026 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613412023} - 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: 613412027} - 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: 3 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &613412027 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613412023} - 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 &613412028 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613412023} - m_CullTransparentMesh: 0 --- !u!1 &626573792 GameObject: m_ObjectHideFlags: 0 @@ -3061,6 +4204,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 626573792} m_CullTransparentMesh: 0 +--- !u!1 &644107141 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 644107142} + - component: {fileID: 644107144} + - component: {fileID: 644107143} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &644107142 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644107141} + 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: 1872434459} + 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 &644107143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644107141} + 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: "\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} + 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 &644107144 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644107141} + m_CullTransparentMesh: 0 --- !u!1 &647342455 GameObject: m_ObjectHideFlags: 0 @@ -3197,6 +4476,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 647342455} m_CullTransparentMesh: 1 +--- !u!1 &656210219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 656210220} + m_Layer: 5 + m_Name: MenuPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &656210220 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 656210219} + 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: 1798817340} + m_Father: {fileID: 2041358635} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1016, y: 875} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &672714555 GameObject: m_ObjectHideFlags: 0 @@ -3319,17 +4634,6 @@ 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 @@ -4044,7 +5348,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: -655.91455} + m_AnchoredPosition: {x: 508, y: -460.91458} m_SizeDelta: {x: 500, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &827511721 @@ -4415,11 +5719,269 @@ Transform: - {fileID: 1477685224} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &962645158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 962645159} + - component: {fileID: 962645162} + - component: {fileID: 962645161} + - component: {fileID: 962645160} + m_Layer: 5 + m_Name: Bottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &962645159 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962645158} + 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: 1001446624} + m_Father: {fileID: 1798817340} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -61.721985} + m_SizeDelta: {x: 0, y: -123.44324} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &962645160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962645158} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &962645161 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962645158} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} + 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: 6e4f4c0390c77404fbc0e6716111c623, 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 &962645162 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962645158} + m_CullTransparentMesh: 0 +--- !u!1 &965024374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 965024375} + - component: {fileID: 965024378} + - component: {fileID: 965024377} + - component: {fileID: 965024376} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &965024375 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965024374} + 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: 1858792702} + - {fileID: 104504151} + - {fileID: 2026240930} + m_Father: {fileID: 1798817340} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -62.5} + m_SizeDelta: {x: 0, y: 125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &965024376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965024374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &965024377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965024374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} + 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: 6e4f4c0390c77404fbc0e6716111c623, 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 &965024378 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965024374} + m_CullTransparentMesh: 0 --- !u!1 &971043559 stripped GameObject: m_CorrespondingSourceObject: {fileID: 134332083069605836, guid: 15c02fef22ba8d0488bd2517167c117c, type: 3} m_PrefabInstance: {fileID: 1731091154544500521} m_PrefabAsset: {fileID: 0} +--- !u!1 &1001446623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1001446624} + - component: {fileID: 1001446626} + - component: {fileID: 1001446625} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1001446624 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001446623} + 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: 1066172617} + m_Father: {fileID: 962645159} + 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: 20} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1001446625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001446623} + 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.1254902, g: 0.09803922, b: 0.09803922, 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: 9b75de00bdf9740988287b8df6afd5fb, 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 &1001446626 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001446623} + m_CullTransparentMesh: 0 --- !u!114 &1011270532 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7772076497191242295, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} @@ -4465,6 +6027,7 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 0 k__BackingField: {fileID: 1033584369} + k__BackingField: {fileID: 1033584370} k__BackingField: {fileID: 1049575630} k__BackingField: {fileID: 1286436776} k__BackingField: {fileID: 119873275} @@ -4474,8 +6037,8 @@ MonoBehaviour: k__BackingField: {fileID: 189897494} k__BackingField: {fileID: 443429115} k__BackingField: {fileID: 2070710949} + k__BackingField: {fileID: 2041358634} _fadeImage: {fileID: 1383464473} - _fadeInOutDuration: {x: 0.2, y: 0.3} --- !u!114 &1033584367 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4551,6 +6114,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1575069793} - {fileID: 1049575629} - {fileID: 1286436774} - {fileID: 119873274} @@ -4560,6 +6124,7 @@ RectTransform: - {fileID: 189897493} - {fileID: 443429114} - {fileID: 2070710948} + - {fileID: 2041358635} - {fileID: 1383464472} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4568,67 +6133,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &1042335352 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 692030855012949935, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_Name - value: FirstTutorialMapController - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 741067902433630331, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5097763007298727804, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e2289a46a7d6f22468c4d555027f4a26, type: 3} --- !u!1 &1049575628 GameObject: m_ObjectHideFlags: 0 @@ -4686,6 +6190,114 @@ MonoBehaviour: _percentText: {fileID: 1390869165} _fadeImage: {fileID: 793017950} _fadeInOutDuration: {x: 0.05, y: 0.2} +--- !u!1 &1066172616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1066172617} + - component: {fileID: 1066172620} + - component: {fileID: 1066172619} + - component: {fileID: 1066172618} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1066172617 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066172616} + 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: 1872434459} + - {fileID: 288894975} + - {fileID: 457545154} + - {fileID: 1283203100} + - {fileID: 1464378975} + - {fileID: 408283094} + m_Father: {fileID: 1001446624} + 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.27238464} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1066172618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066172616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 30 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1066172619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066172616} + 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: 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: 25c38e8fff88e4a3193f2b5d3705db38, 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 &1066172620 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066172616} + m_CullTransparentMesh: 0 --- !u!1 &1068410569 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4019578663844880581, guid: ccb8b4cf4e054704a8bfa9e1334764a7, type: 3} @@ -4948,12 +6560,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113438218} m_CullTransparentMesh: 0 ---- !u!224 &1146057871 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6818895542156988354, guid: 7e26271972658154fa0725b5a06a9d0f, type: 3} - m_PrefabInstance: {fileID: 4130606129790395379} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1149622737 +--- !u!1 &1123554634 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4961,9 +6568,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1149622738} - - component: {fileID: 1149622740} - - component: {fileID: 1149622739} + - component: {fileID: 1123554635} + - component: {fileID: 1123554637} + - component: {fileID: 1123554636} m_Layer: 5 m_Name: Border m_TagString: Untagged @@ -4971,32 +6578,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1149622738 +--- !u!224 &1123554635 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1149622737} + m_GameObject: {fileID: 1123554634} 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: 2124681503} + m_Father: {fileID: 1872434459} 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 &1149622739 +--- !u!114 &1123554636 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1149622737} + m_GameObject: {fileID: 1123554634} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -5020,13 +6627,93 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1149622740 +--- !u!222 &1123554637 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1149622737} + m_GameObject: {fileID: 1123554634} + m_CullTransparentMesh: 0 +--- !u!224 &1146057871 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6818895542156988354, guid: 7e26271972658154fa0725b5a06a9d0f, type: 3} + m_PrefabInstance: {fileID: 4130606129790395379} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1163635641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1163635642} + - component: {fileID: 1163635644} + - component: {fileID: 1163635643} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1163635642 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163635641} + 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: 1464378975} + 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 &1163635643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163635641} + 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 &1163635644 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163635641} m_CullTransparentMesh: 0 --- !u!1 &1166753585 GameObject: @@ -5111,10 +6798,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 522031830802304584, guid: 680ce017bd2b7d34a99245242d032120, type: 3} - propertyPath: _waitDuration - value: 1 - objectReference: {fileID: 0} - target: {fileID: 668700138157159316, guid: 680ce017bd2b7d34a99245242d032120, type: 3} propertyPath: m_LocalPosition.z value: -5 @@ -5135,10 +6818,6 @@ PrefabInstance: propertyPath: m_Name value: CombatPlayer objectReference: {fileID: 0} - - target: {fileID: 6290149650087484560, guid: 680ce017bd2b7d34a99245242d032120, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5188,34 +6867,6 @@ PrefabInstance: 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 @@ -5228,10 +6879,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5314920078381576138, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 5424010737098975716, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} propertyPath: m_Name value: SandMoleMapController objectReference: {fileID: 0} + - target: {fileID: 5987913821471563421, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: _targetTransform + value: + objectReference: {fileID: 370354195} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5248,6 +6907,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb656087fe6c652469b29504a37df539, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1213070731 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6029847374134326452, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + m_PrefabInstance: {fileID: 1213070729} + m_PrefabAsset: {fileID: 0} --- !u!1 &1243437081 GameObject: m_ObjectHideFlags: 0 @@ -5507,7 +7171,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: -525.91455} + m_AnchoredPosition: {x: 508, y: -330.91458} m_SizeDelta: {x: 500, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1245318498 @@ -5912,6 +7576,156 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1271651065} m_CullTransparentMesh: 0 +--- !u!1 &1283203099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1283203100} + - component: {fileID: 1283203104} + - component: {fileID: 1283203103} + - component: {fileID: 1283203102} + - component: {fileID: 1283203101} + m_Layer: 5 + m_Name: HardResetAllMapsButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1283203100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283203099} + 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: 1512206134} + - {fileID: 418044502} + m_Father: {fileID: 1066172617} + 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: -450.91458} + m_SizeDelta: {x: 500, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1283203101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283203099} + 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 &1283203102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283203099} + 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: 1283203103} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1033584365} + m_TargetAssemblyTypeName: BlueWater.Uis.CombatUiManager, Assembly-CSharp + m_MethodName: HardResetAllMaps + m_Mode: 1 + 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 &1283203103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283203099} + 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 &1283203104 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283203099} + m_CullTransparentMesh: 0 --- !u!1 &1286270531 GameObject: m_ObjectHideFlags: 0 @@ -6267,6 +8081,81 @@ Transform: m_Children: [] m_Father: {fileID: 882036795} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1295781449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1295781450} + - component: {fileID: 1295781452} + - component: {fileID: 1295781451} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1295781450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295781449} + 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: 288894975} + 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 &1295781451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295781449} + 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 &1295781452 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295781449} + m_CullTransparentMesh: 0 --- !u!1 &1311921698 GameObject: m_ObjectHideFlags: 0 @@ -6403,81 +8292,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311921698} m_CullTransparentMesh: 0 ---- !u!1 &1320091618 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1320091619} - - component: {fileID: 1320091621} - - component: {fileID: 1320091620} - m_Layer: 5 - m_Name: Border - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1320091619 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1320091618} - 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: 613412024} - 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 &1320091620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1320091618} - 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 &1320091621 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1320091618} - m_CullTransparentMesh: 0 --- !u!1 &1327388041 GameObject: m_ObjectHideFlags: 0 @@ -6698,34 +8512,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 5230841042572963376, guid: 9246d6576382b724b978b10dd59f0204, type: 3} - propertyPath: m_LocalPosition.x - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 9246d6576382b724b978b10dd59f0204, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 9246d6576382b724b978b10dd59f0204, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 9246d6576382b724b978b10dd59f0204, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 9246d6576382b724b978b10dd59f0204, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 9246d6576382b724b978b10dd59f0204, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 9246d6576382b724b978b10dd59f0204, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} + - target: {fileID: 2198908365867291992, guid: 9246d6576382b724b978b10dd59f0204, type: 3} + propertyPath: _targetTransform + value: + objectReference: {fileID: 370354196} - target: {fileID: 5230841042572963376, guid: 9246d6576382b724b978b10dd59f0204, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -6738,14 +8528,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5314920078381576138, guid: 9246d6576382b724b978b10dd59f0204, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 5424010737098975716, guid: 9246d6576382b724b978b10dd59f0204, type: 3} propertyPath: m_Name value: TitanSlimeMapController objectReference: {fileID: 0} - - target: {fileID: 6863831321883664811, guid: 9246d6576382b724b978b10dd59f0204, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} + - target: {fileID: 5628154792854967689, guid: 9246d6576382b724b978b10dd59f0204, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 61bcb80cd058c0b46820a9bdbd18bd7f, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -7201,6 +8995,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1016, y: 875} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1429563009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1429563010} + - component: {fileID: 1429563012} + - component: {fileID: 1429563011} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1429563010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1429563009} + 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: 2026240930} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1429563011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1429563009} + 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.8745098, g: 0.81960785, b: 0.7882353, 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: 65133b11016ae4f619c821df8e547c32, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1429563012 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1429563009} + m_CullTransparentMesh: 0 --- !u!1 &1441764475 GameObject: m_ObjectHideFlags: 0 @@ -7465,6 +9334,232 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1464378974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1464378975} + - component: {fileID: 1464378979} + - component: {fileID: 1464378978} + - component: {fileID: 1464378977} + - component: {fileID: 1464378976} + m_Layer: 5 + m_Name: MoveTitleSceneButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1464378975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1464378974} + 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: 1163635642} + - {fileID: 70049816} + m_Father: {fileID: 1066172617} + 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: -560.91455} + m_SizeDelta: {x: 500, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1464378976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1464378974} + 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 &1464378977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1464378974} + 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: 1464378978} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1033584365} + m_TargetAssemblyTypeName: BlueWaterProject.CombatUiManager, Assembly-CSharp + m_MethodName: MoveTitleScene + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1464378978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1464378974} + 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 &1464378979 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1464378974} + m_CullTransparentMesh: 0 +--- !u!1 &1466235549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1466235550} + - component: {fileID: 1466235552} + - component: {fileID: 1466235551} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1466235550 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1466235549} + 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: 1759387357} + m_Father: {fileID: 2026240930} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1466235551 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1466235549} + 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.1254902, g: 0.09803922, b: 0.09803922, 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 &1466235552 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1466235549} + m_CullTransparentMesh: 0 --- !u!1 &1474633200 GameObject: m_ObjectHideFlags: 0 @@ -7744,142 +9839,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484753224} m_CullTransparentMesh: 1 ---- !u!1 &1498167942 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1498167943} - - component: {fileID: 1498167945} - - component: {fileID: 1498167944} - m_Layer: 5 - m_Name: NameText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1498167943 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1498167942} - 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: 613412024} - 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 &1498167944 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1498167942} - 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: "\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} - 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 &1498167945 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1498167942} - m_CullTransparentMesh: 0 --- !u!1001 &1511319438 PrefabInstance: m_ObjectHideFlags: 0 @@ -7986,6 +9945,81 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} m_PrefabInstance: {fileID: 1511319438} m_PrefabAsset: {fileID: 0} +--- !u!1 &1512206133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1512206134} + - component: {fileID: 1512206136} + - component: {fileID: 1512206135} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1512206134 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1512206133} + 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: 1283203100} + 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 &1512206135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1512206133} + 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 &1512206136 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1512206133} + m_CullTransparentMesh: 0 --- !u!1 &1512231578 GameObject: m_ObjectHideFlags: 0 @@ -8559,6 +10593,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1566656346} m_CullTransparentMesh: 0 +--- !u!1 &1575069792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1575069793} + m_Layer: 5 + m_Name: InteractionUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1575069793 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575069792} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 2076272783} + m_Father: {fileID: 1033584370} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &1589034268 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6818895542156988354, guid: 7e26271972658154fa0725b5a06a9d0f, type: 3} @@ -8669,7 +10739,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 - k__BackingField: {fileID: 728440691} k__BackingField: {fileID: 36953787} k__BackingField: {fileID: 1011270532} k__BackingField: {fileID: 1213070730} @@ -8688,6 +10757,142 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1620351021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1620351022} + - component: {fileID: 1620351024} + - component: {fileID: 1620351023} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1620351022 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620351021} + 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: 457545154} + 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 &1620351023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620351021} + 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 &1620351024 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620351021} + m_CullTransparentMesh: 0 --- !u!1001 &1640578873 PrefabInstance: m_ObjectHideFlags: 0 @@ -8777,142 +10982,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7e26271972658154fa0725b5a06a9d0f, type: 3} ---- !u!1 &1672383350 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1672383351} - - component: {fileID: 1672383353} - - component: {fileID: 1672383352} - m_Layer: 5 - m_Name: NameText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1672383351 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1672383350} - 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: 2124681503} - 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 &1672383352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1672383350} - 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: "\uCF54\uBFD4\uC18C \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 &1672383353 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1672383350} - m_CullTransparentMesh: 0 --- !u!1 &1681379063 GameObject: m_ObjectHideFlags: 0 @@ -9526,6 +11595,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1737524231} m_CullTransparentMesh: 0 +--- !u!1 &1759387356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1759387357} + - component: {fileID: 1759387359} + - component: {fileID: 1759387358} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1759387357 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759387356} + 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: 1466235550} + 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 &1759387358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759387356} + 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: 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: 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 &1759387359 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759387356} + m_CullTransparentMesh: 0 --- !u!1 &1770719752 GameObject: m_ObjectHideFlags: 0 @@ -9601,6 +11745,53 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1770719752} m_CullTransparentMesh: 1 +--- !u!1 &1798817339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1798817340} + - component: {fileID: 1798817341} + m_Layer: 5 + m_Name: Popup Base - Concave + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1798817340 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798817339} + 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: 965024375} + - {fileID: 249834838} + - {fileID: 962645159} + m_Father: {fileID: 656210220} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1798817341 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798817339} + m_CullTransparentMesh: 1 --- !u!1 &1816611988 GameObject: m_ObjectHideFlags: 0 @@ -9707,6 +11898,218 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1841240829} m_CullTransparentMesh: 0 +--- !u!1 &1857687636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1857687637} + - component: {fileID: 1857687639} + - component: {fileID: 1857687638} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1857687637 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857687636} + 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: 2076272783} + 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 &1857687638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857687636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: F + 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: 34.5 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + 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: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1857687639 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857687636} + m_CullTransparentMesh: 1 +--- !u!1 &1858792701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1858792702} + - component: {fileID: 1858792704} + - component: {fileID: 1858792703} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1858792702 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858792701} + 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: 503995828} + m_Father: {fileID: 965024375} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -86.04995} + m_SizeDelta: {x: 0, y: 172.27238} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1858792703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858792701} + 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.078431375, g: 0.05882353, b: 0.05882353, 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: 9b75de00bdf9740988287b8df6afd5fb, 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 &1858792704 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858792701} + m_CullTransparentMesh: 0 --- !u!1 &1863983221 GameObject: m_ObjectHideFlags: 0 @@ -9795,6 +12198,156 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &1872434458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1872434459} + - component: {fileID: 1872434463} + - component: {fileID: 1872434462} + - component: {fileID: 1872434461} + - component: {fileID: 1872434460} + m_Layer: 5 + m_Name: MoveBossStage1Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1872434459 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872434458} + 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: 1123554635} + - {fileID: 644107142} + m_Father: {fileID: 1066172617} + 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: -120.91458} + m_SizeDelta: {x: 500, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1872434460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872434458} + 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 &1872434461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872434458} + 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: 1872434462} + 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: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1872434462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872434458} + 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 &1872434463 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872434458} + m_CullTransparentMesh: 0 --- !u!1 &1877234214 GameObject: m_ObjectHideFlags: 0 @@ -10020,156 +12573,6 @@ 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 @@ -10545,6 +12948,279 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023029613} m_CullTransparentMesh: 0 +--- !u!1 &2026240929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2026240930} + - component: {fileID: 2026240934} + - component: {fileID: 2026240933} + - component: {fileID: 2026240932} + - component: {fileID: 2026240931} + m_Layer: 5 + m_Name: CloseButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2026240930 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2026240929} + 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: 1466235550} + - {fileID: 1429563010} + m_Father: {fileID: 965024375} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -80, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &2026240931 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2026240929} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &2026240932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2026240929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 684da8d3856b6400ca0468d3888c5374, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeTime: 0.2 + onHoverAlpha: 0.6 + onClickAlpha: 0.7 +--- !u!114 &2026240933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2026240929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad63971631c874d1aa33146b8079b8a5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2041358634} + m_TargetAssemblyTypeName: BlueWaterProject.CombatMenuPopupUi, Assembly-CSharp + m_MethodName: Close + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!82 &2026240934 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2026240929} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: c201f1dfd9d8345c7913a8662735c920, type: 3} + m_Resource: {fileID: 8300000, guid: c201f1dfd9d8345c7913a8662735c920, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &2041358633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2041358635} + - component: {fileID: 2041358634} + m_Layer: 5 + m_Name: DevelopMenuPopupUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &2041358634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041358633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 179524db1ad20f44a8374fb83bb46495, type: 3} + m_Name: + m_EditorClassIdentifier: + SwitchMapsOpened: 5 + SwitchMapsClosed: 4 +--- !u!224 &2041358635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041358633} + 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: 503862322} + - {fileID: 656210220} + m_Father: {fileID: 1033584370} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2043119554 GameObject: m_ObjectHideFlags: 0 @@ -10683,9 +13359,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 613412024} - - {fileID: 2124681503} - - {fileID: 1899485663} - {fileID: 1245318497} - {fileID: 827511720} m_Father: {fileID: 1113438219} @@ -10902,6 +13575,82 @@ MonoBehaviour: m_EditorClassIdentifier: _firstTutorialUi: {fileID: 1111610237} _secondTutorialUi: {fileID: 1532429480} +--- !u!1 &2076272782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2076272783} + - component: {fileID: 2076272785} + - component: {fileID: 2076272784} + m_Layer: 5 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2076272783 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2076272782} + 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: 1857687637} + m_Father: {fileID: 1575069793} + 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 &2076272784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2076272782} + 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.3647059, g: 0.35686275, b: 0.3647059, 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: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2076272785 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2076272782} + m_CullTransparentMesh: 1 --- !u!1 &2114353639 GameObject: m_ObjectHideFlags: 0 @@ -11052,156 +13801,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2114353639} m_CullTransparentMesh: 0 ---- !u!1 &2124681502 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2124681503} - - component: {fileID: 2124681507} - - component: {fileID: 2124681506} - - component: {fileID: 2124681505} - - component: {fileID: 2124681504} - m_Layer: 5 - m_Name: MoveBossStage2Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2124681503 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124681502} - 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: 1149622738} - - {fileID: 1672383351} - 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: -265.91458} - m_SizeDelta: {x: 500, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2124681504 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124681502} - 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 &2124681505 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124681502} - 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: 2124681506} - 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: 4 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &2124681506 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124681502} - 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 &2124681507 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124681502} - m_CullTransparentMesh: 0 --- !u!224 &2138325868 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6818895542156988354, guid: 7e26271972658154fa0725b5a06a9d0f, type: 3} @@ -20279,7 +22878,6 @@ SceneRoots: - {fileID: 1461902905} - {fileID: 549059392} - {fileID: 1179122867} - - {fileID: 1042335352} - {fileID: 1332793830} - {fileID: 370354194} - {fileID: 1213070729} diff --git a/Assets/02.Scripts/Character/CharacterData.cs b/Assets/02.Scripts/Character/CharacterData.cs new file mode 100644 index 000000000..610ac6810 --- /dev/null +++ b/Assets/02.Scripts/Character/CharacterData.cs @@ -0,0 +1,21 @@ +using System; +using UnityEngine; + +namespace BlueWater +{ + [Serializable] + public class CharacterData + { + [field: SerializeField] + public int CharacterIdx { get; set; } + + [field: SerializeField] + public string Name { get; set; } + + public CharacterData(int characterIdx, string name) + { + CharacterIdx = characterIdx; + Name = name; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/CharacterData.cs.meta b/Assets/02.Scripts/Character/CharacterData.cs.meta new file mode 100644 index 000000000..2762c08c3 --- /dev/null +++ b/Assets/02.Scripts/Character/CharacterData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 68764a07c47f7254cba8e62068805491 \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Enemy/Boss/BossData.cs b/Assets/02.Scripts/Character/Enemy/Boss/BossData.cs index 4bd3ed61c..5eb3af79a 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/BossData.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/BossData.cs @@ -14,6 +14,9 @@ namespace BlueWater.Enemies.Bosses [field: SerializeField] public string DisplayName { get; private set; } + [field: SerializeField] + public int CharacterIdx { get; private set; } + [field: SerializeField] public int MaxHealthPoint { get; private set; } diff --git a/Assets/02.Scripts/Character/Enemy/Boss/Rhinoceros/Rhinoceros.cs b/Assets/02.Scripts/Character/Enemy/Boss/Rhinoceros/Rhinoceros.cs index dafe9832b..bd76b5e3a 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/Rhinoceros/Rhinoceros.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/Rhinoceros/Rhinoceros.cs @@ -1,4 +1,5 @@ using BlueWater.Interfaces; +using BlueWater.Items; using BlueWater.Maps; using UnityEngine; @@ -76,7 +77,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros public override void Initialize() { BossHealthPoint.Initialize(true, RhinocerosData.MaxHealthPoint, - RhinocerosData.DisplayName, BossMapController.ParticleInstantiateLocation); + RhinocerosData.DisplayName, BossMapController.ParticleInstanceLocation); BossSkillController.Initialize(BossData.SkillDataList); SetMoveSpeed(RhinocerosData.MoveSpeed); StopMove(); @@ -98,7 +99,9 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros } AnimationController.SetAnimationTrigger("isDead"); - BossMapController.MapClear(); + + ItemManager.Instance.ItemDropRandomPosition(BossData.CharacterIdx, transform.position); + BossMapController.ClearMap(); } private void FlipVisualLook() diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/MiniSandMole.cs b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/MiniSandMole.cs index d7b16da7d..1d450e4b7 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/MiniSandMole.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/MiniSandMole.cs @@ -140,7 +140,7 @@ namespace BlueWater.Enemies.Bosses.SandMole Target = GameManager.Instance.CurrentCombatPlayer.GetComponent(); BossHealthPoint.Initialize(false, BossData.MaxHealthPoint, - BossData.DisplayName, BossMapController.ParticleInstantiateLocation); + BossData.DisplayName, BossMapController.ParticleInstanceLocation); BossHealthPoint.OnDead += HandleDie; BossSkillController.Initialize(BossData.SkillDataList); diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs index 0bcfe166b..f1111972f 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using BlueWater.Interfaces; +using BlueWater.Items; using BlueWater.Maps; using Sirenix.OdinInspector; using UnityEngine; @@ -102,7 +103,7 @@ namespace BlueWater.Enemies.Bosses.SandMole public override void Initialize() { BossHealthPoint.Initialize(true, SandMoleData.MaxHealthPoint, - SandMoleData.DisplayName, SandMoleMapController.ParticleInstantiateLocation); + SandMoleData.DisplayName, SandMoleMapController.ParticleInstanceLocation); BossHealthPoint.OnHealthChanged += SummonMiniSandMole; BossSkillController.Initialize(BossData.SkillDataList); SetMoveSpeed(SandMoleData.MoveSpeed); @@ -125,7 +126,8 @@ namespace BlueWater.Enemies.Bosses.SandMole } AnimationController.SetAnimationTrigger("isDead"); - SandMoleMapController.MapClear(); + ItemManager.Instance.ItemDropRandomPosition(BossData.CharacterIdx, transform.position); + SandMoleMapController.ClearMap(); } private void SummonMiniSandMole(int currentHp) diff --git a/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs b/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs index b1f44300b..1f6e15eea 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs @@ -1,3 +1,4 @@ +using BlueWater.Items; using BlueWater.Maps; using BlueWater.Uis; using UnityEngine; @@ -44,7 +45,7 @@ namespace BlueWater.Enemies.Bosses.TitanSlime MaxCoolDown = TitanSlimeState.RandomCooldown.y; BossHealthPoint.Initialize(TitanSlimeState.HasRabbit, TitanSlimeState.MaxHp, - TitanSlimeData.DisplayName, _titanSlimeMapController.ParticleInstantiateLocation); + TitanSlimeData.DisplayName, _titanSlimeMapController.ParticleInstanceLocation); BossSkillController.Initialize(BossData.SkillDataList); BehaviorTree.EnableBehavior(); @@ -69,13 +70,14 @@ namespace BlueWater.Enemies.Bosses.TitanSlime if (TitanSlimeState.Level == 4 && TitanSlimeState.HasRabbit) { - _titanSlimeMapController.MapClear(); + ItemManager.Instance.ItemDropRandomPosition(BossData.CharacterIdx, transform.position); + _titanSlimeMapController.ClearMap(); return; } if (TitanSlimeState.Level <= 4) { EnemyManager.Instance.SpawnSplitSlimes(transform.position, TitanSlimeState.Level + 1, - TitanSlimeState.HasRabbit, _titanSlimeMapController.EnemyInstantiateLocation); + TitanSlimeState.HasRabbit, _titanSlimeMapController.EnemyInstanceLocation); } Destroy(gameObject); } diff --git a/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlimeAttackedParticle.cs b/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlimeAttackedParticle.cs index c523f1c85..0e4176de0 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlimeAttackedParticle.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlimeAttackedParticle.cs @@ -21,7 +21,7 @@ namespace BlueWater.Enemies.Bosses.TitanSlime private void Start() { _titanSlimeAttackedParticle = GetComponent(); - _instantiateLocation = FindAnyObjectByType().ParticleInstantiateLocation; + _instantiateLocation = FindAnyObjectByType().ParticleInstanceLocation; _collisionEvents = new List(); } diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs b/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs index 609eebeff..e4e557e62 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs @@ -1,5 +1,8 @@ using System; +using System.Collections.Generic; +using BlueWater.Interfaces; using BlueWater.Uis; +using BlueWater.Utility; using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.InputSystem; @@ -14,6 +17,16 @@ namespace BlueWater.Players.Combat // Components [SerializeField] private PlayerInput _playerInput; + + [SerializeField] + protected float InteractionRadius = 2f; + + [SerializeField] + private Vector3 _interactionUiOffset = new(0f, 1.5f, 0f); + + private List _playerInteractions = new(); + private IPlayerInteraction _closestInteraction; + private IPlayerInteraction _previousInteraction; // Events public event Action OnMoveInputReceived; @@ -33,6 +46,25 @@ namespace BlueWater.Players.Combat Initialize(); } + private void Update() + { + _closestInteraction = GetClosestInteraction(); + if (_closestInteraction != null) + { + _closestInteraction.ShowInteractionUi(); + if (_previousInteraction != null && _closestInteraction != _previousInteraction) + { + _previousInteraction.HideInteractionUi(); + } + _previousInteraction = _closestInteraction; + } + else + { + _previousInteraction?.HideInteractionUi(); + _previousInteraction = null; + } + } + // Initialize methods #region Initialize methods @@ -99,6 +131,14 @@ namespace BlueWater.Players.Combat } } + public void OnInteraction(InputAction.CallbackContext context) + { + if (context.performed) + { + _closestInteraction?.Interaction(); + } + } + public void OnOpenItemInventory(InputAction.CallbackContext context) { if (context.performed) @@ -125,6 +165,14 @@ namespace BlueWater.Players.Combat } } + public void OnOpenDevelopMenu(InputAction.CallbackContext context) + { + if (context.performed) + { + CombatUiManager.Instance.DevelopMenuPopupUi.Open(CombatUiManager.Instance.PopupUiList); + } + } + public void OnCancel(InputAction.CallbackContext context) { if (context.performed) @@ -149,5 +197,37 @@ namespace BlueWater.Players.Combat } #endregion + + // Methods + #region Methods + + public void RegisterPlayerInteraction(IPlayerInteraction playerInteraction) + { + Utils.RegisterList(_playerInteractions, playerInteraction); + } + + public void UnregisterPlayerInteraction(IPlayerInteraction playerInteraction) + { + Utils.UnregisterList(_playerInteractions, playerInteraction); + } + + private IPlayerInteraction GetClosestInteraction() + { + IPlayerInteraction closestInteraction = null; + var closestDistance = float.MaxValue; + + foreach (var interaction in _playerInteractions) + { + var distance = Vector3.Distance(transform.position, interaction.Transform.position); + if (distance > InteractionRadius || distance >= closestDistance) continue; + + closestDistance = distance; + closestInteraction = interaction; + } + + return closestInteraction; + } + + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatInventory.cs b/Assets/02.Scripts/Character/Player/Combat/CombatInventory.cs index eeaa40ca5..0cc28ddea 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatInventory.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatInventory.cs @@ -86,7 +86,7 @@ namespace BlueWater.Players.Combat foreach (var element in ItemSlotList) { - var elementWeight = ItemManager.Instance.ItemDictionary[element.Idx].Weight; + var elementWeight = ItemManager.Instance.GetItemDataByIdx(element.Idx).Weight; CurrentTotalWeight += elementWeight * element.Count; } @@ -104,12 +104,12 @@ namespace BlueWater.Players.Combat break; case InventorySortingType.Name: ItemSlotList.Sort((x, y) => - string.Compare(ItemManager.Instance.ItemDictionary[x.Idx].Name, - ItemManager.Instance.ItemDictionary[y.Idx].Name, StringComparison.Ordinal)); + string.Compare(ItemManager.Instance.GetItemDataByIdx(x.Idx).Name, + ItemManager.Instance.GetItemDataByIdx(y.Idx).Name, StringComparison.Ordinal)); break; case InventorySortingType.Category: ItemSlotList.Sort((x, y) => - ItemManager.Instance.ItemDictionary[x.Idx].Category.CompareTo(ItemManager.Instance.ItemDictionary[y.Idx].Category)); + ItemManager.Instance.GetItemDataByIdx(x.Idx).Category.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.Idx).Category)); break; case InventorySortingType.Count: ItemSlotList.Sort((x, y) => y.Count.CompareTo(x.Count)); diff --git a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs index 4cd34436f..1865636b3 100644 --- a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs +++ b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs @@ -32,6 +32,7 @@ namespace BlueWater.Players private WaitForSeconds _flashWhiteWaitTime; private Coroutine _flashWhiteCoroutine; private Coroutine _damageIntervalCoroutine; + private bool _isQuitting; // Hashes private static readonly int _isHitHash = Shader.PropertyToID("_IsHit"); @@ -53,13 +54,17 @@ namespace BlueWater.Players _flashWhiteWaitTime = new WaitForSeconds(InvincibilityDuration * 0.1f); SetCurrentHealthPoint(MaxHealthPoint); } - + + private void OnApplicationQuit() + { + _isQuitting = true; + } + private void OnDestroy() { - if (CombatUiManager.Instance && CombatUiManager.Instance.PlayerHealthPointUi) - { - OnHealthChanged -= CombatUiManager.Instance.PlayerHealthPointUi.SetCurrentHealthPoint; - } + if (_isQuitting) return; + + OnHealthChanged -= CombatUiManager.Instance.PlayerHealthPointUi.SetCurrentHealthPoint; } // Initialize methods @@ -75,8 +80,9 @@ namespace BlueWater.Players // Methods public void SetCurrentHealthPoint(int changedHealthPoint) { - CurrentHealthPoint = changedHealthPoint; - OnHealthChanged?.Invoke(changedHealthPoint); + var newChangedHealthPoint = Mathf.Clamp(changedHealthPoint, 0, MaxHealthPoint); + CurrentHealthPoint = newChangedHealthPoint; + OnHealthChanged?.Invoke(newChangedHealthPoint); if (CurrentHealthPoint <= 2) { diff --git a/Assets/02.Scripts/Character/SpineController.cs b/Assets/02.Scripts/Character/SpineController.cs index 2f343dcd7..8fd0a436f 100644 --- a/Assets/02.Scripts/Character/SpineController.cs +++ b/Assets/02.Scripts/Character/SpineController.cs @@ -1,3 +1,5 @@ +using System; +using System.Collections; using Sirenix.OdinInspector; using Spine.Unity; using UnityEngine; @@ -16,7 +18,7 @@ namespace BlueWater.Players // Variables [SerializeField] - private string _initialSkinName; + private string _initialSkinName = "default"; #endregion @@ -75,6 +77,70 @@ namespace BlueWater.Players _animationState.Apply(_skeletonAnimation.Skeleton); } + public bool IsComparingCurrentAnimation(string animationName, int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return false; + + var currentAnimation = _animationState.GetCurrent(trackIndex)?.Animation; + return currentAnimation != null && currentAnimation.Name == animationName; + } + + public IEnumerator WaitForAnimationToRun(string animationName, Action onSuccess, float timeout = 2f) + { + var elapsedTime = 0f; + while (!IsComparingCurrentAnimation(animationName)) + { + elapsedTime += Time.deltaTime; + yield return null; + if (elapsedTime > timeout) + { + Debug.Log("Timeout waiting for animation state: " + animationName); + onSuccess?.Invoke(false); + yield break; + } + } + onSuccess?.Invoke(true); + } + + public void SetCurrentAnimationSpeed(float targetDuration, int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return; + + var currentAnimation = _animationState.GetCurrent(trackIndex)?.Animation; + if (currentAnimation != null) + { + var animationLength = currentAnimation.Duration; + _animationState.TimeScale = animationLength / targetDuration; + } + } + + public float GetCurrentAnimationNormalizedTime(int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return 0f; + + var currentTrackEntry = _animationState.GetCurrent(trackIndex); + if (currentTrackEntry != null) + { + return currentTrackEntry.TrackTime / currentTrackEntry.Animation.Duration; + } + return 0f; + } + + public float GetCurrentAnimationLength(int trackIndex = 0) + { + if (!_skeletonAnimation || _animationState == null) return 0f; + + var currentAnimation = _animationState.GetCurrent(trackIndex)?.Animation; + return currentAnimation != null ? currentAnimation.Duration : 0f; + } + + public void ResetAnimationSpeed() + { + if (!_skeletonAnimation || _animationState == null) return; + + _animationState.TimeScale = 1f; + } + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/DataManager.cs b/Assets/02.Scripts/DataManager.cs index 8e084d943..2110c1f0a 100644 --- a/Assets/02.Scripts/DataManager.cs +++ b/Assets/02.Scripts/DataManager.cs @@ -7,11 +7,9 @@ namespace BlueWater public enum SaveStage { None = 0, - FirstTutorial, - SecondTutorial, - TitanSlime, - Rhinoceros, - SandMole + TitanSlime = 3, + Rhinoceros = 4, + SandMole = 5 } public class DataManager : Singleton diff --git a/Assets/02.Scripts/Editor/JsonHelperEditor.cs b/Assets/02.Scripts/Editor/JsonHelperEditor.cs index 891c324fb..4f41298ea 100644 --- a/Assets/02.Scripts/Editor/JsonHelperEditor.cs +++ b/Assets/02.Scripts/Editor/JsonHelperEditor.cs @@ -15,8 +15,7 @@ namespace BlueWater.Editors private enum DataType { None = 0, - ItemTable, - ItemDropTable + ItemDataTable } private string _jsonFilePath = "Assets/Resources/Json/FileName"; @@ -67,12 +66,9 @@ namespace BlueWater.Editors EditorUtility.DisplayDialog("경고 메세지", "데이터 타입이 None인지 확인해주세요.", "확인"); Debug.LogError("데이터 타입이 None인지 확인해주세요."); return; - case DataType.ItemTable: + case DataType.ItemDataTable: LoadData(); break; - case DataType.ItemDropTable: - LoadData(); - break; default: EditorUtility.DisplayDialog("경고 메세지", "데이터 타입이 제대로 설정되어있는지 확인해주세요.", "OK"); Debug.LogError("데이터 타입이 제대로 설정되어있는지 확인해주세요."); diff --git a/Assets/02.Scripts/FadeableObject.cs b/Assets/02.Scripts/FadeableObject.cs index 9d279d7a1..57cbe6f1c 100644 --- a/Assets/02.Scripts/FadeableObject.cs +++ b/Assets/02.Scripts/FadeableObject.cs @@ -13,7 +13,7 @@ namespace BlueWater private Material _transparentMaterial; [SerializeField, Range(0f, 1f), ShowIf("@IsFadeable")] - private float _transparency = 0.5f; + private float _transparency; [SerializeField, Range(0f, 2f), ShowIf("@IsFadeable")] private float _fadeDuration = 0.5f; diff --git a/Assets/02.Scripts/Interface/IPlayerInteraction.cs b/Assets/02.Scripts/Interface/IPlayerInteraction.cs new file mode 100644 index 000000000..6fa26548c --- /dev/null +++ b/Assets/02.Scripts/Interface/IPlayerInteraction.cs @@ -0,0 +1,14 @@ +using UnityEngine; + +namespace BlueWater.Interfaces +{ + public interface IPlayerInteraction + { + Transform Transform { get; } + bool EnableInteraction { get; } + + void Interaction(); + void ShowInteractionUi(); + void HideInteractionUi(); + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Interface/IPlayerInteraction.cs.meta b/Assets/02.Scripts/Interface/IPlayerInteraction.cs.meta new file mode 100644 index 000000000..d102ded5c --- /dev/null +++ b/Assets/02.Scripts/Interface/IPlayerInteraction.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 423859f99172a734686693a503b83b95 +timeCreated: 1716899052 diff --git a/Assets/02.Scripts/Item/DropItem.cs b/Assets/02.Scripts/Item/DropItem.cs new file mode 100644 index 000000000..acdc98507 --- /dev/null +++ b/Assets/02.Scripts/Item/DropItem.cs @@ -0,0 +1,21 @@ +using System; +using UnityEngine; + +namespace BlueWater.Items +{ + [Serializable] + public class DropItem + { + [field: SerializeField] + public int ItemIdx { get; set; } + + [field: SerializeField] + public int DropRate { get; set; } + + [field: SerializeField] + public int QuantityMin { get; set; } + + [field: SerializeField] + public int QuantityMax { get; set; } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/DropItem.cs.meta b/Assets/02.Scripts/Item/DropItem.cs.meta new file mode 100644 index 000000000..cf66c2701 --- /dev/null +++ b/Assets/02.Scripts/Item/DropItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e24de25ce8077024596c98d8cc3ad309 \ No newline at end of file diff --git a/Assets/02.Scripts/Item/DropItemController.cs b/Assets/02.Scripts/Item/DropItemController.cs deleted file mode 100644 index aa1204c3b..000000000 --- a/Assets/02.Scripts/Item/DropItemController.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System.Collections; -using BlueWater.Players.Combat; -using Sirenix.OdinInspector; -using UnityEngine; - -namespace BlueWater.Items -{ - public class DropItemController : MonoBehaviour - { - [Title("컴포넌트")] - [SerializeField] - private Rigidbody _rigidbody; - - [SerializeField] - private Collider _collider; - - [SerializeField] - private SpriteRenderer _spriteRenderer; - - [Title("자동 파괴")] - [SerializeField] - private bool _useAutoDestroy = true; - - [SerializeField, ShowIf("@_useAutoDestroy")] - private float _autoDestroyTime = 30f; - - [Title("획득")] - [SerializeField] - private bool _drawGizmos = true; - - [SerializeField] - private float _distance = 5f; - - [SerializeField] - private float _acquisitionTime = 1f; - - private ItemSlot _itemSlot; - private Collider _targetCollider; - private readonly WaitForSeconds _lootCoroutineTime = new(0.5f); - - private void OnDrawGizmosSelected() - { - if (!_drawGizmos) return; - - Gizmos.DrawWireSphere(transform.position, _distance); - } - - private void Start() - { - if (_useAutoDestroy) - { - Destroy(gameObject, _autoDestroyTime); - } - - StartCoroutine(LootCoroutine()); - } - - public void Initialize(ItemSlot itemSlotValue) - { - _itemSlot = itemSlotValue; - if (_spriteRenderer) - { - _spriteRenderer.sprite = ItemManager.Instance.ItemDictionary[_itemSlot.Idx].Sprite; - } - } - - private IEnumerator LootCoroutine() - { - while (true) - { - _targetCollider ??= FindAnyObjectByType().GetComponent(); - if (_targetCollider == null) - { - yield return _lootCoroutineTime; - continue; - } - - var targetDistance = Vector3.Distance(_targetCollider.transform.position, transform.position); - if (targetDistance <= _distance) break; - - yield return _lootCoroutineTime; - } - - if (_rigidbody) - { - _rigidbody.isKinematic = true; - _rigidbody.useGravity = false; - } - if (_collider) - { - _collider.enabled = false; - } - - var startPosition = transform.position; - var elapsedTime = 0f; - - while (elapsedTime < _acquisitionTime) - { - if (_targetCollider == null) - { - yield break; - } - elapsedTime += Time.deltaTime; - var t = elapsedTime / _acquisitionTime; - t = Mathf.SmoothStep(0f, 1f, t); - - transform.parent.position = Vector3.Lerp(startPosition, _targetCollider.bounds.center, t); - yield return null; - } - - ItemManager.Instance.Acquire(_itemSlot); - Destroy(gameObject); - } - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/DropItemController.cs.meta b/Assets/02.Scripts/Item/DropItemController.cs.meta deleted file mode 100644 index b54b735a7..000000000 --- a/Assets/02.Scripts/Item/DropItemController.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 76f610d7843c7b64f9925ec3594d7de4 \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Item.cs b/Assets/02.Scripts/Item/Item.cs new file mode 100644 index 000000000..618cfaa73 --- /dev/null +++ b/Assets/02.Scripts/Item/Item.cs @@ -0,0 +1,204 @@ +using System.Collections; +using BlueWater.Audios; +using BlueWater.Interfaces; +using BlueWater.Uis; +using BlueWater.Utility; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Items +{ + public class Item : MonoBehaviour, IPlayerInteraction + { + [field: Title("컴포넌트")] + public Transform Transform { get; private set; } + + [SerializeField] + protected Rigidbody Rigidbody; + + [SerializeField] + protected Collider Collider; + + [SerializeField] + protected Transform VisualLook; + + [SerializeField] + protected SpriteRenderer SpriteRenderer; + + [SerializeField] + protected Canvas Canvas; + + [field: Title("드랍 옵션")] + [field: SerializeField, Tooltip("키 입력을 통한 아이템 획득")] + public bool EnableInteraction { get; private set; } = true; + + [SerializeField] + protected bool UseAutoDestroy = true; + + [SerializeField, ShowIf("@UseAutoDestroy")] + protected float AutoDestroyTime = 30f; + + [SerializeField, ShowIf("@!EnableInteraction")] + protected bool DrawGizmos = true; + + [SerializeField, ShowIf("@!EnableInteraction")] + protected float Radius = 5f; + + [SerializeField, ShowIf("@!EnableInteraction")] + protected float AcquisitionTime = 1f; + + [SerializeField] + protected string AcquiredSfxName = "GetItem"; + + [Title("아이템 데이터")] + [SerializeField] + protected ItemData ItemData; + + protected ItemSlot ItemSlot; + protected Collider TargetCollider; + protected Coroutine RootCoroutineInstance; + protected readonly WaitForSeconds LootCoroutineTime = new(0.5f); + + private bool _isQuitting; + + private void OnDrawGizmosSelected() + { + if (!DrawGizmos) return; + + Gizmos.DrawWireSphere(transform.position, Radius); + } + + private void Awake() + { + InitializeComponents(); + } + + private void Start() + { + if (UseAutoDestroy) + { + Destroy(gameObject, AutoDestroyTime); + } + + if (EnableInteraction) + { + GameManager.Instance.CurrentCombatPlayer.CombatInput.RegisterPlayerInteraction(this); + } + else + { + Utils.StartUniqueCoroutine(this, ref RootCoroutineInstance, LootCoroutine()); + } + } + + private void OnApplicationQuit() + { + _isQuitting = true; + } + + private void OnDestroy() + { + if (_isQuitting) return; + + if (EnableInteraction) + { + GameManager.Instance.CurrentCombatPlayer.CombatInput.UnregisterPlayerInteraction(this); + } + } + + public void Initialize(ItemSlot itemSlot) + { + ItemSlot = itemSlot; + ItemData = ItemManager.Instance.GetItemDataByIdx(ItemSlot.Idx); + + SpriteRenderer.sprite = ItemData.Sprite; + } + + [Button("컴포넌트 초기화")] + private void InitializeComponents() + { + Transform = transform; + Rigidbody = GetComponent(); + Collider = GetComponent(); + VisualLook = transform.Find("VisualLook"); + SpriteRenderer = VisualLook.GetComponent(); + Canvas = transform.Find("Canvas").GetComponent(); + Canvas.GetComponent().worldCamera = Camera.main; + } + + protected virtual void OnAcquired() + { + Destroy(gameObject); + AudioManager.Instance.PlaySfx(AcquiredSfxName); + DataManager.Instance.CombatInventory.AddItem(ItemSlot); + CombatUiManager.Instance.ItemLootUi.ShowLootInfoUi(ItemData, ItemSlot.Count); + } + + private IEnumerator LootCoroutine() + { + while (true) + { + TargetCollider = GameManager.Instance.CurrentCombatPlayer.CharacterCollider; + if (TargetCollider == null) + { + yield return LootCoroutineTime; + continue; + } + + var targetDistance = Vector3.Distance(TargetCollider.transform.position, transform.position); + if (targetDistance <= Radius) break; + + yield return LootCoroutineTime; + } + + if (Rigidbody) + { + Rigidbody.isKinematic = true; + Rigidbody.useGravity = false; + } + if (Collider) + { + Collider.enabled = false; + } + + var startPosition = transform.position; + var elapsedTime = 0f; + + while (elapsedTime < AcquisitionTime) + { + if (TargetCollider == null) + { + yield break; + } + elapsedTime += Time.deltaTime; + var t = elapsedTime / AcquisitionTime; + t = Mathf.SmoothStep(0f, 1f, t); + + transform.position = Vector3.Lerp(startPosition, TargetCollider.bounds.center, t); + yield return null; + } + + OnAcquired(); + } + + public void AddForce(Vector3 force, ForceMode forceMode) => Rigidbody.AddForce(force, forceMode); + + public void Interaction() + { + OnAcquired(); + } + + public void ShowInteractionUi() + { + if (!Canvas) return; + + Canvas.gameObject.SetActive(true); + } + + public void HideInteractionUi() + { + if (!Canvas) return; + + Canvas.gameObject.SetActive(false); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Item.cs.meta b/Assets/02.Scripts/Item/Item.cs.meta new file mode 100644 index 000000000..cd8375c1e --- /dev/null +++ b/Assets/02.Scripts/Item/Item.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 619bc0c8098f9a841b08d6cf4d9c1e91 \ No newline at end of file diff --git a/Assets/02.Scripts/Item/ItemData.cs b/Assets/02.Scripts/Item/ItemData.cs index 15a6d1545..c1daa5872 100644 --- a/Assets/02.Scripts/Item/ItemData.cs +++ b/Assets/02.Scripts/Item/ItemData.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Interfaces; +using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Items @@ -28,28 +29,33 @@ namespace BlueWater.Items [Serializable] public class ItemData : IIdx { - [field: SerializeField, Tooltip("고유 식별 ID")] + [BoxGroup("Json 데이터 영역")] + [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] public int Idx { get; set; } - [field: SerializeField, Tooltip("이름")] + [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] public string Name { get; set; } - [field: SerializeField, Tooltip("아이템 종류")] + [field: SerializeField, Tooltip("아이템 종류"), BoxGroup("Json 데이터 영역")] public ItemCategory Category { get; set; } - [field: SerializeField, Tooltip("재료 종류")] + [field: SerializeField, Tooltip("재료 종류"), BoxGroup("Json 데이터 영역")] public ItemType Type { get; set; } - [field: SerializeField, Tooltip("가격")] + [field: SerializeField, Tooltip("가격"), BoxGroup("Json 데이터 영역")] public int Price { get; set; } - [field: SerializeField, Tooltip("무게")] + [field: SerializeField, Tooltip("무게"), BoxGroup("Json 데이터 영역")] public int Weight { get; set; } - - [field: SerializeField, Tooltip("스프라이트")] + + [field: SerializeField, Tooltip("설명"), TextArea(3, 10), BoxGroup("Json 데이터 영역")] + public string Description { get; set; } + + [BoxGroup("직접 추가하는 영역")] + [field: SerializeField, BoxGroup("직접 추가하는 영역")] public Sprite Sprite { get; set; } - [field: SerializeField, Tooltip("설명"), TextArea(3, 10)] - public string Description { get; set; } + [field: SerializeField, BoxGroup("직접 추가하는 영역")] + public Item ItemPrefab { get; set; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/ItemDropTable.cs b/Assets/02.Scripts/Item/ItemDropTable.cs index 116ea8749..20d01ada2 100644 --- a/Assets/02.Scripts/Item/ItemDropTable.cs +++ b/Assets/02.Scripts/Item/ItemDropTable.cs @@ -1,80 +1,46 @@ using System; using System.Collections.Generic; -using BlueWater.Interfaces; using UnityEngine; using Random = UnityEngine.Random; namespace BlueWater.Items { [Serializable] - public class ItemDropTable : IIdx + public class ItemDropTable { - [field: SerializeField, Tooltip("드랍 테이블 인덱스")] - public int Idx { get; set; } - - [field: SerializeField, Tooltip("드랍 테이블 이름")] - public string Name { get; set; } - [field: SerializeField] - public int ItemIdx1 { get; set; } + public CharacterData CharacterData { get; set; } + + // ItemDropTableScriptableObject 클래스에서 생성되기 떄문에 new() 필수 [field: SerializeField] - public int ItemProb1 { get; set; } - [field: SerializeField] - public int ItemMin1 { get; set; } - [field: SerializeField] - public int ItemMax1 { get; set; } - - [field: SerializeField] - public int ItemIdx2 { get; set; } - [field: SerializeField] - public int ItemProb2 { get; set; } - [field: SerializeField] - public int ItemMin2 { get; set; } - [field: SerializeField] - public int ItemMax2 { get; set; } - - [field: SerializeField] - public int ItemIdx3 { get; set; } - [field: SerializeField] - public int ItemProb3 { get; set; } - [field: SerializeField] - public int ItemMin3 { get; set; } - [field: SerializeField] - public int ItemMax3 { get; set; } - - [field: SerializeField] - public int ItemIdx4 { get; set; } - [field: SerializeField] - public int ItemProb4 { get; set; } - [field: SerializeField] - public int ItemMin4 { get; set; } - [field: SerializeField] - public int ItemMax4 { get; set; } - - [field: SerializeField, Tooltip("설명"), TextArea(3, 10)] - public string Description { get; set; } + public List DropItems { get; set; } = new(); + + private List _itemSlots; + + public ItemDropTable(CharacterData characterData) + { + CharacterData = characterData; + } public List GetDroppedItemList() { - var newItemSlotList = new List(); - - CheckAndAddItem(newItemSlotList, ItemIdx1, ItemProb1, ItemMin1, ItemMax1); - CheckAndAddItem(newItemSlotList, ItemIdx2, ItemProb2, ItemMin2, ItemMax2); - CheckAndAddItem(newItemSlotList, ItemIdx3, ItemProb3, ItemMin3, ItemMax3); - CheckAndAddItem(newItemSlotList, ItemIdx4, ItemProb4, ItemMin4, ItemMax4); + _itemSlots = new List(); - return newItemSlotList; + foreach (var element in DropItems) + { + CheckAndAddItem(element); + } + + return _itemSlots; } - private void CheckAndAddItem(List itemSlotList, int itemIdx, int probability, int min, int max) + private void CheckAndAddItem(DropItem dropItem) { - if (itemIdx == 0) return; - var dropChance = Random.Range(0, 101); - if (dropChance > probability) return; - - var randomCount = Random.Range(min, max + 1); - itemSlotList.Add(new ItemSlot(itemIdx, randomCount)); + if (dropChance > dropItem.DropRate) return; + + var randomCount = Random.Range(dropItem.QuantityMin, dropItem.QuantityMax + 1); + _itemSlots.Add(new ItemSlot(dropItem.ItemIdx, randomCount)); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/ItemDropTableSo.cs b/Assets/02.Scripts/Item/ItemDropTableSo.cs index 344856c59..678cf8a7a 100644 --- a/Assets/02.Scripts/Item/ItemDropTableSo.cs +++ b/Assets/02.Scripts/Item/ItemDropTableSo.cs @@ -1,23 +1,84 @@ using System.Collections.Generic; -using BlueWater.Interfaces; +using System.IO; +using BlueWater.Items; +using Newtonsoft.Json.Linq; +using UnityEditor; using UnityEngine; -namespace BlueWater.Items +namespace BlueWater { - [CreateAssetMenu(fileName = "ItemDropTable", menuName = "ScriptableObjects/ItemDropTable")] - public class ItemDropTableSo : ScriptableObject, IDataContainer + public class ItemDropTableSo : ScriptableObject { - [field: SerializeField] - public List ItemDropTableList { get; private set; } + // public 필수 + public List ItemDropTables = new(); + private const string ItemDropJsonPath = "Assets/Resources/Json/ItemDropTable.json"; + private const string CharacterDataJsonPath = "Assets/Resources/Json/CharacterData.json"; + private const string FilePath = "Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset"; - public List GetData() + [MenuItem("Tools/ItemDropTable ScriptableObject 생성")] + private static void CreateItemDropTable() { - return ItemDropTableList; + var itemDropJsonContent = File.ReadAllText(ItemDropJsonPath); + var characterDataJsonContent = File.ReadAllText(CharacterDataJsonPath); + + var instance = CreateFromJson(itemDropJsonContent, characterDataJsonContent); + AssetDatabase.CreateAsset(instance, FilePath); + AssetDatabase.SaveAssets(); + Debug.Log("ItemDropTable ScriptableObject created successfully in ItemDropTableScriptableObject class."); } - public void SetData(List itemDropTableList) + private static ItemDropTableSo CreateFromJson(string itemDropJsonString, string characterDataJsonString) { - ItemDropTableList = itemDropTableList; + var itemDropTables = ParseJsonToCharacterDrops(itemDropJsonString, characterDataJsonString); + var instance = CreateInstance(); + instance.ItemDropTables = itemDropTables; + return instance; + } + + private static List ParseJsonToCharacterDrops(string itemDropJsonString, string characterDataJsonString) + { + var newItemDropTables = new List(); + var itemDropTables = new Dictionary(); + var characterDataDictionary = ParseCharacterDataJson(characterDataJsonString); + + var jsonArray = JArray.Parse(itemDropJsonString); + foreach (var element in jsonArray) + { + var characterIdx = (int)element["CharacterIdx"]; + var dropItem = new DropItem + { + ItemIdx = (int)element["ItemIdx"], + DropRate = (int)element["DropRate"], + QuantityMin = (int)element["QuantityMin"], + QuantityMax = (int)element["QuantityMax"] + }; + + if (!itemDropTables.ContainsKey(characterIdx)) + { + var characterName = characterDataDictionary.GetValueOrDefault(characterIdx, "Unknown"); + itemDropTables[characterIdx] = new ItemDropTable(new CharacterData(characterIdx, characterName)); + } + + itemDropTables[characterIdx].DropItems.Add(dropItem); + } + + newItemDropTables.AddRange(itemDropTables.Values); + return newItemDropTables; + } + + private static Dictionary ParseCharacterDataJson(string characterDataJsonString) + { + var characterDataDictionary = new Dictionary(); + var jsonArray = JArray.Parse(characterDataJsonString); + + foreach (var element in jsonArray) + { + var characterIdx = (int)element["CharacterIdx"]; + var name = (string)element["Name"]; + characterDataDictionary[characterIdx] = name; + } + + return characterDataDictionary; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/ItemDropTableSo.cs.meta b/Assets/02.Scripts/Item/ItemDropTableSo.cs.meta index ee68f0a2c..3eeb32d82 100644 --- a/Assets/02.Scripts/Item/ItemDropTableSo.cs.meta +++ b/Assets/02.Scripts/Item/ItemDropTableSo.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: 027aabcea812200499455b126674dacd +guid: 9b4027f974cd5234690df1b35ca492ac \ No newline at end of file diff --git a/Assets/02.Scripts/Item/ItemManager.cs b/Assets/02.Scripts/Item/ItemManager.cs index 4262974f3..1a174195f 100644 --- a/Assets/02.Scripts/Item/ItemManager.cs +++ b/Assets/02.Scripts/Item/ItemManager.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using BlueWater.Audios; -using BlueWater.Uis; using Sirenix.OdinInspector; using UnityEngine; @@ -9,15 +7,15 @@ namespace BlueWater.Items public class ItemManager : Singleton { [SerializeField, Required] - private GameObject _dropItemControllerPrefab; + private Item _defaultItemPrefab; [SerializeField, Required] private ItemDataSo _itemDataSo; - public Dictionary ItemDictionary { get; private set; } + private Dictionary _itemDictionary; [SerializeField, Required] private ItemDropTableSo _itemDropTableSo; - public Dictionary ItemDropTableDictionary { get; private set; } + private Dictionary _itemDropTableDictionary; protected override void OnAwake() { @@ -28,60 +26,62 @@ namespace BlueWater.Items private void Initialize() { - ItemDictionary = new Dictionary(_itemDataSo.ItemDataList.Count); + _itemDictionary = new Dictionary(_itemDataSo.ItemDataList.Count); foreach (var element in _itemDataSo.ItemDataList) { - ItemDictionary.TryAdd(element.Idx, element); + _itemDictionary.TryAdd(element.Idx, element); } - ItemDropTableDictionary = new Dictionary(_itemDropTableSo.ItemDropTableList.Count); - foreach (var element in _itemDropTableSo.ItemDropTableList) + _itemDropTableDictionary = new Dictionary(_itemDropTableSo.ItemDropTables.Count); + foreach (var element in _itemDropTableSo.ItemDropTables) { - ItemDropTableDictionary.TryAdd(element.Idx, element); - } - } - - public void ItemDrop(int idx, Vector3 dropPosition) - { - var itemDropTable = ItemDropTableDictionary[idx]; - var droppedItemList = itemDropTable.GetDroppedItemList(); - foreach (var element in droppedItemList) - { - var instantiateItem = Instantiate(_dropItemControllerPrefab, dropPosition, Quaternion.identity); - instantiateItem.GetComponent().Initialize(element); + _itemDropTableDictionary.TryAdd(element.CharacterData.CharacterIdx, element); } } public void ItemDropRandomPosition(int idx, Vector3 dropPosition) { - var itemDropTable = ItemDropTableDictionary[idx]; + var itemDropTable = GetItemDropTableByIdx(idx); + if (itemDropTable == null) return; + var droppedItemList = itemDropTable.GetDroppedItemList(); foreach (var element in droppedItemList) { var newDropPositionX = Random.Range(dropPosition.x - 1f, dropPosition.x + 1f); var newDropPositionZ = Random.Range(dropPosition.z - 1f, dropPosition.z + 1f); var newDropPosition = new Vector3(newDropPositionX, dropPosition.y, newDropPositionZ); - - var instantiateItem = Instantiate(_dropItemControllerPrefab, newDropPosition, Quaternion.identity); - instantiateItem.GetComponent().Initialize(element); - instantiateItem.GetComponent().AddForce(Vector3.up * 20f, ForceMode.Impulse); + + var itemPrefab = _itemDictionary[element.Idx].ItemPrefab; + if (!itemPrefab) + { + itemPrefab = _defaultItemPrefab; + } + var instantiateItem = Instantiate(itemPrefab, newDropPosition, Quaternion.identity); + instantiateItem.Initialize(element); + instantiateItem.AddForce(Vector3.up * 20f, ForceMode.Impulse); } } - - public void Acquire(ItemSlot itemSlot) - { - AudioManager.Instance.PlaySfx("GetItem"); - DataManager.Instance.CombatInventory.AddItem(itemSlot); - CombatUiManager.Instance.ItemLootUi.ShowLootInfoUi(ItemDictionary[itemSlot.Idx], itemSlot.Count); - } public ItemData GetItemDataByIdx(int idx) { - if (ItemDictionary.TryGetValue(idx, out var itemData)) return itemData; + if (_itemDictionary.TryGetValue(idx, out var itemData)) return itemData; + + Debug.LogError($"{idx}와 일치하는 아이템이 없습니다."); + return null; + } + + public ItemDropTable GetItemDropTableByIdx(int idx) + { + if (idx == 0) + { + Debug.Log("ItemDropTable이 비어있습니다."); + return null; + } + + if (_itemDropTableDictionary.TryGetValue(idx, out var itemDropTable)) return itemDropTable; Debug.LogError($"{idx}와 일치하는 아이템이 없습니다."); return null; - } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Type.meta b/Assets/02.Scripts/Item/Type.meta new file mode 100644 index 000000000..ea28d3f7d --- /dev/null +++ b/Assets/02.Scripts/Item/Type.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a75f1e343253ebf46ac1bc293ddf2e49 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Item/Type/HealingItem.cs b/Assets/02.Scripts/Item/Type/HealingItem.cs new file mode 100644 index 000000000..ddd66d5e4 --- /dev/null +++ b/Assets/02.Scripts/Item/Type/HealingItem.cs @@ -0,0 +1,22 @@ +using BlueWater.Audios; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Items +{ + public class HealingItem : Item + { + [Title("추가 옵션")] + [SerializeField] + private int _healingHealthPoint = 1; + + protected override void OnAcquired() + { + Destroy(gameObject); + AudioManager.Instance.PlaySfx(AcquiredSfxName); + var currentCombatPlayer = GameManager.Instance.CurrentCombatPlayer; + var currentHealthPoint = currentCombatPlayer.PlayerHealthPoint.CurrentHealthPoint; + currentCombatPlayer.PlayerHealthPoint.SetCurrentHealthPoint(currentHealthPoint + _healingHealthPoint); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Type/HealingItem.cs.meta b/Assets/02.Scripts/Item/Type/HealingItem.cs.meta new file mode 100644 index 000000000..bbc9d3ced --- /dev/null +++ b/Assets/02.Scripts/Item/Type/HealingItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 31ee4bedfcf364843a6f2665bec1c762 \ No newline at end of file diff --git a/Assets/02.Scripts/Map/BossMapController.cs b/Assets/02.Scripts/Map/BossMapController.cs index 341832dea..5a72bcd82 100644 --- a/Assets/02.Scripts/Map/BossMapController.cs +++ b/Assets/02.Scripts/Map/BossMapController.cs @@ -3,6 +3,7 @@ using BlueWater.Audios; using BlueWater.Enemies; using BlueWater.Enemies.Bosses; using BlueWater.Uis; +using BlueWater.Utility; using Sirenix.OdinInspector; using UnityEngine; @@ -16,45 +17,111 @@ namespace BlueWater.Maps [SerializeField] protected BossType BossType; + [SerializeField, Required] + protected BossMapTrigger BossMapTrigger; + + protected override void Start() + { + base.Start(); + + BossMapTrigger.OnInteractionActive += InitializeMap; + BossMapTrigger.OnInteractionActive += CloseMapEntrances; + } + + protected override void OnDestroy() + { + base.OnDestroy(); + + BossMapTrigger.OnInteractionActive -= InitializeMap; + BossMapTrigger.OnInteractionActive -= CloseMapEntrances; + } + + protected override void InitializeComponents() + { + base.InitializeComponents(); + + BossSpawnTransform = transform.Find("Spawns/BossSpawn"); + BossMapTrigger = transform.Find("Props/2D/BossMapTrigger").GetComponent(); + } + public override void InitializeMap() { - AllDestroyObjects(); - - if (GameManager.Instance) - { - var player = GameManager.Instance.CurrentCombatPlayer; - if (player) - { - Destroy(player.gameObject); - } - - GameManager.Instance.InstantiateCombatPlayer(PlayerSpawnTransform.position); - } - - DataManager.Instance.CurrentSaveStage = SaveStage; - if (!string.IsNullOrEmpty(BGMName)) - { - AudioManager.Instance.PlayBgm(BGMName); - } - - InitializeBoss(); - // 보스 override로 추가 + Utils.StartUniqueCoroutine(this, ref MapInitializeCoroutineInstance, InitializeMapCoroutine()); } protected virtual void InitializeBoss() { - EnemyManager.Instance.InstantiateBoss(BossType, BossSpawnTransform.position, EnemyInstantiateLocation); + EnemyManager.Instance.InstantiateBoss(BossType, BossSpawnTransform.position, EnemyInstanceLocation); } - - public override void MapClear() + + public override void ResetMap(bool isHardReset = false) { - StartCoroutine(nameof(MapClearCoroutine)); + DestroyAllObjects(); + OpenMapEntrances(); + switch (isHardReset) + { + case false when IsCleared: + return; + case true: + IsCleared = false; + break; + } + BossMapTrigger.ResetTrigger(); + } + + public override void RestartMap() + { + StartCoroutine(RestartMapCoroutine()); } - protected virtual IEnumerator MapClearCoroutine() + public override void ClearMap() + { + IsCleared = true; + StartCoroutine(nameof(ClearMapCoroutine)); + } + + protected virtual IEnumerator InitializeMapCoroutine() + { + DestroyAllObjects(); + + DataManager.Instance.CurrentSaveStage = SaveStage; + if (!string.IsNullOrEmpty(BgmName)) + { + AudioManager.Instance.PlayBgm(BgmName); + } + + CombatUiManager.Instance.FadeInOut(InitializeFadeInOutTime.x, InitializeFadeInOutTime.y); + + yield return new WaitForSeconds(InitializeFadeInOutTime.x + InitializeFadeInOutTime.y); + + InitializeBoss(); + } + + protected virtual IEnumerator RestartMapCoroutine() + { + DestroyAllObjects(); + + DataManager.Instance.CurrentSaveStage = SaveStage; + AudioManager.Instance.StopBgm(); + CombatUiManager.Instance.FadeInOut(InitializeFadeInOutTime.x, InitializeFadeInOutTime.y, + new Color(0f, 0f, 0f, 0f), 1f); + + yield return new WaitForSeconds(InitializeFadeInOutTime.x); + + var currentCombatPlayer = GameManager.Instance.CurrentCombatPlayer; + if (currentCombatPlayer) + { + Destroy(currentCombatPlayer.gameObject); + } + GameManager.Instance.InstantiateCombatPlayer(PlayerSpawnLocation.position, Quaternion.identity); + BossMapTrigger.ResetTrigger(); + OpenMapEntrances(); + } + + protected virtual IEnumerator ClearMapCoroutine() { VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f); - CombatUiManager.Instance.FadeInOut(); + CombatUiManager.Instance.FadeInOut(ClearFadeInOutTime.x, ClearFadeInOutTime.y); var elapsedTime = 0f; while (elapsedTime <= 3f) @@ -62,7 +129,7 @@ namespace BlueWater.Maps elapsedTime += Time.unscaledDeltaTime; yield return null; } - AllDestroyEnemy(); + DestroyAllEnemies(); VisualFeedbackManager.Instance.SetBaseTimeScale(1f); elapsedTime = 0f; @@ -72,7 +139,7 @@ namespace BlueWater.Maps yield return null; } - CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList); + OpenMapEntrances(); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Map/BossMapTrigger.cs b/Assets/02.Scripts/Map/BossMapTrigger.cs new file mode 100644 index 000000000..fc02a1c01 --- /dev/null +++ b/Assets/02.Scripts/Map/BossMapTrigger.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections; +using BlueWater.Players; +using BlueWater.Utility; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Maps +{ + public class BossMapTrigger : MonoBehaviour + { + public enum BossMapTriggerAnimation + { + Idle, + Animation + } + + [SerializeField] + private SpineController _spineController; + + public Action OnInteractionActive; + private Coroutine _bossMapTriggerCoroutineInstance; + + private void Awake() + { + InitializeComponents(); + } + + private void OnTriggerEnter(Collider other) + { + if (!other.CompareTag("Player")) return; + + Utils.StartUniqueCoroutine(this, ref _bossMapTriggerCoroutineInstance, BossMapTriggerCoroutine()); + } + + private void OnTriggerExit(Collider other) + { + if (!other.CompareTag("Player")) return; + + if (_bossMapTriggerCoroutineInstance == null) return; + + StopCoroutine(_bossMapTriggerCoroutineInstance); + _bossMapTriggerCoroutineInstance = null; + _spineController.PlayAnimation(BossMapTriggerAnimation.Idle.ToString(), true); + } + + [Button("컴포넌트 초기화")] + private void InitializeComponents() + { + _spineController = GetComponent(); + } + + public void ResetTrigger() + { + _spineController.PlayAnimation(BossMapTriggerAnimation.Idle.ToString(), true); + if (_bossMapTriggerCoroutineInstance != null) + { + StopCoroutine(_bossMapTriggerCoroutineInstance); + _bossMapTriggerCoroutineInstance = null; + } + gameObject.SetActive(true); + } + + private IEnumerator BossMapTriggerCoroutine() + { + var interactionAnimationName = BossMapTriggerAnimation.Animation.ToString(); + _spineController.PlayAnimation(interactionAnimationName, false); + + var animationStarted = false; + yield return StartCoroutine(_spineController.WaitForAnimationToRun(interactionAnimationName, + success => animationStarted = success)); + + if (!animationStarted) + { + yield break; + } + + while (_spineController.IsComparingCurrentAnimation(interactionAnimationName) + && _spineController.GetCurrentAnimationNormalizedTime() <= 1f) + { + yield return null; + } + + gameObject.SetActive(false); + OnInteractionActive?.Invoke(); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Map/BossMapTrigger.cs.meta b/Assets/02.Scripts/Map/BossMapTrigger.cs.meta new file mode 100644 index 000000000..4c2485ba7 --- /dev/null +++ b/Assets/02.Scripts/Map/BossMapTrigger.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fdff38e2580871c42b6f98a477e42335 diff --git a/Assets/02.Scripts/Map/FirstTutorialMapController.cs b/Assets/02.Scripts/Map/FirstTutorialMapController.cs index 26b5a5c7e..56740fdd5 100644 --- a/Assets/02.Scripts/Map/FirstTutorialMapController.cs +++ b/Assets/02.Scripts/Map/FirstTutorialMapController.cs @@ -15,7 +15,7 @@ namespace BlueWater.Maps public override void InitializeMap() { - AllDestroyObjects(); + DestroyAllObjects(); if (GameManager.Instance) { @@ -25,7 +25,7 @@ namespace BlueWater.Maps Destroy(player.gameObject); } - GameManager.Instance.InstantiateCombatPlayer(PlayerSpawnTransform.position); + GameManager.Instance.InstantiateCombatPlayer(PlayerSpawnLocation.position); } // TODO : Enemy 생성 후 추가 @@ -33,10 +33,25 @@ namespace BlueWater.Maps //InstantiateFieldMinion(enemySpawnTransformList[1].position, magicOrkPrefab); DataManager.Instance.CurrentSaveStage = SaveStage; - if (!string.IsNullOrEmpty(BGMName)) + if (!string.IsNullOrEmpty(BgmName)) { - AudioManager.Instance.PlayBgm(BGMName); + AudioManager.Instance.PlayBgm(BgmName); } } + + public override void ResetMap(bool isHardReset = false) + { + throw new System.NotImplementedException(); + } + + public override void RestartMap() + { + throw new System.NotImplementedException(); + } + + public override void ClearMap() + { + throw new System.NotImplementedException(); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Map/MapController.cs b/Assets/02.Scripts/Map/MapController.cs index 72e52c0bd..dd8ce43e4 100644 --- a/Assets/02.Scripts/Map/MapController.cs +++ b/Assets/02.Scripts/Map/MapController.cs @@ -1,5 +1,4 @@ -using System.Collections; -using BlueWater.Uis; +using System.Collections.Generic; using Sirenix.OdinInspector; using UnityEngine; @@ -10,84 +9,114 @@ namespace BlueWater.Maps /// 컴포넌트 [Title("컴포넌트")] [SerializeField, Required] - protected Transform PlayerSpawnTransform; + protected Transform PlayerSpawnLocation; - [SerializeField, Required] - public Transform EnemyInstantiateLocation; + [field: SerializeField, Required] + public Transform EnemyInstanceLocation { get; private set; } [field: SerializeField] - public Transform ParticleInstantiateLocation { get; private set; } + public Transform ParticleInstanceLocation { get; private set; } + + [SerializeField] + protected Transform MapEntranceLocations; + + [SerializeField] + protected List MapEntrances; [SerializeField] protected SaveStage SaveStage; [SerializeField] - protected string BGMName; + protected string BgmName; + + [SerializeField] + protected Vector2 InitializeFadeInOutTime = new(0.2f, 1f); + + [SerializeField] + protected Vector2 ClearFadeInOutTime = new(0.2f, 0.3f); + + protected Coroutine MapInitializeCoroutineInstance; + protected static bool IsCleared; + private bool _isQuitting; + + private void Awake() + { + InitializeComponents(); + } + + protected virtual void Start() + { + + } + + protected virtual void OnApplicationQuit() + { + _isQuitting = true; + } + + protected virtual void OnDestroy() + { + if (_isQuitting) return; + } + + [Button("컴포넌트 초기화")] + protected virtual void InitializeComponents() + { + PlayerSpawnLocation = transform.Find("Spawns/PlayerSpawn"); + EnemyInstanceLocation = transform.Find("Enemies"); + ParticleInstanceLocation = transform.Find("InstantiateObjects"); + MapEntranceLocations = transform.Find("MapEntrances"); + + var entrancesArray = MapEntranceLocations.GetComponentsInChildren(); + MapEntrances = new List(entrancesArray.Length); + MapEntrances.AddRange(entrancesArray); + } public abstract void InitializeMap(); - - // TODO : FieldMinion 생성 후 연결 - // protected T InstantiateFieldMinion(Vector3 instantiatePosition, T prefab) where T : FieldMinion - // { - // var instantiateFieldMinion = Instantiate(prefab, instantiatePosition, Quaternion.identity, EnemyInstantiateLocation).GetComponent(); - // instantiateFieldMinion.Init(this); - // - // EnemyInstanceList.Add(instantiateFieldMinion.gameObject); - // - // return instantiateFieldMinion; - // } - public void AllDestroyEnemy() + public void OpenMapEntrances() { - foreach (Transform element in EnemyInstantiateLocation) + foreach (var element in MapEntrances) + { + element.OpenMapEntrance(); + } + } + + public void CloseMapEntrances() + { + foreach (var element in MapEntrances) + { + element.CloseMapEntrance(); + } + } + + public void DestroyAllEnemies() + { + foreach (Transform element in EnemyInstanceLocation) { Destroy(element.gameObject); } } - public void AllDestroyObjects() + public void DestroyAllObjects() { - foreach (Transform element in EnemyInstantiateLocation) - { - Destroy(element.gameObject); - } + DestroyAllEnemies(); - foreach (Transform element in ParticleInstantiateLocation) + foreach (Transform element in ParticleInstanceLocation) { Destroy(element.gameObject); } } - - public virtual void MapClear() - { - if (EnemyInstantiateLocation.childCount <= 0) - { - StartCoroutine(nameof(MapClearCoroutine)); - } - } - - private 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); + public void MovePlayer() + { + if (!GameManager.Instance.CurrentCombatPlayer) return; - elapsedTime = 0f; - while (elapsedTime <= 2f) - { - elapsedTime += Time.unscaledDeltaTime; - yield return null; - } - - MapClear(); + GameManager.Instance.CurrentCombatPlayer.transform.position = PlayerSpawnLocation.position; } + + public abstract void ResetMap(bool isHardReset = false); + public abstract void RestartMap(); + public abstract void ClearMap(); } } \ No newline at end of file diff --git a/Assets/02.Scripts/Map/MapEntrance.cs b/Assets/02.Scripts/Map/MapEntrance.cs new file mode 100644 index 000000000..b601f67a6 --- /dev/null +++ b/Assets/02.Scripts/Map/MapEntrance.cs @@ -0,0 +1,43 @@ +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Maps +{ + public class MapEntrance : MonoBehaviour + { + [SerializeField] + private Collider _collider; + + [SerializeField] + private SpriteRenderer _spriteRenderer; + + private void Awake() + { + InitializeComponents(); + } + + private void Start() + { + OpenMapEntrance(); + } + + [Button("컴포넌트 초기화")] + private void InitializeComponents() + { + _collider = GetComponent(); + _spriteRenderer = GetComponentInChildren(); + } + + public void OpenMapEntrance() + { + _collider.enabled = false; + _spriteRenderer.enabled = false; + } + + public void CloseMapEntrance() + { + _collider.enabled = true; + _spriteRenderer.enabled = true; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Map/MapEntrance.cs.meta b/Assets/02.Scripts/Map/MapEntrance.cs.meta new file mode 100644 index 000000000..375dd19cb --- /dev/null +++ b/Assets/02.Scripts/Map/MapEntrance.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6b1ebaf29bf6b49478d58541a2343fa5 \ No newline at end of file diff --git a/Assets/02.Scripts/Map/MapManager.cs b/Assets/02.Scripts/Map/MapManager.cs index ee33ce082..d0c0601ea 100644 --- a/Assets/02.Scripts/Map/MapManager.cs +++ b/Assets/02.Scripts/Map/MapManager.cs @@ -1,13 +1,12 @@ using System; +using System.Collections.Generic; +using BlueWater.Audios; 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; } @@ -16,45 +15,74 @@ namespace BlueWater.Maps [field: SerializeField] public SandMoleMapController SandMoleMapController { get; private set; } - + + private List _mapControllers; private MapController _currentMapController; - - public void InitializeMap() + + protected override void OnAwake() { - MapController newMapController = null; - switch (DataManager.Instance.CurrentSaveStage) + _mapControllers = new List(3) + { + TitanSlimeMapController, + RhinocerosMapController, + SandMoleMapController + }; + } + + // public void InitializeMap() + // { + // if (_currentMapController != null) + // { + // _currentMapController.AllDestroyObjects(); + // } + // + // _currentMapController = GetMapController(DataManager.Instance.CurrentSaveStage); + // if (_currentMapController != null) + // { + // _currentMapController.InitializeMap(); + // } + // } + + public MapController GetMapController(SaveStage saveStage) + { + switch (saveStage) { case SaveStage.None: - break; - case SaveStage.FirstTutorial: - newMapController = FirstTutorialMapController; - break; - case SaveStage.SecondTutorial: - //MapController = FindAnyObjectByType(); - break; + return null; case SaveStage.TitanSlime: - newMapController = TitanSlimeMapController; - break; + return TitanSlimeMapController; case SaveStage.Rhinoceros: - newMapController = RhinocerosMapController; - break; + return RhinocerosMapController; case SaveStage.SandMole: - newMapController = SandMoleMapController; - break; + return SandMoleMapController; default: throw new ArgumentOutOfRangeException(); } - - if (_currentMapController != null) - { - _currentMapController.AllDestroyObjects(); - } + } - _currentMapController = newMapController; + public void HardResetAllMaps() + { + foreach (var element in _mapControllers) + { + element.ResetMap(true); + } + AudioManager.Instance.StopBgm(); + } + + public void CurrentMapRestart() + { if (_currentMapController != null) { - _currentMapController.InitializeMap(); + _currentMapController.ResetMap(); } + _currentMapController = GetMapController(DataManager.Instance.CurrentSaveStage); + _currentMapController.RestartMap(); + } + + public void MoveSelectStage(int stage) + { + var moveMapController = GetMapController((SaveStage)stage); + moveMapController.MovePlayer(); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Map/MapPortal.cs b/Assets/02.Scripts/Map/MapPortal.cs new file mode 100644 index 000000000..355d540b4 --- /dev/null +++ b/Assets/02.Scripts/Map/MapPortal.cs @@ -0,0 +1,58 @@ +using System.Collections; +using BlueWater.Uis; +using BlueWater.Utility; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Maps +{ + public class MapPortal : MonoBehaviour + { + [SerializeField] + private Collider _collider; + + [SerializeField, Required] + private Transform _targetTransform; + + [SerializeField] + private Vector2 _fadeInOutTime = new(1f, 1f); + + [SerializeField] + private float _delayAfterFadeIn = 0.5f; + + [SerializeField] + private Color _fadeColor = new(0f, 0f, 0f, 0f); + + private Coroutine _portalCoroutineInstance; + + private void Awake() + { + InitializeComponents(); + } + + [Button("컴포넌트 초기화")] + private void InitializeComponents() + { + _collider = GetComponent(); + } + + private void OnTriggerEnter(Collider other) + { + if (!other.CompareTag("Player") || !_targetTransform) return; + + Utils.StartUniqueCoroutine(this, ref _portalCoroutineInstance, PortalCoroutine(other)); + } + + private IEnumerator PortalCoroutine(Collider other) + { + PlayerInputKeyManager.Instance.DisableCurrentPlayerInput(); + CombatUiManager.Instance.FadeInOut(_fadeInOutTime.x, _fadeInOutTime.y, _fadeColor, _delayAfterFadeIn); + yield return new WaitForSeconds(_fadeInOutTime.x); + + other.transform.position = _targetTransform.position; + yield return new WaitForSeconds(_delayAfterFadeIn + _fadeInOutTime.y); + + PlayerInputKeyManager.Instance.EnableCurrentPlayerInput(); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Map/MapPortal.cs.meta b/Assets/02.Scripts/Map/MapPortal.cs.meta new file mode 100644 index 000000000..23b890d26 --- /dev/null +++ b/Assets/02.Scripts/Map/MapPortal.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ade4573044ba9d54faa47184fd8a718b diff --git a/Assets/02.Scripts/Map/NormalMapTrigger.cs b/Assets/02.Scripts/Map/NormalMapTrigger.cs new file mode 100644 index 000000000..2535e5a76 --- /dev/null +++ b/Assets/02.Scripts/Map/NormalMapTrigger.cs @@ -0,0 +1,23 @@ +using System; +using UnityEngine; + +namespace BlueWater.Maps +{ + public class NormalMapTrigger : MonoBehaviour + { + public Action OnPlayerEntrance; + + private void OnTriggerEnter(Collider other) + { + if (!other.CompareTag("Player")) return; + + gameObject.SetActive(false); + OnPlayerEntrance?.Invoke(); + } + + public void ResetTrigger() + { + gameObject.SetActive(true); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Map/NormalMapTrigger.cs.meta b/Assets/02.Scripts/Map/NormalMapTrigger.cs.meta new file mode 100644 index 000000000..98138a11b --- /dev/null +++ b/Assets/02.Scripts/Map/NormalMapTrigger.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2b3c7fabec96a1d43918dc5990392e22 \ No newline at end of file diff --git a/Assets/02.Scripts/Map/SandMoleMapController.cs b/Assets/02.Scripts/Map/SandMoleMapController.cs index 99312cbdf..7fee84f93 100644 --- a/Assets/02.Scripts/Map/SandMoleMapController.cs +++ b/Assets/02.Scripts/Map/SandMoleMapController.cs @@ -22,10 +22,10 @@ namespace BlueWater.Maps random2 = Random.Range(0, MiniSandMoleSpawnTransforms.Count); } while (random2 == random1); - var miniSandMole1 = EnemyManager.Instance.InstantiateMiniSandMole(MiniSandMoleSpawnTransforms[random1].position, EnemyInstantiateLocation); + var miniSandMole1 = EnemyManager.Instance.InstantiateMiniSandMole(MiniSandMoleSpawnTransforms[random1].position, EnemyInstanceLocation); miniSandMole1.Initialize(); - var miniSandMole2 = EnemyManager.Instance.InstantiateMiniSandMole(MiniSandMoleSpawnTransforms[random2].position, EnemyInstantiateLocation); + var miniSandMole2 = EnemyManager.Instance.InstantiateMiniSandMole(MiniSandMoleSpawnTransforms[random2].position, EnemyInstanceLocation); miniSandMole2.Initialize(); } } diff --git a/Assets/02.Scripts/Map/TitanSlimeMapController.cs b/Assets/02.Scripts/Map/TitanSlimeMapController.cs index 36038a167..a9dcc9ff3 100644 --- a/Assets/02.Scripts/Map/TitanSlimeMapController.cs +++ b/Assets/02.Scripts/Map/TitanSlimeMapController.cs @@ -9,14 +9,14 @@ namespace BlueWater.Maps { protected override void InitializeBoss() { - EnemyManager.Instance.InstantiateTitanSlime(BossSpawnTransform.position, 1, true, EnemyInstantiateLocation); + EnemyManager.Instance.InstantiateTitanSlime(BossSpawnTransform.position, 1, true, EnemyInstanceLocation); } - protected override IEnumerator MapClearCoroutine() + protected override IEnumerator ClearMapCoroutine() { - AllDestroyEnemy(); + DestroyAllEnemies(); VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f); - CombatUiManager.Instance.FadeInOut(); + CombatUiManager.Instance.FadeInOut(ClearFadeInOutTime.x, ClearFadeInOutTime.y); var elapsedTime = 0f; while (elapsedTime <= 3f) @@ -24,7 +24,7 @@ namespace BlueWater.Maps elapsedTime += Time.unscaledDeltaTime; yield return null; } - AllDestroyEnemy(); + DestroyAllEnemies(); VisualFeedbackManager.Instance.SetBaseTimeScale(1f); elapsedTime = 0f; @@ -34,7 +34,8 @@ namespace BlueWater.Maps yield return null; } - CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList); + OpenMapEntrances(); + //CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/NewBlueWater.inputactions b/Assets/02.Scripts/NewBlueWater.inputactions index 12795d915..c4ae0022d 100644 --- a/Assets/02.Scripts/NewBlueWater.inputactions +++ b/Assets/02.Scripts/NewBlueWater.inputactions @@ -747,6 +747,15 @@ "interactions": "", "initialStateCheck": false }, + { + "name": "Interaction", + "type": "Button", + "id": "2959a0ad-c73e-43b1-b98e-9917868b2a9a", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, { "name": "ActivateMainSkill", "type": "Button", @@ -765,6 +774,15 @@ "interactions": "", "initialStateCheck": false }, + { + "name": "OpenDevelopMenu", + "type": "Button", + "id": "a5d9ffcb-5c4f-4c6d-8335-9060bbea120a", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, { "name": "OpenItemInventory", "type": "Button", @@ -864,6 +882,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "7ceb23c4-9187-46a0-af0b-96f4bc80ff62", + "path": "/f", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Interaction", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "2f54c74a-af50-485d-ac82-cd34a044f8f8", @@ -886,6 +915,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "9cb03036-6749-4f46-a55c-d2167045de8a", + "path": "/f1", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "OpenDevelopMenu", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "46591849-5c1e-4b83-b490-0a4ad29ed80f", diff --git a/Assets/02.Scripts/PlayerInputKeyManager.cs b/Assets/02.Scripts/PlayerInputKeyManager.cs index bc006541c..0d82bd39e 100644 --- a/Assets/02.Scripts/PlayerInputKeyManager.cs +++ b/Assets/02.Scripts/PlayerInputKeyManager.cs @@ -29,7 +29,7 @@ namespace BlueWater { if (_currentPlayerInput && _currentPlayerInput.enabled) return false; - //Debug.Log("CurrentPlayerInput가 할당되지 않았습니다."); + Debug.Log("CurrentPlayerInput가 할당되지 않았습니다."); return true; } @@ -56,7 +56,7 @@ namespace BlueWater public void EnableCurrentPlayerInput() { - if (IsNullCurrentPlayerInput()) return; + if (!_currentPlayerInput) return; _currentPlayerInput.enabled = true; } diff --git a/Assets/02.Scripts/Prop/Rockfall.cs b/Assets/02.Scripts/Prop/Rockfall.cs index 14b618e92..45ce4dcd6 100644 --- a/Assets/02.Scripts/Prop/Rockfall.cs +++ b/Assets/02.Scripts/Prop/Rockfall.cs @@ -54,7 +54,7 @@ namespace BlueWater { _sphereCollider.enabled = false; _startPosition = transform.position; - SpawnLocation = MapManager.Instance.SandMoleMapController.ParticleInstantiateLocation; + SpawnLocation = MapManager.Instance.SandMoleMapController.ParticleInstanceLocation; _hitColliders = new Collider[4]; BasicSetting(); diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/RhinocerosData.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/RhinocerosData.asset index a561ec2dc..cd65ad6a7 100644 --- a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/RhinocerosData.asset +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/RhinocerosData.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: Rhinoceros k__BackingField: "\uCF54\uBFD4\uC18C" + k__BackingField: 2 k__BackingField: 700 k__BackingField: serializedVersion: 2 diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset index f3f4ced20..cc639260e 100644 --- a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SandMoleData.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: SandMole k__BackingField: "\uBAA8\uB798 \uB450\uB354\uC9C0" + k__BackingField: 3 k__BackingField: 1000 k__BackingField: serializedVersion: 2 diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/TitanSlimeData.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/TitanSlimeData.asset index d431ee2e5..5bd5c08eb 100644 --- a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/TitanSlimeData.asset +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/TitanSlimeData.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: TitanSlime k__BackingField: "\uD0C0\uC774\uD0C4 \uC2AC\uB77C\uC784" + k__BackingField: 1 k__BackingField: 0 k__BackingField: serializedVersion: 2 diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset similarity index 80% rename from Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset rename to Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset index ee9ad0e60..44756df36 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f7fe40513dd0a794689cc8a52ddb2f87, type: 3} - m_Name: ItemTable + m_Name: ItemDataTable m_EditorClassIdentifier: k__BackingField: - k__BackingField: 10101 @@ -19,341 +19,402 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10102 k__BackingField: "\uACF5\uB8E1 \uACE0\uAE30" k__BackingField: 1 k__BackingField: 1 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10103 k__BackingField: "\uB7A8\uACE0\uAE30" k__BackingField: 1 k__BackingField: 1 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10104 k__BackingField: "\uB2ED\uACE0\uAE30" k__BackingField: 1 k__BackingField: 1 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10105 k__BackingField: "\uBC40\uACE0\uAE30" k__BackingField: 1 k__BackingField: 1 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10106 k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4" k__BackingField: 1 k__BackingField: 1 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10107 k__BackingField: "\uCF54\uBFD4\uC18C \uB2E4\uB9AC\uC0B4" k__BackingField: 1 k__BackingField: 1 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10201 k__BackingField: "\uBC31\uC0C1\uC5B4" k__BackingField: 1 k__BackingField: 2 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10202 k__BackingField: "\uB2C8\uBAA8" k__BackingField: 1 k__BackingField: 2 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10203 k__BackingField: "\uD574\uD30C\uB9AC" k__BackingField: 1 k__BackingField: 2 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10204 k__BackingField: "\uAC00\uC624\uB9AC" k__BackingField: 1 k__BackingField: 2 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10205 k__BackingField: "\uC6B0\uB7ED" k__BackingField: 1 k__BackingField: 2 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10301 k__BackingField: "\uB370\uC2A4\uB3C4\uC5B4\uC758 \uC54C" k__BackingField: 1 k__BackingField: 3 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10302 k__BackingField: "\uACF5\uB8E1\uC54C" k__BackingField: 1 k__BackingField: 3 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10401 k__BackingField: "\uBA54\uB860" k__BackingField: 1 k__BackingField: 4 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10402 k__BackingField: "\uD1A0\uB9C8\uD1A0" k__BackingField: 1 k__BackingField: 4 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10403 k__BackingField: "\uC0AC\uACFC" k__BackingField: 1 k__BackingField: 4 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10404 k__BackingField: "\uB808\uBAAC" k__BackingField: 1 k__BackingField: 4 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10405 k__BackingField: "\uD1A0\uB9C8\uD1A0" k__BackingField: 1 k__BackingField: 4 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10501 k__BackingField: "\uB9C8\uB298" k__BackingField: 1 k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10502 k__BackingField: "\uC591\uD30C" k__BackingField: 1 k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10503 k__BackingField: "\uB300\uD30C" k__BackingField: 1 k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10504 k__BackingField: "\uD30C\uC2AC\uB9AC" k__BackingField: 1 k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10505 k__BackingField: "\uB2E4\uC2DC\uB9C8" k__BackingField: 1 k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10506 k__BackingField: "\uD30C\uD504\uB9AC\uCE74" k__BackingField: 1 k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10507 k__BackingField: "\uBC30\uCD94" k__BackingField: 1 k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10508 k__BackingField: "\uBE0C\uB85C\uCF5C\uB9AC" k__BackingField: 1 k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10509 k__BackingField: "\uAE7B\uC78E" k__BackingField: 1 k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10601 k__BackingField: "\uC9C4\uC8FC \uC870\uAC1C" k__BackingField: 1 k__BackingField: 6 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10602 k__BackingField: "\uBC14\uB2E4 \uC870\uAC1C" k__BackingField: 1 k__BackingField: 6 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10603 k__BackingField: "\uAC70\uB300 \uC870\uAC1C" k__BackingField: 1 k__BackingField: 6 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10701 k__BackingField: "\uC18C\uAE08" k__BackingField: 1 k__BackingField: 7 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10702 k__BackingField: "\uACE0\uCDA7\uAC00\uB8E8" k__BackingField: 1 k__BackingField: 7 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10703 k__BackingField: "\uD6C4\uCD94" k__BackingField: 1 k__BackingField: 7 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10704 k__BackingField: "\uAC04\uC7A5" k__BackingField: 1 k__BackingField: 7 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10705 k__BackingField: "\uBC84\uD130" k__BackingField: 1 k__BackingField: 7 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 10706 k__BackingField: "\uC124\uD0D5" k__BackingField: 1 k__BackingField: 7 k__BackingField: 100 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 20001 k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uB3D9)" k__BackingField: 2 k__BackingField: 0 k__BackingField: 500 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 20002 k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uC740)" k__BackingField: 2 k__BackingField: 0 k__BackingField: 1000 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 20003 k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uAE08)" k__BackingField: 2 k__BackingField: 0 k__BackingField: 2000 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 20004 k__BackingField: "\uBBF8\uBBF9" k__BackingField: 2 k__BackingField: 0 k__BackingField: 0 k__BackingField: 100 - k__BackingField: {fileID: 0} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 30201 k__BackingField: "\uCF54\uCF54\uB11B\uAC8C\uC0B4\uC2A4\uD29C" k__BackingField: 3 k__BackingField: 2 k__BackingField: 0 k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 03de9c442181996409543cd79d5bfff3, type: 3} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} - k__BackingField: 40001 k__BackingField: "\uB9E5\uC8FC" k__BackingField: 4 k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 - k__BackingField: {fileID: 1484297983, guid: 392baff6d0b9a054fb64806241db3101, type: 3} k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 50001 + k__BackingField: "\uD558\uD2B8 \uBC18 \uAC1C" + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} + k__BackingField: {fileID: 8962896418303621511, guid: 0dc7ed0facf2fca4b80244d0d95e2557, type: 3} + - k__BackingField: 50002 + k__BackingField: "\uD558\uD2B8 \uD55C \uAC1C" + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} + k__BackingField: {fileID: 8962896418303621511, guid: 66d94bc59db241a4895f8e4fff7ea201, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset.meta b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset.meta similarity index 79% rename from Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset.meta rename to Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset.meta index 9044eb60d..b0c047cd9 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemTable.asset.meta +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ec425583030e16d4dacc21b64f467bd1 +guid: d7011c71193e95743aa868ca1bea6010 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset index 524fa4d5d..374ba1cc7 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset @@ -9,121 +9,71 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 027aabcea812200499455b126674dacd, type: 3} + m_Script: {fileID: 11500000, guid: 9b4027f974cd5234690df1b35ca492ac, type: 3} m_Name: ItemDropTable m_EditorClassIdentifier: - k__BackingField: - - k__BackingField: 1000001 - k__BackingField: "\uB2C8\uBAA8" - k__BackingField: 10202 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 3 - k__BackingField: 10701 - k__BackingField: 80 - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - - k__BackingField: 1000002 - k__BackingField: "\uC0C1\uC5B4" - k__BackingField: 10201 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 10702 - k__BackingField: 70 - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - - k__BackingField: 1000003 - k__BackingField: "\uAC00\uC624\uB9AC" - k__BackingField: 10204 - k__BackingField: 100 - k__BackingField: 3 - k__BackingField: 5 - k__BackingField: 10703 - k__BackingField: 50 - k__BackingField: 1 - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - - k__BackingField: 2000001 - k__BackingField: "\uC791\uC740 \uC220\uD1B5" - k__BackingField: 20001 - k__BackingField: 80 - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 20002 - k__BackingField: 50 - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - - k__BackingField: 2000002 - k__BackingField: "\uD070 \uC220\uD1B5" - k__BackingField: 20002 - k__BackingField: 80 - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 20003 - k__BackingField: 50 - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - - k__BackingField: 3000001 - k__BackingField: "\uC624\uD06C" - k__BackingField: 10102 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 20001 - k__BackingField: 30 - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 20002 - k__BackingField: 20 - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 20003 - k__BackingField: 10 - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: + ItemDropTables: + - k__BackingField: + k__BackingField: 1 + k__BackingField: "\uD0C0\uC774\uD0C4 \uC2AC\uB77C\uC784" + k__BackingField: + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: + k__BackingField: 2 + k__BackingField: "\uCF54\uBFD4\uC18C" + k__BackingField: + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: + k__BackingField: 3 + k__BackingField: "\uBAA8\uB798 \uB450\uB354\uC9C0" + k__BackingField: + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: + k__BackingField: 4 + k__BackingField: "\uC720\uB839 \uC220\uD1B5" + k__BackingField: + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/MeteorSwing.cs b/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/MeteorSwing.cs index f561d3d7d..db65644ea 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/MeteorSwing.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/MeteorSwing.cs @@ -45,7 +45,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros.Skills _rhinoceros = SkillUser.GetComponent(); _animationController = _rhinoceros.AnimationController; _targetCollider = _rhinoceros.Target; - _particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstantiateLocation; + _particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstanceLocation; } _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 a01e9bf37..0e6528632 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/SeismicThrust.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/Rhinoceros/SeismicThrust.cs @@ -46,7 +46,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros.Skills { _rhinoceros = SkillUser.GetComponent(); _targetCollider = _rhinoceros.Target; - _particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstantiateLocation; + _particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstanceLocation; } _seismicThrustData = (SeismicThrustData)SkillData; RaycastHits = new RaycastHit[4]; diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/GateOfSpikes.cs b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/GateOfSpikes.cs index 6a6dd25bf..f4051bc3a 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/GateOfSpikes.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/GateOfSpikes.cs @@ -28,7 +28,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills _animationController = _sandMole.AnimationController; _userCollider = _sandMole.CharacterCollider; _targetCollider = _sandMole.Target; - _particleInstantiateLocation = MapManager.Instance.SandMoleMapController.ParticleInstantiateLocation; + _particleInstantiateLocation = MapManager.Instance.SandMoleMapController.ParticleInstanceLocation; } _gateOfSpikesData = (GateOfSpikesData)SkillData; _spikes = new List(_gateOfSpikesData.SpikeCount); diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/MultiThrowSpikes.cs b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/MultiThrowSpikes.cs index ce8a76535..b9e37db9e 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/MultiThrowSpikes.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/MultiThrowSpikes.cs @@ -21,7 +21,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills _sandMole = SkillUser.GetComponent(); _animationController = _sandMole.AnimationController; _targetCollider = _sandMole.Target; - _particleInstantiateLocation = MapManager.Instance.SandMoleMapController.ParticleInstantiateLocation; + _particleInstantiateLocation = MapManager.Instance.SandMoleMapController.ParticleInstanceLocation; } _multiThrowSpikesData = (MultiThrowSpikesData)SkillData; diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/SingleRoll.cs b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/SingleRoll.cs index 007ea9315..8f99761da 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/SingleRoll.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/SingleRoll.cs @@ -184,7 +184,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills + -targetDirection * _singleRollData.RockfallInterval * i + Vector3.up * _singleRollData.RockfallSpawnHeight; spawnPosition += Vector3.Cross(-targetDirection, Vector3.up).normalized * randomSide; - Instantiate(_singleRollData.RockfallPrefab, spawnPosition, Quaternion.identity, _sandMoleMapController.ParticleInstantiateLocation); + Instantiate(_singleRollData.RockfallPrefab, spawnPosition, Quaternion.identity, _sandMoleMapController.ParticleInstanceLocation); } } diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/SpikeBarrage.cs b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/SpikeBarrage.cs index 4042daacb..3b49c387a 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/SpikeBarrage.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/SpikeBarrage.cs @@ -31,7 +31,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills _targetCollider = SkillUser.GetComponent().Target; _userSpriteRenderer = SkillUser.GetComponentInChildren(); _sandMoleMapController = MapManager.Instance.SandMoleMapController; - _particleInstantiateLocation = _sandMoleMapController.ParticleInstantiateLocation; + _particleInstantiateLocation = _sandMoleMapController.ParticleInstanceLocation; _centerSpawnTransform = _sandMoleMapController.CenterSpawnTransform; _spikeBarrageData = (SpikeBarrageData)SkillData; diff --git a/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs b/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs index b301da96e..af1bf2ea5 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs @@ -230,12 +230,12 @@ namespace BlueWater.Items break; case InventorySortingType.Name: _itemSlotUiList.Sort((x, y) => - string.Compare(ItemManager.Instance.ItemDictionary[x.ItemSlot.Idx].Name, - ItemManager.Instance.ItemDictionary[y.ItemSlot.Idx].Name, StringComparison.Ordinal)); + string.Compare(ItemManager.Instance.GetItemDataByIdx(x.ItemSlot.Idx).Name, + ItemManager.Instance.GetItemDataByIdx(y.ItemSlot.Idx).Name, StringComparison.Ordinal)); break; case InventorySortingType.Category: _itemSlotUiList.Sort((x, y) => - ItemManager.Instance.ItemDictionary[x.ItemSlot.Idx].Category.CompareTo(ItemManager.Instance.ItemDictionary[y.ItemSlot.Idx].Category)); + ItemManager.Instance.GetItemDataByIdx(x.ItemSlot.Idx).Category.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.ItemSlot.Idx).Category)); break; case InventorySortingType.Count: _itemSlotUiList.Sort((x, y) => y.ItemSlot.Count.CompareTo(x.ItemSlot.Count)); diff --git a/Assets/02.Scripts/Ui/Combat/CombatTutorialUi.cs b/Assets/02.Scripts/Ui/Combat/CombatTutorialUi.cs index b896af036..42bc97922 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatTutorialUi.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatTutorialUi.cs @@ -1,4 +1,3 @@ -using System.Collections; using Sirenix.OdinInspector; using UnityEngine; @@ -14,6 +13,8 @@ namespace BlueWater.Uis public class CombatTutorialUi : MonoBehaviour { + private static bool _isCompletedTutorial; + [SerializeField] private GameObject _firstTutorialUi; @@ -31,6 +32,8 @@ namespace BlueWater.Uis public void ShowFirstTutorialUi() { + if (_isCompletedTutorial) return; + PlayerInputKeyManager.Instance.DisableAllActionMaps(); gameObject.SetActive(true); _firstTutorialUi.SetActive(true); @@ -61,10 +64,11 @@ namespace BlueWater.Uis _firstTutorialUi.SetActive(false); _secondTutorialUi.SetActive(false); CurrentTutorialState = TutorialState.End; + _isCompletedTutorial = true; - //PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Combat); + PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Combat); //PlayerInputKeyManager.Instance.EnableAllActions(); - CombatUiManager.Instance.MoveSelectStage((int)SaveStage.FirstTutorial); + //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 353115294..c06acede9 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using BlueWater.Items; using BlueWater.Maps; @@ -16,6 +15,9 @@ namespace BlueWater.Uis [field: SerializeField] public Canvas MainCanvas { get; private set; } + [field: SerializeField] + public RectTransform MainCanvasRect { get; private set; } + [field: SerializeField] public CombatSkillUi CombatSkillUi { get; private set; } @@ -43,12 +45,11 @@ namespace BlueWater.Uis [field: SerializeField] public CombatTutorialUi CombatTutorialUi { get; private set; } + [field: SerializeField] + public MenuPopupUi DevelopMenuPopupUi { get; private set; } + [SerializeField] private Image _fadeImage; - - [Title("효과")] - [SerializeField] - private Vector2 _fadeInOutDuration = new(0.2f, 0.3f); public List PopupUiList { get; private set; } @@ -56,15 +57,12 @@ namespace BlueWater.Uis { InitializeComponents(); } - - private void OnEnable() - { - PopupUi.OnPopupUiOpenEvent += RegisterPopup; - PopupUi.OnPopupUiCloseEvent += UnregisterPopup; - } private void Start() { + PopupUi.OnPopupUiOpenEvent += RegisterPopup; + PopupUi.OnPopupUiCloseEvent += UnregisterPopup; + Invoke(nameof(StartTutorial), 0.1f); } @@ -73,8 +71,10 @@ namespace BlueWater.Uis CombatTutorialUi.ShowFirstTutorialUi(); } - private void OnDisable() + private void OnDestroy() { + if (Quitting) return; + PopupUi.OnPopupUiOpenEvent -= RegisterPopup; PopupUi.OnPopupUiCloseEvent -= UnregisterPopup; } @@ -83,6 +83,7 @@ namespace BlueWater.Uis private void InitializeComponents() { MainCanvas = GetComponent(); + MainCanvasRect = MainCanvas.GetComponent(); CombatSkillUi = MainCanvas.transform.Find("CombatSkillUi").GetComponent(); FieldBossHealthPointUi = MainCanvas.transform.Find("FieldBossHealthPointUi").GetComponent(); PlayerHealthPointUi = MainCanvas.transform.Find("PlayerHealthPointUi").GetComponent(); @@ -92,6 +93,7 @@ namespace BlueWater.Uis ClearPopupUi = MainCanvas.transform.Find("ClearPopupUi").GetComponent(); CombatMenuPopupUi = MainCanvas.transform.Find("CombatMenuPopupUi").GetComponent(); CombatTutorialUi = MainCanvas.transform.Find("CombatTutorialUi").GetComponent(); + DevelopMenuPopupUi = MainCanvas.transform.Find("DevelopMenuPopupUi").GetComponent(); _fadeImage = MainCanvas.transform.Find("FadeImage").GetComponent(); PopupUiList = new List(8); @@ -132,35 +134,43 @@ namespace BlueWater.Uis PopupUiList.Clear(); } - public void FadeInOut() + public void FadeInOut(float fadeInTime, float fadeOutTime, Color? fadeColor = null, float delayAfterFadeIn = 0f) { - _fadeImage.enabled = true; - _fadeImage.color = new Color(1, 1, 1, 0); - _fadeImage.DOFade(1f, _fadeInOutDuration.x).OnComplete(() => + var newColor = new Color(1f, 1f, 1f, 0f); + if (fadeColor != null) { - _fadeImage.DOFade(0f, _fadeInOutDuration.y).OnComplete(() => + newColor = (Color)fadeColor; + } + _fadeImage.color = newColor; + _fadeImage.enabled = true; + _fadeImage.DOFade(1f, fadeInTime).OnComplete(() => + { + DOVirtual.DelayedCall(delayAfterFadeIn, () => { - _fadeImage.enabled = false; + _fadeImage.DOFade(0f, fadeOutTime).OnComplete(() => + { + _fadeImage.enabled = false; + }); }); }); } + + public void HardResetAllMaps() + { + MapManager.Instance.HardResetAllMaps(); + CloseAllPopup(); + } public void RestartCurrentStage() { - MapManager.Instance.InitializeMap(); + MapManager.Instance.CurrentMapRestart(); CloseAllPopup(); } - public void MoveNextStage() - { - DataManager.Instance.CurrentSaveStage++; - RestartCurrentStage(); - } - public void MoveSelectStage(int stage) { - DataManager.Instance.CurrentSaveStage = (SaveStage)stage; - RestartCurrentStage(); + MapManager.Instance.MoveSelectStage(stage); + CloseAllPopup(); } public void MoveTitleScene() diff --git a/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs b/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs index 66d8b1686..ca30159f9 100644 --- a/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs +++ b/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs @@ -50,7 +50,7 @@ namespace BlueWater.Uis _removeType = RemoveType.Single; _selectedList.Clear(); _selectedList.Add(selectedSlot); - _contentText.text = ItemManager.Instance.ItemDictionary[selectedSlot.ItemSlot.Idx].Name + "을(를) 버리시겠습니까?"; + _contentText.text = ItemManager.Instance.GetItemDataByIdx(selectedSlot.ItemSlot.Idx).Name + "을(를) 버리시겠습니까?"; _currentCount = 1; _countText.text = _currentCount.ToString(); diff --git a/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs b/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs index 547736ce5..cf8061196 100644 --- a/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs +++ b/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs @@ -47,7 +47,7 @@ namespace BlueWater.Uis public void UpdateData(ItemSlot itemSlot) { - var item = ItemManager.Instance.ItemDictionary[itemSlot.Idx]; + var item = ItemManager.Instance.GetItemDataByIdx(itemSlot.Idx); _image.sprite = item.Sprite; _nameText.text = item.Name; _weightText.text = item.Weight * ItemSlot.Count + "kg"; diff --git a/Assets/03.Images/Fire.jpg b/Assets/03.Images/Fire.jpg new file mode 100644 index 000000000..c074f04ee Binary files /dev/null and b/Assets/03.Images/Fire.jpg differ diff --git a/Assets/03.Images/Fire.jpg.meta b/Assets/03.Images/Fire.jpg.meta new file mode 100644 index 000000000..5a342bce2 --- /dev/null +++ b/Assets/03.Images/Fire.jpg.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 9be7ccef6923b9a4bb8517ca399f8875 +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: 1024 + 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/GroundBlue2.png b/Assets/03.Images/Maps/Combat/GroundBlue2.png new file mode 100644 index 000000000..5d6fdf920 Binary files /dev/null and b/Assets/03.Images/Maps/Combat/GroundBlue2.png differ diff --git a/Assets/03.Images/Maps/Combat/GroundBlue2.png.meta b/Assets/03.Images/Maps/Combat/GroundBlue2.png.meta new file mode 100644 index 000000000..6aecd41d3 --- /dev/null +++ b/Assets/03.Images/Maps/Combat/GroundBlue2.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 3dc6e21aa8674b7439c33b913a15a7ff +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: 9 + spritePivot: {x: 0.49, 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Maps/Combat/GroundGreen2.png b/Assets/03.Images/Maps/Combat/GroundGreen2.png new file mode 100644 index 000000000..41e7c33d7 Binary files /dev/null and b/Assets/03.Images/Maps/Combat/GroundGreen2.png differ diff --git a/Assets/03.Images/Maps/Combat/GroundGreen2.png.meta b/Assets/03.Images/Maps/Combat/GroundGreen2.png.meta new file mode 100644 index 000000000..2f2e13ad5 --- /dev/null +++ b/Assets/03.Images/Maps/Combat/GroundGreen2.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: fbb146e2be969a54e9c727ddb7f9e376 +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: 9 + spritePivot: {x: 0.49, 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/GroundRed2.png b/Assets/03.Images/Maps/Combat/GroundRed2.png new file mode 100644 index 000000000..df461dddb Binary files /dev/null and b/Assets/03.Images/Maps/Combat/GroundRed2.png differ diff --git a/Assets/03.Images/Maps/Combat/GroundRed2.png.meta b/Assets/03.Images/Maps/Combat/GroundRed2.png.meta new file mode 100644 index 000000000..f8031543e --- /dev/null +++ b/Assets/03.Images/Maps/Combat/GroundRed2.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: b6927a0b762f1fd4f8c09b527a12b12e +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: 9 + spritePivot: {x: 0.49, 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/Ui/Combat/HeartFull.png.meta b/Assets/03.Images/Ui/Combat/HeartFull.png.meta index 934d48ca1..e1907fa67 100644 --- a/Assets/03.Images/Ui/Combat/HeartFull.png.meta +++ b/Assets/03.Images/Ui/Combat/HeartFull.png.meta @@ -46,8 +46,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.12} spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -127,7 +127,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/03.Images/Ui/Combat/HeartHalf.png.meta b/Assets/03.Images/Ui/Combat/HeartHalf.png.meta index 3a01e7f0b..e91f033b6 100644 --- a/Assets/03.Images/Ui/Combat/HeartHalf.png.meta +++ b/Assets/03.Images/Ui/Combat/HeartHalf.png.meta @@ -46,8 +46,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.12} spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/Assets/04.Materials/SpriteTest.mat b/Assets/04.Materials/Maps/MapEntrance.mat similarity index 84% rename from Assets/04.Materials/SpriteTest.mat rename to Assets/04.Materials/Maps/MapEntrance.mat index d487ecad0..69cb0aede 100644 --- a/Assets/04.Materials/SpriteTest.mat +++ b/Assets/04.Materials/Maps/MapEntrance.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6618167929957125877 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -7,8 +20,8 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: SpriteTest - m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3} + m_Name: MapEntrance + m_Shader: {fileID: -6465566751694194690, guid: e554a7f1a3b4f9b40bb81cc2c27d2ef4, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -20,14 +33,10 @@ Material: stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS - m_LockedProperties: + m_LockedProperties: _DissolveScale m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BaseMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -53,21 +62,13 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 9be7ccef6923b9a4bb8517ca399f8875, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -80,6 +81,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SubTex: + m_Texture: {fileID: 2800000, guid: 6701bfb8e762cd54e96d8dc1a763d942, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -94,7 +99,6 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - PixelSnap: 0 - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 @@ -107,9 +111,12 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DissolveAmount: 2 + - _DissolveScale: 2 + - _DistortionAmount: 0.5 + - _DistortionScale: 5 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _EnableExternalAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -117,6 +124,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -129,23 +137,10 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 6.961862, g: 16.020674, b: 2.4324582, a: 0} + - _DissolveSpeed: {r: 0.1, g: -0.2, b: 0, a: 0} + - _DistortionSpeed: {r: -0.2, g: 0.1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!114 &5626841901917671979 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 9 diff --git a/Assets/04.Materials/SpriteTest.mat.meta b/Assets/04.Materials/Maps/MapEntrance.mat.meta similarity index 79% rename from Assets/04.Materials/SpriteTest.mat.meta rename to Assets/04.Materials/Maps/MapEntrance.mat.meta index 4e307b423..037385d22 100644 --- a/Assets/04.Materials/SpriteTest.mat.meta +++ b/Assets/04.Materials/Maps/MapEntrance.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d9661228028579246b04396b50448874 +guid: 61bcb80cd058c0b46820a9bdbd18bd7f NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/04.Materials/Test.mat b/Assets/04.Materials/Test.mat deleted file mode 100644 index d489bfd58..000000000 --- a/Assets/04.Materials/Test.mat +++ /dev/null @@ -1,142 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8726976126742831339 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 9 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Test - m_Shader: {fileID: -6465566751694194690, guid: 835dd53a78c02664c864a5a31c79c4c5, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2501 - stringTagMap: {} - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: d2d7eac4c6fe70241884aa288e039d1c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlphaClip: 1 - - _AlphaToMask: 1 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BlendOp: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 0 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossinessSource: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueControl: 1 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _SampleGI: 0 - - _Shininess: 0 - - _Smoothness: 0.5 - - _SmoothnessSource: 0 - - _SmoothnessTextureChannel: 0 - - _SpecSource: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 0 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/04.Materials/Test2.mat b/Assets/04.Materials/Test2.mat deleted file mode 100644 index 7fe4cf4fb..000000000 --- a/Assets/04.Materials/Test2.mat +++ /dev/null @@ -1,154 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8726976126742831339 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 9 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Test2 - m_Shader: {fileID: -6465566751694194690, guid: e7e53e9fe92507d4fb6c701e11403155, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: d2d7eac4c6fe70241884aa288e039d1c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FillMap: - m_Texture: {fileID: 2800000, guid: be3dc57a3e6cfff46a6f38321763456e, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IndicatorMap: - m_Texture: {fileID: 2800000, guid: ed7005bcdc79d774d866653ff8a0c6a0, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlphaClip: 1 - - _AlphaToMask: 1 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BlendOp: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 0 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _Fill: 0 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossinessSource: 0 - - _GlossyReflections: 0 - - _Intensity: 1 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Opacity: 1 - - _Parallax: 0.005 - - _QueueControl: 1 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _RotationSpeed: 10 - - _SampleGI: 0 - - _Shininess: 0 - - _Smoothness: 0.5 - - _SmoothnessSource: 0 - - _SmoothnessTextureChannel: 0 - - _SpecSource: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 0 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab index 7d19e2db3..125b17cbd 100644 --- a/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/BaseBoss.prefab @@ -261,9 +261,9 @@ Rigidbody: m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 - m_Interpolate: 0 + m_Interpolate: 1 m_Constraints: 112 - m_CollisionDetection: 0 + m_CollisionDetection: 2 --- !u!136 &4832858849328938018 CapsuleCollider: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab b/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab index c109fcbb7..125020a42 100644 --- a/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab @@ -77,7 +77,7 @@ GameObject: - component: {fileID: 7608738450534251423} m_Layer: 9 m_Name: CombatPlayer - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -343,6 +343,78 @@ MonoBehaviour: m_Calls: [] m_ActionId: 70079543-a5e9-4137-85af-1ad206da8794 m_ActionName: 'CombatTitle/MoveScene[/Keyboard/anyKey,/Mouse/leftButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 66824a18-0819-44a4-92c2-6395511e3d0d + m_ActionName: 'UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 93ed1c14-2900-4d30-91fb-a9f2353a9540 + m_ActionName: 'UI/Submit[/Keyboard/enter]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 3c7c74ba-0c86-4e21-ab91-2b1e674cf243 + m_ActionName: 'UI/Cancel[/Keyboard/escape]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 52083aa7-62f5-41d7-b37e-4db100ef2cda + m_ActionName: 'UI/Point[/Mouse/position]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 42e6067b-0d00-4787-92d8-ddf60510de83 + m_ActionName: 'UI/Click[/Mouse/leftButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 30ef3965-cc51-452e-8df9-6a3567a53f4d + m_ActionName: 'UI/ScrollWheel[/Mouse/scroll]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: b99f7e4b-30f0-4936-9e55-c383951d6f58 + m_ActionName: 'UI/MiddleClick[/Mouse/middleButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 4849bf4c-7b3b-43c4-8bbf-7178f536fb94 + m_ActionName: 'UI/RightClick[/Mouse/rightButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 49ed4722-bfe5-47b7-b724-008d9ca57edc + m_ActionName: UI/TrackedDevicePosition + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7f4f45c6-67b1-47bf-9a74-fea6f6b5fde1 + m_ActionName: UI/TrackedDeviceOrientation + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 522031830802304584} + m_TargetAssemblyTypeName: BlueWater.Players.Combat.CombatInput, Assembly-CSharp + m_MethodName: OnInteraction + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 2959a0ad-c73e-43b1-b98e-9917868b2a9a + m_ActionName: 'Combat/Interaction[/Keyboard/f]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 522031830802304584} + m_TargetAssemblyTypeName: BlueWater.Players.Combat.CombatInput, Assembly-CSharp + m_MethodName: OnOpenDevelopMenu + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: a5d9ffcb-5c4f-4c6d-8335-9060bbea120a + m_ActionName: 'Combat/OpenDevelopMenu[/Keyboard/f1]' m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: Combat @@ -387,6 +459,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _playerInput: {fileID: 6401154187219196241} + InteractionRadius: 2 + _interactionUiOffset: {x: 0, y: 1.5, z: 0} --- !u!114 &181082763061672982 MonoBehaviour: m_ObjectHideFlags: 0 @@ -529,7 +603,6 @@ MonoBehaviour: _maskLayer: serializedVersion: 2 m_Bits: 1024 - _material: {fileID: 2100000, guid: 1ad7e8b18587eb64b98d1c75db32dc5a, type: 2} --- !u!1 &7185106063436424164 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Items/FullHeartItem.prefab b/Assets/05.Prefabs/Items/FullHeartItem.prefab new file mode 100644 index 000000000..a6ee38b7f --- /dev/null +++ b/Assets/05.Prefabs/Items/FullHeartItem.prefab @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2777433600211998119 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_Name + value: FullHeartItem + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1370112280380943697, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + insertIndex: -1 + addedObject: {fileID: 8962896418303621511} + m_SourcePrefab: {fileID: 100100000, guid: 28a379482be867746aad889c0f1c3c79, type: 3} +--- !u!1 &62503137722364538 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8962896418303621511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 62503137722364538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31ee4bedfcf364843a6f2665bec1c762, type: 3} + m_Name: + m_EditorClassIdentifier: + Rigidbody: {fileID: 6274307350954836457} + Collider: {fileID: 2848843651262022415} + VisualLook: {fileID: 5201300381511609034} + SpriteRenderer: {fileID: 4737084216554679565} + Canvas: {fileID: 2788422010916109769} + k__BackingField: 1 + UseAutoDestroy: 1 + AutoDestroyTime: 30 + DrawGizmos: 1 + Radius: 5 + AcquisitionTime: 1 + AcquiredSfxName: GetItem + ItemData: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + _healingHealthPoint: 2 +--- !u!223 &2788422010916109769 stripped +Canvas: + m_CorrespondingSourceObject: {fileID: 16072863968012398, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!65 &2848843651262022415 stripped +BoxCollider: + m_CorrespondingSourceObject: {fileID: 72705275807094440, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!212 &4737084216554679565 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 7437393363680573610, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5201300381511609034 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7973014042992492397, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!54 &6274307350954836457 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 8185780986250253390, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Items/FullHeartItem.prefab.meta b/Assets/05.Prefabs/Items/FullHeartItem.prefab.meta new file mode 100644 index 000000000..e9bf952bd --- /dev/null +++ b/Assets/05.Prefabs/Items/FullHeartItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0dc7ed0facf2fca4b80244d0d95e2557 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Items/HalfHeartItem.prefab b/Assets/05.Prefabs/Items/HalfHeartItem.prefab new file mode 100644 index 000000000..aa16104cc --- /dev/null +++ b/Assets/05.Prefabs/Items/HalfHeartItem.prefab @@ -0,0 +1,132 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2777433600211998119 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_Name + value: HalfHeartItem + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7437393363680573610, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} + m_RemovedComponents: + - {fileID: 1370112280380943697, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + insertIndex: -1 + addedObject: {fileID: 8962896418303621511} + m_SourcePrefab: {fileID: 100100000, guid: 28a379482be867746aad889c0f1c3c79, type: 3} +--- !u!1 &62503137722364538 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8962896418303621511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 62503137722364538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31ee4bedfcf364843a6f2665bec1c762, type: 3} + m_Name: + m_EditorClassIdentifier: + Rigidbody: {fileID: 6274307350954836457} + Collider: {fileID: 2848843651262022415} + VisualLook: {fileID: 5201300381511609034} + SpriteRenderer: {fileID: 4737084216554679565} + Canvas: {fileID: 2788422010916109769} + k__BackingField: 1 + UseAutoDestroy: 1 + AutoDestroyTime: 30 + DrawGizmos: 1 + Radius: 5 + AcquisitionTime: 1 + AcquiredSfxName: GetItem + ItemData: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + _healingHealthPoint: 1 +--- !u!223 &2788422010916109769 stripped +Canvas: + m_CorrespondingSourceObject: {fileID: 16072863968012398, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!65 &2848843651262022415 stripped +BoxCollider: + m_CorrespondingSourceObject: {fileID: 72705275807094440, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!212 &4737084216554679565 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 7437393363680573610, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5201300381511609034 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7973014042992492397, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} +--- !u!54 &6274307350954836457 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 8185780986250253390, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + m_PrefabInstance: {fileID: 2777433600211998119} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Items/HalfHeartItem.prefab.meta b/Assets/05.Prefabs/Items/HalfHeartItem.prefab.meta new file mode 100644 index 000000000..9aab7f2c9 --- /dev/null +++ b/Assets/05.Prefabs/Items/HalfHeartItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 66d94bc59db241a4895f8e4fff7ea201 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Items/Item.prefab b/Assets/05.Prefabs/Items/Item.prefab new file mode 100644 index 000000000..ac10cb922 --- /dev/null +++ b/Assets/05.Prefabs/Items/Item.prefab @@ -0,0 +1,557 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &316318118309449416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 666340171847681576} + - component: {fileID: 16072863968012398} + - component: {fileID: 3466664881830510074} + - component: {fileID: 897534835685585813} + m_Layer: 13 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &666340171847681576 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316318118309449416} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01069167, y: 0.01069167, z: 0.01069167} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 482296371213806214} + m_Father: {fileID: 3930562537327335166} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 800, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &16072863968012398 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316318118309449416} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 1 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3466664881830510074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316318118309449416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &897534835685585813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316318118309449416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 65535 +--- !u!1 &1513751791682743921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7973014042992492397} + - component: {fileID: 7437393363680573610} + m_Layer: 13 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7973014042992492397 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1513751791682743921} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3930562537327335166} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7437393363680573610 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1513751791682743921} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2762223215237867485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3930562537327335166} + - component: {fileID: 8185780986250253390} + - component: {fileID: 72705275807094440} + - component: {fileID: 1370112280380943697} + m_Layer: 13 + m_Name: Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3930562537327335166 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2762223215237867485} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7973014042992492397} + - {fileID: 666340171847681576} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &8185780986250253390 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2762223215237867485} + serializedVersion: 4 + m_Mass: 10 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!65 &72705275807094440 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2762223215237867485} + 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: 0.25} + m_Center: {x: 0, y: 0.5, z: 0} +--- !u!114 &1370112280380943697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2762223215237867485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 619bc0c8098f9a841b08d6cf4d9c1e91, type: 3} + m_Name: + m_EditorClassIdentifier: + Rigidbody: {fileID: 8185780986250253390} + Collider: {fileID: 72705275807094440} + VisualLook: {fileID: 7973014042992492397} + SpriteRenderer: {fileID: 7437393363680573610} + Canvas: {fileID: 16072863968012398} + k__BackingField: 1 + UseAutoDestroy: 1 + AutoDestroyTime: 30 + DrawGizmos: 1 + Radius: 5 + AcquisitionTime: 1 + AcquiredSfxName: GetItem + ItemData: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} +--- !u!1 &2815016273565104219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 226077220011295018} + - component: {fileID: 448025115665681541} + - component: {fileID: 1697045944594333697} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &226077220011295018 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2815016273565104219} + 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: 6223355445657907225} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &448025115665681541 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2815016273565104219} + m_CullTransparentMesh: 1 +--- !u!114 &1697045944594333697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2815016273565104219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: F + 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: 34.5 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 200 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8111308071153146249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 482296371213806214} + m_Layer: 5 + m_Name: InteractionUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &482296371213806214 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8111308071153146249} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 6223355445657907225} + m_Father: {fileID: 666340171847681576} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 120} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8357987098767019228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6223355445657907225} + - component: {fileID: 453554727717358886} + - component: {fileID: 1713988739707689781} + m_Layer: 5 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6223355445657907225 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8357987098767019228} + 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: 226077220011295018} + m_Father: {fileID: 482296371213806214} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &453554727717358886 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8357987098767019228} + m_CullTransparentMesh: 1 +--- !u!114 &1713988739707689781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8357987098767019228} + 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.3647059, g: 0.35686275, b: 0.3647059, 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: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/05.Prefabs/Items/DropItemController.prefab.meta b/Assets/05.Prefabs/Items/Item.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Items/DropItemController.prefab.meta rename to Assets/05.Prefabs/Items/Item.prefab.meta diff --git a/Assets/05.Prefabs/Managers/ItemManager.prefab b/Assets/05.Prefabs/Managers/ItemManager.prefab index 522201482..52c6bcccc 100644 --- a/Assets/05.Prefabs/Managers/ItemManager.prefab +++ b/Assets/05.Prefabs/Managers/ItemManager.prefab @@ -45,6 +45,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 1 - _dropItemControllerPrefab: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3} - _itemDataSo: {fileID: 11400000, guid: ec425583030e16d4dacc21b64f467bd1, type: 2} + _defaultItemPrefab: {fileID: 1370112280380943697, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + _itemDataSo: {fileID: 11400000, guid: d7011c71193e95743aa868ca1bea6010, type: 2} _itemDropTableSo: {fileID: 11400000, guid: 9e1384a77106eb845ad86d6834ba9a52, type: 2} diff --git a/Assets/05.Prefabs/Maps/BossMapTrigger.prefab b/Assets/05.Prefabs/Maps/BossMapTrigger.prefab new file mode 100644 index 000000000..64f7a22c9 --- /dev/null +++ b/Assets/05.Prefabs/Maps/BossMapTrigger.prefab @@ -0,0 +1,215 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &873287429936955811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7257062567955675062} + - component: {fileID: 4862962219166162506} + - component: {fileID: 6589898666490457267} + - component: {fileID: 545895004707295019} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7257062567955675062 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 873287429936955811} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.001, z: -0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7348979974277454575} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &4862962219166162506 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 873287429936955811} + m_Mesh: {fileID: 0} +--- !u!23 &6589898666490457267 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 873287429936955811} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + 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: 74269c31af0586d4cbf4b2307813e475, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &545895004707295019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 873287429936955811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: fe0cd3a6556ca6942a36e1ea6c29c865, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: Idle + loop: 1 + timeScale: 1 +--- !u!1 &4070104005773255287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7348979974277454575} + - component: {fileID: 8901558942315672686} + - component: {fileID: 864693122161811869} + - component: {fileID: 9078754208177888251} + m_Layer: 8 + m_Name: BossMapTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7348979974277454575 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4070104005773255287} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 7257062567955675062} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8901558942315672686 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4070104005773255287} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0.5, z: 0} +--- !u!114 &864693122161811869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4070104005773255287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdff38e2580871c42b6f98a477e42335, type: 3} + m_Name: + m_EditorClassIdentifier: + _spineController: {fileID: 9078754208177888251} +--- !u!114 &9078754208177888251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4070104005773255287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: + _skeletonAnimation: {fileID: 545895004707295019} + _initialSkinName: default diff --git a/Assets/05.Prefabs/Maps/BossMapTrigger.prefab.meta b/Assets/05.Prefabs/Maps/BossMapTrigger.prefab.meta new file mode 100644 index 000000000..4b25b7a79 --- /dev/null +++ b/Assets/05.Prefabs/Maps/BossMapTrigger.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ecbffb138ac6f52458902a58b58ef697 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Maps/MapControllers.meta b/Assets/05.Prefabs/Maps/MapControllers.meta new file mode 100644 index 000000000..7f388f65b --- /dev/null +++ b/Assets/05.Prefabs/Maps/MapControllers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef57aee6cc4326e4b9deb9ea70ca4c3e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Maps/FirstTutorialMapController.prefab b/Assets/05.Prefabs/Maps/MapControllers/FirstTutorialMapController.prefab similarity index 73% rename from Assets/05.Prefabs/Maps/FirstTutorialMapController.prefab rename to Assets/05.Prefabs/Maps/MapControllers/FirstTutorialMapController.prefab index 7349077ae..4d10e76d7 100644 --- a/Assets/05.Prefabs/Maps/FirstTutorialMapController.prefab +++ b/Assets/05.Prefabs/Maps/MapControllers/FirstTutorialMapController.prefab @@ -10,31 +10,7 @@ PrefabInstance: m_Modifications: - 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 + value: 200 objectReference: {fileID: 0} - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/05.Prefabs/Maps/FirstTutorialMapController.prefab.meta b/Assets/05.Prefabs/Maps/MapControllers/FirstTutorialMapController.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Maps/FirstTutorialMapController.prefab.meta rename to Assets/05.Prefabs/Maps/MapControllers/FirstTutorialMapController.prefab.meta diff --git a/Assets/05.Prefabs/Maps/MapController.prefab b/Assets/05.Prefabs/Maps/MapControllers/MapController.prefab similarity index 91% rename from Assets/05.Prefabs/Maps/MapController.prefab rename to Assets/05.Prefabs/Maps/MapControllers/MapController.prefab index c5a3e0738..b440553f8 100644 --- a/Assets/05.Prefabs/Maps/MapController.prefab +++ b/Assets/05.Prefabs/Maps/MapControllers/MapController.prefab @@ -481,7 +481,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5684081474487815918} m_Father: {fileID: 665791185885374265} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3228264040967496712 @@ -548,6 +549,37 @@ Transform: m_Children: [] m_Father: {fileID: 7580754897896246193} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4768462283633482403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 616072524783204347} + m_Layer: 0 + m_Name: MapPortals + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &616072524783204347 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4768462283633482403} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7580754897896246193} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4942791758257518844 GameObject: m_ObjectHideFlags: 0 @@ -1112,10 +1144,43 @@ Transform: - {fileID: 7798505859049167048} - {fileID: 3528589141546779327} - {fileID: 4700527603807157220} + - {fileID: 8536453960896907503} + - {fileID: 616072524783204347} - {fileID: 7778690860228022480} - {fileID: 5292453453235858255} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7710462685797103205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8536453960896907503} + m_Layer: 0 + m_Name: MapEntrances + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8536453960896907503 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7710462685797103205} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7580754897896246193} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9198442223207540368 GameObject: m_ObjectHideFlags: 0 @@ -1224,3 +1289,41 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &3106704901392946177 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4291237925026304783} + m_Modifications: + - target: {fileID: 4070104005773255287, guid: ecbffb138ac6f52458902a58b58ef697, type: 3} + propertyPath: m_Name + value: BossMapTrigger + objectReference: {fileID: 0} + - target: {fileID: 4862962219166162506, guid: ecbffb138ac6f52458902a58b58ef697, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 7348979974277454575, guid: ecbffb138ac6f52458902a58b58ef697, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7348979974277454575, guid: ecbffb138ac6f52458902a58b58ef697, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7348979974277454575, guid: ecbffb138ac6f52458902a58b58ef697, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ecbffb138ac6f52458902a58b58ef697, type: 3} +--- !u!4 &5684081474487815918 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7348979974277454575, guid: ecbffb138ac6f52458902a58b58ef697, type: 3} + m_PrefabInstance: {fileID: 3106704901392946177} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Maps/MapController.prefab.meta b/Assets/05.Prefabs/Maps/MapControllers/MapController.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Maps/MapController.prefab.meta rename to Assets/05.Prefabs/Maps/MapControllers/MapController.prefab.meta diff --git a/Assets/05.Prefabs/Maps/RhinocerosMapController.prefab b/Assets/05.Prefabs/Maps/MapControllers/RhinocerosMapController.prefab similarity index 82% rename from Assets/05.Prefabs/Maps/RhinocerosMapController.prefab rename to Assets/05.Prefabs/Maps/MapControllers/RhinocerosMapController.prefab index ca9124529..96251ef37 100644 --- a/Assets/05.Prefabs/Maps/RhinocerosMapController.prefab +++ b/Assets/05.Prefabs/Maps/MapControllers/RhinocerosMapController.prefab @@ -38,6 +38,114 @@ Transform: - {fileID: 8939069746064190633} m_Father: {fileID: 5773079417302806422} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &762329734702350285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7031697504821928453} + - component: {fileID: 3378762419273747522} + - component: {fileID: 1784979961450411398} + - component: {fileID: 7320053958320553190} + 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 &7031697504821928453 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762329734702350285} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7, y: 0, z: 4.8} + m_LocalScale: {x: 4, y: 5, z: 8} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6393101942211125861} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3378762419273747522 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762329734702350285} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1784979961450411398 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762329734702350285} + 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 &7320053958320553190 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762329734702350285} + 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 &1229390299005479172 GameObject: m_ObjectHideFlags: 0 @@ -124,6 +232,114 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2316757167252076553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5109253569689304471} + - component: {fileID: 3330439313134263062} + - component: {fileID: 1619473354459596722} + - component: {fileID: 1249731278989149037} + 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 &5109253569689304471 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2316757167252076553} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 7.51} + m_LocalScale: {x: 8, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6393101942211125861} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3330439313134263062 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2316757167252076553} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1619473354459596722 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2316757167252076553} + 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 &1249731278989149037 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2316757167252076553} + 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 &4257248159447409164 GameObject: m_ObjectHideFlags: 0 @@ -384,6 +600,222 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6012366649014345639 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7121816917502641890} + - component: {fileID: 3531598134543334058} + - component: {fileID: 453745292523793165} + - component: {fileID: 2614733459967192691} + 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 &7121816917502641890 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6012366649014345639} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.33, y: 0, z: 0} + m_LocalScale: {x: 4, y: 5, z: 8} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6393101942211125861} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3531598134543334058 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6012366649014345639} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &453745292523793165 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6012366649014345639} + 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 &2614733459967192691 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6012366649014345639} + 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 &6075823282232596785 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4438120685554126002} + - component: {fileID: 937960653394743998} + - component: {fileID: 2416972824160609957} + - component: {fileID: 8685024612914822290} + 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 &4438120685554126002 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6075823282232596785} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5, y: 0, z: 6.25} + m_LocalScale: {x: 8, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6393101942211125861} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &937960653394743998 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6075823282232596785} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2416972824160609957 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6075823282232596785} + 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 &8685024612914822290 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6075823282232596785} + 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 &6816363493920125926 GameObject: m_ObjectHideFlags: 0 @@ -834,6 +1266,83 @@ Transform: m_CorrespondingSourceObject: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3} m_PrefabInstance: {fileID: 1595018328850717514} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1701608886674246878 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2153847254135338102} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_Name + value: MapEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalScale.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.x + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.2 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} +--- !u!114 &6690762032223832123 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5424314009316918501, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 1701608886674246878} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b1ebaf29bf6b49478d58541a2343fa5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &7076674752345370300 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 1701608886674246878} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1901918544213915883 PrefabInstance: m_ObjectHideFlags: 0 @@ -912,6 +1421,145 @@ Transform: m_CorrespondingSourceObject: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3} m_PrefabInstance: {fileID: 1901918544213915883} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1981187877037987894 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2153847254135338102} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_Name + value: MapEntrance + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalScale.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.42 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.z + value: 10.25 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} +--- !u!114 &5780826671245057235 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5424314009316918501, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 1981187877037987894} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b1ebaf29bf6b49478d58541a2343fa5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &7986753049839303252 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 1981187877037987894} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2054275962752976232 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7142473433342266210} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_Name + value: MapPortal (1) + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.x + value: -14.85 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 798202f522c348649add7379a99abad4, type: 3} +--- !u!4 &7577996245576935178 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + m_PrefabInstance: {fileID: 2054275962752976232} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2866362335333989455 PrefabInstance: m_ObjectHideFlags: 0 @@ -1438,6 +2086,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: 1759992658637499492, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3} propertyPath: m_LocalScale.x value: 12.46 @@ -1746,6 +2398,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3} m_PrefabInstance: {fileID: 4109673611001317888} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4283926218761311746 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7142473433342266210} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_Name + value: MapPortal + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.55 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.z + value: 12.7 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 798202f522c348649add7379a99abad4, type: 3} +--- !u!4 &5682313781508093024 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + m_PrefabInstance: {fileID: 4283926218761311746} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4668997499401686712 PrefabInstance: m_ObjectHideFlags: 0 @@ -2046,6 +2760,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1969924119275959711} m_Modifications: + - target: {fileID: 746926837324079264, guid: 4894430045828234fa523041eb483b69, type: 3} + propertyPath: k__BackingField + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: 4894430045828234fa523041eb483b69, type: 3} propertyPath: m_LocalScale.x value: 11 @@ -2532,6 +3250,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: 7.3 @@ -2802,6 +3524,10 @@ PrefabInstance: propertyPath: m_Name value: FallBush01 (7) objectReference: {fileID: 0} + - target: {fileID: 7050571487355227770, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3} + propertyPath: m_LocalPosition.y + value: 0.369 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2820,37 +3546,85 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2614076963411596655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalScale.z + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 2614076963411596655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.z + value: -4.9 + objectReference: {fileID: 0} + - target: {fileID: 2688871614312994883, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3586112574380059702, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalScale.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3586112574380059702, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.x + value: -4.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.x + value: 21.25 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalScale.y + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.w + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 270 + objectReference: {fileID: 0} + - target: {fileID: 5958988907676655751, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Size.x + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 5958988907676655751, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Size.y + value: 1.3 + objectReference: {fileID: 0} - target: {fileID: 7396433262681865224, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: fc79bc919897a1048976a13f1814e2cb, type: 3} + objectReference: {fileID: 21300000, guid: b6927a0b762f1fd4f8c09b527a12b12e, type: 3} + - target: {fileID: 7521448959059331659, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - 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 + value: 200 objectReference: {fileID: 0} - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2871,6 +3645,18 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 1 + addedObject: {fileID: 7031697504821928453} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 2 + addedObject: {fileID: 7121816917502641890} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 4 + addedObject: {fileID: 4438120685554126002} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 5 + addedObject: {fileID: 5109253569689304471} - targetCorrespondingSourceObject: {fileID: 4291237925026304783, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 7557375837466550001} @@ -2892,6 +3678,18 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 209590181697093112} + - targetCorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 7986753049839303252} + - targetCorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 7076674752345370300} + - targetCorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 5682313781508093024} + - targetCorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 7577996245576935178} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7702874292798655589, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 @@ -2919,13 +3717,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45ca5fc4b0d9415ca599aa7cd17f3370, type: 3} m_Name: m_EditorClassIdentifier: - PlayerSpawnTransform: {fileID: 2849157954692818502} - EnemyInstantiateLocation: {fileID: 27273469593611337} - k__BackingField: {fileID: 2513291633537767382} + PlayerSpawnLocation: {fileID: 2849157954692818502} + k__BackingField: {fileID: 27273469593611337} + k__BackingField: {fileID: 2513291633537767382} + MapEntranceLocations: {fileID: 2153847254135338102} + MapEntrances: + - {fileID: 5780826671245057235} + - {fileID: 6690762032223832123} SaveStage: 4 - BGMName: Stage2 + BgmName: Stage2 + InitializeFadeInOutTime: {x: 0.2, y: 1} + ClearFadeInOutTime: {x: 0.2, y: 0.3} BossSpawnTransform: {fileID: 1204009204749076978} BossType: 2 + BossMapTrigger: {fileID: 5516532932220750085} --- !u!4 &552333954124801105 stripped Transform: m_CorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} @@ -2936,6 +3741,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 8874040642671342955, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} m_PrefabInstance: {fileID: 7751701066597760153} m_PrefabAsset: {fileID: 0} +--- !u!4 &2153847254135338102 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 7751701066597760153} + m_PrefabAsset: {fileID: 0} --- !u!4 &2513291633537767382 stripped Transform: m_CorrespondingSourceObject: {fileID: 5292453453235858255, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} @@ -2946,11 +3756,32 @@ Transform: m_CorrespondingSourceObject: {fileID: 5483604360458066655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} m_PrefabInstance: {fileID: 7751701066597760153} m_PrefabAsset: {fileID: 0} +--- !u!114 &5516532932220750085 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2818473219870193052, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 7751701066597760153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdff38e2580871c42b6f98a477e42335, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &5773079417302806422 stripped Transform: m_CorrespondingSourceObject: {fileID: 4291237925026304783, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} m_PrefabInstance: {fileID: 7751701066597760153} m_PrefabAsset: {fileID: 0} +--- !u!4 &6393101942211125861 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 7751701066597760153} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7142473433342266210 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 7751701066597760153} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7768925629722026934 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Maps/RhinocerosMapController.prefab.meta b/Assets/05.Prefabs/Maps/MapControllers/RhinocerosMapController.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Maps/RhinocerosMapController.prefab.meta rename to Assets/05.Prefabs/Maps/MapControllers/RhinocerosMapController.prefab.meta diff --git a/Assets/05.Prefabs/Maps/SandMoleMapController.prefab b/Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab similarity index 53% rename from Assets/05.Prefabs/Maps/SandMoleMapController.prefab rename to Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab index 39975cd18..7d57dadf9 100644 --- a/Assets/05.Prefabs/Maps/SandMoleMapController.prefab +++ b/Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab @@ -311,6 +311,114 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1760715683021774751 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5467576439725994877} + - component: {fileID: 5956220603318830841} + - component: {fileID: 2224340551834110735} + - component: {fileID: 8383108166877643083} + m_Layer: 7 + m_Name: Wall (8) + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5467576439725994877 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1760715683021774751} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.65, y: 0, z: -7} + m_LocalScale: {x: 8, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5956220603318830841 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1760715683021774751} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2224340551834110735 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1760715683021774751} + 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 &8383108166877643083 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1760715683021774751} + 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 &2563095547787055824 GameObject: m_ObjectHideFlags: 0 @@ -450,6 +558,114 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4927020328815886220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6808103865080557536} + - component: {fileID: 4532412719844494229} + - component: {fileID: 6504471468362816209} + - component: {fileID: 1688085060042845872} + m_Layer: 7 + m_Name: Wall (9) + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6808103865080557536 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927020328815886220} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -8.2} + m_LocalScale: {x: 8, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4532412719844494229 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927020328815886220} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6504471468362816209 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927020328815886220} + 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 &1688085060042845872 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927020328815886220} + 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 @@ -558,6 +774,114 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7049278992516918060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7980065968173810144} + - component: {fileID: 339313247665189224} + - component: {fileID: 4832383091149187922} + - component: {fileID: 5858055743687062617} + m_Layer: 7 + m_Name: Wall (10) + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7980065968173810144 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7049278992516918060} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.8, y: 0, z: 4.8} + m_LocalScale: {x: 4, y: 5, z: 8} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &339313247665189224 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7049278992516918060} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4832383091149187922 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7049278992516918060} + 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 &5858055743687062617 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7049278992516918060} + 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 &7225845442489806937 GameObject: m_ObjectHideFlags: 0 @@ -741,6 +1065,114 @@ Transform: - {fileID: 6657138680337087356} m_Father: {fileID: 6960399737772514917} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7687132103722071672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6033259031597972912} + - component: {fileID: 3677994094677427467} + - component: {fileID: 7748781785925775046} + - component: {fileID: 2707051628513835897} + m_Layer: 7 + m_Name: Wall (11) + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6033259031597972912 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7687132103722071672} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.336, y: 0, z: 0} + m_LocalScale: {x: 4, y: 5, z: 8} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3677994094677427467 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7687132103722071672} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7748781785925775046 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7687132103722071672} + 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 &2707051628513835897 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7687132103722071672} + 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 &7883838996347282313 GameObject: m_ObjectHideFlags: 0 @@ -880,6 +1312,83 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &132332318437660084 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6328821892107758958} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_Name + value: MapEntrance + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalScale.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.44 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.z + value: -12.35 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} +--- !u!114 &5373123456437408081 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5424314009316918501, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 132332318437660084} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b1ebaf29bf6b49478d58541a2343fa5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &8394166543195273174 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 132332318437660084} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2424043105665738113 PrefabInstance: m_ObjectHideFlags: 0 @@ -888,6 +1397,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2614076963411596655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalScale.z + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 2614076963411596655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.x + value: -6.8 + objectReference: {fileID: 0} + - target: {fileID: 2614076963411596655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.z + value: -4.8 + objectReference: {fileID: 0} - target: {fileID: 2688871614312994883, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_Enabled value: 0 @@ -908,10 +1429,50 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 5194988466372041496, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalScale.y value: 25 objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.w + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalRotation.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 270 + objectReference: {fileID: 0} + - target: {fileID: 5958988907676655751, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Size.x + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 5958988907676655751, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Size.y + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 6511453854817970958, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalScale.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6511453854817970958, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6511453854817970958, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalPosition.z value: -7 @@ -919,34 +1480,18 @@ PrefabInstance: - 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: 21300000, guid: 3dc6e21aa8674b7439c33b913a15a7ff, type: 3} + - target: {fileID: 7521448959059331659, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Mesh + value: objectReference: {fileID: 0} - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} - propertyPath: m_LocalPosition.y - value: 0 + propertyPath: m_LocalPosition.x + value: 200 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 + value: 200 objectReference: {fileID: 0} - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -971,6 +1516,18 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 1 + addedObject: {fileID: 7980065968173810144} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 2 + addedObject: {fileID: 6033259031597972912} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 5467576439725994877} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 6808103865080557536} - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 9110149285681616722} @@ -998,16 +1555,44 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4700527603807157220, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 8991664057069348477} + - targetCorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 8394166543195273174} + - targetCorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 2011948303591882848} + - targetCorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1405513706330517591} + - targetCorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 4402092296501028718} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7702874292798655589, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 4232848145969149048} m_SourcePrefab: {fileID: 100100000, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} +--- !u!114 &486059084208967709 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2818473219870193052, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdff38e2580871c42b6f98a477e42335, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &1335494345527737213 stripped Transform: m_CorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} m_PrefabInstance: {fileID: 2424043105665738113} m_PrefabAsset: {fileID: 0} +--- !u!4 &2967684064714445434 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 616072524783204347, 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} @@ -1030,13 +1615,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb656087fe6c652469b29504a37df539, type: 3} m_Name: m_EditorClassIdentifier: - PlayerSpawnTransform: {fileID: 7906706039042621278} - EnemyInstantiateLocation: {fileID: 5354947371749406033} - k__BackingField: {fileID: 7552954649617714894} + PlayerSpawnLocation: {fileID: 7906706039042621278} + k__BackingField: {fileID: 5354947371749406033} + k__BackingField: {fileID: 7552954649617714894} + MapEntranceLocations: {fileID: 6328821892107758958} + MapEntrances: + - {fileID: 5373123456437408081} + - {fileID: 2667497661582632679} SaveStage: 5 - BGMName: + BgmName: + InitializeFadeInOutTime: {x: 0.2, y: 1} + ClearFadeInOutTime: {x: 0.2, y: 0.3} BossSpawnTransform: {fileID: 6522622582430961898} BossType: 3 + BossMapTrigger: {fileID: 486059084208967709} k__BackingField: {fileID: 4946803535834257734} MiniSandMoleSpawnTransforms: - {fileID: 2981470058859736985} @@ -1048,6 +1640,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} m_PrefabInstance: {fileID: 2424043105665738113} m_PrefabAsset: {fileID: 0} +--- !u!4 &6328821892107758958 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8536453960896907503, 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} @@ -1068,3 +1665,204 @@ Transform: m_CorrespondingSourceObject: {fileID: 5483604360458066655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} m_PrefabInstance: {fileID: 2424043105665738113} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5242029347387589900 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2967684064714445434} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_Name + value: MapPortal (1) + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.x + value: -14.87 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 270 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 798202f522c348649add7379a99abad4, type: 3} +--- !u!4 &4402092296501028718 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + m_PrefabInstance: {fileID: 5242029347387589900} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7361504337758868021 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2967684064714445434} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_Name + value: MapPortal + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.z + value: -14.54 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 798202f522c348649add7379a99abad4, type: 3} +--- !u!4 &1405513706330517591 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + m_PrefabInstance: {fileID: 7361504337758868021} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7945425234005582338 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6328821892107758958} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_Name + value: MapEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalScale.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.x + value: -11.85 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.05 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 270 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} +--- !u!4 &2011948303591882848 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 7945425234005582338} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2667497661582632679 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5424314009316918501, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 7945425234005582338} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b1ebaf29bf6b49478d58541a2343fa5, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Maps/SandMoleMapController.prefab.meta b/Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Maps/SandMoleMapController.prefab.meta rename to Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab.meta diff --git a/Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab b/Assets/05.Prefabs/Maps/MapControllers/TitanSlimeMapController.prefab similarity index 93% rename from Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab rename to Assets/05.Prefabs/Maps/MapControllers/TitanSlimeMapController.prefab index 74dee4b66..175b917d1 100644 --- a/Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab +++ b/Assets/05.Prefabs/Maps/MapControllers/TitanSlimeMapController.prefab @@ -126,7 +126,6 @@ Transform: - {fileID: 6793147521412412275} - {fileID: 3207376932302006485} - {fileID: 1490978243574806496} - - {fileID: 3492477702596359327} - {fileID: 8958512497786607934} - {fileID: 8603909124098447364} - {fileID: 5997767972893869268} @@ -389,6 +388,114 @@ Transform: - {fileID: 4756553323673393326} m_Father: {fileID: 1886555746222503566} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3389752583977293500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 74864033025160754} + - component: {fileID: 543168805582100317} + - component: {fileID: 6039317122998190529} + - component: {fileID: 3474271104405721037} + 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 &74864033025160754 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3389752583977293500} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5, y: 0, z: 6} + m_LocalScale: {x: 8, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &543168805582100317 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3389752583977293500} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6039317122998190529 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3389752583977293500} + 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 &3474271104405721037 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3389752583977293500} + 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 &3970957049747289597 GameObject: m_ObjectHideFlags: 0 @@ -441,6 +548,114 @@ Transform: - {fileID: 3005850409763579834} m_Father: {fileID: 1886555746222503566} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4978820410574331929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5260826166886908783} + - component: {fileID: 1285299950414350581} + - component: {fileID: 7363654487868442540} + - component: {fileID: 3279190817185456649} + 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 &5260826166886908783 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4978820410574331929} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7, y: 0, z: 4} + m_LocalScale: {x: 4, y: 5, z: 7} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1285299950414350581 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4978820410574331929} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7363654487868442540 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4978820410574331929} + 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 &3279190817185456649 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4978820410574331929} + 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 @@ -527,6 +742,222 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7740764229238772796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4760012316425252193} + - component: {fileID: 7034794537483621984} + - component: {fileID: 1694865172139917456} + - component: {fileID: 771209834459367074} + 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 &4760012316425252193 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7740764229238772796} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 7.32} + m_LocalScale: {x: 4, y: 5, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7034794537483621984 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7740764229238772796} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1694865172139917456 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7740764229238772796} + 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 &771209834459367074 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7740764229238772796} + 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 &9008763449328480997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3499223873025712686} + - component: {fileID: 8422374143342507211} + - component: {fileID: 3383089662189478717} + - component: {fileID: 8131282520456812450} + 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 &3499223873025712686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9008763449328480997} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7, y: 0, z: -4.4} + m_LocalScale: {x: 4, y: 5, z: 7} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1335494345527737213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8422374143342507211 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9008763449328480997} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3383089662189478717 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9008763449328480997} + 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 &8131282520456812450 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9008763449328480997} + 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 &59778326231251575 PrefabInstance: m_ObjectHideFlags: 0 @@ -1665,7 +2096,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3} propertyPath: m_LocalPosition.x - value: 1.81 + value: 0.22 objectReference: {fileID: 0} - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3} propertyPath: m_LocalPosition.y @@ -1673,7 +2104,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3} propertyPath: m_LocalPosition.z - value: 11.25 + value: 14.74 objectReference: {fileID: 0} - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3} propertyPath: m_LocalRotation.w @@ -1787,6 +2218,71 @@ Transform: m_CorrespondingSourceObject: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3} m_PrefabInstance: {fileID: 1646726598727614556} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1678647787700164013 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6328821892107758958} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_Name + value: MapEntrance (1) + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalScale.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.x + value: 12.26 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.33 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} +--- !u!114 &6632898035063951688 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5424314009316918501, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 1678647787700164013} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b1ebaf29bf6b49478d58541a2343fa5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &7125806428023273423 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 1678647787700164013} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1733262567986341189 PrefabInstance: m_ObjectHideFlags: 0 @@ -2775,34 +3271,62 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + - target: {fileID: 626585320665436581, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 626585320665436581, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 8.5 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} + - target: {fileID: 626585320665436581, 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 + - target: {fileID: 2688871614312994883, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} - propertyPath: m_LocalRotation.y + - target: {fileID: 3586112574380059702, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalScale.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3586112574380059702, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 3586112574380059702, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.z + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4835769001966080896, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} - propertyPath: m_LocalRotation.z + - 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: 5958988907676655751, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Size.x + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 5958988907676655751, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Size.y + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 7396433262681865224, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: fbb146e2be969a54e9c727ddb7f9e376, type: 3} + - target: {fileID: 7521448959059331659, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -2826,6 +3350,18 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 2 + addedObject: {fileID: 74864033025160754} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 3 + addedObject: {fileID: 4760012316425252193} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 5 + addedObject: {fileID: 5260826166886908783} + - targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: 6 + addedObject: {fileID: 3499223873025712686} - targetCorrespondingSourceObject: {fileID: 4291237925026304783, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 7604816022990125953} @@ -2850,16 +3386,49 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 9203013126190605548} + - targetCorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 4483216113731692748} + - targetCorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 7125806428023273423} + - targetCorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 2586749109761478614} + - targetCorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 6781333776230562706} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7702874292798655589, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 7629976349863100293} m_SourcePrefab: {fileID: 100100000, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} +--- !u!114 &486059084208967709 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2818473219870193052, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdff38e2580871c42b6f98a477e42335, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1335494345527737213 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + m_PrefabInstance: {fileID: 2424043105665738113} + m_PrefabAsset: {fileID: 0} --- !u!4 &1886555746222503566 stripped Transform: m_CorrespondingSourceObject: {fileID: 4291237925026304783, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} m_PrefabInstance: {fileID: 2424043105665738113} m_PrefabAsset: {fileID: 0} +--- !u!4 &2967684064714445434 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 616072524783204347, 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} @@ -2882,18 +3451,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6aff73d268584edba076603861b2ea73, type: 3} m_Name: m_EditorClassIdentifier: - PlayerSpawnTransform: {fileID: 7906706039042621278} - EnemyInstantiateLocation: {fileID: 5354947371749406033} - k__BackingField: {fileID: 7552954649617714894} + PlayerSpawnLocation: {fileID: 7906706039042621278} + k__BackingField: {fileID: 5354947371749406033} + k__BackingField: {fileID: 7552954649617714894} + MapEntranceLocations: {fileID: 6328821892107758958} + MapEntrances: + - {fileID: 60991982810615371} + - {fileID: 6632898035063951688} SaveStage: 3 - BGMName: Stage1 + BgmName: Stage1 + InitializeFadeInOutTime: {x: 0.2, y: 1} + ClearFadeInOutTime: {x: 0.2, y: 0.3} BossSpawnTransform: {fileID: 6522622582430961898} BossType: 1 + BossMapTrigger: {fileID: 486059084208967709} --- !u!4 &5591840841030008137 stripped Transform: m_CorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} m_PrefabInstance: {fileID: 2424043105665738113} m_PrefabAsset: {fileID: 0} +--- !u!4 &6328821892107758958 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8536453960896907503, 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} @@ -3193,67 +3774,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 1012316818468953382, guid: f8cb4efe6ab794f4589d73b6409c0805, type: 3} m_PrefabInstance: {fileID: 2829480821290084037} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2890037764833171707 +--- !u!1001 &3149161101104257520 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7604816022990125953} + m_TransformParent: {fileID: 2967684064714445434} m_Modifications: - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 3695289696544250322, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_Name + value: MapPortal (1) + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalPosition.x - value: 16.7 + value: 15.25 objectReference: {fileID: 0} - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalPosition.y - value: -3.34 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalPosition.z - value: -1.33 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 90 objectReference: {fileID: 0} - - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3281663413899102263, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} - propertyPath: m_Name - value: Bush02 (27) - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} ---- !u!4 &3492477702596359327 stripped + m_SourcePrefab: {fileID: 100100000, guid: 798202f522c348649add7379a99abad4, type: 3} +--- !u!4 &6781333776230562706 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} - m_PrefabInstance: {fileID: 2890037764833171707} + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + m_PrefabInstance: {fileID: 3149161101104257520} m_PrefabAsset: {fileID: 0} --- !u!1001 &3197874926552429366 PrefabInstance: @@ -5657,6 +6238,55 @@ Transform: m_CorrespondingSourceObject: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} m_PrefabInstance: {fileID: 5445778169910207642} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5449257936156117678 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6328821892107758958} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_Name + value: MapEntrance + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} +--- !u!114 &60991982810615371 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5424314009316918501, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 5449257936156117678} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b1ebaf29bf6b49478d58541a2343fa5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &4483216113731692748 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3} + m_PrefabInstance: {fileID: 5449257936156117678} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5501725663000552541 PrefabInstance: m_ObjectHideFlags: 0 @@ -6279,6 +6909,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} m_PrefabInstance: {fileID: 6133151332394386602} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6218847567317085620 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2967684064714445434} + m_Modifications: + - target: {fileID: 3695289696544250322, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_Name + value: MapPortal + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalPosition.z + value: 12.25 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 798202f522c348649add7379a99abad4, type: 3} +--- !u!4 &2586749109761478614 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} + m_PrefabInstance: {fileID: 6218847567317085620} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6310084551861217086 PrefabInstance: m_ObjectHideFlags: 0 @@ -6955,7 +7647,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3} propertyPath: m_LocalPosition.z - value: -1.96 + value: 2.93 objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3} propertyPath: m_LocalRotation.w @@ -8081,6 +8773,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7699592165048296756} m_Modifications: + - target: {fileID: 746926837324079264, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3} + propertyPath: k__BackingField + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3} propertyPath: m_LocalScale.y value: 25.28 @@ -8231,7 +8927,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: 4894430045828234fa523041eb483b69, type: 3} propertyPath: m_LocalPosition.x - value: 1.73 + value: 4.28 objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: 4894430045828234fa523041eb483b69, type: 3} propertyPath: m_LocalPosition.y @@ -8239,7 +8935,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: 4894430045828234fa523041eb483b69, type: 3} propertyPath: m_LocalPosition.z - value: 11.59 + value: 13.26 objectReference: {fileID: 0} - target: {fileID: 1759992658637499492, guid: 4894430045828234fa523041eb483b69, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab.meta b/Assets/05.Prefabs/Maps/MapControllers/TitanSlimeMapController.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab.meta rename to Assets/05.Prefabs/Maps/MapControllers/TitanSlimeMapController.prefab.meta diff --git a/Assets/05.Prefabs/Items/DropItemController.prefab b/Assets/05.Prefabs/Maps/MapEntrance.prefab similarity index 65% rename from Assets/05.Prefabs/Items/DropItemController.prefab rename to Assets/05.Prefabs/Maps/MapEntrance.prefab index b7c34ff9c..623a038f9 100644 --- a/Assets/05.Prefabs/Items/DropItemController.prefab +++ b/Assets/05.Prefabs/Maps/MapEntrance.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1513751791682743921 +--- !u!1 &3695289696544250322 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,37 +8,106 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7973014042992492397} - - component: {fileID: 7437393363680573610} - m_Layer: 13 + - component: {fileID: 8478081780112990818} + - component: {fileID: 2419274615299264600} + - component: {fileID: 5424314009316918501} + m_Layer: 7 + m_Name: MapEntrance + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8478081780112990818 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3695289696544250322} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 3, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5482602209483235043} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2419274615299264600 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3695289696544250322} + 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: 2} + m_Center: {x: 0, y: 0.5, z: 1} +--- !u!114 &5424314009316918501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3695289696544250322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b1ebaf29bf6b49478d58541a2343fa5, type: 3} + m_Name: + m_EditorClassIdentifier: + _collider: {fileID: 2419274615299264600} + _spriteRenderer: {fileID: 397618381594304295} +--- !u!1 &8036650266970889974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5482602209483235043} + - component: {fileID: 397618381594304295} + m_Layer: 0 m_Name: VisualLook m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7973014042992492397 +--- !u!4 &5482602209483235043 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1513751791682743921} + m_GameObject: {fileID: 8036650266970889974} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.25, z: 0} + m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3930562537327335166} + m_Father: {fileID: 8478081780112990818} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7437393363680573610 +--- !u!212 &397618381594304295 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1513751791682743921} + m_GameObject: {fileID: 8036650266970889974} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -55,7 +124,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 61bcb80cd058c0b46820a9bdbd18bd7f, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -76,96 +145,14 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 81a3fcda055a247fbbc1f7fbd9d33582, type: 3} + m_Sprite: {fileID: 21300000, guid: 9be7ccef6923b9a4bb8517ca399f8875, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.64, y: 0.64} + m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2762223215237867485 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3930562537327335166} - - component: {fileID: 8185780986250253390} - - component: {fileID: 72705275807094440} - m_Layer: 13 - m_Name: DropItemController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3930562537327335166 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2762223215237867485} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7973014042992492397} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &8185780986250253390 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2762223215237867485} - serializedVersion: 4 - m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!65 &72705275807094440 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2762223215237867485} - 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: 0.5, y: 0.5, z: 0.25} - m_Center: {x: 0, y: 0.25, z: 0} diff --git a/Assets/05.Prefabs/Maps/MapEntrance.prefab.meta b/Assets/05.Prefabs/Maps/MapEntrance.prefab.meta new file mode 100644 index 000000000..af2c9210b --- /dev/null +++ b/Assets/05.Prefabs/Maps/MapEntrance.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7b8975b59db16444ab90718ccdbafd1f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Maps/MapPortal.prefab b/Assets/05.Prefabs/Maps/MapPortal.prefab new file mode 100644 index 000000000..99996161c --- /dev/null +++ b/Assets/05.Prefabs/Maps/MapPortal.prefab @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3695289696544250322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8478081780112990818} + - component: {fileID: 2419274615299264600} + - component: {fileID: 3832570790678334632} + m_Layer: 8 + m_Name: MapPortal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8478081780112990818 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3695289696544250322} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 3, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3857054957979330177} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2419274615299264600 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3695289696544250322} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0.5, z: 0.5} +--- !u!114 &3832570790678334632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3695289696544250322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ade4573044ba9d54faa47184fd8a718b, type: 3} + m_Name: + m_EditorClassIdentifier: + _collider: {fileID: 2419274615299264600} + _targetTransform: {fileID: 0} + _fadeInOutTime: {x: 1, y: 1} + _fadeColor: {r: 0, g: 0, b: 0, a: 0} +--- !u!1 &7904870373950690060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3857054957979330177} + m_Layer: 8 + m_Name: PlayerSpawn + m_TagString: Untagged + m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3857054957979330177 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7904870373950690060} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8478081780112990818} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/05.Prefabs/Maps/MapPortal.prefab.meta b/Assets/05.Prefabs/Maps/MapPortal.prefab.meta new file mode 100644 index 000000000..2498656ad --- /dev/null +++ b/Assets/05.Prefabs/Maps/MapPortal.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 798202f522c348649add7379a99abad4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/BasePropsOpaqueLit.prefab b/Assets/05.Prefabs/Props/BasePropsOpaqueLit.prefab index bf5996499..dcf121877 100644 --- a/Assets/05.Prefabs/Props/BasePropsOpaqueLit.prefab +++ b/Assets/05.Prefabs/Props/BasePropsOpaqueLit.prefab @@ -156,5 +156,5 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: 0 _transparentMaterial: {fileID: 2100000, guid: cc9b0fce917bc9548bd1bf66aa23a269, type: 2} - _transparency: 0.5 + _transparency: 0 _fadeDuration: 0.5 diff --git a/Assets/08.Spines/Characters/Enemies.meta b/Assets/08.Spines/Characters/Enemies.meta new file mode 100644 index 000000000..c23ecddcd --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca1b4dcd6625c104cb626531931271de +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Enemies/Bosses.meta b/Assets/08.Spines/Characters/Enemies/Bosses.meta new file mode 100644 index 000000000..cf481212f --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f1b87eecd853002419ad35a08e1e3ceb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole.meta b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole.meta new file mode 100644 index 000000000..518f03a02 --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0634f8c4edfb5d14f8a47155b5357ce1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.atlas.txt b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.atlas.txt new file mode 100644 index 000000000..5840d3eb7 --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.atlas.txt @@ -0,0 +1,24 @@ +SandMole_spine.png +size:1009,941 +filter:Linear,Linear +scale:0.63 +L-hand +bounds:736,4,197,221 +rotate:90 +L-leg +bounds:824,758,181,183 +rotate:90 +R-hand +bounds:736,203,270,255 +R-leg +bounds:824,595,161,183 +rotate:90 +Spin01 +bounds:412,460,410,479 +Spin02 +bounds:2,441,408,498 +bady +bounds:2,2,437,473 +rotate:90 +haed +bounds:477,92,257,366 diff --git a/Assets/Resources/JSON/ItemTable.json.meta b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.atlas.txt.meta similarity index 75% rename from Assets/Resources/JSON/ItemTable.json.meta rename to Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.atlas.txt.meta index c96236f51..0a925f746 100644 --- a/Assets/Resources/JSON/ItemTable.json.meta +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6423cd66f215818408ea3b5451d9c9a3 +guid: e553348d7cf4d7044849c22a9e60654b TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.png b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.png new file mode 100644 index 000000000..a52081e3a Binary files /dev/null and b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.png differ diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.png.meta b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.png.meta new file mode 100644 index 000000000..f056475be --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 3c44ede4067bf47479030196a1fc61ec +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.skel.bytes b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.skel.bytes new file mode 100644 index 000000000..5230f52f6 Binary files /dev/null and b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.skel.bytes differ diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.skel.bytes.meta b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.skel.bytes.meta new file mode 100644 index 000000000..4e9f50b55 --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8dde5b90ef9786042907ed6079c968f9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Atlas.asset b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Atlas.asset new file mode 100644 index 000000000..48ee61493 --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Atlas.asset @@ -0,0 +1,19 @@ +%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: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: SandMole_spine_Atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: e553348d7cf4d7044849c22a9e60654b, type: 3} + materials: + - {fileID: 2100000, guid: cd85759cb00b35c4b9d52d8814bf680b, type: 2} diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Atlas.asset.meta b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Atlas.asset.meta new file mode 100644 index 000000000..d0bb83659 --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d31993ca2e2a364a99a30395604b3a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Material.mat b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Material.mat new file mode 100644 index 000000000..f579a9e40 --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Material.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SandMole_spine_Material + m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 3c44ede4067bf47479030196a1fc61ec, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _DoubleSidedLighting: 0 + - _LightAffectsAdditive: 0 + - _ReceiveShadows: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _TintBlack: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04.Materials/Test.mat.meta b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Material.mat.meta similarity index 79% rename from Assets/04.Materials/Test.mat.meta rename to Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Material.mat.meta index f14de47ae..9235d96ad 100644 --- a/Assets/04.Materials/Test.mat.meta +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 156792d10530b0c4b8cad6eee5c57c30 +guid: cd85759cb00b35c4b9d52d8814bf680b NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_SkeletonData.asset b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_SkeletonData.asset new file mode 100644 index 000000000..b53d17cf7 --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_SkeletonData.asset @@ -0,0 +1,31 @@ +%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: SandMole_spine_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 1d31993ca2e2a364a99a30395604b3a8, type: 2} + scale: 0.0005 + skeletonJSON: {fileID: 4900000, guid: 8dde5b90ef9786042907ed6079c968f9, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_SkeletonData.asset.meta b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_SkeletonData.asset.meta new file mode 100644 index 000000000..64af04c55 --- /dev/null +++ b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31819191fa1f97347bc9f73c0dbeb10e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props.meta b/Assets/08.Spines/Props.meta new file mode 100644 index 000000000..82fd1d886 --- /dev/null +++ b/Assets/08.Spines/Props.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc63f6a3cec1fa040851b5b55cec4826 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/BossMapTrigger.meta b/Assets/08.Spines/Props/BossMapTrigger.meta new file mode 100644 index 000000000..9a9c7fc71 --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0c9a242c199285469c751d781451cbd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.atlas.txt b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.atlas.txt new file mode 100644 index 000000000..fcd1e4170 --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.atlas.txt @@ -0,0 +1,22 @@ +MagicalPattern_spine.png +size:1006,980 +filter:Linear,Linear +scale:0.33 +01 +bounds:2,314,336,324 +04 +bounds:2,314,336,324 +02 +bounds:342,654,336,324 +03 +bounds:680,642,336,324 +rotate:90 +05 +bounds:342,328,336,324 +06 +bounds:680,304,336,324 +rotate:90 +08 +bounds:340,2,336,324 +09 +bounds:2,640,338,338 diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.atlas.txt.meta b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.atlas.txt.meta new file mode 100644 index 000000000..77762d173 --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 228dc5f196be5bc4f9f6752bd87d8ba9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.png b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.png new file mode 100644 index 000000000..659afefb0 Binary files /dev/null and b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.png differ diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.png.meta b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.png.meta new file mode 100644 index 000000000..c5ca77a3b --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 98126353d183c2e4db09a87f2ad163a3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.skel.bytes b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.skel.bytes new file mode 100644 index 000000000..fa0f0dcc5 Binary files /dev/null and b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.skel.bytes differ diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.skel.bytes.meta b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.skel.bytes.meta new file mode 100644 index 000000000..1e16b5fc9 --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b893df7288b49ff4aba3ac8d3c3487c8 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Atlas.asset b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Atlas.asset new file mode 100644 index 000000000..a297bd697 --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Atlas.asset @@ -0,0 +1,19 @@ +%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: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: MagicalPattern_spine_Atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: 228dc5f196be5bc4f9f6752bd87d8ba9, type: 3} + materials: + - {fileID: 2100000, guid: 74269c31af0586d4cbf4b2307813e475, type: 2} diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Atlas.asset.meta b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Atlas.asset.meta new file mode 100644 index 000000000..2d9042445 --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 261e14f32ef4f9243ae02e01a81c9cd7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Material.mat b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Material.mat new file mode 100644 index 000000000..431f03988 --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Material.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MagicalPattern_spine_Material + m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 98126353d183c2e4db09a87f2ad163a3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _DoubleSidedLighting: 0 + - _LightAffectsAdditive: 0 + - _ReceiveShadows: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _TintBlack: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04.Materials/Test2.mat.meta b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Material.mat.meta similarity index 79% rename from Assets/04.Materials/Test2.mat.meta rename to Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Material.mat.meta index 9e79fdc3b..c34c095ca 100644 --- a/Assets/04.Materials/Test2.mat.meta +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 83cda1e14405fc04681503380ae22e14 +guid: 74269c31af0586d4cbf4b2307813e475 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_SkeletonData.asset b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_SkeletonData.asset new file mode 100644 index 000000000..0e8a50e4a --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_SkeletonData.asset @@ -0,0 +1,31 @@ +%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: MagicalPattern_spine_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 261e14f32ef4f9243ae02e01a81c9cd7, type: 2} + scale: 0.001 + skeletonJSON: {fileID: 4900000, guid: b893df7288b49ff4aba3ac8d3c3487c8, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_SkeletonData.asset.meta b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_SkeletonData.asset.meta new file mode 100644 index 000000000..4ab0d4350 --- /dev/null +++ b/Assets/08.Spines/Props/BossMapTrigger/MagicalPattern_spine_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fe0cd3a6556ca6942a36e1ea6c29c865 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/09.Shaders/Halo.shadergraph b/Assets/09.Shaders/MapEntrance.shadergraph similarity index 61% rename from Assets/09.Shaders/Halo.shadergraph rename to Assets/09.Shaders/MapEntrance.shadergraph index 780ba0691..5817e0f21 100644 --- a/Assets/09.Shaders/Halo.shadergraph +++ b/Assets/09.Shaders/MapEntrance.shadergraph @@ -1,94 +1,121 @@ { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", - "m_ObjectId": "e90fd690904647b4b45f3bf6322cbeb2", + "m_ObjectId": "1595a7e27feb4c9cb0f1dcdf8c92019c", "m_Properties": [ { - "m_Id": "08ec8d2201394825b8ea9b5063f7ee26" + "m_Id": "541842d62c5c412e9c37e532a7226de4" }, { - "m_Id": "d969cbdf89e242a994ee4314aa9859bd" + "m_Id": "a1813b6e770e4b1c8684bb95e9c84cff" }, { - "m_Id": "3d13d2482f984398b1ca9f1787dc786f" + "m_Id": "37a4a92c07c24c9caba2b8e3028295e5" }, { - "m_Id": "6f2ac14256884d08845f3bf338b3239f" + "m_Id": "f68f10b2ed6049a78017d9544c8b5fd1" + }, + { + "m_Id": "5dec3f1716ba413782e0ed4d4cb08208" + }, + { + "m_Id": "205837fb7fa6420b90265cdc52bc45ee" + }, + { + "m_Id": "2d939178d3024f8dacbb530bf90ed109" + }, + { + "m_Id": "2544b29e114c4338b2d2e1071cc2c592" } ], "m_Keywords": [], "m_Dropdowns": [], "m_CategoryData": [ { - "m_Id": "1e3e66679e9b4dfc994e426524b456ce" + "m_Id": "d023828b18324d3cb812b19abd7c6a47" } ], "m_Nodes": [ { - "m_Id": "99e9843c001b43f6a0a979cf9be41d53" + "m_Id": "9cb6db8279b747bcad1ec5a6d7d8aafc" }, { - "m_Id": "fa849a709df64d38837306cbea450599" + "m_Id": "4544d145754e4382a382a6280a76e0c3" }, { - "m_Id": "3c7a3fd31c9c49e38ede518f502be431" + "m_Id": "c8afb1c0d2af4bfeb3f20479839e39c5" }, { - "m_Id": "8bec63bd01034c00b9940a178bdeb804" + "m_Id": "1aea15022e6e44b08e6fe84be343646e" }, { - "m_Id": "9af886e38383487193e9c5aa546bc399" + "m_Id": "5bbd8126337a480a8ec052e07aa8e5f8" }, { - "m_Id": "e82e57e5027f487594042eefcb712047" + "m_Id": "edf2544b9ee9423fbf85ebe8642aef24" }, { - "m_Id": "76c773e438704a61bcc56eae126a1266" + "m_Id": "4f0de5655af44909885aa9484600eb02" }, { - "m_Id": "36bf515c375d4b20b5fa41fe6dd3b845" + "m_Id": "c8239da6425d4ea3996940c3e58f270a" }, { - "m_Id": "f500a9ace2b54a5f88ac9ef58123410a" + "m_Id": "c38780a43503411385404b82be296ac5" }, { - "m_Id": "494d6e3c76fd4a23b39dc289279612e4" + "m_Id": "0625e111920a48f48f1164bc48d9d028" }, { - "m_Id": "f4579b6ea45841e4a632a6b9070437ac" + "m_Id": "0baa3325270f4c269d70c4b73d5bcece" }, { - "m_Id": "aa9ed7cbbc564a2d9c00552a6e9a24c0" + "m_Id": "8abc3ad6ab584118858c7bfaddb96cbf" }, { - "m_Id": "91e0143f9238487cb830baf1a5339a11" + "m_Id": "2a56678e8f954af7bb8ee117610e542b" }, { - "m_Id": "e0ccaea8d7f0427392a67134e58bc363" + "m_Id": "b899985de28f4766b8187db832c53243" }, { - "m_Id": "2492fe8e66f048e98cab4d498c9992d0" + "m_Id": "ba4538d3bf424aa2addee2fa4475a903" }, { - "m_Id": "109c0f5e88ee4e82bd450dc43ba25e43" + "m_Id": "1a1ce6b5fdc8482ab847a05f7312860a" }, { - "m_Id": "92cb00afb5824497b7267db88437e963" + "m_Id": "edb7864205944891a4a879317e87a9ac" }, { - "m_Id": "dfbe323d0a404e6eaef7470089539036" + "m_Id": "df7e2d9e4f084ee09b449fefa3e01b6d" }, { - "m_Id": "8f114e22f38d46348c6819eb4c81ba99" + "m_Id": "7ebb5a3ddfc145a1bf51d755b6657694" }, { - "m_Id": "3f6713d860d84cae91d6706286cf6b03" + "m_Id": "ee54203f5c474fd58175b1b11debb5dd" }, { - "m_Id": "494d6d7dbd75415f981b950e72971594" + "m_Id": "c95e792ca3f944338388137341507673" }, { - "m_Id": "095fee3913244ef8a5f39add05ce5ca2" + "m_Id": "83e96df0b69e4f08b308ae350c294360" + }, + { + "m_Id": "b35904affe3340fcbac13926c2afc42e" + }, + { + "m_Id": "5832fc60adf3425f9a3d5f0f3c5a06ee" + }, + { + "m_Id": "6630e06345ea44e4a191849bfbf72dac" + }, + { + "m_Id": "c2d69578ec5c4dfb9899e2180c037db1" + }, + { + "m_Id": "91d444cabe4141068b2b5bb2df64d12c" } ], "m_GroupDatas": [], @@ -97,13 +124,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "109c0f5e88ee4e82bd450dc43ba25e43" + "m_Id": "0625e111920a48f48f1164bc48d9d028" }, "m_SlotId": 3 }, "m_InputSlot": { "m_Node": { - "m_Id": "2492fe8e66f048e98cab4d498c9992d0" + "m_Id": "0baa3325270f4c269d70c4b73d5bcece" }, "m_SlotId": 0 } @@ -111,13 +138,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "2492fe8e66f048e98cab4d498c9992d0" + "m_Id": "0baa3325270f4c269d70c4b73d5bcece" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "e0ccaea8d7f0427392a67134e58bc363" + "m_Id": "2a56678e8f954af7bb8ee117610e542b" }, "m_SlotId": 1 } @@ -125,83 +152,27 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "36bf515c375d4b20b5fa41fe6dd3b845" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "76c773e438704a61bcc56eae126a1266" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "3f6713d860d84cae91d6706286cf6b03" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "494d6d7dbd75415f981b950e72971594" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "3f6713d860d84cae91d6706286cf6b03" - }, - "m_SlotId": 4 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "095fee3913244ef8a5f39add05ce5ca2" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "3f6713d860d84cae91d6706286cf6b03" - }, - "m_SlotId": 5 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "095fee3913244ef8a5f39add05ce5ca2" + "m_Id": "0baa3325270f4c269d70c4b73d5bcece" }, "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7ebb5a3ddfc145a1bf51d755b6657694" + }, + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "3f6713d860d84cae91d6706286cf6b03" - }, - "m_SlotId": 6 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "095fee3913244ef8a5f39add05ce5ca2" + "m_Id": "1a1ce6b5fdc8482ab847a05f7312860a" }, "m_SlotId": 3 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "494d6d7dbd75415f981b950e72971594" - }, - "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "3c7a3fd31c9c49e38ede518f502be431" + "m_Id": "edb7864205944891a4a879317e87a9ac" }, "m_SlotId": 0 } @@ -209,69 +180,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "494d6d7dbd75415f981b950e72971594" + "m_Id": "2a56678e8f954af7bb8ee117610e542b" }, - "m_SlotId": 2 + "m_SlotId": 3 }, "m_InputSlot": { "m_Node": { - "m_Id": "fa849a709df64d38837306cbea450599" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "494d6e3c76fd4a23b39dc289279612e4" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "9af886e38383487193e9c5aa546bc399" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "76c773e438704a61bcc56eae126a1266" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "f500a9ace2b54a5f88ac9ef58123410a" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "8bec63bd01034c00b9940a178bdeb804" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "f4579b6ea45841e4a632a6b9070437ac" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "8f114e22f38d46348c6819eb4c81ba99" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "109c0f5e88ee4e82bd450dc43ba25e43" + "m_Id": "4f0de5655af44909885aa9484600eb02" }, "m_SlotId": 2 } @@ -279,13 +194,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "91e0143f9238487cb830baf1a5339a11" + "m_Id": "4f0de5655af44909885aa9484600eb02" }, - "m_SlotId": 1 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "e82e57e5027f487594042eefcb712047" + "m_Id": "ee54203f5c474fd58175b1b11debb5dd" }, "m_SlotId": 0 } @@ -293,13 +208,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "92cb00afb5824497b7267db88437e963" + "m_Id": "5832fc60adf3425f9a3d5f0f3c5a06ee" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "8f114e22f38d46348c6819eb4c81ba99" + "m_Id": "ba4538d3bf424aa2addee2fa4475a903" }, "m_SlotId": 1 } @@ -307,27 +222,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "9af886e38383487193e9c5aa546bc399" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "e0ccaea8d7f0427392a67134e58bc363" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "aa9ed7cbbc564a2d9c00552a6e9a24c0" + "m_Id": "6630e06345ea44e4a191849bfbf72dac" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "f4579b6ea45841e4a632a6b9070437ac" + "m_Id": "0baa3325270f4c269d70c4b73d5bcece" }, "m_SlotId": 1 } @@ -335,27 +236,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "dfbe323d0a404e6eaef7470089539036" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "8f114e22f38d46348c6819eb4c81ba99" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "e0ccaea8d7f0427392a67134e58bc363" + "m_Id": "7ebb5a3ddfc145a1bf51d755b6657694" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "f500a9ace2b54a5f88ac9ef58123410a" + "m_Id": "ee54203f5c474fd58175b1b11debb5dd" }, "m_SlotId": 1 } @@ -363,27 +250,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "e82e57e5027f487594042eefcb712047" + "m_Id": "83e96df0b69e4f08b308ae350c294360" }, - "m_SlotId": 1 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "9af886e38383487193e9c5aa546bc399" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "f4579b6ea45841e4a632a6b9070437ac" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "91e0143f9238487cb830baf1a5339a11" + "m_Id": "c95e792ca3f944338388137341507673" }, "m_SlotId": 0 } @@ -391,15 +264,211 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "f500a9ace2b54a5f88ac9ef58123410a" + "m_Id": "8abc3ad6ab584118858c7bfaddb96cbf" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2a56678e8f954af7bb8ee117610e542b" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "91d444cabe4141068b2b5bb2df64d12c" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "df7e2d9e4f084ee09b449fefa3e01b6d" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b35904affe3340fcbac13926c2afc42e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c38780a43503411385404b82be296ac5" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b899985de28f4766b8187db832c53243" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2a56678e8f954af7bb8ee117610e542b" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ba4538d3bf424aa2addee2fa4475a903" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "494d6d7dbd75415f981b950e72971594" + "m_Id": "1a1ce6b5fdc8482ab847a05f7312860a" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c2d69578ec5c4dfb9899e2180c037db1" }, "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "edb7864205944891a4a879317e87a9ac" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c38780a43503411385404b82be296ac5" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "0625e111920a48f48f1164bc48d9d028" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c8239da6425d4ea3996940c3e58f270a" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4f0de5655af44909885aa9484600eb02" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c95e792ca3f944338388137341507673" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1aea15022e6e44b08e6fe84be343646e" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c95e792ca3f944338388137341507673" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5bbd8126337a480a8ec052e07aa8e5f8" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "df7e2d9e4f084ee09b449fefa3e01b6d" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7ebb5a3ddfc145a1bf51d755b6657694" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "edb7864205944891a4a879317e87a9ac" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "df7e2d9e4f084ee09b449fefa3e01b6d" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "edf2544b9ee9423fbf85ebe8642aef24" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ba4538d3bf424aa2addee2fa4475a903" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "edf2544b9ee9423fbf85ebe8642aef24" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c38780a43503411385404b82be296ac5" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ee54203f5c474fd58175b1b11debb5dd" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c95e792ca3f944338388137341507673" + }, + "m_SlotId": 1 } } ], @@ -408,7 +477,17 @@ "x": 0.0, "y": 0.0 }, - "m_Blocks": [] + "m_Blocks": [ + { + "m_Id": "9cb6db8279b747bcad1ec5a6d7d8aafc" + }, + { + "m_Id": "4544d145754e4382a382a6280a76e0c3" + }, + { + "m_Id": "c8afb1c0d2af4bfeb3f20479839e39c5" + } + ] }, "m_FragmentContext": { "m_Position": { @@ -417,13 +496,10 @@ }, "m_Blocks": [ { - "m_Id": "99e9843c001b43f6a0a979cf9be41d53" + "m_Id": "1aea15022e6e44b08e6fe84be343646e" }, { - "m_Id": "3c7a3fd31c9c49e38ede518f502be431" - }, - { - "m_Id": "fa849a709df64d38837306cbea450599" + "m_Id": "5bbd8126337a480a8ec052e07aa8e5f8" } ] }, @@ -443,209 +519,15 @@ "m_SubDatas": [], "m_ActiveTargets": [ { - "m_Id": "48fd23aa1d204109ab9d58545211d36d" + "m_Id": "a22250821063456493450bcac5b5d5bf" } ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "02236c81e4a947a8b412097481033b05", - "m_Id": 0, - "m_DisplayName": "Emission", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Emission", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_ColorMode": 1, - "m_DefaultColor": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "05f65440804644b0aa4e8000410d075f", - "m_Id": 2, - "m_DisplayName": "UV", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "UV", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [], - "m_Channel": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "073a0ad1e4da442a84ed8f486c6f1076", - "m_Id": 2, - "m_DisplayName": "Cosine Time", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Cosine Time", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", - "m_ObjectId": "08ec8d2201394825b8ea9b5063f7ee26", - "m_Guid": { - "m_GuidSerialized": "23c55efc-3057-43ed-b075-89a31f28d992" - }, - "m_Name": "MainTex", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "MainTex", - "m_DefaultReferenceName": "_MainTex", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"7f38df8025a1e2c4a9583a8aa1fe8a84\",\"type\":3}}", - "m_Guid": "" - }, - "isMainTexture": false, - "useTilingAndOffset": false, - "m_Modifiable": true, - "m_DefaultType": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "09128ff8b45c43378db38db9560a5253", - "m_Id": 3, - "m_DisplayName": "Delta Time", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Delta Time", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "093ab09156654a60b0ad1d50cdf1beea", - "m_Id": 1, - "m_DisplayName": "X", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "X", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3Node", - "m_ObjectId": "095fee3913244ef8a5f39add05ce5ca2", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Vector 3", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -281.0000305175781, - "y": 868.0000610351563, - "width": 128.0, - "height": 125.0 - } - }, - "m_Slots": [ - { - "m_Id": "093ab09156654a60b0ad1d50cdf1beea" - }, - { - "m_Id": "e5dacf92ceeb4e8ca28d244050538f3e" - }, - { - "m_Id": "7292ede6bfa74a4c9a87360026f8e6fd" - }, - { - "m_Id": "acc9cb227f304ef692afe1c1acd8b085" - } - ], - "synonyms": [ - "3", - "v3", - "vec3", - "float3" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "0c6a760623b042a88c70178462a012c7", - "m_Id": 1, - "m_DisplayName": "Scale", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Scale", - "m_StageCapability": 3, - "m_Value": 50.0, - "m_DefaultValue": 500.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TilingAndOffsetNode", - "m_ObjectId": "109c0f5e88ee4e82bd450dc43ba25e43", + "m_ObjectId": "0625e111920a48f48f1164bc48d9d028", "m_Group": { "m_Id": "" }, @@ -654,24 +536,24 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2062.999755859375, - "y": 892.0, - "width": 207.999755859375, - "height": 326.0 + "x": -2394.0, + "y": -49.0000114440918, + "width": 208.0, + "height": 325.9999694824219 } }, "m_Slots": [ { - "m_Id": "50aaa4f2a25f4f018d7469790d788952" + "m_Id": "44185b492cd744e9a062a1269c1d2513" }, { - "m_Id": "58446eba59104509bb5a41a69350a110" + "m_Id": "8b099451bb3242398e7d0f294ad62333" }, { - "m_Id": "837ad91df50143649d64d3302664d2b8" + "m_Id": "8d9f1ab276f14f409e1a4107460a94b7" }, { - "m_Id": "5ddefdb1ae3a456e8541370d6273d972" + "m_Id": "dbf872aae10440e48fec5bd8ed5d3285" } ], "synonyms": [ @@ -689,128 +571,71 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "110823a60d544a088119751befe37bea", + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "072a880bc12d4847a7d8f1058651e05c", "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, + "m_DisplayName": "DissolveSpeed", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "A", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 + "y": 0.0 }, "m_DefaultValue": { "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "130edad9f7eb46879f841badcb8b948a", - "m_Id": 4, - "m_DisplayName": "Smooth Delta", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Smooth Delta", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, + "y": 0.0 + }, "m_Labels": [] } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CategoryData", - "m_ObjectId": "1e3e66679e9b4dfc994e426524b456ce", - "m_Name": "", - "m_ChildObjectList": [ - { - "m_Id": "08ec8d2201394825b8ea9b5063f7ee26" - }, - { - "m_Id": "3d13d2482f984398b1ca9f1787dc786f" - }, - { - "m_Id": "6f2ac14256884d08845f3bf338b3239f" - }, - { - "m_Id": "d969cbdf89e242a994ee4314aa9859bd" - } - ] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", - "m_ObjectId": "1f24b5ee69a34d94a52938ca3f7a909a", - "m_Id": 1, - "m_DisplayName": "Texture", + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0a714cddb87c4aeb81829948b1f874bd", + "m_Id": 2, + "m_DisplayName": "CellDensity", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Texture", + "m_ShaderOutputName": "CellDensity", "m_StageCapability": 3, - "m_BareResource": false, - "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"b96dab13331f00c49b25e3cf41b4dead\",\"type\":3}}", - "m_Guid": "" - }, - "m_DefaultType": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "2428aa2b7a744fee92b3cf29bd8143f4", - "m_Id": 0, - "m_DisplayName": "Time", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Time", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, + "m_Value": 2.0, + "m_DefaultValue": 5.0, "m_Labels": [] } { "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.NoiseNode", - "m_ObjectId": "2492fe8e66f048e98cab4d498c9992d0", + "m_Type": "UnityEditor.ShaderGraph.GradientNoiseNode", + "m_ObjectId": "0baa3325270f4c269d70c4b73d5bcece", "m_Group": { "m_Id": "" }, - "m_Name": "Simple Noise", + "m_Name": "Gradient Noise", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1734.9998779296875, - "y": 892.0, - "width": 208.0, - "height": 337.0 + "x": -1965.0001220703125, + "y": -48.99998092651367, + "width": 208.0001220703125, + "height": 337.0000305175781 } }, "m_Slots": [ { - "m_Id": "9a1d4bfccf394f3d9b992475b1a77f00" + "m_Id": "914169c5e4ce421ab98b8cc15ea17b42" }, { - "m_Id": "0c6a760623b042a88c70178462a012c7" + "m_Id": "96c03e3a10194ba5a8c26b9c8b93be08" }, { - "m_Id": "c9e74384c9ae4295a68abcb249b11cb7" + "m_Id": "52db21bb6ca84182b6b4ec874f9e7414" } ], "synonyms": [ - "value noise" + "perlin noise" ], "m_Precision": 0, "m_PreviewExpanded": true, @@ -825,7 +650,7 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "272456b600274276b6583c4e97f7e590", + "m_ObjectId": "130fa58777a441e4aee7b91ef16b890c", "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, @@ -872,28 +697,172 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "2c4ab16604a64728a8879ca4280aa397", - "m_Id": 0, - "m_DisplayName": "Alpha", - "m_SlotType": 0, + "m_Type": "UnityEditor.ShaderGraph.TilingAndOffsetNode", + "m_ObjectId": "1a1ce6b5fdc8482ab847a05f7312860a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Tiling And Offset", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2394.0, + "y": 410.0, + "width": 208.0, + "height": 326.0 + } + }, + "m_Slots": [ + { + "m_Id": "30dc3a739ff74ce7a2b2644f8e549b01" + }, + { + "m_Id": "6a74498363a2474c85d06e689224d27d" + }, + { + "m_Id": "6ba9cdae52354307b9979ab5a19ce6b3" + }, + { + "m_Id": "9e5a8888eff648f8a1b155d18f4d03b4" + } + ], + "synonyms": [ + "pan", + "scale" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "1aea15022e6e44b08e6fe84be343646e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "27ee8678462547139a778c86ae45494e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "1b2ae36a7e47475a8b7bc2e235e5d6ef", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "Alpha", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", + "m_ObjectId": "205837fb7fa6420b90265cdc52bc45ee", + "m_Guid": { + "m_GuidSerialized": "0c17993d-b519-443e-83fe-f18bb5d76b3f" + }, + "m_Name": "DissolveSpeed", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DissolveSpeed", + "m_DefaultReferenceName": "_DissolveSpeed", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "x": -0.10000000149011612, + "y": -0.30000001192092898, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "2544b29e114c4338b2d2e1071cc2c592", + "m_Guid": { + "m_GuidSerialized": "c2242030-96e2-4040-ba4d-2c3c194f7a2f" + }, + "m_Name": "DistortionScale", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DistortionScale", + "m_DefaultReferenceName": "_DistortionScale", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 5.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } } { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "34ca0c53add84688800657d78b12fe8c", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, + "m_ObjectId": "279b696f58474e969da6c44ed208e488", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "A", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { "e00": 0.0, @@ -935,260 +904,21 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "36bf515c375d4b20b5fa41fe6dd3b845", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1202.0001220703125, - "y": -173.00001525878907, - "width": 127.0, - "height": 34.0 - } - }, - "m_Slots": [ - { - "m_Id": "b0bd09612f0b4df9b8888f2ec909f55d" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "08ec8d2201394825b8ea9b5063f7ee26" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData", - "m_ObjectId": "3b3fba15f5d54208a1c2e57008f1b001", - "m_Version": 0, - "m_AlphaClip": false, - "m_DisableTint": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "3c7a3fd31c9c49e38ede518f502be431", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Emission", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -3.000060558319092, - "y": 259.0, - "width": 199.99990844726563, - "height": 41.0 - } - }, - "m_Slots": [ - { - "m_Id": "02236c81e4a947a8b412097481033b05" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Emission" -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "3d13d2482f984398b1ca9f1787dc786f", - "m_Guid": { - "m_GuidSerialized": "c26e149f-6c4b-4925-b3bc-deb00d48d277" - }, - "m_Name": "ColorSpeed", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "ColorSpeed", - "m_DefaultReferenceName": "_ColorSpeed", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": 5.0, - "m_FloatType": 0, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "3d230adc291f4a04a0afb57ec9354649", - "m_Id": 1, - "m_DisplayName": "B", + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "27b896f4dfa6452c98c384bebee5cf64", + "m_Id": 3, + "m_DisplayName": "Sampler", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "B", + "m_ShaderOutputName": "Sampler", "m_StageCapability": 3, - "m_Value": { - "e00": 2.0, - "e01": 2.0, - "e02": 2.0, - "e03": 2.0, - "e10": 2.0, - "e11": 2.0, - "e12": 2.0, - "e13": 2.0, - "e20": 2.0, - "e21": 2.0, - "e22": 2.0, - "e23": 2.0, - "e30": 2.0, - "e31": 2.0, - "e32": 2.0, - "e33": 2.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "3f455a5c93c04fa2be9922e828585008", - "m_Id": 2, - "m_DisplayName": "UV", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "UV", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [], - "m_Channel": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", - "m_ObjectId": "3f6713d860d84cae91d6706286cf6b03", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Sample Texture 2D", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -559.0, - "y": 672.9999389648438, - "width": 208.00009155273438, - "height": 435.00006103515627 - } - }, - "m_Slots": [ - { - "m_Id": "641fcb99e8fd41c0842437f9f819e39e" - }, - { - "m_Id": "983b11bc7f1245d6a298d2ce1abd5307" - }, - { - "m_Id": "bafd439d995840b88c562aef1fe42f65" - }, - { - "m_Id": "8cf7619a87f44393b93ed759f20edc38" - }, - { - "m_Id": "ca494eba349540bda16a7a7ef9e5e642" - }, - { - "m_Id": "1f24b5ee69a34d94a52938ca3f7a909a" - }, - { - "m_Id": "3f455a5c93c04fa2be9922e828585008" - }, - { - "m_Id": "4964e77ec48946fdb3b8ba36eac03337" - } - ], - "synonyms": [ - "tex2d" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_TextureType": 0, - "m_NormalMapSpace": 0, - "m_EnableGlobalMipBias": true, - "m_MipSamplingMode": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "412e2cf1d58a49d69aabfb85b98fb0d0", - "m_Id": 6, - "m_DisplayName": "B", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_BareResource": false } { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "43b29cb5dd3845d9b555c6e2b9f8a501", + "m_ObjectId": "27ee8678462547139a778c86ae45494e", "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 0, @@ -1215,131 +945,10 @@ } } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", - "m_ObjectId": "48fd23aa1d204109ab9d58545211d36d", - "m_Datas": [ - { - "m_Id": "3b3fba15f5d54208a1c2e57008f1b001" - } - ], - "m_ActiveSubTarget": { - "m_Id": "94a7ac0683f343a4a8a95cc1ea6473eb" - }, - "m_AllowMaterialOverride": false, - "m_SurfaceType": 0, - "m_ZTestMode": 4, - "m_ZWriteControl": 0, - "m_AlphaMode": 0, - "m_RenderFace": 2, - "m_AlphaClip": false, - "m_CastShadows": true, - "m_ReceiveShadows": true, - "m_DisableTint": false, - "m_AdditionalMotionVectorMode": 0, - "m_AlembicMotionVectors": false, - "m_SupportsLODCrossFade": false, - "m_CustomEditorGUI": "", - "m_SupportVFX": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.AddNode", - "m_ObjectId": "494d6d7dbd75415f981b950e72971594", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Add", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -136.00001525878907, - "y": 522.0000610351563, - "width": 207.99996948242188, - "height": 302.0 - } - }, - "m_Slots": [ - { - "m_Id": "110823a60d544a088119751befe37bea" - }, - { - "m_Id": "6c33648a14694abbbade836156b77d57" - }, - { - "m_Id": "6f52729613914ef19dc9da7d5d930168" - } - ], - "synonyms": [ - "addition", - "sum", - "plus" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "494d6e3c76fd4a23b39dc289279612e4", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1488.0001220703125, - "y": 325.00006103515627, - "width": 95.9998779296875, - "height": 33.99993896484375 - } - }, - "m_Slots": [ - { - "m_Id": "be879cb4592c4f018cd3b4eca43ec84e" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "d969cbdf89e242a994ee4314aa9859bd" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "4964e77ec48946fdb3b8ba36eac03337", - "m_Id": 3, - "m_DisplayName": "Sampler", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3, - "m_BareResource": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "4d9ef5bc6986446b8a241ae5c442c897", + "m_ObjectId": "291299197a814f73a5217bf2c1d13cfb", "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, @@ -1384,25 +993,187 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.LerpNode", + "m_ObjectId": "2a56678e8f954af7bb8ee117610e542b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Lerp", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1620.9998779296875, + "y": -448.00006103515627, + "width": 208.0, + "height": 326.0000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "600a6276df1e495f9fa89528d2116a2d" + }, + { + "m_Id": "8da7e4845d3a4cf7a4c34c314edd1187" + }, + { + "m_Id": "70ab4706f28d4170b6482136b0c126d9" + }, + { + "m_Id": "3b2b6808fe1f4e539d70fcb563bb0587" + } + ], + "synonyms": [ + "mix", + "blend", + "linear interpolate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "4e1ac48688724f5abe606bd42b9d407f", - "m_Id": 2, - "m_DisplayName": "Cosine Time", + "m_ObjectId": "2a57ea4c7aa14be1b57cf26e1187825f", + "m_Id": 4, + "m_DisplayName": "Smooth Delta", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "Cosine Time", + "m_ShaderOutputName": "Smooth Delta", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "2c093d6a11044360a19616fe02c57325", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "2d939178d3024f8dacbb530bf90ed109", + "m_Guid": { + "m_GuidSerialized": "12f86dff-02e4-49f5-81e9-c8c14838f3c1" + }, + "m_Name": "DissolveAmount", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DissolveAmount", + "m_DefaultReferenceName": "_DissolveAmount", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 2.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "2f8a06a47603453ca6baaec9b3fbff3e", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "50aaa4f2a25f4f018d7469790d788952", + "m_ObjectId": "308ec3f214cf4accb6f26234094004f5", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "30dc3a739ff74ce7a2b2644f8e549b01", "m_Id": 0, "m_DisplayName": "UV", "m_SlotType": 0, @@ -1423,386 +1194,39 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "580c54af5aec4ec3bbbb355a302a44ae", - "m_Id": 1, - "m_DisplayName": "Time", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Time", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "582606e07fb14f1cbd4c8a8573dde39f", + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "33fc47313a8d4e5dbb568fa198da5b24", "m_Id": 0, - "m_DisplayName": "A", + "m_DisplayName": "Position", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "58446eba59104509bb5a41a69350a110", - "m_Id": 1, - "m_DisplayName": "Tiling", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Tiling", - "m_StageCapability": 3, - "m_Value": { - "x": 1.0, - "y": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "5ddefdb1ae3a456e8541370d6273d972", - "m_Id": 3, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "641fcb99e8fd41c0842437f9f819e39e", - "m_Id": 0, - "m_DisplayName": "RGBA", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "RGBA", - "m_StageCapability": 2, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, "m_Value": { "x": 0.0, "y": 0.0, - "z": 0.0, - "w": 0.0 + "z": 0.0 }, "m_DefaultValue": { "x": 0.0, "y": 0.0, - "z": 0.0, - "w": 0.0 + "z": 0.0 }, - "m_Labels": [] + "m_Labels": [], + "m_Space": 0 } { - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.GradientInputMaterialSlot", - "m_ObjectId": "6a6a719ad3c344e7b9654745c935f994", - "m_Id": 0, - "m_DisplayName": "Gradient", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Gradient", - "m_StageCapability": 3, - "m_Value": { - "serializedVersion": "2", - "key0": { - "r": 0.7490196228027344, - "g": 0.7490196228027344, - "b": 0.0, - "a": 0.0 - }, - "key1": { - "r": 1.4980393648147584, - "g": 1.4980393648147584, - "b": 0.0, - "a": 1.0 - }, - "key2": { - "r": 1.0, - "g": 1.0, - "b": 0.0, - "a": 1.0 - }, - "key3": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key4": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key5": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key6": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key7": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "ctime0": 0, - "ctime1": 49151, - "ctime2": 65535, - "ctime3": 0, - "ctime4": 0, - "ctime5": 0, - "ctime6": 0, - "ctime7": 0, - "atime0": 0, - "atime1": 16384, - "atime2": 49151, - "atime3": 65535, - "atime4": 0, - "atime5": 0, - "atime6": 0, - "atime7": 0, - "m_Mode": 0, - "m_ColorSpace": -1, - "m_NumColorKeys": 3, - "m_NumAlphaKeys": 4 - }, - "m_DefaultValue": { - "serializedVersion": "2", - "key0": { - "r": 1.0, - "g": 1.0, - "b": 1.0, - "a": 1.0 - }, - "key1": { - "r": 1.0, - "g": 1.0, - "b": 1.0, - "a": 1.0 - }, - "key2": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key3": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key4": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key5": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key6": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key7": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "ctime0": 0, - "ctime1": 65535, - "ctime2": 0, - "ctime3": 0, - "ctime4": 0, - "ctime5": 0, - "ctime6": 0, - "ctime7": 0, - "atime0": 0, - "atime1": 65535, - "atime2": 0, - "atime3": 0, - "atime4": 0, - "atime5": 0, - "atime6": 0, - "atime7": 0, - "m_Mode": 0, - "m_ColorSpace": -1, - "m_NumColorKeys": 2, - "m_NumAlphaKeys": 2 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "6c33648a14694abbbade836156b77d57", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "6d0da55e3d0a4b98b6b6de2caa1ea6ff", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "6d4516b40ba4400083fbd166936f69ee", - "m_Id": 0, - "m_DisplayName": "Time", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Time", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "6f2ac14256884d08845f3bf338b3239f", + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "37a4a92c07c24c9caba2b8e3028295e5", "m_Guid": { - "m_GuidSerialized": "13de1732-2c06-4edd-9808-03229bb78407" + "m_GuidSerialized": "a1f4c87f-be11-4bba-9e5f-0e9c1b48ae01" }, - "m_Name": "MoveSpeed", + "m_Name": "Color", "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "MoveSpeed", - "m_DefaultReferenceName": "_MoveSpeed", + "m_RefNameGeneratedByDisplayName": "Color", + "m_DefaultReferenceName": "_Color", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, @@ -1812,19 +1236,21 @@ "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, "m_Hidden": false, - "m_Value": -0.30000001192092898, - "m_FloatType": 0, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 - } + "m_Value": { + "r": 16.020668029785158, + "g": 4.256800174713135, + "b": 2.403099775314331, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 1 } { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "6f52729613914ef19dc9da7d5d930168", - "m_Id": 2, + "m_ObjectId": "3b2b6808fe1f4e539d70fcb563bb0587", + "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, @@ -1847,87 +1273,114 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "6ff3262b6cb04384810898ad4da0754d", - "m_Id": 3, - "m_DisplayName": "Delta Time", + "m_ObjectId": "3b489de4de50445eabf0081311d1cb69", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3e37529e1896477ea5ceb14b1c4bd297", + "m_Id": 0, + "m_DisplayName": "DissolveScale", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "Delta Time", + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "3ec9d06dad9742238bde79c1d63bfd73" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "44185b492cd744e9a062a1269c1d2513", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "4544d145754e4382a382a6280a76e0c3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "9bfdebcf54e44553b56de37fd6acc9cc" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "4ecf241441234be3b5fcf9595209bec8", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "7292ede6bfa74a4c9a87360026f8e6fd", - "m_Id": 3, - "m_DisplayName": "Z", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Z", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [ - "Z" - ] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "738bc58eaf3945fcaf0031969a6e0096", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", - "m_ObjectId": "76c773e438704a61bcc56eae126a1266", + "m_ObjectId": "4f0de5655af44909885aa9484600eb02", "m_Group": { "m_Id": "" }, @@ -1936,36 +1389,36 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -993.9999389648438, - "y": -139.0, - "width": 207.99993896484376, - "height": 434.99993896484377 + "x": -1096.9998779296875, + "y": -435.0000305175781, + "width": 208.0, + "height": 435.0 } }, "m_Slots": [ { - "m_Id": "f9ca03f55bc74aba97a3cb7ed5f3da08" + "m_Id": "c9d6eb7eca864ecaaa80d721b9287a18" }, { - "m_Id": "9a0a1d0fac7a408f9cdda52b6b9e0b0e" + "m_Id": "fb5b8b5622ca42c188d7da932fd1425d" }, { - "m_Id": "d0d34563f4824ee7a7293e1e40a34d8d" + "m_Id": "9035c965fb4941a58f2f4f18b08cacd9" }, { - "m_Id": "412e2cf1d58a49d69aabfb85b98fb0d0" + "m_Id": "811f59e0077743e7a0ed09c37bd2be3a" }, { - "m_Id": "b8694ed8cc9044bb8c20012361aed6a8" + "m_Id": "c9a8903a8a214ce9b54387dd47854164" }, { - "m_Id": "7c16e15bba1e42ef878e106ff800cb5f" + "m_Id": "2f8a06a47603453ca6baaec9b3fbff3e" }, { - "m_Id": "05f65440804644b0aa4e8000410d075f" + "m_Id": "308ec3f214cf4accb6f26234094004f5" }, { - "m_Id": "db6cc2418b1c4f75a2db04362aae1067" + "m_Id": "27b896f4dfa6452c98c384bebee5cf64" } ], "synonyms": [ @@ -1986,26 +1439,135 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", - "m_ObjectId": "7c16e15bba1e42ef878e106ff800cb5f", - "m_Id": 1, - "m_DisplayName": "Texture", + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "5074e787469d49c1a13f261995c3efb5", + "m_Id": 0, + "m_DisplayName": "Tangent", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Texture", + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5258610b13c74917ba3272efd063bc11", + "m_Id": 4, + "m_DisplayName": "Cells", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Cells", "m_StageCapability": 3, - "m_BareResource": false, - "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "52db21bb6ca84182b6b4ec874f9e7414", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "532c08a708d944fe85a28296d89fa7f8", + "m_Id": 0, + "m_DisplayName": "DistortionSpeed", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "541842d62c5c412e9c37e532a7226de4", + "m_Guid": { + "m_GuidSerialized": "f394bfa2-e7f9-4a94-9e61-8d37c03a5a55" + }, + "m_Name": "MainTex", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MainTex", + "m_DefaultReferenceName": "_MainTex", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"9be7ccef6923b9a4bb8517ca399f8875\",\"type\":3}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "551a9f24b4074be5b6b40ae503b53427", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "7dd0d319ad3447d98272525c034ab2c7", + "m_ObjectId": "558770aaebdd42bcb48af50c4de5280a", "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, @@ -2050,10 +1612,265 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "5832fc60adf3425f9a3d5f0f3c5a06ee", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3013.0, + "y": 462.0, + "width": 128.0, + "height": 101.0 + } + }, + "m_Slots": [ + { + "m_Id": "072a880bc12d4847a7d8f1058651e05c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "205837fb7fa6420b90265cdc52bc45ee" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5bbd8126337a480a8ec052e07aa8e5f8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "3b489de4de50445eabf0081311d1cb69" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", + "m_ObjectId": "5dec3f1716ba413782e0ed4d4cb08208", + "m_Guid": { + "m_GuidSerialized": "e8f003c9-c4c9-44cc-acca-2e61608f04c0" + }, + "m_Name": "DistortionSpeed", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DistortionSpeed", + "m_DefaultReferenceName": "_DistortionSpeed", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "x": 0.0, + "y": -0.30000001192092898, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5e7fbda05d7f4dd2924a0f029e93e8d6", + "m_Id": 0, + "m_DisplayName": "DistortionScale", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "600a6276df1e495f9fa89528d2116a2d", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "61b92ae4e2b045098591cf45a6df328c", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "6630e06345ea44e4a191849bfbf72dac", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2146.0, + "y": 26.000030517578126, + "width": 154.9998779296875, + "height": 33.999996185302737 + } + }, + "m_Slots": [ + { + "m_Id": "5e7fbda05d7f4dd2924a0f029e93e8d6" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "2544b29e114c4338b2d2e1071cc2c592" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "66858ec7cd404a1f87b054cbd0ed9913", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "837ad91df50143649d64d3302664d2b8", + "m_ObjectId": "6a74498363a2474c85d06e689224d27d", + "m_Id": 1, + "m_DisplayName": "Tiling", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tiling", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "6ba9cdae52354307b9979ab5a19ce6b3", "m_Id": 2, "m_DisplayName": "Offset", "m_SlotType": 0, @@ -2074,277 +1891,33 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "878d81943831473497c6fa5fc6dca0f8", - "m_Id": 0, - "m_DisplayName": "In", + "m_ObjectId": "6df2acf4d33e44a69e9b4ae0e6af0e29", + "m_Id": 1, + "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "8a6ce879c3204ff39db00fd92f12fb05", - "m_Id": 1, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.TimeNode", - "m_ObjectId": "8bec63bd01034c00b9940a178bdeb804", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Time", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2257.000244140625, - "y": 377.0, - "width": 124.0, - "height": 173.0 - } - }, - "m_Slots": [ - { - "m_Id": "6d4516b40ba4400083fbd166936f69ee" - }, - { - "m_Id": "ee8c11e492e843ad8aab59aa0967a38b" - }, - { - "m_Id": "4e1ac48688724f5abe606bd42b9d407f" - }, - { - "m_Id": "6ff3262b6cb04384810898ad4da0754d" - }, - { - "m_Id": "956e1015cf7a4abea08c987c019d67b9" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "8cf7619a87f44393b93ed759f20edc38", - "m_Id": 6, - "m_DisplayName": "B", - "m_SlotType": 1, - "m_Hidden": false, "m_ShaderOutputName": "B", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "8f114e22f38d46348c6819eb4c81ba99", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2428.999755859375, - "y": 891.9999389648438, - "width": 208.0, - "height": 301.99993896484377 - } - }, - "m_Slots": [ - { - "m_Id": "582606e07fb14f1cbd4c8a8573dde39f" - }, - { - "m_Id": "ec0ec52aa1ee44a1ab197271e78087c8" - }, - { - "m_Id": "6d0da55e3d0a4b98b6b6de2caa1ea6ff" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SineNode", - "m_ObjectId": "91e0143f9238487cb830baf1a5339a11", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Sine", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1784.0001220703125, - "y": 429.0000305175781, - "width": 208.0, - "height": 278.0000305175781 - } - }, - "m_Slots": [ - { - "m_Id": "878d81943831473497c6fa5fc6dca0f8" - }, - { - "m_Id": "8a6ce879c3204ff39db00fd92f12fb05" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.TimeNode", - "m_ObjectId": "92cb00afb5824497b7267db88437e963", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Time", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2672.0, - "y": 945.0000610351563, - "width": 124.0, - "height": 173.00006103515626 - } - }, - "m_Slots": [ - { - "m_Id": "2428aa2b7a744fee92b3cf29bd8143f4" - }, - { - "m_Id": "f2a8423bd0dd44b592f947dd98bbcc94" - }, - { - "m_Id": "073a0ad1e4da442a84ed8f486c6f1076" - }, - { - "m_Id": "09128ff8b45c43378db38db9560a5253" - }, - { - "m_Id": "130edad9f7eb46879f841badcb8b948a" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalCanvasSubTarget", - "m_ObjectId": "94a7ac0683f343a4a8a95cc1ea6473eb" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "956e1015cf7a4abea08c987c019d67b9", - "m_Id": 4, - "m_DisplayName": "Smooth Delta", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Smooth Delta", "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "983b11bc7f1245d6a298d2ce1abd5307", - "m_Id": 4, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Value": { + "x": 2.0, + "y": 2.0, + "z": 2.0, + "w": 2.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } } { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "995ab46301d84a02b373226cc62a8a15", - "m_Id": 2, - "m_DisplayName": "Out", + "m_ObjectId": "706c498d7f7447d389b70e35b8cbc105", + "m_Id": 0, + "m_DisplayName": "Color", "m_SlotType": 1, "m_Hidden": false, "m_ShaderOutputName": "Out", @@ -2364,10 +1937,97 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "70ab4706f28d4170b6482136b0c126d9", + "m_Id": 2, + "m_DisplayName": "T", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "T", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "71f45def15254c9d88e1a5fb94303ec7", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7a1139a98ab145199ca0ac10dc9bba68", + "m_Id": 1, + "m_DisplayName": "AngleOffset", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AngleOffset", + "m_StageCapability": 3, + "m_Value": 2.0, + "m_DefaultValue": 2.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "998d3e59002d4ec9a967408db4bcebf0", + "m_ObjectId": "7b2d87037b7941bda405965b080580da", "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, @@ -2414,25 +2074,131 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "99e9843c001b43f6a0a979cf9be41d53", + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "7e7e98d4eead41a2935ebf1eed9663a7", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "7ebb5a3ddfc145a1bf51d755b6657694", "m_Group": { "m_Id": "" }, - "m_Name": "SurfaceDescription.BaseColor", + "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": -1412.9998779296875, + "y": 253.0, + "width": 208.0, + "height": 301.99993896484377 } }, "m_Slots": [ { - "m_Id": "43b29cb5dd3845d9b555c6e2b9f8a501" + "m_Id": "965ab717028649d09dc451655d1c40d5" + }, + { + "m_Id": "9f81526225084727b4a7f3569cc96a71" + }, + { + "m_Id": "279b696f58474e969da6c44ed208e488" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "811f59e0077743e7a0ed09c37bd2be3a", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "83e96df0b69e4f08b308ae350c294360", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -418.00006103515627, + "y": -88.00000762939453, + "width": 105.0, + "height": 33.99999237060547 + } + }, + "m_Slots": [ + { + "m_Id": "706c498d7f7447d389b70e35b8cbc105" } ], "synonyms": [], @@ -2443,18 +2209,172 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_SerializedDescriptor": "SurfaceDescription.BaseColor" + "m_Property": { + "m_Id": "37a4a92c07c24c9caba2b8e3028295e5" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "89e50a6bb6b14cfcafbea79dcb2fe7e8", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVNode", + "m_ObjectId": "8abc3ad6ab584118858c7bfaddb96cbf", + "m_Group": { + "m_Id": "" + }, + "m_Name": "UV", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2069.0, + "y": -598.0000610351563, + "width": 208.0001220703125, + "height": 313.0000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "a23067f6ba69437c8e000e134dbd9432" + } + ], + "synonyms": [ + "texcoords", + "coords", + "coordinates" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_OutputChannel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "8b099451bb3242398e7d0f294ad62333", + "m_Id": 1, + "m_DisplayName": "Tiling", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tiling", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "8d9f1ab276f14f409e1a4107460a94b7", + "m_Id": 2, + "m_DisplayName": "Offset", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Offset", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8da7e4845d3a4cf7a4c34c314edd1187", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } } { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "9a0a1d0fac7a408f9cdda52b6b9e0b0e", - "m_Id": 4, - "m_DisplayName": "R", + "m_ObjectId": "9035c965fb4941a58f2f4f18b08cacd9", + "m_Id": 5, + "m_DisplayName": "G", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "R", + "m_ShaderOutputName": "G", "m_StageCapability": 2, "m_Value": 0.0, "m_DefaultValue": 0.0, @@ -2464,7 +2384,7 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "9a1d4bfccf394f3d9b992475b1a77f00", + "m_ObjectId": "914169c5e4ce421ab98b8cc15ea17b42", "m_Id": 0, "m_DisplayName": "UV", "m_SlotType": 0, @@ -2483,121 +2403,10 @@ "m_Channel": 0 } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.SampleGradient", - "m_ObjectId": "9af886e38383487193e9c5aa546bc399", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Sample Gradient", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1202.0001220703125, - "y": 371.0, - "width": 208.0, - "height": 302.00006103515627 - } - }, - "m_Slots": [ - { - "m_Id": "6a6a719ad3c344e7b9654745c935f994" - }, - { - "m_Id": "580c54af5aec4ec3bbbb355a302a44ae" - }, - { - "m_Id": "995ab46301d84a02b373226cc62a8a15" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "a104c4bdfbc1468397cfb567fb8fc518", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "e00": 2.0, - "e01": 2.0, - "e02": 2.0, - "e03": 2.0, - "e10": 2.0, - "e11": 2.0, - "e12": 2.0, - "e13": 2.0, - "e20": 2.0, - "e21": 2.0, - "e22": 2.0, - "e23": 2.0, - "e30": 2.0, - "e31": 2.0, - "e32": 2.0, - "e33": 2.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "a5c5483f8b53465eba5723523dbddd70", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "aa9ed7cbbc564a2d9c00552a6e9a24c0", + "m_ObjectId": "91d444cabe4141068b2b5bb2df64d12c", "m_Group": { "m_Id": "" }, @@ -2606,15 +2415,15 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2221.000244140625, - "y": 587.0, - "width": 109.0, - "height": 34.00006103515625 + "x": -1757.0001220703125, + "y": 705.0000610351563, + "width": 159.0001220703125, + "height": 34.0 } }, "m_Slots": [ { - "m_Id": "d9173b90d52b463995b72b862bed875b" + "m_Id": "e7ebf77dce9f43e7800325ad7308dcbf" } ], "synonyms": [], @@ -2626,71 +2435,20 @@ "m_SerializableColors": [] }, "m_Property": { - "m_Id": "3d13d2482f984398b1ca9f1787dc786f" + "m_Id": "2d939178d3024f8dacbb530bf90ed109" } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "acc9cb227f304ef692afe1c1acd8b085", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", - "m_ObjectId": "b0bd09612f0b4df9b8888f2ec909f55d", - "m_Id": 0, - "m_DisplayName": "MainTex", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_BareResource": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "b8694ed8cc9044bb8c20012361aed6a8", - "m_Id": 7, - "m_DisplayName": "A", + "m_ObjectId": "958143c7db1f418db3e0d8b365085b12", + "m_Id": 0, + "m_DisplayName": "Time", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "bafd439d995840b88c562aef1fe42f65", - "m_Id": 5, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 2, + "m_ShaderOutputName": "Time", + "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, "m_Labels": [] @@ -2699,12 +2457,12 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "bb7da09843fc4740b8cf1782496a16ea", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, + "m_ObjectId": "965ab717028649d09dc451655d1c40d5", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Out", + "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { "e00": 0.0, @@ -2744,220 +2502,114 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.GradientMaterialSlot", - "m_ObjectId": "be879cb4592c4f018cd3b4eca43ec84e", - "m_Id": 0, - "m_DisplayName": "Color", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "c9e74384c9ae4295a68abcb249b11cb7", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, + "m_ObjectId": "96c03e3a10194ba5a8c26b9c8b93be08", + "m_Id": 1, + "m_DisplayName": "Scale", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Out", + "m_ShaderOutputName": "Scale", "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, + "m_Value": 5.0, + "m_DefaultValue": 10.0, "m_Labels": [] } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "ca494eba349540bda16a7a7ef9e5e642", - "m_Id": 7, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "9a6ab1f923344f0092921d440b4d9000", + "m_Id": 0, "m_DisplayName": "A", - "m_SlotType": 1, + "m_SlotType": 0, "m_Hidden": false, "m_ShaderOutputName": "A", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d0d34563f4824ee7a7293e1e40a34d8d", - "m_Id": 5, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d2a233c3353d485da42f0aeece4de2d9", - "m_Id": 0, - "m_DisplayName": "MoveSpeed", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d9173b90d52b463995b72b862bed875b", - "m_Id": 0, - "m_DisplayName": "ColorSpeed", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.GradientShaderProperty", - "m_ObjectId": "d969cbdf89e242a994ee4314aa9859bd", - "m_Guid": { - "m_GuidSerialized": "fd618680-98d1-4334-893c-a86e6befa37e" - }, - "m_Name": "Color", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Color", - "m_DefaultReferenceName": "_Color", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, "m_Value": { - "serializedVersion": "2", - "key0": { - "r": 1.0, - "g": 1.0, - "b": 0.0, - "a": 0.0 - }, - "key1": { - "r": 1.4980392456054688, - "g": 0.9960784316062927, - "b": 0.0, - "a": 1.0 - }, - "key2": { - "r": 1.0, - "g": 1.0, - "b": 0.0, - "a": 1.0 - }, - "key3": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key4": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key5": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key6": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "key7": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "ctime0": 0, - "ctime1": 49151, - "ctime2": 65535, - "ctime3": 0, - "ctime4": 0, - "ctime5": 0, - "ctime6": 0, - "ctime7": 0, - "atime0": 0, - "atime1": 16384, - "atime2": 49151, - "atime3": 65535, - "atime4": 0, - "atime5": 0, - "atime6": 0, - "atime7": 0, - "m_Mode": 0, - "m_ColorSpace": 1, - "m_NumColorKeys": 3, - "m_NumAlphaKeys": 4 + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "db6cc2418b1c4f75a2db04362aae1067", - "m_Id": 3, - "m_DisplayName": "Sampler", + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "9bfdebcf54e44553b56de37fd6acc9cc", + "m_Id": 0, + "m_DisplayName": "Normal", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3, - "m_BareResource": false + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "dfbe323d0a404e6eaef7470089539036", + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "9cb6db8279b747bcad1ec5a6d7d8aafc", "m_Group": { "m_Id": "" }, - "m_Name": "Property", + "m_Name": "VertexDescription.Position", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2429.0, - "y": 858.0000610351563, - "width": 116.0, - "height": 34.0 + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 } }, "m_Slots": [ { - "m_Id": "d2a233c3353d485da42f0aeece4de2d9" + "m_Id": "33fc47313a8d4e5dbb568fa198da5b24" } ], "synonyms": [], @@ -2968,114 +2620,14 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_Property": { - "m_Id": "6f2ac14256884d08845f3bf338b3239f" - } + "m_SerializedDescriptor": "VertexDescription.Position" } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "e0ccaea8d7f0427392a67134e58bc363", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -889.9999389648438, - "y": 455.99993896484377, - "width": 207.99993896484376, - "height": 302.0 - } - }, - "m_Slots": [ - { - "m_Id": "4d9ef5bc6986446b8a241ae5c442c897" - }, - { - "m_Id": "a104c4bdfbc1468397cfb567fb8fc518" - }, - { - "m_Id": "bb7da09843fc4740b8cf1782496a16ea" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "e5dacf92ceeb4e8ca28d244050538f3e", - "m_Id": 2, - "m_DisplayName": "Y", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Y", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [ - "Y" - ] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.AbsoluteNode", - "m_ObjectId": "e82e57e5027f487594042eefcb712047", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Absolute", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1527.0001220703125, - "y": 429.0000305175781, - "width": 208.0, - "height": 278.0000305175781 - } - }, - "m_Slots": [ - { - "m_Id": "a5c5483f8b53465eba5723523dbddd70" - }, - { - "m_Id": "e898583db3a44129a6edebe6eefcc843" - } - ], - "synonyms": [ - "positive" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "e898583db3a44129a6edebe6eefcc843", - "m_Id": 1, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "9e5a8888eff648f8a1b155d18f4d03b4", + "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, @@ -3083,22 +2635,19 @@ "m_StageCapability": 3, "m_Value": { "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 + "y": 0.0 }, "m_DefaultValue": { "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } + "y": 0.0 + }, + "m_Labels": [] } { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "ec0ec52aa1ee44a1ab197271e78087c8", + "m_ObjectId": "9f81526225084727b4a7f3569cc96a71", "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, @@ -3144,125 +2693,463 @@ } { - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "ee8c11e492e843ad8aab59aa0967a38b", - "m_Id": 1, - "m_DisplayName": "Sine Time", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Sine Time", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "f2a8423bd0dd44b592f947dd98bbcc94", - "m_Id": 1, - "m_DisplayName": "Sine Time", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Sine Time", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "f4579b6ea45841e4a632a6b9070437ac", - "m_Group": { - "m_Id": "" + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "a1813b6e770e4b1c8684bb95e9c84cff", + "m_Guid": { + "m_GuidSerialized": "620127b0-ba99-49de-943b-3c91379d335c" }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2041.000244140625, - "y": 399.00006103515627, - "width": 208.0, - "height": 302.0 - } - }, - "m_Slots": [ - { - "m_Id": "7dd0d319ad3447d98272525c034ab2c7" - }, - { - "m_Id": "272456b600274276b6583c4e97f7e590" - }, - { - "m_Id": "998d3e59002d4ec9a967408db4bcebf0" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, + "m_Name": "DistortionAmount", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DistortionAmount", + "m_DefaultReferenceName": "_DistortionAmount", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.10000000149011612, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "f500a9ace2b54a5f88ac9ef58123410a", - "m_Group": { - "m_Id": "" + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "a18ea43006f14d9895ad156501ac0ff6", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -558.77001953125, - "y": 210.22998046875, - "width": 208.0, - "height": 302.0 - } - }, - "m_Slots": [ - { - "m_Id": "34ca0c53add84688800657d78b12fe8c" - }, - { - "m_Id": "3d230adc291f4a04a0afb57ec9354649" - }, - { - "m_Id": "738bc58eaf3945fcaf0031969a6e0096" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "a22250821063456493450bcac5b5d5bf", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "3ec9d06dad9742238bde79c1d63bfd73" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 1, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 0, + "m_AlphaClip": false, + "m_CastShadows": false, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "f9ca03f55bc74aba97a3cb7ed5f3da08", + "m_ObjectId": "a23067f6ba69437c8e000e134dbd9432", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a6689ac0b5b44009bf7cefce7a441be4", + "m_Id": 1, + "m_DisplayName": "Sine Time", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Sine Time", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a94a14a5f0c7448fa3ca185e7831ffd7", + "m_Id": 3, + "m_DisplayName": "Delta Time", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Delta Time", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "b35904affe3340fcbac13926c2afc42e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2948.0, + "y": -8.0, + "width": 161.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "532c08a708d944fe85a28296d89fa7f8" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "5dec3f1716ba413782e0ed4d4cb08208" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "b899985de28f4766b8187db832c53243", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1833.0, + "y": -390.0000305175781, + "width": 167.0001220703125, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "fb6b0f3bd75d44b89c831e0d3e4aa6e3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a1813b6e770e4b1c8684bb95e9c84cff" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "ba4538d3bf424aa2addee2fa4475a903", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2754.0, + "y": 412.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "9a6ab1f923344f0092921d440b4d9000" + }, + { + "m_Id": "2c093d6a11044360a19616fe02c57325" + }, + { + "m_Id": "de315eec08ba46aa9f1807ad7dfb03e9" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "c2d69578ec5c4dfb9899e2180c037db1", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2105.0, + "y": 764.0, + "width": 147.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "3e37529e1896477ea5ceb14b1c4bd297" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "f68f10b2ed6049a78017d9544c8b5fd1" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "c38780a43503411385404b82be296ac5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2754.0, + "y": -49.0000114440918, + "width": 208.0, + "height": 302.00006103515627 + } + }, + "m_Slots": [ + { + "m_Id": "558770aaebdd42bcb48af50c4de5280a" + }, + { + "m_Id": "130fa58777a441e4aee7b91ef16b890c" + }, + { + "m_Id": "7b2d87037b7941bda405965b080580da" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "c8239da6425d4ea3996940c3e58f270a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1096.9998779296875, + "y": -464.0, + "width": 127.0, + "height": 33.99993896484375 + } + }, + "m_Slots": [ + { + "m_Id": "66858ec7cd404a1f87b054cbd0ed9913" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "541842d62c5c412e9c37e532a7226de4" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "c8afb1c0d2af4bfeb3f20479839e39c5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "5074e787469d49c1a13f261995c3efb5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "c95e792ca3f944338388137341507673", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -418.00006103515627, + "y": -54.000030517578128, + "width": 207.99993896484376, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "89e50a6bb6b14cfcafbea79dcb2fe7e8" + }, + { + "m_Id": "71f45def15254c9d88e1a5fb94303ec7" + }, + { + "m_Id": "61b92ae4e2b045098591cf45a6df328c" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c9a8903a8a214ce9b54387dd47854164", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "c9d6eb7eca864ecaaa80d721b9287a18", "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, @@ -3286,25 +3173,148 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "fa849a709df64d38837306cbea450599", + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "d023828b18324d3cb812b19abd7c6a47", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "541842d62c5c412e9c37e532a7226de4" + }, + { + "m_Id": "37a4a92c07c24c9caba2b8e3028295e5" + }, + { + "m_Id": "a1813b6e770e4b1c8684bb95e9c84cff" + }, + { + "m_Id": "2544b29e114c4338b2d2e1071cc2c592" + }, + { + "m_Id": "5dec3f1716ba413782e0ed4d4cb08208" + }, + { + "m_Id": "205837fb7fa6420b90265cdc52bc45ee" + }, + { + "m_Id": "f68f10b2ed6049a78017d9544c8b5fd1" + }, + { + "m_Id": "2d939178d3024f8dacbb530bf90ed109" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d0a6d665c1bf42489e6a0583d3523909", + "m_Id": 2, + "m_DisplayName": "Cosine Time", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Cosine Time", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "dbf872aae10440e48fec5bd8ed5d3285", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "de315eec08ba46aa9f1807ad7dfb03e9", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PowerNode", + "m_ObjectId": "df7e2d9e4f084ee09b449fefa3e01b6d", "m_Group": { "m_Id": "" }, - "m_Name": "SurfaceDescription.Alpha", + "m_Name": "Power", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": -1761.0, + "y": 402.9999694824219, + "width": 207.9998779296875, + "height": 302.0000915527344 } }, "m_Slots": [ { - "m_Id": "2c4ab16604a64728a8879ca4280aa397" + "m_Id": "a18ea43006f14d9895ad156501ac0ff6" + }, + { + "m_Id": "6df2acf4d33e44a69e9b4ae0e6af0e29" + }, + { + "m_Id": "1b2ae36a7e47475a8b7bc2e235e5d6ef" } ], "synonyms": [], @@ -3314,7 +3324,263 @@ "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Alpha" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "e1076f3fcdaf46b7b29bdc8e330a4a55", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e7ebf77dce9f43e7800325ad7308dcbf", + "m_Id": 0, + "m_DisplayName": "DissolveAmount", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.VoronoiNode", + "m_ObjectId": "edb7864205944891a4a879317e87a9ac", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Voronoi", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2105.000244140625, + "y": 402.9999694824219, + "width": 208.0003662109375, + "height": 361.0000915527344 + } + }, + "m_Slots": [ + { + "m_Id": "551a9f24b4074be5b6b40ae503b53427" + }, + { + "m_Id": "7a1139a98ab145199ca0ac10dc9bba68" + }, + { + "m_Id": "0a714cddb87c4aeb81829948b1f874bd" + }, + { + "m_Id": "4ecf241441234be3b5fcf9595209bec8" + }, + { + "m_Id": "5258610b13c74917ba3272efd063bc11" + } + ], + "synonyms": [ + "worley noise" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_HashType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TimeNode", + "m_ObjectId": "edf2544b9ee9423fbf85ebe8642aef24", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Time", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3009.0, + "y": 214.0000457763672, + "width": 124.0, + "height": 172.99998474121095 + } + }, + "m_Slots": [ + { + "m_Id": "958143c7db1f418db3e0d8b365085b12" + }, + { + "m_Id": "a6689ac0b5b44009bf7cefce7a441be4" + }, + { + "m_Id": "d0a6d665c1bf42489e6a0583d3523909" + }, + { + "m_Id": "a94a14a5f0c7448fa3ca185e7831ffd7" + }, + { + "m_Id": "2a57ea4c7aa14be1b57cf26e1187825f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "ee54203f5c474fd58175b1b11debb5dd", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -747.0, + "y": 48.9999885559082, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "291299197a814f73a5217bf2c1d13cfb" + }, + { + "m_Id": "e1076f3fcdaf46b7b29bdc8e330a4a55" + }, + { + "m_Id": "7e7e98d4eead41a2935ebf1eed9663a7" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "f68f10b2ed6049a78017d9544c8b5fd1", + "m_Guid": { + "m_GuidSerialized": "f5bc9139-7f8c-45d5-a546-6c14673494b6" + }, + "m_Name": "DissolveScale", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DissolveScale", + "m_DefaultReferenceName": "_DissolveScale", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 2.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "fb5b8b5622ca42c188d7da932fd1425d", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "fb6b0f3bd75d44b89c831e0d3e4aa6e3", + "m_Id": 0, + "m_DisplayName": "DistortionAmount", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] } diff --git a/Assets/09.Shaders/Halo.shadergraph.meta b/Assets/09.Shaders/MapEntrance.shadergraph.meta similarity index 86% rename from Assets/09.Shaders/Halo.shadergraph.meta rename to Assets/09.Shaders/MapEntrance.shadergraph.meta index 9b164c534..f2f816fd1 100644 --- a/Assets/09.Shaders/Halo.shadergraph.meta +++ b/Assets/09.Shaders/MapEntrance.shadergraph.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cff0ef5afae2fcf4fa29845cca3ba2d6 +guid: e554a7f1a3b4f9b40bb81cc2c27d2ef4 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/09.Shaders/OpaqueLitTest.shadergraph b/Assets/09.Shaders/OpaqueLitTest.shadergraph deleted file mode 100644 index 1aa6f3a61..000000000 --- a/Assets/09.Shaders/OpaqueLitTest.shadergraph +++ /dev/null @@ -1,1117 +0,0 @@ -{ - "m_SGVersion": 3, - "m_Type": "UnityEditor.ShaderGraph.GraphData", - "m_ObjectId": "c6df821332a54857ab0b90a4bb141044", - "m_Properties": [ - { - "m_Id": "a20a96562c314b80af9e4e475f0d4459" - } - ], - "m_Keywords": [], - "m_Dropdowns": [], - "m_CategoryData": [ - { - "m_Id": "84d50b2d304447d485f5e2db043558b3" - } - ], - "m_Nodes": [ - { - "m_Id": "bf29d5136d7d40179c35baeb72eb4724" - }, - { - "m_Id": "5c802b3c311c4a10bbaa51d11a207990" - }, - { - "m_Id": "fe8eaf38216b472d8f759dc90b67b482" - }, - { - "m_Id": "1aab0a487de9424a9a0abac9fa3820c8" - }, - { - "m_Id": "217fe9ea2c6847f98457f3aa53a0a7e8" - }, - { - "m_Id": "3966336657384e11a5ce0b536cd8fd1d" - }, - { - "m_Id": "76952b1bb18c45148868ffbeacecf094" - }, - { - "m_Id": "75778f811b2b4a819c15c0ac1d8b72d5" - }, - { - "m_Id": "73a77492fc0c4be895e93a61b92581b8" - }, - { - "m_Id": "49b1c73c64354753b78441f2ffeaa736" - }, - { - "m_Id": "93839485c463493ba4bf99b7820f0f0f" - }, - { - "m_Id": "f91ebfd2449845288c1756261b95fed4" - }, - { - "m_Id": "35d40b864ba847d0803e1f4a7faf811c" - } - ], - "m_GroupDatas": [], - "m_StickyNoteDatas": [], - "m_Edges": [ - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "75778f811b2b4a819c15c0ac1d8b72d5" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "76952b1bb18c45148868ffbeacecf094" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "76952b1bb18c45148868ffbeacecf094" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "1aab0a487de9424a9a0abac9fa3820c8" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "76952b1bb18c45148868ffbeacecf094" - }, - "m_SlotId": 7 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "217fe9ea2c6847f98457f3aa53a0a7e8" - }, - "m_SlotId": 0 - } - } - ], - "m_VertexContext": { - "m_Position": { - "x": 0.0, - "y": 0.0 - }, - "m_Blocks": [ - { - "m_Id": "bf29d5136d7d40179c35baeb72eb4724" - }, - { - "m_Id": "5c802b3c311c4a10bbaa51d11a207990" - }, - { - "m_Id": "fe8eaf38216b472d8f759dc90b67b482" - } - ] - }, - "m_FragmentContext": { - "m_Position": { - "x": 0.0, - "y": 200.0 - }, - "m_Blocks": [ - { - "m_Id": "1aab0a487de9424a9a0abac9fa3820c8" - }, - { - "m_Id": "217fe9ea2c6847f98457f3aa53a0a7e8" - }, - { - "m_Id": "3966336657384e11a5ce0b536cd8fd1d" - }, - { - "m_Id": "73a77492fc0c4be895e93a61b92581b8" - }, - { - "m_Id": "49b1c73c64354753b78441f2ffeaa736" - }, - { - "m_Id": "93839485c463493ba4bf99b7820f0f0f" - }, - { - "m_Id": "f91ebfd2449845288c1756261b95fed4" - }, - { - "m_Id": "35d40b864ba847d0803e1f4a7faf811c" - } - ] - }, - "m_PreviewData": { - "serializedMesh": { - "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", - "m_Guid": "" - }, - "preventRotation": false - }, - "m_Path": "Shader Graphs", - "m_GraphPrecision": 1, - "m_PreviewMode": 2, - "m_OutputNode": { - "m_Id": "" - }, - "m_SubDatas": [], - "m_ActiveTargets": [ - { - "m_Id": "a1457f3beda445ac954e54be7ac103a0" - } - ] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "1305f95303484d85a188255dfb5e1b64", - "m_Id": 0, - "m_DisplayName": "Specular Color", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Specular", - "m_StageCapability": 2, - "m_Value": { - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_ColorMode": 0, - "m_DefaultColor": { - "r": 0.5, - "g": 0.5, - "b": 0.5, - "a": 1.0 - } -} - -{ - "m_SGVersion": 2, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", - "m_ObjectId": "1572770bc2564cfdb6e8c8a1d4a10643", - "m_WorkflowMode": 0, - "m_NormalDropOffSpace": 0, - "m_ClearCoat": false, - "m_BlendModePreserveSpecular": true -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "1aab0a487de9424a9a0abac9fa3820c8", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.BaseColor", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "1ed082026f4c433f964371d939c80a14" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.BaseColor" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "1ed082026f4c433f964371d939c80a14", - "m_Id": 0, - "m_DisplayName": "Base Color", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "BaseColor", - "m_StageCapability": 2, - "m_Value": { - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_ColorMode": 0, - "m_DefaultColor": { - "r": 0.5, - "g": 0.5, - "b": 0.5, - "a": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "217fe9ea2c6847f98457f3aa53a0a7e8", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Alpha", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "a9174470a4b34bffa688cb00c391588e" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Alpha" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "2efcf83716bd44b8b78d386c28f32e13", - "m_Id": 4, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "35d40b864ba847d0803e1f4a7faf811c", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Specular", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "1305f95303484d85a188255dfb5e1b64" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Specular" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "3966336657384e11a5ce0b536cd8fd1d", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.AlphaClipThreshold", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "6590ff78183549a991005ac6c58eb716" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "49b1c73c64354753b78441f2ffeaa736", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.NormalTS", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "a8f002b3053240e7855c0aae84d7b5c0" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.NormalTS" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", - "m_ObjectId": "5979f46a8126435a9688e6f87691378c", - "m_Id": 0, - "m_DisplayName": "Tangent", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Tangent", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", - "m_ObjectId": "5aa7140680e34ba5a5650571c5a29fca", - "m_Id": 0, - "m_DisplayName": "Normal", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Normal", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "5c802b3c311c4a10bbaa51d11a207990", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.Normal", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "5aa7140680e34ba5a5650571c5a29fca" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.Normal" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "658450c1a0fd4584ba8d3502d41d1d90", - "m_Id": 6, - "m_DisplayName": "B", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "6590ff78183549a991005ac6c58eb716", - "m_Id": 0, - "m_DisplayName": "Alpha Clip Threshold", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "AlphaClipThreshold", - "m_StageCapability": 2, - "m_Value": 0.5, - "m_DefaultValue": 0.5, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "73a77492fc0c4be895e93a61b92581b8", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Smoothness", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "ed27c65440d5413c950638a21da6baba" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Smoothness" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "75778f811b2b4a819c15c0ac1d8b72d5", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -641.9999389648438, - "y": 166.0, - "width": 127.0, - "height": 34.0 - } - }, - "m_Slots": [ - { - "m_Id": "c06dccf83af04fb1abb899a0fa3200ea" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "a20a96562c314b80af9e4e475f0d4459" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", - "m_ObjectId": "76952b1bb18c45148868ffbeacecf094", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Sample Texture 2D", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -641.9999389648438, - "y": 200.0, - "width": 208.0, - "height": 434.99993896484377 - } - }, - "m_Slots": [ - { - "m_Id": "e5780d2c64ce4aadb94ed531f625455c" - }, - { - "m_Id": "2efcf83716bd44b8b78d386c28f32e13" - }, - { - "m_Id": "f8038eec4923457b89e8f0b574834f44" - }, - { - "m_Id": "658450c1a0fd4584ba8d3502d41d1d90" - }, - { - "m_Id": "9e9b3f3ca3be46d98510bcec27b627b3" - }, - { - "m_Id": "906bec2a17a64b4cb819f770a0d756b6" - }, - { - "m_Id": "ffaed9e64eaf44e6a0579e75bc65422b" - }, - { - "m_Id": "f46cbf1e01c04085b3616097b2556e67" - } - ], - "synonyms": [ - "tex2d" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_TextureType": 0, - "m_NormalMapSpace": 0, - "m_EnableGlobalMipBias": true, - "m_MipSamplingMode": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CategoryData", - "m_ObjectId": "84d50b2d304447d485f5e2db043558b3", - "m_Name": "", - "m_ChildObjectList": [ - { - "m_Id": "a20a96562c314b80af9e4e475f0d4459" - } - ] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", - "m_ObjectId": "852ffd0d2ee047a08ec312cdba0c04c8", - "m_Id": 0, - "m_DisplayName": "Position", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Position", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "8c129fd2a17e4704966e624946d4529d", - "m_Id": 0, - "m_DisplayName": "Ambient Occlusion", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Occlusion", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", - "m_ObjectId": "906bec2a17a64b4cb819f770a0d756b6", - "m_Id": 1, - "m_DisplayName": "Texture", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Texture", - "m_StageCapability": 3, - "m_BareResource": false, - "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", - "m_Guid": "" - }, - "m_DefaultType": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "93839485c463493ba4bf99b7820f0f0f", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Emission", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "d57f157c229f4831be9b6cb3010887fd" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Emission" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "9e9b3f3ca3be46d98510bcec27b627b3", - "m_Id": 7, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", - "m_ObjectId": "a1457f3beda445ac954e54be7ac103a0", - "m_Datas": [], - "m_ActiveSubTarget": { - "m_Id": "1572770bc2564cfdb6e8c8a1d4a10643" - }, - "m_AllowMaterialOverride": false, - "m_SurfaceType": 0, - "m_ZTestMode": 4, - "m_ZWriteControl": 0, - "m_AlphaMode": 0, - "m_RenderFace": 0, - "m_AlphaClip": true, - "m_CastShadows": true, - "m_ReceiveShadows": true, - "m_DisableTint": false, - "m_AdditionalMotionVectorMode": 0, - "m_AlembicMotionVectors": false, - "m_SupportsLODCrossFade": false, - "m_CustomEditorGUI": "", - "m_SupportVFX": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", - "m_ObjectId": "a20a96562c314b80af9e4e475f0d4459", - "m_Guid": { - "m_GuidSerialized": "ec73ba8c-d5e2-4519-9151-f5c0673c3778" - }, - "m_Name": "MainTex", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "MainTex", - "m_DefaultReferenceName": "_MainTex", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", - "m_Guid": "" - }, - "isMainTexture": false, - "useTilingAndOffset": false, - "m_Modifiable": true, - "m_DefaultType": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", - "m_ObjectId": "a8f002b3053240e7855c0aae84d7b5c0", - "m_Id": 0, - "m_DisplayName": "Normal (Tangent Space)", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "NormalTS", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 3 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "a9174470a4b34bffa688cb00c391588e", - "m_Id": 0, - "m_DisplayName": "Alpha", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Alpha", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "bf29d5136d7d40179c35baeb72eb4724", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.Position", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "852ffd0d2ee047a08ec312cdba0c04c8" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.Position" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", - "m_ObjectId": "c06dccf83af04fb1abb899a0fa3200ea", - "m_Id": 0, - "m_DisplayName": "MainTex", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_BareResource": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "d57f157c229f4831be9b6cb3010887fd", - "m_Id": 0, - "m_DisplayName": "Emission", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Emission", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_ColorMode": 1, - "m_DefaultColor": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "e5780d2c64ce4aadb94ed531f625455c", - "m_Id": 0, - "m_DisplayName": "RGBA", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "RGBA", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "ed27c65440d5413c950638a21da6baba", - "m_Id": 0, - "m_DisplayName": "Smoothness", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Smoothness", - "m_StageCapability": 2, - "m_Value": 0.5, - "m_DefaultValue": 0.5, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "f46cbf1e01c04085b3616097b2556e67", - "m_Id": 3, - "m_DisplayName": "Sampler", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3, - "m_BareResource": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "f8038eec4923457b89e8f0b574834f44", - "m_Id": 5, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "f91ebfd2449845288c1756261b95fed4", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Occlusion", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "8c129fd2a17e4704966e624946d4529d" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Occlusion" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "fe8eaf38216b472d8f759dc90b67b482", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.Tangent", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "5979f46a8126435a9688e6f87691378c" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.Tangent" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "ffaed9e64eaf44e6a0579e75bc65422b", - "m_Id": 2, - "m_DisplayName": "UV", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "UV", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [], - "m_Channel": 0 -} - diff --git a/Assets/09.Shaders/OpaqueLitTest.shadergraph.meta b/Assets/09.Shaders/OpaqueLitTest.shadergraph.meta deleted file mode 100644 index ba9fc3dc9..000000000 --- a/Assets/09.Shaders/OpaqueLitTest.shadergraph.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 835dd53a78c02664c864a5a31c79c4c5 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/09.Shaders/TestLit.shader b/Assets/09.Shaders/TestLit.shader deleted file mode 100644 index ef7d3a393..000000000 --- a/Assets/09.Shaders/TestLit.shader +++ /dev/null @@ -1,57 +0,0 @@ -Shader "Custom/OpaqueNoZWrite" -{ - Properties - { - _MainTex ("Main Texture", 2D) = "white" {} - } - SubShader - { - Tags { "RenderType"="Opaque" } - LOD 200 - - Pass - { - Tags { "LightMode"="ForwardBase" } - ZWrite Off - Blend SrcAlpha OneMinusSrcAlpha - - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #include "UnityCG.cginc" - - struct appdata_t - { - float4 vertex : POSITION; - float2 uv : TEXCOORD0; - }; - - struct v2f - { - float2 uv : TEXCOORD0; - float4 vertex : SV_POSITION; - float3 worldPos : TEXCOORD1; - }; - - sampler2D _MainTex; - float4 _MainTex_ST; - - v2f vert (appdata_t v) - { - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); - o.uv = TRANSFORM_TEX(v.uv, _MainTex); - o.worldPos = mul(unity_ObjectToWorld, v.vertex).xyz; - return o; - } - - half4 frag (v2f i) : SV_Target - { - half4 col = tex2D(_MainTex, i.uv); - return col; - } - ENDCG - } - } - FallBack "Diffuse" -} \ No newline at end of file diff --git a/Assets/09.Shaders/TestLit.shader.meta b/Assets/09.Shaders/TestLit.shader.meta deleted file mode 100644 index fa9e3ae52..000000000 --- a/Assets/09.Shaders/TestLit.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a643f6815755cfc41a3a41cb38352d36 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Excel/CharacterData.xlsx b/Assets/Resources/Excel/CharacterData.xlsx new file mode 100644 index 000000000..3662884ac Binary files /dev/null and b/Assets/Resources/Excel/CharacterData.xlsx differ diff --git a/Assets/Resources/Excel/ItemTable.xlsx.meta b/Assets/Resources/Excel/CharacterData.xlsx.meta similarity index 74% rename from Assets/Resources/Excel/ItemTable.xlsx.meta rename to Assets/Resources/Excel/CharacterData.xlsx.meta index 436e41a23..b48573d48 100644 --- a/Assets/Resources/Excel/ItemTable.xlsx.meta +++ b/Assets/Resources/Excel/CharacterData.xlsx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d27c5dd36451ea408eeece9d88aeeb1 +guid: b6279b7f900d32c449b0fe284a469a7f DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Excel/ItemTable.xlsx b/Assets/Resources/Excel/ItemDataTable.xlsx similarity index 50% rename from Assets/Resources/Excel/ItemTable.xlsx rename to Assets/Resources/Excel/ItemDataTable.xlsx index 6d1e6d1f7..0db2de099 100644 Binary files a/Assets/Resources/Excel/ItemTable.xlsx and b/Assets/Resources/Excel/ItemDataTable.xlsx differ diff --git a/Assets/Resources/Excel/ItemDataTable.xlsx.meta b/Assets/Resources/Excel/ItemDataTable.xlsx.meta new file mode 100644 index 000000000..c00e5b6e5 --- /dev/null +++ b/Assets/Resources/Excel/ItemDataTable.xlsx.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f46616e8e7147e4e8f672c1d2d8c6ae +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Excel/ItemDropTable.xlsx b/Assets/Resources/Excel/ItemDropTable.xlsx index a9051717e..5f7319860 100644 Binary files a/Assets/Resources/Excel/ItemDropTable.xlsx and b/Assets/Resources/Excel/ItemDropTable.xlsx differ diff --git a/Assets/Resources/JSON/CharacterData.json b/Assets/Resources/JSON/CharacterData.json new file mode 100644 index 000000000..791c97e5e --- /dev/null +++ b/Assets/Resources/JSON/CharacterData.json @@ -0,0 +1,18 @@ +[ + { + "CharacterIdx": 1, + "Name": "타이탄 슬라임" + }, + { + "CharacterIdx": 2, + "Name": "코뿔소" + }, + { + "CharacterIdx": 3, + "Name": "모래 두더지" + }, + { + "CharacterIdx": 4, + "Name": "유령 술통" + } +] \ No newline at end of file diff --git a/Assets/Resources/JSON/CharacterData.json.meta b/Assets/Resources/JSON/CharacterData.json.meta new file mode 100644 index 000000000..10c552458 --- /dev/null +++ b/Assets/Resources/JSON/CharacterData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f2e31a6eb016d17448dc4c5f683f8957 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/JSON/ItemTable.json b/Assets/Resources/JSON/ItemDataTable.json similarity index 95% rename from Assets/Resources/JSON/ItemTable.json rename to Assets/Resources/JSON/ItemDataTable.json index a6dfe5d81..aa77d9457 100644 --- a/Assets/Resources/JSON/ItemTable.json +++ b/Assets/Resources/JSON/ItemDataTable.json @@ -385,5 +385,23 @@ "Price": 0, "Weight": 0, "Desciption": "" + }, + { + "Idx": 50001, + "Name": "하트 반 개", + "Category": 5, + "Type": 0, + "Price": 0, + "Weight": 0, + "Desciption": "" + }, + { + "Idx": 50002, + "Name": "하트 한 개", + "Category": 5, + "Type": 0, + "Price": 0, + "Weight": 0, + "Desciption": "" } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/ItemDataTable.json.meta b/Assets/Resources/JSON/ItemDataTable.json.meta new file mode 100644 index 000000000..c4acd660f --- /dev/null +++ b/Assets/Resources/JSON/ItemDataTable.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 114f5ca2117228b45a8c2a9283ef3dbd +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/JSON/ItemDropTable.json b/Assets/Resources/JSON/ItemDropTable.json index c0ca8421a..8fa6b6ae8 100644 --- a/Assets/Resources/JSON/ItemDropTable.json +++ b/Assets/Resources/JSON/ItemDropTable.json @@ -1,128 +1,86 @@ [ { - "Idx": 1000001, - "Name": "니모", - "ItemIdx1": 10202, - "ItemProb1": 100, - "ItemMin1": 1, - "ItemMax1": 3, - "ItemIdx2": 10701, - "ItemProb2": 80, - "ItemMin2": 1, - "ItemMax2": 1, - "ItemIdx3": 0, - "ItemProb3": 0, - "ItemMin3": 0, - "ItemMax3": 0, - "ItemIdx4": 0, - "ItemProb4": 0, - "ItemMin4": 0, - "ItemMax4": 0, - "Description": "" + "CharacterIdx": 1, + "ItemIdx": 50002, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 }, { - "Idx": 1000002, - "Name": "상어", - "ItemIdx1": 10201, - "ItemProb1": 100, - "ItemMin1": 1, - "ItemMax1": 5, - "ItemIdx2": 10702, - "ItemProb2": 70, - "ItemMin2": 1, - "ItemMax2": 2, - "ItemIdx3": 0, - "ItemProb3": 0, - "ItemMin3": 0, - "ItemMax3": 0, - "ItemIdx4": 0, - "ItemProb4": 0, - "ItemMin4": 0, - "ItemMax4": 0, - "Description": "" + "CharacterIdx": 1, + "ItemIdx": 50002, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 }, { - "Idx": 1000003, - "Name": "가오리", - "ItemIdx1": 10204, - "ItemProb1": 100, - "ItemMin1": 3, - "ItemMax1": 5, - "ItemIdx2": 10703, - "ItemProb2": 50, - "ItemMin2": 1, - "ItemMax2": 3, - "ItemIdx3": 0, - "ItemProb3": 0, - "ItemMin3": 0, - "ItemMax3": 0, - "ItemIdx4": 0, - "ItemProb4": 0, - "ItemMin4": 0, - "ItemMax4": 0, - "Description": "" + "CharacterIdx": 1, + "ItemIdx": 50001, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 }, { - "Idx": 2000001, - "Name": "작은 술통", - "ItemIdx1": 20001, - "ItemProb1": 80, - "ItemMin1": 1, - "ItemMax1": 1, - "ItemIdx2": 20002, - "ItemProb2": 50, - "ItemMin2": 1, - "ItemMax2": 1, - "ItemIdx3": 0, - "ItemProb3": 0, - "ItemMin3": 0, - "ItemMax3": 0, - "ItemIdx4": 0, - "ItemProb4": 0, - "ItemMin4": 0, - "ItemMax4": 0, - "Description": "" + "CharacterIdx": 2, + "ItemIdx": 50002, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 }, { - "Idx": 2000002, - "Name": "큰 술통", - "ItemIdx1": 20002, - "ItemProb1": 80, - "ItemMin1": 1, - "ItemMax1": 1, - "ItemIdx2": 20003, - "ItemProb2": 50, - "ItemMin2": 1, - "ItemMax2": 1, - "ItemIdx3": 0, - "ItemProb3": 0, - "ItemMin3": 0, - "ItemMax3": 0, - "ItemIdx4": 0, - "ItemProb4": 0, - "ItemMin4": 0, - "ItemMax4": 0, - "Description": "" + "CharacterIdx": 2, + "ItemIdx": 50002, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 }, { - "Idx": 3000001, - "Name": "오크", - "ItemIdx1": 10102, - "ItemProb1": 100, - "ItemMin1": 1, - "ItemMax1": 5, - "ItemIdx2": 20001, - "ItemProb2": 30, - "ItemMin2": 1, - "ItemMax2": 1, - "ItemIdx3": 20002, - "ItemProb3": 20, - "ItemMin3": 1, - "ItemMax3": 1, - "ItemIdx4": 20003, - "ItemProb4": 10, - "ItemMin4": 1, - "ItemMax4": 1, - "Description": "" + "CharacterIdx": 2, + "ItemIdx": 50001, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 + }, + { + "CharacterIdx": 3, + "ItemIdx": 50002, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 + }, + { + "CharacterIdx": 3, + "ItemIdx": 50002, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 + }, + { + "CharacterIdx": 3, + "ItemIdx": 50001, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 + }, + { + "CharacterIdx": 4, + "ItemIdx": 50002, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 + }, + { + "CharacterIdx": 4, + "ItemIdx": 50002, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 + }, + { + "CharacterIdx": 4, + "ItemIdx": 50001, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 } ] \ No newline at end of file