Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient

ProjectNLD/Assets/Art/UI/Sprite Atlas/LevelFight/Battle_Character.spriteatlasv2

@@ -19,4 +19,5 @@ SpriteAtlasAsset:
     - {fileID: 102900000, guid: b1abad6ffdd9bb9409e41fd47f0dc4fb, type: 3}
     - {fileID: 102900000, guid: e3cb3d5bbf5514442a4b475c8ffefced, type: 3}
     - {fileID: 102900000, guid: 544794340a8b3f14ca035bae94eb4f76, type: 3}
+    - {fileID: 102900000, guid: 0590fff5784698f4880d6c296135ba71, type: 3}
   m_IsVariant: 0

ProjectNLD/Assets/Art/UI/Sprite Atlas/LevelFight/Battle_Screen3DInfo.spriteatlasv2

@@ -13,7 +13,7 @@ SpriteAtlasAsset:
     packables:
     - {fileID: 102900000, guid: 117bcd6b7d330ad45ab12d380d7f274b, type: 3}
     - {fileID: 102900000, guid: 39c9381d5929e41489b89abdc44a108f, type: 3}
-    - {fileID: 102900000, guid: a8667c5bc7e804c49b155b81ccef68ef, type: 3}
+    - {fileID: 0}
     - {fileID: 102900000, guid: 8c3d619c620c69d4fa9c7175aa36294a, type: 3}
     - {fileID: 102900000, guid: 8ca225c1ec20edf42a6f943ee98c9869, type: 3}
   m_IsVariant: 0

ProjectNLD/Assets/Art/UI/Sprite Atlas/LevelFight/Battle_ScreenInfo.spriteatlasv2

@@ -16,4 +16,5 @@ SpriteAtlasAsset:
     - {fileID: 102900000, guid: 9acc36a3ed338d74a825123fb3942bb4, type: 3}
     - {fileID: 102900000, guid: 3c5cc226dbe4110478cc4fc8afad4a26, type: 3}
     - {fileID: 0}
+    - {fileID: 102900000, guid: a8667c5bc7e804c49b155b81ccef68ef, type: 3}
   m_IsVariant: 0

ProjectNLD/Assets/Art/UI/Texture/UI_Pic_Level/BeforeBattle.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6aadd0d1364f55d479414118f476a9ef
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightTarget.prefab

@@ -1533,7 +1533,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 91b9c7a4ba180f744bdaeb31a81f8293, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

ProjectNLD/Assets/Art_Out/UI/Texture/UI_Pic_Level/NewFight/UI_di_tanchuang_01.png.meta

@@ -1,140 +0,0 @@
-fileFormatVersion: 2
-guid: d03ab6e63911bdd40b21c77d3ddbea4b
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 1024
-    resizeAlgorithm: 0
-    textureFormat: 3
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 1024
-    resizeAlgorithm: 0
-    textureFormat: 22
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 1024
-    resizeAlgorithm: 0
-    textureFormat: 49
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: