From 56f231f1f6523d7920cf32f033f9bb6f0015550f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 28 Oct 2020 18:05:11 +0800
Subject: [PATCH] Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master
---
Assets/Prefabs/Enemies/water.prefab | 256 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 256 insertions(+), 0 deletions(-)
diff --git a/Assets/Prefabs/Enemies/water.prefab b/Assets/Prefabs/Enemies/water.prefab
index 4e4d5e5..79e4638 100644
--- a/Assets/Prefabs/Enemies/water.prefab
+++ b/Assets/Prefabs/Enemies/water.prefab
@@ -155,6 +155,8 @@
- {fileID: 1421559657359136364}
- {fileID: 772091675164355399}
- {fileID: 5468027130051431602}
+ - {fileID: 200673849226178847}
+ - {fileID: 2323292837256036054}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -229,6 +231,8 @@
commonTex: {fileID: 2800000, guid: 26688e577f01c9a41a04dd9401b7b49a, type: 3}
PoisonParticle: {fileID: 5162362214322550841}
PoisonEndParticle: {fileID: 3520733133352832967}
+ SlowDownParticle: {fileID: 1423570647904081181}
+ FrostParticle: {fileID: 8152897956000995089}
appliedEffectOffset: {x: 0, y: 0.1, z: 0.1}
appliedEffectScale: 0.08
healthBar: {fileID: 9222104150701355608}
@@ -471,6 +475,122 @@
m_CorrespondingSourceObject: {fileID: 4544219117696442, guid: ad121b684e3934947a2d412b4202d8fd,
type: 3}
m_PrefabInstance: {fileID: 1417015450723705814}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2452110888275779192
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 8434816861478773449}
+ m_Modifications:
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 7
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: scalingMode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5048851361003543717, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: scalingMode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5048851361003543717, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7091104469017435009, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_jiansu1026
+ objectReference: {fileID: 0}
+ - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.85
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 393d187774e421848be71dd6a69be174, type: 3}
+--- !u!4 &200673849226178847 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ m_PrefabInstance: {fileID: 2452110888275779192}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &1423570647904081181 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ m_PrefabInstance: {fileID: 2452110888275779192}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4198952192164864370
PrefabInstance:
@@ -846,3 +966,139 @@
type: 3}
m_PrefabInstance: {fileID: 6425534016629409417}
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: 8
+ 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}
--
Gitblit v1.9.1