Skip to content

GitLab

Commit e3d9766f authored by Samantha Straka's avatar Samantha Straka
Browse files

Wieder auf dem alten Stand. Yey

parent 6daa2815
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3233 additions and 2201 deletions
AdvertiseRepo/Ads/Assets/LogFiles/2432 0 → 100644
View file @ e3d9766f
2432
0
0,cola,lights,13:41:21:059
1,fabric,VW,13:42:04:791
Endtime13:42:27:408
AdvertiseRepo/Ads/Assets/LogFiles/34.meta → AdvertiseRepo/Ads/Assets/LogFiles/2432.meta
View file @ e3d9766f
fileFormatVersion: 2
guid: 60039ec3d0c9afd4e892e79a8e6b568e
guid: 8b8cae2cf5a6c2b4792b7ec05f5a5fe6
DefaultImporter:
externalObjects: {}
userData:
......
AdvertiseRepo/Ads/Assets/LogFiles/324 deleted 100644 → 0
View file @ 6daa2815
324
1
2,bear,stilisierteTiere,15:48:38:695
0,bear,stilisierteTiere,15:48:38:866
AdvertiseRepo/Ads/Assets/LogFiles/3242 deleted 100644 → 0
View file @ 6daa2815
3242
1
1,Kugeln,Samsung,15:32:41:389
0,Kugeln,Samsung,15:33:29:253
0,Kugeln,Samsung,15:34:20:603
0,Kugeln,Samsung,15:34:28:998
AdvertiseRepo/Ads/Assets/LogFiles/3242.meta deleted 100644 → 0
View file @ 6daa2815
fileFormatVersion: 2
guid: cc03038be42708645b3dcb775f3a3969
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AdvertiseRepo/Ads/Assets/LogFiles/34 deleted 100644 → 0
View file @ 6daa2815
34
1
2,Abstract,banane,15:49:00:361
0,Abstract,banane,15:50:13:455
0,Abstract,banane,15:50:46:592
1,2;
2,3;
3,6;
4,4;
7,7;
5,1;
8,8;
6,5;
9,9;
1,2;
2,3;
3,6;
4,4;
7,7;
5,1;
8,8;
6,5;
9,9;
0,Abstract,banane,15:51:19:872
1,2;
2,3;
3,6;
4,4;
7,7;
5,1;
8,8;
6,5;
9,9;
1,2;
2,3;
3,6;
4,4;
7,7;
5,1;
8,8;
6,5;
9,9;
AdvertiseRepo/Ads/Assets/LogFiles/5464 0 → 100644
View file @ e3d9766f
5464
0
0,adidas,tokei,13:32:01:182
1,bear,Samsung,13:32:39:738
0,cola,abstract,13:33:26:915
AdvertiseRepo/Ads/Assets/LogFiles/324.meta → AdvertiseRepo/Ads/Assets/LogFiles/5464.meta
View file @ e3d9766f
fileFormatVersion: 2
guid: 79569de99a7d1a04da3f117ae451eacc
guid: 25195446055f054479090d62ccb591a8
DefaultImporter:
externalObjects: {}
userData:
......
AdvertiseRepo/Ads/Assets/LogFiles/67896879 deleted 100644 → 0
View file @ 6daa2815
67896879
1
1,phone,MCDonalds,15:41:18:865
0,phone,MCDonalds,15:42:00:571
0,phone,MCDonalds,15:42:17:184
1,1
2,2
3,3
4,4
7,7
5,8
8,5
6,6
9,9
1,1
2,2
3,3
4,4
7,7
5,8
8,5
6,6
9,9
AdvertiseRepo/Ads/Assets/LogFiles/98768786 0 → 100644
View file @ e3d9766f
98768786
0
0,Nike,phone,13:18:17:989
0,Starbucks,lights,13:18:49:827
1,2
2,1
3,3
4,4
5,5
6,6
7,7
8,8
9,9
1,2
2,1
3,3
4,4
5,5
6,6
7,7
8,8
9,9
0,VW,banane,13:20:22:280
0,Samsung,tokei,13:20:55:853
1,fabric,amazon,13:21:23:457
1,bear,Paypal,13:21:47:297
1,tonkarton,Twitter,13:22:19:695
1,6
2,1
3,3
4,7
5,8
6,2
7,4
8,5
9,9
1,6
2,1
3,3
4,7
5,8
6,2
7,4
8,5
9,9
1,6
2,1
3,3
4,7
5,8
6,2
7,4
8,5
9,9
1,6
2,1
3,3
4,7
5,8
6,2
7,4
8,5
9,9
1,1
2,5
3,3
4,4
5,8
6,2
7,7
8,6
9,9
1,1
2,5
3,3
4,4
5,8
6,2
7,7
8,6
9,9
1,1
2,5
3,3
4,4
5,8
6,2
7,7
8,6
9,9
1,1
2,5
3,3
4,4
5,8
6,2
7,7
8,6
9,9
1,1
2,5
3,3
4,4
5,8
6,2
7,7
8,6
9,9
1,1
2,5
3,3
4,4
5,8
6,2
7,7
8,6
9,9
1,1
2,5
3,3
4,4
5,8
6,2
7,7
8,6
9,9
1,1
2,5
3,3
4,4
5,8
6,2
7,7
8,6
9,9
1,abstract,insta,13:23:57:693
0,adidas,duck,13:24:14:917
1,wuusch,MCDonalds,13:24:37:359
Endtime13:25:17:544
AdvertiseRepo/Ads/Assets/LogFiles/67896879.meta → AdvertiseRepo/Ads/Assets/LogFiles/98768786.meta
View file @ e3d9766f
fileFormatVersion: 2
guid: 25216d8409c6a2043bda0339a60c0267
guid: 8c716c6714e7d124f9c48602c2f47643
DefaultImporter:
externalObjects: {}
userData:
......
AdvertiseRepo/Ads/Assets/Scenes/SampleScene/ReflectionProbe-0.exr.meta
View file @ e3d9766f
......@@ -58,7 +58,7 @@ TextureImporter:
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
......@@ -69,7 +69,6 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
......
AdvertiseRepo/Ads/Assets/Scenes/Start.unity
View file @ e3d9766f
This diff is collapsed.
AdvertiseRepo/Ads/Assets/Scripts/Controller.cs
View file @ e3d9766f
......@@ -13,13 +13,13 @@ public class Controller : MonoBehaviour
public SteamVR_Input_Sources handType;
public bool triggerDown;
private GameObject overlappedCube;
public List<String> conditions;
public List<String> conditions;
private int numberOfRepetitions = 0;
public GameManager manager;
private bool canSetNextCondition;
private IEnumerator coroutine;
public GameObject timer;
public Material nextCon, eineSekunde, zweiSekunden;
public Material nextCon, eineSekunde, zweiSekunden;
// Start is called before the first frame update
......@@ -38,7 +38,8 @@ public class Controller : MonoBehaviour
{
grabbedCube.transform.SetPositionAndRotation(gameObject.transform.position, gameObject.transform.rotation);
// grabbedCube.transform.SetPositionAndRotation(gameObject.transform.position, gameObject.transform.rotation);
grabbedCube.transform.position = gameObject.transform.position;
......@@ -52,13 +53,13 @@ public class Controller : MonoBehaviour
{
}
public void TriggerHeld(SteamVR_Action_Boolean fromAction, SteamVR_Input_Sources fromSource)
{
triggerDown = true;
......@@ -86,6 +87,7 @@ public class Controller : MonoBehaviour
{
if (collision.gameObject.tag == "PuzzleCube")
{
overlappedCube = collision.gameObject;
if (overlappedCube != grabbedCube)
{
......@@ -106,7 +108,7 @@ public class Controller : MonoBehaviour
if (overlappedCube && triggerDown && !grabbedCube)
{
print("Grab");
grabbedCube = overlappedCube;
grabbedCube.GetComponent<Rigidbody>().useGravity = false;
grabbedCube.GetComponent<Rigidbody>().isKinematic = true;
......@@ -125,7 +127,7 @@ public class Controller : MonoBehaviour
if (other.gameObject.tag == "PuzzleCube")
{
other.GetComponent<Cube>().unhighLight();
if (!other.GetComponent<Cube>().hasLocation() && !triggerDown)
{
......
AdvertiseRepo/Ads/Assets/Scripts/Cube.cs
View file @ e3d9766f
......@@ -20,7 +20,7 @@ public class Cube : MonoBehaviour
private void Awake()
{
puzzleMaterial = front.GetComponent<MeshRenderer>().materials[0];
}
......@@ -59,7 +59,7 @@ public class Cube : MonoBehaviour
void Start()
{
gm = GameObject.FindGameObjectWithTag("GameManager");
transform.position = originalPosition.transform.position;
Cubecollider = gameObject.GetComponent<Collider>();
}
......@@ -142,12 +142,15 @@ public class Cube : MonoBehaviour
//This is called at the start of the application, so that the cubes are lieing on the table
public void setToOriginalPosition()
{
transform.position = originalPosition.transform.position;
if (attachedLocation)
{
attachedLocation.GetComponent<PuzzleCubeLocation>().setOccupied(false);
attachedLocation = null;
}
transform.position = originalPosition.transform.position;
transform.rotation = originalPosition.transform.rotation;
gameObject.GetComponent<Rigidbody>().useGravity = true;
}
......@@ -170,6 +173,7 @@ public class Cube : MonoBehaviour
public void setMaterial(string path)
{
puzzleMaterial = Resources.Load("Images/" + path + "/" + Index.ToString()) as Material;
front.GetComponent<MeshRenderer>().material = puzzleMaterial;
......@@ -180,7 +184,7 @@ public class Cube : MonoBehaviour
{
Material[] mats = GetComponent<MeshRenderer>().materials;
mats[0] = puzzleMaterial;
mats[0] = mats[0];
mats[1] = highLightMaterial;
GetComponent<MeshRenderer>().materials = mats;
}
......@@ -189,7 +193,7 @@ public class Cube : MonoBehaviour
{
Material[] mats = GetComponent<MeshRenderer>().materials;
mats[0] = puzzleMaterial;
mats[0] = mats[0];
mats[1] = null;
GetComponent<MeshRenderer>().materials = mats;
}
......
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