3335 修改被服务器踢掉的玩家的提示信息窗口弹出逻辑。

client_Wu Xijin

2019-02-18 0e401e6b5f672e17d08559c36adc6094e55d315e

 Core/ResModule/GameObjectPoolManager.cs

@@ -1,8 +1,9 @@
using System.Collections.Generic;

using UnityEngine;

using System;

using TableConfig;





[XLua.LuaCallCSharp]

public class GameObjectPoolManager : SingletonMonobehaviour<GameObjectPoolManager>

{

#if UNITY_EDITOR

@@ -101,7 +102,7 @@
        string _assetName;

        string _assetBundleName;



        NPCConfig _m = Config.Instance.Get<NPCConfig>(npcID);

        NPCConfig _m = NPCConfig.Get(npcID);



        if (_m == null || _m.MODE.Equals("0"))

        {

@@ -145,10 +146,41 @@
        return RequestPool(prefab).Request();

    }



    public GameObject RequestEmptyJY()

    {

        var _prefab = InstanceResourcesLoader.LoadEmptyJY();

        if (!_prefab)

        {

            return null;

        }



        var _pool = RequestPool(_prefab);

        _pool.assetName = InstanceResourcesLoader.emptyJyName;

        _pool.assetBundleName = "mob/prefab_race_jy";



        return _pool.Request();

    }



    public void ReleaseEmptyJY(GameObject go)

    {

        var _prefab = InstanceResourcesLoader.LoadEmptyJY();

        if (!_prefab)

        {

            return;

        }



        GameObjectPool _pool = RequestPool(_prefab);



        if (_pool != null)

        {

            _pool.Release(go);

        }

    }



    public GameObject RequestDefaultPet()

    {

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[2][0],

                                                             GeneralConfig.Instance.ModeDefaultConfig[2][1]);

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[2][0],

                                                             GeneralDefine.ModeDefaultConfig[2][1]);



        if (!_prefab)

        {

@@ -157,16 +189,16 @@


        GameObjectPool _pool = RequestPool(_prefab);



        _pool.assetName = GeneralConfig.Instance.ModeDefaultConfig[2][1];

        _pool.assetBundleName = GeneralConfig.Instance.ModeDefaultConfig[2][0];

        _pool.assetName = GeneralDefine.ModeDefaultConfig[2][1];

        _pool.assetBundleName = GeneralDefine.ModeDefaultConfig[2][0];



        return _pool.Request();

    }



    public GameObject RequestDefaultFightNpc()

    {

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[1][0],

                                                             GeneralConfig.Instance.ModeDefaultConfig[1][1]);

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[1][0],

                                                             GeneralDefine.ModeDefaultConfig[1][1]);



        if (!_prefab)

        {

@@ -175,16 +207,16 @@


        GameObjectPool _pool = RequestPool(_prefab);



        _pool.assetName = GeneralConfig.Instance.ModeDefaultConfig[1][1];

        _pool.assetBundleName = GeneralConfig.Instance.ModeDefaultConfig[1][0];

        _pool.assetName = GeneralDefine.ModeDefaultConfig[1][1];

        _pool.assetBundleName = GeneralDefine.ModeDefaultConfig[1][0];



        return _pool.Request();

    }



    public GameObject RequestDefaultFuncNpc()

    {

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[0][0],

                                                             GeneralConfig.Instance.ModeDefaultConfig[0][1]);

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[0][0],

                                                             GeneralDefine.ModeDefaultConfig[0][1]);



        if (!_prefab)

        {

@@ -193,16 +225,16 @@


        GameObjectPool _pool = RequestPool(_prefab);



        _pool.assetName = GeneralConfig.Instance.ModeDefaultConfig[0][1];

        _pool.assetBundleName = GeneralConfig.Instance.ModeDefaultConfig[0][0];

        _pool.assetName = GeneralDefine.ModeDefaultConfig[0][1];

        _pool.assetBundleName = GeneralDefine.ModeDefaultConfig[0][0];



        return _pool.Request();

    }



    public void ReleaseDefaultPet(GameObject go)

    {

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[2][0],

                                                             GeneralConfig.Instance.ModeDefaultConfig[2][1]);

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[2][0],

                                                             GeneralDefine.ModeDefaultConfig[2][1]);

        if (!_prefab)

        {

            return;

@@ -218,8 +250,8 @@


    public void ReleaseDefaultHorse(GameObject go)

    {

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[3][0],

                                                             GeneralConfig.Instance.ModeDefaultConfig[3][1]);

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[3][0],

                                                             GeneralDefine.ModeDefaultConfig[3][1]);

        if (!_prefab)

        {

            return;

@@ -235,8 +267,8 @@


    public void ReleaseDefaultFightNPC(GameObject go)

    {

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[1][0],

                                                             GeneralConfig.Instance.ModeDefaultConfig[1][1]);

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[1][0],

                                                             GeneralDefine.ModeDefaultConfig[1][1]);



        if (!_prefab)

        {

@@ -253,8 +285,8 @@


    public void ReleaseDefaultFuncNPC(GameObject go)

    {

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[0][0],

                                                             GeneralConfig.Instance.ModeDefaultConfig[0][1]);

        GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[0][0],

                                                             GeneralDefine.ModeDefaultConfig[0][1]);



        if (!_prefab)

        {

@@ -274,7 +306,7 @@
        string _assetName;

        string _assetBundleName;



        NPCConfig _m = Config.Instance.Get<NPCConfig>(npcID);

        NPCConfig _m = NPCConfig.Get(npcID);



        if (_m == null || _m.MODE.Equals("0"))

        {

@@ -565,6 +597,7 @@
                DebugItem _debugItem = Instance.m_DebugInstIDDict[_go.GetInstanceID()];

                _debugItem.transform.SetParent(m_DebugFree);

#endif

                _go.transform.SetParent(Instance.m_TargetContainer);

                _go.transform.position = Constants.Special_Hide_Position;



                if (releaseCallBack != null)