From 9ff9f48c63ba94ec25d3ba698aef7c5429f639e4 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 20 九月 2018 16:54:53 +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, 6 insertions(+), 0 deletions(-)
diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
index 02a7071..ece8b02 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -160,3 +160,9 @@
window: XBStoreWin
- order: 3
window: XBWarehouseWin
+ - parent: SocialWin
+ orderTables:
+ - order: 1
+ window: TeamChatWin
+ - order: 2
+ window: FairyChatWin
--
Gitblit v1.8.0