Conjure/PixelSphinx
6
0
Fork 0
mirror of https://github.com/ConjureETS/PixelSphinx.git synced 2026-03-24 02:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ETSConjure/PixelSphinx

Browse Source
This commit is contained in:
Jean-Sébastien Gervais 2016-04-09 11:10:24 -04:00
commit c65ec6333e
3 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Astronaut.prefab
View File

@ -145,7 +145,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab270b0cb2475114ab8eb45661af0df1, type: 3} m_Script: {fileID: 11500000, guid: ab270b0cb2475114ab8eb45661af0df1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PlayerNumber: 0 PlayerNumber: 1
--- !u!114 &11491252 --- !u!114 &11491252
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

22
Assets/_Scenes/Main.unity
View File

@ -383,6 +383,14 @@ Prefab:
propertyPath: gaugeMax propertyPath: gaugeMax
value: 100 value: 100
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11401034, guid: 198e988adacced646a19f757f6237ae1, type: 2}
propertyPath: CriticalMin
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 11401034, guid: 198e988adacced646a19f757f6237ae1, type: 2}
propertyPath: CriticalMax
value: 0.9
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 198e988adacced646a19f757f6237ae1, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 198e988adacced646a19f757f6237ae1, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
@ -433,9 +441,17 @@ Prefab:
propertyPath: m_Name propertyPath: m_Name
value: Astronaut_1 value: Astronaut_1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11434752, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} - target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: PlayerNumber propertyPath: WalkAnimSpeed
value: 1 value: 3
objectReference: {fileID: 0}
- target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: WalkAnimAngle
value: 20
objectReference: {fileID: 0}
- target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: EjectSpinSpeed
value: 10
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}

59
Assets/_Scenes/sophieMain.unity
View File

@ -208,25 +208,12 @@ Prefab:
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} m_ParentPrefab: {fileID: 100100000, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
--- !u!1 &1408525986 stripped --- !u!114 &1408525992 stripped
GameObject:
m_PrefabParentObject: {fileID: 170392, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
m_PrefabInternal: {fileID: 1660116367}
--- !u!114 &1408525987
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11494368, guid: acd71c7b2f995984d9033c9dc4e257dc,
m_PrefabParentObject: {fileID: 0} type: 2}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 1660116367}
m_GameObject: {fileID: 1408525986} m_Script: {fileID: 11500000, guid: 8c32c40e0b8e5eb47bb7a91068af09ca, type: 3}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 77462b2431858f84b9bc2d055c2f4d45, type: 3}
m_Name:
m_EditorClassIdentifier:
aspi: {fileID: 0}
WalkAnimSpeed: 0
WalkAnimAngle: 0
EjectSpinSpeed: 0
--- !u!1001 &1469146136 --- !u!1001 &1469146136
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -344,34 +331,18 @@ Prefab:
propertyPath: m_Name propertyPath: m_Name
value: Astronaut_1 value: Astronaut_1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5402556, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} - target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_AngularDrag propertyPath: WalkAnimSpeed
value: 0 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5402556, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} - target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_IsKinematic propertyPath: WalkAnimAngle
value: 0 value: 20
objectReference: {fileID: 0}
- target: {fileID: 5402556, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_UseGravity
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5402556, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_Mass
value: 1
objectReference: {fileID: 0}
- target: {fileID: 13683032, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_Center.y
value: 1.31
objectReference: {fileID: 0}
- target: {fileID: 13683032, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_Height
value: 1.59
objectReference: {fileID: 0}
- target: {fileID: 13683032, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_Radius
value: 0.76
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: aspi
value:
objectReference: {fileID: 1408525992}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0