From 9d42c069d9dccee4aa898f8f7c7267b5266aa682 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 13 十一月 2018 21:16:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/ResModule/GameObjectPoolManager.cs | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/Core/ResModule/GameObjectPoolManager.cs b/Core/ResModule/GameObjectPoolManager.cs
index 6990b5d..797e411 100644
--- a/Core/ResModule/GameObjectPoolManager.cs
+++ b/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)
--
Gitblit v1.8.0