From 4b6432c17050bb65511feb41beae4c2c526fe075 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 18 四月 2019 21:36:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Editor/Logo/xbqy/Icon.png | 0
Assets/Editor/Logo/xbqy/Icon.png.meta | 92 +++++++++++
Assets/Editor/Logo/xbqy/Launch_1.png.meta | 92 +++++++++++
Assets/Editor/Logo/xbqy/SplashImage.png | 0
Assets/Editor/VersionConfigs/Versions.txt | 8
Assets/Editor/Logo/xbqy/TB_DL_Logo.png.meta | 92 +++++++++++
Assets/Editor/Logo/xbqy/LaunchBackGround.png.meta | 92 +++++++++++
Assets/Editor/Logo/xbqy/SplashImage.png.meta | 92 +++++++++++
Assets/Editor/Logo/xbqy/LaunchBackGround.png | 0
Assets/Editor/Logo/xbqy/Launch_1.png | 0
Assets/Editor/Logo/xbqy/TB_DL_Logo.png | 0
11 files changed, 464 insertions(+), 4 deletions(-)
diff --git a/Assets/Editor/Logo/xbqy/Icon.png b/Assets/Editor/Logo/xbqy/Icon.png
new file mode 100644
index 0000000..3ef4c34
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/Icon.png
Binary files differ
diff --git a/Assets/Editor/Logo/xbqy/Icon.png.meta b/Assets/Editor/Logo/xbqy/Icon.png.meta
new file mode 100644
index 0000000..3878c43
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/Icon.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 0118954b3e1a44f4a8971d4be333ae29
+timeCreated: 1521082299
+licenseType: Pro
+TextureImporter:
+ fileIDToRecycleName: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ filterMode: -1
+ aniso: -1
+ mipBias: -1
+ wrapMode: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: iPhone
+ maxTextureSize: 2048
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ - buildTarget: Android
+ maxTextureSize: 2048
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Editor/Logo/xbqy/LaunchBackGround.png b/Assets/Editor/Logo/xbqy/LaunchBackGround.png
new file mode 100644
index 0000000..0b455c4
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/LaunchBackGround.png
Binary files differ
diff --git a/Assets/Editor/Logo/xbqy/LaunchBackGround.png.meta b/Assets/Editor/Logo/xbqy/LaunchBackGround.png.meta
new file mode 100644
index 0000000..fe4fedc
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/LaunchBackGround.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 5c6b50d4f7c96714592ba9e8d6702719
+timeCreated: 1555303472
+licenseType: Pro
+TextureImporter:
+ fileIDToRecycleName: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ filterMode: -1
+ aniso: -1
+ mipBias: -1
+ wrapMode: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: iPhone
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Android
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Editor/Logo/xbqy/Launch_1.png b/Assets/Editor/Logo/xbqy/Launch_1.png
new file mode 100644
index 0000000..36b0e00
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/Launch_1.png
Binary files differ
diff --git a/Assets/Editor/Logo/xbqy/Launch_1.png.meta b/Assets/Editor/Logo/xbqy/Launch_1.png.meta
new file mode 100644
index 0000000..4599b9d
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/Launch_1.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: a660f84edd252804aac2b3668a2f9738
+timeCreated: 1530278776
+licenseType: Pro
+TextureImporter:
+ fileIDToRecycleName: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ filterMode: 1
+ aniso: -1
+ mipBias: -1
+ wrapMode: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 1
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ - buildTarget: Android
+ maxTextureSize: 1024
+ textureFormat: 34
+ textureCompression: 1
+ compressionQuality: 1
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ - buildTarget: iPhone
+ maxTextureSize: 1024
+ textureFormat: 32
+ textureCompression: 1
+ compressionQuality: 1
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Editor/Logo/xbqy/SplashImage.png b/Assets/Editor/Logo/xbqy/SplashImage.png
new file mode 100644
index 0000000..ba15fcf
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/SplashImage.png
Binary files differ
diff --git a/Assets/Editor/Logo/xbqy/SplashImage.png.meta b/Assets/Editor/Logo/xbqy/SplashImage.png.meta
new file mode 100644
index 0000000..bee895e
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/SplashImage.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 179f9801f106906489c8b6bcc9896c8a
+timeCreated: 1520997354
+licenseType: Pro
+TextureImporter:
+ fileIDToRecycleName: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ filterMode: 0
+ aniso: -1
+ mipBias: -1
+ wrapMode: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaUsage: 0
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Android
+ maxTextureSize: 2048
+ textureFormat: 7
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ - buildTarget: iPhone
+ maxTextureSize: 2048
+ textureFormat: 7
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Editor/Logo/xbqy/TB_DL_Logo.png b/Assets/Editor/Logo/xbqy/TB_DL_Logo.png
new file mode 100644
index 0000000..8577337
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/TB_DL_Logo.png
Binary files differ
diff --git a/Assets/Editor/Logo/xbqy/TB_DL_Logo.png.meta b/Assets/Editor/Logo/xbqy/TB_DL_Logo.png.meta
new file mode 100644
index 0000000..146b4a7
--- /dev/null
+++ b/Assets/Editor/Logo/xbqy/TB_DL_Logo.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 76f26a0e42970f4409df9cbf82416e50
+timeCreated: 1530257245
+licenseType: Pro
+TextureImporter:
+ fileIDToRecycleName: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ filterMode: 1
+ aniso: -1
+ mipBias: -1
+ wrapMode: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 1
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ - buildTarget: Android
+ maxTextureSize: 512
+ textureFormat: 47
+ textureCompression: 1
+ compressionQuality: 1
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ - buildTarget: iPhone
+ maxTextureSize: 2048
+ textureFormat: 33
+ textureCompression: 1
+ compressionQuality: 1
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ spritePackingTag:
+ userData:
+ assetBundleName: builtin/sprites
+ assetBundleVariant:
diff --git a/Assets/Editor/VersionConfigs/Versions.txt b/Assets/Editor/VersionConfigs/Versions.txt
index 6c6c6df..d4f5087 100644
--- a/Assets/Editor/VersionConfigs/Versions.txt
+++ b/Assets/Editor/VersionConfigs/Versions.txt
@@ -1,9 +1,9 @@
锘縄d name AppId VersionAuthority m_Version m_ClientPackageFlag m_Branch m_AssetAccess m_PartAssetPackage m_ProductName m_BundleIdentifier m_KeystoreFileName m_KeystorePassword m_KeystoreAlias m_KeystoreAliasPassword m_AppleDeveloperTeamID m_DebugVersion m_IsBanShu m_LogoPosition m_BanHao m_SpID m_Recharge m_CreateRolePattern
鐗堟湰鏍囪瘑 鐗堟湰鍚嶇О 娓犻亾id 鐗堟湰鏉冮檺锛�0鏄祴璇曠増鏈紝1鏄彂甯冪増鏈� 鐗堟湰鍙� 瀹㈡埛绔爣璇� 鍒嗘敮 璧勬簮,0NullAsset,1HalfAsset,2FullAsset,3IgnoreDownLoad 鏄惁鍒嗗寘锛�0涓嶅垎鍖咃紝1鍒嗗寘 浜у搧鍚� 浜у搧鍖呭悕 绛惧悕鏂囦欢鍚� 绛惧悕鏂囦欢瀵嗙爜 绛惧悕鏂囦欢鍒悕 绛惧悕鏂囦欢鍒悕瀵嗙爜 寮�鍙戣�呰处鍙峰瘑鐮� 鏄惁debug鐗堟湰锛�0鍚�1鏄� 鏄惁鐗堢讲鐗堟湰锛�0鍚�1鏄� 鐧诲綍鐣岄潰鐨凩ogo浣嶇疆 鐗堝彿 杩愯惀鍟咺D 鍏呭�肩晫闈㈤鏍� 鍒涜鍦烘櫙椋庢牸
-9998 TheSecondWorld test 0 1.100.1 aaa 2 2 1 灏戝勾淇粰浼� com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 1 0 (-32,144) 0 1
-9999 TheSecondWorld test 0 1.100.1 aaa 2 1 1 灏戝勾淇粰浼� com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 1 0 (-32,144) 0 1
-10000 TheSecondWorld test 0 1.100.1 aaa 2 3 1 灏戝勾淇粰浼� com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 1 0 (-32,144) 0 1
-1 android_20 226114725 1 1.5.200 2020 1 1 1 灏戝勾淇粰浼� com.shandangceshi.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64) 0 1
+9998 TheSecondWorld test 0 1.100.1 aaa 2 2 1 灏戝勾淇粰浼� com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 1 0 (-32,144) 0
+9999 TheSecondWorld test 0 1.100.1 aaa 2 1 1 灏戝勾淇粰浼� com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 1 0 (-32,144) 0
+10000 TheSecondWorld test 0 1.100.1 aaa 2 3 1 灏戝勾淇粰浼� com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 1 0 (-32,144) 0
+1 xbqy 226114725 1 2.0.0 test 900 1 1 浠欏疂濂囩紭 com.shandangceshi.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-32,144) 0
2 android_20 822055139 1 1.5.200 2020 0 1 1 灏戝勾淇粰浼� com.ziyouyouxi01.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64) 0 1
3 android_20 822055139 1 1.5.200 2020 2 1 1 灏戝勾淇粰浼� com.ziyouyouxi01.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64) 0 1
4 android_20 822055139 1 1.5.200 2021 2 1 1 灏戝勾淇粰浼� com.ziyouyouxi01.snxxz shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (-15,64) 0 1
--
Gitblit v1.8.0