Commit 3cf552ef authored by mmaluschnig's avatar mmaluschnig
Browse files

Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Player now can't leave the circus.
  Fixed exclamation marks not showing on characters correctly upon level up.
parents 3f22b431 5875e0c7
......@@ -1309,7 +1309,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 258363426}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 4.5, z: -10.146484}
m_LocalPosition: {x: 0, y: 4.5, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 503603553}
......@@ -7341,7 +7341,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -94.25, y: -15}
m_AnchoredPosition: {x: -94.25001, y: -15}
m_SizeDelta: {x: 170.51, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &848493752
......@@ -12578,7 +12578,7 @@ Transform:
m_LocalScale: {x: 4, y: 3.6999998, z: 1}
m_Children: []
m_Father: {fileID: 1230210401}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1008886850
SpriteRenderer:
......@@ -18079,6 +18079,7 @@ Transform:
- {fileID: 1402622834}
- {fileID: 503603553}
- {fileID: 102930289}
- {fileID: 1679412200}
- {fileID: 1008886849}
m_Father: {fileID: 491873958}
m_RootOrder: 7
......@@ -28497,6 +28498,7 @@ Transform:
- {fileID: 636012976}
- {fileID: 231697273}
- {fileID: 1146273524}
- {fileID: 1751635343}
m_Father: {fileID: 1175208678}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -28530,11 +28532,213 @@ Transform:
m_Father: {fileID: 836855645}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1679412199
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1679412200}
- component: {fileID: 1679412202}
- component: {fileID: 1679412201}
m_Layer: 0
m_Name: Fence_1 (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1679412200
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1679412199}
m_LocalRotation: {x: 0.02769416, y: 0.647262, z: -0.03256354, w: -0.7610681}
m_LocalPosition: {x: -46.95, y: -2.21, z: 100}
m_LocalScale: {x: 8.556785, y: 3.7514532, z: 1.056516}
m_Children: []
m_Father: {fileID: 1230210401}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 279.24, z: 4.9}
--- !u!61 &1679412201
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1679412199}
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: 6.21, y: 0.44}
newSize: {x: 6.21, y: 0.44}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.04, y: 0.44}
m_EdgeRadius: 0
--- !u!212 &1679412202
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1679412199}
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: -1966733235
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300002, guid: 4912bb1b0bc6d2146898d2cfb55c153f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 6.21, y: 0.44}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1684358589 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1201578362876714, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
m_PrefabInternal: {fileID: 1109435144}
--- !u!1 &1751635342
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1751635343}
- component: {fileID: 1751635345}
- component: {fileID: 1751635344}
m_Layer: 0
m_Name: Fence_1 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1751635343
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1751635342}
m_LocalRotation: {x: 0.0327465, y: 0.7653442, z: 0.027477577, w: 0.6422001}
m_LocalPosition: {x: 29.07, y: -4, z: 100}
m_LocalScale: {x: 8, y: 3.6999998, z: 1}
m_Children: []
m_Father: {fileID: 1646371380}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 100, z: 4.9}
--- !u!61 &1751635344
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1751635342}
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: 6.21, y: 0.44}
newSize: {x: 6.21, y: 0.44}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.04, y: 0.44}
m_EdgeRadius: 0
--- !u!212 &1751635345
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1751635342}
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: -1966733235
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300002, guid: 4912bb1b0bc6d2146898d2cfb55c153f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 6.21, y: 0.44}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1756462862
Prefab:
m_ObjectHideFlags: 0
......
......@@ -54,12 +54,13 @@ public class CharacterInteractions : MonoBehaviour {
}
private IEnumerator checkLevelUp() {
yield return new WaitForSeconds(0.1f);
if (characterScript.getName() != "Ahava"){
yield return new WaitForSeconds(0.1f);
LevelUpImage.gameObject.SetActive(GameManager.hasLeveledUp(characterScript.getName()));
/*if (characterScript.getName() != "Ahava"){
LevelUpImage.gameObject.SetActive(false);
} else {
LevelUpImage.gameObject.SetActive(GameManager.hasLeveledUp(characterScript.getName()));
}
}*/
StopCoroutine(checkLevelUp());
}
......
......@@ -5,7 +5,7 @@ using UnityEngine;
public class GameManager : MonoBehaviour {
public static float AhavaLevel;
public static float SilasLevel = 1f;
public static float SilasLevel = 1.8f;
public static float SimonLevel = 1f;
public static float JohnLevel = 1f;
......
Markdown is supported
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