Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

client_wuxijin

2018-08-10 f5045dd364830ad850e75782da5713471d1161a2

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

 Assets/Editor/Logo/lxj.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 01e005808a839ab41a7de35f6d789e60
folderAsset: yes
timeCreated: 1533884522
licenseType: Free
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Editor/Logo/lxj/Icon.png

 Assets/Editor/Logo/lxj/Icon.png.meta

New file
@@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: f9a599944a42e3b46a3a7b0f93bf028c
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: 

 Assets/Editor/Logo/lxj/SplashImage.png

 Assets/Editor/Logo/lxj/SplashImage.png.meta

New file
@@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 33633bfb5c6c7bc4db0cc457e200e5ce
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: 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: 0
  alphaIsTransparency: 1
  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: 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: 

 Assets/Editor/Logo/lxj/TB_DL_Logo.png

 Assets/Editor/Logo/lxj/TB_DL_Logo.png.meta

New file
@@ -0,0 +1,68 @@
fileFormatVersion: 2
guid: 6dc3be5110b15f54bb24359f22975e47
timeCreated: 1533883927
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
    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
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
  spritePackingTag: 
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Editor/Tool/ClientPackage.cs

@@ -13,14 +13,16 @@
    public static readonly string versionsFilePath = Application.dataPath + Path.DirectorySeparatorChar + "Editor/VersionConfigs/Versions.txt";
    public static readonly string[] baseLevels = new string[] { "Assets/Resources/Scenes/Launch.unity", "Assets/Resources/Scenes/Empty.unity" };



    public static string SDK_PLUGIN_PROJECT {

    public static string SDK_PLUGIN_PROJECT

    {

        get { return LocalSave.GetString("SDK_PROJECT_PATH"); }

        set { LocalSave.SetString("SDK_PROJECT_PATH", value); }

    }

    static string ANDROID_PLUGIN_PATH = Application.dataPath + "/Plugins/Android";

    static int packageIndex {

    static int packageIndex

    {

        get { return LocalSave.GetInt("ClientPackageIndex", 1); }

        set { LocalSave.SetInt("ClientPackageIndex", value); }

    }
@@ -236,7 +238,10 @@
        }



        FileExtersion.DirectoryCopy(StringUtility.Contact(SDK_PLUGIN_PROJECT, "/Android/", versionConfig.appId), ANDROID_PLUGIN_PATH);
        if (!versionConfig.appId.Equals("test"))

        {

        FileExtersion.DirectoryCopy(StringUtility.Contact(SDK_PLUGIN_PROJECT, "/渠道差异/", versionConfig.productName), ANDROID_PLUGIN_PATH);

        }
        AssetDatabase.SaveAssets();

        AssetDatabase.Refresh();




 Assets/Editor/VersionConfigs/Versions.txt

@@ -81,3 +81,4 @@
78    djx_28    226114725    1    1.0.12    2128    4    2    0    斗剑仙    com.shandangceshi.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-9.5,-286)

79    djx_29    226114725    1    1.0.12    2129    4    2    0    斗剑仙    com.shandangceshi.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-9.5,-286)

80    djx_30    226114725    1    1.0.12    2130    4    2    0    斗剑仙    com.shandangceshi.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-9.5,-286)

81    lxj    508021130    1    1.0.15    2201    0    1    1    斗剑仙    com.zyxhgame.game007    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018    7F7BWLXKZR    0    0    (-15,64)