From 74daf5509be4fc140fd1bdb6d4df5f1c1002e368 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 22 Oct 2020 17:28:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle
---
Assets/Prefabs/Enemies/BossAgent.prefab | 256 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 256 insertions(+), 0 deletions(-)
diff --git a/Assets/Prefabs/Enemies/BossAgent.prefab b/Assets/Prefabs/Enemies/BossAgent.prefab
index b2d2fbc..d66851c 100644
--- a/Assets/Prefabs/Enemies/BossAgent.prefab
+++ b/Assets/Prefabs/Enemies/BossAgent.prefab
@@ -19473,6 +19473,8 @@
- {fileID: 4193058270655844}
- {fileID: 4405945576505646}
- {fileID: 6672722229402226915}
+ - {fileID: 3881291852863383436}
+ - {fileID: 4788861706614181992}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
@@ -19522,6 +19524,8 @@
poisonTex: {fileID: 2800000, guid: fb9717c189fa0ed4bbe78291ce4a4c42, type: 3}
frozenTex: {fileID: 2800000, guid: 48244ff8b9d4c1d4bbdedeec422ca81f, type: 3}
commonTex: {fileID: 2800000, guid: c8cf6e555932ca145ad2bd71e02f2f28, type: 3}
+ PoisonParticle: {fileID: 8705033929627219186}
+ PoisonEndParticle: {fileID: 4788861708044492040}
appliedEffectOffset: {x: 0, y: 0.5, z: 0}
appliedEffectScale: 1
healthBar: {fileID: 6710204219456379707}
@@ -44106,3 +44110,255 @@
type: 3}
m_PrefabInstance: {fileID: 4875712372938459897}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5883340130119265396
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 4066970842593808}
+ m_Modifications:
+ - target: {fileID: 1427824651177390450, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824651177390450, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 1427824651177390450, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.3
+ 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: 7
+ 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 &4788861706614181992 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ m_PrefabInstance: {fileID: 5883340130119265396}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &4788861708044492040 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 1427824651177390460, guid: 1428e6b22c062b640bbe37b82f1ee655,
+ type: 3}
+ m_PrefabInstance: {fileID: 5883340130119265396}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7369593289619376706
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 4066970842593808}
+ 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.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 4175614104185630731, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 4175614104185630731, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.3
+ 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.75
+ objectReference: {fileID: 0}
+ - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.95
+ 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: 6
+ 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 &3881291852863383436 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ m_PrefabInstance: {fileID: 7369593289619376706}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &8705033929627219186 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 2200131777148403376, guid: da8892980c8b53042a412b759809e5e8,
+ type: 3}
+ m_PrefabInstance: {fileID: 7369593289619376706}
+ m_PrefabAsset: {fileID: 0}
--
Gitblit v1.9.1