Merge commit 'f7c9c6db1c194233d15fdd848721b2d47b8dd11e' into master

chenxin

2020-12-11 47998dc6daec5da4562ed23d51af65990e9cf3af

Merge commit 'f7c9c6db1c194233d15fdd848721b2d47b8dd11e' into master

 Assets/Scenes/Levels/Battle/Endless2D.unity

@@ -4805,6 +4805,12 @@
      propertyPath: m_Camera
      value: 
      objectReference: {fileID: 1340671930}
    - target: {fileID: 7048995018697131114, guid: 29da21b318f42054db30c52123aa4dbf,
        type: 3}
      propertyPath: m_Sprite
      value: 
      objectReference: {fileID: 21300000, guid: 243c7c03ef72a5b45bc1b772d1639260,
        type: 3}
    - target: {fileID: 7240404797452539631, guid: 29da21b318f42054db30c52123aa4dbf,
        type: 3}
      propertyPath: Panel

 Assets/Scenes/LoadingScene.unity

@@ -433,6 +433,7 @@
  m_Script: {fileID: 11500000, guid: 5671a738ca063f047a1619ba0c199f45, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  nextSprite: {fileID: 21300000, guid: c98050c2e2f37b24cb4f9e43acd62964, type: 3}
  imei0: 
  imei1: 
  meid: 

 Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs

@@ -25,6 +25,9 @@

    float waitTime;//加载等待时间

    [SerializeField]
    private Sprite nextSprite;

    // Start is called before the first frame update
    void Start()
    {

 Assets/UI/Endless/Bottom/Lark20201211-101254.png

 Assets/UI/Endless/Bottom/Lark20201211-101254.png.meta

copy from "Assets/UI/Endless/Bottom/\350\277\233\345\272\246\345\272\225.png.meta"
copy to Assets/UI/Endless/Bottom/Lark20201211-101254.png.meta
File was copied from Assets/UI/Endless/Bottom/进度底.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cda1ffd53d268f74fa300a5403c86531
guid: 243c7c03ef72a5b45bc1b772d1639260
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@@ -89,12 +89,12 @@
    buildTarget: Android
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureFormat: 4
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:

 Assets/UI/Endless/Bottom/进度底.png

Binary files differ

 Assets/UI/Loading/Lark20201211-193242.png

 Assets/UI/Loading/Lark20201211-193242.png.meta

File was renamed from Assets/UI/Endless/Bottom/进度底.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cda1ffd53d268f74fa300a5403c86531
guid: c98050c2e2f37b24cb4f9e43acd62964
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@@ -89,12 +89,12 @@
    buildTarget: Android
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureFormat: 4
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:

 Assets/UI/Loading/LoadingBg.png.meta

@@ -89,12 +89,12 @@
    buildTarget: Android
    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureFormat: 4
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet: