同步化工的修改

Assets/Scenes/Menu.unity

@@ -4675,7 +4675,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: f970b800d0d1afa48beb30bf44841e07, type: 3}
+  m_Sprite: {fileID: 21300000, guid: f4262a9686e9dd44eae0a77d67e04631, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7763,7 +7763,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 1ac4104c2fed0e44f816354e5e69adcc, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9123073fe76e36f448dbba7a3f8fc45d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Scripts/Common/AttributeSetting/BaseAttributeSet.cs

@@ -40,6 +40,12 @@ public abstract class BaseAttributeSet : MonoBehaviour
         MessageDispatcher.RemoveListener("DELETE_COMMAND", Close);
         MessageDispatcher.RemoveListener("GROUP_DISMISS", Close);//删除组
     }
+    public virtual void OnDestroy()
+    {
+        MessageDispatcher.RemoveListener("DELETE_ALL_COMMAND", Close);
+        MessageDispatcher.RemoveListener("DELETE_COMMAND", Close);
+        MessageDispatcher.RemoveListener("GROUP_DISMISS", Close);//删除组
+    }
 
     private void Close(IMessage msg)
     {

Assets/Scripts/Common/ChatSystem/FireSiteInfo/FireInfoToggle.cs

@@ -24,11 +24,14 @@ public class FireInfoToggle : BaseToggle
     }
     public void CancelToggle(IMessage obj)
     {
-        var num = (int)obj.Data;
-        int myNum = int.Parse(gameObject.name);
-        if (num == myNum)
+        if(gameObject)
         {
-            GetComponent<Toggle>().isOn = false;
+            var num = (int)obj.Data;
+            int myNum = int.Parse(gameObject.name);
+            if (num == myNum)
+            {
+                GetComponent<Toggle>().isOn = false;
+            }
         }
     }
     public override void RespondFun(bool value)

Assets/Scripts/Common/Disasters/FireSpread/FireLiquipPanel.cs

@@ -113,23 +113,28 @@ public class FireLiquipPanel : BaseAttributeSet
 
     private void SureClick()
     {
-        SetTime = Mtime * 60 + Stime;
-        string settimestring = SecondToHMS(SetTime);
-        chooseObj.GetComponent<FireLiquidLevelCtrl>().showTime = settimestring;
-
-        //发送设置时间
-        MessageDispatcher.SendMessage("SetTime", new SetLiquipdata() {
-            LiquipId = chooseObj.GetComponent<BaseGameObjInfo>().gameObjID,
-            time=settimestring,
-        });
-        MessageDispatcher.SendMessage("CANCEL_OBJ_SELECTED");
-
-        if (GameSettings.othersSettings.mode != Mode.DisasterManagement)
+        if (chooseObj&&chooseObj.GetComponent<FireLiquidLevelCtrl>()) 
         {
-            NetworkManager.Default.SendAsync("SET_LIQUIP_HIDE_SYNC", chooseObj.GetComponent<BaseGameObjInfo>().gameObjID);
-        }
+            SetTime = Mtime * 60 + Stime;
+            string settimestring = SecondToHMS(SetTime);
+            chooseObj.GetComponent<FireLiquidLevelCtrl>().showTime = settimestring;
+
+            //发送设置时间
+            MessageDispatcher.SendMessage("SetTime", new SetLiquipdata()
+            {
+                LiquipId = chooseObj.GetComponent<BaseGameObjInfo>().gameObjID,
+                time = settimestring,
+            });
+            MessageDispatcher.SendMessage("CANCEL_OBJ_SELECTED");
 
-        LoadPromptWin.Instance.LoadTextPromptWindow("设置成功",1f);
+            if (GameSettings.othersSettings.mode != Mode.DisasterManagement)
+            {
+                NetworkManager.Default.SendAsync("SET_LIQUIP_HIDE_SYNC", chooseObj.GetComponent<BaseGameObjInfo>().gameObjID);
+            }
+
+            LoadPromptWin.Instance.LoadTextPromptWindow("设置成功", 1f);
+        }
+       
     }
 
     public void Close()

Assets/Scripts/Common/Disasters/Wound_Trapped/TrappedMoveFree.cs

