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

Pull request #11: enlevé génération automatique de Level Manager

Browse Source 
Merge in CGD/gather-and-defend from bug/levelManager_auto_generation to main

* commit 'da519fe75fee41e76f13ee7db60fbc0fbf4afa4b':
  enlevé génération automatique de Level Manager
This commit is contained in:
Felix-gabriel Boucher-luneau 2023-06-02 18:15:03 +00:00
commit 3d041bae7f
2 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Assets/LevelEditor/LevelEditorScene.unity
View File

@ -2439,6 +2439,63 @@ Tilemap:
e31: 0 e31: 0
e32: 0 e32: 0
e33: 1 e33: 1
--- !u!1001 &1575455666
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3028288566889208744, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_Name
value: LevelManager
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 02daecb0115395844b4932445d039051, type: 3}
--- !u!1 &1588294913 --- !u!1 &1588294913
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

12
Assets/Scripts/LevelManager/LevelManager.cs
View File

@ -21,21 +21,19 @@ public class LevelManager : Singleton<LevelManager>
private readonly List<ILevelObject> _toRemove; private readonly List<ILevelObject> _toRemove;
private readonly List<ILevelObject> _levelObjects; private readonly List<ILevelObject> _levelObjects;
public Level _currentLevel;
public Transform LevelTransform public Transform LevelTransform
{ {
get; private set; get;
set;
} }
public Level _currentLevel;
public LevelManager() public LevelManager()
{ {
_toAdd = new List<ILevelObject>(); _toAdd = new List<ILevelObject>();
_toRemove = new List<ILevelObject>(); _toRemove = new List<ILevelObject>();
_levelObjects = new List<ILevelObject>(); _levelObjects = new List<ILevelObject>();
var mgrScript = Object.FindObjectOfType<LevelManagerScript>();
if (!mgrScript) mgrScript = new GameObject(nameof(LevelManager)).AddComponent<LevelManagerScript>();
LevelTransform = mgrScript.transform;
} }
#region [~CRUD~] #region [~CRUD~]