From 9b17184f6ab5b35dfe0debb9a23cc337dab5b2c7 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 30 八月 2018 10:09:18 +0800
Subject: [PATCH] Merge branch '2960仙盟抢Boss活动'
---
Assets/Resources/ScriptableObject/Config/WindowConfig.asset | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
index 47f44af..6c32351 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -74,6 +74,8 @@
orderTables:
- order: 0
window: DemonJarWin
+ - order: 1
+ window: FairyGrabBossWin
- parent: UnionPanel
orderTables:
- order: 2
@@ -223,7 +225,7 @@
- EquipDevourWin
- ComposeWingsWin
- ComposeTicketWin
- -
+ - FairyGrabBossWin
- ComposeEquipWin
- ComposeToolsWin
- MagicianWin
--
Gitblit v1.8.0