Jelajahi Sumber

efter första release, fucked up, redo..

Axel Nordh 7 tahun lalu
induk
melakukan
1569f7b317

TEMPAT SAMPAH
Assets/Images/GameIcon.png


+ 88 - 0
Assets/Images/GameIcon.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: bf12e139794f4d54b9b71699c524a038
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 87d2e18780d81a74cb19a68997bf01f1
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

TEMPAT SAMPAH
Assets/Images/GameIcon.xcf


+ 7 - 0
Assets/Images/GameIcon.xcf.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5592aca8dda49984ba98996e1d70d4a5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff ditekan karena terlalu besar
+ 541 - 135
Assets/MainMenu.unity


File diff ditekan karena terlalu besar
+ 680 - 74
Assets/Prefab/LocalGame.prefab


+ 0 - 76
Assets/Prefab/Panel.prefab

@@ -1,76 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &7460299730061661032
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5371510168798060342}
-  - component: {fileID: 6579300692378601676}
-  - component: {fileID: 7975703466908185607}
-  m_Layer: 5
-  m_Name: Panel
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5371510168798060342
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7460299730061661032}
-  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: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6579300692378601676
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7460299730061661032}
-  m_CullTransparentMesh: 0
---- !u!114 &7975703466908185607
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7460299730061661032}
-  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

+ 35 - 11
Assets/Prefab/PlayerInfo.prefab

@@ -13,6 +13,7 @@ GameObject:
   - component: {fileID: 3980037200411588144}
   - component: {fileID: 487875939721856792}
   - component: {fileID: 7062300083992947690}
+  - component: {fileID: 4462619395977117909}
   m_Layer: 5
   m_Name: PlayerInfo
   m_TagString: Untagged
@@ -112,6 +113,29 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   nameText: {fileID: 8502294024371270356}
   pointsText: {fileID: 8380995092262412217}
+--- !u!114 &4462619395977117909
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1668827557623854269}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 5
+    m_Right: 5
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 2
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 0
 --- !u!1 &2189208103802656590
 GameObject:
   m_ObjectHideFlags: 0
@@ -145,10 +169,10 @@ RectTransform:
   m_Father: {fileID: 8182258568001242865}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 5, y: 0}
-  m_SizeDelta: {x: 190, y: 16}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 16}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2950324220866648863
 CanvasRenderer:
@@ -205,9 +229,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
-  m_MinWidth: 100
+  m_MinWidth: 50
   m_MinHeight: -1
-  m_PreferredWidth: 150
+  m_PreferredWidth: 100
   m_PreferredHeight: -1
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1
@@ -245,10 +269,10 @@ RectTransform:
   m_Father: {fileID: 8182258568001242865}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -0.000015258789, y: 0}
-  m_SizeDelta: {x: 102, y: 16}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8850173315071199892
 CanvasRenderer:
@@ -307,7 +331,7 @@ MonoBehaviour:
   m_IgnoreLayout: 0
   m_MinWidth: 0
   m_MinHeight: -1
-  m_PreferredWidth: 60
+  m_PreferredWidth: 25
   m_PreferredHeight: -1
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1

+ 11 - 9
Assets/Prefab/QuestionCard.prefab

@@ -103,6 +103,8 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
   m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!114 &496125334106695266
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -194,10 +196,10 @@ RectTransform:
   m_Father: {fileID: 7200334351305752922}
   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: 0, y: -0.000019491}
-  m_SizeDelta: {x: 88, y: 123.53}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -10, y: -10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7378609231691140005
 CanvasRenderer:
@@ -232,7 +234,7 @@ MonoBehaviour:
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 1
-    m_MinSize: 10
+    m_MinSize: 8
     m_MaxSize: 18
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -385,10 +387,10 @@ RectTransform:
   m_Father: {fileID: 6622248623755758832}
   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: 0, y: 0.00073558}
-  m_SizeDelta: {x: 92, y: 46.7}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -10, y: -10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &635772643756194019
 CanvasRenderer:

+ 277 - 0
Assets/Prefab/StatsLine.prefab

@@ -0,0 +1,277 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1110996546943796457
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2683372069544661878}
+  - component: {fileID: 5385695372056896213}
+  - component: {fileID: 3503155882699649392}
+  m_Layer: 5
+  m_Name: StatValue
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2683372069544661878
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1110996546943796457}
+  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: 5258109456492476191}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5385695372056896213
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1110996546943796457}
+  m_CullTransparentMesh: 0
+--- !u!114 &3503155882699649392
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1110996546943796457}
+  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: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: StatValue
+--- !u!1 &3520506932150161392
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5615812260655658477}
+  - component: {fileID: 2579321090774548123}
+  - component: {fileID: 8532515255562604759}
+  m_Layer: 5
+  m_Name: StatName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5615812260655658477
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3520506932150161392}
+  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: 5258109456492476191}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2579321090774548123
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3520506932150161392}
+  m_CullTransparentMesh: 0
+--- !u!114 &8532515255562604759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3520506932150161392}
+  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: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: StatName
+--- !u!1 &4647862445024647967
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5258109456492476191}
+  - component: {fileID: 7830958166291710495}
+  - component: {fileID: 4954664034366436600}
+  - component: {fileID: 3481210091842867662}
+  - component: {fileID: 6589157768217286903}
+  m_Layer: 5
+  m_Name: StatsLine
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5258109456492476191
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4647862445024647967}
+  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:
+  - {fileID: 5615812260655658477}
+  - {fileID: 2683372069544661878}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7830958166291710495
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4647862445024647967}
+  m_CullTransparentMesh: 0
+--- !u!114 &4954664034366436600
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4647862445024647967}
+  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!114 &3481210091842867662
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4647862445024647967}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 2
+    m_Right: 2
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 3
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 1
+  m_ChildScaleHeight: 0
+--- !u!114 &6589157768217286903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4647862445024647967}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bce9229b765bf3f4384e007ca2477cf8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  statName: {fileID: 8532515255562604759}
+  statValue: {fileID: 3503155882699649392}

+ 1 - 1
Assets/Prefab/Panel.prefab.meta → Assets/Prefab/StatsLine.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6b33d2abce98c0b4c8c66bd6287f19e9
+guid: 534976da5d7fe5d4bb2528ea394a0258
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 96 - 29
Assets/Scripts/Database.cs

@@ -5,6 +5,7 @@ using Mono.Data.Sqlite;
 using System.Data;
 using System;
 using UnityEngine.Networking;
+using System.IO;
 
 public class Database : MonoBehaviour {
     string connectionType;
@@ -27,11 +28,23 @@ public class Database : MonoBehaviour {
         public List<Question> questionsList = new List<Question>();
     }
 
+    internal void SetLastPlayedDate(int gameId) {
+        string sql = "UPDATE game SET lastPlayedDate = DATE() WHERE id = " + gameId;
+        IDbConnection conn = new SqliteConnection(databaseUrl);
+        conn.Open();
+        IDbCommand cmd = conn.CreateCommand();
+        cmd.CommandText = sql;
+        cmd.ExecuteNonQuery();
+
+        cmd.Dispose();
+        conn.Close();
+    }
+
     string questionString = "";
     string answerString = "";
     string idString = "";
     string categoryString = "";
-    private int round;
+    private int round = -1;
 
     public string QuestionString { get => questionString; set => questionString = value; }
 
@@ -70,37 +83,43 @@ public class Database : MonoBehaviour {
 
     internal List<LocalGameScript> GetLocalGames(GameObject prefab) {
         List<LocalGameScript> games = new List<LocalGameScript>();
-        string sql = "SELECT game.*, name,count(name) as points, localUsers.id FROM game INNER JOIN localGamePlayers on game.id = localGamePlayers.gameId INNER JOIN localUsers on playerId = localUsers.id INNER JOIN usersLockedQuestions ON name = usersLockedQuestions.playerName GROUP BY name order by points ASC;";
+        string sql = "SELECT game.*, name, localUsers.id as userId FROM game INNER JOIN localGamePlayers on game.id = localGamePlayers.gameId INNER JOIN localUsers on playerId = localUsers.id order by game.id ASC, userId ASC";
         IDbConnection conn = new SqliteConnection(databaseUrl);
         conn.Open();
         IDbCommand cmd = conn.CreateCommand();
         cmd.CommandText = sql;
         IDataReader reader = cmd.ExecuteReader();
         int currentGame = -1;
-        GameObject localGame = Instantiate(prefab, new Vector2(0, 0), Quaternion.identity) as GameObject;
-        LocalGameScript lgs = localGame.GetComponent<LocalGameScript>();
+        GameObject localGame;// = Instantiate(prefab, new Vector2(0, 0), Quaternion.identity) as GameObject;
+        LocalGameScript lgs = null;//= localGame.GetComponent<LocalGameScript>();
 
+        string currentPlayerName = "";
+        int currentPoints = 0;
         while (reader.Read()) {
 
 
-            if (currentGame == reader.GetInt32(0)) {
-                lgs.AddPlayer(reader.GetString(10), reader.GetInt32(11));
-            } else {
+            if (currentGame != reader.GetInt32(0)) {
                 localGame = Instantiate(prefab, new Vector2(0, 0), Quaternion.identity) as GameObject;
                 lgs = localGame.GetComponent<LocalGameScript>();
 
                 lgs.GameId = reader.GetInt32(0);
                 lgs.GameMode = reader.GetString(1);
-                lgs.QuestionsNeededToWin = reader.GetInt32(2);
+                lgs.QuestionsNeededToWin = reader.GetInt32(2).ToString();
                 lgs.AnswerTimer = reader.GetInt32(3);
-                lgs.NumberOfPlayers = reader.GetInt32(4);
+                lgs.NumberOfPlayers = reader.GetInt32(4).ToString();
                 lgs.CurrentPlayer = reader.GetString(5);
-                lgs.Round = reader.GetInt32(6);
+                lgs.Round = reader.GetInt32(6).ToString();
                 lgs.StartDate = reader.GetValue(7) != DBNull.Value ? reader.GetString(7) : "";
                 lgs.LastPlayedDate = reader.GetValue(8) != DBNull.Value ? reader.GetString(8) : "";
                 lgs.FinishedDate = reader.GetValue(9) != DBNull.Value ? reader.GetString(9) : "";
-                lgs.AddPlayer(reader.GetString(10), reader.GetInt32(11));
+                currentPlayerName = reader.GetString(10);
+                currentPoints = GetPlayerPoints(reader.GetInt32(0), currentPlayerName);
+                lgs.AddPlayer(currentPlayerName, currentPoints);
                 games.Add(lgs);
+            } else if (currentGame == reader.GetInt32(0)) {
+                currentPlayerName = reader.GetString(10);
+                currentPoints = GetPlayerPoints(currentGame, currentPlayerName);
+                lgs.AddPlayer(currentPlayerName, currentPoints);
             }
 
             currentGame = reader.GetInt32(0);
@@ -143,6 +162,25 @@ public class Database : MonoBehaviour {
         conn.Close();
     }
 
+    internal int GetPlayerPoints(int gameId, string playerName) {
+        string sql = "SELECT count(*) FROM usersLockedQuestions WHERE gameId = " + gameId + " AND playerName = '" +playerName + "'";
+        IDbConnection conn = new SqliteConnection(databaseUrl);
+        conn.Open();
+        IDbCommand cmd = conn.CreateCommand();
+        cmd.CommandText = sql;
+        IDataReader reader = cmd.ExecuteReader();
+
+        int points = 0;
+        while (reader.Read()) {
+            points = reader.GetInt32(0);
+        }
+        reader.Close();
+        cmd.Dispose();
+        conn.Close();
+
+        return points;
+    }
+
     internal void SetFinishedDate(int gameId, string finishedDate) {
         string sql = "UPDATE game SET finishedDate = '" + finishedDate + "' WHERE id = " + gameId;
         IDbConnection conn = new SqliteConnection(databaseUrl);
@@ -168,7 +206,7 @@ public class Database : MonoBehaviour {
     }
 
     internal int GetRoundValue(int gameId) {
-        if (this.round == null) {
+        if (this.round == -1) {
             string sql = "SELECT round FROM game WHERE id = " + gameId;
             IDbConnection conn = new SqliteConnection(databaseUrl);
             conn.Open();
@@ -176,7 +214,7 @@ public class Database : MonoBehaviour {
             cmd.CommandText = sql;
             IDataReader reader = cmd.ExecuteReader();
             while (reader.Read()) {
-                this.gameMode = reader.GetString(0);
+                this.round = reader.GetInt32(0);
             }
             reader.Close();
             cmd.Dispose();
@@ -186,7 +224,7 @@ public class Database : MonoBehaviour {
     }
 
     internal List<KeyValuePair<string, int>> GetPlayersForGame(int gameId) {
-        string sql = "SELECT name, (SELECT count(*) FROM usersLockedQuestions WHERE playerName = localUsers.name) as numAnswers  FROM localGamePlayers " +
+        string sql = "SELECT name, (SELECT count(*) FROM usersLockedQuestions WHERE playerName = localUsers.name AND gameId = " + gameId + ") as numAnswers  FROM localGamePlayers " +
             "LEFT JOIN localUsers ON localGamePlayers.playerId = localUsers.id " +
             "WHERE gameId = " + gameId;
         IDbConnection conn = new SqliteConnection(databaseUrl);
@@ -211,8 +249,24 @@ public class Database : MonoBehaviour {
 
     public void SetLocalOrOnline(string type) {
         gameMode = type;
+        string databaseName = "narKampenLocal.db";
         if (type.Equals("Local")) {
-            databaseUrl = "URI=file:" + Application.dataPath + "/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();
+
+                    File.WriteAllBytes(databaseUrl, load.downloadHandler.data);
+                    //File.WriteAllBytes(databaseUrl, load.bytes);
+                }
+                databaseUrl = "URI=file:" + databaseUrl;
+            } else {
+                databaseUrl = "URI=file:" + Application.dataPath + "/narKampenLocal.db";
+            }
         } else {
             databaseUrl = "nordh.xyz/narKampen/dbFiles/dbAccess.php";
         }
@@ -238,18 +292,25 @@ public class Database : MonoBehaviour {
     }
 
     public void LinkPlayersToLocalGame(List<string> playerNames, int gameId) {
+
+        IDbConnection conn = new SqliteConnection(databaseUrl);
+        conn.Open();
+        string questionSql = "SELECT id FROM questions order by random() limit 1";
+        IDbCommand cmd = conn.CreateCommand();
+        cmd.CommandText = questionSql;
+        IDataReader reader = cmd.ExecuteReader();
+        int questionId = -1;
+        while (reader.Read()) {
+            questionId = reader.GetInt32(0);
+        }
         foreach (string player in playerNames) {
             string sql = "SELECT id FROM localUsers WHERE name = '" + player + "'";
-            IDbConnection conn = new SqliteConnection(databaseUrl);
-            conn.Open();
-            IDbCommand cmd = conn.CreateCommand();
+            int playerId;
+            cmd = conn.CreateCommand();
             cmd.CommandText = sql;
-            IDataReader reader = cmd.ExecuteReader();
+            reader = cmd.ExecuteReader();
             if (reader.Read()) {
-                int playerId = reader.GetInt32(0);
-                conn.Close();
-                LinkPlayerToGame(playerId, gameId);
-                continue;
+                playerId = reader.GetInt32(0);
             } else {
                 reader.Close();
                 sql = "INSERT INTO localUsers (name) VALUES ('" + player + "')";
@@ -258,14 +319,20 @@ public class Database : MonoBehaviour {
 
                 cmd.CommandText = "SELECT last_insert_rowid()";
                 Int64 lastInsert64 = (Int64)cmd.ExecuteScalar();
-
-                LinkPlayerToGame((int)lastInsert64, gameId);
+                playerId = (int)lastInsert64;
             }
-            conn.Close();
             cmd.Dispose();
             reader.Close();
-        }
 
+            LinkPlayerToGame(playerId, gameId);
+            SavePlayersQuestion(questionId.ToString(), player, gameId);
+
+        }
+        IDbCommand cmd2 = conn.CreateCommand();
+        cmd2.CommandText = "UPDATE game SET currentPlayer = '" + playerNames[0] + "' WHERE id = " + gameId;
+        cmd2.ExecuteNonQuery();
+        cmd2.Dispose();
+        conn.Close();
     }
 
     private void LinkPlayerToGame(int playerId, int gameId) {
@@ -274,7 +341,7 @@ public class Database : MonoBehaviour {
         conn2.Open();
         IDbCommand cmd = conn2.CreateCommand();
         cmd.CommandText = sql;
-        cmd.ExecuteScalar();
+        cmd.ExecuteNonQuery();
         cmd.Dispose();
         conn2.Close();
     }
@@ -298,7 +365,7 @@ public class Database : MonoBehaviour {
     }
 
     public int SetupNewLocalGame(int winNumber, int numberOfPlayers, int questionTimer) {
-        string sql = "INSERT INTO game (winNumber, numberOfPlayers, answerTimer, gameMode) VALUES (" + winNumber + "," + numberOfPlayers + "," + questionTimer + ", 'Local')";
+        string sql = "INSERT INTO game (winNumber, numberOfPlayers, answerTimer, gameMode, startedDate) VALUES (" + winNumber + "," + numberOfPlayers + "," + questionTimer + ", 'Local', DATE())";
         IDbConnection conn = new SqliteConnection(databaseUrl);
         conn.Open();
         IDbCommand cmd = conn.CreateCommand();

+ 4 - 2
Assets/Scripts/GameManagerScript.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -21,8 +22,9 @@ public class GameManagerScript : MonoBehaviour {
         GameId = PlayerPrefs.GetInt("GameId");
 
         db.SetLocalOrOnline("Local");
-
+        db.SetLastPlayedDate(gameId);
         StatsScript statsScript = GameObject.Find("StatsPanel").GetComponent<StatsScript>();
+
         statsScript.AddPlayersToStats(GetPlayersForGame());
     }
 

+ 15 - 14
Assets/Scripts/LocalGameScript.cs

@@ -13,30 +13,31 @@ public class LocalGameScript : MonoBehaviour
     public Button startButton;
     public Button deleteButton;
 
-    private int gameId;
-    private string gameMode;
-    private int questionsNeededToWin;
+    public Text numberOfPlayersText;
+    public Text neededToWinText;
+    public Text roundText;
+    public Text dateStartedText;
+    public Text lastPlayedText;
+    public Text finishedDateText;
+
     private int answerTimer;
-    private int numberOfPlayers;
+    private string gameMode;
     private string currentPlayer;
     private string currentPlayerName;
-    private int round;
-    private string startDate;
-    private string lastPlayedDate;
-    private string finishedDate;
+    private int gameId;
     private List<KeyValuePair<string, int>> players;
 
     public string CurrentPlayerName { get => currentPlayerName; set => currentPlayerName = value; }
     public string CurrentPlayer { get => currentPlayer; set => currentPlayer = value; }
-    public int NumberOfPlayers { get => numberOfPlayers; set => numberOfPlayers = value; }
+    public string NumberOfPlayers { get => numberOfPlayersText.text; set => numberOfPlayersText.text = value; }
     public int AnswerTimer { get => answerTimer; set => answerTimer = value; }
-    public int QuestionsNeededToWin { get => questionsNeededToWin; set => questionsNeededToWin = value; }
+    public string QuestionsNeededToWin { get => neededToWinText.text; set => neededToWinText.text = value; }
     public string GameMode { get => gameMode; set => gameMode = value; }
     public int GameId { get => gameId; set => gameId = value; }
-    public int Round { get => round; set => round = value; }
-    public string StartDate { get => startDate; set => startDate = value; }
-    public string LastPlayedDate { get => lastPlayedDate; set => lastPlayedDate = value; }
-    public string FinishedDate { get => finishedDate; set => finishedDate = value; }
+    public string Round { get => roundText.text; set => roundText.text = value; }
+    public string StartDate { get => dateStartedText.text; set => dateStartedText.text = value; }
+    public string LastPlayedDate { get => lastPlayedText.text; set => lastPlayedText.text = value; }
+    public string FinishedDate { get => finishedDateText.text; set => finishedDateText.text = value; }
     public List<KeyValuePair<string, int>> Players { get => players; set => players = value; }
 
     private void Start() {

+ 7 - 0
Assets/Scripts/MainMenu.cs

@@ -125,6 +125,13 @@ public class MainMenu : MonoBehaviour {
         GameObject.Find("GameType").gameObject.GetComponent<CanvasGroup>().alpha = 1;
         activeGamesPanel.gameObject.GetComponent<CanvasGroup>().alpha = 0;
         activeGamesPanel.gameObject.GetComponent<CanvasGroup>().blocksRaycasts = false;
+
+        CanvasGroup localPanelCanvas = GameObject.Find("LocalGamesPanel").GetComponent<CanvasGroup>();
+        CanvasGroup onlinePanelCanvas = GameObject.Find("OnlineGamesPanel").GetComponent<CanvasGroup>();
+        localPanelCanvas.alpha = 0;
+        localPanelCanvas.blocksRaycasts = false;
+        onlinePanelCanvas.alpha = 0;
+        onlinePanelCanvas.blocksRaycasts = false;
     }
 
     private void SliderChoice(float arg) {

+ 8 - 24
Assets/Scripts/ScrollViewScript.cs

@@ -40,31 +40,13 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
 
         List<QuestionCard> answerlineQuestions = db.GetPlayerQuestions(gameId, currentPlayer);
         SetQuestionsInAnswerLine(answerlineQuestions);
-        if (answerlineQuestions.Count == 0) {
-            SetGiventQuestion();
-        }
+
         SetNewQuestion(db.GetNewQuestion());
         ResetNewQuestionPosition();
         ts.ResetTimer();
         ts.StartTimer();
     }
 
-    public void SetGiventQuestion() {
-        // if new game, create one question card to start with
-        GameObject question = Instantiate(prefab, new Vector2(0, 0), Quaternion.identity) as GameObject;
-        QuestionCard questionCard = question.GetComponent<QuestionCard>();
-        questionCard.PrepareQuestion("QuestionText", "AnswerText");
-        questionCard = db.GetNewQuestion();
-        questionCard.SetQuestionSafe();
-
-        questionCard.transform.SetSiblingIndex(0);
-        questionCard.transform.SetParent(contentPanel);
-
-        for (int i = 0; i < players.Count; i++) {
-            db.SavePlayersQuestion(questionCard.idString, players[i].Key, gameId);
-        }
-    }
-
     private void SetQuestionsInAnswerLine(List<QuestionCard> questions) {
         foreach (QuestionCard q in questions) {
             q.transform.SetParent(contentPanel);
@@ -108,6 +90,7 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
 
     private void ResetNewQuestionPosition() {
         nq.transform.position = nq.originalPos;
+        nq.SetAnswerText("???? - ????");
         nq.transform.localPosition = new Vector3(0, 0, 0);
 
         nq.GetComponent<CanvasGroup>().alpha = 1f;
@@ -164,9 +147,10 @@ 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("Stats Value Lost").GetComponent<Text>().text + " questions from your answer to unlocked questions. " +
+                "you lost " + GameObject.Find("questionsLostStat").GetComponent<StatsLine>().GetValue() + " questions from your answer to unlocked questions. " +
                 "It took " + db.GetRoundValue(gameId) + " rounds";
-            dialog.SetOnAccept("YEAY!", () => { dialog.Hide(); });
+            dialog.SetOnAccept("YEAY!", () => { dialog.Hide(); db.SetFinishedDate(gameId, DateTime.Today.ToShortDateString()); });
+            dialog.Show();
         }
     }
 
@@ -187,10 +171,10 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
                 Destroy(q.gameObject);
             }
         }
-        Text lostQuestionsValueText = GameObject.Find("Stats Value Lost").GetComponent<Text>();
-        lostQuestionsValueText.text = (Int16.Parse(lostQuestionsValueText.text) + lostQuestions).ToString();
+        StatsLine questionsLost = GameObject.Find("questionsLost").GetComponent<StatsLine>();
+        questionsLost.SetStatValue(Int32.Parse(questionsLost.GetValue() + lostQuestions).ToString());
 
-        statsScript.SetQuestionsInAnswerLine(currentPlayer, contentPanel.childCount - lostQuestions);
+        statsScript.SetQuestionsInAnswerLine(currentPlayer, contentPanel.childCount - lostQuestions); //TODO
     }
 
     void YesFunction() {

+ 45 - 27
Assets/Scripts/StatsScript.cs

@@ -8,26 +8,58 @@ public class StatsScript : MonoBehaviour {
     public GameObject statsNames;
     public GameObject statsValues;
 
+    public GameObject statsLinePrefab;
+
     private Text[] statsTextNames;
     private Text[] statsTextValues;
 
+    private List<StatsLine> statLines;
+
     GameManagerScript gms;
 
     private void Start() {
+        statLines = new List<StatsLine>();
         gms = GameObject.Find("GameManager").GetComponent<GameManagerScript>();
-        AddTextComponent(statsNames, "Player",false,-1);
-        AddTextComponent(statsValues, "",true,-1);
-        //AddPlayersFromRefs();
-        statsTextNames = statsNames.GetComponentsInChildren<Text>();
-        statsTextValues = statsValues.GetComponentsInChildren<Text>();
+        CreateStandardStats();
+    }
+
+    private void CreateStandardStats() {
+        StatsLine round = CreateStatLine();
+        round.SetStatName("Round");
+        round.SetStatValue("1");
+        round.name = "roundStat";
+
+        StatsLine lostQuestions = CreateStatLine();
+        lostQuestions.SetStatName("Questions lost");
+        lostQuestions.SetStatValue("0");
+        lostQuestions.name = "questionsLost";
+
+        StatsLine playerTitle = CreateStatLine();
+        playerTitle.SetStatName("Players");
+        playerTitle.SetStatValue("");
+        playerTitle.MakeBold();
+
+        statLines.Add(round);
+        statLines.Add(lostQuestions);
+        statLines.Add(playerTitle);
+    }
+
+    private StatsLine CreateStatLine() {
+        GameObject slp = Instantiate(statsLinePrefab, new Vector2(0, 0), Quaternion.identity) as GameObject;
+        StatsLine statLine = slp.GetComponent<StatsLine>();
+
+        statLine.transform.SetParent(this.transform);
+        return statLine;
     }
 
-    public void AddPlayersToStats(List<KeyValuePair<string,int>> players) {
-        int count = players.Count;
-        
-        for (int i = 0; i < count; i++) { 
-            AddTextComponent(statsNames, players[i].Key, false, i);
-            AddTextComponent(statsValues, players[i].Value.ToString(), true, i);
+    public void AddPlayersToStats(List<KeyValuePair<string, int>> players) {
+
+        foreach (KeyValuePair<string,int> player in players) {
+            StatsLine p = CreateStatLine();
+            p.SetStatName(player.Key);
+            p.SetStatValue(player.Value.ToString());
+
+            statLines.Add(p);
         }
     }
 
@@ -38,7 +70,7 @@ public class StatsScript : MonoBehaviour {
         Text newTextObject = playerHeaderGameObject.AddComponent<Text>();
         newTextObject.text = text;
         newTextObject.font = (Font)Resources.GetBuiltinResource(typeof(Font), "Arial.ttf");
-        newTextObject.color = new Color32(50,50,50,255);
+        newTextObject.color = new Color32(50, 50, 50, 255);
 
         newTextObject.resizeTextForBestFit = true;
         newTextObject.resizeTextMinSize = 10;
@@ -58,20 +90,6 @@ public class StatsScript : MonoBehaviour {
         rectTransform.localScale = new Vector3(1, 1, 1);
     }
 
-    public void MakeBold(string playerName) {
-        statsTextNames = statsNames.GetComponentsInChildren<Text>();
-        statsTextValues = statsValues.GetComponentsInChildren<Text>();
-        for (int i = 0; i < statsTextNames.Length; i++) {
-            if (statsTextNames[i].text.Equals(playerName)) {
-                statsTextNames[i].fontStyle = FontStyle.Bold;
-                statsTextValues[i].fontStyle = FontStyle.Bold;
-            } else {
-                statsTextNames[i].fontStyle = FontStyle.Normal;
-                statsTextValues[i].fontStyle = FontStyle.Normal;
-            }
-        }
-    }
-
     public void IncreaseRoundValue() {
         foreach (Text text in statsTextValues) {
             if (text.name.Equals("Stats Value Round")) {
@@ -85,7 +103,7 @@ public class StatsScript : MonoBehaviour {
     }
 
     public void SetQuestionsInAnswerLine(string playerName, int count) {
-        for (int i = 0; i < statsTextNames.Length; i++) { 
+        for (int i = 0; i < statsTextNames.Length; i++) {
             if (statsTextNames[i].text.Equals(playerName)) {
                 statsTextValues[i].text = count.ToString();
             }

+ 33 - 0
Assets/StatsLine.cs

@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class StatsLine : MonoBehaviour
+{
+
+    public Text statName;
+    public Text statValue;
+
+    public void SetStatName(string value) {
+        statName.text = value;
+    }
+
+    public void SetStatValue(string value) {
+        statValue.text = value;
+    }
+
+    public string GetValue() {
+        return statValue.text;
+    }
+    
+    public void MakeBold() {
+        statName.fontStyle = FontStyle.Bold;
+        statValue.fontStyle = FontStyle.Bold;
+    }
+
+    public void UnBold() {
+        statName.fontStyle = FontStyle.Normal;
+        statValue.fontStyle = FontStyle.Normal;
+    }
+}

+ 11 - 0
Assets/StatsLine.cs.meta

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

+ 8 - 0
Assets/StreamingAssets.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 920cea59731541e419b3f05d139e4ee8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

TEMPAT SAMPAH
Assets/StreamingAssets/narKampenLocal.db


+ 7 - 0
Assets/StreamingAssets/narKampenLocal.db.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c156cb884b4d3864a9ffb1f812db5458
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/User.unity

@@ -769,7 +769,7 @@ MonoBehaviour:
   m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 800, y: 600}

File diff ditekan karena terlalu besar
+ 253 - 363
Assets/narKampen.unity


TEMPAT SAMPAH
Assets/narKampenLocal.db


+ 1 - 1
Assets/narKampenLocal.db.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c156cb884b4d3864a9ffb1f812db5458
+guid: 829c887cff687e642aa8efaf5be43e63
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 8 - 5
Packages/manifest.json

@@ -1,11 +1,14 @@
 {
   "dependencies": {
     "com.unity.ads": "2.0.8",
-    "com.unity.analytics": "3.2.2",
-    "com.unity.collab-proxy": "1.2.15",
-    "com.unity.package-manager-ui": "2.0.3",
-    "com.unity.purchasing": "2.0.3",
-    "com.unity.textmeshpro": "1.3.0",
+    "com.unity.analytics": "3.3.2",
+    "com.unity.collab-proxy": "1.2.16",
+    "com.unity.multiplayer-hlapi": "1.0.2",
+    "com.unity.package-manager-ui": "2.1.2",
+    "com.unity.purchasing": "2.0.6",
+    "com.unity.textmeshpro": "2.0.0",
+    "com.unity.timeline": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.0.2",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",

+ 4 - 4
ProjectSettings/EditorBuildSettings.asset

@@ -6,12 +6,12 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/narKampen.unity
-    guid: 173419871896d2742a84e462fa3af7df
+    path: Assets/User.unity
+    guid: 38925ed866f076e4cb6d819774839d4a
   - enabled: 1
     path: Assets/MainMenu.unity
     guid: 663bfb586ff76f445950dd5434725919
   - enabled: 1
-    path: Assets/User.unity
-    guid: 38925ed866f076e4cb6d819774839d4a
+    path: Assets/narKampen.unity
+    guid: 173419871896d2742a84e462fa3af7df
   m_configObjects: {}

+ 2 - 1
ProjectSettings/GraphicsSettings.asset

@@ -36,8 +36,9 @@ GraphicsSettings:
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

+ 27 - 10
ProjectSettings/ProjectSettings.asset

@@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 15
+  serializedVersion: 16
   productGUID: 5d0f18a4388c98c4d8e652b762b36524
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
@@ -125,7 +125,6 @@ PlayerSettings:
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   xboxOneEnable7thCore: 0
-  isWsaHolographicRemotingEnabled: 0
   vrSettings:
     cardboard:
       depthFormat: 0
@@ -140,10 +139,17 @@ PlayerSettings:
     hololens:
       depthFormat: 1
       depthBufferSharingEnabled: 0
+    lumin:
+      depthFormat: 0
+      frameTiming: 2
+      enableGLCache: 0
+      glCacheMaxBlobSize: 524288
+      glCacheMaxFileSize: 8388608
     oculus:
       sharedDepthBuffer: 1
       dashSupport: 1
     enable360StereoCapture: 0
+  isWsaHolographicRemotingEnabled: 0
   protectGraphicsMemory: 0
   enableFrameTimingStats: 0
   useHDRDisplay: 0
@@ -155,7 +161,7 @@ PlayerSettings:
   applicationIdentifier:
     Android: se.axelnordh.narkampen
   buildNumber: {}
-  AndroidBundleVersionCode: 1
+  AndroidBundleVersionCode: 4
   AndroidMinSdkVersion: 16
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
@@ -193,6 +199,10 @@ PlayerSettings:
   iPadHighResPortraitSplashScreen: {fileID: 0}
   iPadLandscapeSplashScreen: {fileID: 0}
   iPadHighResLandscapeSplashScreen: {fileID: 0}
+  iPhone65inPortraitSplashScreen: {fileID: 0}
+  iPhone65inLandscapeSplashScreen: {fileID: 0}
+  iPhone61inPortraitSplashScreen: {fileID: 0}
+  iPhone61inLandscapeSplashScreen: {fileID: 0}
   appleTVSplashScreen: {fileID: 0}
   appleTVSplashScreen2x: {fileID: 0}
   tvOSSmallIconLayers: []
@@ -236,21 +246,23 @@ PlayerSettings:
   tvOSManualSigningProvisioningProfileType: 0
   appleEnableAutomaticSigning: 0
   iOSRequireARKit: 0
+  iOSAutomaticallyDetectAndAddCapabilities: 1
   appleEnableProMotion: 0
   clonedFromGUID: 00000000000000000000000000000000
   templatePackageId: 
   templateDefaultScene: 
-  AndroidTargetArchitectures: 5
+  AndroidTargetArchitectures: 7
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: 
-  AndroidKeyaliasName: 
+  AndroidKeystoreName: '{inproject}: narkampen.keystore'
+  AndroidKeyaliasName: narkampen
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 1
   AndroidIsGame: 1
   AndroidEnableTango: 0
   androidEnableBanner: 1
   androidUseLowAccuracyLocation: 0
+  androidUseCustomKeystore: 1
   m_AndroidBanners:
   - width: 320
     height: 180
@@ -357,6 +369,7 @@ PlayerSettings:
   m_BuildTargetEnableVuforiaSettings: []
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
+  openGLRequireES32: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
     iPhone: 1
@@ -545,6 +558,7 @@ PlayerSettings:
   ps4DownloadDataSize: 0
   ps4GarlicHeapSize: 2048
   ps4ProGarlicHeapSize: 2560
+  playerPrefsMaxSize: 32768
   ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
   ps4pnSessions: 1
   ps4pnPresence: 1
@@ -592,15 +606,19 @@ PlayerSettings:
   webGLCompressionFormat: 1
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
+  webGLWasmStreaming: 0
   scriptingDefineSymbols: {}
   platformArchitecture: {}
-  scriptingBackend: {}
+  scriptingBackend:
+    Android: 1
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}
   allowUnsafeCode: 0
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
+  gcIncremental: 0
+  gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform: {}
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
@@ -631,7 +649,6 @@ PlayerSettings:
   metroFTAName: 
   metroFTAFileTypes: []
   metroProtocolName: 
-  metroCompilationOverrides: 1
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: 
@@ -656,7 +673,7 @@ PlayerSettings:
   XboxOneAllowedProductIds: []
   XboxOnePersistentLocalStorageSize: 0
   XboxOneXTitleMemory: 8
-  xboxOneScriptCompiler: 0
+  xboxOneScriptCompiler: 1
   XboxOneOverrideIdentityName: 
   vrEditorSettings:
     daydream:
@@ -670,7 +687,7 @@ PlayerSettings:
     m_PortalFolderPath: 
   luminCert:
     m_CertPath: 
-    m_PrivateKeyPath: 
+    m_SignPackage: 1
   luminIsChannelApp: 0
   luminVersion:
     m_VersionCode: 1

+ 2 - 1
ProjectSettings/ProjectVersion.txt

@@ -1 +1,2 @@
-m_EditorVersion: 2018.3.7f1
+m_EditorVersion: 2019.1.3f1
+m_EditorVersionWithRevision: 2019.1.3f1 (dc414eb9ed43)

+ 10 - 0
ProjectSettings/XRSettings.asset

@@ -0,0 +1,10 @@
+{
+    "m_SettingKeys": [
+        "VR Device Disabled",
+        "VR Device User Alert"
+    ],
+    "m_SettingValues": [
+        "False",
+        "False"
+    ]
+}

+ 3 - 0
info.txt

@@ -0,0 +1,3 @@
+Client id: 694923049882-c6fh2oj4lapdrcdt3gce5tqerv3rnqn8.apps.googleusercontent.com
+
+81:3B:5F:B0:16:29:4E:D0:DA:C1:C0:72:7C:F4:85:54:23:FE:F9:FC

TEMPAT SAMPAH
narKampen.aab


TEMPAT SAMPAH
narkampen.keystore


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini