This commit is contained in:
wulongxiao 2024-12-30 12:13:50 +08:00
parent 8b391dc946
commit 8e97dea665
5 changed files with 28 additions and 38 deletions

View File

@ -330,7 +330,7 @@ MonoBehaviour:
id: 0 id: 0
Name: Name:
camp: 1 camp: 1
hp: 25 hp: 500
dieIndex: 1 dieIndex: 1
Hpfiil: {fileID: 1566038940701374259} Hpfiil: {fileID: 1566038940701374259}
HpfiilYello: {fileID: 605146830908541898} HpfiilYello: {fileID: 605146830908541898}

View File

@ -850,8 +850,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 462.18054, y: -1101.9258} m_AnchoredPosition: {x: 462.18054, y: -1051.9258}
m_SizeDelta: {x: 725.2872, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5361498673185763723 --- !u!114 &5361498673185763723
MonoBehaviour: MonoBehaviour:

View File

@ -4685,7 +4685,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3} - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3} - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchorMin.x propertyPath: m_AnchorMin.x
@ -4693,15 +4693,15 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3} - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3} - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 166
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3} - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 166
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3} - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -4733,11 +4733,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3} - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 208
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3} - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -116
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3} - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x

View File

@ -1320,10 +1320,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 628.68, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &514399549474802177 --- !u!222 &514399549474802177
CanvasRenderer: CanvasRenderer:
@ -2127,10 +2127,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 132, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1106133910927903845 --- !u!222 &1106133910927903845
CanvasRenderer: CanvasRenderer:
@ -2432,10 +2432,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 380.34, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6130671505914922423 --- !u!222 &6130671505914922423
CanvasRenderer: CanvasRenderer:
@ -6405,10 +6405,10 @@ RectTransform:
m_Father: {fileID: 8646173537015180660} m_Father: {fileID: 8646173537015180660}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 132, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8646173537325353418 --- !u!222 &8646173537325353418
CanvasRenderer: CanvasRenderer:

View File

@ -92,12 +92,10 @@ public class SpawnPool : Base
void Start() void Start()
{ {
//this.StartSpawning();
Base.GlobalObj.GetComponent<gameGlobal>().OnGamePlay += this.StartSpawning; Base.GlobalObj.GetComponent<gameGlobal>().OnGamePlay += this.StartSpawning;
//currentWave = MengyaoInfo.Instance.m_WaveData[0].AffiliatedWaveNumber;
//GenerateQuantity = MengyaoInfo.Instance.m_WaveData[0].EnemyStatistics[0].EnemyAttributes.Count;
////GenerationIntervalOfOne = MengyaoInfo.Instance.m_WaveData[0].EnemyStatistics[0].
} }
public void UpdateNodeList() public void UpdateNodeList()
{ {
@ -234,15 +232,7 @@ public class SpawnPool : Base
} }
// 当池子中敌人死亡或者被回收时,将其回收到池中
public void ReturnEnemyToPool(GameObject enemy)
{
//enemy.GetComponent<Role>().mycollider.enabled = false;
enemy.SetActive(false); // 禁用敌人对象
EnemyPool.Return(enemy); // 将敌人回收到池中
Enemys.Remove(enemy);
}
private void OnDisable() private void OnDisable()
{ {