Commit 76355526 authored by astatham's avatar astatham
Browse files

Pies now stay where they land

parent 74f5b715
......@@ -183,11 +183,11 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 203239470}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.43, y: -0.19, z: 0}
m_LocalPosition: {x: 7.43, y: -1.74, z: 0}
m_LocalScale: {x: 0.565, y: 0.922, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &203239473
BoxCollider2D:
......@@ -214,66 +214,54 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 5, y: 0.5}
m_EdgeRadius: 0
--- !u!1 &370645808
--- !u!1 &234002383
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 370645812}
- component: {fileID: 370645811}
- component: {fileID: 370645810}
- component: {fileID: 370645809}
- component: {fileID: 234002386}
- component: {fileID: 234002385}
- component: {fileID: 234002384}
m_Layer: 0
m_Name: Bear-1
m_Name: RightWall
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!61 &370645809
--- !u!61 &234002384
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 370645808}
m_GameObject: {fileID: 234002383}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.12, y: -0.08}
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1.29, y: 1.8}
newSize: {x: 1.29, y: 1.8}
oldSize: {x: 5, y: 0.86}
newSize: {x: 5, y: 0.86}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.86, y: 1.56}
m_Size: {x: 5, y: 0.51}
m_EdgeRadius: 0
--- !u!114 &370645810
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 370645808}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 53f76b8adcf2348e3a73cf1343cb10e5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!212 &370645811
--- !u!212 &234002385
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 370645808}
m_GameObject: {fileID: 234002383}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
......@@ -303,30 +291,30 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 3ae1b490507d79e4ca407331d7098f81, type: 3}
m_Sprite: {fileID: 21300000, guid: abc7c8627cab5494da8e4bd5f24a5796, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.29, y: 1.8}
m_Size: {x: 5, y: 0.86}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &370645812
--- !u!4 &234002386
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 370645808}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.22, y: 1.256, z: 0}
m_LocalScale: {x: -1.364147, y: 1.4991595, z: 1}
m_GameObject: {fileID: 234002383}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 8.79, y: -0.01, z: 0}
m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!1 &488923751
GameObject:
m_ObjectHideFlags: 0
......@@ -397,12 +385,12 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 488923751}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.48, y: -1.76, z: 0}
m_LocalScale: {x: -0.9012456, y: 1.1060119, z: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 5.006926, y: -4.0102563, z: 0.024424091}
m_LocalScale: {x: -1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_Father: {fileID: 634434897}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &488923754
BoxCollider2D:
......@@ -478,61 +466,38 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &626288396
--- !u!1 &634434896
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 626288398}
- component: {fileID: 626288397}
- component: {fileID: 634434897}
m_Layer: 0
m_Name: RightWall
m_Name: Characters
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!61 &626288397
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 626288396}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.3, y: -4.53}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.36, y: 9.93}
m_EdgeRadius: 0
--- !u!4 &626288398
--- !u!4 &634434897
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 626288396}
m_GameObject: {fileID: 634434896}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.43, y: 4.54, z: -0.024424091}
m_LocalPosition: {x: -0.09692616, y: 0.35025632, z: -0.024424091}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 488923753}
- {fileID: 907546179}
- {fileID: 1911354534}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &907546174
GameObject:
......@@ -656,11 +621,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 907546174}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 6.96, y: -1.53, z: -0.024424091}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 7.336926, y: -3.7202563, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_Father: {fileID: 634434897}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &992615372
......@@ -732,11 +697,11 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 992615372}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -4, z: 0}
m_LocalPosition: {x: 0, y: 4.46, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1048895977
GameObject:
......@@ -819,11 +784,11 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1048895977}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -8.92, y: -1.69, z: -0.024424091}
m_LocalPosition: {x: -8.92, y: -3.55, z: -0.024424091}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1375899855
GameObject:
......@@ -909,13 +874,13 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1375899855}
m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
m_LocalPosition: {x: -2.568668, y: -3.2, z: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.55, y: 3.7, z: 0}
m_LocalScale: {x: 0.21, y: 0.17, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1666194995
GameObject:
m_ObjectHideFlags: 0
......@@ -1061,22 +1026,24 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1911354532}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -8.68, y: -1.82, z: -1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -8.583075, y: -3.9202561, z: -0.9755759}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_Father: {fileID: 634434897}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2076489824
--- !u!1 &1956120121
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2076489826}
- component: {fileID: 2076489825}
- component: {fileID: 1956120124}
- component: {fileID: 1956120123}
- component: {fileID: 1956120122}
- component: {fileID: 1956120125}
m_Layer: 0
m_Name: Floor
m_TagString: Untagged
......@@ -1084,41 +1051,112 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!61 &2076489825
--- !u!61 &1956120122
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2076489824}
m_GameObject: {fileID: 1956120121}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 8.9, y: 0}
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 5, y: 0.86}
newSize: {x: 5, y: 0.86}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 17.92, y: 0.46}
m_Size: {x: 5, y: 0.53}
m_EdgeRadius: 0
--- !u!4 &2076489826
--- !u!212 &1956120123
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1956120121}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: abc7c8627cab5494da8e4bd5f24a5796, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 5, y: 0.86}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &1956120124
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2076489824}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -8.89, y: -4.97, z: -0.024424091}
m_LocalScale: {x: 1, y: 1, z: 1}
m_GameObject: {fileID: 1956120121}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.12, y: -4.92, z: -0.024424091}
m_LocalScale: {x: 3.59, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1956120125
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1956120121}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 5, y: 0.86}
newSize: {x: 5, y: 0.86}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5, y: 0.53}
m_EdgeRadius: 0
......@@ -14,7 +14,10 @@ public class Pie : MonoBehaviour {
{
PieManager.pieInScene = false;
PieManager.start = false;
Destroy(gameObject);
gameObject.GetComponent<Rigidbody2D>().velocity = new Vector2(0, 0);
gameObject.GetComponent<Rigidbody2D>().gravityScale = 0;
//gameObject.GetComponent<Rigidbody2D>().isKinematic = true;
//gameObject.GetComponent<Rigidbody2D>().constraints = RigidbodyConstraints2D.FreezePosition;
}
private void Update()
......
......@@ -13,7 +13,7 @@ public class PieTarget : MonoBehaviour {
{
Destroy(gameObject);
//Destroy(gameObject);
}
......
......@@ -14,27 +14,27 @@ public class PowerBar : MonoBehaviour {
{
if (currentPos >= minPos && currentPos < maxPos && currentPos > previousPos)
{
gameObject.transform.position = new Vector3(currentPos, -3, 0);
gameObject.transform.position = new Vector3(currentPos, 3.7f, 0);
previousPos = currentPos;
currentPos += (posChangeSpeed * Time.deltaTime);
}
else if (currentPos <= maxPos && currentPos > minPos && currentPos < previousPos)
{
gameObject.transform.position = new Vector3(currentPos, -3, 0);
gameObject.transform.position = new Vector3(currentPos, 3.7f, 0);
previousPos = currentPos;
currentPos -= (posChangeSpeed * Time.deltaTime);
}
else if (currentPos > previousPos)
{
gameObject.transform.position = new Vector3(currentPos, -3, 0);
gameObject.transform.position = new Vector3(currentPos, 3.7f, 0);
previousPos = currentPos;
currentPos -= (posChangeSpeed * Time.deltaTime);
}
else if (currentPos < previousPos)
{
gameObject.transform.position = new Vector3(currentPos, -3, 0);
gameObject.transform.position = new Vector3(currentPos, 3.7f, 0);
previousPos = currentPos;
currentPos += (posChangeSpeed * Time.deltaTime);
......
Supports Markdown
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