Forráskód Böngészése

Pre-alpha V0.2 - 8

Axel Nordh 7 éve
szülő
commit
f4ab45da75

+ 30 - 30
Assets/MainMenu.unity

@@ -1810,7 +1810,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1840243352}
   m_HandleRect: {fileID: 1840243351}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 1.0000008
   m_Size: 0.87808895
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -2689,7 +2689,6 @@ GameObject:
   - component: {fileID: 777178506}
   - component: {fileID: 777178507}
   - component: {fileID: 777178508}
-  - component: {fileID: 777178509}
   m_Layer: 5
   m_Name: LocalGamesList
   m_TagString: Untagged
@@ -2713,8 +2712,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 2.875, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 2.875, y: -0.000017172915}
+  m_SizeDelta: {x: -23, y: 190}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &777178507
 MonoBehaviour:
@@ -2761,20 +2760,6 @@ MonoBehaviour:
   m_FlexibleWidth: 1
   m_FlexibleHeight: 1
   m_LayoutPriority: 1
---- !u!114 &777178509
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 777178505}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
 --- !u!1 &783549272
 GameObject:
   m_ObjectHideFlags: 0
@@ -2924,8 +2909,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.000007705889}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0.00010313089}
+  m_SizeDelta: {x: 0, y: 10}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &825961925
 MonoBehaviour:
@@ -2942,8 +2927,8 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
+    m_Top: 5
+    m_Bottom: 5
   m_ChildAlignment: 1
   m_Spacing: 1
   m_ChildForceExpandWidth: 1
@@ -2965,7 +2950,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
-  m_VerticalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &839160372
 GameObject:
   m_ObjectHideFlags: 0
@@ -3386,8 +3371,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -429.3}
-  m_SizeDelta: {x: 711, y: 429.3}
+  m_AnchoredPosition: {x: 0, y: -379.1}
+  m_SizeDelta: {x: 711, y: 379.1}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!225 &929755090
 CanvasGroup:
@@ -3795,8 +3780,8 @@ RectTransform:
   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.5, y: -25}
-  m_SizeDelta: {x: 712, y: 151.7}
+  m_AnchoredPosition: {x: 0.5, y: -76}
+  m_SizeDelta: {x: 712, y: 111.15}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1089075784
 MonoBehaviour:
@@ -5943,8 +5928,8 @@ RectTransform:
   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: -41.025}
-  m_SizeDelta: {x: 0, y: -227.95}
+  m_AnchoredPosition: {x: 0, y: 11.9}
+  m_SizeDelta: {x: 0, y: -333.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1615883283
 MonoBehaviour:
@@ -6064,7 +6049,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 359479520}
   m_HandleRect: {fileID: 359479519}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -6122,6 +6107,7 @@ GameObject:
   - component: {fileID: 1687109498}
   - component: {fileID: 1687109500}
   - component: {fileID: 1687109497}
+  - component: {fileID: 1687109501}
   m_Layer: 5
   m_Name: Main Panel
   m_TagString: Untagged
@@ -6225,6 +6211,20 @@ MonoBehaviour:
   localGamePrefab: {fileID: 5023127887778350162, guid: e9fabf2145e478e41b3c41f4ed3306cc,
     type: 3}
   onlineGamePrefab: {fileID: 0}
+--- !u!114 &1687109501
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1687109495}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f44a77de62bef0649a10245961f7cad1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  perspectiveZoomSpeed: 0.5
+  orthoZoomSpeed: 0.5
 --- !u!1 &1698485521
 GameObject:
   m_ObjectHideFlags: 0

+ 39 - 4
Assets/Prefab/LocalGame.prefab

@@ -101,6 +101,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &577965491826448843
 GameObject:
   m_ObjectHideFlags: 0
@@ -201,6 +203,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &618395110754206352
 GameObject:
   m_ObjectHideFlags: 0
@@ -234,7 +238,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -375,6 +379,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &1147422495067119245
 GameObject:
   m_ObjectHideFlags: 0
@@ -475,6 +481,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &1227600613147041323
 GameObject:
   m_ObjectHideFlags: 0
@@ -609,6 +617,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!114 &408482090994045525
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -802,6 +812,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &2082655178611575159
 GameObject:
   m_ObjectHideFlags: 0
@@ -980,17 +992,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 671025367310041736}
@@ -1098,17 +1113,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 3024353618322409956}
@@ -1347,6 +1365,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &5023127886737789045
 GameObject:
   m_ObjectHideFlags: 0
@@ -1448,6 +1468,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &5023127886976451394
 GameObject:
   m_ObjectHideFlags: 0
