Skip to content

Commit 8b6b6d2

Browse files
amirhosseinjoyixiramirhosseinjoyixir
committed
Merge branch 'release/3.1.0'
2 parents c4fe388 + a4ba090 commit 8b6b6d2

File tree

12 files changed

+22
-21
lines changed

12 files changed

+22
-21
lines changed

‎GameManager/Assets/Joyixir/GameManager/Demo/Scripts/LevelManagerListener.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
using Joyixir.GameManager.Scripts.Level;
1+
using Joyixir.GameManager.Level;
22
using TMPro;
33
using UnityEngine;
4+
45
namespace Joyixir.GameManager.Demo
56
{
67
public class LevelManagerListener : MonoBehaviour

‎GameManager/Assets/Joyixir/GameManager/Demo/Scripts/MyLevel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using Joyixir.GameManager.Scripts.Level;
1+
using Joyixir.GameManager.Level;
22
using UnityEngine;
33

4-
namespace Joyixir.GameManager.Demo.Scripts
4+
namespace Joyixir.GameManager.Demo
55
{
66
public class MyLevel : BaseLevel
77
{

‎GameManager/Assets/Joyixir/GameManager/Demo/Scripts/MyLevelConfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using Joyixir.GameManager.Scripts.Level;
21
using UnityEngine;
2+
using Joyixir.GameManager.Level;
33

4-
namespace Joyixir.GameManager.Demo.Scripts
4+
namespace Joyixir.GameManager.Demo
55
{
66
[CreateAssetMenu(fileName = "GameManagerDemoLevel", menuName = "Joyixir/GameManager/Demo/GameManagerDemoLevel", order = 0)]
77
public class MyLevelConfig : BaseLevelConfig

‎GameManager/Assets/Joyixir/GameManager/Demo/Scripts/MySceneBaseLevel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using Joyixir.GameManager.Scripts.Level;
1+
using Joyixir.GameManager.Level;
22
using UnityEngine;
33

4-
namespace Joyixir.GameManager.Demo.Scripts
4+
namespace Joyixir.GameManager.Demo
55
{
66
public class MySceneBaseLevel : BaseLevel
77
{

‎GameManager/Assets/Joyixir/GameManager/Demo/Scripts/MySceneBaseLevelConfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using Joyixir.GameManager.Scripts.Level;
1+
using Joyixir.GameManager.Level;
22
using UnityEngine;
33

4-
namespace Joyixir.GameManager.Demo.Scripts
4+
namespace Joyixir.GameManager.Demo
55
{
66
[CreateAssetMenu(fileName = "GameManagerSceneBaseDemoLevel", menuName = "Joyixir/GameManager/Demo/GameManagerSceneBaseDemoLevel", order = 0)]
77
public class MySceneBaseLevelConfig : BaseLevelConfig

‎GameManager/Assets/Joyixir/GameManager/Demo/Scripts/MySecondSceneBaseLevel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using Joyixir.GameManager.Scripts.Level;
1+
using Joyixir.GameManager.Level;
22
using UnityEngine;
33

4-
namespace Joyixir.GameManager.Demo.Scripts
4+
namespace Joyixir.GameManager.Demo
55
{
66
public class MySecondSceneBaseLevel : BaseLevel
77
{

‎GameManager/Assets/Joyixir/GameManager/Demo/Scripts/MySecondSceneBaseLevelConfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using Joyixir.GameManager.Scripts.Level;
1+
using Joyixir.GameManager.Level;
22
using UnityEngine;
33

4-
namespace Joyixir.GameManager.Demo.Scripts
4+
namespace Joyixir.GameManager.Demo
55
{
66
[CreateAssetMenu(fileName = "GameManagerSecondSceneBaseDemoLevel", menuName = "Joyixir/GameManager/Demo/GameManagerSecondSceneBaseDemoLevel", order = 0)]
77
public class MySecondSceneBaseLevelConfig : BaseLevelConfig

‎GameManager/Assets/Joyixir/GameManager/Scripts/GameManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using Joyixir.GameManager.Scripts.Level;
2-
using Joyixir.GameManager.Scripts.Utils;
1+
using Joyixir.GameManager.Level;
2+
using Joyixir.GameManager.Utils;
33
using UnityEngine;
44

5-
namespace Joyixir.GameManager.Scripts
5+
namespace Joyixir.GameManager
66
{
77
[AddComponentMenu("Joyixir/GameManagement/GameManager")]
88
public class GameManager : MonoBehaviour

‎GameManager/Assets/Joyixir/GameManager/Scripts/Level/BaseLevel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using UnityEngine;
33

4-
namespace Joyixir.GameManager.Scripts.Level
4+
namespace Joyixir.GameManager.Level
55
{
66
public abstract class BaseLevel : MonoBehaviour
77
{

‎GameManager/Assets/Joyixir/GameManager/Scripts/Level/BaseLevelConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace Joyixir.GameManager.Scripts.Level
3+
namespace Joyixir.GameManager.Level
44
{
55
public abstract class BaseLevelConfig : ScriptableObject
66
{

‎GameManager/Assets/Joyixir/GameManager/Scripts/Level/LevelManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using System;
22
using System.Collections;
33
using System.Collections.Generic;
4-
using Joyixir.GameManager.Scripts.Utils;
4+
using Joyixir.GameManager.Utils;
55
using Joyixir.Utils;
66
using UnityEngine;
77
using UnityEngine.SceneManagement;
88
using Random = UnityEngine.Random;
99

10-
namespace Joyixir.GameManager.Scripts.Level
10+
namespace Joyixir.GameManager.Level
1111
{
1212
[AddComponentMenu("Joyixir/GameManagement/LevelManager")]
1313
public class LevelManager : MonoBehaviour

‎GameManager/Assets/Joyixir/GameManager/Scripts/Utils/GameManagementPlayerPrefs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace Joyixir.GameManager.Scripts.Utils
3+
namespace Joyixir.GameManager.Utils
44
{
55
internal static class GameManagementPlayerPrefs
66
{

0 commit comments

Comments
 (0)