From 8883a075615dd05aa5b1311591fe4649f0fb8c8e Mon Sep 17 00:00:00 2001 From: client_Hale <339726288@qq.com> Date: 星期日, 20 十月 2019 18:16:05 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client --- Assets/Editor/Logo/mgxbqy/Icon.png.meta | 2 +- Assets/Editor/Logo/mgxbqy/Launch_1.png.meta | 2 +- Assets/Editor/Logo/mgxbqy/SplashImage.png.meta | 2 +- Assets/Editor/VersionConfigs/Versions.txt | 2 +- Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png | 0 Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png.meta | 2 +- Assets/Editor/Logo/mgxbqy/Icon.png | 0 Assets/Editor/Logo/mgxbqy/LoginBackGround.png.meta | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Editor/Logo/mgxbqy/Icon.png b/Assets/Editor/Logo/mgxbqy/Icon.png index ce5b059..20988a7 100644 --- a/Assets/Editor/Logo/mgxbqy/Icon.png +++ b/Assets/Editor/Logo/mgxbqy/Icon.png Binary files differ diff --git a/Assets/Editor/Logo/mgxbqy/Icon.png.meta b/Assets/Editor/Logo/mgxbqy/Icon.png.meta index ae12734..33036d8 100644 --- a/Assets/Editor/Logo/mgxbqy/Icon.png.meta +++ b/Assets/Editor/Logo/mgxbqy/Icon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7569aab3b1252aa4c94fecf19429fc36 +guid: 94a339d2fc05ee24c8984a5eb2575112 timeCreated: 1521082299 licenseType: Pro TextureImporter: diff --git a/Assets/Editor/Logo/mgxbqy/Launch_1.png.meta b/Assets/Editor/Logo/mgxbqy/Launch_1.png.meta index b577d2c..f9611c5 100644 --- a/Assets/Editor/Logo/mgxbqy/Launch_1.png.meta +++ b/Assets/Editor/Logo/mgxbqy/Launch_1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e53c116ebe42b4f4f98e410b44afd0ab +guid: 86fb464304f6cf24d899d8dd66b8345d timeCreated: 1555914219 licenseType: Free TextureImporter: diff --git a/Assets/Editor/Logo/mgxbqy/LoginBackGround.png.meta b/Assets/Editor/Logo/mgxbqy/LoginBackGround.png.meta index 26d8667..a7b6b5a 100644 --- a/Assets/Editor/Logo/mgxbqy/LoginBackGround.png.meta +++ b/Assets/Editor/Logo/mgxbqy/LoginBackGround.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ba89397a41c026c4ba1ce8b1a339499e +guid: ad87731341525714e8f2a5b075919894 timeCreated: 1555914219 licenseType: Free TextureImporter: diff --git a/Assets/Editor/Logo/mgxbqy/SplashImage.png.meta b/Assets/Editor/Logo/mgxbqy/SplashImage.png.meta index d0d8066..0788b05 100644 --- a/Assets/Editor/Logo/mgxbqy/SplashImage.png.meta +++ b/Assets/Editor/Logo/mgxbqy/SplashImage.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 740d5dcf9ea5bec4cbe2aa96a14d8956 +guid: e09a482f8dfe69b4d886a5e748222865 timeCreated: 1520997354 licenseType: Pro TextureImporter: diff --git a/Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png b/Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png index 6cbbba4..01f4bfe 100644 --- a/Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png +++ b/Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png Binary files differ diff --git a/Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png.meta b/Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png.meta index c35e44b..0fcb7bc 100644 --- a/Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png.meta +++ b/Assets/Editor/Logo/mgxbqy/TB_DL_Logo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7078bc0368637745bfa72919d11b396 +guid: bee8e140d5355084fb2e408b4ff1da1a timeCreated: 1530257245 licenseType: Pro TextureImporter: diff --git a/Assets/Editor/VersionConfigs/Versions.txt b/Assets/Editor/VersionConfigs/Versions.txt index 1d2d06d..e47f8c9 100644 --- a/Assets/Editor/VersionConfigs/Versions.txt +++ b/Assets/Editor/VersionConfigs/Versions.txt @@ -17,7 +17,7 @@ 12 djxxz mrgame 1 2.0.500 3101 3 xbqy 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 0 1 13 xjaz spxjgame 1 2.0.500 2901 4 xbqy 1 1 浠欏姭 com.xjaz.sp shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,80) 娓告垙钁椾綔鏉冧汉锛氬箍宸炴嵎娓歌蒋浠舵湁闄愬叕鍙� 鍑虹増绀炬湇鍔″崟浣嶏細涓夎景褰卞簱闊冲儚鍑虹増绀�</r>鍑虹増鐗╁彿锛欼SBN 978-7-89658-810-9 杞憲鐧昏鍙凤細2013SR060480 瀹℃壒鏂囧彿锛氭柊骞垮嚭瀹°��2014銆�503鍙� sipu 0 1 14 xjaz_zwx spxjgame 1 2.0.500 2901 3 xbqy 1 1 浠欏姭 com.xjaz.sp shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,80) 娓告垙钁椾綔鏉冧汉锛氬箍宸炴嵎娓歌蒋浠舵湁闄愬叕鍙� 鍑虹増绀炬湇鍔″崟浣嶏細涓夎景褰卞簱闊冲儚鍑虹増绀�</r>鍑虹増鐗╁彿锛欼SBN 978-7-89658-810-9 杞憲鐧昏鍙凤細2013SR060480 瀹℃壒鏂囧彿锛氭柊骞垮嚭瀹°��2014銆�503鍙� sipu 0 1 -15 mgxbqy mgxbqy 1 2.0.500 5001 1 xbqy 1 1 姊﹀够澶╅獎 com.mhtj.mg shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (15,64) mggame 0 1 +15 mgxbqy mgxbqy 1 2.0.500 5001 1 xbqy 1 1 姊︾伒浼犺 com.mhtj.mg shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (0,80) mggame 0 1 102 taptap 904100357 1 2.0.500 4101 1 xbqy 1 1 鍒�鍓戠瑧鏂颁紶 com.ziyouyouxi08.djxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 0 0 (-15,64) taptap 0 1 103 yjgame yjgame 1 2.0.500 4201 2 xbqy 1 1 鍒�鍓戠瑧鏂颁紶 com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 0 0 (-15,64) 浜屽洓鍏浂锛堥晣姹燂級鏅烘収绀惧尯淇℃伅鏈嶅姟鏈夐檺鍏徃銆愯繍钀ュ崟浣嶃�� 鍖椾含浼�氱數瀛愬嚭鐗堢ぞ 銆愬嚭鐗堛��</r>杞憲鐧昏鍙凤細2015SR235627 ISBN锛�978-7-7979-0154-3 瀹℃壒鏂囧彿锛氭柊骞垮嚭瀹2016]1343鍙� xiaomi 0 1 104 yilegame yilegame 1 2.0.500 4301 2 xbqy 1 1 姊﹀够澶╅獎 com.android.yiru.menghtj shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (15,64) aoyou 0 1 -- Gitblit v1.8.0