@@ -1590,7 +1612,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 60}
+  m_SizeDelta: {x: -20, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5023127887778350167
 CanvasRenderer:
@@ -1644,7 +1666,7 @@ MonoBehaviour:
   m_IgnoreLayout: 0
   m_MinWidth: 300
   m_MinHeight: 60
-  m_PreferredWidth: -1
+  m_PreferredWidth: 600
   m_PreferredHeight: 120
   m_FlexibleWidth: 1
   m_FlexibleHeight: 0
@@ -1695,6 +1717,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
   m_ChildControlHeight: 1
+  m_ChildScaleWidth: 1
+  m_ChildScaleHeight: 0
 --- !u!1 &5023127887786194205
 GameObject:
   m_ObjectHideFlags: 0
@@ -2232,6 +2256,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
   m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!114 &7440494478111899729
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2467,6 +2493,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
   m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &6659332493645555649
 GameObject:
   m_ObjectHideFlags: 0
@@ -2564,7 +2592,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2648654414683390979
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2645,17 +2673,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 200170930938477676}
@@ -2870,6 +2901,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &7479828009431830729
 GameObject:
   m_ObjectHideFlags: 0
@@ -3123,6 +3156,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &8352669345201601954
 GameObject:
   m_ObjectHideFlags: 0

+ 33 - 9
Assets/Prefab/PlayerSetting.prefab

@@ -69,9 +69,9 @@ MonoBehaviour:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 14
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 10
-    m_MaxSize: 40
+    m_MaxSize: 18
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 0
@@ -180,17 +180,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 4493885812376020612}
@@ -235,9 +238,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: 100
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
+  m_MinHeight: 20
+  m_PreferredWidth: 200
+  m_PreferredHeight: 30
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -414,9 +417,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: 100
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
+  m_MinHeight: 20
+  m_PreferredWidth: 200
+  m_PreferredHeight: 30
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -432,6 +435,7 @@ GameObject:
   - component: {fileID: 4493885813332806040}
   - component: {fileID: 4493885813332805991}
   - component: {fileID: 7382202834261336664}
+  - component: {fileID: 245985020491215500}
   m_Layer: 5
   m_Name: PlayerSetting
   m_TagString: Untagged
@@ -458,7 +462,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 30}
+  m_SizeDelta: {x: 400, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4493885813332806040
 CanvasRenderer:
@@ -511,3 +515,23 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   nameText: {fileID: 4493885813120904466}
   nameInput: {fileID: 4493885812376020611}
+--- !u!114 &245985020491215500
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4493885813332805989}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 200
+  m_MinHeight: 20
+  m_PreferredWidth: 600
+  m_PreferredHeight: 30
+  m_FlexibleWidth: 1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1

+ 10 - 31
Assets/Prefab/QuestionCard.prefab

@@ -13,7 +13,6 @@ GameObject:
   - component: {fileID: 4688061370215409508}
   - component: {fileID: 4272043366978706191}
   - component: {fileID: 496125334106695266}
-  - component: {fileID: 3820892049407775847}
   - component: {fileID: 4126295651488552487}
   m_Layer: 5
   m_Name: QuestionCard
@@ -38,10 +37,10 @@ RectTransform:
   m_Father: {fileID: 0}
   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_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 180}
+  m_SizeDelta: {x: 100, y: -60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5121997675851897887
 CanvasRenderer:
@@ -99,12 +98,12 @@ MonoBehaviour:
     m_Bottom: 4
   m_ChildAlignment: 0
   m_Spacing: 2
-  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 1
+  m_ChildControlWidth: 0
   m_ChildControlHeight: 1
   m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
+  m_ChildScaleHeight: 1
 --- !u!114 &496125334106695266
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -129,26 +128,6 @@ MonoBehaviour:
   safeColor:
     serializedVersion: 2
     rgba: 3248895005
---- !u!114 &3820892049407775847
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2583734455467487379}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: -1
-  m_MinHeight: 150
-  m_PreferredWidth: 100
-  m_PreferredHeight: 200
-  m_FlexibleWidth: 0
-  m_FlexibleHeight: 1
-  m_LayoutPriority: 1
 --- !u!114 &4126295651488552487
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -281,7 +260,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1876947779286866796
 CanvasRenderer:
@@ -462,7 +441,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8861552641027936267}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 2}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6239230281463816132}
@@ -472,7 +451,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7921554056996791670
 CanvasRenderer:
@@ -529,7 +508,7 @@ MonoBehaviour:
   m_PreferredWidth: 94
   m_PreferredHeight: 50
   m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
+  m_FlexibleHeight: 1
   m_LayoutPriority: 1
 --- !u!114 &675644889844183679
 MonoBehaviour:

+ 53 - 4
Assets/Scripts/Database.cs

@@ -131,6 +131,39 @@ public class Database : MonoBehaviour {
         return games;
     }
 
