Skip to content

Commit

Permalink
Final
Browse files Browse the repository at this point in the history
  • Loading branch information
@ASPePeX
ASPePeX committed Jan 27, 2019
1 parent 52bed50 commit 4eb778e
Show file tree
Hide file tree
Showing 12 changed files with 961 additions and 106 deletions.
30 changes: 30 additions & 0 deletions Assets/ActivateZahlen.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class ActivateZahlen : MonoBehaviour
{

public GameObject Zahlen;
// Start is called before the first frame update
void Start()
{

}

// Update is called once per frame
void Update()
{

}

private void OnTriggerEnter2D(Collider2D collision)
{
Zahlen.GetComponent<Zahlenschloss>().Toggle();
}

private void OnTriggerExit2D(Collider2D collision)
{
Zahlen.GetComponent<Zahlenschloss>().Toggle();
}
}
11 changes: 11 additions & 0 deletions Assets/ActivateZahlen.cs.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

161 changes: 77 additions & 84 deletions Assets/Prefabs/SplashScreen.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2826497176729293776}
- {fileID: 6114832186722113446}
- {fileID: 2826497176869478341}
- {fileID: 2826497175184821070}
- {fileID: 2826497175763231413}
Expand Down Expand Up @@ -595,7 +595,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.73600006, y: 0.12633817}
m_AnchorMax: {x: 0.88277626, y: 0.72200006}
m_AnchoredPosition: {x: -0.2000122, y: 0.35398865}
m_AnchoredPosition: {x: -0.2000122, y: 0.3540039}
m_SizeDelta: {x: -0.099998474, y: -0.50804}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2826497175339534864
Expand Down Expand Up @@ -904,7 +904,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.69453394, y: 0.6545701}
m_AnchorMax: {x: 0.785, y: 0.726831}
m_AnchoredPosition: {x: 1.0700073, y: 2.1520004}
m_AnchoredPosition: {x: 1.0700073, y: 2.152008}
m_SizeDelta: {x: 0.4539795, y: -1.199997}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2826497175744323685
Expand Down Expand Up @@ -1378,7 +1378,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.1941983, y: 0.019000001}
m_AnchorMax: {x: 0.785, y: 0.22441548}
m_AnchoredPosition: {x: 1.2999878, y: 2.4999847}
m_AnchoredPosition: {x: 1.2999878, y: 2.4999695}
m_SizeDelta: {x: -0.1000061, y: 2.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2826497175877637950
Expand Down Expand Up @@ -2096,7 +2096,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.64000005, y: 0.80158454}
m_AnchorMax: {x: 0.79677624, y: 0.86933815}
m_AnchoredPosition: {x: 2.5099945, y: -1.0399933}
m_AnchoredPosition: {x: 2.5099945, y: -1.039978}
m_SizeDelta: {x: 1, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2826497176402419614
Expand Down Expand Up @@ -2290,85 +2290,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2826497176729293779
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2826497176729293776}
- component: {fileID: 2826497176729293782}
- component: {fileID: 2826497176729293777}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2826497176729293776
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2826497176729293779}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2826497175120052605}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.24859664, y: 0.7194155}
m_AnchorMax: {x: 0.7472167, y: 1}
m_AnchoredPosition: {x: 2, y: 0.8500061}
m_SizeDelta: {x: 1.5, y: -1.699997}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2826497176729293782
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2826497176729293779}
m_CullTransparentMesh: 0
--- !u!114 &2826497176729293777
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2826497176729293779}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Seeking Shelter
--- !u!1 &2826497176869478340
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2518,3 +2439,75 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &3272091379669312565
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6114832186722113446}
- component: {fileID: 3882022939876410057}
- component: {fileID: 8129713037475179572}
m_Layer: 5
m_Name: RawImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6114832186722113446
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3272091379669312565}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2826497175120052605}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3882022939876410057
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3272091379669312565}
m_CullTransparentMesh: 0
--- !u!114 &8129713037475179572
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3272091379669312565}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Texture: {fileID: 2800000, guid: 22557f8c434326b41a38a7206388cac5, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
26 changes: 13 additions & 13 deletions Assets/Prefabs/Zahlenschloss.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 4
m_Father: {fileID: 7291429562655452658}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 169.06711, y: -0.42999208}
m_AnchoredPosition: {x: -72.11087, y: 0.4948126}
m_SizeDelta: {x: 57.13, y: 67.92}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7291429562051116914
Expand Down Expand Up @@ -272,7 +272,7 @@ RectTransform:
m_Children:
- {fileID: 7291429563737360569}
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.279, y: 0.34283093}
m_AnchorMax: {x: 0.3485593, y: 0.37933823}
Expand Down Expand Up @@ -502,7 +502,7 @@ RectTransform:
m_Children:
- {fileID: 7291429563798173464}
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.39085764, y: 0.34283093}
m_AnchorMax: {x: 0.46300003, y: 0.37933823}
Expand Down Expand Up @@ -651,7 +651,6 @@ RectTransform:
- {fileID: 7291429563345375454}
- {fileID: 7291429562403482625}
- {fileID: 7291429562655452658}
- {fileID: 7291429562051116924}
- {fileID: 7291429563111773456}
- {fileID: 7291429562066825622}
- {fileID: 7291429562081025763}
Expand Down Expand Up @@ -1052,7 +1051,7 @@ RectTransform:
m_Children:
- {fileID: 7291429562067111046}
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.51472044, y: 0.35258457}
m_AnchorMax: {x: 0.586, y: 0.37933823}
Expand Down Expand Up @@ -1280,7 +1279,7 @@ RectTransform:
m_Children:
- {fileID: 7291429563780606903}
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.62700003, y: 0.34283093}
m_AnchorMax: {x: 0.69900006, y: 0.37933823}
Expand Down Expand Up @@ -1429,7 +1428,7 @@ RectTransform:
m_Children:
- {fileID: 7291429562366563837}
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.39085764, y: 0.61800003}
m_AnchorMax: {x: 0.46300003, y: 0.6474155}
Expand Down Expand Up @@ -1573,7 +1572,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 7291429562051116924}
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1650,7 +1650,7 @@ RectTransform:
m_Children:
- {fileID: 7291429563103908733}
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.51472044, y: 0.61800003}
m_AnchorMax: {x: 0.586, y: 0.6474155}
Expand Down Expand Up @@ -1880,7 +1880,7 @@ RectTransform:
m_Children:
- {fileID: 7291429561814227703}
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.279, y: 0.61800003}
m_AnchorMax: {x: 0.3485593, y: 0.6474155}
Expand Down Expand Up @@ -2193,7 +2193,7 @@ RectTransform:
m_Children:
- {fileID: 7291429562276916853}
m_Father: {fileID: 7291429562244661489}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.62700003, y: 0.61800003}
m_AnchorMax: {x: 0.69900006, y: 0.657}
Expand Down
Loading

0 comments on commit 4eb778e

Please sign in to comment.