From 6fe617e984867051a66d1ccc1a53af66e550b37c Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 18:46:22 +0800
Subject: [PATCH] 125 战斗 飘字配置化
---
Battle/ScriptableObject/FloatingConfig_Hpbar.asset.meta | 8 ++
Battle/ScriptableObject/FloatingConfig_Combo.asset | 24 ++++++++
Battle/ScriptableObject/FloatingConfig_Buff.asset.meta | 8 ++
Battle/ScriptableObject/FloatingConfig_Buff.asset | 24 ++++++++
Battle/ScriptableObject/FloatingConfig_Combo.asset.meta | 8 ++
UIComp/DamageContent.prefab | 11 ---
Battle/ScriptableObject/FloatingConfig_Hpbar.asset | 24 ++++++++
Battle/ScriptableObject.meta | 8 ++
Hero/SpineRes/Hero_001.prefab | 13 ++--
9 files changed, 111 insertions(+), 17 deletions(-)
diff --git a/Battle/ScriptableObject.meta b/Battle/ScriptableObject.meta
new file mode 100644
index 0000000..b047dab
--- /dev/null
+++ b/Battle/ScriptableObject.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bc29888aef1cf89468277cf56c678211
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Battle/ScriptableObject/FloatingConfig_Buff.asset b/Battle/ScriptableObject/FloatingConfig_Buff.asset
new file mode 100644
index 0000000..780b8eb
--- /dev/null
+++ b/Battle/ScriptableObject/FloatingConfig_Buff.asset
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 900f40b168d3e0b4f9bebd9917a43c7e, type: 3}
+ m_Name: FloatingConfig_Buff
+ m_EditorClassIdentifier:
+ beginPos: {x: 0, y: 0}
+ endPos: {x: 0, y: 150}
+ scaleChangeTime: 0.6333334
+ totalShowTime: 1.7000002
+ normalBeginScale: {x: 2, y: 2, z: 2}
+ normalEndScale: {x: 1, y: 1, z: 1}
+ critBeginScale: {x: 3, y: 3, z: 3}
+ critEndScale: {x: 1.5, y: 1.5, z: 1.5}
+ beginColor: {r: 1, g: 1, b: 1, a: 0.5}
+ endColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Battle/ScriptableObject/FloatingConfig_Buff.asset.meta b/Battle/ScriptableObject/FloatingConfig_Buff.asset.meta
new file mode 100644
index 0000000..1c81a74
--- /dev/null
+++ b/Battle/ScriptableObject/FloatingConfig_Buff.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2a49a496280870048a543a49ae0f9fc5
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Battle/ScriptableObject/FloatingConfig_Combo.asset b/Battle/ScriptableObject/FloatingConfig_Combo.asset
new file mode 100644
index 0000000..89a9516
--- /dev/null
+++ b/Battle/ScriptableObject/FloatingConfig_Combo.asset
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 900f40b168d3e0b4f9bebd9917a43c7e, type: 3}
+ m_Name: FloatingConfig_Combo
+ m_EditorClassIdentifier:
+ beginPos: {x: 0, y: 0}
+ endPos: {x: 0, y: 150}
+ scaleChangeTime: 0.6333334
+ totalShowTime: 1.7000002
+ normalBeginScale: {x: 2, y: 2, z: 2}
+ normalEndScale: {x: 1, y: 1, z: 1}
+ critBeginScale: {x: 3, y: 3, z: 3}
+ critEndScale: {x: 1.5, y: 1.5, z: 1.5}
+ beginColor: {r: 1, g: 1, b: 1, a: 0.5}
+ endColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Battle/ScriptableObject/FloatingConfig_Combo.asset.meta b/Battle/ScriptableObject/FloatingConfig_Combo.asset.meta
new file mode 100644
index 0000000..a8676bf
--- /dev/null
+++ b/Battle/ScriptableObject/FloatingConfig_Combo.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5c5d794b39017349871d8ec7051da31
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Battle/ScriptableObject/FloatingConfig_Hpbar.asset b/Battle/ScriptableObject/FloatingConfig_Hpbar.asset
new file mode 100644
index 0000000..e56c52e
--- /dev/null
+++ b/Battle/ScriptableObject/FloatingConfig_Hpbar.asset
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 900f40b168d3e0b4f9bebd9917a43c7e, type: 3}
+ m_Name: FloatingConfig_Hpbar
+ m_EditorClassIdentifier:
+ beginPos: {x: 0, y: 0}
+ endPos: {x: 0, y: 150}
+ scaleChangeTime: 0.6333334
+ totalShowTime: 1.7000002
+ normalBeginScale: {x: 2, y: 2, z: 2}
+ normalEndScale: {x: 1, y: 1, z: 1}
+ critBeginScale: {x: 3, y: 3, z: 3}
+ critEndScale: {x: 1.5, y: 1.5, z: 1.5}
+ beginColor: {r: 1, g: 1, b: 1, a: 0.5}
+ endColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Battle/ScriptableObject/FloatingConfig_Hpbar.asset.meta b/Battle/ScriptableObject/FloatingConfig_Hpbar.asset.meta
new file mode 100644
index 0000000..43cf06b
--- /dev/null
+++ b/Battle/ScriptableObject/FloatingConfig_Hpbar.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0f402a3b22aa98b4ab42192ebb1087ac
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Hero/SpineRes/Hero_001.prefab b/Hero/SpineRes/Hero_001.prefab
index 3123188..2fd501e 100644
--- a/Hero/SpineRes/Hero_001.prefab
+++ b/Hero/SpineRes/Hero_001.prefab
@@ -616,7 +616,8 @@
m_EditorClassIdentifier:
sliderHp: {fileID: 3363639429810817769}
sliderXp: {fileID: 6324762592433455232}
- PopUpInterval: 0.2
+ heroInfoContainer: {fileID: 1858834441455728003}
+ textTips: {fileID: 4980243988766608731}
buffCells:
- {fileID: 3257815862114982440}
- {fileID: 2167757057058587110}
@@ -624,8 +625,9 @@
- {fileID: 9129934313505071610}
- {fileID: 986423012690275543}
- {fileID: 1541482002627265149}
- heroInfoContainer: {fileID: 1858834441455728003}
- textTips: {fileID: 4980243988766608731}
+ followFloatingConfig: {fileID: 11400000, guid: 2a49a496280870048a543a49ae0f9fc5, type: 2}
+ noFollowFloatingConfig: {fileID: 11400000, guid: d5c5d794b39017349871d8ec7051da31, type: 2}
+ PopUpInterval: 0.2
--- !u!223 &9159503526439283918
Canvas:
m_ObjectHideFlags: 0
@@ -1867,14 +1869,11 @@
m_Script: {fileID: 11500000, guid: ca221a28c4019fa439e674596524bc3d, type: 3}
m_Name:
m_EditorClassIdentifier:
- beginPos: {x: 0, y: 0}
- endPos: {x: 0, y: 150}
rectTransform: {fileID: 5654455341073469813}
tipText: {fileID: 6453641305022250914}
artText: {fileID: 7250774376148166801}
background: {fileID: 3522465749273810095}
- normalBeginScale: {x: 2.5, y: 2.5, z: 2.5}
- normalEndScale: {x: 1.25, y: 1.25, z: 1.25}
+ floatingConfig: {fileID: 0}
--- !u!1 &9096325252512834893
GameObject:
m_ObjectHideFlags: 0
diff --git a/UIComp/DamageContent.prefab b/UIComp/DamageContent.prefab
index e906f75..8a09843 100644
--- a/UIComp/DamageContent.prefab
+++ b/UIComp/DamageContent.prefab
@@ -182,16 +182,7 @@
m_EditorClassIdentifier:
line: {fileID: 2033141880003891448}
parent: {fileID: 8196951651560326685}
- beginPos: {x: 0, y: 0}
- endPos: {x: 0, y: 150}
- scaleChangeTime: 0.40004998
- totalShowTime: 1.2
- normalBeginScale: {x: 2, y: 2, z: 2}
- normalEndScale: {x: 1, y: 1, z: 1}
- critBeginScale: {x: 3, y: 3, z: 3}
- critEndScale: {x: 1.5, y: 1.5, z: 1.5}
- beginColor: {r: 1, g: 1, b: 1, a: 0.5}
- endColor: {r: 1, g: 1, b: 1, a: 1}
+ floatingConfig: {fileID: 11400000, guid: 0f402a3b22aa98b4ab42192ebb1087ac, type: 2}
--- !u!1 &4026765504503192625
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.8.0