Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Clean code; Remove text on levels; Load game scene for now when clicking on a level btn

Browse Source
This commit is contained in:
craftwill 2023-07-14 13:01:21 -04:00
parent d12b9c2a62
commit 1d147bb207
8 changed files with 103 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Prefabs/UI/WorldMap/Btn_Level.prefab
View File

@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 1893888152474992944}
- component: {fileID: 1893888152474992910}
- component: {fileID: 1893888152474992911}
- component: {fileID: 3635312510255970917}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@ -60,7 +61,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -135,6 +136,18 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!225 &3635312510255970917
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1893888152474992945}
m_Enabled: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &1893888152770301340
GameObject:
m_ObjectHideFlags: 0

10
Assets/Prefabs/UI/WorldMap/WorldMapEditor.prefab
View File

@ -41,10 +41,10 @@ MonoBehaviour:
m_GameObject: {fileID: 3405186844740662670}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 551b5e1cdf881454091dab91f3b468e8, type: 3}
m_Script: {fileID: 11500000, guid: 0d6233d8dc8acbe4ea0a57fc4554836d, type: 3}
m_Name:
m_EditorClassIdentifier:
buttonList: []
_unlockedIcon: {fileID: 21300000, guid: e8fd4cf19b7d3fa46a0f3d04d7653832, type: 3}
_lockedIcon: {fileID: 21300000, guid: 21a4590b4c1723f48be7dd9cdcf7bca5, type: 3}
_savedIcon: {fileID: 21300000, guid: f293941fc69e7f34995120515f6133da, type: 3}
_buttonList: []
_unlockedIcon: {fileID: 21300000, guid: 69b6c29431f5c054eb9e4d971c438d0c, type: 3}
_lockedIcon: {fileID: 21300000, guid: 08856ba46a79dee4f92032e73cd1ec28, type: 3}
_savedIcon: {fileID: 21300000, guid: ee253f177a5384e4db2a7405d9b7f0df, type: 3}

120
Assets/Scenes/LevelSelect.unity
View File

@ -278,7 +278,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -437,7 +437,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -596,7 +596,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -1076,7 +1076,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -1217,7 +1217,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.39996338, y: -0.00045776367}
m_AnchoredPosition: {x: 0.39996338, y: -0.00048828125}
m_SizeDelta: {x: 0.39990234, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1319691315
@ -1311,7 +1311,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -1425,7 +1425,7 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 551b5e1cdf881454091dab91f3b468e8, type: 3}
m_Script: {fileID: 11500000, guid: 0d6233d8dc8acbe4ea0a57fc4554836d, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1355576000
@ -1481,7 +1481,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -1790,7 +1790,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -1949,7 +1949,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -2225,7 +2225,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -2384,7 +2384,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -2490,50 +2490,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1893888152770301340, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
m_PrefabInstance: {fileID: 1878632746}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1896950921
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1896950923}
- component: {fileID: 1896950922}
m_Layer: 0
m_Name: LevelSave
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1896950922
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1896950921}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc8ad172127676148a68f7d85f01e5dc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1896950923
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1896950921}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 527.7125, y: 260.25394, z: 5.853995}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1893888154391728751
PrefabInstance:
m_ObjectHideFlags: 0
@ -2583,7 +2539,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldEditor, GameAssembly
value: WorldMapManager, GameAssembly
objectReference: {fileID: 0}
- target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
@ -2742,11 +2698,15 @@ PrefabInstance:
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: saveClass
value:
objectReference: {fileID: 1896950922}
objectReference: {fileID: 0}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: buttonList.Array.size
value: 11
objectReference: {fileID: 0}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.size
value: 11
objectReference: {fileID: 0}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: buttonList.Array.data[0]
value:
@ -2787,9 +2747,53 @@ PrefabInstance:
propertyPath: buttonList.Array.data[9]
value:
objectReference: {fileID: 1538036939}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[0]
value:
objectReference: {fileID: 1893888154391728752}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[1]
value:
objectReference: {fileID: 1580267099}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[2]
value:
objectReference: {fileID: 1834603330}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[3]
value:
objectReference: {fileID: 1330348924}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[4]
value:
objectReference: {fileID: 193101751}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[5]
value:
objectReference: {fileID: 1355576002}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[6]
value:
objectReference: {fileID: 1878632748}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[7]
value:
objectReference: {fileID: 407607521}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[8]
value:
objectReference: {fileID: 1216504576}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[9]
value:
objectReference: {fileID: 1538036939}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: buttonList.Array.data[10]
value:
objectReference: {fileID: 448638733}
- target: {fileID: 3405186844740662671, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
propertyPath: _buttonList.Array.data[10]
value:
objectReference: {fileID: 448638733}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}

