diff --git a/Assets/Art/cursor.png.meta b/Assets/Art/cursor.png.meta index 10a4fe0..4b8f70a 100644 --- a/Assets/Art/cursor.png.meta +++ b/Assets/Art/cursor.png.meta @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03e5482cd2175de469d9d5619ba7e4f606a45ab974d97548a45bf1bcd5ecb9e1 -size 3515 +oid sha256:ac9386c8be13c4b9deac08ce4ff6ef801e49620cf45ad9047ab3b36ecd41b823 +size 4179 diff --git a/Assets/Scenes/SoulahaScene.unity b/Assets/Scenes/SoulahaScene.unity index d895a65..0a0473f 100644 --- a/Assets/Scenes/SoulahaScene.unity +++ b/Assets/Scenes/SoulahaScene.unity @@ -560,9 +560,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cbbe9406db76ed447bdc7c36883ee139, type: 3} m_Name: m_EditorClassIdentifier: - _controls: {fileID: 1407792874} - _state: 0 - ui: {fileID: 1822990541} + controls: {fileID: 1407792874} + cannonList: + - {fileID: 6969840674995165993} + uiController: {fileID: 1822990541} + state: 0 + points: 0 --- !u!4 &1571118495 Transform: m_ObjectHideFlags: 0 @@ -717,19 +720,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 19.4609 + value: 0 objectReference: {fileID: 0} - target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 430403745636601587, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: player @@ -737,19 +740,19 @@ PrefabInstance: objectReference: {fileID: 1407792871} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 318.01968 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3203615922723506192, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: player @@ -757,35 +760,35 @@ PrefabInstance: objectReference: {fileID: 1407792871} - target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 19.4609 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 33.4218 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4088869081495123135, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: player @@ -793,35 +796,35 @@ PrefabInstance: objectReference: {fileID: 1407792871} - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 33.4218 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 184.00984 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5156634212059812228, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -829,35 +832,35 @@ PrefabInstance: objectReference: {fileID: 1571118494} - target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7226858076299792826, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_Pivot.x @@ -953,51 +956,51 @@ PrefabInstance: objectReference: {fileID: 1407792871} - target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 18.883 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 5.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -5.5 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} @@ -1326,3 +1329,14 @@ Transform: m_CorrespondingSourceObject: {fileID: 6969840675499469969, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} m_PrefabInstance: {fileID: 6969840674995165991} m_PrefabAsset: {fileID: 0} +--- !u!114 &6969840674995165993 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1832045534445164820, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} + m_PrefabInstance: {fileID: 6969840674995165991} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a12feff9954dae440b01b5ac3c3749bd, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 55379a2..9db7741 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -14,7 +14,7 @@ PlayerSettings: accelerometerFrequency: 60 companyName: Conjure productName: ConjureCreativeJam20 - defaultCursor: {fileID: 2800000, guid: c6535c9f0b512474f9d06a68ab050a30, type: 3} + defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_ShowUnitySplashScreen: 1