Commit 4f5c0d00 authored by Andrew R Van Buren's avatar Andrew R Van Buren
Browse files

Merge branch 'designmerge' into 'master'

Designmerge

See merge request !61
parents 4c528b44 c716d049
...@@ -41,6 +41,22 @@ GameObject: ...@@ -41,6 +41,22 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &1235948705510670
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4006451848707384}
- component: {fileID: 114331805935495066}
m_Layer: 0
m_Name: InputManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1292833923080258 --- !u!1 &1292833923080258
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -280,7 +296,7 @@ GameObject: ...@@ -280,7 +296,7 @@ GameObject:
- component: {fileID: 114296284101528218} - component: {fileID: 114296284101528218}
- component: {fileID: 114496983445290320} - component: {fileID: 114496983445290320}
- component: {fileID: 114468523229820794} - component: {fileID: 114468523229820794}
- component: {fileID: 114912600304330566} - component: {fileID: 114397509330875448}
m_Layer: 8 m_Layer: 8
m_Name: Player m_Name: Player
m_TagString: Player m_TagString: Player
...@@ -365,6 +381,19 @@ Transform: ...@@ -365,6 +381,19 @@ Transform:
m_Father: {fileID: 4893306079521950} m_Father: {fileID: 4893306079521950}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 280} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 280}
--- !u!4 &4006451848707384
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1235948705510670}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.26, y: -0.49, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4766587421979404}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4025393693045770 --- !u!4 &4025393693045770
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -553,11 +582,12 @@ Transform: ...@@ -553,11 +582,12 @@ Transform:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1784255690954616} m_GameObject: {fileID: 1784255690954616}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1, y: 1, z: 0} m_LocalPosition: {x: 0.63, y: 3.54, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 4838104525842692} - {fileID: 4838104525842692}
- {fileID: 4006451848707384}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -848,7 +878,7 @@ Rigidbody2D: ...@@ -848,7 +878,7 @@ Rigidbody2D:
m_Mass: 1 m_Mass: 1
m_LinearDrag: 0 m_LinearDrag: 0
m_AngularDrag: 0.05 m_AngularDrag: 0.05
m_GravityScale: 1 m_GravityScale: 2.5
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Interpolate: 1 m_Interpolate: 1
m_SleepingMode: 1 m_SleepingMode: 1
...@@ -900,13 +930,60 @@ MonoBehaviour: ...@@ -900,13 +930,60 @@ MonoBehaviour:
disableScripts: [] disableScripts: []
dashVelocityCurve: dashVelocityCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: [] m_Curve:
- serializedVersion: 2
time: 0
value: 20
inSlope: 0.088255405
outSlope: 0.088255405
tangentMode: 0
- serializedVersion: 2
time: 0.85067564
value: 19.747648
inSlope: -1.0969454
outSlope: -16.875267
tangentMode: 1
- serializedVersion: 2
time: 1
value: 7
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 0
dashDistance: 0 dashDistance: 5
coolDown: 1 coolDown: 2
holdTime: 1 holdTime: 1.25
--- !u!114 &114331805935495066
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1235948705510670}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a7bd8d106353a247bd436ee1baa2061, type: 3}
m_Name:
m_EditorClassIdentifier:
inputs:
- axisName: Horizontal
offValue: 0
buttons: 1
condition: 1
- axisName: Horizontal
offValue: 0
buttons: 0
condition: 0
- axisName: A
offValue: 0
buttons: 4
condition: 0
- axisName: B
offValue: 0
buttons: 5
condition: 0
inputState: {fileID: 114343537035820548}
--- !u!114 &114343537035820548 --- !u!114 &114343537035820548
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -918,6 +995,19 @@ MonoBehaviour: ...@@ -918,6 +995,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 90413373afbe7ce47a1e5595b11b1a63, type: 3} m_Script: {fileID: 11500000, guid: 90413373afbe7ce47a1e5595b11b1a63, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &114397509330875448
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1784255690954616}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: de3aa9fc98a1afc4ea1040f7e728697b, type: 3}
m_Name:
m_EditorClassIdentifier:
inputButtons:
disableScripts: []
--- !u!114 &114468523229820794 --- !u!114 &114468523229820794
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -931,11 +1021,11 @@ MonoBehaviour: ...@@ -931,11 +1021,11 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
inputButtons: 0100000000000000 inputButtons: 0100000000000000
disableScripts: [] disableScripts: []
speed: 5 speed: 7
airAcceleration: 0.07 airAcceleration: 0.5
groundAcceleration: 1 groundAcceleration: 1
wallClingTime: 0.25 wallClingTime: 0.25
clingSpeed: 0.25 clingSpeed: 1.5
isWallSliding: 0 isWallSliding: 0
--- !u!114 &114496983445290320 --- !u!114 &114496983445290320
MonoBehaviour: MonoBehaviour:
...@@ -950,7 +1040,7 @@ MonoBehaviour: ...@@ -950,7 +1040,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
inputButtons: 04000000 inputButtons: 04000000
disableScripts: [] disableScripts: []
jumpHeight: 3 jumpHeight: 4
airJumpHeight: 3 airJumpHeight: 3
airJumpCount: 1 airJumpCount: 1
wallJumpHeight: 3 wallJumpHeight: 3
...@@ -974,22 +1064,6 @@ MonoBehaviour: ...@@ -974,22 +1064,6 @@ MonoBehaviour:
m_Bits: 1 m_Bits: 1
skinWidth: 0 skinWidth: 0
groundCheckDistance: 0.1 groundCheckDistance: 0.1
--- !u!114 &114912600304330566
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1784255690954616}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cad1638cf0899c4584bad64f0af5112, type: 3}
m_Name:
m_EditorClassIdentifier:
smoothSpeed: 1
UpBuffer: 5
DownBuffer: 5
RightBuffer: 5
LeftBuffer: 5
--- !u!137 &137216855547286664 --- !u!137 &137216855547286664
SkinnedMeshRenderer: SkinnedMeshRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -1308,7 +1308,7 @@ ParticleSystem: ...@@ -1308,7 +1308,7 @@ ParticleSystem:
m_GameObject: {fileID: 920148520} m_GameObject: {fileID: 920148520}
serializedVersion: 5 serializedVersion: 5
lengthInSec: 0.1 lengthInSec: 0.1
simulationSpeed: 1 speed: 1
looping: 1 looping: 1
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 1
...@@ -5061,9 +5061,14 @@ MonoBehaviour: ...@@ -5061,9 +5061,14 @@ MonoBehaviour:
m_GameObject: {fileID: 1373822964} m_GameObject: {fileID: 1373822964}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a707327fed739e346b5480ab597dbb23, type: 3} m_Script: {fileID: 11500000, guid: 0cad1638cf0899c4584bad64f0af5112, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
smoothSpeed: 1
UpBuffer: 0
DownBuffer: 0
RightBuffer: 0
LeftBuffer: 0
--- !u!1001 &1398096626 --- !u!1001 &1398096626
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -6000,7 +6005,7 @@ ParticleSystem: ...@@ -6000,7 +6005,7 @@ ParticleSystem:
m_GameObject: {fileID: 2100709141} m_GameObject: {fileID: 2100709141}
serializedVersion: 5 serializedVersion: 5
lengthInSec: 0.1 lengthInSec: 0.1
simulationSpeed: 1 speed: 1
looping: 0 looping: 0
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 1
......
...@@ -180,7 +180,6 @@ Transform: ...@@ -180,7 +180,6 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 663298495}
- {fileID: 1047060827} - {fileID: 1047060827}
- {fileID: 134450023} - {fileID: 134450023}
- {fileID: 798247200} - {fileID: 798247200}
...@@ -222,6 +221,7 @@ Transform: ...@@ -222,6 +221,7 @@ Transform:
- {fileID: 1427307617} - {fileID: 1427307617}
- {fileID: 1388647850} - {fileID: 1388647850}
- {fileID: 1704607018} - {fileID: 1704607018}
- {fileID: 663298495}
- {fileID: 42912062} - {fileID: 42912062}
- {fileID: 1321808691} - {fileID: 1321808691}
- {fileID: 1313813760} - {fileID: 1313813760}
...@@ -291,16 +291,22 @@ Transform: ...@@ -291,16 +291,22 @@ Transform:
- {fileID: 1195780639} - {fileID: 1195780639}
- {fileID: 853943950} - {fileID: 853943950}
- {fileID: 2072787584} - {fileID: 2072787584}
- {fileID: 148633399}
- {fileID: 332007632} - {fileID: 332007632}
- {fileID: 1124128454}
- {fileID: 1464219326} - {fileID: 1464219326}
- {fileID: 583871598} - {fileID: 583871598}
- {fileID: 1543109257}
- {fileID: 701066870} - {fileID: 701066870}
- {fileID: 1043287271} - {fileID: 1043287271}
- {fileID: 1210398006}
- {fileID: 951695610} - {fileID: 951695610}
- {fileID: 1871483002} - {fileID: 1871483002}
- {fileID: 1029002387} - {fileID: 1029002387}
- {fileID: 504015309}
- {fileID: 2077211628} - {fileID: 2077211628}
- {fileID: 148633399} - {fileID: 982838387}
- {fileID: 158461584}
- {fileID: 750603309} - {fileID: 750603309}
- {fileID: 1974524669} - {fileID: 1974524669}
- {fileID: 148198523} - {fileID: 148198523}
...@@ -312,12 +318,6 @@ Transform: ...@@ -312,12 +318,6 @@ Transform:
- {fileID: 353258458} - {fileID: 353258458}
- {fileID: 804716426} - {fileID: 804716426}
- {fileID: 438938466} - {fileID: 438938466}
- {fileID: 504015309}
- {fileID: 1543109257}
- {fileID: 982838387}
- {fileID: 158461584}
- {fileID: 1124128454}
- {fileID: 1210398006}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -3296,6 +3296,7 @@ GameObject: ...@@ -3296,6 +3296,7 @@ GameObject:
- component: {fileID: 1100797469} - component: {fileID: 1100797469}
- component: {fileID: 1100797468} - component: {fileID: 1100797468}
- component: {fileID: 1100797467} - component: {fileID: 1100797467}
- component: {fileID: 1100797472}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
...@@ -3371,6 +3372,22 @@ Transform: ...@@ -3371,6 +3372,22 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1100797472
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1100797466}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cad1638cf0899c4584bad64f0af5112, type: 3}
m_Name:
m_EditorClassIdentifier:
smoothSpeed: 1
UpBuffer: 0
DownBuffer: 0
RightBuffer: 0
LeftBuffer: 0
--- !u!1001 &1108961550 --- !u!1001 &1108961550
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment