CommonParameterContainer改为Singleton模式

Assets/Script/GameScript/Character/AgentController.cs

@@ -5,7 +5,6 @@ using UnityEngine;
 
 public class AgentController : MonoBehaviour
 {
-    [SerializeField] public GameObject commonParameterContainerObj;
     [SerializeField] public Camera fpsCam;
 
     [Header("GetAxis() Simulate")]
@@ -41,7 +40,7 @@ public class AgentController : MonoBehaviour
     private void Start()
     {
         // initialize scripts
-        commonPramCon = commonParameterContainerObj.GetComponent<CommonParameterContainer>();
+        commonPramCon = CommonParameterContainer.Instance;
         playerController = transform.GetComponent<CharacterController>();
 
         // initialize Environment parameters

Assets/Script/GameScript/CommonParameterContainer.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class CommonParameterContainer : MonoBehaviour
+public class CommonParameterContainer : Singleton<CommonParameterContainer>
 {
     [SerializeField] private GameObject hudObj;
 
@@ -95,6 +95,7 @@ public class CommonParameterContainer : MonoBehaviour
 
     private void Start()
     {
+        Instance.persistThroughScene = false;
         messageCon = hudObj.GetComponent<MessageBoxController>();
         try
         {

Assets/Script/GameScript/MLAgentsCustomController.cs

@@ -8,7 +8,6 @@ using UnityEngine;
 public class MLAgentsCustomController : Agent
 {
     [SerializeField] private GameObject paramContainerObj;
-    [SerializeField] private GameObject commonParameterContainer;
     [SerializeField] private GameObject targetControllerObj;
     [SerializeField] private GameObject environmentUIObj;
     [SerializeField] private GameObject sideChannelObj;
@@ -50,7 +49,7 @@ public class MLAgentsCustomController : Agent
         agentController = transform.GetComponent<AgentController>();
         raySensors = transform.GetComponent<RaySensors>();
         paramContainer = paramContainerObj.GetComponent<ParameterContainer>();
-        commonParamCon = commonParameterContainer.GetComponent<CommonParameterContainer>();
+        commonParamCon = CommonParameterContainer.Instance;
         targetController = targetControllerObj.GetComponent<TargetController>();
         envUIController = environmentUIObj.GetComponent<EnvironmentUIControl>();
         hudController = hudObj.GetComponent<HUDController>();

Assets/Script/GameScript/ParameterContainer.cs

@@ -7,7 +7,6 @@ public class ParameterContainer : MonoBehaviour
     [SerializeField] private GameObject blockConObj;
     [SerializeField] private GameObject agentObj;
     [SerializeField] private GameObject hudObj;
-    [SerializeField] private GameObject CommonParamObj;
 
     private TargetController targetCon;
     private SceneBlockContainer blockCont;
@@ -56,7 +55,7 @@ public class ParameterContainer : MonoBehaviour
         targetCon = targetConObj.GetComponent<TargetController>();
         blockCont = blockConObj.GetComponent<SceneBlockContainer>();
         messageCon = hudObj.GetComponent<MessageBoxController>();
-        commonParamCont = CommonParamObj.GetComponent<CommonParameterContainer>();
+        commonParamCont = CommonParameterContainer.Instance;
 
         areaTimeBonusPerSec = commonParamCont.areaTimeBonusPerSec;
         freeTimeBonusPerSec = commonParamCont.freeTimeBonusPerSec;

Assets/Script/GameScript/SceneBlockContainer.cs

@@ -7,8 +7,6 @@ public class SceneBlockContainer : MonoBehaviour
     [SerializeField]
     private GameObject environmentObj;
     [SerializeField]
-    private GameObject commonParameterContainerObj;
-    [SerializeField]
     private GameObject hudObj;
 
     // public GameObject[] attackBlockPrefabs = new GameObject[1];
@@ -21,7 +19,7 @@ public class SceneBlockContainer : MonoBehaviour
 
     private void Start()
     {
-        commonParamCon = commonParameterContainerObj.GetComponent<CommonParameterContainer>();
+        commonParamCon = CommonParameterContainer.Instance;
     }
 
     /// <summary>

Assets/Script/GameScript/TargetController.cs

@@ -10,7 +10,6 @@ public class TargetController : MonoBehaviour
     [SerializeField] private GameObject HUDObj;
     [SerializeField] private GameObject sceneBlockContainerObj;
     [SerializeField] private GameObject enemyContainerObj;
-    [SerializeField] private GameObject commonParameterContainerObj;
     [SerializeField] private GameObject environmentUIObj;
 
     // area
@@ -70,7 +69,7 @@ public class TargetController : MonoBehaviour
     // Start is called before the first frame update
     private void Start()
     {
-        commonParamCon = commonParameterContainerObj.GetComponent<CommonParameterContainer>();
+        commonParamCon = CommonParameterContainer.Instance;
         sceneBlockCon = sceneBlockContainerObj.GetComponent<SceneBlockContainer>();
         envUICon = environmentUIObj.GetComponent<EnvironmentUIControl>();
         enemyCon = enemyContainerObj.GetComponent<EnemyContainer>();