UI fixed; Entry room integration

This commit is contained in:
Mediha Zukic
2017-05-23 22:55:39 +03:00
parent 40cedaf5bf
commit 97bb6a57bf
5 changed files with 724 additions and 505 deletions

View File

@@ -132,17 +132,17 @@ RectTransform:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 65932182} m_GameObject: {fileID: 65932182}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1805279909} m_Father: {fileID: 1805279909}
m_RootOrder: 1 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 118, y: 0} m_AnchoredPosition: {x: 175, y: 100}
m_SizeDelta: {x: 160, y: 30} m_SizeDelta: {x: 100, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &65932184 --- !u!114 &65932184
MonoBehaviour: MonoBehaviour:
@@ -165,12 +165,12 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 35a4069847f5a5140b28f08fba17be56, type: 3} m_Font: {fileID: 12800000, guid: 35a4069847f5a5140b28f08fba17be56, type: 3}
m_FontSize: 25 m_FontSize: 55
m_FontStyle: 1 m_FontStyle: 1
m_BestFit: 0 m_BestFit: 0
m_MinSize: 2 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 55
m_Alignment: 1 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@@ -211,13 +211,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1805279909} m_Father: {fileID: 1805279909}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 10, y: 90} m_AnchoredPosition: {x: 0, y: -250}
m_SizeDelta: {x: 370, y: 50} m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &73771155 --- !u!114 &73771155
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -239,12 +239,12 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 34b69fa3cc23fa1498ecdf2650846c9d, type: 3} m_Font: {fileID: 12800000, guid: 34b69fa3cc23fa1498ecdf2650846c9d, type: 3}
m_FontSize: 30 m_FontSize: 35
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 1 m_MinSize: 1
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 1 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@@ -289,8 +289,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 75, y: 0} m_AnchoredPosition: {x: -61, y: 100}
m_SizeDelta: {x: 160, y: 30} m_SizeDelta: {x: 72, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &160376549 --- !u!114 &160376549
MonoBehaviour: MonoBehaviour:
@@ -313,72 +313,72 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 35a4069847f5a5140b28f08fba17be56, type: 3} m_Font: {fileID: 12800000, guid: 35a4069847f5a5140b28f08fba17be56, type: 3}
m_FontSize: 25 m_FontSize: 55
m_FontStyle: 1 m_FontStyle: 1
m_BestFit: 0 m_BestFit: 0
m_MinSize: 2 m_MinSize: 0
m_MaxSize: 40 m_MaxSize: 60
m_Alignment: 0 m_Alignment: 5
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 90 m_Text: 900
--- !u!222 &160376550 --- !u!222 &160376550
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 160376547} m_GameObject: {fileID: 160376547}
--- !u!1 &330471365 --- !u!1 &233742269
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
serializedVersion: 5 serializedVersion: 5
m_Component: m_Component:
- component: {fileID: 330471366} - component: {fileID: 233742270}
- component: {fileID: 330471368} - component: {fileID: 233742272}
- component: {fileID: 330471367} - component: {fileID: 233742271}
m_Layer: 5 m_Layer: 5
m_Name: Text m_Name: ScoreTextBackground
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &330471366 --- !u!224 &233742270
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 330471365} m_GameObject: {fileID: 233742269}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 730165369} m_Father: {fileID: 1805279909}
m_RootOrder: 0 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 175, y: 100}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 60}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &330471367 --- !u!114 &233742271
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 330471365} m_GameObject: {fileID: 233742269}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_Color: {r: 0.553, g: 0.1939879, b: 0, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
@@ -386,25 +386,25 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: ea60ddb36cd742f43afccf15d3ffe272, type: 3} m_Font: {fileID: 12800000, guid: 35a4069847f5a5140b28f08fba17be56, type: 3}
m_FontSize: 35 m_FontSize: 55
m_FontStyle: 0 m_FontStyle: 1
m_BestFit: 0 m_BestFit: 0
m_MinSize: 0 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 60
m_Alignment: 4 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Next question m_Text: 888
--- !u!222 &330471368 --- !u!222 &233742272
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 330471365} m_GameObject: {fileID: 233742269}
--- !u!1 &524683168 --- !u!1 &524683168
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -498,12 +498,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1805279909} m_Father: {fileID: 1805279909}
m_RootOrder: 5 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 110, y: 0} m_AnchoredPosition: {x: 75, y: 100}
m_SizeDelta: {x: 160, y: 30} m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &636545794 --- !u!114 &636545794
MonoBehaviour: MonoBehaviour:
@@ -526,12 +526,12 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 34b69fa3cc23fa1498ecdf2650846c9d, type: 3} m_Font: {fileID: 12800000, guid: 34b69fa3cc23fa1498ecdf2650846c9d, type: 3}
m_FontSize: 25 m_FontSize: 35
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 2 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 55
m_Alignment: 0 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@@ -602,117 +602,68 @@ Prefab:
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
--- !u!1 &730165368 --- !u!1 &872436310
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
serializedVersion: 5 serializedVersion: 5
m_Component: m_Component:
- component: {fileID: 730165369} - component: {fileID: 872436313}
- component: {fileID: 730165372} - component: {fileID: 872436312}
- component: {fileID: 730165371} - component: {fileID: 872436311}
- component: {fileID: 730165370} m_Layer: 0
m_Layer: 5 m_Name: EventSystem
m_Name: NextQuestionButton
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &730165369 --- !u!114 &872436311
RectTransform: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 730165368} m_GameObject: {fileID: 872436310}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &872436312
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 872436310}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 5
--- !u!4 &872436313
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 872436310}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children: []
- {fileID: 330471366} m_Father: {fileID: 0}
m_Father: {fileID: 1805279909} m_RootOrder: 6
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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: 0, y: -100}
m_SizeDelta: {x: 220, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &730165370
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 730165368}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 730165371}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &730165371
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 730165368}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &730165372
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 730165368}
--- !u!1 &873979779 --- !u!1 &873979779
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -741,12 +692,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1805279909} m_Father: {fileID: 1805279909}
m_RootOrder: 4 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: -143, y: 100}
m_SizeDelta: {x: 160, y: 30} m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &873979781 --- !u!114 &873979781
MonoBehaviour: MonoBehaviour:
@@ -769,12 +720,12 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 34b69fa3cc23fa1498ecdf2650846c9d, type: 3} m_Font: {fileID: 12800000, guid: 34b69fa3cc23fa1498ecdf2650846c9d, type: 3}
m_FontSize: 25 m_FontSize: 35
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 2 m_MinSize: 0
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 0 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@@ -871,7 +822,7 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1187566120} m_GameObject: {fileID: 1187566120}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 10, z: -25} m_LocalPosition: {x: 0, y: 15, z: -25}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
@@ -947,7 +898,7 @@ Prefab:
m_Modifications: m_Modifications:
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3} - target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -15.5 value: 31.3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3} - target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -963,20 +914,36 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3} - target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalRotation.w
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3} - target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalScale.z
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 153c7c3363d51a9439069414442f515c, type: 3} m_ParentPrefab: {fileID: 100100000, guid: 153c7c3363d51a9439069414442f515c, type: 3}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
@@ -1065,12 +1032,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: m_Children:
- {fileID: 1936500532}
- {fileID: 73771154} - {fileID: 73771154}
- {fileID: 65932183}
- {fileID: 160376548} - {fileID: 160376548}
- {fileID: 730165369}
- {fileID: 873979780} - {fileID: 873979780}
- {fileID: 636545793} - {fileID: 636545793}
- {fileID: 233742270}
- {fileID: 65932183}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1133,3 +1101,77 @@ Prefab:
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: c81250ac87834d44b9e38c271d829d82, type: 2} m_ParentPrefab: {fileID: 100100000, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
--- !u!1 &1936500531
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1936500532}
- component: {fileID: 1936500534}
- component: {fileID: 1936500533}
m_Layer: 5
m_Name: CounterTextBackground
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1936500532
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1936500531}
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: 1805279909}
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: -61, y: 100}
m_SizeDelta: {x: 72, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1936500533
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1936500531}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.553, g: 0.1939879, b: 0, 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: 12800000, guid: 35a4069847f5a5140b28f08fba17be56, type: 3}
m_FontSize: 55
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 60
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 88
--- !u!222 &1936500534
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1936500531}

