Conjure/ludumdare50
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed safezone collider enabled by default + Added empty Arena component

Browse Source
This commit is contained in:
Jason Durand 01 2022-04-02 04:16:32 -04:00
parent 4daed34748
commit 761d6876cc
5 changed files with 85 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Assets/Prefabs/Arena.prefab
View File

@ -69,7 +69,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3}
m_Color: {r: 0.8490566, g: 0.75490606, b: 0.48460305, a: 1}
@ -151,7 +151,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: -1
m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3}
m_Color: {r: 0.6037736, g: 0.48196557, b: 0.13385546, a: 1}
@ -209,7 +209,7 @@ CircleCollider2D:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9196727423716235681}
m_Enabled: 1
m_Enabled: 0
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
@ -317,7 +317,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3}
m_Color: {r: 0.6037736, g: 0.48196557, b: 0.13385546, a: 1}
@ -400,7 +400,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -509,7 +509,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -618,7 +618,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -727,7 +727,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -836,7 +836,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -984,7 +984,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: -1
m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3}
m_Color: {r: 0.33454967, g: 0.3515994, b: 0.3962264, a: 1}
@ -1067,7 +1067,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -1176,7 +1176,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -1285,7 +1285,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -1394,7 +1394,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -1502,7 +1502,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: -3
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.9056604, g: 0.80022454, b: 0.51690996, a: 1}
@ -1585,7 +1585,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.3529412, b: 0.39607844, a: 1}
@ -1693,7 +1693,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 541259567
m_SortingLayer: 1
m_SortingLayer: -1
m_SortingOrder: -2
m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3}
m_Color: {r: 0.14150941, g: 0.11485051, b: 0.10613206, a: 1}
@ -1715,6 +1715,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 9196727425507610130}
- component: {fileID: -7596782781093632548}
m_Layer: 0
m_Name: Arena
m_TagString: Untagged
@ -1739,3 +1740,15 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-7596782781093632548
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9196727425507610131}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72794012913ccd840a73788b90573212, type: 3}
m_Name:
m_EditorClassIdentifier:

21
Assets/Scenes/SampleScene.unity
View File

@ -130,6 +130,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8365024801073869717, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: m_Follow
value:
objectReference: {fileID: 720678398}
- target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: m_LookAt
value:
objectReference: {fileID: 720678398}
- target: {fileID: 8365024801698166081, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: m_RootOrder
value: 0
@ -178,8 +190,17 @@ PrefabInstance:
propertyPath: m_Name
value: SceneStuff
objectReference: {fileID: 0}
- target: {fileID: 8365024802335227868, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
--- !u!4 &720678398 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
m_PrefabInstance: {fileID: 1942557562}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1359990804
PrefabInstance:
m_ObjectHideFlags: 0

18
Assets/Scripts/Arena.cs Normal file
View File

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Arena : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

11
Assets/Scripts/Arena.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 72794012913ccd840a73788b90573212
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

5
Assets/Scripts/SafeZone.cs
View File

@ -5,6 +5,11 @@ public class SafeZone : MonoBehaviour {
[SerializeField] CircleCollider2D moatCollider;
public bool IsInSafeZone { get; private set; } = true;
void Awake() {
if (moatCollider.enabled)
Debug.LogWarning("Moat collider was enabled on start, shouldn't be if the player starts in the safe zone.");
}
public void EnterSafeZone() {
moatCollider.enabled = false;
IsInSafeZone = true;