Merge branch 'china/dev' into china/dev-c

# Conflicts:
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller.meta
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
dev_chengFeng
jiaoyangna 2021-04-16 15:42:39 +08:00
commit 92104541fc
2246 changed files with 58485 additions and 62804 deletions

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/r_zhandou_huntiao_001_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/r_zhandou_huntiao_002_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/r_zhandou_xuetiao_003_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/r_zhandou_xuetiao_007_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_r_ymqf_f_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_r_ymqf_m_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_r_ymqf_q_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_r_ymqf_y_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_r_ymqf_z_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_jjc_jiesuan_shengli_png_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_jjc_jiesuan_shibai_png_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_zhandouzhong_dou_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_zhandouzhong_zhan_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_zhandouzhong_zhong_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -95,5 +95,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_jiesuan_bai01_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_jiesuan_shengli02_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/ui_effect_jiesuan_zhan03_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baibao_banzi_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baibao_fuzi_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baibao_zi_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baolishuchu_juesebanzi2_solgan1_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baolishuchu_juesebanzi2_solgan_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baowuxitong_gongmin_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baowuxitong_hunbao_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baowuxitong_linbao_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baridenglu_shixingshuxing_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baridenglu_slogan02_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baridenglu_slogan03_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baridenglu_slogan08_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -115,5 +115,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baridenglu_slogan08_zh_1_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_baridenglu_sloganwuxing_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_bianhuanmoce_banner_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_bianhuanmoce_icon1_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_bianhuanmoce_icon2_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_bianhuanmoce_zi_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_bowenduoshi_banner_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_bowenduoshi_icon1_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_bowenduoshi_icon2_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/b_bowenduoshi_zi_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/banner_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_feng_01_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_feng_02_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_houqi_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_kuang003_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_qianqi_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_quanqi_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_xinhoupai_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_xinqianpai_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_xintuijianzhengrong_png_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_xinyishangzheng_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_yiyaobeijin0003_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_yiyaobeijin0004_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_yiyaobeijin0005_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_yiyaobeijin003_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_yiyaobeijin004_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_yiyaobeijin005_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_zhanli-li_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_zhanli-zhan_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bd_zhongqi_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -115,5 +115,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/bianpao_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_3_1_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_3_2_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_3_3_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_3_4_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_3_5_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_3_6_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_3_7_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_3_8_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_3_9_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_ab_00014_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_axl_00061_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_bgj_00091_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_bhxz_00013_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_ccfy_banner01_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_ccfy_beijin-slogan_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_ccfy_icon1_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_ccfy_icon2_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_ccfy_slogan_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_ce_00034_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chdr_00030_t9_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengjiu_ditu_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengjiu_fubenanniu_1_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengjiu_fubenanniu_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengjiu_jiaoseanniu_1_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengjiu_jiaoseanniu_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengjiu_teshuanniu_1_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengjiu_teshuanniu_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengjiu_wanfaanniu_1_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengjiu_wanfaanniu_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengyuan_tujian_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_bei_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_libao001_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_libao002_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_lijin001_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_lijin002_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_yuan001_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_yuan002_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -138,5 +138,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_yuan003_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_yueka001_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/c_chengzhang_yueka002_en
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More