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/BoneFieldWin.prefab | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/UI/BoneFieldWin.prefab b/UI/BoneFieldWin.prefab
index e25e1fb..d11a244 100644
--- a/UI/BoneFieldWin.prefab
+++ b/UI/BoneFieldWin.prefab
@@ -363,7 +363,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: 24
m_FontStyle: 0
m_BestFit: 1
@@ -375,7 +375,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: BoneField06
+ m_Text: "\u5173\u5361\u5956\u52B1"
m_IsKey: 1
m_KeyName: BoneField06
m_ColorType: 0
@@ -393,7 +393,7 @@
m_Name:
m_EditorClassIdentifier:
m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
- OutlineWidth: 1
+ OutlineWidth: 2
--- !u!1 &189945865301276568
GameObject:
m_ObjectHideFlags: 0
@@ -1345,7 +1345,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: 28
m_FontStyle: 0
m_BestFit: 0
@@ -1596,7 +1596,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: 32
m_FontStyle: 0
m_BestFit: 0
@@ -2046,7 +2046,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: 34
m_FontStyle: 0
m_BestFit: 1
@@ -2349,7 +2349,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: 28
m_FontStyle: 0
m_BestFit: 1
@@ -2361,7 +2361,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: BoneField04
+ m_Text: "\u6311\u6218"
m_IsKey: 1
m_KeyName: BoneField04
m_ColorType: 0
@@ -2522,7 +2522,7 @@
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: BoneField01
+ m_Text: "\u96BE\u5EA6"
m_IsKey: 1
m_KeyName: BoneField01
m_ColorType: 0
@@ -3416,6 +3416,7 @@
- component: {fileID: 5168491092284659975}
- component: {fileID: 6584757082117712939}
- component: {fileID: 3290979180075065715}
+ - component: {fileID: 6593998715467517604}
m_Layer: 5
m_Name: bonefield_txt_47
m_TagString: Untagged
@@ -3471,7 +3472,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: 24
m_FontStyle: 0
m_BestFit: 1
@@ -3488,6 +3489,20 @@
m_KeyName: BoneField06
m_ColorType: 0
m_BGColorType: 0
+--- !u!114 &6593998715467517604
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5333876911901653584}
+ 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: 2
--- !u!1 &5423950077415361371
GameObject:
m_ObjectHideFlags: 0
@@ -4272,7 +4287,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: BoneField04
+ m_Text: "\u6311\u6218"
m_IsKey: 1
m_KeyName: BoneField04
m_ColorType: 0
@@ -4679,7 +4694,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: 24
m_FontStyle: 0
m_BestFit: 0
@@ -4709,7 +4724,7 @@
m_Name:
m_EditorClassIdentifier:
m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
- OutlineWidth: 1
+ OutlineWidth: 2
--- !u!1 &7163621603190150955
GameObject:
m_ObjectHideFlags: 0
@@ -4825,7 +4840,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: 28
m_FontStyle: 0
m_BestFit: 1
@@ -5067,7 +5082,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: 28
m_FontStyle: 0
m_BestFit: 1
--
Gitblit v1.8.0