4340 【前端】支持xlua方便IOS提审

client_Wu Xijin

2018-10-27 45c82c513c67130bb52cb5e7f2f10c957e463cf1

 Core/ResModule/GameObjectPoolManager.cs

@@ -3,6 +3,7 @@
using System;

using TableConfig;



[XLua.LuaCallCSharp]

public class GameObjectPoolManager : SingletonMonobehaviour<GameObjectPoolManager>

{

#if UNITY_EDITOR

@@ -147,8 +148,8 @@


    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 +158,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 +176,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 +194,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 +219,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 +236,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 +254,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)

        {

@@ -565,6 +566,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)