+    internal void SetQuestionsLost(int gameId, string playerName, int questionsLost) {
+
+        string sql = "UPDATE localGamePlayers SET questionsLost = questionsLost + " + questionsLost + " WHERE gameId = " + gameId + " AND playerId = (SELECT id FROM localUsers WHERE  name = '" + playerName + "')";
+        IDbConnection conn = new SqliteConnection(databaseUrl);
+        conn.Open();
+        IDbCommand cmd = conn.CreateCommand();
+        cmd.CommandText = sql;
+
+        cmd.ExecuteNonQuery();
+
+        cmd.Dispose();
+        conn.Close();
+        
+    }
+
+    internal void RemoveGame(int gameId) {
+        string sql = "DELETE FROM game WHERE id = " + gameId;
+
+        List<LocalGameScript> games = new List<LocalGameScript>();
+        IDbConnection conn = new SqliteConnection(databaseUrl);
+        conn.Open();
+        IDbCommand cmd = conn.CreateCommand();
+        cmd.CommandText = sql;
+        cmd.ExecuteNonQuery();
+        
+        string deleteLockedQuestionsSql = "DELETE FROM usersLockedQuestions WHERE gameId = " + gameId;
+        cmd.CommandText = deleteLockedQuestionsSql;
+        cmd.ExecuteNonQuery();
+
+        cmd.Dispose();
+        conn.Close();
+    }
+
     public string GetCurrentPlayer(int gameId) {
         string sql = "SELECT currentPlayer FROM game WHERE id = " + gameId;
         IDbConnection conn = new SqliteConnection(databaseUrl);
@@ -249,19 +282,17 @@ public class Database : MonoBehaviour {
 
     public void SetLocalOrOnline(string type) {
         gameMode = type;
-        string databaseName = "narKampenLocal.db";
         if (type.Equals("Local")) {
+            string databaseName = "narKampenLocal.db";
             if (Application.platform == RuntimePlatform.Android) {
                 databaseUrl = Application.persistentDataPath + "/" + databaseName;
 
                 if (!File.Exists(databaseUrl)) {
                     UnityWebRequest load = UnityWebRequest.Get("jar:file://" + Application.dataPath + "!/assets/" + databaseName);
-                    // WWW load = new WWW("jar:file://" + Application.dataPath + "!/assets/" + databaseName);
-                    //while (!load.isDone) { }
                     load.SendWebRequest();
+                    while (!load.isDone) { }
 
                     File.WriteAllBytes(databaseUrl, load.downloadHandler.data);
-                    //File.WriteAllBytes(databaseUrl, load.bytes);
                 }
                 databaseUrl = "URI=file:" + databaseUrl;
             } else {
@@ -273,6 +304,24 @@ public class Database : MonoBehaviour {
         connectionType = type;
     }
 
+    internal int GetQuestionsLost(int gameId, string playerName) {
+        string sql = "SELECT questionsLost FROM localGamePlayers WHERE gameId = " + gameId + " AND playerId = (SELECT id from localUsers WHERE name = '" + playerName + "')";
+        IDbConnection conn = new SqliteConnection(databaseUrl);
+        conn.Open();
+        IDbCommand cmd = conn.CreateCommand();
+        cmd.CommandText = sql;
+        IDataReader reader = cmd.ExecuteReader();
+        int returnValue = 0;
+        while (reader.Read()) {
+             returnValue = reader.GetInt32(0);
+        }
+        reader.Close();
+        cmd.Dispose();
+        conn.Close();
+
+        return returnValue;
+    }
+
     public string GetGameMode(int gameId) {
         if (this.gameMode == null) {
             string sql = "SELECT gameMode FROM game WHERE id = " + gameId;

+ 1 - 1
Assets/Scripts/Draggable.cs

@@ -89,7 +89,7 @@ public class Draggable : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
         le.flexibleWidth = this.GetComponent<LayoutElement>().flexibleWidth;
         le.minHeight = this.GetComponent<LayoutElement>().minHeight;
         le.minWidth = this.GetComponent<LayoutElement>().minWidth;
-
+        
         placeholder.transform.SetSiblingIndex(this.transform.GetSiblingIndex());
 
         parent = this.transform.parent;

+ 10 - 2
Assets/Scripts/GameManagerScript.cs

@@ -9,12 +9,12 @@ public class GameManagerScript : MonoBehaviour {
     private string gameMode;
 
     public Database db;
+    StatsScript statsScript;
      
     public string GameMode { get => gameMode; set => gameMode = value; }
     public int GameId { get; internal set; }
 
     List<KeyValuePair<string, int>> players;
-
     // Start is called before the first frame update
     void Start() {
         db = GameObject.Find("GameManager").GetComponent<Database>();
@@ -22,7 +22,7 @@ public class GameManagerScript : MonoBehaviour {
 
         db.SetLocalOrOnline("Local");
         db.SetLastPlayedDate(GameId);
-        StatsScript statsScript = GameObject.Find("StatsPanel").GetComponent<StatsScript>();
+        statsScript = GameObject.Find("StatsPanel").GetComponent<StatsScript>();
 
     }
 
@@ -31,6 +31,14 @@ public class GameManagerScript : MonoBehaviour {
         return players;
     }
 
+    public void UpdateQuestiosLost(int questionsLost, string playerName) {
+        db.SetQuestionsLost(GameId, playerName, questionsLost);
+    }
+
+    public void UpdateQuestionsInAnswerLine(string playerName, int count) {
+        
+    }
+
     public List<KeyValuePair<string, int>> GetPlayers() {
         if (players == null) {
             players = GetPlayersForGame();

+ 8 - 8
Assets/Scripts/InformationPanelScript.cs

@@ -1,18 +1,18 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class InformationPanelScript : MonoBehaviour
 {
+    public Button quitButton;
+    public Text currentPlayerText;
     // Start is called before the first frame update
-    void Start()
-    {
-        
+    void Start() {
+        quitButton.onClick.AddListener(() => { Application.Quit(); });
     }
 
-    // Update is called once per frame
-    void Update()
-    {
-        
+    public void SetCurrentPlayer(string playerName) {
+        currentPlayerText.text = playerName;
     }
-}
+}

+ 7 - 1
Assets/Scripts/LocalGameScript.cs

@@ -40,9 +40,12 @@ public class LocalGameScript : MonoBehaviour
     public string FinishedDate { get => finishedDateText.text; set => finishedDateText.text = value; }
     public List<KeyValuePair<string, int>> Players { get => players; set => players = value; }
 
+    private Database db;
+
     private void Start() {
         startButton.onClick.AddListener(StartThisGame);
         deleteButton.onClick.AddListener(DeleteThisGame);
+        db = GameObject.Find("Main Panel").GetComponent<Database>();
     }
 
     public void AddPlayer(string name, int points) {
@@ -69,6 +72,9 @@ public class LocalGameScript : MonoBehaviour
     }
 
     public void DeleteThisGame() {
-        Debug.Log("CLicked button to delete game");
+        db.RemoveGame(gameId);
+        Destroy(this);
+        Destroy(this.gameObject);
     }
+
 }

+ 46 - 0
Assets/Scripts/PinchZoom.cs

@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PinchZoom : MonoBehaviour
+{
+    public float perspectiveZoomSpeed = 0.5f;
+    public float orthoZoomSpeed = 0.5f;
+
+    // Update is called once per frame
+    void Update() {
+        // If there are two touches on the device...
+        if (Input.touchCount == 2) {
+            // Store both touches.
+            Touch touchZero = Input.GetTouch(0);
+            Touch touchOne = Input.GetTouch(1);
+
+            // Find the position in the previous frame of each touch.
+            Vector2 touchZeroPrevPos = touchZero.position - touchZero.deltaPosition;
+            Vector2 touchOnePrevPos = touchOne.position - touchOne.deltaPosition;
+
+            // Find the magnitude of the vector (the distance) between the touches in each frame.
+            float prevTouchDeltaMag = (touchZeroPrevPos - touchOnePrevPos).magnitude;
+            float touchDeltaMag = (touchZero.position - touchOne.position).magnitude;
+
+            // Find the difference in the distances between each frame.
+            float deltaMagnitudeDiff = prevTouchDeltaMag - touchDeltaMag;
+
+            Camera camera = GetComponent<Camera>();
+            // If the camera is orthographic...
+            if (camera.orthographic) {
+                // ... change the orthographic size based on the change in distance between the touches.
+                camera.orthographicSize += deltaMagnitudeDiff * orthoZoomSpeed;
+
+                // Make sure the orthographic size never drops below zero.
+                camera.orthographicSize = Mathf.Max(camera.orthographicSize, 0.1f);
+            } else {
+                // Otherwise change the field of view based on the change in distance between the touches.
+                camera.fieldOfView += deltaMagnitudeDiff * perspectiveZoomSpeed;
+
+                // Clamp the field of view to make sure it's between 0 and 180.
+                camera.fieldOfView = Mathf.Clamp(camera.fieldOfView, 0.1f, 179.9f);
+            }
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/PinchZoom.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f44a77de62bef0649a10245961f7cad1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 22 - 0
Assets/Scripts/PrivacyPolicy.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class PrivacyPolicy : MonoBehaviour
+{
+    Button pp;
+    private string privacyPolicyLink = "http://nordh.xyz/narKampen/PrivacyPolicy/privacy_policy.html";
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        pp = this.GetComponent<Button>();
+        pp.onClick.AddListener(OpenWebpage);
+    }
+
+    private void OpenWebpage() {
+        Application.OpenURL(privacyPolicyLink);
+    }
+}

+ 11 - 0
Assets/Scripts/PrivacyPolicy.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 20a2634fd8ac11147acda3ec6c32efc1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 14 - 5
Assets/Scripts/ScrollViewScript.cs

@@ -21,6 +21,8 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
     GameManagerScript gameManagerScript;
     TimerScript ts;
 
+    InformationPanelScript ips;
+
     string currentPlayer;
 
     // Start is called before the first frame update
@@ -36,11 +38,16 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
         gameId = gameManagerScript.GameId;
         currentPlayer = db.GetCurrentPlayer(gameId);
 
+        ips = GameObject.Find("InformationPanel").GetComponent<InformationPanelScript>();
+        ips.SetCurrentPlayer(currentPlayer);
+
         statsScript.MakeBold(currentPlayer);
 
         List<QuestionCard> answerlineQuestions = db.GetPlayerQuestions(gameId, currentPlayer);
         SetQuestionsInAnswerLine(answerlineQuestions);
 
+        statsScript.SetQuestionsLost(db.GetQuestionsLost(gameId, currentPlayer));
+
         SetNewQuestion(db.GetNewQuestion());
         ResetNewQuestionPosition();
         ts.ResetTimer();
@@ -119,7 +126,7 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
 
 
             if (answeredCorrectly) {
-                GameObject.Find("RoundButtons").GetComponent<RoundButtonsScript>().ShowPanel();
+                GameObject.Find("NewQuestionButtonPanel").GetComponent<RoundButtonsScript>().ShowPanel();
                 nq.GetComponent<CanvasGroup>().alpha = 0;
                 CheckWin();
                 ts.StopTimer();
@@ -152,7 +159,7 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
             GenericDialog dialog = GenericDialog.Instance();
             dialog.title.text = "You won!";
             dialog.message.text = "You reached the goal of " + db.GetWinCondition(gameId) + " first, " +
-                "you lost " + GameObject.Find("questionsLostStat").GetComponent<StatsLine>().GetValue() + " questions from your answer to unlocked questions. " +
+                "you lost " + statsScript.GetQuestionsLost() + " questions from your answer to unlocked questions. " +
                 "It took " + db.GetRoundValue(gameId) + " rounds";
             dialog.SetOnAccept("YEAY!", () => { dialog.Hide(); db.SetFinishedDate(gameId, DateTime.Today.ToShortDateString()); });
             dialog.Show();
@@ -176,10 +183,9 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
                 Destroy(q.gameObject);
             }
         }
-        StatsLine questionsLost = GameObject.Find("questionsLost").GetComponent<StatsLine>();
-        questionsLost.SetStatValue(Int32.Parse(questionsLost.GetValue() + lostQuestions).ToString());
 
-        statsScript.SetQuestionsInAnswerLine(currentPlayer, contentPanel.childCount - lostQuestions); //TODO
+        gameManagerScript.UpdateQuestiosLost(lostQuestions, currentPlayer);
+        statsScript.SetQuestionsInAnswerLine(currentPlayer, contentPanel.childCount - lostQuestions);
     }
 
     void YesFunction() {
@@ -266,8 +272,11 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
             List<QuestionCard> questions = db.GetPlayerQuestions(gameId, currentPlayer);
             SetQuestionsInAnswerLine(questions);
 
+            statsScript.SetQuestionsLost(db.GetQuestionsLost(gameManagerScript.GameId, currentPlayer));
+
             statsScript.MakeBold(currentPlayer);
             db.SetCurrentPlayer(gameId, currentPlayer);
+            ips.SetCurrentPlayer(currentPlayer);
             ResetNewQuestionPosition();
             SetNewQuestion(db.GetNewQuestion());
             ts.StartTimer();

+ 11 - 1
Assets/Scripts/StatsLine.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
@@ -17,6 +18,10 @@ public class StatsLine : MonoBehaviour
         statValue.text = value;
     }
 
+    public void SetStatValue(int value) {
+        statValue.text = value.ToString();
+    }
+
 
     public string GetName() {
         return statName.text;
@@ -24,6 +29,11 @@ public class StatsLine : MonoBehaviour
     public string GetValue() {
         return statValue.text;
     }
+
+    public int GetIntValue() {
+        Int32.TryParse(statValue.text, out int returnValue);
+        return returnValue;
+    }
     
     public void MakeBold() {
         statName.fontStyle = FontStyle.Bold;

+ 13 - 5
Assets/Scripts/StatsScript.cs

@@ -34,7 +34,7 @@ public class StatsScript : MonoBehaviour {
 
         StatsLine lostQuestions = CreateStatLine();
         lostQuestions.SetStatName("Questions lost");
-        lostQuestions.SetStatValue("0");
+        lostQuestions.SetStatValue(0);
         lostQuestions.name = "questionsLost";
 
         StatsLine playerTitle = CreateStatLine();
@@ -60,7 +60,7 @@ public class StatsScript : MonoBehaviour {
         foreach (KeyValuePair<string, int> player in players) {
             StatsLine p = CreateStatLine();
             p.SetStatName(player.Key);
-            p.SetStatValue(player.Value.ToString());
+            p.SetStatValue(player.Value);
 
             statLines.Add(p);
         }
@@ -71,7 +71,7 @@ public class StatsScript : MonoBehaviour {
             if (sl.GetName().Equals("Round")) {
                 Int32.TryParse(sl.GetValue(), out int round);
                 round++;
-                sl.SetStatValue(round.ToString());
+                sl.SetStatValue(round);
                 break;
             }
         }
@@ -90,10 +90,18 @@ public class StatsScript : MonoBehaviour {
     public void SetQuestionsInAnswerLine(string playerName, int count) {
         foreach (StatsLine sl in statLines) {
             if (sl.GetName().Equals(playerName)) {
-                sl.SetStatValue(count.ToString()) ;
+                sl.SetStatValue(count) ;
                 break;
             } 
         }
-        return;
+    }
+
+    public void SetQuestionsLost(int questionsLost) {
+        StatsLine sl =  statLines.Find(s => s.GetName().Equals("Questions lost"));
+        sl.SetStatValue(questionsLost);
+    }
+
+    public int GetQuestionsLost() {
+        return statLines.Find(s => s.GetName().Equals("Questions lost")).GetIntValue();
     }
 }

BIN
Assets/StreamingAssets/narKampenLocal.db


+ 214 - 7
Assets/User.unity

@@ -54,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 0
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
-    serializedVersion: 10
+    serializedVersion: 12
     m_Resolution: 2
     m_BakeResolution: 40
     m_AtlasSize: 1024
@@ -62,6 +62,7 @@ LightmapSettings:
     m_AOMaxDistance: 1
     m_CompAOExponent: 1
     m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
     m_Padding: 2
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
@@ -76,10 +77,16 @@ LightmapSettings:
     m_PVRDirectSampleCount: 32
     m_PVRSampleCount: 500
     m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 500
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 2
+    m_PVRDenoiserTypeDirect: 0
+    m_PVRDenoiserTypeIndirect: 0
+    m_PVRDenoiserTypeAO: 0
     m_PVRFilterTypeDirect: 0
     m_PVRFilterTypeIndirect: 0
     m_PVRFilterTypeAO: 0
-    m_PVRFilteringMode: 1
+    m_PVREnvironmentMIS: 0
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
     m_PVRFilteringGaussRadiusIndirect: 5
@@ -88,6 +95,7 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
     m_ShowResolutionOverlay: 1
+    m_ExportTrainingData: 0
   m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
@@ -150,9 +158,10 @@ Camera:
   m_ClearFlags: 1
   m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
   m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
-  m_GateFitMode: 2
   m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
@@ -257,17 +266,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 39834639}
@@ -554,7 +566,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
-    m_Mode: 4
+    m_Mode: 2
     m_SelectOnUp: {fileID: 1437897727}
     m_SelectOnDown: {fileID: 1421835109}
     m_SelectOnLeft: {fileID: 0}
@@ -564,17 +576,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 231128499}
@@ -1352,17 +1367,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 760699002}
@@ -1719,7 +1737,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
-    m_Mode: 4
+    m_Mode: 0
     m_SelectOnUp: {fileID: 760699001}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -1729,17 +1747,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 918568528}
@@ -1785,6 +1806,165 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 918568525}
   m_CullTransparentMesh: 0
+--- !u!1 &1158075059
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1158075060}
+  - component: {fileID: 1158075065}
+  - component: {fileID: 1158075064}
+  - component: {fileID: 1158075063}
+  - component: {fileID: 1158075062}
+  - component: {fileID: 1158075061}
+  m_Layer: 5
+  m_Name: PrivacyPolicy
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1158075060
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1158075059}
+  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: 1262297231}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!114 &1158075061
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1158075059}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20a2634fd8ac11147acda3ec6c32efc1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1158075062
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1158075059}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 0
+    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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1158075064}
+  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 &1158075063
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1158075059}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!114 &1158075064
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1158075059}
+  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.07075471, g: 0.3227817, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 2
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Privacy Policy
+--- !u!222 &1158075065
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1158075059}
+  m_CullTransparentMesh: 0
 --- !u!1 &1172685347
 GameObject:
   m_ObjectHideFlags: 0
@@ -2045,6 +2225,7 @@ RectTransform:
   - {fileID: 918568526}
   - {fileID: 1533972002}
   - {fileID: 108694396}
+  - {fileID: 1158075060}
   m_Father: {fileID: 1551309669}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2262,7 +2443,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
-    m_Mode: 4
+    m_Mode: 0
     m_SelectOnUp: {fileID: 231128498}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -2272,17 +2453,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 1421835110}
