Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
This commit is contained in:
@@ -175,12 +175,12 @@ SpriteRenderer:
|
|||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 0
|
m_SortingOrder: 0
|
||||||
m_Sprite: {fileID: 21300000, guid: fa06e98df13bed5468a7d1961cb760a4, type: 3}
|
m_Sprite: {fileID: 21300000, guid: bc8d7710bbebad24b82e33f7ac25b541, type: 3}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_FlipX: 0
|
m_FlipX: 0
|
||||||
m_FlipY: 0
|
m_FlipY: 0
|
||||||
m_DrawMode: 0
|
m_DrawMode: 0
|
||||||
m_Size: {x: 18.875, y: 9.75}
|
m_Size: {x: 7.5, y: 10.1875}
|
||||||
m_AdaptiveModeThreshold: 0.5
|
m_AdaptiveModeThreshold: 0.5
|
||||||
m_SpriteTileMode: 0
|
m_SpriteTileMode: 0
|
||||||
m_WasSpriteAssigned: 1
|
m_WasSpriteAssigned: 1
|
||||||
@@ -194,12 +194,18 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 163099069}
|
m_GameObject: {fileID: 163099069}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 3.08, y: -0.04, z: 10}
|
m_LocalPosition: {x: 0.4, y: -1.22, z: 10}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!20 &181442642 stripped
|
||||||
|
Camera:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 5711328081315814051, guid: fe8fb0c1c30f84b43885e84de26e0f11,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 527800482}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &527800482
|
--- !u!1001 &527800482
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -220,7 +226,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11,
|
- target: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.z
|
propertyPath: m_LocalPosition.z
|
||||||
value: 0
|
value: -10
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11,
|
- target: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11,
|
||||||
type: 3}
|
type: 3}
|
||||||
@@ -329,9 +335,16 @@ MonoBehaviour:
|
|||||||
sceneA: {fileID: 163099070}
|
sceneA: {fileID: 163099070}
|
||||||
sceneB: {fileID: 1767155644}
|
sceneB: {fileID: 1767155644}
|
||||||
sceneC: {fileID: 1641291250}
|
sceneC: {fileID: 1641291250}
|
||||||
sprites: []
|
sprites:
|
||||||
camera: {fileID: 0}
|
- {fileID: 21300000, guid: bc8d7710bbebad24b82e33f7ac25b541, type: 3}
|
||||||
--- !u!1 &766330446
|
- {fileID: 21300000, guid: fa06e98df13bed5468a7d1961cb760a4, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 9f623c61ab46b87438bfdece3d768960, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 1da36b65961a27d4b85b510e8de9b8f5, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 53892b572f4f58d41ad7f4c7dbc06a4e, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 950c5f7a7eb9c8542b85cd8e1b1cc464, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 5f1fe8705f850e845b03e87561f1dd07, type: 3}
|
||||||
|
gameCamera: {fileID: 181442642}
|
||||||
|
--- !u!1 &691305549
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -339,124 +352,163 @@ GameObject:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 766330448}
|
- component: {fileID: 691305551}
|
||||||
- component: {fileID: 766330447}
|
- component: {fileID: 691305550}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Music
|
m_Name: WidescreenB
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!82 &766330447
|
--- !u!212 &691305550
|
||||||
AudioSource:
|
SpriteRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 766330446}
|
m_GameObject: {fileID: 691305549}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 4
|
m_CastShadows: 0
|
||||||
OutputAudioMixerGroup: {fileID: 0}
|
m_ReceiveShadows: 0
|
||||||
m_audioClip: {fileID: 8300000, guid: a01c0a314f63f5c4aaf9d28a33e9d2f2, type: 3}
|
m_DynamicOccludee: 1
|
||||||
m_PlayOnAwake: 1
|
m_MotionVectors: 1
|
||||||
m_Volume: 1
|
m_LightProbeUsage: 1
|
||||||
m_Pitch: 1
|
m_ReflectionProbeUsage: 1
|
||||||
Loop: 0
|
m_RenderingLayerMask: 1
|
||||||
Mute: 0
|
m_RendererPriority: 0
|
||||||
Spatialize: 0
|
m_Materials:
|
||||||
SpatializePostEffects: 0
|
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
Priority: 128
|
m_StaticBatchInfo:
|
||||||
DopplerLevel: 1
|
firstSubMesh: 0
|
||||||
MinDistance: 1
|
subMeshCount: 0
|
||||||
MaxDistance: 500
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
Pan2D: 0
|
m_ProbeAnchor: {fileID: 0}
|
||||||
rolloffMode: 0
|
m_LightProbeVolumeOverride: {fileID: 0}
|
||||||
BypassEffects: 0
|
m_ScaleInLightmap: 1
|
||||||
BypassListenerEffects: 0
|
m_ReceiveGI: 1
|
||||||
BypassReverbZones: 0
|
m_PreserveUVs: 0
|
||||||
rolloffCustomCurve:
|
m_IgnoreNormalsForChartDetection: 0
|
||||||
serializedVersion: 2
|
m_ImportantGI: 0
|
||||||
m_Curve:
|
m_StitchLightmapSeams: 1
|
||||||
- serializedVersion: 3
|
m_SelectedEditorRenderState: 0
|
||||||
time: 0
|
m_MinimumChartSize: 4
|
||||||
value: 1
|
m_AutoUVMaxDistance: 0.5
|
||||||
inSlope: 0
|
m_AutoUVMaxAngle: 89
|
||||||
outSlope: 0
|
m_LightmapParameters: {fileID: 0}
|
||||||
tangentMode: 0
|
m_SortingLayerID: 0
|
||||||
weightedMode: 0
|
m_SortingLayer: 0
|
||||||
inWeight: 0.33333334
|
m_SortingOrder: 0
|
||||||
outWeight: 0.33333334
|
m_Sprite: {fileID: 21300000, guid: a9078c7117a6aee41b18fa31152cd6cb, type: 3}
|
||||||
- serializedVersion: 3
|
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
||||||
time: 1
|
m_FlipX: 0
|
||||||
value: 0
|
m_FlipY: 0
|
||||||
inSlope: 0
|
m_DrawMode: 0
|
||||||
outSlope: 0
|
m_Size: {x: 0.16, y: 0.16}
|
||||||
tangentMode: 0
|
m_AdaptiveModeThreshold: 0.5
|
||||||
weightedMode: 0
|
m_SpriteTileMode: 0
|
||||||
inWeight: 0.33333334
|
m_WasSpriteAssigned: 1
|
||||||
outWeight: 0.33333334
|
m_MaskInteraction: 0
|
||||||
m_PreInfinity: 2
|
m_SpriteSortPoint: 0
|
||||||
m_PostInfinity: 2
|
--- !u!4 &691305551
|
||||||
m_RotationOrder: 4
|
|
||||||
panLevelCustomCurve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: 0
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 0
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
spreadCustomCurve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: 0
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 0
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
reverbZoneMixCustomCurve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: 1
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 0
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
--- !u!4 &766330448
|
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 766330446}
|
m_GameObject: {fileID: 691305549}
|
||||||
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_LocalPosition: {x: -9.88, y: 7.52, z: 9}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 81.503, y: 10, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 987286083}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!4 &987286083 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 527800482}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &1108633903
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1108633905}
|
||||||
|
- component: {fileID: 1108633904}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: WidescreenA
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!212 &1108633904
|
||||||
|
SpriteRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1108633903}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 0
|
||||||
|
m_ReceiveShadows: 0
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_StaticBatchInfo:
|
||||||
|
firstSubMesh: 0
|
||||||
|
subMeshCount: 0
|
||||||
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
|
m_ProbeAnchor: {fileID: 0}
|
||||||
|
m_LightProbeVolumeOverride: {fileID: 0}
|
||||||
|
m_ScaleInLightmap: 1
|
||||||
|
m_ReceiveGI: 1
|
||||||
|
m_PreserveUVs: 0
|
||||||
|
m_IgnoreNormalsForChartDetection: 0
|
||||||
|
m_ImportantGI: 0
|
||||||
|
m_StitchLightmapSeams: 1
|
||||||
|
m_SelectedEditorRenderState: 0
|
||||||
|
m_MinimumChartSize: 4
|
||||||
|
m_AutoUVMaxDistance: 0.5
|
||||||
|
m_AutoUVMaxAngle: 89
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_Sprite: {fileID: 21300000, guid: a9078c7117a6aee41b18fa31152cd6cb, type: 3}
|
||||||
|
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
m_FlipX: 0
|
||||||
|
m_FlipY: 0
|
||||||
|
m_DrawMode: 0
|
||||||
|
m_Size: {x: 0.16, y: 0.16}
|
||||||
|
m_AdaptiveModeThreshold: 0.5
|
||||||
|
m_SpriteTileMode: 0
|
||||||
|
m_WasSpriteAssigned: 1
|
||||||
|
m_MaskInteraction: 0
|
||||||
|
m_SpriteSortPoint: 0
|
||||||
|
--- !u!4 &1108633905
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1108633903}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: -9.35, y: -5.13, z: 9}
|
||||||
|
m_LocalScale: {x: 79.431564, y: 10, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 987286083}
|
||||||
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &1641291249
|
--- !u!1 &1641291249
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -469,7 +521,7 @@ GameObject:
|
|||||||
- component: {fileID: 1641291251}
|
- component: {fileID: 1641291251}
|
||||||
- component: {fileID: 1641291250}
|
- component: {fileID: 1641291250}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: New Sprite
|
m_Name: ScenePieceC
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
@@ -513,7 +565,7 @@ SpriteRenderer:
|
|||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 0
|
m_SortingOrder: 0
|
||||||
m_Sprite: {fileID: 21300000, guid: 9f623c61ab46b87438bfdece3d768960, type: 3}
|
m_Sprite: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_FlipX: 0
|
m_FlipX: 0
|
||||||
m_FlipY: 0
|
m_FlipY: 0
|
||||||
@@ -521,7 +573,7 @@ SpriteRenderer:
|
|||||||
m_Size: {x: 7.5, y: 10.1875}
|
m_Size: {x: 7.5, y: 10.1875}
|
||||||
m_AdaptiveModeThreshold: 0.5
|
m_AdaptiveModeThreshold: 0.5
|
||||||
m_SpriteTileMode: 0
|
m_SpriteTileMode: 0
|
||||||
m_WasSpriteAssigned: 1
|
m_WasSpriteAssigned: 0
|
||||||
m_MaskInteraction: 0
|
m_MaskInteraction: 0
|
||||||
m_SpriteSortPoint: 0
|
m_SpriteSortPoint: 0
|
||||||
--- !u!4 &1641291251
|
--- !u!4 &1641291251
|
||||||
@@ -532,7 +584,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1641291249}
|
m_GameObject: {fileID: 1641291249}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0.8, y: -1.08, z: 9}
|
m_LocalPosition: {x: 0.8, y: -1.08, z: 15}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
@@ -593,7 +645,7 @@ SpriteRenderer:
|
|||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 0
|
m_SortingOrder: 0
|
||||||
m_Sprite: {fileID: 21300000, guid: d1cb72aac5477ad418c7ed735583f29b, type: 3}
|
m_Sprite: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_FlipX: 0
|
m_FlipX: 0
|
||||||
m_FlipY: 0
|
m_FlipY: 0
|
||||||
@@ -601,7 +653,7 @@ SpriteRenderer:
|
|||||||
m_Size: {x: 21.4375, y: 12.1875}
|
m_Size: {x: 21.4375, y: 12.1875}
|
||||||
m_AdaptiveModeThreshold: 0.5
|
m_AdaptiveModeThreshold: 0.5
|
||||||
m_SpriteTileMode: 0
|
m_SpriteTileMode: 0
|
||||||
m_WasSpriteAssigned: 1
|
m_WasSpriteAssigned: 0
|
||||||
m_MaskInteraction: 0
|
m_MaskInteraction: 0
|
||||||
m_SpriteSortPoint: 0
|
m_SpriteSortPoint: 0
|
||||||
--- !u!4 &1767155645
|
--- !u!4 &1767155645
|
||||||
@@ -612,7 +664,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1767155643}
|
m_GameObject: {fileID: 1767155643}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: -2.53, y: -1.22, z: 3}
|
m_LocalPosition: {x: 0, y: 0, z: 3}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
public class GameIntroCutscene : Cutscene
|
public class GameIntroCutscene : Cutscene
|
||||||
{
|
{
|
||||||
@@ -9,13 +9,13 @@ public class GameIntroCutscene : Cutscene
|
|||||||
public SpriteRenderer sceneC;
|
public SpriteRenderer sceneC;
|
||||||
public Sprite[] sprites;
|
public Sprite[] sprites;
|
||||||
|
|
||||||
public Camera camera;
|
public Camera gameCamera;
|
||||||
private Vector3 basePosition;
|
private Vector3 basePosition;
|
||||||
private int shakeTime = 0;
|
private int shakeTime = 0;
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
basePosition = camera.transform.position;
|
basePosition = gameCamera.transform.position;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -23,12 +23,12 @@ public class GameIntroCutscene : Cutscene
|
|||||||
{
|
{
|
||||||
if (shakeTime > 0)
|
if (shakeTime > 0)
|
||||||
{
|
{
|
||||||
camera.transform.position = basePosition + new Vector3(
|
gameCamera.transform.position = basePosition + new Vector3(
|
||||||
Random.Range(-0.2f, 0.2f), Random.Range(-0.2f, 0.2f), basePosition.z);
|
Random.Range(-0.2f, 0.2f), Random.Range(-0.2f, 0.2f), basePosition.z);
|
||||||
shakeTime--;
|
shakeTime--;
|
||||||
|
|
||||||
if (shakeTime == 0)
|
if (shakeTime == 0)
|
||||||
camera.transform.position = basePosition;
|
gameCamera.transform.position = basePosition;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,28 +41,37 @@ public class GameIntroCutscene : Cutscene
|
|||||||
{
|
{
|
||||||
yield return TestA();
|
yield return TestA();
|
||||||
yield return TestB();
|
yield return TestB();
|
||||||
|
yield return TestC();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnSceneEnd()
|
||||||
|
{
|
||||||
|
var nextIndex = SceneManager.GetActiveScene().buildIndex + 1;
|
||||||
|
|
||||||
|
if (SceneManager.sceneCountInBuildSettings > nextIndex)
|
||||||
|
SceneManager.LoadScene(nextIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
IEnumerator TestA()
|
IEnumerator TestA()
|
||||||
{
|
{
|
||||||
sceneA.sprite = sprites[0];
|
sceneA.sprite = sprites[1];
|
||||||
sceneB.sprite = sprites[1];
|
sceneB.sprite = sprites[0];
|
||||||
sceneC.sprite = sprites[2];
|
sceneC.sprite = sprites[2];
|
||||||
|
|
||||||
for (int i = 0; i <= 150; i++)
|
for (int i = 0; i <= 150; i++)
|
||||||
{
|
{
|
||||||
var percent = 1f * i / 150;
|
var percent = 1f * i / 150;
|
||||||
sceneA.transform.position = Vector3.Lerp(
|
sceneA.transform.position = Vector3.Lerp(
|
||||||
new Vector3(-0.16f, -0.04f, 0f),
|
new Vector3(-0.16f, -0.04f, 10f),
|
||||||
new Vector3(3.08f, -0.04f, 0f),
|
new Vector3(3.08f, -0.04f, 10f),
|
||||||
percent);
|
percent);
|
||||||
sceneB.transform.position = Vector3.Lerp(
|
sceneB.transform.position = Vector3.Lerp(
|
||||||
new Vector3(1.5f, -1.22f, -2f),
|
new Vector3(2.02f, -1.22f, 0f),
|
||||||
new Vector3(-2.2f, -1.22f, -2f),
|
new Vector3(.4f, -1.22f, 0f),
|
||||||
percent);
|
percent);
|
||||||
sceneC.transform.position = Vector3.Lerp(
|
sceneC.transform.position = Vector3.Lerp(
|
||||||
new Vector3(0.38f, -1.08f, -1f),
|
new Vector3(0.38f, -1.08f, 9f),
|
||||||
new Vector3(3.62f, -1.08f, -1f),
|
new Vector3(3.62f, -1.08f, 9f),
|
||||||
percent);
|
percent);
|
||||||
yield return null;
|
yield return null;
|
||||||
}
|
}
|
||||||
@@ -77,19 +86,42 @@ public class GameIntroCutscene : Cutscene
|
|||||||
|
|
||||||
IEnumerator TestB()
|
IEnumerator TestB()
|
||||||
{
|
{
|
||||||
sceneA.sprite = sprites[4];
|
sceneA.sprite = sprites[5];
|
||||||
sceneB.sprite = sprites[5];
|
sceneB.sprite = sprites[4];
|
||||||
sceneC.gameObject.SetActive(false);
|
sceneC.gameObject.SetActive(false);
|
||||||
|
|
||||||
sceneA.transform.position = new Vector3(0f, 0f, 0f);
|
sceneA.transform.position = new Vector3(0f, 0f, 1f);
|
||||||
sceneB.transform.position = new Vector3(0f, 0f, -10f);
|
sceneB.transform.position = new Vector3(0f, 0f, 0f);
|
||||||
|
|
||||||
Shake(60);
|
Shake(30);
|
||||||
|
|
||||||
for (int i = 0; i <= 60; i++)
|
for (int i = 0; i <= 90; i++)
|
||||||
{
|
{
|
||||||
sceneA.transform.localScale.Set(i % 4 >= 2 ? -1f : 1f, 1f, 1f);
|
var test = i % 4 >= 2;
|
||||||
|
sceneA.transform.localScale = new Vector3(test ? -1f : 1f, 1f, 1f);
|
||||||
yield return null;
|
yield return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sceneA.transform.localScale = Vector3.one;
|
||||||
|
}
|
||||||
|
|
||||||
|
IEnumerator TestC()
|
||||||
|
{
|
||||||
|
sceneA.sprite = sprites[1];
|
||||||
|
sceneB.sprite = sprites[0];
|
||||||
|
sceneC.sprite = sprites[3];
|
||||||
|
sceneC.gameObject.SetActive(true);
|
||||||
|
|
||||||
|
sceneA.transform.position = new Vector3(3.08f, -0.04f, 10f);
|
||||||
|
sceneB.transform.position = new Vector3(.4f, -1.22f, 0f);
|
||||||
|
sceneC.transform.position = new Vector3(3.62f, -1.08f, 9f);
|
||||||
|
|
||||||
|
yield return new WaitForSeconds(.8f);
|
||||||
|
|
||||||
|
sceneC.sprite = sprites[2];
|
||||||
|
sceneB.sprite = sprites[6];
|
||||||
|
Shake(20);
|
||||||
|
|
||||||
|
yield return new WaitForSeconds(1.5f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 4.4 KiB |
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: d1cb72aac5477ad418c7ed735583f29b
|
guid: bc8d7710bbebad24b82e33f7ac25b541
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
internalIDToNameTable: []
|
internalIDToNameTable: []
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
|||||||
BIN
Assets/Textures/SceneEl3.png
Normal file
BIN
Assets/Textures/SceneEl3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.1 KiB |
151
Assets/Textures/SceneEl3.png.meta
Normal file
151
Assets/Textures/SceneEl3.png.meta
Normal file
@@ -0,0 +1,151 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5f1fe8705f850e845b03e87561f1dd07
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 10
|
||||||
|
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
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 0
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 16
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Windows Store Apps
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 6.0 KiB |
BIN
Assets/Textures/Square.png
Normal file
BIN
Assets/Textures/Square.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 78 B |
159
Assets/Textures/Square.png.meta
Normal file
159
Assets/Textures/Square.png.meta
Normal file
@@ -0,0 +1,159 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a9078c7117a6aee41b18fa31152cd6cb
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 10
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
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
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 0
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 3
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 1
|
||||||
|
spritePivot: {x: 0, y: 1}
|
||||||
|
spritePixelsToUnits: 16
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Windows Store Apps
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline:
|
||||||
|
- - {x: -2, y: -2}
|
||||||
|
- {x: -2, y: 2}
|
||||||
|
- {x: 2, y: 2}
|
||||||
|
- {x: 2, y: -2}
|
||||||
|
physicsShape:
|
||||||
|
- - {x: -2, y: -2}
|
||||||
|
- {x: -2, y: 2}
|
||||||
|
- {x: 2, y: 2}
|
||||||
|
- {x: 2, y: -2}
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Reference in New Issue
Block a user