From 4049c0ebf05f1319f5011a2f32fa91f73453fe9f Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 10 六月 2025 14:54:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
UI/PopConfirmWin.prefab | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/UI/PopConfirmWin.prefab b/UI/PopConfirmWin.prefab
index 601df12..9a623a3 100644
--- a/UI/PopConfirmWin.prefab
+++ b/UI/PopConfirmWin.prefab
@@ -313,7 +313,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: 224191051378984500}
m_Father: {fileID: 224801398227082294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -633,15 +634,15 @@
supportParentChildRelation: 1
isPersistent: 0
maxIdleRounds: 20
- openAnimationType: 2
- closeAnimationType: 2
+ openAnimationType: 1
+ closeAnimationType: 0
animeDuration: 0.2
animationEase: 6
lastUsedRound: 0
parentUI: {fileID: 0}
childrenUI: []
openMask: 1
- clickEmptySpaceClose: 0
+ clickEmptySpaceClose: 1
popConfirmBtn: {fileID: 114791111398676460}
popCancelBtn: {fileID: 114862514174972662}
popConfirmInfo: {fileID: 114754121027158872}
@@ -932,7 +933,6 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224170880028740190}
- - {fileID: 224191051378984500}
- {fileID: 224176137119944818}
- {fileID: 224205260472835446}
- {fileID: 224959442705425128}
@@ -940,10 +940,10 @@
- {fileID: 224894810739324936}
m_Father: {fileID: 224400408536566206}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 1334, y: 750}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1826528712990252
GameObject:
@@ -976,11 +976,11 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224907361187889720}
- m_Father: {fileID: 224801398227082294}
+ m_Father: {fileID: 224696515655477244}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 153.2098}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0, y: -67.79021}
m_SizeDelta: {x: 240, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222359541476034188
--
Gitblit v1.8.0