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/wood.prefab | 416 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 416 insertions(+), 0 deletions(-)
diff --git a/Assets/Prefabs/Enemies/wood.prefab b/Assets/Prefabs/Enemies/wood.prefab
index 6865a0b..e2e6e89 100644
--- a/Assets/Prefabs/Enemies/wood.prefab
+++ b/Assets/Prefabs/Enemies/wood.prefab
@@ -155,6 +155,8 @@
- {fileID: 9114815543095638400}
- {fileID: 2909016453797189899}
- {fileID: 1774749892824093657}
+ - {fileID: 5729843628970712658}
+ - {fileID: 7608846377688892443}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -229,6 +231,8 @@
commonTex: {fileID: 2800000, guid: 30f4f867fda6b084dbdeeafa64ca5051, type: 3}
PoisonParticle: {fileID: 7299639356303870581}
PoisonEndParticle: {fileID: 7178544336952021164}
+ SlowDownParticle: {fileID: 6813128575059589712}
+ FrostParticle: {fileID: 4071564742152580572}
appliedEffectOffset: {x: 0, y: 0.1, z: 0.1}
appliedEffectScale: 0.08
healthBar: {fileID: 9222104150701355608}
@@ -600,6 +604,302 @@
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: 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: 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
@@ -738,6 +1038,122 @@
m_Script: {fileID: 11500000, guid: 5440fde571ec4db4a719f37df8e972f0, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &8019561273946026293
+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 &5729843628970712658 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ m_PrefabInstance: {fileID: 8019561273946026293}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &6813128575059589712 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174,
+ type: 3}
+ m_PrefabInstance: {fileID: 8019561273946026293}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &8918806629018678469
PrefabInstance:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1