8
Assets/Scripts/WorldMap.meta Normal file
View File

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

29
Assets/Scripts/LevelEditor/WorldEditor.cs → Assets/Scripts/WorldMap/WorldMapManager.cs
View File

@ -6,31 +6,25 @@ using UnityEngine.SceneManagement;
using System;
using UnityEditor;
public class WorldEditor : MonoBehaviour
public class WorldMapManager : MonoBehaviour
{
[SerializeField]
private GameObject[] buttonList;
private GameObject[] _buttonList;
[SerializeField]
private Sprite _unlockedIcon;
[SerializeField]
private Sprite _lockedIcon;
[SerializeField]
private Sprite _savedIcon;
[SerializeField]
private LevelSaveClass saveClass;
// Start is called before the first frame update
private WorldMapSave _worldMapSave;
void Start()
{
//TODO: getMajorSaveFile() //Call et obtiens le chemin du fichier de sauvegarde;
_worldMapSave = new WorldMapSave();
UnlockLevels();
}
// Update is called once per frame
void Update()
{
}
/**
* Debloque les niveaux deja debloquer dans le fichier de sauvegarde majeur.
@ -38,14 +32,14 @@ public class WorldEditor : MonoBehaviour
public void UnlockLevels()
{
int counterIndex = 0;
foreach(GameObject CurrentLevelButton in buttonList)
foreach(GameObject CurrentLevelButton in _buttonList)
{
if (saveClass.GetLevelState(counterIndex) == LevelSaveClass.LevelState.UNLOCKED)
if (_worldMapSave.GetLevelState(counterIndex) == WorldMapSave.LevelState.UNLOCKED)
{
CurrentLevelButton.SetActive(true);
ShowUnlockedIcon(CurrentLevelButton);
}
else if (saveClass.GetLevelState(counterIndex) == LevelSaveClass.LevelState.LOCKED)
else if (_worldMapSave.GetLevelState(counterIndex) == WorldMapSave.LevelState.LOCKED)
{
//CurrentLevelButton.SetActive(false);
ShowLockedIcon(CurrentLevelButton);
@ -58,7 +52,6 @@ public class WorldEditor : MonoBehaviour
counterIndex++;
}
}
private void ShowLockedIcon(GameObject currentLevelButton)
{
currentLevelButton.GetComponent<Image>().sprite = _lockedIcon;
@ -76,10 +69,10 @@ public class WorldEditor : MonoBehaviour
public void CallLevelWorld1(int levelToCall)
{
string levelToGet = "1-" + levelToCall;
if (buttonList[levelToCall - 1].GetComponent<Image>().sprite.name != "worldmap_level_locked")
if (_buttonList[levelToCall - 1].GetComponent<Image>().sprite.name != "worldmap_level_locked")
{
LevelManager.Instance.LoadLevel(levelToGet, true);
SceneManager.LoadScene("Game");
//LevelManager.Instance.LoadLevel(levelToGet, true);
}
}
}

2
Assets/Scripts/LevelEditor/WorldEditor.cs.meta → Assets/Scripts/WorldMap/WorldMapManager.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 551b5e1cdf881454091dab91f3b468e8
guid: 0d6233d8dc8acbe4ea0a57fc4554836d
MonoImporter:
externalObjects: {}
serializedVersion: 2

14
Assets/Scripts/LevelManager/LevelSaveClass.cs → Assets/Scripts/WorldMap/WorldMapSave.cs
View File

@ -2,7 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class LevelSaveClass : MonoBehaviour
public class WorldMapSave
{
public enum LevelState
{
@ -14,18 +14,6 @@ public class LevelSaveClass : MonoBehaviour
private LevelState[] levelUnlocked = { LevelState.UNLOCKED, LevelState.UNLOCKED, LevelState.UNLOCKED, LevelState.SAVED,
LevelState.LOCKED, LevelState.LOCKED, LevelState.LOCKED, LevelState.LOCKED, LevelState.LOCKED, LevelState.LOCKED, LevelState.LOCKED };
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
public void UnlockNextLevel(int levelNumber)
{
if(levelNumber == 10)

2
Assets/Scripts/LevelManager/LevelSaveClass.cs.meta → Assets/Scripts/WorldMap/WorldMapSave.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: fc8ad172127676148a68f7d85f01e5dc
guid: 5557c338257bffe4686836fda12d5d43
MonoImporter:
externalObjects: {}
serializedVersion: 2