foldcc/taptap2024_GJ_chidouren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updat core

Browse Source
This commit is contained in:
Foldcc_b1
2024-10-23 18:46:37 +08:00
parent 4fc0810107
commit 9b4a121e5b
41 changed files with 37911 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Packages/CC-Framework/com.foldcc.cc-framework.common/Script/GamePool/manager/GamePoolManager.cs
View File

@@ -205,7 +205,7 @@ namespace Framework.GamePool.manager
{
var poolObject = this.GamePoolDisableList[i];
if (poolObject.Table.Equals (table))
if (poolObject.Table != null && poolObject.Table.Equals (table))
{
if (isSubTable && !subTable.Equals (poolObject.SubTable , StringComparison.Ordinal))
{
@@ -388,6 +388,11 @@ namespace Framework.GamePool.manager
foreach (var assetRequest in pools)
{
var poolAsset = new PoolAsset (assetRequest, group);
if (poolAsset.PoolAbstract == null)
{
poolAsset.KillAsset ();
continue;
}
if (!this.GamePoolDic.ContainsKey (poolAsset.Table))
{
this.GamePoolDic.Add (poolAsset.Table, poolAsset);
@@ -435,9 +440,9 @@ namespace Framework.GamePool.manager
internal PoolAsset (AssetHandle assetRequest, string Group)
{
this._assetRequest = assetRequest;
this._group = Group;
this._poolAbstract = ((GameObject) assetRequest.AssetObject).GetComponent<GamePoolAbstract> ();
this._assetRequest = assetRequest;
this._group = Group;
this._poolAbstract = ((GameObject) assetRequest.AssetObject).GetComponent<GamePoolAbstract> ();
}
public string Group => this._group;