File diff suppressed because it is too large Load Diff

View File

@@ -6,30 +6,45 @@ using UnityEngine.SceneManagement;
public class EntrySceneScript : MonoBehaviour { public class EntrySceneScript : MonoBehaviour {
public Button firstGameButton;
public Button secondGameButton;
// Use this for initialization // Use this for initialization
void Start () { void Start () {
Debug.Log("Started"); Debug.Log("Started");
firstGameButton.GetComponent<Button>().onClick.AddListener(LoadFirstGame);
secondGameButton.GetComponent<Button>().onClick.AddListener(LoadSecondGame);
} }
// Update is called once per frame // Update is called once per frame
void Update () { void Update () {
// Select answers event handler
} if (Input.GetMouseButtonDown(0))
{
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hit;
if (Physics.Raycast(ray, out hit, 100))
{
if(hit.transform.gameObject.name == "FirstGame")
{
Debug.Log("Load first game");
SceneManager.LoadScene("Quiz4Scene");
}
else if (hit.transform.gameObject.name == "SecondGame")
{
Debug.Log("Load second game");
SceneManager.LoadScene("Quiz2Scene");
}
}
}
}
public void LoadFirstGame() public void LoadFirstGame()
{ {
Debug.Log("Load first game");
SceneManager.LoadScene("Quiz4Scene");
} }
public void LoadSecondGame() { public void LoadSecondGame() {
Debug.Log("Load second game");
SceneManager.LoadScene("Quiz2Scene");
} }
} }

View File

@@ -297,7 +297,7 @@ public class Quiz2Controller : MonoBehaviour {
if (scoreValue < 0) if (scoreValue < 0)
scoreValue = 0; scoreValue = 0;
} }
scoreText.text = scoreValue.ToString(); scoreText.text = scoreValue.ToString("D3");
} }
/// <summary> /// <summary>

View File

@@ -303,7 +303,7 @@ public class Quiz4Controller : MonoBehaviour {
if (scoreValue < 0) if (scoreValue < 0)
scoreValue = 0; scoreValue = 0;
} }
scoreText.text = scoreValue.ToString(); scoreText.text = scoreValue.ToString("D3");
} }
/// <summary> /// <summary>