Updated master scene

This commit is contained in:
MartinRemi 2015-11-16 17:46:15 -05:00
parent 5e139c87e6
commit 5ce963b0c3
3 changed files with 330 additions and 101 deletions

View File

@ -1,34 +1,13 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &101678
--- !u!1 &177424
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 434640}
- 212: {fileID: 21225478}
- 95: {fileID: 9520834}
- 61: {fileID: 6183734}
- 114: {fileID: 11477144}
- 50: {fileID: 5006852}
- 114: {fileID: 11437552}
m_Layer: 8
m_Name: Player
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &116816
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 431276}
- 4: {fileID: 437628}
m_Layer: 8
m_Name: GroundCheck
m_TagString: Untagged
@ -36,38 +15,61 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &431276
--- !u!1 &197158
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 462904}
- 212: {fileID: 21272474}
- 95: {fileID: 9514794}
- 61: {fileID: 6136852}
- 114: {fileID: 11413024}
- 50: {fileID: 5098556}
- 114: {fileID: 11406802}
- 114: {fileID: 11472154}
- 114: {fileID: 11478382}
m_Layer: 8
m_Name: Player
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &437628
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 116816}
m_GameObject: {fileID: 177424}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -.116999999, z: 0}
m_LocalScale: {x: .922599614, y: .922599435, z: .922599435}
m_Children: []
m_Father: {fileID: 434640}
m_Father: {fileID: 462904}
m_RootOrder: 0
--- !u!4 &434640
--- !u!4 &462904
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 101678}
m_GameObject: {fileID: 197158}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 431276}
- {fileID: 437628}
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!50 &5006852
--- !u!50 &5098556
Rigidbody2D:
serializedVersion: 2
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 101678}
m_GameObject: {fileID: 197158}
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: .0500000007
@ -77,12 +79,12 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!61 &6183734
--- !u!61 &6136852
BoxCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 101678}
m_GameObject: {fileID: 197158}
m_Enabled: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
@ -90,13 +92,13 @@ BoxCollider2D:
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Size: {x: .159999996, y: .239999995}
--- !u!95 &9520834
--- !u!95 &9514794
Animator:
serializedVersion: 3
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 101678}
m_GameObject: {fileID: 197158}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: c55b7167c12258245995b4ae37994d6d, type: 2}
@ -107,12 +109,12 @@ Animator:
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
--- !u!114 &11437552
--- !u!114 &11406802
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 101678}
m_GameObject: {fileID: 197158}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2197f504ed5ef864b9bc03da81a8f4fb, type: 3}
@ -121,12 +123,12 @@ MonoBehaviour:
rocket: {fileID: 5027078, guid: 1cf24e915b357664f94ba440a1d1ec1a, type: 2}
rocket_position_offset: {x: .100000001, y: 0, z: 0}
speed: 3
--- !u!114 &11477144
--- !u!114 &11413024
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 101678}
m_GameObject: {fileID: 197158}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6174bd025e68ea74ba7d2b9ead76df90, type: 3}
@ -134,17 +136,41 @@ MonoBehaviour:
m_EditorClassIdentifier:
maxSpeed: 2
grounded: 1
groundCheck: {fileID: 431276}
groundCheck: {fileID: 437628}
ground:
serializedVersion: 2
m_Bits: 4294967039
jumpForce: 35
--- !u!212 &21225478
--- !u!114 &11472154
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 197158}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 28110cf2b286c534c94e41ea7e145ef0, type: 3}
m_Name:
m_EditorClassIdentifier:
maxHP: 3
--- !u!114 &11478382
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 197158}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1a250e41dad412f41a2bdfb3f462c130, type: 3}
m_Name:
m_EditorClassIdentifier:
health: {fileID: 0}
--- !u!212 &21272474
SpriteRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 101678}
m_GameObject: {fileID: 197158}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@ -171,24 +197,8 @@ Prefab:
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 0}
propertyPath: rocket
value:
objectReference: {fileID: 5027078, guid: 1cf24e915b357664f94ba440a1d1ec1a, type: 2}
- target: {fileID: 0}
propertyPath: speed
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: rocket_position_offset.x
value: .100000001
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 101678}
m_RootGameObject: {fileID: 197158}
m_IsPrefabParent: 1

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b7819e17682d74b45a71d6831a413e0b
timeCreated: 1447011295
timeCreated: 1447713838
licenseType: Free
NativeFormatImporter:
userData:

