From 9496ef89434aa7c93a0280fe729d735999f0b090 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 9 Apr 2021 13:40:54 +0800 Subject: [PATCH] =?UTF-8?q?meta=20=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e0fec1aa3aab0cd74e8759be957413493843f081) --- .../DyAct_Activity7/c_ygsj_kuang001_nmw.png.meta | 11 +++++++++++ .../Atlas/FifteenDayGiftAtlas/ArtFont.meta | 4 ---- .../ArtFont/l_lingshoubaize_anniu1.png.meta | 11 +++++++++++ .../ArtFont/l_lingshoubaize_rukou_zi.png.meta | 11 +++++++++++ .../ArtFont/l_lingshoubaize_slogan.png.meta | 11 +++++++++++ .../ArtFont/l_lingshoubaize_slogan01.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_01.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_02.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_03.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_04.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_05.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_06.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_07.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_08.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_09.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_10.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_11.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_12.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_13.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_14.png.meta | 11 +++++++++++ .../images/l_lingshoubaize_hua_15.png.meta | 11 +++++++++++ .../l_lingshoubaize_anniu.png.meta | 11 +++++++++++ .../l_lingshoubaize_daojukuang.png.meta | 11 +++++++++++ .../l_lingshoubaize_guanbi.png.meta | 11 +++++++++++ .../FifteenDayGiftAtlas/l_lingshoubaize_hua.png.meta | 11 +++++++++++ .../l_lingshoubaize_kuang.png.meta | 11 +++++++++++ .../l_lingshoubaize_kuang02.png.meta | 11 +++++++++++ .../l_lingshoubaize_kuangguang.png.meta | 11 +++++++++++ .../l_lingshoubaize_lihui.png.meta | 11 +++++++++++ .../FifteenDayGiftAtlas/l_lingshoubaize_lu.png.meta | 11 +++++++++++ .../l_lingshoubaize_rukou.png.meta | 11 +++++++++++ .../l_lingshoubaize_xiaohua2.png.meta | 11 +++++++++++ .../Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png.meta | 11 +++++++++++ .../Atlas/FuXingGaoZhao/r_fxgz_mujia.png.meta | 11 +++++++++++ .../Atlas/TagAtlas/c_czlb_yuan1.png.meta | 2 +- .../Atlas/TagAtlas/c_czlb_yuan2.png.meta | 2 +- .../Atlas/TagAtlas/c_czlb_yuan3.png.meta | 2 +- .../TianShuMiJuan/t_tianshumijuan_huangkuang.png.meta | 11 +++++++++++ .../TianShuMiJuan/t_tianshumijuan_mingzidi.png.meta | 11 +++++++++++ Assets/ManagedResources/Effects/Model/Materials.meta | 8 -------- .../PublicArtRes/Models/Materials.meta | 8 -------- 41 files changed, 388 insertions(+), 23 deletions(-) delete mode 100644 Assets/ManagedResources/Effects/Model/Materials.meta delete mode 100644 Assets/ManagedResources/PublicArtRes/Models/Materials.meta diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity7/c_ygsj_kuang001_nmw.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity7/c_ygsj_kuang001_nmw.png.meta index bb7b1b5586..42d8a9bb0a 100644 --- a/Assets/ManagedResources/Atlas/DyAct_Activity7/c_ygsj_kuang001_nmw.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_Activity7/c_ygsj_kuang001_nmw.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta index 1dcad5068c..8f426bc829 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD:Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta guid: e20e2df0e801f7c479db7253be9d1165 -======= -guid: 45286d5e3bd54274c918c3b290dec3fa ->>>>>>> china_dev_merge:Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_anniu1.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_anniu1.png.meta index b8a92bdc41..f0f93a8e73 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_anniu1.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_anniu1.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_rukou_zi.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_rukou_zi.png.meta index e5b487064e..b7a480efba 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_rukou_zi.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_rukou_zi.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_slogan.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_slogan.png.meta index 2a41b2e993..4da68c080e 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_slogan.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_slogan.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_slogan01.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_slogan01.png.meta index 74c1b19f6d..6c8f40201d 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_slogan01.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont/l_lingshoubaize_slogan01.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_01.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_01.png.meta index 55fce2fed5..dd64dffdc2 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_01.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_01.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_02.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_02.png.meta index f3e5203993..a79ea5e6a1 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_02.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_02.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_03.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_03.png.meta index 5a97b50b3c..f805e90fae 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_03.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_03.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_04.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_04.png.meta index 366057c0b1..4d5fbf6688 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_04.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_04.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_05.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_05.png.meta index a863ecfa27..3c0b854605 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_05.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_05.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_06.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_06.png.meta index 3afa64406f..c385b23c7e 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_06.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_06.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_07.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_07.png.meta index 053358b7dd..bc8f82cdf7 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_07.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_07.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_08.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_08.png.meta index 40e372873c..cc4221c717 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_08.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_08.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_09.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_09.png.meta index 863ba07f28..76358e6e06 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_09.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_09.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_10.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_10.png.meta index d11faec479..dcf5cc85d0 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_10.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_10.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_11.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_11.png.meta index 5feda25146..1f62512e38 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_11.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_11.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_12.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_12.png.meta index e00eb6b3a3..28f3b81580 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_12.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_12.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_13.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_13.png.meta index aefd3b8169..217b831306 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_13.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_13.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_14.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_14.png.meta index d37ca7536f..807a181dc2 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_14.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_14.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_15.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_15.png.meta index 6f5fb2fd4e..9c1190f987 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_15.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/images/l_lingshoubaize_hua_15.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_anniu.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_anniu.png.meta index 701416cd97..5f0bb54db3 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_anniu.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_anniu.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_daojukuang.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_daojukuang.png.meta index d9b14793de..965dfa299e 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_daojukuang.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_daojukuang.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_guanbi.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_guanbi.png.meta index 2b8367b281..ce216cb4bf 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_guanbi.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_guanbi.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_hua.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_hua.png.meta index 04798e31e6..04f6e37ccc 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_hua.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_hua.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuang.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuang.png.meta index 771c201211..823acc151f 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuang.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuang.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuang02.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuang02.png.meta index 78bf4e01c9..2258e60d9d 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuang02.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuang02.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuangguang.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuangguang.png.meta index de92b83c6f..3b043e4a09 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuangguang.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_kuangguang.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_lihui.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_lihui.png.meta index 9aef7d4404..2a5f1183a5 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_lihui.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_lihui.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_lu.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_lu.png.meta index e0942ab8e6..bf16b48876 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_lu.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_lu.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_rukou.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_rukou.png.meta index 5c2fbe8aea..32198cf810 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_rukou.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_rukou.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_xiaohua2.png.meta b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_xiaohua2.png.meta index a538f04474..2dea2a8a1a 100644 --- a/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_xiaohua2.png.meta +++ b/Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/l_lingshoubaize_xiaohua2.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png.meta b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png.meta index 9cd9a9fd38..193c23c922 100644 --- a/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png.meta +++ b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png.meta b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png.meta index 214c0f073f..2b3472d006 100644 --- a/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png.meta +++ b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png.meta index 6136886f95..ec4a9d2b9c 100644 --- a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png.meta +++ b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8433faecc652d374ab2a8398d559dfcb +guid: ac078472e13a3d44dbaf92b209cb3d19 TextureImporter: fileIDToRecycleName: {} externalObjects: {} diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png.meta index edda957205..f0ce351581 100644 --- a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png.meta +++ b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0e07676b8a5eca4bb06956f73bfe3d2 +guid: 550e4b817fd1acd4fb9bf598cd69dd44 TextureImporter: fileIDToRecycleName: 21300000: c_czlb_yuan_vi diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png.meta index 7b2d489290..de99b82220 100644 --- a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png.meta +++ b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0fd43dce91385d447a30170798eb1543 +guid: 88487e67c1b8da24c8adbba27168a071 TextureImporter: fileIDToRecycleName: 21300000: c_czlb_yuan_en diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_huangkuang.png.meta b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_huangkuang.png.meta index 46c7d84912..b480cc3496 100644 --- a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_huangkuang.png.meta +++ b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_huangkuang.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_mingzidi.png.meta b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_mingzidi.png.meta index 2ebb9d7bb9..2b63db1f34 100644 --- a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_mingzidi.png.meta +++ b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_mingzidi.png.meta @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Effects/Model/Materials.meta b/Assets/ManagedResources/Effects/Model/Materials.meta deleted file mode 100644 index 85c619cb77..0000000000 --- a/Assets/ManagedResources/Effects/Model/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 70e7feb15403e214f801e51b8b4e0461 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Models/Materials.meta b/Assets/ManagedResources/PublicArtRes/Models/Materials.meta deleted file mode 100644 index 25ee432029..0000000000 --- a/Assets/ManagedResources/PublicArtRes/Models/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4ffaae1db0483704eae97ecc794d5e28 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: