Merge branch 'main' of https://github.com/LeGall29/GGJ2024
This commit is contained in:
Otaku9999
commit
9cb3bfdfd1
@ -459,15 +459,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 130058893}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -305.91254}
|
||||
m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 987875882}
|
||||
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: -610, y: 99.56564}
|
||||
m_SizeDelta: {x: 100, y: 180.86871}
|
||||
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, y: 0.5}
|
||||
--- !u!114 &130058895
|
||||
MonoBehaviour:
|
||||
@ -489,17 +489,17 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Player 191234567
|
||||
m_text: 01234567890123456
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4284208278
|
||||
m_fontColor: {r: 0.5882353, g: 0.8313726, b: 0.35686275, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -516,15 +516,15 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 0
|
||||
m_fontSizeMax: 0
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -598,10 +598,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6747543}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 150, y: -300}
|
||||
m_SizeDelta: {x: 300, y: 200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &132605380
|
||||
MonoBehaviour:
|
||||
@ -1193,10 +1193,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6747543}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1050, y: -300}
|
||||
m_SizeDelta: {x: 300, y: 200}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &340074661
|
||||
MonoBehaviour:
|
||||
@ -1325,7 +1325,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: de098f8fd5f884a1aa55db7874246b92, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
playerLabels:
|
||||
waitingForPlayersPage: {fileID: 1117928114}
|
||||
waitingForPlayersLabels:
|
||||
- {fileID: 1794849355}
|
||||
- {fileID: 1452182577}
|
||||
- {fileID: 1018720202}
|
||||
@ -1334,6 +1335,16 @@ MonoBehaviour:
|
||||
- {fileID: 496953434}
|
||||
- {fileID: 2137991537}
|
||||
- {fileID: 340074661}
|
||||
waitingForPropositionsPage: {fileID: 1730465902}
|
||||
waitingForPropositionsLabels:
|
||||
- {fileID: 972471162}
|
||||
- {fileID: 1374681049}
|
||||
- {fileID: 1141337197}
|
||||
- {fileID: 130058895}
|
||||
- {fileID: 680005431}
|
||||
- {fileID: 1854893636}
|
||||
- {fileID: 2065109614}
|
||||
- {fileID: 1197279072}
|
||||
propositionTime: 59.8
|
||||
votingTime: 20
|
||||
roomCodeLabel: {fileID: 1805240027}
|
||||
@ -1536,10 +1547,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6747543}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 350, y: -300}
|
||||
m_SizeDelta: {x: 300, y: 200}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &496953434
|
||||
MonoBehaviour:
|
||||
@ -2197,15 +2208,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 680005429}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -305.91254}
|
||||
m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 987875882}
|
||||
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: -610, y: 41.982822}
|
||||
m_SizeDelta: {x: 100, y: 176.03436}
|
||||
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, y: 0.5}
|
||||
--- !u!114 &680005431
|
||||
MonoBehaviour:
|
||||
@ -2227,17 +2238,17 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Player 191234567
|
||||
m_text: 01234567890123456
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -2254,15 +2265,15 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 0
|
||||
m_fontSizeMax: 0
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -2930,15 +2941,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 972471160}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -305.91254}
|
||||
m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 987875882}
|
||||
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: -610, y: 278.03284}
|
||||
m_SizeDelta: {x: 100, y: 183.93434}
|
||||
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, y: 0.5}
|
||||
--- !u!114 &972471162
|
||||
MonoBehaviour:
|
||||
@ -2960,17 +2971,17 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Player 191234567
|
||||
m_text: 01234567890123456
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4284208278
|
||||
m_fontColor: {r: 0.5882353, g: 0.83137256, b: 0.35686275, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -2987,15 +2998,15 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 0
|
||||
m_fontSizeMax: 0
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -3023,7 +3034,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 1.3201599, w: 123.400795}
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@ -3069,10 +3080,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6747543}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1050, y: -100}
|
||||
m_SizeDelta: {x: 300, y: 200}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &983174567
|
||||
MonoBehaviour:
|
||||
@ -3180,6 +3191,7 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 987875882}
|
||||
- component: {fileID: 987875883}
|
||||
m_Layer: 0
|
||||
m_Name: Players
|
||||
m_TagString: Untagged
|
||||
@ -3195,8 +3207,8 @@ RectTransform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 987875881}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 642.6175}
|
||||
m_LocalScale: {x: 2.1006565, y: 2.1006565, z: 2.1006565}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 972471161}
|
||||
@ -3209,11 +3221,35 @@ RectTransform:
|
||||
- {fileID: 1197279071}
|
||||
m_Father: {fileID: 1730465903}
|
||||
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: 1530, y: -329}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -200, y: -200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &987875883
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 987875881}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 400, y: 400}
|
||||
m_Spacing: {x: 0, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!1 &997964895
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3514,10 +3550,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6747543}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 700, y: -100}
|
||||
m_SizeDelta: {x: 300, y: 200}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1018720202
|
||||
MonoBehaviour:
|
||||
@ -3839,12 +3875,12 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 1117928115}
|
||||
m_Layer: 5
|
||||
m_Name: RoomConnectState
|
||||
m_Name: WaitingForPlayersPage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1117928115
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3900,15 +3936,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 1141337195}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -305.91254}
|
||||
m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 987875882}
|
||||
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: -610, y: 159.11496}
|
||||
m_SizeDelta: {x: 100, y: 181.77008}
|
||||
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, y: 0.5}
|
||||
--- !u!114 &1141337197
|
||||
MonoBehaviour:
|
||||
@ -3930,17 +3966,17 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Player 191234567
|
||||
m_text: 01234567890123456
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -3957,15 +3993,15 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 0
|
||||
m_fontSizeMax: 0
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -4041,8 +4077,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: 0, y: -25}
|
||||
m_SizeDelta: {x: 0, y: 50}
|
||||
m_AnchoredPosition: {x: 0, y: -100}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1165659436
|
||||
MonoBehaviour:
|
||||
@ -4066,15 +4102,15 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: waiting for player pictures
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
rgba: 4278245631
|
||||
m_fontColor: {r: 1, g: 0.84751457, b: 0, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -4091,8 +4127,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 36
|
||||
m_fontSizeBase: 36
|
||||
m_fontSize: 100
|
||||
m_fontSizeBase: 100
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@ -4101,7 +4137,7 @@ MonoBehaviour:
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_characterSpacing: 5
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
@ -4127,7 +4163,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: -1.0582583, w: 0}
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@ -4168,15 +4204,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 1197279070}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -305.91254}
|
||||
m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 987875882}
|
||||
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: -610, y: -149.5922}
|
||||
m_SizeDelta: {x: 100, y: 199.18439}
|
||||
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, y: 0.5}
|
||||
--- !u!114 &1197279072
|
||||
MonoBehaviour:
|
||||
@ -4198,17 +4234,17 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Player 191234567
|
||||
m_text: 01234567890123456
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -4225,15 +4261,15 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 0
|
||||
m_fontSizeMax: 0
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -4819,15 +4855,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 1374681047}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -305.91254}
|
||||
m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 987875882}
|
||||
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: -610, y: 219.11496}
|
||||
m_SizeDelta: {x: 100, y: 181.77007}
|
||||
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, y: 0.5}
|
||||
--- !u!114 &1374681049
|
||||
MonoBehaviour:
|
||||
@ -4849,17 +4885,17 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Player 191234567
|
||||
m_text: 01234567890123456
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -4876,15 +4912,15 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 0
|
||||
m_fontSizeMax: 0
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -4912,7 +4948,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 1.0697252, w: 133.0019}
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@ -5131,10 +5167,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6747543}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 350, y: -100}
|
||||
m_SizeDelta: {x: 300, y: 200}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1452182577
|
||||
MonoBehaviour:
|
||||
@ -5728,12 +5764,12 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 1730465903}
|
||||
m_Layer: 5
|
||||
m_Name: WaitingAnswerState
|
||||
m_Name: WiatingForPropositionPage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1730465903
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6058,10 +6094,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6747543}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 150, y: -100}
|
||||
m_SizeDelta: {x: 300, y: 200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1794849355
|
||||
MonoBehaviour:
|
||||
@ -6210,14 +6246,14 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0.7311321, b: 0.90759665, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 0}
|
||||
m_Texture: {fileID: 2800000, guid: 51cab6d235722024da1a1ba85f4d2e99, type: 3}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -6733,15 +6769,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 1854893634}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -305.91254}
|
||||
m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 987875882}
|
||||
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: -610, y: -20.49218}
|
||||
m_SizeDelta: {x: 100.2, y: 180.98436}
|
||||
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, y: 0.5}
|
||||
--- !u!114 &1854893636
|
||||
MonoBehaviour:
|
||||
@ -6763,17 +6799,17 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Player 191234567
|
||||
m_text: 01234567890123456
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -6790,15 +6826,15 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 0
|
||||
m_fontSizeMax: 0
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -7623,15 +7659,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 2065109612}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -305.91254}
|
||||
m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 987875882}
|
||||
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: -610, y: -79.06718}
|
||||
m_SizeDelta: {x: 100, y: 178.13435}
|
||||
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, y: 0.5}
|
||||
--- !u!114 &2065109614
|
||||
MonoBehaviour:
|
||||
@ -7653,17 +7689,17 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Player 191234567
|
||||
m_text: 01234567890123456
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -7680,15 +7716,15 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 0
|
||||
m_fontSizeMax: 0
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -7762,10 +7798,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6747543}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 700, y: -300}
|
||||
m_SizeDelta: {x: 300, y: 200}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &2137991537
|
||||
MonoBehaviour:
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Text.RegularExpressions;
|
||||
using UnityEngine;
|
||||
|
||||
[Serializable]
|
||||
[JsonObject]
|
||||
@ -8,17 +9,21 @@ public class Player
|
||||
{
|
||||
public string name;
|
||||
public string id;
|
||||
public float creationDate;
|
||||
|
||||
[JsonConstructor]
|
||||
public Player(string _name, string _id)
|
||||
public Player(string _name, string _id, float _creationDate)
|
||||
{
|
||||
name = _name;
|
||||
id = _id;
|
||||
creationDate = _creationDate;
|
||||
|
||||
}
|
||||
|
||||
public Player(string _name)
|
||||
{
|
||||
id = Guid.NewGuid().ToString();
|
||||
creationDate = Time.time;
|
||||
SetName(_name);
|
||||
}
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ public class Room
|
||||
public Dictionary<string, Player> players;
|
||||
public int currentQuestion;
|
||||
public double creationDate;
|
||||
|
||||
public int currentState;
|
||||
|
||||
public Room(string _code)
|
||||
{
|
||||
@ -20,6 +20,7 @@ public Room(string _code)
|
||||
players = new Dictionary<string, Player>();
|
||||
questions = new Dictionary<string, Question>();
|
||||
currentQuestion = 0;
|
||||
currentState = 0;
|
||||
}
|
||||
|
||||
public List<Player> GetPlayerList()
|
||||
@ -31,5 +32,10 @@ public List<Question> GetQuestionList()
|
||||
{
|
||||
return new List<Question>(questions.Values);
|
||||
}
|
||||
|
||||
public void setPlayersAreReady(int _state)
|
||||
{
|
||||
currentState = _state;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Firebase.Database;
|
||||
using Firebase.Extensions;
|
||||
using Newtonsoft.Json;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
|
||||
@ -12,6 +13,7 @@ public class GameManager : MonoBehaviour
|
||||
{
|
||||
private GameState currentState;
|
||||
private List<Player> players = new();
|
||||
private bool isFirst = false;
|
||||
public Player currentPlayer = null;
|
||||
public Question currentQuestion = null;
|
||||
|
||||
@ -54,6 +56,12 @@ private void Start()
|
||||
HomeConnection.SetActive(true);
|
||||
submitNewPlayer.interactable = false;
|
||||
}
|
||||
private void OnApplicationQuit()
|
||||
{
|
||||
myOnlineRoom.Child("players").Child(currentPlayer.id).RemoveValueAsync();
|
||||
Debug.Log($"delete player {currentPlayer.name}");
|
||||
myRoom = null;
|
||||
}
|
||||
|
||||
public GameState GetCurrentState()
|
||||
{
|
||||
@ -123,7 +131,10 @@ public void PlayerValidateNameAndServerRoom(string _name, string _code)
|
||||
WaitingRoom.SetActive(true);
|
||||
HomeConnection.SetActive(false);
|
||||
|
||||
UpdateDisplayedListUser();
|
||||
List<Player> list = new List<Player>();
|
||||
list.Add(currentPlayer);
|
||||
|
||||
UpdateDisplayedListUser(list) ;
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -187,9 +198,32 @@ private void JoinRoom(Action callback_OnRoomJoined)
|
||||
public void StartGame()
|
||||
{
|
||||
// send Start Game
|
||||
currentState = GameState.Explanation;
|
||||
WaitingRoom.SetActive(false);
|
||||
BeforeStart.SetActive(true);
|
||||
myRoom.setPlayersAreReady(1);
|
||||
string JSON = JsonUtility.ToJson(myRoom);
|
||||
Debug.Log(JSON);
|
||||
try
|
||||
{
|
||||
myOnlineRoom.Child("currentState").SetValueAsync(2).ContinueWithOnMainThread(task =>
|
||||
{
|
||||
if (task.IsFaulted)
|
||||
{
|
||||
Debug.LogException(task.Exception);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log($"start the game", this);
|
||||
currentState = GameState.Explanation;
|
||||
WaitingRoom.SetActive(false);
|
||||
BeforeStart.SetActive(true);
|
||||
}
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.LogException(ex);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -243,7 +277,7 @@ private void OnRoomUpdate(object sender, ValueChangedEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
myRoom = JsonUtility.FromJson<Room>(e.Snapshot.GetRawJsonValue());
|
||||
myRoom = JsonConvert.DeserializeObject<Room>(e.Snapshot.GetRawJsonValue());
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -254,16 +288,15 @@ private void OnRoomUpdate(object sender, ValueChangedEventArgs e)
|
||||
{
|
||||
case GameState.WaitingForOtherPlayersToJoin:
|
||||
{
|
||||
|
||||
// players = new list en fonction de ce qu'envoie fangh
|
||||
UpdateDisplayedListUser();
|
||||
CheckIfIAmTheFirst(myRoom.GetPlayerList());
|
||||
UpdateDisplayedListUser(myRoom.GetPlayerList());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void UpdateDisplayedListUser()
|
||||
private void UpdateDisplayedListUser(List<Player> players)
|
||||
{
|
||||
listPlayersUI.text = string.Empty;
|
||||
for (int i = 0; i < players.Count; i++)
|
||||
@ -271,6 +304,18 @@ private void UpdateDisplayedListUser()
|
||||
listPlayersUI.text += "\n" + players[i].name;
|
||||
}
|
||||
}
|
||||
|
||||
private void CheckIfIAmTheFirst(List<Player> players)
|
||||
{
|
||||
if (players.Count > 1)
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void OnClickSubmitSignIn()
|
||||
@ -283,14 +328,15 @@ public void OnClickSubmitSignIn()
|
||||
|
||||
public enum GameState
|
||||
{
|
||||
EnteringName,
|
||||
WaitingForOtherPlayersToJoin,
|
||||
Explanation,
|
||||
MakeProposition,
|
||||
PropositionsSent,
|
||||
WaitingForOtherPlayers,
|
||||
VotingTime,
|
||||
Ending
|
||||
EnteringName = 0,
|
||||
WaitingForOtherPlayersToJoin = 1,
|
||||
Explanation = 2,
|
||||
MakeProposition = 3,
|
||||
PropositionsSent = 4,
|
||||
MakeVote = 5,
|
||||
VoteSent = 6,
|
||||
Score = 7,
|
||||
Ending = 8
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -10,16 +10,27 @@
|
||||
|
||||
public class RoomManager : MonoBehaviour
|
||||
{
|
||||
public List<TextMeshProUGUI> playerLabels = new List<TextMeshProUGUI>();
|
||||
[Header("Waiting For Players Page")]
|
||||
public GameObject waitingForPlayersPage;
|
||||
/// <summary>
|
||||
/// TextMeshPro that show the value of the current rooom code
|
||||
/// </summary>
|
||||
public TextMeshProUGUI roomCodeLabel;
|
||||
public List<TextMeshProUGUI> waitingForPlayersLabels = new List<TextMeshProUGUI>();
|
||||
|
||||
private RoomState currentState;
|
||||
private Room myRoom = null;
|
||||
private List<Player> players;
|
||||
|
||||
[Header("Waiting For Proposition Page")]
|
||||
public GameObject waitingForPropositionsPage;
|
||||
public List<TextMeshProUGUI> waitingForPropositionsLabels = new List<TextMeshProUGUI>();
|
||||
public float propositionTime = 60;
|
||||
private float propositionCurrentTime = 0;
|
||||
public TextMeshProUGUI timerGUI;
|
||||
|
||||
private GameState currentState;
|
||||
private Room myRoom = null;
|
||||
|
||||
public float votingTime = 20;
|
||||
|
||||
private float propositionCurrentTime = 0;
|
||||
private float votingCurrentTime = 0;
|
||||
|
||||
/// <summary>
|
||||
@ -36,15 +47,10 @@ public class RoomManager : MonoBehaviour
|
||||
|
||||
DatabaseReference realtimeDB;
|
||||
|
||||
/// <summary>
|
||||
/// TextMeshPro that show the value of the current rooom code
|
||||
/// </summary>
|
||||
public TextMeshProUGUI roomCodeLabel;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
FirebaseInitializer.Instance.onFirebaseReady += Initialize;
|
||||
currentState = RoomState.None;
|
||||
currentState = GameState.EnteringName;
|
||||
}
|
||||
|
||||
|
||||
@ -53,14 +59,14 @@ private void Start()
|
||||
propositionCurrentTime = propositionTime;
|
||||
votingCurrentTime = votingTime;
|
||||
DisableAllPlayerLabels();
|
||||
currentState = RoomState.WaitingForPlayers;
|
||||
currentState = GameState.WaitingForOtherPlayersToJoin;
|
||||
}
|
||||
|
||||
private void DisableAllPlayerLabels()
|
||||
{
|
||||
for (int i = 0; i < playerLabels.Count; i++)
|
||||
for (int i = 0; i < waitingForPlayersLabels.Count; i++)
|
||||
{
|
||||
playerLabels[i].text = $"Waiting for P{i + 1}";
|
||||
waitingForPlayersLabels[i].text = $"Waiting for P{i + 1}";
|
||||
}
|
||||
}
|
||||
|
||||
@ -98,7 +104,6 @@ private void WhichCodesAreAlreadyUsed(Action<List<int>> callback_OnCodesChecked)
|
||||
else if (task.IsCompleted)
|
||||
{
|
||||
DataSnapshot snapshot = task.Result;
|
||||
Debug.Log(snapshot.Value);
|
||||
if (snapshot.Value != null)
|
||||
{
|
||||
string JSON = snapshot.GetRawJsonValue();
|
||||
@ -171,11 +176,6 @@ private int GenerateRandomAvailableCode(List<int> _impossibleCodes)
|
||||
return random;
|
||||
}
|
||||
|
||||
private void DisplayRoomCode()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void PlayerSendProposition(Proposition _proposition)
|
||||
{
|
||||
|
||||
@ -186,7 +186,10 @@ public void PlayerSendProposition(Proposition _proposition)
|
||||
/// </summary>
|
||||
public void HostStartGame()
|
||||
{
|
||||
|
||||
currentState = GameState.MakeProposition;
|
||||
waitingForPropositionsPage.SetActive(true);
|
||||
waitingForPlayersPage.SetActive(false);
|
||||
propositionCurrentTime = propositionTime;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -273,9 +276,12 @@ private void OnRoomUpdate(object sender, ValueChangedEventArgs value)
|
||||
|
||||
switch (currentState)
|
||||
{
|
||||
case RoomState.WaitingForPlayers:
|
||||
case GameState.WaitingForOtherPlayersToJoin:
|
||||
UpdateConnectedPlayerList(myRoom.GetPlayerList());
|
||||
break;
|
||||
case GameState.MakeProposition:
|
||||
HostStartGame();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@ -291,7 +297,7 @@ private void UpdateConnectedPlayerList(List<Player> _players)
|
||||
for (int i = 0; i < _players.Count; i++)
|
||||
{
|
||||
Debug.Log($"player {i} = {_players[i].name}");
|
||||
playerLabels[i].text = _players[i].name;
|
||||
waitingForPlayersLabels[i].text = _players[i].name;
|
||||
}
|
||||
}
|
||||
|
||||
@ -304,13 +310,3 @@ private void FakePlayerConnection()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public enum RoomState
|
||||
{
|
||||
None,
|
||||
WaitingForPlayers,
|
||||
WaitingForPropositions,
|
||||
ShowPropositions,
|
||||
ShowVoters,
|
||||
Score
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user