From 1868bc632a9134b6891d4fc5f427e3f280b9e973 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 18 十月 2018 09:53:30 +0800
Subject: [PATCH] 3335 代码维护，修改通用配置定义类型。
---
Core/ResModule/GameObjectPoolManager.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Core/ResModule/GameObjectPoolManager.cs b/Core/ResModule/GameObjectPoolManager.cs
index 6990b5d..4902240 100644
--- a/Core/ResModule/GameObjectPoolManager.cs
+++ b/Core/ResModule/GameObjectPoolManager.cs
@@ -147,8 +147,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 +157,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 +175,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 +193,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 +218,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 +235,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 +253,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)
{
--
Gitblit v1.8.0