Skip to content

Commit

Permalink
triggers aigua
Browse files Browse the repository at this point in the history
  • Loading branch information
carolinadcf committed May 16, 2023
1 parent 1e591d5 commit 7ea704f
Show file tree
Hide file tree
Showing 228 changed files with 26,850 additions and 1,969 deletions.
659 changes: 659 additions & 0 deletions Assets/Scenes/Scene.unity

Large diffs are not rendered by default.

51 changes: 39 additions & 12 deletions Assets/Scripts/GameManager/gestionadorJoc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@ public class gestionadorJoc : MonoBehaviour
public List<GameObject> camins = new List<GameObject>();

//Proves
public List<GameObject> roquesProves = new List<GameObject>();
public List<GameObject> roquesProves = new List<GameObject>();

// Triggers
public List<GameObject> triggersAigua = new List<GameObject>();

// Aigua
public GameObject aigua;

// Illa
public GameObject illa;

// Start is called before the first frame update
void Start()
Expand All @@ -32,47 +41,65 @@ void Update()
{
obrintCamins();
StartCoroutine(elevantRoques());
nivellAigua();
}
void obrintCamins()
{
if(provaLlums.LlumsisWin == true)
{
camins[2].SetActive(true);
camins[2].SetActive(true); // camí 3
triggersAigua[7].SetActive(false); // trigger camí 3
}
if(provaFlors.FlorsisWin == true)
{
camins[3].SetActive(true);
camins[3].SetActive(true); // camí 4
triggersAigua[8].SetActive(false); // trigger camí 4
}
if(provaBolets.boletsIsWin == true)
{

camins[0].SetActive(true);
camins[0].SetActive(true); // camí 1
triggersAigua[5].SetActive(false); // trigger camí 1
}
if(provaVolcans.volcansIsWin == true)
{
camins[1].SetActive(true);
camins[1].SetActive(true); // camí 2
triggersAigua[6].SetActive(false); // trigger camí 2
}
if(provaConjunta.ConjuntaisWin == true)
{
camins[4].SetActive(true);
camins[4].SetActive(true); // camí 5
triggersAigua[9].SetActive(false); // trigger camí 5
}
}
IEnumerator elevantRoques()
{
if(camins[0].activeInHierarchy)
if(camins[0].activeInHierarchy) // supera prova bolets -> camí 1 s'obre
{
yield return new WaitForSeconds(5);
roquesProves[1].SetActive(true);
roquesProves[1].SetActive(true); // roca flors
triggersAigua[3].SetActive(false); // trigger prova flors
}
if(camins[2].activeInHierarchy)
if(camins[2].activeInHierarchy) // supera prova llums -> camí 3 s'obre
{
yield return new WaitForSeconds(5);
roquesProves[3].SetActive(true);
roquesProves[3].SetActive(true); // roca volcans
triggersAigua[2].SetActive(false); // trigger prova volcans
}
if(camins[1].activeInHierarchy && camins[3].activeInHierarchy)
{
yield return new WaitForSeconds(5);
roquesProves[4].SetActive(true);
roquesProves[4].SetActive(true); // roca conjunta
triggersAigua[4].SetActive(false); // trigger prova conjunta

}
}

void nivellAigua()
{
if (aigua.transform.position.y >= 5.0f)
{
illa.transform.position = new Vector3(0, -15, 0);
}
}
}

12 changes: 12 additions & 0 deletions Assets/Scripts/tracking/PlayerMovement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
public class PlayerMovement : MonoBehaviour
{
[SerializeField] int playerIndex;
[SerializeField] GameObject aigua;

// Start is called before the first frame update
void Start()
{
Expand Down Expand Up @@ -35,4 +37,14 @@ public void setPosition(Vector3 pos)
}
transform.position = pos;
}

