From c87f76b46e35d76cef3118ea221bfb83c2ea8abb Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 10 十月 2018 11:40:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Editor/VersionConfigs/Versions.txt | 14 +++++++-------
Assets/Resources/ScriptableObject/Config/WindowConfig.asset | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Assets/Editor/VersionConfigs/Versions.txt b/Assets/Editor/VersionConfigs/Versions.txt
index 7661dda..4985c90 100644
--- a/Assets/Editor/VersionConfigs/Versions.txt
+++ b/Assets/Editor/VersionConfigs/Versions.txt
@@ -13,16 +13,16 @@
86 snxxz_ios 828115704 1 1.1.0 2701 1 1 1 灏戝勾淇粰浼� com.zyxhgame.game008 shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64)
87 android_20 822055139 1 1.0.18 2020 1 0 1 灏戝勾淇粰浼� com.ziyouyouxi01.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64)
89 android_20 822055139 1 1.1.0 2020 3 1 1 灏戝勾淇粰浼� com.ziyouyouxi01.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64)
-90 xjaz spxjgame 1 1.1.0 2901 1 1 1 浠欏姭 com.xjaz.sp shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (0,80) 娓告垙钁椾綔鏉冧汉:鍖椾含闅忔墜浜掑姩淇℃伅鎶�鏈湁闄愬叕鍙� 鍑虹増鏈嶅姟鍗曚綅:鍖椾含涓柊鑱旂鎶�鑲′唤鏈夐檺鍏徃閲戠増鐢靛瓙鍑虹増绀�</r>鍑虹増鐗╁彿:ISBN 978-7-89447-188-8 杞憲鐧昏鍙�:2011SR027542 瀹℃壒鏂囧彿:绉戞妧涓庢暟瀛椼��2011銆�562 鍙�
-91 xjios spyxxjios 1 1.1.0 3001 1 1 1 浠欏姭 com.xj.jjk shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (0,80) 娓告垙钁椾綔鏉冧汉:鍖椾含闅忔墜浜掑姩淇℃伅鎶�鏈湁闄愬叕鍙� 鍑虹増鏈嶅姟鍗曚綅:鍖椾含涓柊鑱旂鎶�鑲′唤鏈夐檺鍏徃閲戠増鐢靛瓙鍑虹増绀�</r>鍑虹増鐗╁彿:ISBN 978-7-89447-188-8 杞憲鐧昏鍙�:2011SR027542 瀹℃壒鏂囧彿:绉戞妧涓庢暟瀛椼��2011銆�562 鍙�
-92 djxxz mrgame 1 1.0.18 3101 1 1 1 鍒�鍓戠瑧鏂颁紶 com.ziyouyouxi08.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64) 娓告垙钁椾綔鏉冧汉:姹熻嫃鏄撲箰缃戠粶绉戞妧鏈夐檺鍏徃 鍑虹増鏈嶅姟鍗曚綅:鍖椾含浼�氱數瀛愬嚭鐗堢ぞ</r>鍑虹増鐗╁彿:ISBN 978-7-7979-0154-3 澶囨缂栧彿:鏂囩綉娓稿瀛� [2016] M-RPG 7538 瀹℃壒鏂囧彿:鏂板箍鍑哄[2016]1343鍙�
-93 djxxz_ios mrgameios 1 1.1.0 3201 1 1 1 鍒�鍓戠瑧鏂颁紶 shah.losl.lp shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64)
-94 js_android jisugame 1 1.0.18 3301 1 3 1 灏戝勾閰掑墤浠� com.lingleigame.shaonianqixiachuan shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 1 0 (-15,64)
-95 js_ios jisugame 1 1.0.18 3401 1 1 1 灏戝勾閰掑墤浠� com.jisu.snqxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64)
+90 xjaz spxjgame 1 1.0.18 2901 1 1 1 浠欏姭 com.xjaz.sp shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (0,80) 娓告垙钁椾綔鏉冧汉:鍖椾含闅忔墜浜掑姩淇℃伅鎶�鏈湁闄愬叕鍙� 鍑虹増鏈嶅姟鍗曚綅:鍖椾含涓柊鑱旂鎶�鑲′唤鏈夐檺鍏徃閲戠増鐢靛瓙鍑虹増绀�</r>鍑虹増鐗╁彿:ISBN 978-7-89447-188-8 杞憲鐧昏鍙�:2011SR027542 瀹℃壒鏂囧彿:绉戞妧涓庢暟瀛椼��2011銆�562 鍙� sipu
+91 xjios spyxxjios 1 1.0.18 3001 1 1 1 浠欏姭 com.xj.jjk shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (0,80) 娓告垙钁椾綔鏉冧汉:鍖椾含闅忔墜浜掑姩淇℃伅鎶�鏈湁闄愬叕鍙� 鍑虹増鏈嶅姟鍗曚綅:鍖椾含涓柊鑱旂鎶�鑲′唤鏈夐檺鍏徃閲戠増鐢靛瓙鍑虹増绀�</r>鍑虹増鐗╁彿:ISBN 978-7-89447-188-8 杞憲鐧昏鍙�:2011SR027542 瀹℃壒鏂囧彿:绉戞妧涓庢暟瀛椼��2011銆�562 鍙� sipu
+92 djxxz mrgame 1 1.0.18 3101 1 1 1 鍒�鍓戠瑧鏂颁紶 com.ziyouyouxi08.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64) 娓告垙钁椾綔鏉冧汉:姹熻嫃鏄撲箰缃戠粶绉戞妧鏈夐檺鍏徃 鍑虹増鏈嶅姟鍗曚綅:鍖椾含浼�氱數瀛愬嚭鐗堢ぞ</r>鍑虹増鐗╁彿:ISBN 978-7-7979-0154-3 澶囨缂栧彿:鏂囩綉娓稿瀛� [2016] M-RPG 7538 瀹℃壒鏂囧彿:鏂板箍鍑哄[2016]1343鍙� maoer
+93 djxxz_ios mrgameios 1 1.0.18 3201 1 1 1 鍒�鍓戠瑧鏂颁紶 shah.losl.lp shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64) maoer
+94 js_android jisugame 1 1.0.18 3301 1 3 1 灏戝勾閰掑墤浠� com.lingleigame.shaonianqixiachuan shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 1 0 (-15,64) jisu
+95 js_ios jisugameios 1 1.0.18 3401 1 1 1 灏戝勾閰掑墤浠� com.jisu.snqxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64) jisu
993 djxxz_ios mrgameios 1 1.1.0 3201 1 3 1 鍒�鍓戠瑧鏂颁紶 shah.losl.lp shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 1 0 (-15,64) 娓告垙钁椾綔鏉冧汉:姹熻嫃鏄撲箰缃戠粶绉戞妧鏈夐檺鍏徃 鍑虹増鏈嶅姟鍗曚綅:鍖椾含浼�氱數瀛愬嚭鐗堢ぞ</r>鍑虹増鐗╁彿:ISBN 978-7-7979-0154-3 澶囨缂栧彿:鏂囩綉娓稿瀛� [2016] M-RPG 7538 瀹℃壒鏂囧彿:鏂板箍鍑哄[2016]1343鍙�
994 android_20 822055139 1 1.1.0 1888 1 1 1 灏戝勾淇粰浼� com.ziyouyouxi01.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 1 0 (-15,64)
995 djxxz mrgame 1 1.1.0 2801 999 1 1 鍒�鍓戠瑧鏂颁紶 com.ziyouyouxi08.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 1 0 (-15,64)
996 lxj_android 813015059 1 1.1.0 1888 999 1 1 鐏典粰璁� com.ziyouyouxi07.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 1 0 -26,139
-997 android_20 822055139 1 1.1.0 1888 999 1 1 灏戝勾淇粰浼� com.ziyouyouxi01.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64)
+997 android_20 822055139 1 1.0.18 1888 999 1 1 灏戝勾淇粰浼� com.ziyouyouxi01.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64)
998 snqxz_1 424064855 1 1.1.0 2301 999 1 1 灏戝勾濂囦緺浼� com.zyxhgame.game003 shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 5X26T385YZ 0 0 (-15,64)
999 lxj 813015059 1 1.1.0 2050 999 1 1 鐏典粰璁� com.zyxhgame.game007 shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 -26,139
diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
index ab4a9a5..f58cb64 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -110,6 +110,8 @@
window: PrayerWin
- order: 4
window: AwardExchangeWin
+ - order: 5
+ window: WheelOfFortuneWin
- parent: PetWin
orderTables:
- order: 0
--
Gitblit v1.8.0