diff --git a/Assets/Images/Ending1.jpg b/Assets/Images/Ending1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f7fcf35094cb0385926d25740a395f302942b3a5
Binary files /dev/null and b/Assets/Images/Ending1.jpg differ
diff --git a/Assets/Images/Ending1.jpg.meta b/Assets/Images/Ending1.jpg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f5ad7650901ce1430cc3b8057336be38d0fd7eb0
--- /dev/null
+++ b/Assets/Images/Ending1.jpg.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 8431c7f5dac6c3248b72acffaffd3ffd
+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: 100
+ 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: 3
+ 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: 3
+ 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: 3
+ buildTarget: WebGL
+ 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: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Images/Ending2.jpg b/Assets/Images/Ending2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5e28ab8dcdb00e8596753602c08da707251850f6
Binary files /dev/null and b/Assets/Images/Ending2.jpg differ
diff --git a/Assets/Images/Ending2.jpg.meta b/Assets/Images/Ending2.jpg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..738ad0ccff87959ca9bc4fdf64c1aaeacf4186c1
--- /dev/null
+++ b/Assets/Images/Ending2.jpg.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 6c51a294f42369c4c8fb8ac94477427f
+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: 100
+ 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: 3
+ 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: 3
+ 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: 3
+ buildTarget: WebGL
+ 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: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Images/Moon.jpg b/Assets/Images/Moon.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..306457312646167656e19e6ebd7002d96080760c
Binary files /dev/null and b/Assets/Images/Moon.jpg differ
diff --git a/Assets/Images/Moon.jpg.meta b/Assets/Images/Moon.jpg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f77173549f04d63dde6c1bef51aa84afdd12a985
--- /dev/null
+++ b/Assets/Images/Moon.jpg.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: c07fffec3d343ff4e9dba06b8232d4c1
+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: 100
+ 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: 3
+ 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: 3
+ 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: 3
+ buildTarget: WebGL
+ 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: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Cutscene01.unity b/Assets/Scenes/Cutscene01.unity
index a010a62c2477f1d1f8e150b732ebd35806712796..59532028a0bca991dbe4370f08c6780f62094e79 100644
--- a/Assets/Scenes/Cutscene01.unity
+++ b/Assets/Scenes/Cutscene01.unity
@@ -337,7 +337,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 3a106aa02d381be4a9f8bc2453ed97f7, type: 3}
+ m_Sprite: {fileID: 21300000, guid: c07fffec3d343ff4e9dba06b8232d4c1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -457,7 +457,7 @@ GameObject:
m_Component:
- component: {fileID: 1048390941}
m_Layer: 5
- m_Name: Background
+ m_Name: Background1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -483,6 +483,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -796, y: -420}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1287938080
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1287938081}
+ - component: {fileID: 1287938083}
+ - component: {fileID: 1287938082}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1287938081
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1287938080}
+ 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: 1892923723}
+ 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: 2040, y: 1000}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1287938082
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1287938080}
+ 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: 0.8617277, b: 0.63836473, 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: 3a106aa02d381be4a9f8bc2453ed97f7, 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 &1287938083
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1287938080}
+ m_CullTransparentMesh: 1
--- !u!1 &1449083821
GameObject:
m_ObjectHideFlags: 0
@@ -779,6 +854,10 @@ PlayableDirector:
value: {fileID: 192952287}
- key: {fileID: 568482636345763445, guid: fbd32a8e77467434390a0bb2bc27dad9, type: 2}
value: {fileID: 1939514713}
+ - key: {fileID: 8984846709375654472, guid: fbd32a8e77467434390a0bb2bc27dad9, type: 2}
+ value: {fileID: 1048390940}
+ - key: {fileID: -1711578561358945306, guid: fbd32a8e77467434390a0bb2bc27dad9, type: 2}
+ value: {fileID: 1892923722}
m_ExposedReferences:
m_References: []
--- !u!114 &1717725237
@@ -857,6 +936,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1048390941}
+ - {fileID: 1892923723}
- {fileID: 1539342327}
- {fileID: 192952291}
m_Father: {fileID: 0}
@@ -866,6 +946,42 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &1892923722
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1892923723}
+ m_Layer: 5
+ m_Name: Background2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1892923723
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1892923722}
+ 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: 1287938081}
+ m_Father: {fileID: 1717725240}
+ 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: -796, y: -420}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1939514713
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Cutscene02.unity b/Assets/Scenes/Cutscene02.unity
index ae91205cf4e88c13d7af84d4a41e1886ba26a608..08ae2bd3e5e188aeef01e63c4f34352a1fb2d8a7 100644
--- a/Assets/Scenes/Cutscene02.unity
+++ b/Assets/Scenes/Cutscene02.unity
@@ -280,6 +280,42 @@ RectTransform:
m_AnchoredPosition: {x: -1.3202515, y: -1.3544159}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &221484540
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 221484541}
+ m_Layer: 5
+ m_Name: Background3
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &221484541
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 221484540}
+ 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: 652061754}
+ m_Father: {fileID: 1717725240}
+ 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.000030517578}
+ m_SizeDelta: {x: -796, y: -420}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &595227443
GameObject:
m_ObjectHideFlags: 0
@@ -292,7 +328,7 @@ GameObject:
- component: {fileID: 595227446}
- component: {fileID: 595227445}
m_Layer: 5
- m_Name: Image
+ m_Name: Image1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -355,6 +391,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 595227443}
m_CullTransparentMesh: 1
+--- !u!1 &652061753
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 652061754}
+ - component: {fileID: 652061756}
+ - component: {fileID: 652061755}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &652061754
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 652061753}
+ 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: 221484541}
+ 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: 2040, y: 1000}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &652061755
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 652061753}
+ 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: 0.8617277, b: 0.63836473, 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: 6c51a294f42369c4c8fb8ac94477427f, 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 &652061756
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 652061753}
+ m_CullTransparentMesh: 1
--- !u!1 &688163777
GameObject:
m_ObjectHideFlags: 0
@@ -447,6 +558,117 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &846240950
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 846240951}
+ - component: {fileID: 846240953}
+ - component: {fileID: 846240952}
+ m_Layer: 5
+ m_Name: Image2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &846240951
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 846240950}
+ 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: 927779855}
+ 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: 2040, y: 1000}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &846240952
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 846240950}
+ 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: 0.8617277, b: 0.63836473, 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: 8431c7f5dac6c3248b72acffaffd3ffd, 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 &846240953
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 846240950}
+ m_CullTransparentMesh: 1
+--- !u!1 &927779854
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 927779855}
+ m_Layer: 5
+ m_Name: Background2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &927779855
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 927779854}
+ 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: 846240951}
+ m_Father: {fileID: 1717725240}
+ 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: -796, y: -420}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1048390940
GameObject:
m_ObjectHideFlags: 0
@@ -457,7 +679,7 @@ GameObject:
m_Component:
- component: {fileID: 1048390941}
m_Layer: 5
- m_Name: Background
+ m_Name: Background1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1113,6 +1335,12 @@ PlayableDirector:
value: {fileID: 1500528272}
- key: {fileID: 5413049159077412055, guid: 981fa61621224e543aa322a0817b2d6a, type: 2}
value: {fileID: 1939514713}
+ - key: {fileID: -1072804772517611936, guid: 981fa61621224e543aa322a0817b2d6a, type: 2}
+ value: {fileID: 927779854}
+ - key: {fileID: -3364128421395627812, guid: 981fa61621224e543aa322a0817b2d6a, type: 2}
+ value: {fileID: 1048390940}
+ - key: {fileID: 8244056328883187425, guid: 981fa61621224e543aa322a0817b2d6a, type: 2}
+ value: {fileID: 221484540}
m_ExposedReferences:
m_References: []
--- !u!114 &1717725237
@@ -1191,6 +1419,8 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1048390941}
+ - {fileID: 927779855}
+ - {fileID: 221484541}
- {fileID: 1539342327}
- {fileID: 192952291}
- {fileID: 1061203995}
diff --git a/Assets/Scenes/CutsceneCanvasTimeline 2.playable b/Assets/Scenes/CutsceneCanvasTimeline 2.playable
index 72e65f0da65c7f71ea2dd6cd804d21ed1318e005..1c3098b4e1a16e2f0cace9a04f62e157865338fa 100644
--- a/Assets/Scenes/CutsceneCanvasTimeline 2.playable
+++ b/Assets/Scenes/CutsceneCanvasTimeline 2.playable
@@ -295,6 +295,18 @@ MonoBehaviour:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-7770302456054834729
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
+--- !u!114 &-7137980134837825668
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -318,7 +330,217 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
+--- !u!114 &-5112093058377935480
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
+--- !u!114 &-3364128421395627812
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (7)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 20.833333333333332
+ m_ClipIn: 0
+ m_Asset: {fileID: -7137980134837825668}
+ m_Duration: 35
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: -3364128421395627812}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ 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_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
+--- !u!114 &-1072804772517611936
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (6)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 0
+ m_ClipIn: 0
+ m_Asset: {fileID: -167652029090678558}
+ m_Duration: 20.833333333333332
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: -1072804772517611936}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ 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_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
--- !u!114 &-371273019374581009
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
+--- !u!114 &-167652029090678558
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -351,6 +573,9 @@ MonoBehaviour:
- {fileID: 9220462361926288203}
- {fileID: 7061713664170658098}
- {fileID: 5413049159077412055}
+ - {fileID: -1072804772517611936}
+ - {fileID: -3364128421395627812}
+ - {fileID: 8244056328883187425}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
@@ -567,6 +792,99 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
+--- !u!114 &8244056328883187425
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (8)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 55.833333333333336
+ m_ClipIn: 0
+ m_Asset: {fileID: -5112093058377935480}
+ m_Duration: 9.666666666666664
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 8244056328883187425}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ 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_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
--- !u!114 &8296852180825488924
MonoBehaviour:
m_ObjectHideFlags: 1
diff --git a/Assets/Scenes/CutsceneCanvasTimeline.playable b/Assets/Scenes/CutsceneCanvasTimeline.playable
index a7556a7153f89aa83121056c567e4faed04cceb1..5377d8a0e914a7859f41b84bbb480e6d68bbe3af 100644
--- a/Assets/Scenes/CutsceneCanvasTimeline.playable
+++ b/Assets/Scenes/CutsceneCanvasTimeline.playable
@@ -96,6 +96,18 @@ MonoBehaviour:
volume: 1
stereoPan: 0
spatialBlend: 0
+--- !u!114 &-6149129247038497438
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
--- !u!114 &-5959130087813254073
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -213,6 +225,111 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
+--- !u!114 &-4377167826298030224
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
+--- !u!114 &-1711578561358945306
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (4)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 9.166666666666666
+ m_ClipIn: 0
+ m_Asset: {fileID: -6149129247038497438}
+ m_Duration: 12.166666666666666
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: -1711578561358945306}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ 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_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -231,6 +348,8 @@ MonoBehaviour:
- {fileID: -5959130087813254073}
- {fileID: 568482636345763445}
- {fileID: -9092383234624188320}
+ - {fileID: 8984846709375654472}
+ - {fileID: -1711578561358945306}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
@@ -452,3 +571,96 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
+--- !u!114 &8984846709375654472
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (3)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 0
+ m_ClipIn: 0
+ m_Asset: {fileID: -4377167826298030224}
+ m_Duration: 9.166666666666666
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 8984846709375654472}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ 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_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index d013a6b73028759f0ef80fce773cd01b0c45b102..21efa6cffba90725a0bfb59400803383953108f6 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -337,7 +337,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 68121380}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -857,6 +857,57 @@ RectTransform:
m_AnchoredPosition: {x: 95, y: 0}
m_SizeDelta: {x: 130, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &218985451
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 218985453}
+ - component: {fileID: 218985452}
+ m_Layer: 0
+ m_Name: Timeline
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!320 &218985452
+PlayableDirector:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 218985451}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_PlayableAsset: {fileID: 11400000, guid: 76bb718e5f991e74a99b2fb7ac0fade4, type: 2}
+ m_InitialState: 0
+ m_WrapMode: 2
+ m_DirectorUpdateMode: 1
+ m_InitialTime: 0
+ m_SceneBindings:
+ - key: {fileID: 1627412706811410473, guid: 76bb718e5f991e74a99b2fb7ac0fade4, type: 2}
+ value: {fileID: 2023876517}
+ m_ExposedReferences:
+ m_References: []
+--- !u!4 &218985453
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 218985451}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &233154268
GameObject:
m_ObjectHideFlags: 0
@@ -1039,6 +1090,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
paused: {fileID: 24500000, guid: 5b84db49d40ea449aa4f3e3bd229ab5b, type: 2}
unpaused: {fileID: 24500003, guid: 5b84db49d40ea449aa4f3e3bd229ab5b, type: 2}
+ canvas: {fileID: 244922610}
--- !u!114 &244922612
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4762,6 +4814,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 400000, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
- target: {fileID: 400002, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -4796,31 +4860,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
propertyPath: m_LocalScale.y
- value: 1.0000001
+ value: 1.0000002
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
propertyPath: m_LocalScale.z
- value: 0.99999994
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
propertyPath: m_LocalPosition.x
- value: 0.28490835
+ value: 0.40252614
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
propertyPath: m_LocalPosition.y
- value: 0.29675734
+ value: 0.30680865
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
propertyPath: m_LocalPosition.z
- value: 0.71900976
+ value: 0.74257517
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
propertyPath: m_LocalRotation.w
- value: 0.99999976
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
propertyPath: m_LocalRotation.x
- value: 0.000680983
+ value: 0.000000029802319
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
propertyPath: m_LocalRotation.y
@@ -6520,6 +6584,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 400006, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
m_PrefabInstance: {fileID: 1641232233}
m_PrefabAsset: {fileID: 0}
+--- !u!95 &2023876517 stripped
+Animator:
+ m_CorrespondingSourceObject: {fileID: 9500000, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
+ m_PrefabInstance: {fileID: 1641232233}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2096198479
GameObject:
m_ObjectHideFlags: 0
@@ -6636,3 +6705,4 @@ SceneRoots:
- {fileID: 2096198483}
- {fileID: 1102438310}
- {fileID: 465095258}
+ - {fileID: 218985453}
diff --git a/Assets/Scripts/Enemy/EnemyMovement.cs b/Assets/Scripts/Enemy/EnemyMovement.cs
index 937b8ee58e5e2d9812932d02d88adbdac8f3d194..3ee30caca8ab9a6f6f9450aa5cd921b9291f3460 100644
--- a/Assets/Scripts/Enemy/EnemyMovement.cs
+++ b/Assets/Scripts/Enemy/EnemyMovement.cs
@@ -20,6 +20,7 @@ namespace Nightmare
EnemyHealth enemyHealth;
NavMeshAgent nav;
public float timer = 0f;
+ public static bool isFreeze = false;
void Awake ()
{
@@ -48,6 +49,16 @@ namespace Nightmare
void Update ()
{
+ if (isFreeze && nav.isOnNavMesh)
+ {
+ nav.enabled = false;
+ return;
+ }
+ else if (!isFreeze && nav.isOnNavMesh)
+ {
+ nav.enabled = true;
+ }
+
if (!isPaused)
{
// If both the enemy and the player have health left...
diff --git a/Assets/Scripts/Managers/CheatManager.cs b/Assets/Scripts/Managers/CheatManager.cs
index 5be342498158a6fe1db70e324903b89cba853b91..42f216d253187065acacdf0f3a09252e4df6681b 100644
--- a/Assets/Scripts/Managers/CheatManager.cs
+++ b/Assets/Scripts/Managers/CheatManager.cs
@@ -17,21 +17,6 @@ using UnityEngine.Windows;
* SKIPLEVEL : Player skips 1 level
*/
-
-/* CHEATS THAT CAN BE SAVED */
-/*
- * NODAMAGE
- * ONEHITKILL
- * XTWOSPEED
- */
-
-public enum CheatsType
-{
- NODAMAGE,
- ONEHITKILL,
- XTWOSPEED
-}
-
public class CheatManager : MonoBehaviour
{
HUDisplay hud;
@@ -152,14 +137,12 @@ public class CheatManager : MonoBehaviour
{
playerHealth.SetCheatNoDamage(true);
hud.OpenPanel("No Damage Cheat Activated!");
- cheats[(int)CheatsType.NODAMAGE] = true;
}
private void ActivateOneHitKill()
{
playerShooting.ActivateCheatOneHitKill();
hud.OpenPanel("One Hit Kill Cheat Activated!");
- cheats[(int)CheatsType.ONEHITKILL] = true;
}
private void ActivateMotherlode()
@@ -172,7 +155,6 @@ public class CheatManager : MonoBehaviour
{
playerMovement.ActivateCheatXTwoSpeed();
hud.OpenPanel("Two Times Speed Cheat Activated!");
- cheats[(int)CheatsType.XTWOSPEED] = true;
}
private void ActivateFullHPPet()
@@ -264,20 +246,4 @@ public class CheatManager : MonoBehaviour
hud.OpenPanel("Successfully Reset Cheat(s)!");
}
-
- public void LoadCheat(bool[] gatheredCheats)
- {
- if (gatheredCheats[(int)CheatsType.NODAMAGE])
- {
- ActivateNoDamage();
- }
- if (gatheredCheats[(int)CheatsType.ONEHITKILL])
- {
- ActivateOneHitKill();
- }
- if (gatheredCheats[(int)CheatsType.XTWOSPEED])
- {
- ActivateXTwoSpeed();
- }
- }
}
diff --git a/Assets/Scripts/Managers/PauseManager.cs b/Assets/Scripts/Managers/PauseManager.cs
index 9e7fd1ba8d760dfe0c5a963969f4987513a158fd..1bf5257433bee4a578db8cbe96bcb117c7c77c97 100644
--- a/Assets/Scripts/Managers/PauseManager.cs
+++ b/Assets/Scripts/Managers/PauseManager.cs
@@ -10,8 +10,7 @@ public class PauseManager : MonoBehaviour {
public AudioMixerSnapshot paused;
public AudioMixerSnapshot unpaused;
-
- Canvas canvas;
+ [SerializeField] private Canvas canvas;
void Start()
{
@@ -22,29 +21,18 @@ public class PauseManager : MonoBehaviour {
{
if (Input.GetKeyDown(KeyCode.Escape))
{
- canvas.enabled = !canvas.enabled;
- Pause();
- }
- }
-
- public void Pause()
- {
- Time.timeScale = Time.timeScale == 0 ? 1 : 0;
- Lowpass ();
-
- }
-
- void Lowpass()
- {
- if (Time.timeScale == 0)
- {
- paused.TransitionTo(.01f);
- }
-
- else
-
- {
- unpaused.TransitionTo(.01f);
+ if (canvas.isActiveAndEnabled == true)
+ {
+ canvas.enabled = false;
+ Time.timeScale = 1;
+ paused.TransitionTo(.01f);
+ }
+ else if (canvas.isActiveAndEnabled == false)
+ {
+ canvas.enabled = true;
+ Time.timeScale = 0;
+ unpaused.TransitionTo(.01f);
+ }
}
}
diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs
index c1e05cc110dc1103bdaa54a4028b87fa0c8222bb..1bbb2228a3e43878460e6ee35c5e5b14af857a33 100644
--- a/Assets/Scripts/Player/PlayerShooting.cs
+++ b/Assets/Scripts/Player/PlayerShooting.cs
@@ -4,6 +4,8 @@ using System.Text;
using UnitySampleAssets.CrossPlatformInput;
using System.Collections.Generic;
using System;
+using System.Collections;
+using UnityEngine.Playables;
namespace Nightmare
{
@@ -13,7 +15,7 @@ namespace Nightmare
public float grenadeSpeed = 200f;
public float grenadeFireDelay = 0.5f;
public float damagePercent = 1;
- int grenadeStock = 99;
+ int grenadeStock = int.MaxValue;
float timer, grenadeTimer;
public List<GameObject> weaponsList;
@@ -21,6 +23,9 @@ namespace Nightmare
private int currWeaponIdx;
[SerializeField] Transform weaponPos;
float realWeaponDamage;
+
+ // For skill cutscene
+ PlayableDirector director;
private UnityAction listener;
@@ -31,6 +36,18 @@ namespace Nightmare
ChangeWeapon(0);
AdjustGrenadeStock(0);
+ GameObject directorObject = GameObject.Find("Timeline");
+
+ // Get the PlayableDirector component
+ if (directorObject != null)
+ {
+ director = directorObject.GetComponent<PlayableDirector>();
+ }
+ else
+ {
+ Debug.Log("Director Object Null");
+ }
+
listener = new UnityAction(CollectGrenade);
EventManager.StartListening("GrenadePickup", CollectGrenade);
@@ -171,13 +188,41 @@ namespace Nightmare
void ShootGrenade()
{
+ StartCoroutine(ShootCutscene());
+
+ //GameObject clone = Instantiate(grenade, transform.position, Quaternion.identity);
+ //Grenade grenadeClone = clone.GetComponent<Grenade>();
+ //grenadeClone.Shoot(grenadeSpeed * transform.forward);
+ }
+
+ IEnumerator ShootCutscene()
+ {
+ // Freeze the enemies
+ FreezeEnemies();
+
+ // Play the cutscene
+ director.Play();
+
+ // Wait for the cutscene to finish
+ yield return new WaitForSeconds((float)director.duration);
+
+ // Unfreeze the enemies
+ UnfreezeEnemies();
+
AdjustGrenadeStock(-1);
grenadeTimer = 0;
GameObject clone = PoolManager.Pull("Grenade", transform.position, Quaternion.identity);
EventManager.TriggerEvent("ShootGrenade", grenadeSpeed * transform.forward);
- //GameObject clone = Instantiate(grenade, transform.position, Quaternion.identity);
- //Grenade grenadeClone = clone.GetComponent<Grenade>();
- //grenadeClone.Shoot(grenadeSpeed * transform.forward);
+ }
+
+ public void FreezeEnemies()
+ {
+ EnemyMovement.isFreeze = true;
+ }
+
+ public void UnfreezeEnemies()
+ {
+ EnemyMovement.isFreeze = false;
}
public void ResetPlayerDamage()
diff --git a/Assets/Scripts/States/GlobalStateManager.cs b/Assets/Scripts/States/GlobalStateManager.cs
deleted file mode 100644
index a0d815dc9d068c978584e8aead6d70d30d1c391e..0000000000000000000000000000000000000000
--- a/Assets/Scripts/States/GlobalStateManager.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Nightmare;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class GlobalStateManager : MonoBehaviour
-{
- // Create Singleton
- public static GlobalStateManager Instance { get; private set; }
-
- private CheatManager cheatManager;
-
- private void Awake()
- {
- if (Instance != null)
- {
- if (Instance != this)
- {
- Destroy(this);
- }
- }
- else
- {
- Instance = this;
- Refresh();
- }
- }
-
- private void Refresh()
- {
- cheatManager = FindObjectOfType<CheatManager>();
- }
-
- public void SetState(SaveState state)
- {
- Refresh();
-
- cheatManager.LoadCheat(state.globalSaveState.cheats);
- }
-}
diff --git a/Assets/Scripts/States/GlobalStateManager.cs.meta b/Assets/Scripts/States/GlobalStateManager.cs.meta
deleted file mode 100644
index 5b855cc07dfe04bb16508c18a0bec865c021258f..0000000000000000000000000000000000000000
--- a/Assets/Scripts/States/GlobalStateManager.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 40f7e905f1aa63741b02b9146e251f76
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/States/SaveState.cs b/Assets/Scripts/States/SaveState.cs
deleted file mode 100644
index da0b873c5755471c4b62b090a78d431c76926084..0000000000000000000000000000000000000000
--- a/Assets/Scripts/States/SaveState.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using Newtonsoft.Json;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-[Serializable]
-public class GlobalSaveState
-{
- public bool[] cheats;
-
- public GlobalSaveState(bool[] cheats)
- {
- this.cheats = cheats;
- }
-
- public override string ToString()
- {
- return JsonConvert.SerializeObject(this);
- }
-}
-
-[Serializable]
-public class SaveState
-{
- public GlobalSaveState globalSaveState;
-
- public SaveState(GlobalSaveState globalSaveState)
- {
- this.globalSaveState = globalSaveState;
- }
-
- public override string ToString()
- {
- return JsonConvert.SerializeObject(this);
- }
-}
diff --git a/Assets/Scripts/States/SaveState.cs.meta b/Assets/Scripts/States/SaveState.cs.meta
deleted file mode 100644
index a0c00a35f05aaf0458ec3906981de547b54f4e62..0000000000000000000000000000000000000000
--- a/Assets/Scripts/States/SaveState.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e0c4e2ce428b7c044baefcfca6687111
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Timeline/PlayerSkillCutscene.playable b/Assets/Timeline/PlayerSkillCutscene.playable
new file mode 100644
index 0000000000000000000000000000000000000000..40ccb62c19311eb0a8fdb5adfb160653bbfb85bc
--- /dev/null
+++ b/Assets/Timeline/PlayerSkillCutscene.playable
@@ -0,0 +1,2394 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &-9022126792354945349
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Recorded (1)
+ serializedVersion: 7
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.083333336
+ value: {x: -2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.16666667
+ value: {x: 2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.25
+ value: {x: 2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.33333334
+ value: {x: 0, y: 0, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ isIntCurve: 0
+ isSerializeReferenceCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.33333334
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
+--- !u!74 &-8111180767982944259
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Recorded
+ serializedVersion: 7
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: {x: 2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.08333334
+ value: {x: 2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.16666667
+ value: {x: -2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.25
+ value: {x: -2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.3333333
+ value: {x: 0, y: 0, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ isIntCurve: 0
+ isSerializeReferenceCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.3333333
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.08333334
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3333333
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.08333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3333333
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.08333334
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3333333
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
+--- !u!74 &-6842872273689261561
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Recorded (5)
+ serializedVersion: 7
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: {x: 2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.08333334
+ value: {x: 2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.16666667
+ value: {x: -2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.25
+ value: {x: -2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.3333333
+ value: {x: 0, y: 0, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ isIntCurve: 0
+ isSerializeReferenceCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.3333333
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.08333334
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3333333
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.08333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3333333
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.08333334
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3333333
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
+--- !u!74 &-6840836437036700122
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Recorded (6)
+ serializedVersion: 7
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.083333336
+ value: {x: -2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.16666667
+ value: {x: 2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.25
+ value: {x: 2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.33333334
+ value: {x: 0, y: 0, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ isIntCurve: 0
+ isSerializeReferenceCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.33333334
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
+--- !u!114 &-5305719508664672553
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+ m_Name: Recorded
+ m_EditorClassIdentifier:
+ m_Clip: {fileID: -8111180767982944259}
+ m_Position: {x: 0, y: 0, z: 0}
+ m_EulerAngles: {x: 0, y: 0, z: 0}
+ m_UseTrackMatchFields: 1
+ m_MatchTargetFields: 63
+ m_RemoveStartOffset: 0
+ m_ApplyFootIK: 1
+ m_Loop: 0
+ m_Version: 1
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!74 &-4763629259633998696
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Recorded (3)
+ serializedVersion: 7
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: {x: 2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.08333334
+ value: {x: 2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.16666667
+ value: {x: -2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.25
+ value: {x: -2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.3333333
+ value: {x: 0, y: 0, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ isIntCurve: 0
+ isSerializeReferenceCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.3333333
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.08333334
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3333333
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.08333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3333333
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.000000011175871
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.08333334
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3333333
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
+--- !u!114 &-4295359275785073450
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+ m_Name: Recorded (4)
+ m_EditorClassIdentifier:
+ m_Clip: {fileID: -2594941734668837925}
+ m_Position: {x: 0, y: 0, z: 0}
+ m_EulerAngles: {x: -0, y: 0, z: 0}
+ m_UseTrackMatchFields: 1
+ m_MatchTargetFields: 63
+ m_RemoveStartOffset: 0
+ m_ApplyFootIK: 1
+ m_Loop: 0
+ m_Version: 1
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!74 &-3301505361220903123
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Recorded (2)
+ serializedVersion: 7
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ isIntCurve: 0
+ isSerializeReferenceCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
+--- !u!74 &-2594941734668837925
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Recorded (4)
+ serializedVersion: 7
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.083333336
+ value: {x: -2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.16666667
+ value: {x: 2.5, y: 0, z: 2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.25
+ value: {x: 2.5, y: 0, z: -2.5}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.33333334
+ value: {x: 0, y: 0, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ isIntCurve: 0
+ isSerializeReferenceCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.33333334
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -2.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ flags: 0
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
+--- !u!114 &-1578470643941694351
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+ m_Name: Recorded (5)
+ m_EditorClassIdentifier:
+ m_Clip: {fileID: -6842872273689261561}
+ m_Position: {x: 0, y: 0, z: 0}
+ m_EulerAngles: {x: 0, y: 0, z: 0}
+ m_UseTrackMatchFields: 1
+ m_MatchTargetFields: 63
+ m_RemoveStartOffset: 0
+ m_ApplyFootIK: 1
+ m_Loop: 0
+ m_Version: 1
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !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: bfda56da833e2384a9677cd3c976a436, type: 3}
+ m_Name: PlayerSkillCutscene
+ m_EditorClassIdentifier:
+ m_Version: 0
+ m_Tracks:
+ - {fileID: 1627412706811410473}
+ m_FixedDuration: 0
+ m_EditorSettings:
+ m_Framerate: 60
+ m_ScenePreview: 1
+ m_DurationMode: 0
+ m_MarkerTrack: {fileID: 0}
+--- !u!114 &551626655169858314
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+ m_Name: Recorded (2)
+ m_EditorClassIdentifier:
+ m_Clip: {fileID: -3301505361220903123}
+ m_Position: {x: 2.5, y: 0, z: 2.5}
+ m_EulerAngles: {x: -0, y: 0, z: 0}
+ m_UseTrackMatchFields: 1
+ m_MatchTargetFields: 63
+ m_RemoveStartOffset: 0
+ m_ApplyFootIK: 1
+ m_Loop: 0
+ m_Version: 1
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &1627412706811410473
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+ m_Name: Animation Track
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 0.08333333333333333
+ m_ClipIn: 0
+ m_Asset: {fileID: -5305719508664672553}
+ m_Duration: 0.3333333333333333
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 1627412706811410473}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: -1
+ m_BlendOutDuration: -1
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 1
+ m_PostExtrapolationMode: 1
+ m_PreExtrapolationMode: 1
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Recorded
+ - m_Version: 1
+ m_Start: 0
+ m_ClipIn: 0
+ m_Asset: {fileID: 551626655169858314}
+ m_Duration: 0.08333333333333333
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 1627412706811410473}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: -1
+ m_BlendOutDuration: -1
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 1
+ m_PostExtrapolationMode: 1
+ m_PreExtrapolationMode: 1
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Recorded (2)
+ - m_Version: 1
+ m_Start: 0.41666666666666663
+ m_ClipIn: 0
+ m_Asset: {fileID: 8425979510072035395}
+ m_Duration: 0.3437910079956054
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 1627412706811410473}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: -1
+ m_BlendOutDuration: -1
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ 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_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 1
+ m_PostExtrapolationMode: 1
+ m_PreExtrapolationMode: 1
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Recorded (1)
+ - m_Version: 1
+ m_Start: 0.760457674662272
+ m_ClipIn: 0
+ m_Asset: {fileID: 8097966612089804648}
+ m_Duration: 0.3333333333333333
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 1627412706811410473}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: -1
+ m_BlendOutDuration: -1
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 1
+ m_PostExtrapolationMode: 1
+ m_PreExtrapolationMode: 1
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Recorded (3)
+ - m_Version: 1
+ m_Start: 1.0937910079956052
+ m_ClipIn: 0
+ m_Asset: {fileID: -4295359275785073450}
+ m_Duration: 0.3437910079956054
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 1627412706811410473}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: -1
+ m_BlendOutDuration: -1
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ 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_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 1
+ m_PostExtrapolationMode: 1
+ m_PreExtrapolationMode: 1
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Recorded (4)
+ - m_Version: 1
+ m_Start: 1.4375820159912107
+ m_ClipIn: 0
+ m_Asset: {fileID: -1578470643941694351}
+ m_Duration: 0.3333333333333333
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 1627412706811410473}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: -1
+ m_BlendOutDuration: -1
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 1
+ m_PostExtrapolationMode: 1
+ m_PreExtrapolationMode: 1
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Recorded (5)
+ - m_Version: 1
+ m_Start: 1.770915349324544
+ m_ClipIn: 0
+ m_Asset: {fileID: 6748012829031148118}
+ m_Duration: 0.3437910079956054
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 1627412706811410473}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: -1
+ m_BlendOutDuration: -1
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ 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_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 1
+ m_PostExtrapolationMode: 1
+ m_PreExtrapolationMode: 1
+ m_PostExtrapolationTime: Infinity
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Recorded (6)
+ m_Markers:
+ m_Objects: []
+ m_InfiniteClipPreExtrapolation: 1
+ m_InfiniteClipPostExtrapolation: 1
+ m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+ m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+ m_InfiniteClipTimeOffset: 0
+ m_InfiniteClipRemoveOffset: 0
+ m_InfiniteClipApplyFootIK: 1
+ mInfiniteClipLoop: 0
+ m_MatchTargetFields: 63
+ m_Position: {x: 0, y: 0, z: 0}
+ m_EulerAngles: {x: 0, y: 0, z: 0}
+ m_AvatarMask: {fileID: 0}
+ m_ApplyAvatarMask: 1
+ m_TrackOffset: 1
+ m_InfiniteClip: {fileID: 0}
+ m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+ m_ApplyOffsets: 0
+--- !u!114 &6748012829031148118
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+ m_Name: Recorded (6)
+ m_EditorClassIdentifier:
+ m_Clip: {fileID: -6840836437036700122}
+ m_Position: {x: 0, y: 0, z: 0}
+ m_EulerAngles: {x: -0, y: 0, z: 0}
+ m_UseTrackMatchFields: 1
+ m_MatchTargetFields: 63
+ m_RemoveStartOffset: 0
+ m_ApplyFootIK: 1
+ m_Loop: 0
+ m_Version: 1
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &8097966612089804648
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+ m_Name: Recorded (3)
+ m_EditorClassIdentifier:
+ m_Clip: {fileID: -4763629259633998696}
+ m_Position: {x: 0, y: 0, z: 0}
+ m_EulerAngles: {x: 0, y: 0, z: 0}
+ m_UseTrackMatchFields: 1
+ m_MatchTargetFields: 63
+ m_RemoveStartOffset: 0
+ m_ApplyFootIK: 1
+ m_Loop: 0
+ m_Version: 1
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &8425979510072035395
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+ m_Name: Recorded (1)
+ m_EditorClassIdentifier:
+ m_Clip: {fileID: -9022126792354945349}
+ m_Position: {x: 0, y: 0, z: 0}
+ m_EulerAngles: {x: -0, y: 0, z: 0}
+ m_UseTrackMatchFields: 1
+ m_MatchTargetFields: 63
+ m_RemoveStartOffset: 0
+ m_ApplyFootIK: 1
+ m_Loop: 0
+ m_Version: 1
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
diff --git a/Assets/Timeline/PlayerSkillCutscene.playable.meta b/Assets/Timeline/PlayerSkillCutscene.playable.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4e4e519c85738a9323181496b74d51d9a4e12240
--- /dev/null
+++ b/Assets/Timeline/PlayerSkillCutscene.playable.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 76bb718e5f991e74a99b2fb7ac0fade4
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/README.md b/README.md
index fb425e1f2716068c7221d3ede20ea5e97b84814b..80a2f5b6e6a73692f1cc23ba46c2f4946421db64 100644
--- a/README.md
+++ b/README.md
@@ -1,93 +1,425 @@
-# IF3210-2024-Unity-DOR
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.informatika.org/mikeleo03/if3210-2024-unity-dor.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.informatika.org/mikeleo03/if3210-2024-unity-dor/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+<br>
+<div align="center">
+ <div >
+ <img height="150px" src="./images/Logo.png" alt=""/>
+ </div>
+ <br>
+ <div>
+ <h3>Survival Shooter: The Sequel</h3>
+ <p><i>Extended version of Survival Shooter game from Unity tutorial</i></p>
+ </div>
+</div>
+
+<h1 align="center">Survival Shooter: The Sequel Game</h1>
+
+<img src="./images/Main.png" alt=""/>
+
+Survival Shooter: The Sequel expands upon the original Unity tutorial with a wealth of new features. Dive into a world ravaged by Keroco, monstrous frog-like creatures. Embark on 4 challenging quests, following a captivating narrative revealed through 3 cinematic cut-scenes. Progress is tracked with a save system, ensuring your hard-earned victories aren't lost. Failing a quest or depleting your health results in a game over, but don't worry, you can review your performance through detailed gameplay statistics.
+
+The enhanced main menu lets you fine-tune the experience. Adjust audio levels, toggle sound effects, and select difficulty to find your perfect challenge. A loyal pet companion, purchasable with in-game currency earned from quests, fights alongside you. Conquer a variety of enemies – from the basic Keroco to the formidable Raja Keroco and Jendral Keroco. Multiple weapon types, including a default weapon, shotgun, and sword, offer strategic combat options. Enhance your abilities with power-ups found within mysterious orbs scattered throughout the world. And for those who want to push the boundaries, a selection of cheats is available for a truly wild experience. With Survival Shooter: The Sequel, the adventure awaits!
+
+## 📠Table of Contents
+- [General Information](#general-information)
+- [Tech Stacks and Platforms](#tech-stacks-and-platforms)
+- [Libraries](#libraries)
+- [Main Features](#main-features)
+- [Bonus 1 - Build to Android](#bonus-1---build-to-android)
+- [Bonus 2 - Multitype Input](#bonus-2---multitype-input)
+- [Bonus 3 - Skill Cutscene](#bonus-3---skill-cutscene)
+- [Bonus 4 - AR Version](#bonus-4---ar-version)
+- [Task Division](#task-division)
+- [Contributors](#contributors)
+
+## 📢 General Information
+The construction project of the Bandung Bondowoso temple was a great success due to the Android application created by his genie. As a result, he gained immense wealth. Confused about how to spend his fortune, Bandung Bondowoso decided to assemble a PC so that he could play AAAA games. However, he felt that AAAA games did not meet his expectations. Therefore, Bandung Bondowoso asked for help from his genie to create a new game.
+
+The genie of Bandung Bondowoso had previously tried to create a game from the [Unity tutorial](https://youtube.com/playlist?list=PL871udVFq7OF9w5RBjyp_lcyzFuViLe8x&si=gxYZvMOM8I1uHX8w) that is also available [here](https://drive.google.com/drive/folders/1kKue0ELQlIqWxppyJ0h3W-LZBtxNb2Up?usp=sharing). Therefore, the genie of Bandung Bondowoso decided to modify the game to make it more challenging.
+
+## 👨ðŸ»â€ðŸ’» Tech Stacks and Platforms
+<div align="center">
+<kbd>
+<img src="./images/icons/Unity.png" height="60" />
+</kbd>
+<kbd>
+<img src="./images/icons/Visual Studio.png" height="60" />
+</kbd>
+<kbd>
+<img src="./images/icons/Android.png" height="60" />
+</kbd>
+</div>
+<div align="center">
+<h4>Unity | Visual Studio | Android</h4>
+</div>
+
+## 📖 Libraries
+Here's list of libraries that used in this project.
+<table style="width:100%">
+ <col width="35%">
+ <col width="65%">
+ <tr>
+ <th>Libraries</th>
+ <th>Purposes</th>
+ </tr>
+ <tr>
+ <td>TextMeshPro</td>
+ <td>Enables advanced text rendering with better performance and visual enhancements.</td>
+ </tr>
+ <tr>
+ <td>Timeline</td>
+ <td>Creates cinematic sequences and animations with control over cameras, sound, and transitions.</td>
+ </tr>
+ <tr>
+ <td>Unity UI</td>
+ <td>Builds user interfaces within the game, including menus, buttons, and health bars.</td>
+ </tr>
+ <tr>
+ <td>Newtonsoft Json</td>
+ <td>Parses and manipulates JSON data for saving game data or working with external sources.</td>
+ </tr>
+ <tr>
+ <td>Version Control</td>
+ <td>Tracks changes to project files over time, allowing reverts and collaboration.</td>
+ </tr>
+ <tr>
+ <td>Visual Scripting</td>
+ <td>Creates game logic visually with nodes instead of writing code.</td>
+ </tr>
+</table>
+
+And some **Unity core libraries** like Unity, UnityEngine, System, and many more!
+
+## â Game Flows
+Here's Survival Shooter The Sequel main game flows and its interface.
+<table style="width:100%; text-align:center;">
+ <col width="49%">
+ <col width="49%">
+ <tr>
+ <td width="1%" align="center"><img src="./images/screenshots/Splash Screen.jpg"/></td>
+ <td width="1%" align="center"><img src="./images/screenshots/Login Page.jpg"/></td>
+ </tr>
+ <tr>
+ <td width="1%" align="center">Features 1</td>
+ <td width="1%" align="center">Features 2</td>
+ </tr>
+ <tr>
+ <td width="1%" align="center"><img src="./images/screenshots/Splash Screen.jpg"/></td>
+ <td width="1%" align="center"><img src="./images/screenshots/Login Page.jpg"/></td>
+ </tr>
+ <tr>
+ <td width="1%" align="center">Features 1</td>
+ <td width="1%" align="center">Features 2</td>
+ </tr>
+</table>
+
+## 🤳 Bonus 1 - Twibbon Feature
+<table style="width:100%; text-align:center;">
+ <col width="32%">
+ <col width="32%">
+ <col width="32%">
+ <tr>
+ <td width="1%" align="center"><img src="./assets/screenshots/Twibbon Page.jpg"/></td>
+ <td width="1%" align="center"><img src="./assets/screenshots/Twibbon Result 1.jpg"/></td>
+ <td width="1%" align="center"><img src="./assets/screenshots/Twibbon Result 2.jpg"/></td>
+ </tr>
+ <tr>
+ <td width="1%" align="center">Twibbon Page</td>
+ <td width="1%" align="center">Twibbon Result #1</td>
+ <td width="1%" align="center">Twibbon Result #2</td>
+ </tr>
+</table>
+Twibbon is what we called when we overlay a base image with another image to create a new and creative picture. With this feature, user can choose between 6 different and funny overlay to go with their image. They can capture their photo, and immediately receive a twibbon of it. They can use this feature as much as they like and experiment with the different overlay provided.
+
+## 💥 Bonus 2 - OWASP Analysis
+OWASP (Open Web Application Security Project) Top 10 is a list of the ten most critical application security risks. Here is our analysis on 3 of them and how we address those security vulnerabilities.
+
+### 🔒 M4: Insufficient Input/Output Validation
+Insufficient validation and sanitization of data from external sources, such as user inputs or network data, in a mobile application can introduce severe security vulnerabilities. Mobile apps that fail to properly validate and sanitize such data are at risk of being exploited through attacks specific to mobile environments, including SQL injection, Command Injection, and cross-site scripting (XSS) attacks.
+
+These vulnerabilities can have detrimental consequences, including unauthorized access to sensitive data, manipulation of app functionality, and potential compromise of the entire mobile system.
+
+Inadequate output validation can result in data corruption or presentation vulnerabilities, allowing malicious actors to inject malicious code or manipulate sensitive information displayed to users.
+
+An application can be vulnerable to insufficient input/output validation due to:
+- **Lack of Input Validation**: Failure to properly validate user input can expose the application to injection attacks like SQL injection, command injection, or XSS.
+- **Inadequate Output Sanitization**: Insufficient sanitization of output data can result in XSS vulnerabilities, allowing attackers to inject and execute malicious scripts.
+- **Context-Specific Validation Neglect**: Neglecting to consider specific validation requirements based on data context can create vulnerabilities, such as path traversal attacks or unauthorized access to files.
+- **Insufficient Data Integrity Checks**: Not performing proper data integrity checks can lead to data corruption or unauthorized modification, compromising reliability and security.
+- **Poor Secure Coding Practices**: Neglecting secure coding practices, such as using parameterized queries or escaping/encoding data, contributes to input/output validation vulnerabilities.
+
+Here are how we address the vulnerabilities.
+1. **Unsanitized Query and Improper Parameter**
+To prevent SQL Injection attacks, we use Room as persistence mechanism and define the queries and its parameters in DAO (Data Access Object) interface. Room will handle the parameter binding and ensure the execution of properly sanitized query.
+<img src="./assets/owasp/4-1.png"/>
+
+2. **Improper Output From Calling Server API**
+To handle malicious output given by server API when requesting something, we use data class to contain the output/response. This ensure proper and structured data type usage and correct data name.
+<img src="./assets/owasp/4-2-1.png"/>
+<img src="./assets/owasp/4-2-2.png"/>
+
+3. **Unexpected User-Generated Output**
+To handle occasion where processing user input leads to null value, we use default value so that the application still behaves expectedly when that result is used again.
+<img src="./assets/owasp/4-3.png"/>
+
+4. **Malformed User Input Data**
+Ensuring that user fills all the required data before processing to prevent unexpected output that may affect subsequent usage of that output.
+<img src="./assets/owasp/4-4-1.png"/>
+<img src="./assets/owasp/4-4-2.png"/>
+
+### 🔒 M8: Security Misconfiguration
+Security misconfiguration in mobile apps refers to the improper configuration of security settings, permissions, and controls that can lead to vulnerabilities and unauthorized access. Threat agents who can exploit security misconfigurations are attackers aiming to gain unauthorized access to sensitive data or perform malicious actions. Threat agents can be an attacker with physical access to the device, a malicious app on the device that exploits security misconfiguration to execute unauthorized actions on the target vulnerable application context.
+
+Security misconfigurations in mobile apps can be exploited through various attack vectors, including:
+- **Insecure default settings**: Mobile apps often come with default configurations that may have weak security settings or unnecessary permissions enabled, making them vulnerable to attacks.
+- **Improper access controls**: Misconfigured access controls can allow unauthorized users to access sensitive data or perform privileged actions.
+- **Weak encryption or hashing**: Improperly implemented or weak encryption and hashing algorithms can be exploited to gain access to sensitive information.
+- **Lack of secure communication**: Failure to use secure communication protocols, such as SSL/TLS, can expose sensitive data to eavesdropping and man-in-the-middle attacks.
+- **Unprotected storage**: Storing sensitive data, such as passwords or API keys, in an insecure manner, such as plain text or weakly encrypted, can lead to unauthorized access.
+- **Insecure file permissions**: Storing application files with world-readable and/or world-writable permissions.
+- **Misconfigured session management**: Improper session management can result in session hijacking, allowing attackers to impersonate legitimate users.
+
+Here are how we address the vulnerabilities.
+1. **Debugging Enabled in Manifest**
+To prevent exposing sensitive information in debug mode, set `android:debuggable="false"` in the application tag of the AndroidManifest.xml file.
+<img src="./assets/owasp/8-1.png"/>
+
+2. **Unprotected Exported Components**
+To protect activities from unauthorized access, set `android:exported="false"` for activities that don't need to be accessed by other applications.
+<img src="./assets/owasp/8-2.png"/>
+
+3. **Improper Content Provider Permissions**
+Limit access to content providers by setting appropriate permissions and ensuring `android:exported="false"` unless necessary for external access.
+<img src="./assets/owasp/8-3.png"/>
+
+4. **Improper Content Provider Permissions**
+Utilize internal storage or external storage with proper permissions. Before write to user's external download directory, we ask the user permission first. If the user permissions has already been granted then proceed the file saving.
+<img src="./assets/owasp/8-4.png"/>
+
+### 🔒 M9: Insecure Data Storage
+Insecure data storage in a mobile application can attract various threat agents who aim to exploit the vulnerabilities and gain unauthorised access to sensitive information. These threat agents include skilled adversaries who target mobile apps to extract valuable data, malicious insiders within the organisation or app development team who misuse their privileges, state-sponsored actors conducting cyber espionage, cybercriminals seeking financial gain through data theft or ransom, script kiddies utilising pre-built tools for simple attacks, data brokers looking to exploit insecure storage for selling personal information, competitors and industrial spies aiming to gain a competitive advantage, and activists or hacktivists with ideological motives.
+
+Here are common manifestations of these issues:
+- **Lack of Access Controls**: Insufficient access controls within the application may allow unauthorized users or attackers to gain access to sensitive data stored on the device or in the app’s databases.
+- **Inadequate Encryption**: Failure to properly encrypt sensitive data can result in unintended data leakage if an attacker gains access to the storage location. Without encryption, the data is easily readable and can be exploited.
+- **Unintentional Data Exposure**: Mobile applications may inadvertently expose sensitive data through application logs, error messages, or debug features, allowing unauthorized individuals to view or capture sensitive information.
+- **Poor Session Management**: Weak session management can lead to unintended data leakage. If session tokens or user authentication information are not adequately protected or managed, they can be intercepted or manipulated, allowing unauthorized access to sensitive data.
+- **Insufficient Input Validation**: Inadequate input validation and data sanitization can lead to unintended data leakage. Attackers may exploit this weakness to inject malicious scripts or retrieve sensitive data by manipulating input fields.
+- **Cloud Storage Misconfigurations**: If the mobile application uses cloud storage services for data storage and the configurations are mismanaged or misconfigured, it can result in unintended exposure or unauthorized access to stored data.
+- **Third-Party Library Vulnerabilities**: Insecure third-party libraries used in the mobile application may have vulnerabilities that could lead to unintended data leakage. Attackers can exploit these vulnerabilities to gain unauthorized access to sensitive information.
+- **Unintended Data Sharing**: Improper handling of data sharing features within the application can result in unintended data leakage. If sensitive data is shared with unintended recipients or if the sharing process is not adequately secured, it can lead to privacy breaches
+
+Here are how we address the vulnerabilities.
+1. **The Appropriate Implementation of Permissions**
+by utilizing the Android permission system, which allows users to grant specific permissions for access to certain data or features such as location access permission and gallery access permission.
+<img src="./assets/owasp/9-1-1.png"/>
+<img src="./assets/owasp/9-1-2.png"/>
+
+2. **Strong Session Management**
+by implementing robust session management to protect user data and utilizing unique session tokens and ensure they are securely stored on the device.
+<img src="./assets/owasp/9-2.png"/>
+
+3. **Careful Data Sharing Management.**
+When handling data sharing features, we provided adequate control to the users.
+<img src="./assets/owasp/9-3.png"/>
+
+4. **Careful Data Log Management and Error Handling**
+by ensuring that sensitive data is not included in application logs. Additionally, we implemented error handling mechanisms that prevent the logging of sensitive data in error messages.
+<img src="./assets/owasp/9-4.png"/>
+
+
+## 🙋â€â™‚ï¸ Bonus 3 - Accessibility Testing
+Accessibility Scanner is a tool developed by Google and used to scan an application's user interface to provide recommendations on how to improve the application's accessibility. Accessibility Scanner enables anyone, not just developers, to quickly and easily identify common accessibility improvements; for example, zooming in on small touch targets, increasing contrast for text and images, and providing content descriptions for unlabeled graphic elements.
+
+The following is what the suggestion page looks like before the application is repaired.
+<table style="width:100%; text-align:center;">
+ <col width="49%">
+ <col width="49%">
+ <tr>
+ <td width="1%" align="center"><img src="./assets/accessibility/initial_by_screen.jpg"/></td>
+ <td width="1%" align="center"><img src="./assets/accessibility/initial_by_category.jpg"/></td>
+ </tr>
+ <tr>
+ <td width="1%" align="center">Result by Page</td>
+ <td width="1%" align="center">Result by Category</td>
+ </tr>
+</table>
+
+It was found that there were **171 suggestions** from various different pages. We fulfill all these suggestions based on their categories.
+1. **Item Label** <br>
+The fix is documented on [this commit](https://gitlab.informatika.org/mikeleo03/if3210-2024-android-ymr/-/commit/ab716260eed6a21d52bdea41ed72232b9dcad370). Here is the updates:
+ - For EditTexts or editable TextViews, use an `android:hint` attribute to indicate the purpose of the text field.
+ - Use an `android:labelFor` attribute to indicate that a View should act as a content label for another View.
+2. **Touch Target** <br>
+The fix is documented on [this commit](https://gitlab.informatika.org/mikeleo03/if3210-2024-android-ymr/-/commit/992112745541e4300f45354d0b2469ee691984b9). Here is the updates:
+ - Consider making the height of this touch clickable item target 48dp or larger.
+ - A parent container may be handling touch events for this item. If selecting the larger container performs the same action as selecting this item, consider defining this item as not clickable. If a different action is performed, consider increasing the size of this item.
+3. **Text Contrast** <br>
+The fix is documented on [this commit](https://gitlab.informatika.org/mikeleo03/if3210-2024-android-ymr/-/commit/0515b2c1ae5fff32cdbe9fdf353881226ca8859d). Here is the updates:
+ - When using `TextView` to display text, use `android:textColor` and `android:background` to define foreground and background colors with a high contrast ratio.
+ - The W3C recommends:
+ - At least **4.5:1** for small text (below 18 point regular or 14 point bold).
+ - At least **3.0:1** for large text (18 point and above regular or 14 point and above bold).
+4. **Item Descriptions** <br>
+The fix is documented on [this commit](https://gitlab.informatika.org/mikeleo03/if3210-2024-android-ymr/-/commit/a8cf6fd0cdec3c9c0897f072b4be766364aa9887) and [this commit](https://gitlab.informatika.org/mikeleo03/if3210-2024-android-ymr/-/commit/759cbedfbf5614d47dcd2a8e08275a8d13082089). Here is the updates:
+ - Each element should have a unique text label that describes its visual meaning, purpose, or associated action.
+ - Layouts used as rows within `ListViews` or `RecyclerViews` are often inflated repeatedly. In such a case, the repeated labels should include additional text with more identifying information or context for the description of the item.
+5. **Image Contrast** <br>
+The fix is documented on [this commit](https://gitlab.informatika.org/mikeleo03/if3210-2024-android-ymr/-/commit/cf9c41c876592a11f7e911cf54f9a64d02cc05be). Here is the updates: <br>
+ When using ImageView or Image to render graphical content or iconography, make sure that contrast between foreground and background colors meets or exceeds the recommended ratios.
+6. **Unexposed Text** <br>
+The fix is documented on [this commit](https://gitlab.informatika.org/mikeleo03/if3210-2024-android-ymr/-/commit/6c04db96aef6fb443e9804021949a6cc3708f669). Here is the updates:
+ - Visible text in a user interface component should be available to accessibility services.
+ - A ViewGroup that represents a list row is labeled with a contentDescription that customizes the ordering descendant TextViews.
+7. **Item Type Label** <br>
+The fix is documented on [this commit](https://gitlab.informatika.org/mikeleo03/if3210-2024-android-ymr/-/commit/6c04db96aef6fb443e9804021949a6cc3708f669). Here is the updates:
+ - When TalkBack announces a clickable Button element, it appends the word "button" to the text label provided by the developer. If the developer includes "button" in the text label (such as "Save button"), TalkBack might speak the word "button" twice ("Save button button").
+ - A well-implemented user interface doesn't add element type or state descriptions to values of `android:contentDescription`, `android:text`, or `android:hint` attributes.
+
+After fulfilling all these quite tiring suggestions, BondoMan finally succeeded in achieving high accessibility with no further recommendations. Here is the final result.
+
+<table style="width:100%; text-align:center;">
+ <col width="49%">
+ <col width="49%">
+ <tr>
+ <td width="1%" align="center"><img src="./assets/accessibility/final_by_screen.jpg"/></td>
+ <td width="1%" align="center"><img src="./assets/accessibility/final_by_category.jpg"/></td>
+ </tr>
+ <tr>
+ <td width="1%" align="center">Result by Page</td>
+ <td width="1%" align="center">Result by Category</td>
+ </tr>
+</table>
+
+## 👨â€ðŸ‘¨â€ðŸ‘¦â€ðŸ‘¦ Task Division
+The following is the division of tasks that we carry out.
+<table style="width:100%">
+ <col width="70%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <tr>
+ <th>Task</th>
+ <th>13521062</th>
+ <th>13521063</th>
+ <th>13521108</th>
+ </tr>
+ <tr id="merged-row">
+ <td colspan="4"><b>Initialization</b></td>
+ </tr>
+ <tr>
+ <td>Initiate Project</td>
+ <td></td>
+ <td></td>
+ <td align="center">✅</td>
+ </tr>
+ <tr>
+ <td>Setup Room Database</td>
+ <td></td>
+ <td></td>
+ <td align="center">✅</td>
+ </tr>
+ <tr id="merged-row">
+ <td colspan="4"><b>Main Features</b></td>
+ </tr>
+ <tr>
+ <td>Header dan Navbar</td>
+ <td></td>
+ <td></td>
+ <td align="center">✅</td>
+ </tr>
+ <tr>
+ <td>Login - Halaman Login</td>
+ <td></td>
+ <td></td>
+ <td align="center">✅</td>
+ </tr>
+ <tr>
+ <td>Logout - Halaman Pengaturan</td>
+ <td></td>
+ <td></td>
+ <td align="center">✅</td>
+ </tr>
+ <tr>
+ <td>Melakukan Penambahan, Pengubahan, dan Penghapusan Transaksi</td>
+ <td></td>
+ <td align="center">✅</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Melihat Daftar Transaksi yang Sudah Dilakukan</td>
+ <td></td>
+ <td align="center">✅</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Melakukan Scan Nota - Halaman Scan Nota</td>
+ <td align="center">✅</td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Melihat Graf Rangkuman Transaksi - Halaman Graf</td>
+ <td align="center">✅</td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Menyimpan Daftar Transaksi dalam Format .xlsx, .xls - Halaman Pengaturan</td>
+ <td></td>
+ <td></td>
+ <td align="center">✅</td>
+ </tr>
+ <tr>
+ <td>Intent GMail - Halaman Pengaturan</td>
+ <td></td>
+ <td align="center">✅</td>
+ <td align="center">✅</td>
+ </tr>
+ <tr>
+ <td>Background Service - Mengecek expiry JWT</td>
+ <td></td>
+ <td></td>
+ <td align="center">✅</td>
+ </tr>
+ <tr>
+ <td>Network Sensing - Deteksi Sinyal</td>
+ <td align="center">✅</td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Broadcast Receiver - Randomize Transaksi dari Pengaturan</td>
+ <td align="center">✅</td>
+ <td align="center">✅</td>
+ <td></td>
+ </tr>
+ <tr id="merged-row">
+ <td colspan="4"><b>Bonus</b></td>
+ </tr>
+ <tr>
+ <td>Twibbon</td>
+ <td align="center">✅</td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>OWASP</td>
+ <td align="center">✅</td>
+ <td align="center">✅</td>
+ <td align="center">✅</td>
+ </tr>
+ <tr>
+ <td>Accessibility Testing</td>
+ <td></td>
+ <td></td>
+ <td align="center">✅</td>
+ </tr>
+</table>
+
+## 👠Contributors
+|Contributors|Preparation Time|Working Time|
+| --- | :---: | :---: |
+| 13521052 - Melvin Kent Jonathan | - hours | - hours |
+| 13521056 - Daniel Egiant Sitanggang | - hours | - hours |
+| 13521064 - Bill Clinton | - hours | - hours |
+| 13521108 - Michael Leon Putra Widhi | 20 hours | 48 hours |
+| 13521172 - Nathan Tenka | - hours | - hours |
diff --git a/images/Logo.png b/images/Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3de0b63271bd3a6f06af7d135f784721f82123f
Binary files /dev/null and b/images/Logo.png differ
diff --git a/images/Main.png b/images/Main.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b2634e5e7c777dd05deb035ab54f9409acd4969
Binary files /dev/null and b/images/Main.png differ
diff --git a/images/icons/Android.png b/images/icons/Android.png
new file mode 100644
index 0000000000000000000000000000000000000000..31dc21223d6f15ad18febbd70d70e7087c5610bb
Binary files /dev/null and b/images/icons/Android.png differ
diff --git a/images/icons/Unity.png b/images/icons/Unity.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f0cc42bb0bced767e7b6846401419ccd8496d2e
Binary files /dev/null and b/images/icons/Unity.png differ
diff --git a/images/icons/Visual Studio.png b/images/icons/Visual Studio.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f9478556bcc013f59f3dc90672d5a50a1ceb141
Binary files /dev/null and b/images/icons/Visual Studio.png differ