private void OnTriggerEnter(Collider other)
{
Vector3 moveUp = new Vector3(0f, 1f, 0f);

if (other.CompareTag("TriggerAigua"))
{
aigua.transform.position = aigua.transform.position + moveUp;
}
}
}
Binary file added Lab Build/InteractiveSystemsTemplate.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":[{"assemblyName":"Unity.RenderPipelines.Universal.Runtime","nameSpace":"UnityEngine.Rendering.Universal","className":"XRSystem","methodName":"XRSystemInit","loadTypes":3,"isUnityClass":true},{"assemblyName":"Unity.RenderPipelines.HighDefinition.Runtime","nameSpace":"UnityEngine.Rendering.HighDefinition","className":"HDRuntimeReflectionSystem","methodName":"Initialize","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.RenderPipelines.HighDefinition.Runtime","nameSpace":"UnityEngine.Rendering.HighDefinition","className":"XRSystem","methodName":"XRSystemInit","loadTypes":3,"isUnityClass":true},{"assemblyName":"Unity.RenderPipelines.Core.Runtime","nameSpace":"UnityEngine.Rendering","className":"DebugUpdater","methodName":"RuntimeInit","loadTypes":0,"isUnityClass":true}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"names":["UnityEngine.dll","UnityEngine.AIModule.dll","UnityEngine.ARModule.dll","UnityEngine.AccessibilityModule.dll","UnityEngine.AndroidJNIModule.dll","UnityEngine.AnimationModule.dll","UnityEngine.AssetBundleModule.dll","UnityEngine.AudioModule.dll","UnityEngine.ClothModule.dll","UnityEngine.ClusterInputModule.dll","UnityEngine.ClusterRendererModule.dll","UnityEngine.CoreModule.dll","UnityEngine.CrashReportingModule.dll","UnityEngine.DSPGraphModule.dll","UnityEngine.DirectorModule.dll","UnityEngine.GIModule.dll","UnityEngine.GameCenterModule.dll","UnityEngine.GridModule.dll","UnityEngine.HotReloadModule.dll","UnityEngine.IMGUIModule.dll","UnityEngine.ImageConversionModule.dll","UnityEngine.InputModule.dll","UnityEngine.InputLegacyModule.dll","UnityEngine.JSONSerializeModule.dll","UnityEngine.LocalizationModule.dll","UnityEngine.ParticleSystemModule.dll","UnityEngine.PerformanceReportingModule.dll","UnityEngine.PhysicsModule.dll","UnityEngine.Physics2DModule.dll","UnityEngine.ProfilerModule.dll","UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll","UnityEngine.ScreenCaptureModule.dll","UnityEngine.SharedInternalsModule.dll","UnityEngine.SpriteMaskModule.dll","UnityEngine.SpriteShapeModule.dll","UnityEngine.StreamingModule.dll","UnityEngine.SubstanceModule.dll","UnityEngine.SubsystemsModule.dll","UnityEngine.TLSModule.dll","UnityEngine.TerrainModule.dll","UnityEngine.TerrainPhysicsModule.dll","UnityEngine.TextCoreModule.dll","UnityEngine.TextRenderingModule.dll","UnityEngine.TilemapModule.dll","UnityEngine.UIModule.dll","UnityEngine.UIElementsModule.dll","UnityEngine.UIElementsNativeModule.dll","UnityEngine.UNETModule.dll","UnityEngine.UmbraModule.dll","UnityEngine.UnityAnalyticsModule.dll","UnityEngine.UnityConnectModule.dll","UnityEngine.UnityCurlModule.dll","UnityEngine.UnityTestProtocolModule.dll","UnityEngine.UnityWebRequestModule.dll","UnityEngine.UnityWebRequestAssetBundleModule.dll","UnityEngine.UnityWebRequestAudioModule.dll","UnityEngine.UnityWebRequestTextureModule.dll","UnityEngine.UnityWebRequestWWWModule.dll","UnityEngine.VFXModule.dll","UnityEngine.VRModule.dll","UnityEngine.VehiclesModule.dll","UnityEngine.VideoModule.dll","UnityEngine.VirtualTexturingModule.dll","UnityEngine.WindModule.dll","UnityEngine.XRModule.dll","Assembly-CSharp.dll","Unity.RenderPipelines.Universal.Shaders.dll","Unity.RenderPipelines.Universal.Runtime.dll","Unity.VisualEffectGraph.Runtime.dll","Unity.Timeline.dll","Unity.TextMeshPro.dll","Unity.RenderPipelines.HighDefinition.Runtime.dll","Unity.RenderPipelines.Core.Runtime.dll","Unity.RenderPipelines.Core.ShaderLibrary.dll","UnityEngine.UI.dll","Unity.Mathematics.dll","Unity.RenderPipeline.Universal.ShaderLibrary.dll","Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll","Unity.RenderPipelines.HighDefinition.Config.Runtime.dll","Newtonsoft.Json.dll"],"types":[2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16]}
2 changes: 2 additions & 0 deletions Lab Build/InteractiveSystemsTemplate_Data/app.info
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
DefaultCompany
InteractiveSystemsTemplate
3 changes: 3 additions & 0 deletions Lab Build/InteractiveSystemsTemplate_Data/boot.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
wait-for-native-debugger=0
hdr-display-enabled=0
gc-max-time-slice=3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Lab Build/InteractiveSystemsTemplate_Data/level0
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
42 changes: 42 additions & 0 deletions Lab Build/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
This file defines some of the browsers that Microsoft's implementation provides in
<windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers\*.browser

It is not derived from any file distributed with Microsoft's implementation. Since
we can't distribute MS's browser files, we use browscap.ini to determine
browser capabilities. Then, if and only if the application contains App_Browser/*.browser
files and we are using .NET 2.0 or higher, we supplement the capabilities with the
information in those files and the files in this directory. The primary goal of this file
is provide browser definitions that might be referenced in App_Browser/*.browser files.
-->
<browsers>
<defaultBrowser id="Default">
</defaultBrowser>
<browser id="Default">
<identification>
<userAgent match="." />
</identification>
</browser>
<browser id="IE6to9" parentID="Default">
<identification>
<capability name="majorver" match="^[6-9]" />
<capability name="browser" match="^(IE|AOL)$" />
</identification>
</browser>
<browser id="Opera8to9" parentID="Default">
<identification>
<capability name="majorver" match="^[8-9]" />
<capability name="browser" match="^Opera$" />
</identification>
</browser>
<browser id="Safari" parentID="Default">
<identification>
<capability name="browser" match="^Safari$" />
</identification>
</browser>
<browser id="Mozilla" parentID="Default">
<identification>
<capability name="browser" match="^Mozilla" />
</identification>
</browser>
</browsers>
Loading

0 comments on commit 7ea704f

Please sign in to comment.