mirror of
https://github.com/ConjureETS/PixelSphinx.git
synced 2026-03-25 02:50:58 +00:00
fixed last commit (astronaut prefab)
This commit is contained in:
parent
da216027d2
commit
796b5e6975
@ -60,6 +60,7 @@ GameObject:
|
|||||||
- 136: {fileID: 13683032}
|
- 136: {fileID: 13683032}
|
||||||
- 54: {fileID: 5462614}
|
- 54: {fileID: 5462614}
|
||||||
- 136: {fileID: 13672180}
|
- 136: {fileID: 13672180}
|
||||||
|
- 114: {fileID: 11464706}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Character
|
m_Name: Character
|
||||||
m_TagString: Player
|
m_TagString: Player
|
||||||
@ -145,6 +146,21 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
PlayerNumber: 0
|
PlayerNumber: 0
|
||||||
|
--- !u!114 &11464706
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
|
m_GameObject: {fileID: 170392}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 77462b2431858f84b9bc2d055c2f4d45, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
aspi: {fileID: 11494368}
|
||||||
|
WalkAnimSpeed: 3
|
||||||
|
WalkAnimAngle: 20
|
||||||
|
EjectSpinSpeed: 5
|
||||||
--- !u!114 &11494368
|
--- !u!114 &11494368
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@ -157,7 +173,7 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
Rotator: {fileID: 154602}
|
Rotator: {fileID: 154602}
|
||||||
SpriteWalk: {fileID: 130732}
|
SpriteWalk: {fileID: 21220066}
|
||||||
SpriteDash: {fileID: 157058}
|
SpriteDash: {fileID: 157058}
|
||||||
Width: 0.4
|
Width: 0.4
|
||||||
DashTime: 0.4
|
DashTime: 0.4
|
||||||
@ -189,10 +205,10 @@ CapsuleCollider:
|
|||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_IsTrigger: 0
|
m_IsTrigger: 0
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_Radius: 0.77
|
m_Radius: 0.76
|
||||||
m_Height: 3.37
|
m_Height: 1.59
|
||||||
m_Direction: 1
|
m_Direction: 1
|
||||||
m_Center: {x: -0.03, y: 0.35, z: 0}
|
m_Center: {x: -0.03, y: 1.31, z: 0}
|
||||||
--- !u!212 &21220066
|
--- !u!212 &21220066
|
||||||
SpriteRenderer:
|
SpriteRenderer:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
|
|||||||
@ -90,7 +90,6 @@ public class Astronaut : MonoBehaviour {
|
|||||||
}
|
}
|
||||||
|
|
||||||
State = AstronautState.Idle;
|
State = AstronautState.Idle;
|
||||||
//Debug.Log(planet.GetPlanetRadius(0));
|
|
||||||
theta = 0;
|
theta = 0;
|
||||||
height = planet.GetPlanetRadius(theta);
|
height = planet.GetPlanetRadius(theta);
|
||||||
UpdatePosition();
|
UpdatePosition();
|
||||||
|
|||||||
@ -46,7 +46,7 @@ public class Earthquake : MonoBehaviour {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// à être Appelé à chaque fois qu'on enfonce un plateau, le gage se remplis plus vite. (et par le temps)
|
/// à être Appelé à chaque fois qu'on enfonce un plateau, le gage se remplis plus vite. (et par le temps)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Fill4Gauge()
|
public void FillGauge()
|
||||||
{
|
{
|
||||||
|
|
||||||
/*if (gaugeLevel < gaugeMax)
|
/*if (gaugeLevel < gaugeMax)
|
||||||
|
|||||||
@ -265,7 +265,8 @@ public class PlanetManager : MonoBehaviour
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public Wedge GetWedgeFromTheta(float thetaPlayerX)
|
public Wedge GetWedgeFromTheta(float thetaPlayerX)
|
||||||
{
|
{
|
||||||
return wedges[GetWedgeIndex(thetaPlayerX % 360)];
|
print(GetWedgeIndex((thetaPlayerX)%360));
|
||||||
|
return wedges[GetWedgeIndex((thetaPlayerX) % 360)];
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -85,6 +85,34 @@ NavMeshSettings:
|
|||||||
cellSize: 0.16666667
|
cellSize: 0.16666667
|
||||||
manualCellSize: 0
|
manualCellSize: 0
|
||||||
m_NavMeshData: {fileID: 0}
|
m_NavMeshData: {fileID: 0}
|
||||||
|
--- !u!1 &993170680
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Component:
|
||||||
|
- 4: {fileID: 993170681}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: World
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &993170681
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 993170680}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: -0.3277891, y: 0.28751588, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 1589474789}
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 2
|
||||||
--- !u!114 &1027139440 stripped
|
--- !u!114 &1027139440 stripped
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_PrefabParentObject: {fileID: 11471614, guid: 198e988adacced646a19f757f6237ae1,
|
m_PrefabParentObject: {fileID: 11471614, guid: 198e988adacced646a19f757f6237ae1,
|
||||||
@ -180,20 +208,39 @@ 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
|
||||||
|
GameObject:
|
||||||
|
m_PrefabParentObject: {fileID: 170392, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
|
||||||
|
m_PrefabInternal: {fileID: 1660116367}
|
||||||
|
--- !u!114 &1408525987
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1408525986}
|
||||||
|
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
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 993170681}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 421424, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
- target: {fileID: 421424, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: 0
|
value: 0.3277891
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 421424, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
- target: {fileID: 421424, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
||||||
propertyPath: m_LocalPosition.y
|
propertyPath: m_LocalPosition.y
|
||||||
value: 0
|
value: -0.28751588
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 421424, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
- target: {fileID: 421424, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
||||||
propertyPath: m_LocalPosition.z
|
propertyPath: m_LocalPosition.z
|
||||||
@ -217,11 +264,39 @@ Prefab:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 421424, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
- target: {fileID: 421424, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
value: 2
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 21256968, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
||||||
|
propertyPath: m_Color.g
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 21256968, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
||||||
|
propertyPath: m_Color.b
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 21256968, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
||||||
|
propertyPath: m_Color.r
|
||||||
|
value: 1
|
||||||
|
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.6
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 11401034, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
||||||
|
propertyPath: testValue
|
||||||
|
value: 0.3
|
||||||
objectReference: {fileID: 0}
|
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
|
||||||
|
--- !u!4 &1589474789 stripped
|
||||||
|
Transform:
|
||||||
|
m_PrefabParentObject: {fileID: 421424, guid: 198e988adacced646a19f757f6237ae1, type: 2}
|
||||||
|
m_PrefabInternal: {fileID: 1469146136}
|
||||||
--- !u!1001 &1660116367
|
--- !u!1001 &1660116367
|
||||||
Prefab:
|
Prefab:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user