@@ -2381,7 +2565,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
-    m_Mode: 4
+    m_Mode: 2
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 231128498}
     m_SelectOnLeft: {fileID: 0}
@@ -2391,17 +2575,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 1437897728}
@@ -2555,6 +2742,7 @@ GameObject:
   - component: {fileID: 1551309671}
   - component: {fileID: 1551309670}
   - component: {fileID: 1551309672}
+  - component: {fileID: 1551309673}
   m_Layer: 5
   m_Name: Main Panel
   m_TagString: Untagged
@@ -2643,6 +2831,22 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
   m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+--- !u!114 &1551309673
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1551309668}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f44a77de62bef0649a10245961f7cad1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  perspectiveZoomSpeed: 0.5
+  orthoZoomSpeed: 0.5
 --- !u!1 &1634757285
 GameObject:
   m_ObjectHideFlags: 0
@@ -3001,17 +3205,20 @@ MonoBehaviour:
     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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 2118721991}

+ 340 - 87
Assets/narKampen.unity

@@ -583,7 +583,7 @@ CanvasGroup:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 162320633}
   m_Enabled: 1
-  m_Alpha: 1
+  m_Alpha: 0
   m_Interactable: 1
   m_BlocksRaycasts: 0
   m_IgnoreParentGroups: 0