@@ -915,7 +915,7 @@ public class TrappedMoveFree : MonoBehaviour
         }
         if (!firemanHit && !IsBefirstAirOrMoving)
         {
-            if (CurrentUserInfo.mySelf.Id == CurrentUserInfo.room.Owner.UserInfo.Id)
+            if (CurrentUserInfo.room!=null&&CurrentUserInfo.mySelf.Id == CurrentUserInfo.room.Owner.UserInfo.Id)
             {
                 float rang = UnityEngine.Random.Range(2f, 8f);
                 StartCoroutine(randompoint(rang));

Assets/Scripts/Common/GameObjectSelect/ObjSelectCtrl.cs

@@ -133,10 +133,17 @@ public class ObjSelectCtrl : MonoBehaviour
             }
             else
             {
-                // 没有背包的对象关闭背包
-                UIManager.HideView<UIViewBag>();
-                // 关闭仓库界面
-                UIManager.HideView<UIViewEquipLib>();
+                if (GameObject.Find("UIViewBag")) 
+                {
+                    // 没有背包的对象关闭背包
+                    UIManager.HideView<UIViewBag>();
+
+                }
+                if (GameObject.Find("UIViewEquipLib")) 
+                {
+                    // 关闭仓库界面
+                    UIManager.HideView<UIViewEquipLib>();
+                }
             }
         }
     }

Assets/Scripts/Common/Tools/WaterConnonController.cs

@@ -601,20 +601,25 @@ public class WaterConnonController : MonoBehaviour
         }
         for (int i = 0; i < allwatersource.Count; i++)
         {
-            WaterSource ws = EntitiesManager.Instance.GetEntityByID(allwatersource[i]).GetComponent<WaterSource>();
-            if (ws.TotalWater != -100)
+            if (EntitiesManager.Instance.GetEntityByID(allwatersource[i]) != null &&
+                EntitiesManager.Instance.GetEntityByID(allwatersource[i]).GetComponent<WaterSource>())
             {
-                remainwater += (ws.TotalWater - ws.AllUserWater);
-                //if (ws.GetComponent<TruckBindWaterSource>())
-                //{
-                //    allflow += ws.GetComponent<TruckBindWaterSource>().Flow;
-                //}
-            }
-            else
-            {
-                remainwater = -100;
-                break;
+                WaterSource ws = EntitiesManager.Instance.GetEntityByID(allwatersource[i]).GetComponent<WaterSource>();
+                if (ws.TotalWater != -100)
+                {
+                    remainwater += (ws.TotalWater - ws.AllUserWater);
+                    //if (ws.GetComponent<TruckBindWaterSource>())
+                    //{
+                    //    allflow += ws.GetComponent<TruckBindWaterSource>().Flow;
+                    //}
+                }
+                else
+                {
+                    remainwater = -100;
+                    break;
+                }
             }
+
         }
         int remaintime = 0;
         //allflow += Flow;

Assets/Scripts/DongYouLiQing/4GMap/FourthGLookOver.cs

@@ -21,6 +21,13 @@ public class FourthGLookOver : BaseToggle {
         MessageDispatcher.AddListener("4GNobodySelected", ClearSelectedPerson);
         MessageDispatcher.AddListener("QuadrupleMode", ControlLookOverMode);        
 	}
+    public override void OnDestroy()
+    {
+        base.OnDestroy();
+        MessageDispatcher.RemoveListener("FourthGLookOver", SetSelectedPerson);
+        MessageDispatcher.RemoveListener("4GNobodySelected", ClearSelectedPerson);
+        MessageDispatcher.RemoveListener("QuadrupleMode", ControlLookOverMode);
+    }
     /// <summary>
     /// 开启四分屏模式时，查看模式不可用
     /// </summary>

Assets/Scripts/DongYouLiQing/4GMap/QuadrupleDisplay.cs

@@ -11,7 +11,11 @@ public class QuadrupleDisplay : MonoBehaviour {
         MessageDispatcher.AddListener("QuadDisplay", InstantiateDisplay);        
         //MessageDispatcher.AddListener("QuadrupleMode", DeleteAllDisplay);     
 	}
-	void InstantiateDisplay(IMessage obj)
+    private void OnDestroy()
+    {
+        MessageDispatcher.RemoveListener("QuadDisplay", InstantiateDisplay);
+    }
+    void InstantiateDisplay(IMessage obj)
     {
         var info = (CloneGameObjInfo)obj.Data;
         GameObject item = Instantiate(itemPre, transform);