View File

@ -200,6 +200,96 @@ Transform:
m_Children: []
m_Father: {fileID: 645992365}
m_RootOrder: 0
--- !u!1 &493610679
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 493610680}
- 223: {fileID: 493610683}
- 114: {fileID: 493610682}
- 114: {fileID: 493610681}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &493610680
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 493610679}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 729413214}
m_Father: {fileID: 0}
m_RootOrder: 6
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &493610681
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 493610679}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &493610682
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 493610679}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!223 &493610683
Canvas:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 493610679}
m_Enabled: 1
serializedVersion: 2
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingLayerID: 0
m_SortingOrder: 0
--- !u!1 &645992364
GameObject:
m_ObjectHideFlags: 0
@ -232,6 +322,80 @@ Transform:
GameObject:
m_PrefabParentObject: {fileID: 167312, guid: 6a21797441b99c942915e70c461edf77, type: 2}
m_PrefabInternal: {fileID: 849444827}
--- !u!1 &729413211
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 729413214}
- 222: {fileID: 729413213}
- 114: {fileID: 729413212}
m_Layer: 5
m_Name: HP
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &729413212
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 729413211}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'HP
'
--- !u!222 &729413213
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 729413211}
--- !u!224 &729413214
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 729413211}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 493610680}
m_RootOrder: 0
m_AnchorMin: {x: .5, y: .5}
m_AnchorMax: {x: .5, y: .5}
m_AnchoredPosition: {x: -456, y: 236}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: .5, y: .5}
--- !u!1001 &849444827
Prefab:
m_ObjectHideFlags: 0
@ -285,76 +449,49 @@ Prefab:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 434640, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
- target: {fileID: 462904, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 434640, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
- target: {fileID: 462904, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 434640, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
- target: {fileID: 462904, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 434640, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
- target: {fileID: 462904, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 434640, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
- target: {fileID: 462904, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 434640, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
- target: {fileID: 462904, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 434640, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
- target: {fileID: 462904, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 434640, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
- target: {fileID: 462904, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5006852, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_Constraints
value: 4
objectReference: {fileID: 0}
- target: {fileID: 431276, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 11478382, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
propertyPath: health
value:
objectReference: {fileID: 729413212}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
m_IsPrefabParent: 0
--- !u!1 &1189818989 stripped
GameObject:
m_PrefabParentObject: {fileID: 101678, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
m_PrefabParentObject: {fileID: 197158, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
m_PrefabInternal: {fileID: 1024525637}
--- !u!114 &1189818990
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1189818989}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 28110cf2b286c534c94e41ea7e145ef0, type: 3}
m_Name:
m_EditorClassIdentifier:
maxHP: 3
--- !u!114 &1189818998
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1189818989}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1a250e41dad412f41a2bdfb3f462c130, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1302261674
GameObject:
m_ObjectHideFlags: 0
@ -495,6 +632,80 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
player: {fileID: 1189818989}
--- !u!1 &1730906868
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 1730906872}
- 114: {fileID: 1730906871}
- 114: {fileID: 1730906870}
- 114: {fileID: 1730906869}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1730906869
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1730906868}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ForceModuleActive: 0
--- !u!114 &1730906870
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1730906868}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: .5
m_ForceModuleActive: 0
--- !u!114 &1730906871
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1730906868}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 5
--- !u!4 &1730906872
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1730906868}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
--- !u!4 &1747148540 stripped
Transform:
m_PrefabParentObject: {fileID: 417046, guid: 6a21797441b99c942915e70c461edf77, type: 2}
@ -558,6 +769,14 @@ Prefab:
propertyPath: m_Constraints
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6163544, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
propertyPath: m_IsTrigger
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5020362, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
propertyPath: m_IsKinematic
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
m_IsPrefabParent: 0