Commit 6fd8feab authored by Samantha Straka's avatar Samantha Straka
Browse files

Szenen passen einigermaßen im Raum

parent e82b88f0
232
2
0,cola,phone,13:07:02:511
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,5
2,1
3,9
4,6
5,4
6,7
7,2
8,8
9,3
1,1
2,2
3,9
4,4
5,5
6,6
7,7
8,8
9,3
1,1
2,2
3,9
4,4
5,5
6,6
7,7
8,8
9,3
1,1
2,2
3,9
4,4
5,5
6,6
7,7
8,8
9,3
1,1
2,2
3,9
4,4
5,5
6,6
7,7
8,8
9,3
1,1
2,2
3,9
4,4
5,5
6,6
7,7
8,8
9,3
1,1
2,2
3,9
4,4
5,5
6,6
7,7
8,8
9,3
1,1
2,2
3,3
4,4
5,5
6,6
7,7
8,8
9,9
1,1
2,2
3,3
4,4
5,5
6,6
7,7
8,8
9,9
1,bear,Paypal,13:09:00:729
Endtime13:09:00:927
Endtime13:09:00:927
fileFormatVersion: 2
guid: 57b16541c88831a4aa01e4053bf04b27
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
# Default ignored files
/.idea.Scripts.dir/.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelStore">
<e p="C:\Repository\AdvertiseRepo\Ads\Assets\Scripts" t="IncludeFlat" />
<e p="C:\Users\s332722\.Rider2019.3\system\extResources" t="IncludeRecursive" />
<e p="C:\Users\s332722\.Rider2019.3\system\resharper-host\local\Transient\ReSharperHost\v193\SolutionCaches\_.19.00" t="ExcludeRecursive" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelUserStore">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.Scripts.dir/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.Scripts.dir/riderModule.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="vcsConfiguration" value="1" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="RIDER_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/../.." />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
......@@ -53,7 +53,14 @@ public class Cube : MonoBehaviour
{
if (attachedLocation)
{
gm.GetComponent<GameManager>().checkHowManyCubesInPuzzle(-1);
if (gm.GetComponent <GameManager>())
{
gm.GetComponent<GameManager>().checkHowManyCubesInPuzzle(-1);
}
else gm.GetComponent<TutorialManager>().checkHowManyCubesInPuzzle(-1);
attachedLocation.GetComponent<PuzzleCubeLocation>().setOccupied(false);
attachedLocation = null;
}
......@@ -105,8 +112,14 @@ public class Cube : MonoBehaviour
transform.position = collision.gameObject.transform.position;
gameObject.GetComponent<Rigidbody>().useGravity = false;
gm.GetComponent<GameManager>().checkHowManyCubesInPuzzle(1);
if (gm.GetComponent <GameManager>())
{
gm.GetComponent<GameManager>().checkHowManyCubesInPuzzle(1);
}
else gm.GetComponent<TutorialManager>().checkHowManyCubesInPuzzle(1);
......@@ -122,14 +135,21 @@ public class Cube : MonoBehaviour
//When the cube is leaving the cubeLocation, the CubeLocation is no longer occupied
private void OnTriggerExit(Collider collision)
{
if (collision.gameObject.tag == "PuzzleCubeLocation" && collision.gameObject.GetComponent<PuzzleCubeLocation>().isOccupied())
if (collision.gameObject.tag == "PuzzleCubeLocation" &&
collision.gameObject.GetComponent<PuzzleCubeLocation>().isOccupied())
{
if (attachedLocation)
{
attachedLocation.GetComponent<PuzzleCubeLocation>().setOccupied(false);
gm.GetComponent<GameManager>().checkHowManyCubesInPuzzle(-1);
if (gm.GetComponent <GameManager>())
{
gm.GetComponent<GameManager>().checkHowManyCubesInPuzzle(-1);
}
else gm.GetComponent<TutorialManager>().checkHowManyCubesInPuzzle(-1);
attachedLocation = null;
}
......
......@@ -18,7 +18,7 @@ public class DesktopController : MonoBehaviour
void Start()
{
distLeft = leftControllerDesktop.transform.position.y - leftController.transform.position.y;
distRight= rightControllerDesktop.transform.position.y - rightController.transform.position.y;
distRight= rightControllerDesktop.transform.position.y - rightController.transform.position.y;
}
// Update is called once per frame
......
......@@ -11,6 +11,7 @@ public class GameManager : MonoBehaviour
public GameObject vrCamera;
public Camera desktopCamera;
public GameObject poster;
public GameObject cameraRig;
public List<Material> posterAd;
public List<Material> posterNoAd;
public GameObject desktopWall, desktopPoster;
......@@ -56,6 +57,8 @@ public class GameManager : MonoBehaviour
break;
case 1:
print("Desktop");
cameraRig.transform.position = new Vector3(0.33f, -0.0889f, 0.625f);
vrCamera.SetActive(false);
desktopWall.SetActive(true);
desktopPoster.SetActive(true);
......@@ -64,15 +67,17 @@ public class GameManager : MonoBehaviour
case 2:
print("VR Desktop");
// cameraRig.transform.position = new Vector3(3.09f, 23.36f, 1.97f);
desktopCamera.enabled = false;
desktopWall.SetActive(false);
desktopPoster.SetActive(false);
desktopWall.SetActive(true);
desktopPoster.SetActive(true);
break;
case 3:
print("kleiner Winkel VR");
cameraRig.transform.position= new Vector3(0.531f,-0.0895f, 0.73f);
desktopCamera.enabled = false;
desktopWall.SetActive(false);
desktopPoster.SetActive(false);
desktopWall.SetActive(true);
desktopPoster.SetActive(true);
smallAngleModerator.SetActive(true);
break;
default:
......
......@@ -386,6 +386,6 @@ public class TutorialManager : MonoBehaviour
{
print("Writing Done");
Application.Quit();
}
}
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "2.0.8",
"com.unity.analytics": "3.3.2",
"com.unity.analytics": "3.3.5",
"com.unity.collab-proxy": "1.2.16",
"com.unity.package-manager-ui": "2.1.2",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.1.4",
"com.unity.purchasing": "2.0.6",
"com.unity.test-framework": "1.1.13",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.0.0",
"com.unity.xr.oculus.standalone": "1.38.4",
"com.unity.xr.openvr.standalone": "1.0.5",
"com.unity.timeline": "1.2.6",
"com.unity.ugui": "1.0.0",
"com.unity.xr.oculus.standalone": "2.38.4",
"com.unity.xr.openvr.standalone": "2.0.5",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
......
......@@ -3,7 +3,7 @@
--- !u!159 &1
EditorSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 9
m_ExternalVersionControlSupport: Visible Meta Files
m_SerializationMode: 2
m_LineEndingsForNewScripts: 2
......@@ -16,10 +16,20 @@ EditorSettings:
m_EtcTextureFastCompressor: 1
m_EtcTextureNormalCompressor: 2
m_EtcTextureBestCompressor: 4
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref
m_ProjectGenerationRootNamespace:
m_CollabEditorSettings:
inProgressEnabled: 1
m_EnableTextureStreamingInEditMode: 1
m_EnableTextureStreamingInPlayMode: 1
m_AsyncShaderCompilation: 1
m_EnterPlayModeOptionsEnabled: 0
m_EnterPlayModeOptions: 3
m_ShowLightmapResolutionOverlay: 1
m_UseLegacyProbeSampleCount: 1
m_AssetPipelineMode: 1
m_CacheServerMode: 0
m_CacheServerEndpoint:
m_CacheServerNamespacePrefix: default
m_CacheServerEnableDownload: 1
m_CacheServerEnableUpload: 1
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