diff --git a/Assets/Scenes/Ending/Ending.unity b/Assets/Scenes/Ending/Ending.unity index 736b08e533049d49b608bb9d78982cad8198bcdc..e2639199804238d06fcbe9e1736d74aa80581760 100644 --- a/Assets/Scenes/Ending/Ending.unity +++ b/Assets/Scenes/Ending/Ending.unity @@ -4101,7 +4101,7 @@ MonoBehaviour: gameOverText: {fileID: 1361813100} back: {fileID: 1444419002} replay: {fileID: 1295132236} - stats: {fileID: 1394007606} + stats: {fileID: 510020015} timerText: {fileID: 1967120879} gameOverUI: {fileID: 1496903767} gold: {fileID: 390752059} @@ -4110,7 +4110,8 @@ MonoBehaviour: accuracy: {fileID: 1566271601} distance: {fileID: 1539087080} playTime: {fileID: 2016727064} - FadeOutCanvas: {fileID: 1496903767} + FadeOutCanvas: {fileID: 2013278209} + isEnding: 1 --- !u!114 &933550583 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4137,10 +4138,10 @@ Canvas: m_GameObject: {fileID: 933550581} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 2 + m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 - m_PixelPerfect: 0 + m_PixelPerfect: 1 m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 @@ -4158,9 +4159,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 933550581} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1496903770} @@ -4171,10 +4172,10 @@ RectTransform: m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 960, y: 540} - m_SizeDelta: {x: 1920, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &936875404 GameObject: m_ObjectHideFlags: 0 @@ -12342,6 +12343,169 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2009779896} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2013278209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2013278216} + - component: {fileID: 2013278215} + - component: {fileID: 2013278214} + - component: {fileID: 2013278213} + - component: {fileID: 2013278212} + - component: {fileID: 2013278211} + - component: {fileID: 2013278210} + m_Layer: 5 + m_Name: FadeOut + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!95 &2013278210 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013278209} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 77d810e151cf1b843b841ae5fc4e3b67, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &2013278211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013278209} + 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: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2013278212 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013278209} + m_CullTransparentMesh: 1 +--- !u!114 &2013278213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013278209} + 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: 4294967295 +--- !u!114 &2013278214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013278209} + 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: 0 +--- !u!223 &2013278215 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013278209} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2013278216 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013278209} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &2016727063 GameObject: m_ObjectHideFlags: 0 @@ -12688,3 +12852,4 @@ SceneRoots: - {fileID: 336123839} - {fileID: 768624823} - {fileID: 933550585} + - {fileID: 2013278216} diff --git a/Assets/Scenes/FinalStage.unity b/Assets/Scenes/FinalStage.unity index 06c9630d90591904d75f14595b9d17a2a268f1e1..50fb09499d1248cd51e48efdaeab01e696a8fd71 100644 --- a/Assets/Scenes/FinalStage.unity +++ b/Assets/Scenes/FinalStage.unity @@ -191,6 +191,62 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5553602302172582900, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!1 &43398945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 43398947} + - component: {fileID: 43398946} + m_Layer: 0 + m_Name: SkillActivateTimeline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!320 &43398946 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 43398945} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: 7fe47e08f5fb5d94c835fdb7afac2307, type: 2} + m_InitialState: 1 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: + - key: {fileID: -4635569635243348185, guid: 7fe47e08f5fb5d94c835fdb7afac2307, type: 2} + value: {fileID: 359158917} + - key: {fileID: 8124107451091541054, guid: 7fe47e08f5fb5d94c835fdb7afac2307, type: 2} + value: {fileID: 1230702347393119490} + m_ExposedReferences: + m_References: + - 6b2a83ff5aa4eae4b9dc6f3bd077530e: {fileID: 771524463} + - ab17d5a144597064080982c447844faa: {fileID: 457975038} + - eaf98763e7fc7a042936dab964949b29: {fileID: 457975038} +--- !u!4 &43398947 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 43398945} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11.8880005, y: -2.914, z: -4.6050005} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 359158919} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &48917071 PrefabInstance: m_ObjectHideFlags: 0 @@ -203,7 +259,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 178204620} - target: {fileID: 1604671993335288653, guid: 2efde1f742401b345992c5c07ac5d64d, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -243,6 +299,11 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: + objectReference: {fileID: 178204620} + - target: {fileID: 5675171226873387433, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToMainMenu objectReference: {fileID: 0} - target: {fileID: 8743020687667344940, guid: 2efde1f742401b345992c5c07ac5d64d, type: 3} @@ -454,6 +515,101 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 48917071} m_PrefabAsset: {fileID: 0} +--- !u!1 &52081483 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 52081484} + - component: {fileID: 52081487} + - component: {fileID: 52081486} + - component: {fileID: 52081485} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &52081484 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52081483} + 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: 771524464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &52081485 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52081483} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 1 + m_FollowOffset: {x: 0.55, y: 1.29, z: 3.59} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 +--- !u!114 &52081486 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52081483} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0.03, y: 1.03, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0.5 + m_VerticalDamping: 0.5 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &52081487 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52081483} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!64 &64476522 MeshCollider: m_ObjectHideFlags: 0 @@ -808,47 +964,47 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1263217620473054, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 20.99 + value: 0 objectReference: {fileID: 0} - target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 137.845 + value: 0 objectReference: {fileID: 0} - target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224005418473288314, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224005418473288314, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 0.96943974 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224005418473288314, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} @@ -858,67 +1014,67 @@ PrefabInstance: - target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 90.71484 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 787.2129 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224130951485110974, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.y - value: -589 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224130951485110974, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 0.000030517578 objectReference: {fileID: 0} - target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 1000 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 500 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: -650 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224296548220470038, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} @@ -1023,102 +1179,102 @@ PrefabInstance: - target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 80.71484 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 875.92773 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 80.71484 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 959.6426 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 1000 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.y - value: 607 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 500 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 738.85547 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 369.42773 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 265229693040713684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} @@ -1133,32 +1289,32 @@ PrefabInstance: - target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 50.36 + value: 0 objectReference: {fileID: 0} - target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 96.17 + value: 0 objectReference: {fileID: 0} - target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2626955960605667388, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} @@ -1173,67 +1329,67 @@ PrefabInstance: - target: {fileID: 3005720477010286325, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 160.34001 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 20.99 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 54.495 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.x - value: 26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.x - value: 25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4668199621230494770, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} @@ -1330,6 +1486,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} +--- !u!114 &178204620 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 82616962848050741, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + m_PrefabInstance: {fileID: 1230702347393119482} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1494378619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9da81d5c40610b1459c7b7178d73527c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &196435159 GameObject: m_ObjectHideFlags: 3 @@ -2121,6 +2289,85 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -1774443476973282442, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!1 &359158916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 359158919} + - component: {fileID: 359158918} + - component: {fileID: 359158917} + m_Layer: 0 + m_Name: SkillActivateCutscene + m_TagString: SkillCutscene + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &359158917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359158916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: e3ed75ed698e80a468f330e87b6cab6a, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 359158918} + m_TargetAssemblyTypeName: SkillCutscene, Assembly-CSharp + m_MethodName: EndSkillCutscene + 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 &359158918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359158916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76055dead16e1844cb0d263df451e436, type: 3} + m_Name: + m_EditorClassIdentifier: + timeline: {fileID: 43398945} + virtualCamera: {fileID: 771524462} +--- !u!4 &359158919 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359158916} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.3920007, y: 5.874, z: 16.235} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 43398947} + - {fileID: 771524464} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &388955213 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7814079740138504098, guid: 2efde1f742401b345992c5c07ac5d64d, @@ -3678,6 +3925,78 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -977794717397366713, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!1 &771524462 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 771524464} + - component: {fileID: 771524463} + m_Layer: 0 + m_Name: SkillActiveVC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &771524463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 771524462} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 60.000004 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 52081484} +--- !u!4 &771524464 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 771524462} + serializedVersion: 2 + m_LocalRotation: {x: 0.023409467, y: 0.7556084, z: -0.027044555, w: 0.6540463} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 52081484} + m_Father: {fileID: 359158919} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &778887204 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7767272463233705274, guid: 2efde1f742401b345992c5c07ac5d64d, @@ -4583,12 +4902,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!95 &954395975 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 967265779546741046, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, - type: 3} - m_PrefabInstance: {fileID: 1230702347393119482} - m_PrefabAsset: {fileID: 0} --- !u!64 &962899453 MeshCollider: m_ObjectHideFlags: 0 @@ -12289,12 +12602,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1230702347393119490} m_SourcePrefab: {fileID: 100100000, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, type: 3} ---- !u!4 &1230702347393119483 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6596726506632479564, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, - type: 3} - m_PrefabInstance: {fileID: 1230702347393119482} - m_PrefabAsset: {fileID: 0} --- !u!4 &1230702347393119484 stripped Transform: m_CorrespondingSourceObject: {fileID: 2917468588306943403, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, @@ -12492,243 +12799,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, type: 3} ---- !u!1001 &2563494445740876859 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 752569290355959979, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_Follow - value: - objectReference: {fileID: 1230702347393119483} - - target: {fileID: 752569290355959979, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LookAt - value: - objectReference: {fileID: 1230702347393119483} - - target: {fileID: 2783708759929244023, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.38 - objectReference: {fileID: 0} - - target: {fileID: 2783708759929244023, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalPosition.y - value: -1.8100001 - objectReference: {fileID: 0} - - target: {fileID: 2783708759929244023, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalPosition.z - value: 1.98 - objectReference: {fileID: 0} - - target: {fileID: 2783708759929244023, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.056984745 - objectReference: {fileID: 0} - - target: {fileID: 2783708759929244023, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.006339184 - objectReference: {fileID: 0} - - target: {fileID: 2783708759929244023, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.9922343 - objectReference: {fileID: 0} - - target: {fileID: 2783708759929244023, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.110379644 - objectReference: {fileID: 0} - - target: {fileID: 4367631758843000650, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830000008808023940, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7341299269711349473, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_SceneBindings.Array.size - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_SceneBindings.Array.data[2].key - value: - objectReference: {fileID: -4635569635243348185, guid: 7fe47e08f5fb5d94c835fdb7afac2307, - type: 2} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_SceneBindings.Array.data[0].value - value: - objectReference: {fileID: 954395975} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_SceneBindings.Array.data[1].value - value: - objectReference: {fileID: 1230702347393119490} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_SceneBindings.Array.data[2].value - value: - objectReference: {fileID: 2563494445740876861} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_ExposedReferences.m_References.Array.size - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_ExposedReferences.m_References.Array.data[1].first - value: ab17d5a144597064080982c447844faa - objectReference: {fileID: 0} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_ExposedReferences.m_References.Array.data[2].first - value: eaf98763e7fc7a042936dab964949b29 - objectReference: {fileID: 0} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_ExposedReferences.m_References.Array.data[1].second - value: - objectReference: {fileID: 457975038} - - target: {fileID: 8673702341733266039, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_ExposedReferences.m_References.Array.data[2].second - value: - objectReference: {fileID: 457975038} - - target: {fileID: 8737592062568205315, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_Name - value: SkillCutscene - objectReference: {fileID: 0} - - target: {fileID: 8737592062568205315, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8737592062568205315, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2563494445740876862} - - targetCorrespondingSourceObject: {fileID: 8737592062568205315, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2563494445740876861} - m_SourcePrefab: {fileID: 100100000, guid: 4ae4f7b248d78c34d97e345047ed0470, type: 3} ---- !u!1 &2563494445740876860 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8737592062568205315, guid: 4ae4f7b248d78c34d97e345047ed0470, - type: 3} - m_PrefabInstance: {fileID: 2563494445740876859} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2563494445740876861 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2563494445740876860} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Events: - m_Signals: - - {fileID: 11400000, guid: e3ed75ed698e80a468f330e87b6cab6a, type: 2} - m_Events: - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2563494445740876862} - m_TargetAssemblyTypeName: SkillCutscene, Assembly-CSharp - m_MethodName: EndSkillCutscene - 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 &2563494445740876862 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2563494445740876860} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76055dead16e1844cb0d263df451e436, type: 3} - m_Name: - m_EditorClassIdentifier: - timeline: {fileID: 0} - virtualCamera: {fileID: 0} --- !u!1001 &4739606442214425609 PrefabInstance: m_ObjectHideFlags: 0 @@ -13122,5 +13192,5 @@ SceneRoots: - {fileID: 164501356} - {fileID: 1588702990} - {fileID: 1162384300} - - {fileID: 2563494445740876859} - {fileID: 1468104168} + - {fileID: 359158919} diff --git a/Assets/Scenes/InitialStage.unity b/Assets/Scenes/InitialStage.unity index 0eb930d224ee388c5afe7dfbe2c5bdb13b1be687..647f3f14adf43be3871944800c00f831254dd24a 100644 --- a/Assets/Scenes/InitialStage.unity +++ b/Assets/Scenes/InitialStage.unity @@ -1136,7 +1136,7 @@ PrefabInstance: - target: {fileID: 224130951485110974, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000030517578 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3} diff --git a/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs b/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs index e7c4d17773c1170d27c13465e2505a86ddc5c31a..b0462c58b348a3522e6e325a00204f45183ed21d 100644 --- a/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs +++ b/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs @@ -108,8 +108,6 @@ public class Azathoth : MonoBehaviour float fillF = frontHealthBar.fillAmount; float fillB = backHealthBar.fillAmount; float hFraction = health / maxHealth; - Debug.Log("Health:" + health); - Debug.Log("Max:" + maxHealth); if (fillB > hFraction) { diff --git a/Assets/Script/CutScene1.cs b/Assets/Script/CutScene/CutScene1.cs similarity index 100% rename from Assets/Script/CutScene1.cs rename to Assets/Script/CutScene/CutScene1.cs diff --git a/Assets/Script/CutScene1.cs.meta b/Assets/Script/CutScene/CutScene1.cs.meta similarity index 100% rename from Assets/Script/CutScene1.cs.meta rename to Assets/Script/CutScene/CutScene1.cs.meta diff --git a/Assets/Script/Menu/GameOver.cs b/Assets/Script/Menu/GameOver.cs index 27557c71fc9680c340b3de7b1b027378f813ff18..b395549d95722fbc2e89411979be6f82e186905d 100644 --- a/Assets/Script/Menu/GameOver.cs +++ b/Assets/Script/Menu/GameOver.cs @@ -26,6 +26,8 @@ public class GameOver : MonoBehaviour public GameObject FadeOutCanvas; + public bool isEnding; + void Update() { gold.text = GlobalPreference.Instance.GetPlayerGold().ToString(); @@ -97,6 +99,10 @@ public class GameOver : MonoBehaviour gameOverUI.SetActive(true); Time.timeScale = 0.2f; + if (isEnding) + { + gameOverText.text = "AZATHOTH FELL"; + } gameOverText.gameObject.SetActive(true); back.gameObject.SetActive(true); replay.gameObject.SetActive(true); diff --git a/Assets/Script/Stage/Stage.cs b/Assets/Script/Stage/Stage.cs index 09fa111f626b5dbec3b490f62feaa52ab33908f5..d79641dffb8c0234900a17cefb07c2b210147ffd 100644 --- a/Assets/Script/Stage/Stage.cs +++ b/Assets/Script/Stage/Stage.cs @@ -260,7 +260,7 @@ public class Stage : MonoBehaviour public void GoToBossArena() { - SceneManager.LoadScene(3); + isStageCompleted = true; } diff --git a/Assets/Script/Stage/StageManager.cs b/Assets/Script/Stage/StageManager.cs index f49ae9e4a9dfc2aec4aa65827bb13a0361d99cb3..c0ae5c97c19f784b9dc6a21f642fb9c120e7f687 100644 --- a/Assets/Script/Stage/StageManager.cs +++ b/Assets/Script/Stage/StageManager.cs @@ -23,15 +23,6 @@ public class StageManager : MonoBehaviour if (SaveLoadManager.Instance.GetSaveData() != null) { SaveData data = SaveLoadManager.Instance.GetSaveData(); - currentStage = (int)data.stageNumber; - if (currentStage == 2 || currentStage == 3) - { - /*if (GameObject.FindGameObjectWithTag("Player") != null) - { - GameObject.FindGameObjectWithTag("Player").GetComponent<CharacterController>().center = new Vector3(-18.026f, 20.801f, 49.536f); - }*/ - GameObject.Find("Gate").GetComponent<Animator>().SetTrigger("OpenGate"); - } GlobalPreference.Instance.SetPlayerHealth(data.health); GlobalPreference.Instance.SetPlayerGold(data.golds); @@ -48,6 +39,7 @@ public class StageManager : MonoBehaviour GlobalPreference.Instance.setStageNumber((int)data.stageNumber); } + currentStage = GlobalPreference.Instance.getStageNumber(); if (currentStage == 1) { GlobalPreference.Instance.SetPlayerHealth(100); @@ -64,7 +56,16 @@ public class StageManager : MonoBehaviour GlobalPreference.Instance.setStageNumber(0); } + if (currentStage == 2 || currentStage == 3) + { + /*if (GameObject.FindGameObjectWithTag("Player") != null) + { + GameObject.FindGameObjectWithTag("Player").GetComponent<CharacterController>().center = new Vector3(-18.026f, 20.801f, 49.536f); + }*/ + GameObject.Find("Gate").GetComponent<Animator>().SetTrigger("OpenGate"); + } + SaveLoadManager.Instance.SetSaveData(null); StartNextStage(); } @@ -115,7 +116,7 @@ public class StageManager : MonoBehaviour private void Update() { - if (currentStage > 0 && currentStage <= stages.Count) + if (currentStage > 0 && currentStage < stages.Count) { if (stages[currentStage - 1].isStageCompleted) { @@ -125,6 +126,14 @@ public class StageManager : MonoBehaviour StartNextStage(); } } + + if (currentStage == 3 && stages[currentStage - 1].isStageCompleted) + { + currentStage++; + GlobalPreference.Instance.setStageNumber(currentStage); + SceneManager.LoadScene(3); + } + if (currentStage == 4 && stages[0].isStageCompleted) { Ending(); diff --git a/Assets/Timeline/SkillActivateTimeline.playable b/Assets/Timeline/SkillActivateTimeline.playable index 0937f3b4f036f26fdf4407a4aa9d1a309d239d07..622f866994278d12648ba0b8bd0172124a2fb9a9 100644 --- a/Assets/Timeline/SkillActivateTimeline.playable +++ b/Assets/Timeline/SkillActivateTimeline.playable @@ -163,7 +163,7 @@ MonoBehaviour: m_PreExtrapolationMode: 0 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: SkillVC + m_DisplayName: SkillActiveVC - m_Version: 1 m_Start: 0 m_ClipIn: 0 @@ -201,25 +201,7 @@ MonoBehaviour: m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4