From 2ee4887fe1b4d0073dfb8a118d25e15bff3e578b Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 11 十月 2018 14:56:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Resources/ScriptableObject/Config/WindowConfig.asset | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
index ece8b02..f58cb64 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -74,7 +74,7 @@
orderTables:
- order: 0
window: DemonJarWin
- - order: 2
+ - order: 1
window: DogzDungeonWin
- parent: UnionPanel
orderTables:
@@ -110,6 +110,8 @@
window: PrayerWin
- order: 4
window: AwardExchangeWin
+ - order: 5
+ window: WheelOfFortuneWin
- parent: PetWin
orderTables:
- order: 0
@@ -144,6 +146,10 @@
window: FairyJadeInvestmentWin
- order: 11
window: VipInvestWin
+ - order: 12
+ window: FairyLeagueNoticeWin
+ - order: 13
+ window: FairyGrabBossNoticeWin
- parent: VipRechargeWin
orderTables:
- order: 0
@@ -166,3 +172,19 @@
window: TeamChatWin
- order: 2
window: FairyChatWin
+ - parent: DogzWin
+ orderTables:
+ - order: 0
+ window: DogzActiveWin
+ - order: 1
+ window: GodBeastReinforcementWin
+ - parent: FairylandCeremonyWin
+ orderTables:
+ - order: 0
+ window: CeremonyRechargeGiftWin
+ - order: 1
+ window: CeremonyFirepartyWin
+ - order: 2
+ window: CeremonyPeopleToHiWin
+ - order: 3
+ window: CeremonyOutOfPrintWin
--
Gitblit v1.8.0