From 6cbc8a2ab7ac516d8cd1553eb2af933fd15382c3 Mon Sep 17 00:00:00 2001
From: hzr <904249498@qq.com>
Date: 星期二, 18 九月 2018 16:23:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Resources/ScriptableObject/Config/WindowConfig.asset | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
index ed2452c..02a7071 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -74,10 +74,8 @@
orderTables:
- order: 0
window: DemonJarWin
- - order: 1
- window: FairyGrabBossWin
- order: 2
- window: FairyGrabBossWin
+ window: DogzDungeonWin
- parent: UnionPanel
orderTables:
- order: 2
@@ -118,6 +116,8 @@
window: PetAttributeWin
- order: 1
window: MountWin
+ - order: 2
+ window: FairyGrabBossWin
- parent: OpenServerActivityWin
orderTables:
- order: 0
--
Gitblit v1.8.0