From 6a55615a1bf346b6b7fd7e4b827ce80566647bea Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 29 十月 2018 17:54:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into leonard
---
Assets/Resources/ScriptableObject/Config/WindowConfig.asset | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
index 854a03c..897c0bd 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -112,8 +112,6 @@
window: PrayerWin
- order: 4
window: AwardExchangeWin
- - order: 5
- window: WheelOfFortuneWin
- parent: PetWin
orderTables:
- order: 0
@@ -156,6 +154,8 @@
window: FlashRushToBuyWin
- order: 15
window: WishingPoolWin
+ - order: 16
+ window: WheelOfFortuneWin
- parent: VipRechargeWin
orderTables:
- order: 0
--
Gitblit v1.8.0