mirror of
https://github.com/ConjureETS/PixelSphinx.git
synced 2026-03-25 19:10:58 +00:00
Collider des asteroid, ca fonctionne mieux avec des rigid body...
This commit is contained in:
parent
45ad56e044
commit
106f953436
@ -11,7 +11,7 @@ GameObject:
|
|||||||
- 33: {fileID: 3335396}
|
- 33: {fileID: 3335396}
|
||||||
- 23: {fileID: 2317388}
|
- 23: {fileID: 2317388}
|
||||||
- 114: {fileID: 11437858}
|
- 114: {fileID: 11437858}
|
||||||
- 58: {fileID: 5847224}
|
- 135: {fileID: 13502558}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Asteroid
|
m_Name: Asteroid
|
||||||
m_TagString: Asteroid
|
m_TagString: Asteroid
|
||||||
@ -64,20 +64,6 @@ MeshFilter:
|
|||||||
m_PrefabInternal: {fileID: 100100000}
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
m_GameObject: {fileID: 160026}
|
m_GameObject: {fileID: 160026}
|
||||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
--- !u!58 &5847224
|
|
||||||
CircleCollider2D:
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_PrefabParentObject: {fileID: 0}
|
|
||||||
m_PrefabInternal: {fileID: 100100000}
|
|
||||||
m_GameObject: {fileID: 160026}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_Density: 1
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_IsTrigger: 1
|
|
||||||
m_UsedByEffector: 0
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Radius: 0.5
|
|
||||||
--- !u!114 &11437858
|
--- !u!114 &11437858
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@ -91,6 +77,18 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
speed: 1
|
speed: 1
|
||||||
step: 0
|
step: 0
|
||||||
|
--- !u!135 &13502558
|
||||||
|
SphereCollider:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
|
m_GameObject: {fileID: 160026}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Radius: 0.5
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1001 &100100000
|
--- !u!1001 &100100000
|
||||||
Prefab:
|
Prefab:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
|
|||||||
@ -9,10 +9,11 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- 4: {fileID: 427432}
|
- 4: {fileID: 427432}
|
||||||
- 212: {fileID: 21228928}
|
- 212: {fileID: 21228928}
|
||||||
- 58: {fileID: 5856220}
|
- 135: {fileID: 13583406}
|
||||||
|
- 54: {fileID: 5455998}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: WedgePrefab
|
m_Name: WedgePrefab
|
||||||
m_TagString: Untagged
|
m_TagString: Wedge
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
@ -27,7 +28,7 @@ GameObject:
|
|||||||
- 4: {fileID: 411762}
|
- 4: {fileID: 411762}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: WedgePrefab00
|
m_Name: WedgePrefab00
|
||||||
m_TagString: Wedge
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
@ -57,20 +58,33 @@ Transform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 411762}
|
m_Father: {fileID: 411762}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
--- !u!58 &5856220
|
--- !u!54 &5455998
|
||||||
CircleCollider2D:
|
Rigidbody:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
|
m_GameObject: {fileID: 152938}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Mass: 1
|
||||||
|
m_Drag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_UseGravity: 0
|
||||||
|
m_IsKinematic: 0
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 0
|
||||||
|
--- !u!135 &13583406
|
||||||
|
SphereCollider:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
m_PrefabParentObject: {fileID: 0}
|
m_PrefabParentObject: {fileID: 0}
|
||||||
m_PrefabInternal: {fileID: 100100000}
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
m_GameObject: {fileID: 152938}
|
m_GameObject: {fileID: 152938}
|
||||||
m_Enabled: 1
|
|
||||||
m_Density: 1
|
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_IsTrigger: 1
|
m_IsTrigger: 1
|
||||||
m_UsedByEffector: 0
|
m_Enabled: 1
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Radius: 1.985
|
m_Radius: 2
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
--- !u!212 &21228928
|
--- !u!212 &21228928
|
||||||
SpriteRenderer:
|
SpriteRenderer:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
|
|||||||
@ -28,7 +28,7 @@ public class Asteroid : MonoBehaviour
|
|||||||
}
|
}
|
||||||
|
|
||||||
//collider must be set as "isTrigger" in unity for this method to work
|
//collider must be set as "isTrigger" in unity for this method to work
|
||||||
void OnCollisionEnter2D(Collider otherCol)
|
public void OnTriggerEnter(Collider otherCol)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
@ -39,7 +39,8 @@ public class Asteroid : MonoBehaviour
|
|||||||
if (otherCol.gameObject.tag == "Wedge")
|
if (otherCol.gameObject.tag == "Wedge")
|
||||||
{
|
{
|
||||||
var pmgr = FindObjectOfType<PlanetManager>();
|
var pmgr = FindObjectOfType<PlanetManager>();
|
||||||
pmgr.PushWedge(otherCol.gameObject.transform.rotation.z);
|
pmgr.PushWedge(otherCol.gameObject.transform.parent.eulerAngles.z);
|
||||||
|
Destroy(this.gameObject);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -136,7 +136,7 @@ Prefab:
|
|||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2}
|
- target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: 3.51
|
value: 8.22
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2}
|
- target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2}
|
||||||
propertyPath: m_LocalPosition.y
|
propertyPath: m_LocalPosition.y
|
||||||
@ -166,10 +166,6 @@ Prefab:
|
|||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
value: 4
|
value: 4
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 13519402, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2}
|
|
||||||
propertyPath: m_IsTrigger
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_ParentPrefab: {fileID: 100100000, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2}
|
m_ParentPrefab: {fileID: 100100000, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2}
|
||||||
m_IsPrefabParent: 0
|
m_IsPrefabParent: 0
|
||||||
@ -268,6 +264,25 @@ MonoBehaviour:
|
|||||||
CartierMaxRatio: 2
|
CartierMaxRatio: 2
|
||||||
CartierStepSize: 0.25
|
CartierStepSize: 0.25
|
||||||
WedgePrefab: {fileID: 170328, guid: 0b78da08dfa398840862539a74cc2377, type: 2}
|
WedgePrefab: {fileID: 170328, guid: 0b78da08dfa398840862539a74cc2377, type: 2}
|
||||||
|
--- !u!1 &475725347 stripped
|
||||||
|
GameObject:
|
||||||
|
m_PrefabParentObject: {fileID: 160026, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2}
|
||||||
|
m_PrefabInternal: {fileID: 240262242}
|
||||||
|
--- !u!54 &475725353
|
||||||
|
Rigidbody:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 475725347}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Mass: 1
|
||||||
|
m_Drag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_UseGravity: 0
|
||||||
|
m_IsKinematic: 1
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 0
|
||||||
--- !u!1 &638371353
|
--- !u!1 &638371353
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user