From 7ea5599f685ea29f7ecab3516b7335fa93f6e2bf Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 22 Dec 2020 20:35:25 +0800
Subject: [PATCH] 火技能杀死的怪物统一计算 修改击杀显示
---
Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 233 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 185 insertions(+), 48 deletions(-)
diff --git a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
index b55c851..7d90008 100644
--- a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
+++ b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -3125,8 +3125,7 @@
ScoreText: {fileID: 4623057512200465645}
DoubleHit: {fileID: 8424158400893339871}
DoubleHitText: {fileID: 1184553460454064981}
- OneTimeKillObj: {fileID: 7603196512390067914, guid: 4185c72a90809504daa5733a351e163c,
- type: 3}
+ OneTimeKillObj: {fileID: 182285634368127240}
OneTimeKillText: {fileID: 4623057512776119512}
--- !u!1 &4623057512167066751
GameObject:
@@ -6512,6 +6511,7 @@
- {fileID: 4623057511338059841}
- {fileID: 4623057513236082835}
- {fileID: 4623057513020863723}
+ - {fileID: 3543211742427311164}
m_Father: {fileID: 4623057512704841790}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6927,15 +6927,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1c45b10d1786ecd4fae18d70525aa22c, type: 3}
---- !u!4 &6128013593978591219 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 5613572104525330773, guid: 1c45b10d1786ecd4fae18d70525aa22c,
- type: 3}
- m_PrefabInstance: {fileID: 1795944436746546854}
- m_PrefabAsset: {fileID: 0}
--- !u!198 &3539411673559000662 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 3022757409187105008, guid: 1c45b10d1786ecd4fae18d70525aa22c,
+ type: 3}
+ m_PrefabInstance: {fileID: 1795944436746546854}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6128013593978591219 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5613572104525330773, guid: 1c45b10d1786ecd4fae18d70525aa22c,
type: 3}
m_PrefabInstance: {fileID: 1795944436746546854}
m_PrefabAsset: {fileID: 0}
@@ -7188,15 +7188,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
---- !u!1 &4623057511292283299 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
- type: 3}
- m_PrefabInstance: {fileID: 2593358110680681470}
- m_PrefabAsset: {fileID: 0}
--- !u!224 &4623057511292283298 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 2593358110680681470}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &4623057511292283299 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
type: 3}
m_PrefabInstance: {fileID: 2593358110680681470}
m_PrefabAsset: {fileID: 0}
@@ -8080,18 +8080,6 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: edd0f54808263644d9740a9c0040b493, type: 3}
---- !u!1 &8424158400893339871 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493,
- type: 3}
- m_PrefabInstance: {fileID: 4623057511554511967}
- m_PrefabAsset: {fileID: 0}
---- !u!224 &6989462182969459993 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
- type: 3}
- m_PrefabInstance: {fileID: 4623057511554511967}
- m_PrefabAsset: {fileID: 0}
--- !u!114 &1184553460454064981 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5789385329819219722, guid: edd0f54808263644d9740a9c0040b493,
@@ -8104,6 +8092,18 @@
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!224 &6989462182969459993 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057511554511967}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &8424158400893339871 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057511554511967}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &4623057511616550406
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8263,15 +8263,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
---- !u!1 &2593358111013876827 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
- type: 3}
- m_PrefabInstance: {fileID: 4623057511616550406}
- m_PrefabAsset: {fileID: 0}
--- !u!224 &2593358111013876826 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057511616550406}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &2593358111013876827 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
type: 3}
m_PrefabInstance: {fileID: 4623057511616550406}
m_PrefabAsset: {fileID: 0}
@@ -8591,6 +8591,12 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49213eb9f84d76e47b6b19e9a246b83c, type: 3}
+--- !u!224 &3028643155105321891 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057511748623860}
+ m_PrefabAsset: {fileID: 0}
--- !u!114 &7735723185050839569 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3130750578608519141, guid: 49213eb9f84d76e47b6b19e9a246b83c,
@@ -8603,12 +8609,6 @@
m_Script: {fileID: 11500000, guid: 9a92c216c3d4e97459299f45fc451060, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!224 &3028643155105321891 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c,
- type: 3}
- m_PrefabInstance: {fileID: 4623057511748623860}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &4623057511883902042
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8768,15 +8768,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
---- !u!224 &2593358110207618566 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
- type: 3}
- m_PrefabInstance: {fileID: 4623057511883902042}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &2593358110207618567 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057511883902042}
+ m_PrefabAsset: {fileID: 0}
+--- !u!224 &2593358110207618566 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
type: 3}
m_PrefabInstance: {fileID: 4623057511883902042}
m_PrefabAsset: {fileID: 0}
@@ -9125,17 +9125,154 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: be8d40e5dec17924db9f7ba011f48ea6, type: 3}
+--- !u!4 &6664392428777704896 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ m_PrefabInstance: {fileID: 4932092804175574798}
+ m_PrefabAsset: {fileID: 0}
--- !u!198 &8872091061161614627 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 4570502257699842605, guid: be8d40e5dec17924db9f7ba011f48ea6,
type: 3}
m_PrefabInstance: {fileID: 4932092804175574798}
m_PrefabAsset: {fileID: 0}
---- !u!4 &6664392428777704896 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+--- !u!1001 &5767592570076331565
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2459412157512953547}
+ m_Modifications:
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 23
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 560
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 313
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 228
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7462645731956919278, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ propertyPath: m_Name
+ value: DoubleHitImg
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4185c72a90809504daa5733a351e163c, type: 3}
+--- !u!114 &182285634368127240 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: -3274960031300206811, guid: 4185c72a90809504daa5733a351e163c,
type: 3}
- m_PrefabInstance: {fileID: 4932092804175574798}
+ m_PrefabInstance: {fileID: 5767592570076331565}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d1f62823fe2755048837fa08a1cafe59, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!224 &3543211742427311164 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c,
+ type: 3}
+ m_PrefabInstance: {fileID: 5767592570076331565}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7366026308063481932
PrefabInstance:
--
Gitblit v1.9.1