From c2e5bd33cd063f990f7e6d5a2fe8c299f8d3774d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 27 八月 2018 17:03:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Resources/ScriptableObject/Config/WindowConfig.asset | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
index cfa1a53..6e60089 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -46,8 +46,8 @@
window: ComposeWingsWin
- order: 1
window: ComposeTicketWin
- - order: 2
- window:
+ - order: 5
+ window: ComposeDogzEquipWin
- order: 3
window: ComposeEquipWin
- order: 4
@@ -146,5 +146,13 @@
window: VipWin
- order: 2
window: VipInvestWin
+ - parent: HappyXBWin
+ orderTables:
+ - order: 0
+ window: BestXBWin
+ - order: 1
+ window: RuneXBWin
+ - order: 2
+ window: XBStoreWin
- order: 3
- window: FairyJadeInvestmentWin
+ window: XBWarehouseWin
--
Gitblit v1.8.0