Merge remote-tracking branch 'origin/master' into leonard

client_Wu Xijin

2018-10-29 6a55615a1bf346b6b7fd7e4b827ce80566647bea

Merge remote-tracking branch 'origin/master' into leonard

 Assets/Editor/Logo/xjaz/TB_DL_Logo.png

 Assets/Editor/Logo/xjios/Icon.png

 Assets/Editor/Logo/xjios/Launch.png

 Assets/Editor/Logo/xjios/LoginBackGround.png

 Assets/Editor/Logo/xjios/LoginBackGround.png.meta

New file
@@ -0,0 +1,68 @@
fileFormatVersion: 2
guid: 4a4f2f1353164494f9c201e2a49f2d91
timeCreated: 1540628271
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/BuiltInResourceSetting.cs

@@ -56,7 +56,7 @@
        var fromPath = "Assets/Editor/Logo/" + GetVersionName(publisher) + "/LoginBackGround.png";
        var toPath = "Assets/ResourcesOut/BuiltIn/UI/Sprites/LoginBackGround.png";
        AssetDatabase.DeleteAsset(toPath);
        if (!File.Exists(Application.dataPath + "Editor/Logo/" + GetVersionName(publisher) + "/LoginBackGround.png"))
        if (!File.Exists(Application.dataPath + "/Editor/Logo/" + GetVersionName(publisher) + "/LoginBackGround.png"))
        {
            return;
        }

 Assets/Editor/VersionConfigs/Versions.txt

@@ -13,8 +13,8 @@
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    2    0    1    少年修仙传    com.ziyouyouxi01.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-15,64)        
89    android_20    822055139    1    1.1.0    2020    4    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,80)    游戏著作权人：广州捷游软件有限公司 出版社服务单位：三辰影库音像出版社</r>出版物号：ISBN 978-7-89658-810-9 软著登记号：2013SR060480 审批文号：新广出审【2014】503号     sipu
91    xjios    spyxxzios    1    1.1.1    3001    1    1    1    逍遥修真    com.snxz.red    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (0,80)    游戏著作权人:北京随手互动信息技术有限公司 出版服务单位:北京中新联科技股份有限公司金版电子出版社</r>出版物号:ISBN 978-7-89447-188-8 软著登记号:2011SR027542 审批文号:科技与数字〔2011〕562 号     sipu
90    xjaz    spxjgame    1    1.1.0    2901    1    1    1    仙劫    com.xjaz.sp    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-15,80)    游戏著作权人：广州捷游软件有限公司 出版社服务单位：三辰影库音像出版社</r>出版物号：ISBN 978-7-89658-810-9 软著登记号：2013SR060480 审批文号：新广出审【2014】503号     sipu
91    xjios    spyxxzios    1    1.1.1    3001    1    1    1    少年修真    com.snxz.red    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.19    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.19    3201    1    1    1    刀剑笑新传    shah.losl.lp    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-15,64)         maoer
94    js_android    jisugame    1    1.1.0    3301    1    1    1    少年酒剑仙    com.lingleigame.shaonianqixiachuan    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-15,64)        jisu

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -112,8 +112,6 @@
      window: PrayerWin
    - order: 4
      window: AwardExchangeWin
    - order: 5
      window: WheelOfFortuneWin
  - parent: PetWin
    orderTables:
    - order: 0
@@ -156,6 +154,8 @@
      window: FlashRushToBuyWin
    - order: 15
      window: WishingPoolWin
    - order: 16
      window: WheelOfFortuneWin
  - parent: VipRechargeWin
    orderTables:
    - order: 0