From 6f8ed2e37f8762fb3501a671d0dca40bcd68edae Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 21 十月 2018 10:26:29 +0800
Subject: [PATCH] Merge branch 'master' into leonard

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

diff --git a/Assets/Resources/ScriptableObject/Config/PriorityWindowConfig.asset b/Assets/Resources/ScriptableObject/Config/PriorityWindowConfig.asset
index d3f8325..a64f815 100644
--- a/Assets/Resources/ScriptableObject/Config/PriorityWindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/PriorityWindowConfig.asset
@@ -20,3 +20,5 @@
   - CreateRoleWin
   - SelectRoleWin
   - LoadingWin
+  - LaunchBackGroundWin
+  - ExitGameWin

--
Gitblit v1.8.0