From 80ad5602e086de4376d18b5a84ff30bfc537da8b Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 16 十月 2018 10:40:47 +0800
Subject: [PATCH] Merge branch 'master' into UserCenter

---
 Assets/Resources/ScriptableObject/Config/WindowConfig.asset |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
index f58cb64..3dd3268 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -150,6 +150,8 @@
       window: FairyLeagueNoticeWin
     - order: 13
       window: FairyGrabBossNoticeWin
+    - order: 14
+      window: FlashRushToBuyWin
   - parent: VipRechargeWin
     orderTables:
     - order: 0

--
Gitblit v1.8.0