Compare commits

...

2 Commits

27 changed files with 87 additions and 1756 deletions

View File

@@ -58,11 +58,13 @@ public class GameManager : MonoBehaviour
// will silently fail and the task button will appear dead.
[SerializeField] public string[] minigameScenes = {
"MiniGame-Kabely",
//"MiniGame-insertkeys", Obsolete ?
"ButtonsMemoryMinigame",
"Happywheelminigamescene",
"MiniGame-KeyInsert",
//"MiniGame-FlappyBird", Out Of Order, Not assigned prefabs
//"MiniGame-ThrowInHole", Not pushed into main branch
//"MiniGame-Satelit", No assets, just placeholder task
"MiniGame-FlappyBird",
"MiniGame-Satelit",
"MiniGame-ThrowInHole",
"minihra cistici dira"
};
[Header("Debug")]

View File

@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Materials/Blue.mat.meta
guid: 151c2d5ead486e14f84805c05457ef7f
guid: 35493988850f6fe489b4be5b2f625f95
========
guid: 0ac383cb888b6814d8432e6ec14f49cd
>>>>>>>> origin/main:Assets/Materials/image.mat.meta

View File

@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/ButtonsMemoryMinigame.unity.meta
guid: 5f8ea27ba7c86044e9192a63e6e3b6db
guid: a25fb175a69711142ad29b45ee525020
========
guid: 99349b837685d91408e5eb5bac237678
>>>>>>>> origin/main:Assets/Scenes/Client.unity.meta

View File

@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Materials/Green.mat.meta
guid: 0fb69fc17dec90a41803db19eb400738
guid: 2c6b0099075291549ac7194c83d1e61e
NativeFormatImporter:
========
guid: a8455b5835249e44d931c30790f60381

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1be8570b1bc20d946a6e92f218d0de7d
guid: 900bc523907f8ee48baf5515a54e6716
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Materials/Magenta.mat.meta
guid: f5b74b605e2aedd42a9e4e8a40046cf5
guid: fb3371dc09f50d14990c4fd40a2862b6
NativeFormatImporter:
========
guid: 070c4a89027b6e9a28e16859d55f8c66

File diff suppressed because it is too large Load Diff

View File

@@ -7,7 +7,7 @@ using TMPro;
using UnityEditor;
using UnityEngine;
public enum GameState
public enum MinigameState
{
Idle,
ShowingSequance,
@@ -27,7 +27,7 @@ public class ButtonsMinigame : MonoBehaviour, ITask
public TMP_Text statusText;
public GameObject startButton;
private int playerStep = 0;
private GameState state = GameState.Idle;
private MinigameState state = MinigameState.Idle;
private List<int> sequence = new List<int>();
public string TaskID { get; set; }
@@ -54,7 +54,7 @@ public class ButtonsMinigame : MonoBehaviour, ITask
IEnumerator PlaySequence()
{
SetState(GameState.ShowingSequance);
SetState(MinigameState.ShowingSequance);
yield return new WaitForSeconds(delayBeforeSequence);
for (int i = 0; i < sequence.Count; i++)
@@ -67,12 +67,12 @@ public class ButtonsMinigame : MonoBehaviour, ITask
}
playerStep = 0;
SetState(GameState.PlayerTurn);
SetState(MinigameState.PlayerTurn);
}
void Start()
{
SetState(GameState.Idle);
SetState(MinigameState.Idle);
}
public void StartGame()
@@ -83,34 +83,34 @@ public class ButtonsMinigame : MonoBehaviour, ITask
StartCoroutine(PlaySequence());
}
void SetState(GameState newState)
void SetState(MinigameState newState)
{
state = newState;
switch (newState)
{
case GameState.Idle:
case MinigameState.Idle:
statusText.text = "Get Ready!";
break;
case GameState.ShowingSequance:
case MinigameState.ShowingSequance:
statusText.text = "Watch the sequence";
break;
case GameState.PlayerTurn:
case MinigameState.PlayerTurn:
statusText.text = "Your turn!";
break;
case GameState.GameOver:
case MinigameState.GameOver:
statusText.text = "Gameover";
break;
case GameState.MinigameWon:
case MinigameState.MinigameWon:
statusText.text = "Task Completed";
break;
}
startButton.SetActive(state == GameState.Idle || state == GameState.GameOver);
startButton.SetActive(state == MinigameState.Idle || state == MinigameState.GameOver);
}
public void OnButtonClicked(int buttonIndex)
{
if (state != GameState.PlayerTurn) return;
if (state != MinigameState.PlayerTurn) return;
if (buttonIndex == sequence[playerStep])
{
playerStep++;
@@ -118,7 +118,7 @@ public class ButtonsMinigame : MonoBehaviour, ITask
{
if (round >= winRound)
{
SetState(GameState.MinigameWon);
SetState(MinigameState.MinigameWon);
Complete();
}
else
@@ -132,7 +132,7 @@ public class ButtonsMinigame : MonoBehaviour, ITask
}
else
{
SetState(GameState.GameOver);
SetState(MinigameState.GameOver);
Debug.Log("GameOver");
}
}

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 478503718c5a2c449bf8efbdda9c5aa2
=======
guid: 340fa7a6658f67b4884beda3ce703bc8
>>>>>>> origin/main
guid: b680a6b1d72cd374b90a4eac38c8713b
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 5a394b419f210bb4fb74ddc99bf3c469

View File

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

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: f4fdb2075cae8cf459906793b0fc07dd

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 499bc5c49b2d47744a55d527594ece5e

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 7f708f4b0a7fb8e4f888b67817f5b7ce

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 871ab3a9010b6e14ba6c3295b2ed089d

View File

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

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 0db843a35232004438f51e9b9b8eeab7

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: c86a2bcbba19e514b8658980f381825c

View File

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

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: a76580d42c601f44aa909f9dd41ba1b7

View File

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

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 1124b38022849a047ba3418e466160e5

View File

@@ -2,77 +2,25 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2180264
Material:
<<<<<<< HEAD
serializedVersion: 8
=======
<<<<<<< HEAD
serializedVersion: 8
=======
<<<<<<< HEAD
serializedVersion: 8
=======
<<<<<<< HEAD
serializedVersion: 6
=======
serializedVersion: 8
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LiberationSans SDF Material
m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
m_ShaderKeywords:
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
<<<<<<< HEAD
m_LockedProperties:
=======
<<<<<<< HEAD
m_LockedProperties:
=======
<<<<<<< HEAD
m_LockedProperties:
=======
<<<<<<< HEAD
=======
m_LockedProperties:
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@@ -124,22 +72,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
<<<<<<< HEAD
m_Ints: []
=======
<<<<<<< HEAD
m_Ints: []
=======
<<<<<<< HEAD
m_Ints: []
=======
<<<<<<< HEAD
=======
m_Ints: []
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_Floats:
- _Ambient: 0.5
- _Bevel: 0.5
@@ -221,27 +154,8 @@ Material:
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
<<<<<<< HEAD
m_BuildTextureStacks: []
m_AllowLocking: 1
=======
<<<<<<< HEAD
m_BuildTextureStacks: []
m_AllowLocking: 1
=======
<<<<<<< HEAD
m_BuildTextureStacks: []
m_AllowLocking: 1
=======
<<<<<<< HEAD
=======
m_BuildTextureStacks: []
m_AllowLocking: 1
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -255,23 +169,11 @@ MonoBehaviour:
m_Name: LiberationSans SDF - Fallback
m_EditorClassIdentifier:
m_Version: 1.1.0
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_FaceInfo:
m_FaceIndex: 0
m_FamilyName: Liberation Sans
@@ -294,25 +196,12 @@ MonoBehaviour:
m_StrikethroughOffset: 18
m_StrikethroughThickness: 6.298828
m_TabWidth: 24
<<<<<<< HEAD
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
=======
<<<<<<< HEAD
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
m_SourceFontFilePath:
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
=======
<<<<<<< HEAD
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
=======
<<<<<<< HEAD
m_GlyphTable: []
m_CharacterTable: []
m_AtlasTextures:
@@ -364,16 +253,10 @@ MonoBehaviour:
m_MarkToMarkAdjustmentRecords: []
fallbackFontAssets: []
m_FallbackFontAssetTable: []
=======
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_CreationSettings:
sourceFontFileName:
sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
faceIndex: 0
pointSizeSamplingMode: 0
pointSize: 86
@@ -390,25 +273,10 @@ MonoBehaviour:
fontStyleModifier: 0
renderMode: 4169
includeFontFeatures: 1
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
m_SourceFontFilePath:
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
m_GlyphTable: []
m_CharacterTable: []
m_AtlasTextures:
@@ -417,25 +285,17 @@ MonoBehaviour:
m_IsMultiAtlasTexturesEnabled: 1
m_GetFontFeatures: 1
m_ClearDynamicDataOnBuild: 1
<<<<<<< HEAD
=======
>>>>>>> origin/main
m_AtlasWidth: 512
m_AtlasHeight: 512
m_AtlasPadding: 9
m_AtlasRenderMode: 4169
<<<<<<< HEAD
=======
>>>>>>> origin/main
m_UsedGlyphRects: []
m_FreeGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 511
m_Height: 511
<<<<<<< HEAD
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords: []
@@ -684,7 +544,7 @@ MonoBehaviour:
m_MarkToMarkAdjustmentRecords: []
m_ShouldReimportFontFeatures: 0
m_FallbackFontAssetTable: []
=======
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
@@ -695,15 +555,6 @@ MonoBehaviour:
m_ShouldReimportFontFeatures: 0
m_FallbackFontAssetTable: []
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_FontWeightTable:
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
@@ -754,18 +605,6 @@ MonoBehaviour:
boldSpacing: 7
italicStyle: 35
tabSize: 10
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_fontInfo:
Name: Liberation Sans
PointSize: 86
@@ -788,13 +627,11 @@ MonoBehaviour:
Padding: 9
AtlasWidth: 1024
AtlasHeight: 1024
<<<<<<< HEAD
m_glyphInfoList: []
m_KerningTable:
kerningPairs: []
fallbackFontAssets: []
atlas: {fileID: 0}
=======
m_glyphInfoList: []
@@ -803,15 +640,6 @@ MonoBehaviour:
fallbackFontAssets: []
atlas: {fileID: 0}
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
--- !u!28 &28268798066460806
Texture2D:
m_ObjectHideFlags: 0
@@ -823,31 +651,18 @@ Texture2D:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> origin/main
m_IsAlphaChannelOptional: 0
serializedVersion: 4
m_Width: 1
m_Height: 1
m_CompleteImageSize: 1
m_MipsStripped: 0
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 2
m_Width: 0
m_Height: 0
m_CompleteImageSize: 0
>>>>>>> origin/main
>>>>>>> origin/main
m_TextureFormat: 1
m_MipCount: 1
m_IsReadable: 1
@@ -856,14 +671,7 @@ Texture2D:
m_MipmapLimitGroupName:
m_StreamingMipmaps: 0
m_StreamingMipmapsPriority: 0
<<<<<<< HEAD
m_VTOnly: 0
=======
<<<<<<< HEAD
m_VTOnly: 0
=======
=======
>>>>>>> origin/main
m_IsAlphaChannelOptional: 0
serializedVersion: 4
m_Width: 1
@@ -879,13 +687,6 @@ Texture2D:
m_StreamingMipmaps: 0
m_StreamingMipmapsPriority: 0
m_VTOnly: 0
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_AlphaIsTransparency: 0
m_ImageCount: 1
m_TextureDimension: 2
@@ -901,41 +702,16 @@ Texture2D:
m_LightmapFormat: 0
m_ColorSpace: 0
<<<<<<< HEAD
m_PlatformBlob:
image data: 1
_typelessdata: 00
m_StreamData:
serializedVersion: 2
=======
<<<<<<< HEAD
m_PlatformBlob:
=======
<<<<<<< HEAD
m_PlatformBlob:
image data: 1
_typelessdata: 00
m_StreamData:
serializedVersion: 2
=======
<<<<<<< HEAD
image data: 0
_typelessdata:
m_StreamData:
=======
m_PlatformBlob:
>>>>>>> origin/main
image data: 1
_typelessdata: 00
m_StreamData:
serializedVersion: 2
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
offset: 0
size: 0
path:

View File

@@ -7970,12 +7970,8 @@ MonoBehaviour:
m_MarkToBaseAdjustmentRecords: []
m_MarkToMarkAdjustmentRecords: []
m_ShouldReimportFontFeatures: 0
<<<<<<< HEAD
m_FallbackFontAssetTable:
- {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
=======
m_FallbackFontAssetTable: []
>>>>>>> origin/main
m_FontWeightTable:
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}

View File

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

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 74379ac554348f84c8d3abeb440b79b9
=======
guid: f0565825ed419f845acc6ec1f2406ead
>>>>>>> origin/main
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -53,8 +53,6 @@
},
"url": "https://packages.unity.com"
},
<<<<<<< HEAD
=======
"com.unity.mathematics": {
"version": "1.3.2",
"depth": 2,
@@ -62,7 +60,7 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
>>>>>>> origin/main
"com.unity.multiplayer.center": {
"version": "1.0.0",
"depth": 0,