cannot score when ball starts unlucky

main
Benjamin Kraft 1 year ago
parent dbe1638985
commit 071180c59d
  1. 144
      Assets/Scenes/Game.unity
  2. 10
      Assets/Scripts/Game/DeathGate.cs

@ -177,7 +177,7 @@ EdgeCollider2D:
m_AdjacentEndPoint: {x: 0, y: 0}
m_UseAdjacentStartPoint: 0
m_UseAdjacentEndPoint: 0
--- !u!1 &215443037
--- !u!1 &189450092
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -185,113 +185,55 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 215443039}
- component: {fileID: 215443038}
- component: {fileID: 215443040}
- component: {fileID: 189450094}
- component: {fileID: 189450093}
m_Layer: 0
m_Name: Directional Light
m_Name: Dimensions
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &215443038
Light:
--- !u!114 &189450093
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 215443037}
m_GameObject: {fileID: 189450092}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &215443039
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 572c5b8dd6a94b3585befaa50a883755, type: 3}
m_Name:
m_EditorClassIdentifier:
isUpdating: 1
panelHeightPixelsMinimum: 250
playGroundSize: {x: 20, y: 35}
emptySpaceHeight: 3
mainCamera: {fileID: 1698696476}
topC: {fileID: 1166615027}
bottomC: {fileID: 238423618}
leftC: {fileID: 132613874}
rightC: {fileID: 1462314555}
playGround: {fileID: 338338488}
playerPanelTop: {fileID: 738870617}
playerPanelBottom: {fileID: 2108734120}
background: {fileID: 712762093}
--- !u!4 &189450094
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 215443037}
m_LocalRotation: {x: 0.5735764, y: 0, z: 0, w: 0.8191521}
m_GameObject: {fileID: 189450092}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 70, y: 0, z: 0}
--- !u!114 &215443040
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 215443037}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 1
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &238423617
PrefabInstance:
m_ObjectHideFlags: 0
@ -522,7 +464,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &656199024
GameObject:
@ -683,7 +625,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 948416251}
- component: {fileID: 948416252}
m_Layer: 0
m_Name: Border
m_TagString: Untagged
@ -710,31 +651,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &948416252
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 948416250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 572c5b8dd6a94b3585befaa50a883755, type: 3}
m_Name:
m_EditorClassIdentifier:
isUpdating: 1
panelHeightPixelsMinimum: 250
playGroundSize: {x: 20, y: 35}
emptySpaceHeight: 3
mainCamera: {fileID: 1698696476}
topC: {fileID: 1166615027}
bottomC: {fileID: 238423618}
leftC: {fileID: 132613874}
rightC: {fileID: 1462314555}
playGround: {fileID: 338338488}
playerPanelTop: {fileID: 738870617}
playerPanelBottom: {fileID: 2108734120}
background: {fileID: 712762093}
--- !u!1001 &1166615026
PrefabInstance:
m_ObjectHideFlags: 0

@ -20,10 +20,12 @@ namespace Game {
}
}
private void OnTriggerEnter2D(Collider2D other) {
otherPlayer.GainScore();
Ball ball = other.GetComponent<Ball>();
private void OnTriggerEnter2D(Collider2D ballCollider2D) {
Ball ball = ballCollider2D.GetComponent<Ball>();
if (ball.LastContactPlayer != null)
otherPlayer.GainScore();
GameManager.Singleton.RemoveBall(ball);
if (ball.IsPermanent)

Loading…
Cancel
Save