From 2e798c6888c15ac25aba6f99535ffd8b6dff89df Mon Sep 17 00:00:00 2001 From: JieLing Date: Thu, 10 Jun 2021 18:24:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E5=90=8D?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...gshengxin.controller => fx_ui_xiuxingshengxin_ctrl.controller} | 0 ...controller.meta => fx_ui_xiuxingshengxin_ctrl.controller.meta} | 0 .../EffectResUI/Practice/Materials/{ren.mat => ren_mat.mat} | 0 .../Practice/Materials/{ren.mat.meta => ren_mat.mat.meta} | 0 .../Animation/{jian 2.controller => jian 2_ctrl.controller} | 0 .../{jian 2.controller.meta => jian 2_ctrl.controller.meta} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename Assets/ManagedResources/EffectResUI/Practice/Animation/{fx_ui_xiuxingshengxin.controller => fx_ui_xiuxingshengxin_ctrl.controller} (100%) rename Assets/ManagedResources/EffectResUI/Practice/Animation/{fx_ui_xiuxingshengxin.controller.meta => fx_ui_xiuxingshengxin_ctrl.controller.meta} (100%) rename Assets/ManagedResources/EffectResUI/Practice/Materials/{ren.mat => ren_mat.mat} (100%) rename Assets/ManagedResources/EffectResUI/Practice/Materials/{ren.mat.meta => ren_mat.mat.meta} (100%) rename Assets/ManagedResources/Effects/Animation/{jian 2.controller => jian 2_ctrl.controller} (100%) rename Assets/ManagedResources/Effects/Animation/{jian 2.controller.meta => jian 2_ctrl.controller.meta} (100%) diff --git a/Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin.controller b/Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin_ctrl.controller similarity index 100% rename from Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin.controller rename to Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin_ctrl.controller diff --git a/Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin.controller.meta b/Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin_ctrl.controller.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin.controller.meta rename to Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin_ctrl.controller.meta diff --git a/Assets/ManagedResources/EffectResUI/Practice/Materials/ren.mat b/Assets/ManagedResources/EffectResUI/Practice/Materials/ren_mat.mat similarity index 100% rename from Assets/ManagedResources/EffectResUI/Practice/Materials/ren.mat rename to Assets/ManagedResources/EffectResUI/Practice/Materials/ren_mat.mat diff --git a/Assets/ManagedResources/EffectResUI/Practice/Materials/ren.mat.meta b/Assets/ManagedResources/EffectResUI/Practice/Materials/ren_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Practice/Materials/ren.mat.meta rename to Assets/ManagedResources/EffectResUI/Practice/Materials/ren_mat.mat.meta diff --git a/Assets/ManagedResources/Effects/Animation/jian 2.controller b/Assets/ManagedResources/Effects/Animation/jian 2_ctrl.controller similarity index 100% rename from Assets/ManagedResources/Effects/Animation/jian 2.controller rename to Assets/ManagedResources/Effects/Animation/jian 2_ctrl.controller diff --git a/Assets/ManagedResources/Effects/Animation/jian 2.controller.meta b/Assets/ManagedResources/Effects/Animation/jian 2_ctrl.controller.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/jian 2.controller.meta rename to Assets/ManagedResources/Effects/Animation/jian 2_ctrl.controller.meta From 77121e01e3c1fb06a0a59107df855ac1c6f56615 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 10 Jun 2021 21:57:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=E8=A2=AB=E5=8A=A8200=20=20=E5=90=8C=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=98=B5=E8=90=A5=E5=A6=82=E6=9E=9C=E6=9C=89=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?200=E8=A2=AB=E5=8A=A8=20=E5=8F=AA=E4=BC=9A=E7=94=9F=E6=95=88?= =?UTF-8?q?=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index e2a666d773..a6dc35ba1f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1,4 +1,4 @@ -local floor = math.floor +local floor = math.floor local max = math.max local min = math.min --local RoleDataName = RoleDataName @@ -4194,7 +4194,10 @@ local passivityList = { -- a[float] [200] = function(role, args) local f1 = args[1] - + if PassiveManager.passiveCountList[role.camp][200] and PassiveManager.passiveCountList[role.camp][200] > 0 then + return + end + PassiveManager.passiveCountList[role.camp][200] = 1 local onFinalDamage = function(damagingFunc, atkRole, defRole, damage, skill, dotType, bCrit, damageType) local ignoreShara=atkRole.ignoreShara --特殊处理 白骨精附加的普攻不会忽略分摊 @@ -6958,7 +6961,6 @@ local passivityList = { local ctrlNum=0 local onBuffCaster = function(buff) - LogGreen("buff type = ".. buff.type) if buff.type == BuffName.Control then ctrlNum = ctrlNum + 1 end From 4165e6acd5696aba9fa16eaa51629034fc9c3022 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 10 Jun 2021 22:02:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E6=B3=A8=E9=87=8A=E4=B9=8B=E5=89=8D=E8=A2=AB?= =?UTF-8?q?=E5=8A=A8200=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index a6dc35ba1f..b89fbd375c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -4194,10 +4194,10 @@ local passivityList = { -- a[float] [200] = function(role, args) local f1 = args[1] - if PassiveManager.passiveCountList[role.camp][200] and PassiveManager.passiveCountList[role.camp][200] > 0 then - return - end - PassiveManager.passiveCountList[role.camp][200] = 1 + -- if PassiveManager.passiveCountList[role.camp][200] and PassiveManager.passiveCountList[role.camp][200] > 0 then + -- return + -- end + -- PassiveManager.passiveCountList[role.camp][200] = 1 local onFinalDamage = function(damagingFunc, atkRole, defRole, damage, skill, dotType, bCrit, damageType) local ignoreShara=atkRole.ignoreShara --特殊处理 白骨精附加的普攻不会忽略分摊 From 530374e00ba2a7c50feacbe57d84876aca82a74f Mon Sep 17 00:00:00 2001 From: JieLing Date: Thu, 10 Jun 2021 22:53:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E3=80=91?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E5=BC=95=E7=94=A8=E8=B5=84=E6=BA=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Atlas/AiYuanActivityAtlas.meta | 4 ++-- .../Atlas/CommonAtlas/jiantou.png.meta | 11 +++++++++++ .../Atlas/CommonAtlas/y_yosr_jiahao.png.meta | 11 +++++++++++ .../Atlas/CommonAtlas/y_yosr_wenhao.png.meta | 11 +++++++++++ .../t_tianxiangjiren_shenjiang_fx.png.meta | 11 +++++++++++ .../t_tianxiangjiren_shenjiang_jmm.png.meta | 11 +++++++++++ .../r_zjm_huodongicon-zhizunhaoli_zh.png.meta | 11 +++++++++++ .../ArtFont/t_tapolingxiao_liuxingyudi_zh.png.meta | 11 +++++++++++ .../SettingPlayerAtlas/r_Resource_Coin656.png.meta | 10 +++++----- .../Atlas/Story/wukongJuqing.jpg.meta | 11 +++++++++++ Assets/ManagedResources/Atlas/Story/wzs.jpg.meta | 11 +++++++++++ Assets/ManagedResources/Atlas/Story/wzs_1.jpg.meta | 11 +++++++++++ Assets/ManagedResources/Atlas/Story/wzs_2.jpg.meta | 11 +++++++++++ Assets/ManagedResources/Atlas/Story/wzs_3.jpg.meta | 11 +++++++++++ Assets/ManagedResources/Atlas/Story/wzs_4.jpg.meta | 11 +++++++++++ Assets/ManagedResources/Atlas/Story/wzs_fz.png.meta | 11 +++++++++++ .../ArtFont/g_ghhb_weidacheng_zh.png.meta | 11 +++++++++++ .../ArtFont/g_ghhb_yidacheng_zh.png.meta | 11 +++++++++++ .../t_tapolingxiao_tiaozhananniu_02.png.meta | 11 +++++++++++ .../t_tapolingxiao_zuixiaxiaowu.png.meta | 11 +++++++++++ .../t_tapolingxiao_zuoshangdi.png.meta | 11 +++++++++++ .../t_tapolingxiao_zuoshangdi2.png.meta | 11 +++++++++++ .../TagButtonAtlas/ArtFont/x_xrsc_icon1_zh.png.meta | 11 +++++++++++ .../TagButtonAtlas/ArtFont/x_xrsc_icon2_zh.png.meta | 11 +++++++++++ .../TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png.meta | 11 +++++++++++ .../TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png.meta | 11 +++++++++++ Assets/ManagedResources/Atlas/TimeLimitUpHero.meta | 4 ++-- .../TimeLimitUpHero/ArtFont.meta} | 2 +- .../Atlas/YunYouManAtlas/y_yosr_dui.png.meta | 11 +++++++++++ .../Atlas/YunYouManAtlas/y_yosr_jiantou.png.meta | 11 +++++++++++ .../ArtFont/z_zzhl_qieye301_zh.png.meta | 11 +++++++++++ .../ArtFont/z_zzhl_qieye306_zh.png.meta | 11 +++++++++++ .../ArtFont/z_zzhl_qieye30_zh.png.meta | 11 +++++++++++ .../ArtFont/z_zzhl_qieye6_zh.png.meta | 11 +++++++++++ .../ArtFont/z_zzhl_solgan_zh.png.meta | 11 +++++++++++ .../ArtFont/z_zzhl_xbt30_zh.png.meta | 11 +++++++++++ .../ArtFont/z_zzhl_xbt6_zh.png.meta | 11 +++++++++++ .../Atlas/ZhiZunHaoLiAtlas/z_zzhl_banzi.png.meta | 11 +++++++++++ .../ZhiZunHaoLiAtlas/z_zzhl_beijguang.png.meta | 11 +++++++++++ .../Atlas/ZhiZunHaoLiAtlas/z_zzhl_guanbi.png.meta | 11 +++++++++++ .../Atlas/ZhiZunHaoLiAtlas/z_zzhl_kuang.png.meta | 11 +++++++++++ .../Atlas/ZhiZunHaoLiAtlas/z_zzhl_lihui.png.meta | 11 +++++++++++ .../ManagedResources/Atlas/baibaoshanghuiAtlas.meta | 4 ++-- .../Audio/BGM/bgm_story_1_1.mp3.meta | 4 ++-- .../Audio/BGM/bgm_story_1_2.mp3.meta | 4 ++-- .../Audio/BGM/bgm_story_2_1.mp3.meta | 4 ++-- .../Audio/BGM/bgm_story_2_2.mp3.meta | 4 ++-- .../Audio/Skill/actor_voc/Audio_battle_chh.wav.meta | 4 ++-- .../Audio/Skill/actor_voc/Audio_battle_cy.wav.meta | 4 ++-- .../Audio/Skill/actor_voc/Audio_battle_fx.wav.meta | 4 ++-- .../Audio/Skill/actor_voc/Audio_battle_hxz.wav.meta | 4 ++-- .../Audio/Skill/actor_voc/Audio_battle_lm.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_battle_vo_axl01.wav.meta | 4 ++-- .../Audio/Skill/actor_voc/Audio_battle_xyk.wav.meta | 4 ++-- .../Audio/Skill/actor_voc/Audio_battle_ycx.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_battle_yhdd.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_01.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_02.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_03.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_04.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_05.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_06.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_07.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_08.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_09.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_10.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_11.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_12.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_13.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_14.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_15.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_swk_16.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_yhdd_01.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_yhdd_02.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_yhdd_03.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_yhdd_04.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_yhdd_05.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_yhdd_06.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_yhdd_07.wav.meta | 4 ++-- .../Skill/actor_voc/Audio_story_yhdd_08.wav.meta | 4 ++-- .../Audio/Skill/skill/audio_jn_chh_1.mp3.meta | 4 ++-- .../Audio/Skill/skill/audio_jn_chh_2.mp3.meta | 4 ++-- .../Audio/Skill/skill/audio_jn_cy_1.mp3.meta | 4 ++-- .../Audio/Skill/skill/audio_jn_cy_2.mp3.meta | 4 ++-- .../Audio/Skill/skill/audio_pg_nz.mp3.meta | 4 ++-- .../Audio/Skill/skill/audio_pg_swk.mp3.meta | 4 ++-- .../Audio/Skill/skill/audio_pg_yhdd.mp3.meta | 4 ++-- .../Audio/UI/common/voice_ui_laohuji.mp3.meta | 4 ++-- .../ManagedResources/BG/Loading/loading1.jpg.meta | 4 ++-- .../ManagedResources/BG/Loading/loading2.jpg.meta | 4 ++-- .../ManagedResources/BG/Loading/loading3.jpg.meta | 4 ++-- .../ManagedResources/BG/Loading/loading4.jpg.meta | 4 ++-- .../ManagedResources/BG/Loading/loading5.jpg.meta | 4 ++-- .../ManagedResources/BG/Loading/loading6.jpg.meta | 4 ++-- .../BG/Login/dl_ui_effect_bg.png.meta | 2 +- .../BG/s_silingshilian_di2.jpg.meta | 4 ++-- .../BGNC/dl_ui_effect_bg_xipu.jpg.meta | 4 ++-- Assets/ManagedResources/BGNC/loading7.jpg.meta | 4 ++-- .../ManagedResources/BGNC/loading_caohua.png.meta | 4 ++-- Assets/ManagedResources/BGNC/login_caohua.png.meta | 4 ++-- Assets/ManagedResources/BGNC/logo_caohua.png.meta | 4 ++-- .../DynamicAtlas/ArtFont/c_czlb_banner2.jpg.meta | 4 ++-- .../ArtFont/l_mrlb_banner1_zi_zh.png.meta | 4 ++-- .../ArtFont/r_richang_banner_1_zi_zh.png.meta | 4 ++-- .../ArtFont/r_richang_banner_2_zi_zh.png.meta | 4 ++-- .../ArtFont/r_richang_banner_3_zi_zh.png.meta | 4 ++-- .../ArtFont/r_richang_banner_4_zi_zh.png.meta | 4 ++-- .../ArtFont/r_richang_banner_5_zi_zh.png.meta | 4 ++-- .../ArtFont/r_zjm_icon-xinyuntanbao001_zh.png.meta | 4 ++-- .../ArtFont/r_zjm_icon-xinyuntanbao_zh.png.meta | 4 ++-- .../CommonAtlas/r_zjm_huodongicon-di2.png.meta | 4 ++-- .../DynamicAtlas/Skill/ArtFont/c_3_1_t9_zh.png.meta | 2 +- .../DynamicAtlas/Skill/ArtFont/c_3_2_t9_zh.png.meta | 2 +- .../DynamicAtlas/Skill/ArtFont/c_3_3_t9_zh.png.meta | 2 +- .../DynamicAtlas/Skill/ArtFont/c_3_4_t9_zh.png.meta | 2 +- .../DynamicAtlas/Skill/ArtFont/c_3_5_t9_zh.png.meta | 2 +- .../DynamicAtlas/Skill/ArtFont/c_3_6_t9_zh.png.meta | 4 ++-- .../DynamicAtlas/Skill/ArtFont/c_3_7_t9_zh.png.meta | 2 +- .../DynamicAtlas/Skill/ArtFont/c_3_8_t9_zh.png.meta | 2 +- .../Skill/ArtFont/c_chh_00035_t9_zh.png.meta | 4 ++-- .../b_bianhuanmoce_banner_1_zh.jpg.meta | 4 ++-- .../DynamicAtlas/r_richang_banner_1_zh.png.meta | 2 +- .../DynamicAtlas/r_richang_banner_2_zh.png.meta | 2 +- .../DynamicAtlas/r_richang_banner_3_zh.png.meta | 2 +- .../DynamicAtlas/r_richang_banner_4_zh.png.meta | 2 +- .../DynamicAtlas/r_richang_banner_5_zh.png.meta | 2 +- .../EffectResSkill/Effect_normal_nezha.meta | 4 ++-- .../EffectResSkill/Effect_normal_sunwukong.meta | 4 ++-- .../EffectResSkill/Effect_normal_yuhuangdadi.meta | 4 ++-- .../Materials/jian_mat.mat | 2 +- .../EffectResSkill/Effect_skill_chiyou.meta | 4 ++-- .../EffectResSkill/Effect_skill_congheihu.meta | 4 ++-- .../EffectResUI/BaiBaoShangHui.meta | 4 ++-- .../EffectResUI/Chenghao_TaSuiLingXiao.meta | 4 ++-- Assets/ManagedResources/EffectResUI/FightLevel.meta | 4 ++-- Assets/ManagedResources/EffectResUI/Practice.meta | 4 ++-- .../EffectResUI/Practice/Animation.meta | 2 +- .../Animation/fx_ui_xiuxingshengxin_ctrl.controller | 2 +- .../EffectResUI/Practice/Materials/ren_mat.mat | 2 +- .../EffectResUI/ShenYiTianJiang.meta | 4 ++-- .../Effects/Animation/jian 2_ctrl.controller | 2 +- .../Effects/Materials/Default-Diffuse_mat.mat | 2 +- .../Effect_c_swk_00015_s1_attack_PG_014.mat | 0 .../Effect_c_swk_00015_s1_attack_PG_014.mat.meta | 0 .../Materials/Effect_swk_attack_01_09.mat | 0 .../Materials/Effect_swk_attack_01_09.mat.meta | 0 .../Materials/Effect_swk_attack_01_26.mat | 0 .../Materials/Effect_swk_attack_01_26.mat.meta | 0 .../Materials/Effect_swk_attack_01_27.mat | 0 .../Materials/Effect_swk_attack_01_27.mat.meta | 0 .../Materials/fx_tex_lizhi_mat.mat | 0 .../Materials/fx_tex_lizhi_mat.mat.meta | 0 .../Texture => Effects/Textures}/H_shandian_82.tga | Bin .../Textures}/H_shandian_82.tga.meta | 0 .../Texture => Effects/Textures}/fx_tex_lizhi.png | Bin .../Textures}/fx_tex_lizhi.png.meta | 0 .../Texture => Effects/Textures}/keji_08.png | Bin .../Texture => Effects/Textures}/keji_08.png.meta | 0 .../Texture => Effects/Textures}/keji_09.png | Bin .../Texture => Effects/Textures}/keji_09.png.meta | 0 .../Texture => Effects/Textures}/keji_10.png | Bin .../Texture => Effects/Textures}/keji_10.png.meta | 0 Assets/ManagedResources/Icon/FaBao.meta | 4 ++-- .../RTexture/CardTexture10.renderTexture.meta | 4 ++-- .../RTexture/CardTexture11.renderTexture.meta | 4 ++-- .../RTexture/CardTexture12.renderTexture.meta | 4 ++-- .../RTexture/CardTexture13.renderTexture.meta | 4 ++-- .../RTexture/CardTexture7.renderTexture.meta | 4 ++-- .../RTexture/CardTexture8.renderTexture.meta | 4 ++-- .../RTexture/CardTexture9.renderTexture.meta | 4 ++-- .../UpdatePanelAtlas/UpdatePanel_Back_01.png.meta | 2 +- .../UpdatePanelAtlas/UpdatePanel_button1.png.meta | 2 +- .../UpdatePanelAtlas/UpdatePanel_button2.png.meta | 2 +- .../Atlas/UpdatePanelAtlas/dt_jdt01.png.meta | 2 +- .../Atlas/UpdatePanelAtlas/dt_jdt02.png.meta | 2 +- .../Atlas/UpdatePanelAtlas/dt_jdt03.png.meta | 2 +- Assets/Resources/version.txt.meta | 7 +++++++ .../Materials.meta => Scripts/Editor/Util.meta} | 2 +- 178 files changed, 639 insertions(+), 214 deletions(-) rename Assets/ManagedResources/{EffectResSkill/Effect_normal_yuhuangdadi/Texture.meta => Atlas/TimeLimitUpHero/ArtFont.meta} (77%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1 => Effects}/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1 => Effects}/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1 => Effects}/Materials/Effect_swk_attack_01_09.mat (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1 => Effects}/Materials/Effect_swk_attack_01_09.mat.meta (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_swk_00015_s1 => Effects}/Materials/Effect_swk_attack_01_26.mat (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_swk_00015_s1 => Effects}/Materials/Effect_swk_attack_01_26.mat.meta (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1 => Effects}/Materials/Effect_swk_attack_01_27.mat (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1 => Effects}/Materials/Effect_swk_attack_01_27.mat.meta (100%) rename Assets/ManagedResources/{EffectResUI/Chenghao_TaSuiLingXiao => Effects}/Materials/fx_tex_lizhi_mat.mat (100%) rename Assets/ManagedResources/{EffectResUI/Chenghao_TaSuiLingXiao => Effects}/Materials/fx_tex_lizhi_mat.mat.meta (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1/Texture => Effects/Textures}/H_shandian_82.tga (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1/Texture => Effects/Textures}/H_shandian_82.tga.meta (100%) rename Assets/ManagedResources/{EffectResUI/Practice/Texture => Effects/Textures}/fx_tex_lizhi.png (100%) rename Assets/ManagedResources/{EffectResUI/Practice/Texture => Effects/Textures}/fx_tex_lizhi.png.meta (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1/Texture => Effects/Textures}/keji_08.png (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1/Texture => Effects/Textures}/keji_08.png.meta (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1/Texture => Effects/Textures}/keji_09.png (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1/Texture => Effects/Textures}/keji_09.png.meta (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1/Texture => Effects/Textures}/keji_10.png (100%) rename Assets/ManagedResources/{EffectResSkill/Effect_c_dhdj_00042_s1/Texture => Effects/Textures}/keji_10.png.meta (100%) create mode 100644 Assets/Resources/version.txt.meta rename Assets/{ManagedResources/Effects/Model/Materials.meta => Scripts/Editor/Util.meta} (77%) diff --git a/Assets/ManagedResources/Atlas/AiYuanActivityAtlas.meta b/Assets/ManagedResources/Atlas/AiYuanActivityAtlas.meta index 7361f8808e..e5c758f35e 100644 --- a/Assets/ManagedResources/Atlas/AiYuanActivityAtlas.meta +++ b/Assets/ManagedResources/Atlas/AiYuanActivityAtlas.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/atlas/aiyuanactivityatlas + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png.meta b/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png.meta index 7300084b19..6f774bf130 100644 --- a/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png.meta +++ b/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png.meta b/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png.meta index df7cbcba03..35f97aef7e 100644 --- a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png.meta +++ b/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png.meta b/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png.meta index b9dbd0d396..eaab78662b 100644 --- a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png.meta +++ b/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_fx.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_fx.png.meta index e3f59a8eac..b9d0ff8867 100644 --- a/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_fx.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_fx.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_jmm.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_jmm.png.meta index 68af9040dc..26cdd105d0 100644 --- a/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_jmm.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_jmm.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-zhizunhaoli_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-zhizunhaoli_zh.png.meta index 410f0e7de9..9abe877919 100644 --- a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-zhizunhaoli_zh.png.meta +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-zhizunhaoli_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/t_tapolingxiao_liuxingyudi_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/t_tapolingxiao_liuxingyudi_zh.png.meta index 47f138f0c1..4e6e872cd0 100644 --- a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/t_tapolingxiao_liuxingyudi_zh.png.meta +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/t_tapolingxiao_liuxingyudi_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png.meta b/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png.meta index 14abf83c4b..9e84ac519c 100644 --- a/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png.meta +++ b/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -85,12 +85,12 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 56 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android @@ -134,7 +134,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: + spritePackingTag: SettingPlayerAtlas pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta b/Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta index cc53ddc51c..6390ebefec 100644 --- a/Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta +++ b/Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/Story/wzs.jpg.meta b/Assets/ManagedResources/Atlas/Story/wzs.jpg.meta index 82bc2001f9..10592e5460 100644 --- a/Assets/ManagedResources/Atlas/Story/wzs.jpg.meta +++ b/Assets/ManagedResources/Atlas/Story/wzs.jpg.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/Story/wzs_1.jpg.meta b/Assets/ManagedResources/Atlas/Story/wzs_1.jpg.meta index 603ed176c6..e302aa818e 100644 --- a/Assets/ManagedResources/Atlas/Story/wzs_1.jpg.meta +++ b/Assets/ManagedResources/Atlas/Story/wzs_1.jpg.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/Story/wzs_2.jpg.meta b/Assets/ManagedResources/Atlas/Story/wzs_2.jpg.meta index 4620cd1aea..411ed384dd 100644 --- a/Assets/ManagedResources/Atlas/Story/wzs_2.jpg.meta +++ b/Assets/ManagedResources/Atlas/Story/wzs_2.jpg.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/Story/wzs_3.jpg.meta b/Assets/ManagedResources/Atlas/Story/wzs_3.jpg.meta index 397fc95d2f..2697d7a137 100644 --- a/Assets/ManagedResources/Atlas/Story/wzs_3.jpg.meta +++ b/Assets/ManagedResources/Atlas/Story/wzs_3.jpg.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/Story/wzs_4.jpg.meta b/Assets/ManagedResources/Atlas/Story/wzs_4.jpg.meta index b523bad3c0..4b04de8149 100644 --- a/Assets/ManagedResources/Atlas/Story/wzs_4.jpg.meta +++ b/Assets/ManagedResources/Atlas/Story/wzs_4.jpg.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/Story/wzs_fz.png.meta b/Assets/ManagedResources/Atlas/Story/wzs_fz.png.meta index c1be498c94..87cf09b320 100644 --- a/Assets/ManagedResources/Atlas/Story/wzs_fz.png.meta +++ b/Assets/ManagedResources/Atlas/Story/wzs_fz.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/ArtFont/g_ghhb_weidacheng_zh.png.meta b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/ArtFont/g_ghhb_weidacheng_zh.png.meta index dc74527f07..c9890e4459 100644 --- a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/ArtFont/g_ghhb_weidacheng_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/ArtFont/g_ghhb_weidacheng_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/ArtFont/g_ghhb_yidacheng_zh.png.meta b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/ArtFont/g_ghhb_yidacheng_zh.png.meta index 2d7e462b8d..77c38f31ea 100644 --- a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/ArtFont/g_ghhb_yidacheng_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/ArtFont/g_ghhb_yidacheng_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_tiaozhananniu_02.png.meta b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_tiaozhananniu_02.png.meta index bbc981fa67..8792a5ae31 100644 --- a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_tiaozhananniu_02.png.meta +++ b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_tiaozhananniu_02.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuixiaxiaowu.png.meta b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuixiaxiaowu.png.meta index 6927df66cf..bc795f2ed0 100644 --- a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuixiaxiaowu.png.meta +++ b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuixiaxiaowu.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuoshangdi.png.meta b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuoshangdi.png.meta index 14a3618a8b..c16cddefad 100644 --- a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuoshangdi.png.meta +++ b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuoshangdi.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuoshangdi2.png.meta b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuoshangdi2.png.meta index f62700d1bc..264c17ef53 100644 --- a/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuoshangdi2.png.meta +++ b/Assets/ManagedResources/Atlas/TaSuiLingXiaoAtlas/t_tapolingxiao_zuoshangdi2.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/x_xrsc_icon1_zh.png.meta b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/x_xrsc_icon1_zh.png.meta index da65412c77..e729c957a0 100644 --- a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/x_xrsc_icon1_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/x_xrsc_icon1_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/x_xrsc_icon2_zh.png.meta b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/x_xrsc_icon2_zh.png.meta index a11ea41c2b..5ae85f4c2e 100644 --- a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/x_xrsc_icon2_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/x_xrsc_icon2_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png.meta b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png.meta index 50c0c9e8ea..7992ccc070 100644 --- a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png.meta b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png.meta index ce9862a44d..f8d826984e 100644 --- a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/TimeLimitUpHero.meta b/Assets/ManagedResources/Atlas/TimeLimitUpHero.meta index b498a152e1..32551cbc64 100644 --- a/Assets/ManagedResources/Atlas/TimeLimitUpHero.meta +++ b/Assets/ManagedResources/Atlas/TimeLimitUpHero.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/atlas/timelimituphero + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Texture.meta b/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont.meta similarity index 77% rename from Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Texture.meta rename to Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont.meta index 445dee4d36..0e89d226fb 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Texture.meta +++ b/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b9c36692b051dd4e9502147e4ee914e +guid: 7f46503f197935f47a0d0427dca323d4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta index 2b792a923f..b2c3249c6e 100644 --- a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png.meta index c9cb2d8799..3047c2c2ca 100644 --- a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png.meta +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye301_zh.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye301_zh.png.meta index 81d916de5f..be5cffd532 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye301_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye301_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye306_zh.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye306_zh.png.meta index 8afab683d1..2262bd7fd9 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye306_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye306_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye30_zh.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye30_zh.png.meta index 9306454e7b..396b060abd 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye30_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye30_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye6_zh.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye6_zh.png.meta index 23c69bf716..c15ac8204b 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye6_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_qieye6_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_solgan_zh.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_solgan_zh.png.meta index 78f7f21fa8..33eb1a6276 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_solgan_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_solgan_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_xbt30_zh.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_xbt30_zh.png.meta index b5ac39627a..e911de7095 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_xbt30_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_xbt30_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_xbt6_zh.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_xbt6_zh.png.meta index 0138f0283f..dbb5c2f37f 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_xbt6_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/ArtFont/z_zzhl_xbt6_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_banzi.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_banzi.png.meta index 92cb01bc9b..d3be9acc67 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_banzi.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_banzi.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_beijguang.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_beijguang.png.meta index 71bcb89187..0f7192cabf 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_beijguang.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_beijguang.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_guanbi.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_guanbi.png.meta index c677def388..0ab21f593c 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_guanbi.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_guanbi.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_kuang.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_kuang.png.meta index 51e227a1d1..8a0adc64b4 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_kuang.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_kuang.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_lihui.png.meta b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_lihui.png.meta index 672c4f7bf6..be63da7caa 100644 --- a/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_lihui.png.meta +++ b/Assets/ManagedResources/Atlas/ZhiZunHaoLiAtlas/z_zzhl_lihui.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/baibaoshanghuiAtlas.meta b/Assets/ManagedResources/Atlas/baibaoshanghuiAtlas.meta index 1f883d2d27..e4e93cb06e 100644 --- a/Assets/ManagedResources/Atlas/baibaoshanghuiAtlas.meta +++ b/Assets/ManagedResources/Atlas/baibaoshanghuiAtlas.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/atlas/baibaoshanghuiatlas + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3.meta b/Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3.meta index 4c756578f1..29fde9ce63 100644 --- a/Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3.meta +++ b/Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/bgm/bgm_story_1_1 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3.meta b/Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3.meta index a9143ce180..977f651d4a 100644 --- a/Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3.meta +++ b/Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/bgm/bgm_story_1_2 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3.meta b/Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3.meta index e614cfcef4..a1ee026512 100644 --- a/Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3.meta +++ b/Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/bgm/bgm_story_2_1 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3.meta b/Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3.meta index 4e0f0d2b14..fa8032b064 100644 --- a/Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3.meta +++ b/Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/bgm/bgm_story_2_2 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_chh.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_chh.wav.meta index 438ae5a8d7..8b4892a94a 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_chh.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_chh.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_chh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_cy.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_cy.wav.meta index 7f2d64f109..8eebc1e172 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_cy.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_cy.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_cy + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fx.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fx.wav.meta index c079f91866..0cb1b7cec2 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fx.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fx.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_fx + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hxz.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hxz.wav.meta index 626d3e1024..9e61dc311a 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hxz.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hxz.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_hxz + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lm.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lm.wav.meta index 4564f62e88..5cbaafc4f6 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lm.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lm.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_lm + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_axl01.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_axl01.wav.meta index e3f3405e9c..a5e99c9d85 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_axl01.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_axl01.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_vo_axl01 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_xyk.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_xyk.wav.meta index c3808325f5..937a5fbf27 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_xyk.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_xyk.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_xyk + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ycx.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ycx.wav.meta index 4e6833832f..0697596530 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ycx.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ycx.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_ycx + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yhdd.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yhdd.wav.meta index a44fef0a7e..674af9e820 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yhdd.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yhdd.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_yhdd + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_01.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_01.wav.meta index 664acc54f4..a07c89a026 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_01.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_01.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_01 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_02.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_02.wav.meta index dfd32ebc2f..f5f501ae2f 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_02.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_02.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_02 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_03.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_03.wav.meta index 8c53486071..76157d8a9d 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_03.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_03.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_03 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_04.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_04.wav.meta index 3a9bf6e784..1e8d9d0ff3 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_04.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_04.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_04 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_05.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_05.wav.meta index 79f7d270a3..d5c67d577e 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_05.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_05.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_05 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_06.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_06.wav.meta index 853981db5e..a22df3a446 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_06.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_06.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_06 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_07.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_07.wav.meta index 456ab6fae7..b45f77bfa1 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_07.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_07.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_07 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_08.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_08.wav.meta index c31f8752f8..f8d4f8c08c 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_08.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_08.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_08 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_09.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_09.wav.meta index cd97c8bd04..93335856ae 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_09.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_09.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_09 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_10.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_10.wav.meta index 26825aad85..938407b4d4 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_10.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_10.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_10 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_11.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_11.wav.meta index a463b29a4c..f64a70bbaf 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_11.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_11.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_11 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_12.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_12.wav.meta index 921f3c81ad..42640dd18e 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_12.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_12.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_12 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_13.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_13.wav.meta index a9c20aed13..6f31e7f8a3 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_13.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_13.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_13 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_14.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_14.wav.meta index 8a43923204..c40cb60b33 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_14.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_14.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_14 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_15.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_15.wav.meta index 2f75c7b770..fd83b232f3 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_15.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_15.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_15 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_16.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_16.wav.meta index 39af48d9b6..f76707210a 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_16.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_swk_16.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_swk_16 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_01.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_01.wav.meta index 65b3f8b852..7fa916dec2 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_01.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_01.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_yhdd_01 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_02.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_02.wav.meta index d5f376c3c0..e42ad9026d 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_02.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_02.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_yhdd_02 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_03.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_03.wav.meta index 4e1f0afc50..d334388eae 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_03.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_03.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_yhdd_03 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_04.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_04.wav.meta index bd8d75f64f..1f6193d738 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_04.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_04.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_yhdd_04 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_05.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_05.wav.meta index e910db7a84..c3467ccde0 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_05.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_05.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_yhdd_05 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_06.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_06.wav.meta index d6be7ed51c..88c1b9fd9a 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_06.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_06.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_yhdd_06 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_07.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_07.wav.meta index e53071f42d..f83271fa1c 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_07.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_07.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_yhdd_07 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_08.wav.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_08.wav.meta index e330aeae51..4977bf685c 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_08.wav.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_story_yhdd_08.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_story_yhdd_08 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/skill/audio_jn_chh_1.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/audio_jn_chh_1.mp3.meta index adae02a7ee..6dee13e43a 100644 --- a/Assets/ManagedResources/Audio/Skill/skill/audio_jn_chh_1.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/skill/audio_jn_chh_1.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/skill/audio_jn_chh_1 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/skill/audio_jn_chh_2.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/audio_jn_chh_2.mp3.meta index eb68c7ef91..cb0e7a7c4a 100644 --- a/Assets/ManagedResources/Audio/Skill/skill/audio_jn_chh_2.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/skill/audio_jn_chh_2.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/skill/audio_jn_chh_2 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/skill/audio_jn_cy_1.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/audio_jn_cy_1.mp3.meta index f7c3ff77ff..120e339ff5 100644 --- a/Assets/ManagedResources/Audio/Skill/skill/audio_jn_cy_1.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/skill/audio_jn_cy_1.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/skill/audio_jn_cy_1 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/skill/audio_jn_cy_2.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/audio_jn_cy_2.mp3.meta index 3a5964b876..3f627f571b 100644 --- a/Assets/ManagedResources/Audio/Skill/skill/audio_jn_cy_2.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/skill/audio_jn_cy_2.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/skill/audio_jn_cy_2 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/skill/audio_pg_nz.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/audio_pg_nz.mp3.meta index 3688a69c58..f58b5aa49c 100644 --- a/Assets/ManagedResources/Audio/Skill/skill/audio_pg_nz.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/skill/audio_pg_nz.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/skill/audio_pg_nz + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/skill/audio_pg_swk.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/audio_pg_swk.mp3.meta index 1a38721ef4..d10d96a0c0 100644 --- a/Assets/ManagedResources/Audio/Skill/skill/audio_pg_swk.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/skill/audio_pg_swk.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/skill/audio_pg_swk + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/skill/audio_pg_yhdd.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/audio_pg_yhdd.mp3.meta index f1df654058..e648d07ff0 100644 --- a/Assets/ManagedResources/Audio/Skill/skill/audio_pg_yhdd.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/skill/audio_pg_yhdd.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/skill/audio_pg_yhdd + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/UI/common/voice_ui_laohuji.mp3.meta b/Assets/ManagedResources/Audio/UI/common/voice_ui_laohuji.mp3.meta index 0d2012deb9..768dc75515 100644 --- a/Assets/ManagedResources/Audio/UI/common/voice_ui_laohuji.mp3.meta +++ b/Assets/ManagedResources/Audio/UI/common/voice_ui_laohuji.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/ui/common/voice_ui_laohuji + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/Loading/loading1.jpg.meta b/Assets/ManagedResources/BG/Loading/loading1.jpg.meta index 382c624227..99a6ea53bc 100644 --- a/Assets/ManagedResources/BG/Loading/loading1.jpg.meta +++ b/Assets/ManagedResources/BG/Loading/loading1.jpg.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bg/loading/loading1 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/Loading/loading2.jpg.meta b/Assets/ManagedResources/BG/Loading/loading2.jpg.meta index dcc34ca3e7..0b015ead06 100644 --- a/Assets/ManagedResources/BG/Loading/loading2.jpg.meta +++ b/Assets/ManagedResources/BG/Loading/loading2.jpg.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bg/loading/loading2 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/Loading/loading3.jpg.meta b/Assets/ManagedResources/BG/Loading/loading3.jpg.meta index 5ad478f41f..e47d97aee0 100644 --- a/Assets/ManagedResources/BG/Loading/loading3.jpg.meta +++ b/Assets/ManagedResources/BG/Loading/loading3.jpg.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bg/loading/loading3 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/Loading/loading4.jpg.meta b/Assets/ManagedResources/BG/Loading/loading4.jpg.meta index 965e15405c..11726b32b4 100644 --- a/Assets/ManagedResources/BG/Loading/loading4.jpg.meta +++ b/Assets/ManagedResources/BG/Loading/loading4.jpg.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bg/loading/loading4 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/Loading/loading5.jpg.meta b/Assets/ManagedResources/BG/Loading/loading5.jpg.meta index 58342e4f61..cf29e0cf70 100644 --- a/Assets/ManagedResources/BG/Loading/loading5.jpg.meta +++ b/Assets/ManagedResources/BG/Loading/loading5.jpg.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bg/loading/loading5 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/Loading/loading6.jpg.meta b/Assets/ManagedResources/BG/Loading/loading6.jpg.meta index f56c0283d6..235116b1fc 100644 --- a/Assets/ManagedResources/BG/Loading/loading6.jpg.meta +++ b/Assets/ManagedResources/BG/Loading/loading6.jpg.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bg/loading/loading6 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png.meta b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png.meta index b6621c48be..260fd80892 100644 --- a/Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png.meta +++ b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png.meta @@ -117,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/bg/dl_ui_effect_bg + assetBundleName: lz4/bg/login/dl_ui_effect_bg assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/s_silingshilian_di2.jpg.meta b/Assets/ManagedResources/BG/s_silingshilian_di2.jpg.meta index 99edcced3f..5a10ad1190 100644 --- a/Assets/ManagedResources/BG/s_silingshilian_di2.jpg.meta +++ b/Assets/ManagedResources/BG/s_silingshilian_di2.jpg.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bg/s_silingshilian_di2 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BGNC/dl_ui_effect_bg_xipu.jpg.meta b/Assets/ManagedResources/BGNC/dl_ui_effect_bg_xipu.jpg.meta index 86c89e08a7..99927e45ca 100644 --- a/Assets/ManagedResources/BGNC/dl_ui_effect_bg_xipu.jpg.meta +++ b/Assets/ManagedResources/BGNC/dl_ui_effect_bg_xipu.jpg.meta @@ -117,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bgnc/dl_ui_effect_bg_xipu + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BGNC/loading7.jpg.meta b/Assets/ManagedResources/BGNC/loading7.jpg.meta index f7063aa6de..02d45f708a 100644 --- a/Assets/ManagedResources/BGNC/loading7.jpg.meta +++ b/Assets/ManagedResources/BGNC/loading7.jpg.meta @@ -117,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bgnc/loading7 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BGNC/loading_caohua.png.meta b/Assets/ManagedResources/BGNC/loading_caohua.png.meta index e122e708e5..2370193f7f 100644 --- a/Assets/ManagedResources/BGNC/loading_caohua.png.meta +++ b/Assets/ManagedResources/BGNC/loading_caohua.png.meta @@ -117,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bgnc/loading_caohua + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BGNC/login_caohua.png.meta b/Assets/ManagedResources/BGNC/login_caohua.png.meta index b5c57885f4..cba22f887c 100644 --- a/Assets/ManagedResources/BGNC/login_caohua.png.meta +++ b/Assets/ManagedResources/BGNC/login_caohua.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bgnc/login_caohua + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BGNC/logo_caohua.png.meta b/Assets/ManagedResources/BGNC/logo_caohua.png.meta index a056534122..8e91476f6e 100644 --- a/Assets/ManagedResources/BGNC/logo_caohua.png.meta +++ b/Assets/ManagedResources/BGNC/logo_caohua.png.meta @@ -117,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bgnc/logo_caohua + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner2.jpg.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner2.jpg.meta index 0df8fb365b..d910063371 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner2.jpg.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner2.jpg.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/artfont/c_czlb_banner2 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner1_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner1_zi_zh.png.meta index f409e6c2ca..d3cc7398aa 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner1_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner1_zi_zh.png.meta @@ -127,5 +127,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/artfont/l_mrlb_banner1_zi_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zi_zh.png.meta index d7ec076f55..0eae688786 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zi_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_1_zi_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zi_zh.png.meta index 8a4500d936..fcb6063521 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zi_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_2_zi_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zi_zh.png.meta index 87a2c64d8f..a0b664ec36 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zi_zh.png.meta @@ -117,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_3_zi_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zi_zh.png.meta index 24f79f36fb..e8231a5ef8 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zi_zh.png.meta @@ -117,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_4_zi_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zi_zh.png.meta index 54f808d10b..310ea109fa 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zi_zh.png.meta @@ -117,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_5_zi_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-xinyuntanbao001_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-xinyuntanbao001_zh.png.meta index 429168d70a..788628be32 100644 --- a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-xinyuntanbao001_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-xinyuntanbao001_zh.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-xinyuntanbao001_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-xinyuntanbao_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-xinyuntanbao_zh.png.meta index 83c84637aa..c21d1c4b9a 100644 --- a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-xinyuntanbao_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-xinyuntanbao_zh.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-xinyuntanbao_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png.meta index a1fe123095..3d404204b8 100644 --- a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png.meta @@ -117,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/commonatlas/r_zjm_huodongicon-di2 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_1_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_1_t9_zh.png.meta index 37a68220b5..37d8c3cac4 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_1_t9_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_1_t9_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/skill/c_3_1_t9_zh + assetBundleName: lz4/dynamicatlas/skill/artfont/c_3_1_t9_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_2_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_2_t9_zh.png.meta index 4e9812db92..6ce93e4ac8 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_2_t9_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_2_t9_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/skill/c_3_2_t9_zh + assetBundleName: lz4/dynamicatlas/skill/artfont/c_3_2_t9_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_3_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_3_t9_zh.png.meta index b21af95d5b..ea9b87fc8d 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_3_t9_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_3_t9_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/skill/c_3_3_t9_zh + assetBundleName: lz4/dynamicatlas/skill/artfont/c_3_3_t9_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_4_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_4_t9_zh.png.meta index 58e1c6f1e1..e9cc4c128e 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_4_t9_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_4_t9_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/skill/c_3_4_t9_zh + assetBundleName: lz4/dynamicatlas/skill/artfont/c_3_4_t9_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_5_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_5_t9_zh.png.meta index 6f5d0c0806..7e5b74f76a 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_5_t9_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_5_t9_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/skill/c_3_5_t9_zh + assetBundleName: lz4/dynamicatlas/skill/artfont/c_3_5_t9_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_6_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_6_t9_zh.png.meta index 4304c1a5cf..fafd06d670 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_6_t9_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_6_t9_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/artfont/c_3_6_t9_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_7_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_7_t9_zh.png.meta index c2ba3772cc..78ce933735 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_7_t9_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_7_t9_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/skill/c_3_7_t9_zh + assetBundleName: lz4/dynamicatlas/skill/artfont/c_3_7_t9_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_8_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_8_t9_zh.png.meta index 48ea08afb1..2933be3ec8 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_8_t9_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_3_8_t9_zh.png.meta @@ -138,5 +138,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/skill/c_3_8_t9_zh + assetBundleName: lz4/dynamicatlas/skill/artfont/c_3_8_t9_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_chh_00035_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_chh_00035_t9_zh.png.meta index 6b60a45ec1..6405f9155b 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_chh_00035_t9_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/c_chh_00035_t9_zh.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/artfont/c_chh_00035_t9_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_1_zh.jpg.meta b/Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_1_zh.jpg.meta index f3c59077a0..931dbd7346 100644 --- a/Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_1_zh.jpg.meta +++ b/Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_1_zh.jpg.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/b_bianhuanmoce_banner_1_zh + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_1_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_1_zh.png.meta index ef1b74a533..7959fe2931 100644 --- a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_1_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_1_zh.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_1_zh + assetBundleName: lz4/dynamicatlas/r_richang_banner_1_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_2_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_2_zh.png.meta index 24aea75a4e..524a6e61b4 100644 --- a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_2_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_2_zh.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_2_zh + assetBundleName: lz4/dynamicatlas/r_richang_banner_2_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_3_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_3_zh.png.meta index 1e9939504f..7dd1d2a10a 100644 --- a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_3_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_3_zh.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_3_zh + assetBundleName: lz4/dynamicatlas/r_richang_banner_3_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4_zh.png.meta index b329e77996..c58ca14ae6 100644 --- a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4_zh.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_4_zh + assetBundleName: lz4/dynamicatlas/r_richang_banner_4_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_5_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_5_zh.png.meta index 03269602a2..7a0fcb4e37 100644 --- a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_5_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_5_zh.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/artfont/r_richang_banner_5_zh + assetBundleName: lz4/dynamicatlas/r_richang_banner_5_zh assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResSkill/Effect_normal_nezha.meta b/Assets/ManagedResources/EffectResSkill/Effect_normal_nezha.meta index 4d6d3b2c97..bdd3e2af22 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_normal_nezha.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_normal_nezha.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresskill/effect_normal_nezha + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResSkill/Effect_normal_sunwukong.meta b/Assets/ManagedResources/EffectResSkill/Effect_normal_sunwukong.meta index 41e873eea6..6150ac489d 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_normal_sunwukong.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_normal_sunwukong.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresskill/effect_normal_sunwukong + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi.meta b/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi.meta index dbb7777298..3de7fcb71b 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresskill/effect_normal_yuhuangdadi + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Materials/jian_mat.mat b/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Materials/jian_mat.mat index 9d69d0723a..0962922492 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Materials/jian_mat.mat +++ b/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Materials/jian_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: jian + m_Name: jian_mat m_Shader: {fileID: 4800000, guid: 7d6211ba8e650e547825581b68e77a56, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_skill_chiyou.meta b/Assets/ManagedResources/EffectResSkill/Effect_skill_chiyou.meta index ab6898ac64..e1345adafe 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_skill_chiyou.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_skill_chiyou.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresskill/effect_skill_chiyou + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResSkill/Effect_skill_congheihu.meta b/Assets/ManagedResources/EffectResSkill/Effect_skill_congheihu.meta index 54af3603ac..fc9b950f55 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_skill_congheihu.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_skill_congheihu.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresskill/effect_skill_congheihu + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui.meta b/Assets/ManagedResources/EffectResUI/BaiBaoShangHui.meta index cfeda67dc1..46b3028b37 100644 --- a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui.meta +++ b/Assets/ManagedResources/EffectResUI/BaiBaoShangHui.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresui/baibaoshanghui + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao.meta b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao.meta index 9087a752eb..3b58bc6e34 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao.meta +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresui/chenghao_tasuilingxiao + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResUI/FightLevel.meta b/Assets/ManagedResources/EffectResUI/FightLevel.meta index df63c91c53..34fa5d87db 100644 --- a/Assets/ManagedResources/EffectResUI/FightLevel.meta +++ b/Assets/ManagedResources/EffectResUI/FightLevel.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresui/fightlevel + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResUI/Practice.meta b/Assets/ManagedResources/EffectResUI/Practice.meta index 8f25433f60..ef4d7f7f64 100644 --- a/Assets/ManagedResources/EffectResUI/Practice.meta +++ b/Assets/ManagedResources/EffectResUI/Practice.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresui/practice + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/EffectResUI/Practice/Animation.meta b/Assets/ManagedResources/EffectResUI/Practice/Animation.meta index 7737546d71..b79a03bba8 100644 --- a/Assets/ManagedResources/EffectResUI/Practice/Animation.meta +++ b/Assets/ManagedResources/EffectResUI/Practice/Animation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d395613c6f73a44eadb27f03dc1b216 +guid: 4cd11f8fb9addec4d97a261ed3daf756 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin_ctrl.controller b/Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin_ctrl.controller index 03a05253cc..9ab48f206c 100644 --- a/Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin_ctrl.controller +++ b/Assets/ManagedResources/EffectResUI/Practice/Animation/fx_ui_xiuxingshengxin_ctrl.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fx_ui_xiuxingshengxin + m_Name: fx_ui_xiuxingshengxin_ctrl serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/EffectResUI/Practice/Materials/ren_mat.mat b/Assets/ManagedResources/EffectResUI/Practice/Materials/ren_mat.mat index 75a6065b47..57b4b8d184 100644 --- a/Assets/ManagedResources/EffectResUI/Practice/Materials/ren_mat.mat +++ b/Assets/ManagedResources/EffectResUI/Practice/Materials/ren_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ren + m_Name: ren_mat m_Shader: {fileID: 4800000, guid: cd73b754ea97c04468b1349981704714, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/ShenYiTianJiang.meta b/Assets/ManagedResources/EffectResUI/ShenYiTianJiang.meta index f022cac5e6..7cff88d3de 100644 --- a/Assets/ManagedResources/EffectResUI/ShenYiTianJiang.meta +++ b/Assets/ManagedResources/EffectResUI/ShenYiTianJiang.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/effectresui/shenyitianjiang + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Effects/Animation/jian 2_ctrl.controller b/Assets/ManagedResources/Effects/Animation/jian 2_ctrl.controller index 4a95c4b517..bf35452475 100644 --- a/Assets/ManagedResources/Effects/Animation/jian 2_ctrl.controller +++ b/Assets/ManagedResources/Effects/Animation/jian 2_ctrl.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: jian 2 + m_Name: jian 2_ctrl serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/Effects/Materials/Default-Diffuse_mat.mat b/Assets/ManagedResources/Effects/Materials/Default-Diffuse_mat.mat index fef7c6ab6a..b79e349cb8 100644 --- a/Assets/ManagedResources/Effects/Materials/Default-Diffuse_mat.mat +++ b/Assets/ManagedResources/Effects/Materials/Default-Diffuse_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Default-Diffuse + m_Name: Default-Diffuse_mat m_Shader: {fileID: 4800000, guid: 1cf234f48b286c5458c446aca9ea60c7, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat b/Assets/ManagedResources/Effects/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat rename to Assets/ManagedResources/Effects/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta b/Assets/ManagedResources/Effects/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta rename to Assets/ManagedResources/Effects/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_swk_attack_01_09.mat b/Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_09.mat similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_swk_attack_01_09.mat rename to Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_09.mat diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_swk_attack_01_09.mat.meta b/Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_09.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_swk_attack_01_09.mat.meta rename to Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_09.mat.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_swk_attack_01_26.mat b/Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_26.mat similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_swk_attack_01_26.mat rename to Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_26.mat diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_swk_attack_01_26.mat.meta b/Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_26.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_swk_attack_01_26.mat.meta rename to Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_26.mat.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_swk_attack_01_27.mat b/Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_27.mat similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_swk_attack_01_27.mat rename to Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_27.mat diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_swk_attack_01_27.mat.meta b/Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_27.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_swk_attack_01_27.mat.meta rename to Assets/ManagedResources/Effects/Materials/Effect_swk_attack_01_27.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat b/Assets/ManagedResources/Effects/Materials/fx_tex_lizhi_mat.mat similarity index 100% rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat rename to Assets/ManagedResources/Effects/Materials/fx_tex_lizhi_mat.mat diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat.meta b/Assets/ManagedResources/Effects/Materials/fx_tex_lizhi_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat.meta rename to Assets/ManagedResources/Effects/Materials/fx_tex_lizhi_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/H_shandian_82.tga b/Assets/ManagedResources/Effects/Textures/H_shandian_82.tga similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/H_shandian_82.tga rename to Assets/ManagedResources/Effects/Textures/H_shandian_82.tga diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/H_shandian_82.tga.meta b/Assets/ManagedResources/Effects/Textures/H_shandian_82.tga.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/H_shandian_82.tga.meta rename to Assets/ManagedResources/Effects/Textures/H_shandian_82.tga.meta diff --git a/Assets/ManagedResources/EffectResUI/Practice/Texture/fx_tex_lizhi.png b/Assets/ManagedResources/Effects/Textures/fx_tex_lizhi.png similarity index 100% rename from Assets/ManagedResources/EffectResUI/Practice/Texture/fx_tex_lizhi.png rename to Assets/ManagedResources/Effects/Textures/fx_tex_lizhi.png diff --git a/Assets/ManagedResources/EffectResUI/Practice/Texture/fx_tex_lizhi.png.meta b/Assets/ManagedResources/Effects/Textures/fx_tex_lizhi.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Practice/Texture/fx_tex_lizhi.png.meta rename to Assets/ManagedResources/Effects/Textures/fx_tex_lizhi.png.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_08.png b/Assets/ManagedResources/Effects/Textures/keji_08.png similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_08.png rename to Assets/ManagedResources/Effects/Textures/keji_08.png diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_08.png.meta b/Assets/ManagedResources/Effects/Textures/keji_08.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_08.png.meta rename to Assets/ManagedResources/Effects/Textures/keji_08.png.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_09.png b/Assets/ManagedResources/Effects/Textures/keji_09.png similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_09.png rename to Assets/ManagedResources/Effects/Textures/keji_09.png diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_09.png.meta b/Assets/ManagedResources/Effects/Textures/keji_09.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_09.png.meta rename to Assets/ManagedResources/Effects/Textures/keji_09.png.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_10.png b/Assets/ManagedResources/Effects/Textures/keji_10.png similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_10.png rename to Assets/ManagedResources/Effects/Textures/keji_10.png diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_10.png.meta b/Assets/ManagedResources/Effects/Textures/keji_10.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/keji_10.png.meta rename to Assets/ManagedResources/Effects/Textures/keji_10.png.meta diff --git a/Assets/ManagedResources/Icon/FaBao.meta b/Assets/ManagedResources/Icon/FaBao.meta index 7003988edd..cd57c96cce 100644 --- a/Assets/ManagedResources/Icon/FaBao.meta +++ b/Assets/ManagedResources/Icon/FaBao.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/icon/fabao + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta index 93c475760b..7dd33fa3e5 100644 --- a/Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta +++ b/Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/rtexture/cardtexture10 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta index 8789675b2f..a95321ad93 100644 --- a/Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta +++ b/Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/rtexture/cardtexture11 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta index 332c326d84..cc29f5dbf6 100644 --- a/Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta +++ b/Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/rtexture/cardtexture12 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta index 71d49d7891..6900ea3fdd 100644 --- a/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta +++ b/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/rtexture/cardtexture13 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta index 38d8d8d0b4..aedf4aa5a4 100644 --- a/Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta +++ b/Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/rtexture/cardtexture7 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta index 6e291bd6c4..26511f839a 100644 --- a/Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta +++ b/Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/rtexture/cardtexture8 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta index 8671728647..faed7786d4 100644 --- a/Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta +++ b/Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/rtexture/cardtexture9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_Back_01.png.meta b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_Back_01.png.meta index 27ba92c43e..43f0e103b8 100644 --- a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_Back_01.png.meta +++ b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_Back_01.png.meta @@ -73,7 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 65 + textureFormat: 56 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_button1.png.meta b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_button1.png.meta index 109c04270a..186970b2e9 100644 --- a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_button1.png.meta +++ b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_button1.png.meta @@ -73,7 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 33 + textureFormat: 56 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_button2.png.meta b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_button2.png.meta index 8b67cc6356..b621c30330 100644 --- a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_button2.png.meta +++ b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/UpdatePanel_button2.png.meta @@ -73,7 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 33 + textureFormat: 56 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt01.png.meta b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt01.png.meta index 3a88848c9e..c84d002da8 100644 --- a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt01.png.meta +++ b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt01.png.meta @@ -73,7 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 65 + textureFormat: 56 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt02.png.meta b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt02.png.meta index 7c63161ff5..fe3905872d 100644 --- a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt02.png.meta +++ b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt02.png.meta @@ -73,7 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 65 + textureFormat: 56 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt03.png.meta b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt03.png.meta index 470b2b9fd7..001d6e1350 100644 --- a/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt03.png.meta +++ b/Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/dt_jdt03.png.meta @@ -73,7 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 65 + textureFormat: 56 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/Resources/version.txt.meta b/Assets/Resources/version.txt.meta new file mode 100644 index 0000000000..b2d6edf9fd --- /dev/null +++ b/Assets/Resources/version.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 52da38ae9a344c548a25e90cc205dc91 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Effects/Model/Materials.meta b/Assets/Scripts/Editor/Util.meta similarity index 77% rename from Assets/ManagedResources/Effects/Model/Materials.meta rename to Assets/Scripts/Editor/Util.meta index 85c619cb77..9f1f2e984e 100644 --- a/Assets/ManagedResources/Effects/Model/Materials.meta +++ b/Assets/Scripts/Editor/Util.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 70e7feb15403e214f801e51b8b4e0461 +guid: 4496db45fa8eece4c9c94d61c54b5652 folderAsset: yes DefaultImporter: externalObjects: {} From 0f0ba0dfc27dce79f049a1ccdf5d329f3d723d77 Mon Sep 17 00:00:00 2001 From: JieLing Date: Thu, 10 Jun 2021 22:53:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E5=8C=85=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=91=E7=81=B5=E5=8A=A8=E6=AD=A3=E5=BC=8F=E6=9C=8D=E6=95=B0?= =?UTF-8?q?=E6=95=B0appid=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LuaFramework/Scenes/Logo_gn_zf_release.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/LuaFramework/Scenes/Logo_gn_zf_release.unity b/Assets/LuaFramework/Scenes/Logo_gn_zf_release.unity index 242ec26638..22386fe3d4 100644 --- a/Assets/LuaFramework/Scenes/Logo_gn_zf_release.unity +++ b/Assets/LuaFramework/Scenes/Logo_gn_zf_release.unity @@ -309,7 +309,7 @@ MonoBehaviour: enableLog: 1 networkType: 3 tokens: - - appid: 63bdff7d90ca4720b6b6626841f0aad8 + - appid: be3be99564034a39b5927f5f319710b6 serverUrl: https://thinkingdata.18183g.com mode: 0 timeZone: 0