From 85f0d13945f3aef5aef1b3c1b47c77cea0514c17 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 22 Oct 2020 16:06:50 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Prefabs/Enemies/fire.prefab | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 261 insertions(+), 0 deletions(-)
diff --git a/Assets/Prefabs/Enemies/fire.prefab b/Assets/Prefabs/Enemies/fire.prefab
index 522407b..687ebbc 100644
--- a/Assets/Prefabs/Enemies/fire.prefab
+++ b/Assets/Prefabs/Enemies/fire.prefab
@@ -153,6 +153,8 @@
- {fileID: 1277171420674534872}
- {fileID: 9114815543095638400}
- {fileID: 4799994582265139192}
+ - {fileID: 6542537011048626110}
+ - {fileID: 2982453381423257457}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -225,6 +227,8 @@
poisonTex: {fileID: 2800000, guid: 7a975ade1af3c1047bedefeb8036e5ee, type: 3}
frozenTex: {fileID: 2800000, guid: 3a62d14515f404841b39f4b7b2de3cb2, type: 3}
commonTex: {fileID: 2800000, guid: 923815e19a1495543a0161d1c532893f, type: 3}
+ PoisonParticle: {fileID: 1718302357907514560}
+ PoisonEndParticle: {fileID: 2982453380127300113}
appliedEffectOffset: {x: 0, y: 0.1, z: 0.1}
appliedEffectScale: 0.08
healthBar: {fileID: 9222104150701355608}
@@ -399,6 +403,157 @@
serializedVersion: 2
m_Radius: 0.2
m_Center: {x: 0, y: 0, z: 0}
+--- !u!1001 &671268144671726192
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 8434816861478773449}
+ m_Modifications:
+ - target: {fileID: 2200131777148403376, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4175614104185630731, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.15
+ objectReference: {fileID: 0}
+ - target: {fileID: 4175614104185630731, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.15
+ objectReference: {fileID: 0}
+ - target: {fileID: 4175614104185630731, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.15
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426986914226073, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426986950973081, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426987844016924, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988123119164, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988272803277, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.66
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.18
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568399, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_Name
+ value: PoisonParticle
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988461507653, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988505428053, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988690307612, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988700998138, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7531144210411264147, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: da8892980c8b53042a412b759809e5e8, type: 3}
+--- !u!4 &6542537011048626110 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ m_PrefabInstance: {fileID: 671268144671726192}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &1718302357907514560 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 2200131777148403376, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ m_PrefabInstance: {fileID: 671268144671726192}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &4198952192164864370
PrefabInstance:
m_ObjectHideFlags: 0
@@ -496,6 +651,112 @@
m_Script: {fileID: 11500000, guid: 5440fde571ec4db4a719f37df8e972f0, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &4229842640979356525
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 8434816861478773449}
+ m_Modifications:
+ - target: {fileID: 1427824651177390450, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.15
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824651177390450, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.15
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824651177390450, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.15
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824651177390460, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: looping
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354269, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_Name
+ value: PoisonEnd
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824652297354271, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_InitialState
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 1428e6b22c062b640bbe37b82f1ee655, type: 3}
+--- !u!4 &2982453381423257457 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ m_PrefabInstance: {fileID: 4229842640979356525}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &2982453380127300113 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 1427824651177390460, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ m_PrefabInstance: {fileID: 4229842640979356525}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &4796933190690775530
PrefabInstance:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1