@@ -620,8 +620,8 @@ RectTransform:
   m_Father: {fileID: 249496648}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -652,18 +652,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 5
-    m_Right: 5
+    m_Left: 30
+    m_Right: 30
     m_Top: 5
     m_Bottom: 5
   m_ChildAlignment: 4
   m_Spacing: 4
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 1
+  m_ChildControlWidth: 0
   m_ChildControlHeight: 1
   m_ChildScaleWidth: 1
-  m_ChildScaleHeight: 1
+  m_ChildScaleHeight: 0
 --- !u!114 &189632757
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1136,6 +1136,32 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 432797762}
   m_CullTransparentMesh: 0
+--- !u!1 &495995982 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4662818861115959987, guid: e91b5c1a341f8be469b7bab25ee954d7,
+    type: 3}
+  m_PrefabInstance: {fileID: 1227112758}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &495995989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 495995982}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: 1
+  m_FlexibleHeight: 1
+  m_LayoutPriority: 1
 --- !u!1 &614296909
 GameObject:
   m_ObjectHideFlags: 0
@@ -1410,6 +1436,85 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &705148539
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 705148540}
+  - component: {fileID: 705148542}
+  - component: {fileID: 705148541}
+  m_Layer: 5
+  m_Name: Titel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &705148540
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705148539}
+  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: 1265518384}
+  m_RootOrder: 1
+  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: 0}
+  m_SizeDelta: {x: 200, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &705148541
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705148539}
+  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: 14
+    m_FontStyle: 1
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "N\xE4r Kampen"
+--- !u!222 &705148542
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705148539}
+  m_CullTransparentMesh: 0
 --- !u!1 &815165975
 GameObject:
   m_ObjectHideFlags: 0
