解决冲突

wangguan

2020-10-31 0b218adac9ff0871a96a7e190ed77ab7d36e0aef

解决冲突

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 0.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 0.prefab.meta

New file
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c4d109853a118a8449507051485a3969
PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 1.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 1.prefab.meta

New file
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a8c44e860a6ff3442a0ab21ec36b3487
PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 2.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 2.prefab.meta

New file
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0a1b9c8af80fea84588ca8b548e9dac8
PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 3.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 3.prefab.meta

New file
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: edca353d318becb48bd5b657d39d4492
PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 4.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 4.prefab.meta

New file
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 517d2b5ee0bf1a3489b4273193b8a322
PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/Fire/GrowUpTower_0.prefab

@@ -394,7 +394,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1746672929845058, guid: 247db1cfa2c85c04d877413f1153d1ff, type: 3}
  projectile: {fileID: 2369440489128176080, guid: c4d109853a118a8449507051485a3969,
    type: 3}
  projectilePoints:
  - {fileID: 4457715277627928}
  epicenter: {fileID: 4795219791600268}

 Assets/Prefabs/Towers/Fire/GrowUpTower_1.prefab

@@ -29115,7 +29115,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1746672929845058, guid: f3a2193703a514641acddc2901dca215, type: 3}
  projectile: {fileID: 2369440489128176080, guid: a8c44e860a6ff3442a0ab21ec36b3487,
    type: 3}
  projectilePoints:
  - {fileID: 4129159134802836}
  epicenter: {fileID: 4187985146200546}

 Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab

@@ -28909,7 +28909,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1746672929845058, guid: b27ceafe15cad0d40a51e518d630263d, type: 3}
  projectile: {fileID: 2369440489128176080, guid: 0a1b9c8af80fea84588ca8b548e9dac8,
    type: 3}
  projectilePoints:
  - {fileID: 4575828760328406}
  epicenter: {fileID: 4737672716932362}
@@ -48415,7 +48416,7 @@
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: a33383faa79b34b4faa6a615655b7ebe, type: 2}
  - {fileID: 2100000, guid: 94110c9a997a3cf4d971aa75155f5351, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Assets/Prefabs/Towers/Fire/GrowUpTower_3.prefab

@@ -28909,7 +28909,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1746672929845058, guid: 867b777df94d8894680bca0871c747ef, type: 3}
  projectile: {fileID: 2369440489128176080, guid: edca353d318becb48bd5b657d39d4492,
    type: 3}
  projectilePoints:
  - {fileID: 4575828760328406}
  epicenter: {fileID: 4737672716932362}
@@ -48415,7 +48416,7 @@
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: d859f1704ccb66f448036a3a0d3b2926, type: 2}
  - {fileID: 2100000, guid: 94110c9a997a3cf4d971aa75155f5351, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Assets/Prefabs/Towers/Fire/GrowUpTower_4.prefab

@@ -28909,7 +28909,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1746672929845058, guid: b12637cf8987f6f459bcba7c17f01100, type: 3}
  projectile: {fileID: 2369440489128176080, guid: 517d2b5ee0bf1a3489b4273193b8a322,
    type: 3}
  projectilePoints:
  - {fileID: 4575828760328406}
  epicenter: {fileID: 4737672716932362}
@@ -48415,7 +48416,7 @@
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: 95998a1f7e65d4143ae96a999b95728e, type: 2}
  - {fileID: 2100000, guid: 94110c9a997a3cf4d971aa75155f5351, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Assets/Scripts/TowerDefense/Agents/Agent.cs

@@ -855,7 +855,7 @@
                // 统一管理器内删除当前的Agent:
                AgentInsManager.instance.removeAgent(this);
                this.Remove();
                Debug.Log("删除多余的攻击Agent.");
                //Debug.Log("删除多余的攻击Agent.");
            }
        }