From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Prefabs/Enemies/water 1.prefab | 272 +++++++++++++++++++++++++-----------------------------
1 files changed, 125 insertions(+), 147 deletions(-)
diff --git a/Assets/Prefabs/Enemies/water 1.prefab b/Assets/Prefabs/Enemies/water 1.prefab
index 1d7cb7b..4e807f7 100644
--- a/Assets/Prefabs/Enemies/water 1.prefab
+++ b/Assets/Prefabs/Enemies/water 1.prefab
@@ -115,6 +115,7 @@
m_Script: {fileID: 11500000, guid: 70719dcea2b0be54580a41e62debeab1, type: 3}
m_Name:
m_EditorClassIdentifier:
+ offect: {x: 0, y: 0.07, z: 0.04}
--- !u!1 &8434816860007424699
GameObject:
m_ObjectHideFlags: 0
@@ -272,8 +273,8 @@
- {fileID: 772091675164355399}
- {fileID: 5468027130051431602}
- {fileID: 200673849226178847}
- - {fileID: 2323292837256036054}
- {fileID: 4964518330195590823}
+ - {fileID: 5004668289563595669}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -313,15 +314,17 @@
m_EditorClassIdentifier:
description:
projectile: {fileID: 0}
+ woodProjectile_SP: {fileID: 0}
projectilePoints: []
epicenter: {fileID: 8434816861478773449}
isMultiAttack: 0
maxAttackNum: 1
- fireRate: 0
+ projectileFireRate: 1
bWoodAffector: 0
randomAudioSource: {fileID: 0}
towerTargetter: {fileID: 7490226013430720439}
radiusEffectColor: {r: 0, g: 0, b: 0, a: 0}
+ towerLevel: {fileID: 0}
--- !u!114 &8434816861478773454
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -348,8 +351,8 @@
commonTex: {fileID: 2800000, guid: 26688e577f01c9a41a04dd9401b7b49a, type: 3}
PoisonParticle: {fileID: 5162362214322550841}
PoisonEndParticle: {fileID: 3520733133352832967}
- SlowDownParticle: {fileID: 1423570647904081181}
- FrostParticle: {fileID: 8152897956000995089}
+ SlowDownParticle: {fileID: 137911762185639316}
+ FrostParticle: {fileID: 5004668289929344223}
FireSkillParticle: {fileID: 4964518329174177392}
appliedEffectOffset: {x: 0, y: 0.1, z: 0.1}
appliedEffectScale: 0.08
@@ -614,12 +617,12 @@
- target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: -0.57
objectReference: {fileID: 0}
- target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
type: 3}
propertyPath: m_LocalPosition.z
- value: 0
+ value: -1.15
objectReference: {fileID: 0}
- target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
type: 3}
@@ -661,6 +664,21 @@
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.4
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.4
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.4
+ objectReference: {fileID: 0}
- target: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174,
type: 3}
propertyPath: scalingMode
@@ -670,6 +688,21 @@
type: 3}
propertyPath: playOnAwake
value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 3.59
+ objectReference: {fileID: 0}
+ - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.12
+ objectReference: {fileID: 0}
+ - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.08
objectReference: {fileID: 0}
- target: {fileID: 5048851361003543717, guid: 393d187774e421848be71dd6a69be174,
type: 3}
@@ -709,11 +742,92 @@
type: 3}
m_PrefabInstance: {fileID: 2452110888275779192}
m_PrefabAsset: {fileID: 0}
---- !u!198 &1423570647904081181 stripped
+--- !u!198 &137911762185639316 stripped
ParticleSystem:
- m_CorrespondingSourceObject: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174,
+ 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:
@@ -1173,151 +1287,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3}
---- !u!4 &4964518330195590823 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
- type: 3}
- m_PrefabInstance: {fileID: 6937602200615535948}
- m_PrefabAsset: {fileID: 0}
--- !u!198 &4964518329174177392 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 2639904808709911356, 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: 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: 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!198 &8152897956000995089 stripped
-ParticleSystem:
- m_CorrespondingSourceObject: {fileID: 1809121325120232562, guid: ee054dd88b9be2340a0da4ce80a84f62,
- type: 3}
- m_PrefabInstance: {fileID: 7511902182343609187}
- m_PrefabAsset: {fileID: 0}
---- !u!4 &2323292837256036054 stripped
+--- !u!4 &4964518330195590823 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ m_CorrespondingSourceObject: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
- m_PrefabInstance: {fileID: 7511902182343609187}
+ m_PrefabInstance: {fileID: 6937602200615535948}
m_PrefabAsset: {fileID: 0}
--
Gitblit v1.9.1