@@ -1951,6 +2056,85 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 964027517}
   m_CullTransparentMesh: 0
+--- !u!1 &1052864995
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1052864996}
+  - component: {fileID: 1052864998}
+  - component: {fileID: 1052864997}
+  m_Layer: 5
+  m_Name: CurrentPlayer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1052864996
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1052864995}
+  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: 1265518384}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 200, y: 30}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &1052864997
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1052864995}
+  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: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Current Player
+--- !u!222 &1052864998
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1052864995}
+  m_CullTransparentMesh: 0
 --- !u!1 &1091517007
 GameObject:
   m_ObjectHideFlags: 0
@@ -2198,6 +2382,32 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1158019579}
   m_CullTransparentMesh: 0
+--- !u!1 &1168563639 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5145380997340698413, guid: e91b5c1a341f8be469b7bab25ee954d7,
+    type: 3}
+  m_PrefabInstance: {fileID: 1227112758}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1168563643
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1168563639}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: 50
+  m_PreferredWidth: -1
+  m_PreferredHeight: 150
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: 1
+  m_LayoutPriority: 1
 --- !u!1001 &1227112758
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2283,7 +2493,7 @@ PrefabInstance:
     - target: {fileID: 1781451649244772801, guid: e91b5c1a341f8be469b7bab25ee954d7,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 180
+      value: -40
       objectReference: {fileID: 0}
     - target: {fileID: 1781451649244772801, guid: e91b5c1a341f8be469b7bab25ee954d7,
         type: 3}
@@ -2293,7 +2503,7 @@ PrefabInstance:
     - target: {fileID: 1781451649244772801, guid: e91b5c1a341f8be469b7bab25ee954d7,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1781451649244772801, guid: e91b5c1a341f8be469b7bab25ee954d7,
         type: 3}
@@ -2303,7 +2513,7 @@ PrefabInstance:
     - target: {fileID: 1781451649244772801, guid: e91b5c1a341f8be469b7bab25ee954d7,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1781451649244772801, guid: e91b5c1a341f8be469b7bab25ee954d7,
         type: 3}
@@ -2320,6 +2530,16 @@ PrefabInstance:
       propertyPath: parent
       value: 
       objectReference: {fileID: 1119394965}
+    - target: {fileID: 7933561225938041952, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: placeholder
+      value: 
+      objectReference: {fileID: 495995982}
+    - target: {fileID: 7933561225938041952, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: placeholderParent
+      value: 
+      objectReference: {fileID: 189632754}
     - target: {fileID: 5145380996076868372, guid: e91b5c1a341f8be469b7bab25ee954d7,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -2370,7 +2590,98 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    - target: {fileID: 8491633767315704838, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_ChildScaleHeight
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997340698410, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997340698410, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -6
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997340698410, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997340698410, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997340698410, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997340698410, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997340698410, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -6
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997340698410, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997204476516, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997204476516, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997204476516, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997204476516, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997204476516, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997204476516, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997204476516, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997204476516, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5145380997204476516, guid: e91b5c1a341f8be469b7bab25ee954d7,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 3652310416093541855, guid: e91b5c1a341f8be469b7bab25ee954d7, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: e91b5c1a341f8be469b7bab25ee954d7, type: 3}
 --- !u!224 &1227112759 stripped
 RectTransform:
@@ -2516,6 +2827,7 @@ GameObject:
   - component: {fileID: 1265518387}
   - component: {fileID: 1265518386}
   - component: {fileID: 1265518385}
+  - component: {fileID: 1265518388}
   m_Layer: 5
   m_Name: InformationPanel
   m_TagString: Untagged
@@ -2534,7 +2846,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 1477492308}
+  - {fileID: 1052864996}
+  - {fileID: 705148540}
   - {fileID: 1848882435}
   m_Father: {fileID: 329904626}
   m_RootOrder: 0
@@ -2601,6 +2914,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1265518383}
   m_CullTransparentMesh: 0
+--- !u!114 &1265518388
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1265518383}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6ae6755aa613f534c8c5b5481c953a6d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  quitButton: {fileID: 1848882436}
+  currentPlayerText: {fileID: 1052864997}
 --- !u!1 &1283900510
 GameObject:
   m_ObjectHideFlags: 0
@@ -2830,80 +3157,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -20, y: -20}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1477492307
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1477492308}
-  - component: {fileID: 1477492310}
-  - component: {fileID: 1477492309}
-  m_Layer: 5
-  m_Name: UserInformation
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1477492308
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1477492307}
-  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: 1265518384}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -50, y: 0}
-  m_SizeDelta: {x: -100, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1477492309
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1477492307}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
-  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: 10907, 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
-  m_UseSpriteMesh: 0
---- !u!222 &1477492310
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1477492307}
-  m_CullTransparentMesh: 0
 --- !u!1 &1490060584
 GameObject:
   m_ObjectHideFlags: 0
