From c1de51124dcaf0311c715273d895734cabb2227c Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 18 Nov 2020 20:35:24 +0800
Subject: [PATCH] 第一排塔免费开启 眩晕技能特效替换
---
Assets/Prefabs/Enemies/wood 2.prefab | 395 ++++++-----------------------
Assets/Prefabs/Enemies/fire 2.prefab | 127 ++-------
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs | 2
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs | 4
Assets/Prefabs/Enemies/water 1.prefab | 221 ++++++----------
Assets/Scripts/Json/JsonDataCenter.cs | 3
Assets/Scenes/Levels/Battle/Endless2D.unity | 4
7 files changed, 214 insertions(+), 542 deletions(-)
diff --git a/Assets/Prefabs/Enemies/fire 2.prefab b/Assets/Prefabs/Enemies/fire 2.prefab
index 0bd7dff..097cf9c 100644
--- a/Assets/Prefabs/Enemies/fire 2.prefab
+++ b/Assets/Prefabs/Enemies/fire 2.prefab
@@ -273,8 +273,8 @@
- {fileID: 6542537011048626110}
- {fileID: 2982453381423257457}
- {fileID: 6679120199681160672}
- - {fileID: 3395604056345980130}
- {fileID: 6178603281983929972}
+ - {fileID: 4595872435068790202}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -352,7 +352,7 @@
PoisonParticle: {fileID: 1718302357907514560}
PoisonEndParticle: {fileID: 5935093508862825476}
SlowDownParticle: {fileID: 6886032031065297259}
- FrostParticle: {fileID: 9081099759196357925}
+ FrostParticle: {fileID: 4595872434723685104}
FireSkillParticle: {fileID: 6178603283043088035}
appliedEffectOffset: {x: 0, y: 0.1, z: 0.1}
appliedEffectScale: 0.08
@@ -998,141 +998,86 @@
type: 3}
m_PrefabInstance: {fileID: 4796933190690775530}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &7430313061214902615
+--- !u!1001 &6146236397121986736
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8434816861478773449}
m_Modifications:
- - target: {fileID: 692254725541723310, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1809121325120232562, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2023208732165953901, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3148512185824267401, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3622283863595885724, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4292545947651627157, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalPosition.y
- value: 0.52
+ value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalPosition.z
- value: -0.24
+ value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_RootOrder
- value: 9
+ value: 10
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7362736457726227135, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7371666484774926908, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ - target: {fileID: 7677512363771200781, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
propertyPath: m_Name
- value: Effect_bingdong1026
- objectReference: {fileID: 0}
- - target: {fileID: 7371666484774926908, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7421970936961986235, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8473590923595167162, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8719095442663636299, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
+ value: Effect_JiNengBaoShi_Dian_Hit
objectReference: {fileID: 0}
m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: ee054dd88b9be2340a0da4ce80a84f62, type: 3}
---- !u!198 &9081099759196357925 stripped
-ParticleSystem:
- m_CorrespondingSourceObject: {fileID: 1809121325120232562, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- m_PrefabInstance: {fileID: 7430313061214902615}
- m_PrefabAsset: {fileID: 0}
---- !u!4 &3395604056345980130 stripped
+ m_SourcePrefab: {fileID: 100100000, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3}
+--- !u!4 &4595872435068790202 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ m_CorrespondingSourceObject: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
- m_PrefabInstance: {fileID: 7430313061214902615}
+ m_PrefabInstance: {fileID: 6146236397121986736}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &4595872434723685104 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 7677512363561411136, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ m_PrefabInstance: {fileID: 6146236397121986736}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8150421983870813599
PrefabInstance:
@@ -1179,7 +1124,7 @@
- target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
propertyPath: m_RootOrder
- value: 10
+ value: 9
objectReference: {fileID: 0}
- target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
@@ -1218,18 +1163,18 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3}
---- !u!4 &6178603281983929972 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
- type: 3}
- m_PrefabInstance: {fileID: 8150421983870813599}
- m_PrefabAsset: {fileID: 0}
--- !u!198 &6178603283043088035 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 2639904808709911356, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
m_PrefabInstance: {fileID: 8150421983870813599}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &6178603281983929972 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
+ type: 3}
+ m_PrefabInstance: {fileID: 8150421983870813599}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &8970689413692267143
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Enemies/water 1.prefab b/Assets/Prefabs/Enemies/water 1.prefab
index 87a8e97..4e807f7 100644
--- a/Assets/Prefabs/Enemies/water 1.prefab
+++ b/Assets/Prefabs/Enemies/water 1.prefab
@@ -274,7 +274,7 @@
- {fileID: 5468027130051431602}
- {fileID: 200673849226178847}
- {fileID: 4964518330195590823}
- - {fileID: 2323292837256036054}
+ - {fileID: 5004668289563595669}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -352,7 +352,7 @@
PoisonParticle: {fileID: 5162362214322550841}
PoisonEndParticle: {fileID: 3520733133352832967}
SlowDownParticle: {fileID: 137911762185639316}
- FrostParticle: {fileID: 8152897956000995089}
+ FrostParticle: {fileID: 5004668289929344223}
FireSkillParticle: {fileID: 4964518329174177392}
appliedEffectOffset: {x: 0, y: 0.1, z: 0.1}
appliedEffectScale: 0.08
@@ -747,6 +747,87 @@
m_CorrespondingSourceObject: {fileID: 2589099023883815916, guid: 393d187774e421848be71dd6a69be174,
type: 3}
m_PrefabInstance: {fileID: 2452110888275779192}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3456556258320520863
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 8434816861478773449}
+ m_Modifications:
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200781, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_JiNengBaoShi_Dian_Hit
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3}
+--- !u!4 &5004668289563595669 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ m_PrefabInstance: {fileID: 3456556258320520863}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &5004668289929344223 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 7677512363561411136, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ m_PrefabInstance: {fileID: 3456556258320520863}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4198952192164864370
PrefabInstance:
@@ -1217,140 +1298,4 @@
m_CorrespondingSourceObject: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
m_PrefabInstance: {fileID: 6937602200615535948}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &7511902182343609187
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 8434816861478773449}
- m_Modifications:
- - target: {fileID: 692254725541723310, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1809121325120232562, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2023208732165953901, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3148512185824267401, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3622283863595885724, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4292545947651627157, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_RootOrder
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7362736457726227135, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7371666484774926908, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_Name
- value: Effect_bingdong1026
- objectReference: {fileID: 0}
- - target: {fileID: 7421970936961986235, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8115904079539523006, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -0.15
- objectReference: {fileID: 0}
- - target: {fileID: 8473590923595167162, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8719095442663636299, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: ee054dd88b9be2340a0da4ce80a84f62, type: 3}
---- !u!4 &2323292837256036054 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- m_PrefabInstance: {fileID: 7511902182343609187}
- m_PrefabAsset: {fileID: 0}
---- !u!198 &8152897956000995089 stripped
-ParticleSystem:
- m_CorrespondingSourceObject: {fileID: 1809121325120232562, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- m_PrefabInstance: {fileID: 7511902182343609187}
m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/Enemies/wood 2.prefab b/Assets/Prefabs/Enemies/wood 2.prefab
index 1d25056..369850a 100644
--- a/Assets/Prefabs/Enemies/wood 2.prefab
+++ b/Assets/Prefabs/Enemies/wood 2.prefab
@@ -273,8 +273,8 @@
- {fileID: 2909016453797189899}
- {fileID: 1774749892824093657}
- {fileID: 5729843628970712658}
- - {fileID: 7608846377688892443}
- {fileID: 8244594842321693027}
+ - {fileID: 3207871016240874820}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -352,7 +352,7 @@
PoisonParticle: {fileID: 7299639356303870581}
PoisonEndParticle: {fileID: 7178544336952021164}
SlowDownParticle: {fileID: 5522934476590545625}
- FrostParticle: {fileID: 4071564742152580572}
+ FrostParticle: {fileID: 3207871016062738958}
FireSkillParticle: {fileID: 8244594841270657460}
appliedEffectOffset: {x: 0, y: 0.1, z: 0.1}
appliedEffectScale: 0.08
@@ -730,302 +730,6 @@
type: 3}
m_PrefabInstance: {fileID: 824593498719907781}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &2421336591254581678
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 8434816861478773449}
- m_Modifications:
- - target: {fileID: 410417867720661205, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 410417867720661205, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 410417867720661205, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 692254725541723310, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 895535832985558944, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 895535832985558944, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 895535832985558944, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 1809121325120232562, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1916355198176119810, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 1916355198176119810, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 1916355198176119810, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 2023208732165953901, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3059320043405674505, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 3059320043405674505, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 3059320043405674505, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 3148512185824267401, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3622283863595885724, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3830451938940707504, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 3830451938940707504, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 3830451938940707504, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 3919129628388337672, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 3919129628388337672, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 3919129628388337672, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 4292545947651627157, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.15
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -0.3
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_RootOrder
- value: 9
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5292275683670844028, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 5292275683670844028, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 5292275683670844028, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 7362736457726227135, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7371666484774926908, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_Name
- value: Effect_bingdong1026
- objectReference: {fileID: 0}
- - target: {fileID: 7421970936961986235, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7497032114766724615, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 7497032114766724615, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 7497032114766724615, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 8115904079539523006, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 8115904079539523006, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 8115904079539523006, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 8326108930737594471, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 8326108930737594471, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 8326108930737594471, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: 8473590923595167162, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8719095442663636299, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- propertyPath: scalingMode
- value: 1
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: ee054dd88b9be2340a0da4ce80a84f62, type: 3}
---- !u!4 &7608846377688892443 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- m_PrefabInstance: {fileID: 2421336591254581678}
- m_PrefabAsset: {fileID: 0}
---- !u!198 &4071564742152580572 stripped
-ParticleSystem:
- m_CorrespondingSourceObject: {fileID: 1809121325120232562, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- m_PrefabInstance: {fileID: 2421336591254581678}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &4198952192164864370
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1164,6 +868,87 @@
m_Script: {fileID: 11500000, guid: 5440fde571ec4db4a719f37df8e972f0, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &5046465214892965966
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 8434816861478773449}
+ m_Modifications:
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7677512363771200781, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_JiNengBaoShi_Dian_Hit
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3}
+--- !u!4 &3207871016240874820 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ m_PrefabInstance: {fileID: 5046465214892965966}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &3207871016062738958 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 7677512363561411136, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
+ type: 3}
+ m_PrefabInstance: {fileID: 5046465214892965966}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &6253384680902185608
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1209,7 +994,7 @@
- target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
propertyPath: m_RootOrder
- value: 10
+ value: 9
objectReference: {fileID: 0}
- target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
@@ -1248,18 +1033,18 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3}
---- !u!4 &8244594842321693027 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
- type: 3}
- m_PrefabInstance: {fileID: 6253384680902185608}
- m_PrefabAsset: {fileID: 0}
--- !u!198 &8244594841270657460 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 2639904808709911356, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
m_PrefabInstance: {fileID: 6253384680902185608}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &8244594842321693027 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
+ type: 3}
+ m_PrefabInstance: {fileID: 6253384680902185608}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &8019561273946026293
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Levels/Battle/Endless2D.unity b/Assets/Scenes/Levels/Battle/Endless2D.unity
index f5ff8bd..353c1b9 100644
--- a/Assets/Scenes/Levels/Battle/Endless2D.unity
+++ b/Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -2632,9 +2632,9 @@
battleAreaObject: {fileID: 146816451}
skillFirePrefab: {fileID: 2502501340343887533, guid: 630574dd14089b04a8c0e1da203667d1,
type: 3}
- skillBombPrefab: {fileID: 5051328804531235491, guid: 1b11cbd1533e0024191ebe6028f8d8db,
+ skillBombPrefab: {fileID: 7723453392366045576, guid: 203ddbafabf3b514695a7113b0939c72,
type: 3}
- bufStopMovePrefab: {fileID: 7371666484774926908, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ bufStopMovePrefab: {fileID: 7677512363771200781, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
--- !u!114 &567180759
MonoBehaviour:
diff --git a/Assets/Scripts/Json/JsonDataCenter.cs b/Assets/Scripts/Json/JsonDataCenter.cs
index 9fc992a..9c53004 100644
--- a/Assets/Scripts/Json/JsonDataCenter.cs
+++ b/Assets/Scripts/Json/JsonDataCenter.cs
@@ -177,8 +177,7 @@
OpponentMgr.instance.ResetCurrency(currency);
if (EndlessLevelManager.instanceExists)
- // cx test
- EndlessLevelManager.instance.ResetCurrency(5000000);
+ EndlessLevelManager.instance.ResetCurrency(currency);
break;
case "skilltime":
// 设置技能塔出现时间
diff --git a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
index 078de45..7b486cc 100644
--- a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
@@ -892,11 +892,9 @@
for (int tx = 0; tx < dimensions.x; tx++)
{
- m_arrGridType[tx, sy] = PlacementGridType.EGridWaitBuy;
+ m_arrGridType[tx, sy] = PlacementGridType.EGridOpen;
m_arrGridType[tx, sy - 1] = PlacementGridType.EGridWaitBuy;
}
- // 设置塔位默认开启，后面需要根据配置来
- m_arrGridType[2, 3] = PlacementGridType.EGridOpen;
++GameConfig.EndlessOpenAttackTowerCount;
}
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
index 28ea404..5eb9475 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
@@ -449,7 +449,7 @@
else
{
// cx test
- Debug.Log("--------------------- ---------------------");
+ Debug.Log("--------------------- 泡泡炸弹不能移动 ---------------------");
}
}
}
--
Gitblit v1.9.1