From b65fffa3ea24f02a3bb640cc2f4600a4b54b9967 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 20 十二月 2024 16:35:17 +0800
Subject: [PATCH] Merge branch 'lang_en' of http://192.168.1.20:10010/r/snxxz_resourcesout into lang_en
---
UI/Window/VipRechargeWin.prefab | 2 +-
BuiltIn/ScriptableObjects/WindowConfig.asset | 5 +++++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/BuiltIn/ScriptableObjects/WindowConfig.asset b/BuiltIn/ScriptableObjects/WindowConfig.asset
index f7b19f2..a86437f 100644
--- a/BuiltIn/ScriptableObjects/WindowConfig.asset
+++ b/BuiltIn/ScriptableObjects/WindowConfig.asset
@@ -493,6 +493,11 @@
redPointId: 0
titleKey:
window: VipWin
+ - order: 2
+ functionId: 0
+ redPointId: 0
+ titleKey:
+ window: VoucherWin
- parent: HappyXBWin
titleIconKey: OneLevelTitle_35
level: 1
diff --git a/UI/Window/VipRechargeWin.prefab b/UI/Window/VipRechargeWin.prefab
index be2584d..d82b159 100644
--- a/UI/Window/VipRechargeWin.prefab
+++ b/UI/Window/VipRechargeWin.prefab
@@ -3098,7 +3098,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &7788850771816721899
RectTransform:
m_ObjectHideFlags: 0
--
Gitblit v1.8.0