Pull request #29: Revamp main menu

Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '61cf67f7bfd52384cec3808de84f81f24568acfd':
  revamp main menu Add tmp extras
This commit is contained in:
Soulaha 2022-05-15 18:01:19 +00:00
commit 5906b58a83
8 changed files with 1455 additions and 176 deletions

View File

@ -625,8 +625,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Play m_text: Play
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -760,8 +760,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Quit m_text: Quit
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -1029,8 +1029,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Verse Invaders m_text: Verse Invaders
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -1275,6 +1275,87 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 341877381} m_GameObject: {fileID: 341877381}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1001 &403752666
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1091277268389575657, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3827493882350199147, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5886657504162338292, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_Intensity
value: 101.29
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047552, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_Name
value: enemy3
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalScale.x
value: 0.33076775
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalScale.y
value: 0.33076775
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalScale.z
value: 0.33076775
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalPosition.x
value: -10.9
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalPosition.z
value: 26.3
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalRotation.w
value: 0.25096524
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalRotation.x
value: -0.054320067
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalRotation.y
value: 0.94459766
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalRotation.z
value: -0.20445316
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 21.038
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 147.874
objectReference: {fileID: 0}
- target: {fileID: 7237433744057047553, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -12.703
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3}
--- !u!1 &410334968 --- !u!1 &410334968
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1615,8 +1696,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Leaderboard m_text: Leaderboard
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -1640,8 +1721,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 21.55
m_fontSizeBase: 24 m_fontSizeBase: 21.55
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
@ -1750,8 +1831,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: 'SFX:' m_text: 'SFX:'
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -1814,7 +1895,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &524261998 --- !u!222 &524261998
@ -1885,8 +1966,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Options m_text: Options
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -2154,17 +2235,22 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: '* Destroy the invaders before they hit the ground m_text: '* Destroy the invaders before they hit the ground
* Travel between * Travel between
universes to keep the invaders away universes to keep the invaders away
* If one universe is destroyed, you''ve * If one universe is destroyed, you''ve
lost lost
* Use the currency you gain from destroying invaders to buy upgrades * Use the currency you gain from destroying invaders to buy upgrades
for your cannon' for your cannon
'
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -2195,14 +2281,14 @@ MonoBehaviour:
m_fontSizeMin: 18 m_fontSizeMin: 18
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 32 m_fontStyle: 32
m_HorizontalAlignment: 2 m_HorizontalAlignment: 1
m_VerticalAlignment: 512 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 0 m_characterSpacing: 0
m_wordSpacing: 0 m_wordSpacing: 0
m_lineSpacing: 0 m_lineSpacing: 0
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: -32.23
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 1 m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
@ -2227,7 +2313,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &643534699 --- !u!222 &643534699
@ -2298,8 +2384,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Options m_text: Options
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -2362,7 +2448,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &667119344 --- !u!222 &667119344
@ -2478,19 +2564,19 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3} - target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.97083694 value: 0.26803404
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3} - target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0.07947712 value: 0.014931013
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3} - target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0.22542968 value: -0.95994824
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3} - target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0.018454695 value: -0.08021399
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3} - target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
@ -2498,7 +2584,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3} - target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 26.45 value: -148.494
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3} - target: {fileID: 4834061106301780288, guid: 03bebbba108d4de4c9067425294d4775, type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
@ -2574,8 +2660,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Help m_text: Help
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -2709,8 +2795,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Music m_text: Music
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -2773,7 +2859,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &807047429 --- !u!222 &807047429
@ -2844,8 +2930,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: 'Master:' m_text: 'Master:'
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -2908,7 +2994,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &999137297 --- !u!222 &999137297
@ -2979,8 +3065,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Leaderboard m_text: Leaderboard
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -3043,7 +3129,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1008091341 --- !u!222 &1008091341
@ -3114,8 +3200,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Back m_text: Back
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -3178,7 +3264,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1034154821 --- !u!222 &1034154821
@ -3456,13 +3542,25 @@ PrefabInstance:
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 4 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalScale.x
value: 0.5487001
objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalScale.y
value: 0.5487001
objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalScale.z
value: 0.5487001
objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 9.99 value: 9.99
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 9.28 value: 10.15
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
@ -3470,19 +3568,19 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.9519358 value: 0.18033227
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0.06536628 value: -0.11106836
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0.25627452 value: -0.9691948
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0.15449566 value: 0.12571986
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
@ -3490,7 +3588,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: -28.537 value: -157.322
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
@ -3570,8 +3668,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: How to play m_text: How to play
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -3634,7 +3732,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1277568156 --- !u!222 &1277568156
@ -5115,8 +5213,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Back m_text: Back
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -5179,7 +5277,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1876773231 --- !u!222 &1876773231
@ -5250,8 +5348,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Back m_text: Back
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -5314,7 +5412,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &2016819122 --- !u!222 &2016819122

View File

@ -1,8 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8a89fa14b10d46a99122fd4f73fca9a2 guid: f954703432872b6469baf3c6005b0297
timeCreated: 1484172732
licenseType: Pro
NativeFormatImporter: NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,5 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 125cb55b44b24c4393181402bc6200e6 guid: 8a89fa14b10d46a99122fd4f73fca9a2
timeCreated: 1484172732
licenseType: Pro
NativeFormatImporter: NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:

View File

@ -1,7 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: dc36b3fdc14f47ebb36fd484a67e268a guid: 125cb55b44b24c4393181402bc6200e6
timeCreated: 1487729771
licenseType: Pro
NativeFormatImporter: NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:

File diff suppressed because one or more lines are too long

View File

@ -249,6 +249,34 @@ MonoBehaviour:
m_Height: 59 m_Height: 59
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
- m_Index: 54
m_Metrics:
m_Width: 51
m_Height: 61
m_HorizontalBearingX: 3
m_HorizontalBearingY: 60
m_HorizontalAdvance: 57
m_GlyphRect:
m_X: 234
m_Y: 75
m_Width: 51
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
- m_Index: 57
m_Metrics:
m_Width: 57
m_Height: 59
m_HorizontalBearingX: 0
m_HorizontalBearingY: 59
m_HorizontalAdvance: 57
m_GlyphRect:
m_X: 374
m_Y: 10
m_Width: 57
m_Height: 59
m_Scale: 1
m_AtlasIndex: 0
- m_Index: 66 - m_Index: 66
m_Metrics: m_Metrics:
m_Width: 51 m_Width: 51
@ -350,6 +378,14 @@ MonoBehaviour:
m_Unicode: 82 m_Unicode: 82
m_GlyphIndex: 53 m_GlyphIndex: 53
m_Scale: 1 m_Scale: 1
- m_ElementType: 1
m_Unicode: 83
m_GlyphIndex: 54
m_Scale: 1
- m_ElementType: 1
m_Unicode: 86
m_GlyphIndex: 57
m_Scale: 1
- m_ElementType: 1 - m_ElementType: 1
m_Unicode: 95 m_Unicode: 95
m_GlyphIndex: 66 m_GlyphIndex: 66
@ -492,7 +528,112 @@ MonoBehaviour:
m_KerningTable: m_KerningTable:
kerningPairs: [] kerningPairs: []
m_FontFeatureTable: m_FontFeatureTable:
m_GlyphPairAdjustmentRecords: [] m_GlyphPairAdjustmentRecords:
- m_FirstAdjustmentRecord:
m_GlyphIndex: 3
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -4.75
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 36
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 36
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -4.75
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 3
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 36
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -6.390625
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 57
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 53
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -1.546875
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 57
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 57
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -6.390625
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 36
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 57
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -4.75
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 72
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 57
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -3.1875
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 88
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
fallbackFontAssets: [] fallbackFontAssets: []
m_FallbackFontAssetTable: [] m_FallbackFontAssetTable: []
m_CreationSettings: m_CreationSettings:

View File

@ -14,8 +14,8 @@ PlayerSettings:
accelerometerFrequency: 60 accelerometerFrequency: 60
companyName: Conjure companyName: Conjure
productName: ConjureCreativeJam20 productName: ConjureCreativeJam20
defaultCursor: {fileID: 0} defaultCursor: {fileID: 2800000, guid: c6535c9f0b512474f9d06a68ab050a30, type: 3}
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 16, y: 16}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_ShowUnitySplashScreen: 1 m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1 m_ShowUnitySplashLogo: 1