mirror of
https://github.com/ConjureETS/OuijaMTLGJ2016.git
synced 2026-03-24 02:01:06 +00:00
Merge Menu
This commit is contained in:
commit
a8aecd2713
File diff suppressed because it is too large
Load Diff
@ -11,6 +11,7 @@ GameObject:
|
||||
- 114: {fileID: 11481872}
|
||||
- 82: {fileID: 8254278}
|
||||
- 82: {fileID: 8250766}
|
||||
- 82: {fileID: 8206014}
|
||||
m_Layer: 0
|
||||
m_Name: SoundManager
|
||||
m_TagString: Untagged
|
||||
@ -30,6 +31,80 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
--- !u!82 &8206014
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 112570}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 8300000, guid: 42ca4bd826baa2945a1896e2bbad1d37, type: 3}
|
||||
m_PlayOnAwake: 0
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
Priority: 0
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
- time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 0
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 0
|
||||
--- !u!82 &8250766
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 1
|
||||
@ -41,10 +116,10 @@ AudioSource:
|
||||
OutputAudioMixerGroup: {fileID: 24300001, guid: 4dfc40942aa25594b8af2511c1814e5c,
|
||||
type: 2}
|
||||
m_audioClip: {fileID: 8300000, guid: ab3b851bbb749cf4984c1aea0241f278, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_PlayOnAwake: 0
|
||||
m_Volume: 1
|
||||
m_Pitch: 0.52
|
||||
Loop: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
Priority: 0
|
||||
@ -194,6 +269,7 @@ MonoBehaviour:
|
||||
Gameplay: {fileID: 0}
|
||||
Scrapping: {fileID: 8254278}
|
||||
RunePickup: {fileID: 8250766}
|
||||
ShortHorn: {fileID: 8206014}
|
||||
--- !u!1001 &100100000
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 1
|
||||
|
||||
@ -65,7 +65,6 @@ LightmapSettings:
|
||||
m_TextureCompression: 1
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherRayCount: 1024
|
||||
m_ReflectionCompression: 2
|
||||
m_LightmapSnapshot: {fileID: 0}
|
||||
m_RuntimeCPUUsage: 25
|
||||
--- !u!196 &4
|
||||
@ -85,6 +84,9 @@ NavMeshSettings:
|
||||
cellSize: .166666672
|
||||
manualCellSize: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!127 &5
|
||||
LevelGameManager:
|
||||
m_ObjectHideFlags: 0
|
||||
--- !u!1 &16934334
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -325,12 +327,96 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1944057160}
|
||||
m_RootOrder: 5
|
||||
--- !u!1001 &465510529
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1353155034}
|
||||
m_Modifications:
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.9851093
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.17192934
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
--- !u!114 &488783779 stripped
|
||||
MonoBehaviour:
|
||||
m_PrefabParentObject: {fileID: 11431374, guid: d9aa98efb3480c8438047a4565cd1893,
|
||||
type: 2}
|
||||
m_PrefabInternal: {fileID: 1229110618}
|
||||
m_Script: {fileID: 11500000, guid: 0f36f7c8f7d8e03418efcbf2c3645cd8, type: 3}
|
||||
--- !u!1001 &652304390
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 325146622}
|
||||
m_Modifications:
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.9851093
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.17192934
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
--- !u!1001 &833149562
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -501,7 +587,6 @@ Camera:
|
||||
m_RenderingPath: -1
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TargetDisplay: 0
|
||||
m_TargetEye: 3
|
||||
m_HDR: 0
|
||||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
@ -614,6 +699,10 @@ Prefab:
|
||||
propertyPath: m_RootOrder
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 11451600, guid: 10be2fb46e4285942b2957ae293fd714, type: 2}
|
||||
propertyPath: offset
|
||||
value: 70
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: 10be2fb46e4285942b2957ae293fd714, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
@ -706,15 +795,15 @@ Prefab:
|
||||
m_Modifications:
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 7.96999931
|
||||
value: 7.9699993
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.08000004
|
||||
value: -1.08
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.60000229
|
||||
value: 4.6000023
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
@ -722,7 +811,7 @@ Prefab:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: .50000006
|
||||
value: 0.50000006
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
@ -730,7 +819,7 @@ Prefab:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: .866025448
|
||||
value: 0.86602545
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
@ -1271,15 +1360,15 @@ Prefab:
|
||||
m_Modifications:
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -8.07000065
|
||||
value: -8.070001
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.08000004
|
||||
value: -1.08
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.65000534
|
||||
value: 4.6500053
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
@ -1287,7 +1376,7 @@ Prefab:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: .499999851
|
||||
value: 0.49999985
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
@ -1295,7 +1384,7 @@ Prefab:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -.866025567
|
||||
value: -0.86602557
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
@ -1669,6 +1758,10 @@ Prefab:
|
||||
propertyPath: m_Material
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 448126, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
@ -1717,6 +1810,48 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1944057160}
|
||||
m_RootOrder: 7
|
||||
--- !u!1001 &1760567994
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1863653871}
|
||||
m_Modifications:
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.9851093
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.17192934
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 478086, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: eaf32609a10afd24f9a1b314f4287511, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
--- !u!1001 &1777326589
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1776,11 +1911,11 @@ Prefab:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.08000004
|
||||
value: -1.08
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -9.23999786
|
||||
value: -9.239998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
@ -1796,7 +1931,7 @@ Prefab:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -1.49011612e-07
|
||||
value: -0.00000014901161
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
|
||||
@ -85,6 +85,73 @@ NavMeshSettings:
|
||||
cellSize: 0.16666667
|
||||
manualCellSize: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &371852793
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 224: {fileID: 371852794}
|
||||
- 222: {fileID: 371852796}
|
||||
- 114: {fileID: 371852795}
|
||||
m_Layer: 5
|
||||
m_Name: Title
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &371852794
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 371852793}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 4, y: 4, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1520914591}
|
||||
m_RootOrder: 1
|
||||
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: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &371852795
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 371852793}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 4da822d897e97b04689478f16e6aa14b, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
--- !u!222 &371852796
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 371852793}
|
||||
--- !u!1 &767368736
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -256,7 +323,7 @@ GameObject:
|
||||
- 222: {fileID: 1304749981}
|
||||
- 114: {fileID: 1304749980}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_Name: Background
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -275,13 +342,13 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 70e98a81450e7b54fa8b1efd9df2a799, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 65709ad85b5d9b743a5dbae4c841ab0d, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -403,6 +470,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children:
|
||||
- {fileID: 1304749982}
|
||||
- {fileID: 371852794}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@ -477,6 +545,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
nextLevel: 1
|
||||
isSkippable: 1
|
||||
hasAutoSkips: 1
|
||||
timeBeforeSkip: 10
|
||||
timeBeforeAutoSkip: 15
|
||||
timeBeforeSkippable: 3
|
||||
|
||||
@ -35,12 +35,12 @@ public class Character : MonoBehaviour
|
||||
void Awake()
|
||||
{
|
||||
rb = GetComponent<Rigidbody>();
|
||||
particleSys = GetComponent<ParticleSystem>();
|
||||
}
|
||||
|
||||
void Start()
|
||||
{
|
||||
selector = GameObject.FindObjectOfType<SelectorWithBolts>();
|
||||
particleSys = GetComponentInChildren<ParticleSystem>();
|
||||
}
|
||||
|
||||
void Update()
|
||||
@ -94,9 +94,7 @@ public class Character : MonoBehaviour
|
||||
selector.ReplenishPlayerDashMeter(playerId);
|
||||
|
||||
dashRemainingTime = DashCooldown;
|
||||
|
||||
//particleSys.Play();
|
||||
|
||||
|
||||
StartCoroutine(DashCoroutine());
|
||||
|
||||
return true;
|
||||
@ -106,6 +104,8 @@ public class Character : MonoBehaviour
|
||||
{
|
||||
isDashing = true;
|
||||
|
||||
particleSys.Play();
|
||||
|
||||
dashForward = GetComponent<Transform>().forward;
|
||||
rb.velocity = Vector3.zero;
|
||||
|
||||
@ -114,5 +114,7 @@ public class Character : MonoBehaviour
|
||||
yield return new WaitForSeconds(0.9f);
|
||||
|
||||
isDashing = false;
|
||||
|
||||
particleSys.enableEmission = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
using System.Collections;
|
||||
|
||||
public class GUIGameplay : MonoBehaviour {
|
||||
public const int boxHeight=90,boxWidth=50;
|
||||
public const int offset = 10;
|
||||
public const int boxHeight=90,boxWidth=70;
|
||||
public int offset = 10;
|
||||
// Use this for initialization
|
||||
void Start () {
|
||||
|
||||
@ -41,8 +41,8 @@ public class GUIGameplay : MonoBehaviour {
|
||||
break;
|
||||
}
|
||||
//beardTex.Resize(10, 10);
|
||||
int offset = (int)((Screen.width - 3 * boxWidth) / 5f);
|
||||
x = (int) (((Screen.width - boxWidth*3) / 3 * (1+1/6) * i) + (Screen.width - boxWidth*3)/6);
|
||||
//int offset = (int)((Screen.width - 3 * boxWidth) / 5f);
|
||||
x = (int) (offset + Screen.width / 3 * i);
|
||||
|
||||
GUI.Box(new Rect(x , 0, boxWidth, 90), beardTex, boxStyle);
|
||||
|
||||
|
||||
@ -76,6 +76,9 @@ public class LevelManager : MonoBehaviour {
|
||||
|
||||
Selector = GameObject.FindObjectOfType<SelectorWithBolts>();
|
||||
PhysicsContainer = GameObject.Find("PhysicsContainer");
|
||||
|
||||
//play start sound
|
||||
SoundManager.Instance.PlayShortHorn();
|
||||
}
|
||||
|
||||
public void PressTile(int letterNum, RuneBehaviour tile)
|
||||
|
||||
@ -4,9 +4,10 @@ using System.Collections;
|
||||
public class MenuInteractions : MonoBehaviour
|
||||
{
|
||||
public int nextLevel;
|
||||
public bool isSkippable = true;
|
||||
public bool hasAutoSkips = false;
|
||||
public int timeBeforeSkip = 10;
|
||||
public int timeBeforeAutoSkip = 10;
|
||||
public int timeBeforeSkippable = 0;
|
||||
private bool isSkippable = false;
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
@ -18,16 +19,13 @@ public class MenuInteractions : MonoBehaviour
|
||||
Application.LoadLevel(nextLevel);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void Start()
|
||||
{
|
||||
// this won't lead anywhere... let's fix it
|
||||
if(!isSkippable && !hasAutoSkips)
|
||||
{
|
||||
isSkippable = true;
|
||||
hasAutoSkips = true;
|
||||
}
|
||||
|
||||
StartCoroutine(EnableSkip());
|
||||
|
||||
if (hasAutoSkips)
|
||||
{
|
||||
@ -37,8 +35,15 @@ public class MenuInteractions : MonoBehaviour
|
||||
|
||||
IEnumerator AutoSkip()
|
||||
{
|
||||
yield return new WaitForSeconds(timeBeforeSkip);
|
||||
yield return new WaitForSeconds(timeBeforeAutoSkip);
|
||||
Application.LoadLevel(nextLevel);
|
||||
|
||||
}
|
||||
|
||||
IEnumerator EnableSkip()
|
||||
{
|
||||
yield return new WaitForSeconds(timeBeforeSkippable);
|
||||
isSkippable = true;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,6 +7,7 @@ public class SoundManager : MonoBehaviour
|
||||
public AudioSource Gameplay;
|
||||
public AudioSource Scrapping;
|
||||
public AudioSource RunePickup;
|
||||
public AudioSource ShortHorn;
|
||||
|
||||
public static SoundManager Instance
|
||||
{
|
||||
@ -78,4 +79,9 @@ public class SoundManager : MonoBehaviour
|
||||
RunePickup.Play();
|
||||
}
|
||||
|
||||
public void PlayShortHorn()
|
||||
{
|
||||
ShortHorn.Play();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
BIN
Assets/sprites/splash_background.png
Normal file
BIN
Assets/sprites/splash_background.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 522 KiB |
57
Assets/sprites/splash_background.png.meta
Normal file
57
Assets/sprites/splash_background.png.meta
Normal file
@ -0,0 +1,57 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 65709ad85b5d9b743a5dbae4c841ab0d
|
||||
timeCreated: 1454267346
|
||||
licenseType: Free
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 7
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapMode: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaIsTransparency: 1
|
||||
textureType: 8
|
||||
buildTargetSettings: []
|
||||
spriteSheet:
|
||||
sprites: []
|
||||
outline: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/sprites/title_ex3.png
Normal file
BIN
Assets/sprites/title_ex3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
57
Assets/sprites/title_ex3.png.meta
Normal file
57
Assets/sprites/title_ex3.png.meta
Normal file
@ -0,0 +1,57 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4da822d897e97b04689478f16e6aa14b
|
||||
timeCreated: 1454267532
|
||||
licenseType: Free
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 7
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapMode: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaIsTransparency: 1
|
||||
textureType: 8
|
||||
buildTargetSettings: []
|
||||
spriteSheet:
|
||||
sprites: []
|
||||
outline: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -60,23 +60,11 @@ PlayerSettings:
|
||||
xboxSpeechDB: 0
|
||||
xboxEnableHeadOrientation: 0
|
||||
xboxEnableGuest: 0
|
||||
n3dsDisableStereoscopicView: 0
|
||||
n3dsEnableSharedListOpt: 1
|
||||
n3dsEnableVSync: 0
|
||||
xboxOneResolution: 0
|
||||
ps3SplashScreen: {fileID: 0}
|
||||
videoMemoryForVertexBuffers: 0
|
||||
psp2PowerMode: 0
|
||||
psp2AcquireBGM: 1
|
||||
wiiUTVResolution: 0
|
||||
wiiUGamePadMSAA: 1
|
||||
wiiUSupportsNunchuk: 0
|
||||
wiiUSupportsClassicController: 0
|
||||
wiiUSupportsBalanceBoard: 0
|
||||
wiiUSupportsMotionPlus: 0
|
||||
wiiUSupportsProController: 0
|
||||
wiiUAllowScreenCapture: 1
|
||||
wiiUControllerCount: 0
|
||||
m_SupportedAspectRatios:
|
||||
4:3: 1
|
||||
5:4: 1
|
||||
@ -89,26 +77,20 @@ PlayerSettings:
|
||||
metroEnableIndependentInputSource: 0
|
||||
metroEnableLowLatencyPresentationAPI: 0
|
||||
xboxOneDisableKinectGpuReservation: 0
|
||||
virtualRealitySupported: 0
|
||||
productGUID: dbca7936984e94248bf9f90833bc0c3a
|
||||
AndroidBundleVersionCode: 1
|
||||
AndroidMinSdkVersion: 9
|
||||
AndroidPreferredInstallLocation: 1
|
||||
aotOptions:
|
||||
apiCompatibilityLevel: 2
|
||||
stripEngineCode: 1
|
||||
iPhoneStrippingLevel: 0
|
||||
iPhoneScriptCallOptimization: 0
|
||||
iPhoneBuildNumber: 0
|
||||
ForceInternetPermission: 0
|
||||
ForceSDCardPermission: 0
|
||||
CreateWallpaper: 0
|
||||
APKExpansionFiles: 0
|
||||
preloadShaders: 0
|
||||
StripUnusedMeshComponents: 0
|
||||
VertexChannelCompressionMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 238
|
||||
iPhoneSdkVersion: 988
|
||||
iPhoneTargetOSVersion: 22
|
||||
uIPrerenderedIcon: 0
|
||||
@ -154,23 +136,6 @@ PlayerSettings:
|
||||
m_BuildTargetGraphicsAPIs: []
|
||||
webPlayerTemplate: APPLICATION:Default
|
||||
m_TemplateCustomTags: {}
|
||||
wiiUTitleID: 0005000011000000
|
||||
wiiUGroupID: 00010000
|
||||
wiiUCommonSaveSize: 4096
|
||||
wiiUAccountSaveSize: 2048
|
||||
wiiUOlvAccessKey: 0
|
||||
wiiUTinCode: 0
|
||||
wiiUJoinGameId: 0
|
||||
wiiUJoinGameModeMask: 0000000000000000
|
||||
wiiUCommonBossSize: 0
|
||||
wiiUAccountBossSize: 0
|
||||
wiiUAddOnUniqueIDs: []
|
||||
wiiUMainThreadStackSize: 3072
|
||||
wiiULoaderThreadStackSize: 1024
|
||||
wiiUSystemHeapSize: 128
|
||||
wiiUTVStartupScreen: {fileID: 0}
|
||||
wiiUGamePadStartupScreen: {fileID: 0}
|
||||
wiiUProfilerLibPath:
|
||||
actionOnDotNetUnhandledException: 1
|
||||
enableInternalProfiler: 0
|
||||
logObjCUncaughtExceptions: 1
|
||||
@ -221,18 +186,15 @@ PlayerSettings:
|
||||
ps4BackgroundImagePath:
|
||||
ps4StartupImagePath:
|
||||
ps4SaveDataImagePath:
|
||||
ps4SdkOverride:
|
||||
ps4BGMPath:
|
||||
ps4ShareFilePath:
|
||||
ps4NPtitleDatPath:
|
||||
ps4RemotePlayKeyAssignment: -1
|
||||
ps4RemotePlayKeyMappingDir:
|
||||
ps4EnterButtonAssignment: 1
|
||||
ps4ApplicationParam1: 0
|
||||
ps4ApplicationParam2: 0
|
||||
ps4ApplicationParam3: 0
|
||||
ps4ApplicationParam4: 0
|
||||
ps4DownloadDataSize: 0
|
||||
ps4GarlicHeapSize: 2048
|
||||
ps4Passcode: 3mJ7tLHOsT9jNvqC8LNjpnotcWDQLy4O
|
||||
ps4pnSessions: 1
|
||||
@ -240,11 +202,6 @@ PlayerSettings:
|
||||
ps4pnFriends: 1
|
||||
ps4pnGameCustomData: 1
|
||||
playerPrefsSupport: 0
|
||||
ps4ReprojectionSupport: 0
|
||||
ps4attribUserManagement: 0
|
||||
ps4attribMoveSupport: 0
|
||||
ps4attrib3DSupport: 0
|
||||
ps4attribShareSupport: 0
|
||||
monoEnv:
|
||||
psp2Splashimage: {fileID: 0}
|
||||
psp2NPTrophyPackPath:
|
||||
@ -293,6 +250,7 @@ PlayerSettings:
|
||||
psp2InfoBarOnStartup: 0
|
||||
psp2InfoBarColor: 0
|
||||
psmSplashimage: {fileID: 0}
|
||||
virtualRealitySupported: 0
|
||||
spritePackerPolicy:
|
||||
scriptingDefineSymbols: {}
|
||||
metroPackageName: GameJamProject
|
||||
@ -384,17 +342,6 @@ PlayerSettings:
|
||||
tizenSigningProfileName:
|
||||
tizenGPSPermissions: 0
|
||||
tizenMicrophonePermissions: 0
|
||||
n3dsUseExtSaveData: 0
|
||||
n3dsCompressStaticMem: 1
|
||||
n3dsExtSaveDataNumber: 0x12345
|
||||
n3dsStackSize: 131072
|
||||
n3dsTargetPlatform: 2
|
||||
n3dsRegion: 7
|
||||
n3dsMediaSize: 0
|
||||
n3dsLogoStyle: 3
|
||||
n3dsTitle: GameName
|
||||
n3dsProductCode:
|
||||
n3dsApplicationId: 0xFF3FF
|
||||
stvDeviceAddress:
|
||||
stvProductDescription:
|
||||
stvProductAuthor:
|
||||
@ -460,6 +407,7 @@ PlayerSettings:
|
||||
additionalIl2CppArgs::additionalIl2CppArgs:
|
||||
firstStreamedSceneWithResources: 0
|
||||
cloudProjectId:
|
||||
projectId:
|
||||
projectName:
|
||||
organizationId:
|
||||
cloudEnabled: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user