From 1bb2cb899e33f879d3cacae89b8b27825f51fa46 Mon Sep 17 00:00:00 2001
From: MacBuilder <MacBuilder@secondworld.com>
Date: 星期五, 28 九月 2018 22:30:57 +0800
Subject: [PATCH] Merge commit 'c88a516b60bfc0f06d67dbe6f18d94c14d2d094d'
---
Assets/Editor/Logo/xjaz/Icon.png | 0
Assets/Editor/VersionConfigs/Versions.txt | 2
Assets/Editor/Logo/xjaz/TB_DL_Logo.png | 0
Assets/Editor/Logo/xjios/SplashImage.png | 0
Assets/Editor/Logo/xjaz/SplashImage.png | 0
Assets/Resources/Config/PriorBundle.txt | 38 ++++++++++++------
Assets/Editor/Logo/xjios/SplashImage.png.meta | 22 +++++++---
Assets/Editor/Logo/xjaz/SplashImage.png.meta | 22 +++++++---
8 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/Assets/Editor/Logo/xjaz/Icon.png b/Assets/Editor/Logo/xjaz/Icon.png
index 3ef4c34..f9eb859 100644
--- a/Assets/Editor/Logo/xjaz/Icon.png
+++ b/Assets/Editor/Logo/xjaz/Icon.png
Binary files differ
diff --git a/Assets/Editor/Logo/xjaz/SplashImage.png b/Assets/Editor/Logo/xjaz/SplashImage.png
index 94a83fd..ba15fcf 100644
--- a/Assets/Editor/Logo/xjaz/SplashImage.png
+++ b/Assets/Editor/Logo/xjaz/SplashImage.png
Binary files differ
diff --git a/Assets/Editor/Logo/xjaz/SplashImage.png.meta b/Assets/Editor/Logo/xjaz/SplashImage.png.meta
index f5c4456..faf99ba 100644
--- a/Assets/Editor/Logo/xjaz/SplashImage.png.meta
+++ b/Assets/Editor/Logo/xjaz/SplashImage.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
-guid: 0b7e1b8ad42bf914d986fd7e428ea300
-timeCreated: 1536927104
-licenseType: Free
+guid: e99f2730749ab0f4287df1aa1c858571
+timeCreated: 1520997354
+licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
@@ -27,7 +27,7 @@
textureFormat: 1
maxTextureSize: 2048
textureSettings:
- filterMode: -1
+ filterMode: 0
aniso: -1
mipBias: -1
wrapMode: 1
@@ -41,7 +41,7 @@
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
- alphaUsage: 1
+ alphaUsage: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
@@ -68,12 +68,20 @@
overridden: 0
- buildTarget: Android
maxTextureSize: 2048
- textureFormat: -1
+ textureFormat: 7
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
+ - buildTarget: iPhone
+ maxTextureSize: 2048
+ textureFormat: 7
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
spriteSheet:
serializedVersion: 2
sprites: []
diff --git a/Assets/Editor/Logo/xjaz/TB_DL_Logo.png b/Assets/Editor/Logo/xjaz/TB_DL_Logo.png
index 878b206..bda80c2 100644
--- a/Assets/Editor/Logo/xjaz/TB_DL_Logo.png
+++ b/Assets/Editor/Logo/xjaz/TB_DL_Logo.png
Binary files differ
diff --git a/Assets/Editor/Logo/xjios/SplashImage.png b/Assets/Editor/Logo/xjios/SplashImage.png
index 94a83fd..ba15fcf 100644
--- a/Assets/Editor/Logo/xjios/SplashImage.png
+++ b/Assets/Editor/Logo/xjios/SplashImage.png
Binary files differ
diff --git a/Assets/Editor/Logo/xjios/SplashImage.png.meta b/Assets/Editor/Logo/xjios/SplashImage.png.meta
index d475b7d..faf99ba 100644
--- a/Assets/Editor/Logo/xjios/SplashImage.png.meta
+++ b/Assets/Editor/Logo/xjios/SplashImage.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
-guid: 9b4cbcac7ab76e145a9b09ea28bce7a9
-timeCreated: 1536927104
-licenseType: Free
+guid: e99f2730749ab0f4287df1aa1c858571
+timeCreated: 1520997354
+licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
@@ -27,7 +27,7 @@
textureFormat: 1
maxTextureSize: 2048
textureSettings:
- filterMode: -1
+ filterMode: 0
aniso: -1
mipBias: -1
wrapMode: 1
@@ -41,7 +41,7 @@
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
- alphaUsage: 1
+ alphaUsage: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
@@ -68,12 +68,20 @@
overridden: 0
- buildTarget: Android
maxTextureSize: 2048
- textureFormat: -1
+ textureFormat: 7
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
+ - buildTarget: iPhone
+ maxTextureSize: 2048
+ textureFormat: 7
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
spriteSheet:
serializedVersion: 2
sprites: []
diff --git a/Assets/Editor/VersionConfigs/Versions.txt b/Assets/Editor/VersionConfigs/Versions.txt
index 1c21a51..b9c3ee3 100644
--- a/Assets/Editor/VersionConfigs/Versions.txt
+++ b/Assets/Editor/VersionConfigs/Versions.txt
@@ -13,7 +13,7 @@
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.1.0 2020 1 1 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 (-15,64) 娓告垙钁椾綔鏉冧汉:鍖椾含闅忔墜浜掑姩淇℃伅鎶�鏈湁闄愬叕鍙� 鍑虹増鏈嶅姟鍗曚綅:鍖椾含涓柊鑱旂鎶�鑲′唤鏈夐檺鍏徃閲戠増鐢靛瓙鍑虹増绀�</r>鍑虹増鐗╁彿:ISBN 978-7-89447-188-8 杞憲鐧昏鍙�:2011SR027542 瀹℃壒鏂囧彿:绉戞妧涓庢暟瀛椼��2011銆�562 鍙�
+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.1.0 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)
diff --git a/Assets/Resources/Config/PriorBundle.txt b/Assets/Resources/Config/PriorBundle.txt
index 920a339..344a67f 100644
--- a/Assets/Resources/Config/PriorBundle.txt
+++ b/Assets/Resources/Config/PriorBundle.txt
@@ -100,16 +100,28 @@
97 prefab_race_Zq00 2
98 prefab_race_B_Cw16 2
99 prefab_race_ranshaoquan 2
-100 boss1 3
-101 music1 3
-102 role1 3
-103 show1 3
-104 speak1 3
-105 ui1 3
-106 bossskill1 4
-107 cj 4
-108 common1 4
-109 debuff1 4
-110 dsskill1 4
-111 skill1 4
-112 ui1 4
\ No newline at end of file
+100 prefab_race_a_zs00_sb 2
+101 prefab_race_a_zs01_sb 2
+102 prefab_race_a_zs02_sb 2
+103 prefab_race_a_zs03_sb 2
+104 prefab_race_a_zs04_sb 2
+105 prefab_race_a_zs05_sb 2
+106 prefab_race_a_zs06_sb 2
+107 prefab_race_a_zs07_sb 2
+108 prefab_race_a_zs08_sb 2
+109 prefab_race_a_zs09_sb 2
+110 prefab_race_a_zs10_sb 2
+111 prefab_race_a_zs99_sb 2
+112 boss1 3
+113 music1 3
+114 role1 3
+115 show1 3
+116 speak1 3
+117 ui1 3
+118 bossskill1 4
+119 cj 4
+120 common1 4
+121 debuff1 4
+122 dsskill1 4
+123 skill1 4
+124 ui1 4
\ No newline at end of file
--
Gitblit v1.8.0