From 60cbbc9fa3acc39374d11e032a18fd581adf9e9a Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期四, 29 一月 2026 17:20:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
UI/GuildNoteWin.prefab | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/UI/GuildNoteWin.prefab b/UI/GuildNoteWin.prefab
index 2dfa4aa..e9f81a0 100644
--- a/UI/GuildNoteWin.prefab
+++ b/UI/GuildNoteWin.prefab
@@ -167,7 +167,6 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7506763371999158208}
- - {fileID: 7687074115022967027}
- {fileID: 2481582009496819686}
- {fileID: 2422451971265770075}
m_Father: {fileID: 224400408536566206}
@@ -607,7 +606,8 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 7687074115022967027}
m_Father: {fileID: 224801398227082294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1302,7 +1302,7 @@
m_Left: 0
m_Right: 0
m_Top: 36
- m_Bottom: 0
+ m_Bottom: 36
loop: 0
scrollbarVisibility: 0
snapping: 0
@@ -1645,11 +1645,11 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2174361416659586241}
- m_Father: {fileID: 224801398227082294}
+ m_Father: {fileID: 7506763371999158208}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: -269.6}
+ m_AnchoredPosition: {x: -3, y: -40.600006}
m_SizeDelta: {x: 418, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6022492994195229801
--
Gitblit v1.8.0