From 500d595251026d8a323acfa052d16181756a4d79 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 24 十月 2025 16:38:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
UI/BoneFieldBattleWin.prefab | 70 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/UI/BoneFieldBattleWin.prefab b/UI/BoneFieldBattleWin.prefab
index c0eb1f1..1766e9d 100644
--- a/UI/BoneFieldBattleWin.prefab
+++ b/UI/BoneFieldBattleWin.prefab
@@ -94,6 +94,7 @@
- component: {fileID: 7859748341740744538}
- component: {fileID: 4067663335252159719}
- component: {fileID: 8469919924798735455}
+ - component: {fileID: 7983928858414859035}
m_Layer: 5
m_Name: txtBossName
m_TagString: Untagged
@@ -140,7 +141,7 @@
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
+ m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2}
m_Color: {r: 0.8627451, g: 0.7372549, b: 0.0627451, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -149,7 +150,7 @@
m_PersistentCalls:
m_Calls: []
m_FontData:
- m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
+ m_Font: {fileID: 12800000, guid: 111f1aa530e864341a505ce1acbfc0b8, type: 3}
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
@@ -162,6 +163,20 @@
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u53D1\u75AF\u7684\u5F20\u89D2"
+--- !u!114 &7983928858414859035
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 269328497264853025}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+ OutlineWidth: 10
--- !u!1 &287547380315588320
GameObject:
m_ObjectHideFlags: 0
@@ -657,6 +672,7 @@
- component: {fileID: 4849187459371425815}
- component: {fileID: 7872634627838590716}
- component: {fileID: 4298401925528858364}
+ - component: {fileID: 7059012463646805387}
m_Layer: 5
m_Name: BossBattle_txt_220
m_TagString: Untagged
@@ -703,7 +719,7 @@
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
+ m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -725,6 +741,20 @@
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7B49\u7EA71"
+--- !u!114 &7059012463646805387
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2802015215681488115}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+ OutlineWidth: 10
--- !u!1 &3060716873891320302
GameObject:
m_ObjectHideFlags: 0
@@ -1678,6 +1708,7 @@
- component: {fileID: 4226795897315838824}
- component: {fileID: 4956084945603018443}
- component: {fileID: 2107994174478830787}
+ - component: {fileID: 261591514222407310}
m_Layer: 5
m_Name: BossBattle_txt_231
m_TagString: Untagged
@@ -1724,7 +1755,7 @@
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
+ m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -1746,6 +1777,20 @@
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 59.9%
+--- !u!114 &261591514222407310
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5848218929335737890}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+ OutlineWidth: 10
--- !u!1 &5893592720958545367
GameObject:
m_ObjectHideFlags: 0
@@ -2023,6 +2068,7 @@
- component: {fileID: 3101138553790999402}
- component: {fileID: 33091343479926408}
- component: {fileID: 3279618786456716617}
+ - component: {fileID: 993138283926928383}
m_Layer: 5
m_Name: BossBattle_txt_232
m_TagString: Untagged
@@ -2069,7 +2115,7 @@
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
+ m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -2091,6 +2137,20 @@
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: x12
+--- !u!114 &993138283926928383
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6047029857875502180}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+ OutlineWidth: 10
--- !u!1 &6586386302205870154
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.8.0