From 999224705d5c58de3d1f6bc19964f9edeae42098 Mon Sep 17 00:00:00 2001 From: Ian Lee Date: Sun, 19 Nov 2017 22:29:37 -0800 Subject: [PATCH] disabled the ball colliders in the prefabs --- Assets/Prefabs/UI/Sidebar.prefab | 282 ++++++++++++------------ Assets/Prefabs/balls/Blue.prefab | 6 +- Assets/Prefabs/balls/DemoWhite.prefab | 6 +- Assets/Prefabs/balls/Green.prefab | 6 +- Assets/Prefabs/balls/Orange.prefab | 6 +- Assets/Prefabs/balls/Pink.prefab | 6 +- Assets/Prefabs/balls/Purple.prefab | 6 +- Assets/Prefabs/balls/White.prefab | 6 +- Assets/Scripts/Ball.cs | 2 +- Assets/Scripts/ChangeColor.cs | 1 + Assets/Scripts/Source.cs | 1 + ProjectSettings/DynamicsManager.asset | 1 + ProjectSettings/Physics2DSettings.asset | 1 + 13 files changed, 170 insertions(+), 160 deletions(-) diff --git a/Assets/Prefabs/UI/Sidebar.prefab b/Assets/Prefabs/UI/Sidebar.prefab index f6ad775..46c08b2 100644 --- a/Assets/Prefabs/UI/Sidebar.prefab +++ b/Assets/Prefabs/UI/Sidebar.prefab @@ -11,58 +11,56 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1943298875201066} m_IsPrefabParent: 1 ---- !u!1 &1057792824061498 +--- !u!1 &1361756087082560 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224525636146638864} - - component: {fileID: 222659124801323964} - - component: {fileID: 114058056885635722} + - component: {fileID: 224364473467174238} + - component: {fileID: 222186050677492886} + - component: {fileID: 114270897447491682} + - component: {fileID: 61824973573241976} + - component: {fileID: 114922289327806946} m_Layer: 5 - m_Name: ButtonText - m_TagString: Untagged + m_Name: WallCreator + m_TagString: Creator m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1351918711852532 +--- !u!1 &1485230495319086 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224532739332675240} - - component: {fileID: 222420894884805026} - - component: {fileID: 114341297995671072} - - component: {fileID: 61145328565169042} - - component: {fileID: 114744079990830314} - - component: {fileID: 114059985656338376} + - component: {fileID: 224361160347695612} + - component: {fileID: 222387600840239258} + - component: {fileID: 114319736025612966} m_Layer: 5 - m_Name: ConveyorBeltCreator - m_TagString: Creator + m_Name: ButtonText + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1796550972913330 +--- !u!1 &1571909221056256 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224495010715318314} - - component: {fileID: 222641539162987058} - - component: {fileID: 114002046045973980} - - component: {fileID: 61075561632505846} - - component: {fileID: 114395174818649614} - - component: {fileID: 114498583935156360} + - component: {fileID: 224931644394730528} + - component: {fileID: 222460117976804984} + - component: {fileID: 114354685933184884} + - component: {fileID: 61958960639193196} + - component: {fileID: 114028247825802988} m_Layer: 5 - m_Name: WallCreator + m_Name: ConveyorBeltCreator m_TagString: Creator m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -79,6 +77,7 @@ GameObject: - component: {fileID: 222613900974569964} - component: {fileID: 114556311319268236} - component: {fileID: 114863376351153596} + - component: {fileID: 114442899854763468} m_Layer: 5 m_Name: Sidebar m_TagString: Untagged @@ -86,16 +85,16 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1980093275396372 +--- !u!1 &1954453399623778 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224063768855720288} - - component: {fileID: 222961396510311202} - - component: {fileID: 114030408283613540} + - component: {fileID: 224519002528842942} + - component: {fileID: 222121831029722256} + - component: {fileID: 114246841235639568} m_Layer: 5 m_Name: ButtonText m_TagString: Untagged @@ -103,17 +102,17 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!61 &61075561632505846 +--- !u!61 &61824973573241976 BoxCollider2D: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1796550972913330} + m_GameObject: {fileID: 1361756087082560} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_UsedByEffector: 1 + m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: @@ -128,12 +127,12 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 4.39, y: 0.68} m_EdgeRadius: 0 ---- !u!61 &61145328565169042 +--- !u!61 &61958960639193196 BoxCollider2D: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1351918711852532} + m_GameObject: {fileID: 1571909221056256} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -153,39 +152,26 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 4.39, y: 0.68} m_EdgeRadius: 0 ---- !u!114 &114002046045973980 +--- !u!114 &114028247825802988 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1796550972913330} + m_GameObject: {fileID: 1571909221056256} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: ff9c51d3bbcaeb648affffeb044d21ad, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c3bef97d083e37e4680bf709911954b6, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114030408283613540 + gizmo: {fileID: 1797930526813820, guid: 0396645b447605242a5225f502cee57f, type: 2} + count: 4 + countTxt: {fileID: 114319736025612966} +--- !u!114 &114246841235639568 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1980093275396372} + m_GameObject: {fileID: 1954453399623778} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -212,15 +198,42 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'x6 + m_Text: 'x4 ' ---- !u!114 &114058056885635722 +--- !u!114 &114270897447491682 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1057792824061498} + m_GameObject: {fileID: 1361756087082560} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c3bef97d083e37e4680bf709911954b6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114319736025612966 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1485230495319086} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -247,27 +260,15 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'x4 + m_Text: 'x6 ' ---- !u!114 &114059985656338376 +--- !u!114 &114354685933184884 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1351918711852532} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a58f29771a2d324ca38d46e5e71772c, type: 3} - m_Name: - m_EditorClassIdentifier: - countTxt: {fileID: 114030408283613540} ---- !u!114 &114341297995671072 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1351918711852532} + m_GameObject: {fileID: 1571909221056256} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -289,31 +290,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114395174818649614 +--- !u!114 &114442899854763468 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1796550972913330} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ff9c51d3bbcaeb648affffeb044d21ad, type: 3} - m_Name: - m_EditorClassIdentifier: - gizmo: {fileID: 1198426010403458, guid: aaab525ecec614479b2469e9287ff2be, type: 2} - countTxt: {fileID: 114058056885635722} ---- !u!114 &114498583935156360 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1796550972913330} + m_GameObject: {fileID: 1943298875201066} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a58f29771a2d324ca38d46e5e71772c, type: 3} + m_Script: {fileID: 11500000, guid: 0a830089a220a814a8ca5449580c42ec, type: 3} m_Name: m_EditorClassIdentifier: - countTxt: {fileID: 114058056885635722} + hRatio: 0 + wRatio: 0 + _cellSize: {x: 0.08784773, y: 0.15625} + _spacing: {x: 0, y: 0} --- !u!114 &114556311319268236 MonoBehaviour: m_ObjectHideFlags: 1 @@ -341,19 +332,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114744079990830314 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1351918711852532} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ff9c51d3bbcaeb648affffeb044d21ad, type: 3} - m_Name: - m_EditorClassIdentifier: - gizmo: {fileID: 1692976957675764, guid: 101aa4ded2b02194b8f30cf57a1693b6, type: 2} - countTxt: {fileID: 114030408283613540} --- !u!114 &114863376351153596 MonoBehaviour: m_ObjectHideFlags: 1 @@ -377,52 +355,66 @@ MonoBehaviour: m_Spacing: {x: 0, y: 20} m_Constraint: 1 m_ConstraintCount: 1 ---- !u!222 &222420894884805026 +--- !u!114 &114922289327806946 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1361756087082560} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff9c51d3bbcaeb648affffeb044d21ad, type: 3} + m_Name: + m_EditorClassIdentifier: + gizmo: {fileID: 1198426010403458, guid: aaab525ecec614479b2469e9287ff2be, type: 2} + count: 4 + countTxt: {fileID: 114246841235639568} +--- !u!222 &222121831029722256 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1351918711852532} ---- !u!222 &222613900974569964 + m_GameObject: {fileID: 1954453399623778} +--- !u!222 &222186050677492886 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1943298875201066} ---- !u!222 &222641539162987058 + m_GameObject: {fileID: 1361756087082560} +--- !u!222 &222387600840239258 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1796550972913330} ---- !u!222 &222659124801323964 + m_GameObject: {fileID: 1485230495319086} +--- !u!222 &222460117976804984 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1057792824061498} ---- !u!222 &222961396510311202 + m_GameObject: {fileID: 1571909221056256} +--- !u!222 &222613900974569964 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1980093275396372} ---- !u!224 &224063768855720288 + m_GameObject: {fileID: 1943298875201066} +--- !u!224 &224361160347695612 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1980093275396372} + m_GameObject: {fileID: 1485230495319086} m_LocalRotation: {x: -0, y: -0, z: 0.0050675296, w: 0.9999872} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -20, z: 0} m_LocalScale: {x: 1.000011, y: 1.000011, z: 1} m_Children: [] - m_Father: {fileID: 224532739332675240} + m_Father: {fileID: 224931644394730528} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.58100003} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -50} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 10} m_SizeDelta: {x: 26.4, y: 25.299988} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224361445703200456 @@ -432,72 +424,72 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1943298875201066} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 2.4299316, y: -0.0000030994415, z: 0} m_LocalScale: {x: 1.000013, y: 1.000013, z: 1.000013} m_Children: - - {fileID: 224532739332675240} - - {fileID: 224495010715318314} + - {fileID: 224931644394730528} + - {fileID: 224364473467174238} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.9025273, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2.4299636, y: -0.0000030994415} + m_AnchoredPosition: {x: 2.4299316, y: -0.0000030994415} m_SizeDelta: {x: -4.8600006, y: -0.00048828125} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224495010715318314 +--- !u!224 &224364473467174238 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1796550972913330} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1361756087082560} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 38.91323, y: 783.9999, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224525636146638864} + - {fileID: 224519002528842942} m_Father: {fileID: 224361445703200456} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 36.48323, y: 783.99963} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224525636146638864 +--- !u!224 &224519002528842942 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1057792824061498} + m_GameObject: {fileID: 1954453399623778} m_LocalRotation: {x: -0, y: -0, z: 0.0050675296, w: 0.9999872} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 10, z: 0} m_LocalScale: {x: 1.000011, y: 1.000011, z: 1} m_Children: [] - m_Father: {fileID: 224495010715318314} + m_Father: {fileID: 224364473467174238} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.58100003} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -50} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 10} m_SizeDelta: {x: 26.4, y: 25.299988} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224532739332675240 +--- !u!224 &224931644394730528 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1351918711852532} + m_GameObject: {fileID: 1571909221056256} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 23.306808, y: -50.000244, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224063768855720288} + - {fileID: 224361160347695612} m_Father: {fileID: 224361445703200456} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20.876808, y: -50} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/balls/Blue.prefab b/Assets/Prefabs/balls/Blue.prefab index 12375f9..0467211 100644 --- a/Assets/Prefabs/balls/Blue.prefab +++ b/Assets/Prefabs/balls/Blue.prefab @@ -70,7 +70,7 @@ CircleCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1743798012550768} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 0 @@ -85,7 +85,7 @@ BoxCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1743798012550768} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 1 @@ -127,6 +127,7 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -142,6 +143,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Assets/Prefabs/balls/DemoWhite.prefab b/Assets/Prefabs/balls/DemoWhite.prefab index b03c58f..ea283c3 100644 --- a/Assets/Prefabs/balls/DemoWhite.prefab +++ b/Assets/Prefabs/balls/DemoWhite.prefab @@ -70,7 +70,7 @@ CircleCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1079940132241738} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 0 @@ -85,7 +85,7 @@ BoxCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1079940132241738} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 1 @@ -125,6 +125,7 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -140,6 +141,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Assets/Prefabs/balls/Green.prefab b/Assets/Prefabs/balls/Green.prefab index ede5b16..e9f26df 100644 --- a/Assets/Prefabs/balls/Green.prefab +++ b/Assets/Prefabs/balls/Green.prefab @@ -70,7 +70,7 @@ CircleCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1958122540754108} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 0 @@ -85,7 +85,7 @@ BoxCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1958122540754108} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 1 @@ -127,6 +127,7 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -142,6 +143,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Assets/Prefabs/balls/Orange.prefab b/Assets/Prefabs/balls/Orange.prefab index c518075..5158dd2 100644 --- a/Assets/Prefabs/balls/Orange.prefab +++ b/Assets/Prefabs/balls/Orange.prefab @@ -70,7 +70,7 @@ CircleCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1644927921308316} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 0 @@ -85,7 +85,7 @@ BoxCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1644927921308316} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 1 @@ -127,6 +127,7 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -142,6 +143,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Assets/Prefabs/balls/Pink.prefab b/Assets/Prefabs/balls/Pink.prefab index efeaab0..1adf23c 100644 --- a/Assets/Prefabs/balls/Pink.prefab +++ b/Assets/Prefabs/balls/Pink.prefab @@ -70,7 +70,7 @@ CircleCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1681027475477804} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 0 @@ -85,7 +85,7 @@ BoxCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1681027475477804} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 1 @@ -127,6 +127,7 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -142,6 +143,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Assets/Prefabs/balls/Purple.prefab b/Assets/Prefabs/balls/Purple.prefab index 66b8886..15734d6 100644 --- a/Assets/Prefabs/balls/Purple.prefab +++ b/Assets/Prefabs/balls/Purple.prefab @@ -70,7 +70,7 @@ CircleCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1368487416818418} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 0 @@ -85,7 +85,7 @@ BoxCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1368487416818418} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 1 @@ -127,6 +127,7 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -142,6 +143,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Assets/Prefabs/balls/White.prefab b/Assets/Prefabs/balls/White.prefab index b4c1c67..3cdd483 100644 --- a/Assets/Prefabs/balls/White.prefab +++ b/Assets/Prefabs/balls/White.prefab @@ -70,7 +70,7 @@ CircleCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1202815009129246} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 0 @@ -85,7 +85,7 @@ BoxCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1202815009129246} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} m_IsTrigger: 1 @@ -127,6 +127,7 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -142,6 +143,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Assets/Scripts/Ball.cs b/Assets/Scripts/Ball.cs index 1f48489..dc55bef 100644 --- a/Assets/Scripts/Ball.cs +++ b/Assets/Scripts/Ball.cs @@ -16,7 +16,7 @@ public class Ball : MonoBehaviour { void Start () { keeperScript = GameObject.Find("ScoreKeeper").GetComponent(); rb = gameObject.GetComponent (); -// gameObject.GetComponent ().enabled = false; +// gameObject.GetComponent ().enabled = false; } public void init(Vector2 direction) { diff --git a/Assets/Scripts/ChangeColor.cs b/Assets/Scripts/ChangeColor.cs index 6a98c75..fff00b3 100644 --- a/Assets/Scripts/ChangeColor.cs +++ b/Assets/Scripts/ChangeColor.cs @@ -36,6 +36,7 @@ void OnTriggerEnter2D(Collider2D collider) { newBall.GetComponent ().gravityScale = 1; newBall.GetComponent ().enabled = true; + newBall.GetComponent ().enabled = true; newBall.transform.position = newPosition; newBall.transform.GetComponent().velocity = velocity; diff --git a/Assets/Scripts/Source.cs b/Assets/Scripts/Source.cs index 1aaef37..f2a039d 100644 --- a/Assets/Scripts/Source.cs +++ b/Assets/Scripts/Source.cs @@ -45,6 +45,7 @@ void ReleaseBall() { GameObject ball = stack.Pop(); ball.GetComponent ().gravityScale = 1; ball.GetComponent ().enabled = true; + ball.GetComponent ().enabled = true; ball.GetComponent ().painted = false; } } diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 1931946..0be3d78 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -17,3 +17,4 @@ PhysicsManager: m_EnablePCM: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 + m_AutoSyncTransforms: 1 diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 941592d..76ffb11 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -24,6 +24,7 @@ Physics2DSettings: m_QueriesStartInColliders: 1 m_ChangeStopsCallbacks: 0 m_CallbacksOnDisable: 1 + m_AutoSyncTransforms: 1 m_AlwaysShowColliders: 0 m_ShowColliderSleep: 1 m_ShowColliderContacts: 0