From 4ebd125f596d2f253f8ccc868d26578e1a2ace89 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 23 十月 2018 20:55:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
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 354366e..854a03c 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -154,6 +154,8 @@
window: FairyGrabBossNoticeWin
- order: 14
window: FlashRushToBuyWin
+ - order: 15
+ window: WishingPoolWin
- parent: VipRechargeWin
orderTables:
- order: 0
--
Gitblit v1.8.0