@@ -3617,7 +3870,7 @@ RectTransform:
   m_Children:
   - {fileID: 877975417}
   m_Father: {fileID: 1265518384}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}

BIN
Assets/narKampenLocal.db


+ 8 - 5
ProjectSettings/ProjectSettings.asset

@@ -55,8 +55,8 @@ PlayerSettings:
   iosAppInBackgroundBehavior: 0
   displayResolutionDialog: 1
   iosAllowHTTPDownload: 1
-  allowedAutorotateToPortrait: 1
-  allowedAutorotateToPortraitUpsideDown: 1
+  allowedAutorotateToPortrait: 0
+  allowedAutorotateToPortraitUpsideDown: 0
   allowedAutorotateToLandscapeRight: 1
   allowedAutorotateToLandscapeLeft: 1
   useOSAutorotation: 1
@@ -118,7 +118,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1
+  bundleVersion: 0.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -161,7 +161,7 @@ PlayerSettings:
   applicationIdentifier:
     Android: se.axelnordh.narkampen
   buildNumber: {}
-  AndroidBundleVersionCode: 4
+  AndroidBundleVersionCode: 8
   AndroidMinSdkVersion: 16
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
@@ -381,7 +381,10 @@ PlayerSettings:
     m_EncodingQuality: 1
   - m_BuildTarget: PS4
     m_EncodingQuality: 1
-  m_BuildTargetGroupLightmapSettings: []
+  m_BuildTargetGroupLightmapSettings:
+  - m_BuildTarget: Android
+    m_TextureStreamingEnabled: 1
+    m_TextureStreamingPriority: 0
   playModeTestRunnerEnabled: 0
   runPlayModeTestAsEditModeTest: 0
   actionOnDotNetUnhandledException: 1

BIN
narKampen.aab


BIN
narKampenV0.2-8-0.2-v8.symbols.zip