JieLing
|
5293464305
|
Merge branch 'master_xma_test' into master_online_hw
# Conflicts:
# Assets/LuaFramework/Scenes/Logo.unity
# Assets/ManagedResources/Effects/Animation/Effect_c_dj_0008_attack_02_ctrl.controller.meta
# Assets/ManagedResources/Effects/Animation/Effect_c_hsmw_00010_attack_02_anim.anim.meta
# Assets/ManagedResources/Effects/Animation/fx_skill03_04xifu_SR_01.anim.meta
# Assets/ManagedResources/Effects/Model/Plane03.FBX.meta
# Assets/ManagedResources/Effects/Model/daoguang.FBX.meta
# Assets/ManagedResources/Effects/Model/daoguang_tuowei01.FBX.meta
# Assets/ManagedResources/Effects/Textures/T_glow_03.png.meta
# Assets/ManagedResources/Effects/Textures/T_noise_12.tga.meta
# Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01_PNG.PNG.meta
# Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04_png.png.meta
# Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4_PNG.PNG.meta
# Assets/ManagedResources/LuaBytes.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/Plugins/Android/libs/PSDK/mhtsdk.aar
# Assets/Plugins/Android/libs/PSDK/psdk.aar
# Assets/Plugins/Android/libs/PSDK/psdk_mht.aar
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
# BuildABs/Android/files.unity3d
# BuildABs/Android/lz4/atlas/cardatlas.unity3d
# BuildABs/Android/lz4/atlas/eightdayatlas.unity3d
# BuildABs/Android/lz4/atlas/findtreasureatlas.unity3d
# BuildABs/Android/lz4/atlas/mainatlas.unity3d
# BuildABs/Android/lz4/atlas/publicatlas.unity3d
# BuildABs/Android/lz4/audio/gameaudiomixer.unity3d
# BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_hhe01.unity3d
# BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_hsmw01.unity3d
# BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_jtxn01.unity3d
# BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_kqmw01.unity3d
# BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_swk01.unity3d
# BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_zbj01.unity3d
# BuildABs/Android/lz4/audio/skill/buff/audio_c_ch_0015_skeff_slidesk_buff.unity3d
# BuildABs/Android/lz4/audio/skill/buff/audio_c_yr_0007_skeff_slidesk_buff.unity3d
# BuildABs/Android/lz4/audio/skill/buff/audio_effect_buff_sheild.unity3d
# BuildABs/Android/lz4/audio/skill/buff/audio_s_jieling_hg_3002_skeff_casting_buff.unity3d
# BuildABs/Android/lz4/audio/skill/buff/audio_s_jieling_jhj_3003_skeff_casting_buff.unity3d
# BuildABs/Android/lz4/audio/skill/buff/audio_s_jieling_tl_3004_skeff_casting_buff01.unity3d
# BuildABs/Android/lz4/audio/skill/buff/audio_s_jieling_zlz_3001_skeff_casting_buff.unity3d
# BuildABs/Android/lz4/audio/skill/buff/audio_skeff_buff_01.unity3d
# BuildABs/Android/lz4/audio/skill/buff/audio_skeff_debuff_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_bahy_0017_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_bahy_0017_skeff_slide_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_bahy_0017_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_byjy_0038_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ddk_0023_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ddk_0023_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_dhx_0022_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_dhx_0022_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_djx_0048_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_djy_0013_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_djy_0013_skeff_slide_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_djy_0013_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ds_0011_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ds_0011_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_fc_0032_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_fwkl_0010_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_fwwb_0016_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_fwwb_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_gc_0025_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ghboss_50001_skeff_slide_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ghboss_50001_skeff_tap_atacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_gmyl_0030_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_hjyl_0043_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_hwws_0008_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_hwws_0008_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_hydyg_0001_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_hydyg_0001_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_hyjl_0002_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_hyjl_0002_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_hypd_0003_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_hypd_0003_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_jdjs_0009_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_jdjs_0009_skeff_slide_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_jdjs_0009_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_jjdl_0044_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_jy_0004_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_jy_0004_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_jyw_0005_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_kl_0007_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_kn_0018_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_kn_0018_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_lrh_0027_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_lrh_0027_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_mg_0047_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_mmls_0045_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_my_0037_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_mz_0020_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_mz_0020_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_rtz_0012_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_rtz_0012_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_sg_0024_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_sg_0024_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_sm_0021_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_sm_0021_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_syjm_0026_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_syjm_0026_skeff_slide_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_syjm_0026_skeff_tap_atacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_syjm_0026_skeff_tap_doteff.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_wy_0019_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_wy_0019_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_xdd_0015_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_xdd_0015_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_xyysz_0014_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_xyysz_0014_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ymmj_0040_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ys_0028_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ys_0028_skeff_slide_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/monster/audio_m_ys_0028_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ab_00014_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ax_0067_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_axl_00061_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_bhxz_00013_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_bm_0068_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_bmf_0004_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_bmf_0004_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ce_00034_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_cff_0047_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_cff_0049_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ch_0015_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ch_0015_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_cq_0005_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_cs_0031_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_cy_00031_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_cy_00031_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_cyh_0008_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_daji_0094_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_daji_0094_tapsk_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ddtz_00049_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_dhdj_00042_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_dj_0008_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_dlsm_00033_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_dst_00023_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_dz_00058_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_eh_00035_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_fhlh_00021_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_fjzd_0055_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_fm_0027_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_fm_0027_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ft_00026_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_fx_00028_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_fzy_0061_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_gg_0005_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ghn_0009_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ghn_0009_skeff_casting_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ghn_0009_tapsk_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_gt_0001_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_gyps_00020_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_hdxj_00066_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_hhe_00011_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_hsmw_00010_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_hyt_0032_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jbj_0007_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jcdp_00027_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jff_0050_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jhsn_0021_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jls_00044_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jlzz_00060_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jlzz_00060_skeff_slidesk_buff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jmm_0006_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jpw_0024_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jtxn_00045_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jw_0003_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jy_00055_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jy_0029_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jz_0002_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jzy_00043_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jzy_00043_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_jzy_00043_skeff_tapsk_healeff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_kq_0018_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_kqmw_00018_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_lc_00050_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ldb_00047_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_leizhenzi_0095_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_leizhenzi_0095_tapsk_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ljgz_00032_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ls_0004_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ls_0004_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_lslz_00046_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_lsx_00069_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ly_0025_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ly_0039_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ly_0070_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_lzz_0002_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_lzz_0002_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_mc_0034_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_md_00064_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_md_00064_skeff_slidesk_debuff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_md_00064_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_mlmn_0054_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_mp_00051_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_mrzq_0010_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_mz_00038_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_mz_00062_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ne_0058_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_nezha_0089_slidesk_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_nezha_0089_tapsk_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_nxq_00054_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ny_00036_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_nz_00029_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_pxps_00024_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_pxps_00024_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_qf_0046_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_qlq_0006_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_qr_0065_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_rd_00019_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_rj_0033_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_sdxj_00067_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_sgb_00041_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_sjnn_00012_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_skr_0028_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_skr_0028_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_sq_0019_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_sxdw_0053_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_sxdw_0056_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_syf_0016_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_syf_0016_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ts_00017_attack_01_1.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ttjz_00048_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_tx_0011_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_wg_00037_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_wg_00037_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_wl_0036_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_wsps_00016_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_wuchen_0106_tapsk_slidesk_ballistic.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xhht_0017_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xhht_0017_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xjr_0003_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xllh_00022_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xllh_00022_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0012_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0012_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0012_skeff_tapsk_healeff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0026_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0075_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_y_0013_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yangjian_0092_tapsk_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yc_00052_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yff_0048_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ygl_00056_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ygps_00025_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ygps_00025_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ygps_00025_skeff_tapsk_healeff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yhj_00057_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yhj_00057_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yj_00040_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yl_0014_skeff_slidesk_ballistic.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yl_0035_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ylw_00053_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ym_0051_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ym_0052_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yqe_0071_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yqj_0042_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yr_0007_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yr_0007_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ywe_0078_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ywg_0045_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ywg_0045_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ywy_0040_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_ywy_0040_skeff_slidesk_screeneff.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_yxz_0057_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_zc_0021_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_zgm_00039_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_zh_0044_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_c_zs_0080_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_common_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_ab_00014_t3_attack01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_dj_0008_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_dj_0008_attack_02.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_fhlh_00021_t3_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_gg_0005_t3_attack_02.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_ghn_0009_t3_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_ghn_0009_t3_attack_02.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jcdp_00027_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jmm_0006_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jmm_0006_attack_02.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jw_0003_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jzy_00043_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_kqmw_00018_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_kqmw_00018_attack_02.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_nz_00029_t3_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_rd_00019_t3_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_rd_00019_t3_attack_02.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_wsps_00016_t3_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_xllh_00022_t3_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_fx_c_yxz_0057_skill01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_fx_effect_cst_skill01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_fx_effect_cst_skill03.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_n_glgsoldiercap_0007_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_n_hurtsoldier_0021_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_n_jjlyfisher_0005_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_02.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_03.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_04.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_05.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_06.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_dlg_3010_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_fl_3008_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_hs_3006_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_lms_3009_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_md_3007_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_sl_3005_attack_01.unity3d
# BuildABs/Android/lz4/audio/skill/skill/audioc_swk_00015_attack_01.unity3d
# BuildABs/Android/lz4/audio/ui/common/ui_battle_01.unity3d
# BuildABs/Android/lz4/audio/ui/common/ui_commonclick.unity3d
# BuildABs/Android/lz4/audio/ui/common/ui_recruit_01.unity3d
# BuildABs/Android/lz4/audio/ui/special/ui_029_02.unity3d
# BuildABs/Android/lz4/bg/trialmap3/slfb_01_1.unity3d
# BuildABs/Android/lz4/bg/trialmap3/slfb_01_2.unity3d
# BuildABs/Android/lz4/bg/trialmap3/slfb_01_3.unity3d
# BuildABs/Android/lz4/bg/trialmap3/slfb_01_4.unity3d
# BuildABs/Android/lz4/bg/trialmap3/slfb_01_5.unity3d
# BuildABs/Android/lz4/bg/trialmap3/slfb_01_6.unity3d
# BuildABs/Android/lz4/bg/wjfb-04/wjfb-04_23.unity3d
# BuildABs/Android/lz4/icons.unity3d
# BuildABs/Android/lz4/prefabs/effect/aoe/fx_effect_cst_skill01.unity3d
# BuildABs/Android/lz4/prefabs/effect/buff/c_ch_0015_skeff_slidesk_buff.unity3d
# BuildABs/Android/lz4/prefabs/effect/casting/fx_c_yxz_0057_skill01.unity3d
# BuildABs/Android/lz4/prefabs/effect/hit/c_mrzq_0010_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/prefabs/effect/hit/c_yl_0014_skeff_slidesk_attacked.unity3d
# BuildABs/Android/lz4/prefabs/effect/hit/normal_effect.unity3d
# BuildABs/Android/lz4/prefabs/effect/monster/m_djy_0013_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/prefabs/effect/monster/m_fwwb_0016_skeff_tap_attacked.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_ab_00014_t3_attack01.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_ab_00014_t3_attack03.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_dj_0008_attack_02.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_fhlh_00021_t3_attack_01.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_ghn_0009_t3_attack_02.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_jw_0003_attack_01.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_rd_00019_t3_attack_01.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_rd_00019_t3_attack_03.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_wsps_00016_t3_attack_01.unity3d
# BuildABs/Android/lz4/prefabs/effect/skill/effect_c_wsps_00016_t3_attack_02.unity3d
# BuildABs/Android/lz4/prefabs/live2d.unity3d
# BuildABs/Android/lz4/prefabs/ui/arena.unity3d
# BuildABs/Android/lz4/prefabs/ui/arenatopmatch.unity3d
# BuildABs/Android/lz4/prefabs/ui/bag.unity3d
# BuildABs/Android/lz4/prefabs/ui/battle.unity3d
# BuildABs/Android/lz4/prefabs/ui/carbon.unity3d
# BuildABs/Android/lz4/prefabs/ui/common.unity3d
# BuildABs/Android/lz4/prefabs/ui/compound.unity3d
# BuildABs/Android/lz4/prefabs/ui/eightdaygift.unity3d
# BuildABs/Android/lz4/prefabs/ui/expedition.unity3d
# BuildABs/Android/lz4/prefabs/ui/expert.unity3d
# BuildABs/Android/lz4/prefabs/ui/fight.unity3d
# BuildABs/Android/lz4/prefabs/ui/findtreasure.unity3d
# BuildABs/Android/lz4/prefabs/ui/firstrecharge.unity3d
# BuildABs/Android/lz4/prefabs/ui/formation.unity3d
# BuildABs/Android/lz4/prefabs/ui/guild.unity3d
# BuildABs/Android/lz4/prefabs/ui/handbook.unity3d
# BuildABs/Android/lz4/prefabs/ui/loading.unity3d
# BuildABs/Android/lz4/prefabs/ui/login.unity3d
# BuildABs/Android/lz4/prefabs/ui/luckyturntable.unity3d
# BuildABs/Android/lz4/prefabs/ui/main.unity3d
# BuildABs/Android/lz4/prefabs/ui/map.unity3d
# BuildABs/Android/lz4/prefabs/ui/message.unity3d
# BuildABs/Android/lz4/prefabs/ui/mission.unity3d
# BuildABs/Android/lz4/prefabs/ui/monstercamp.unity3d
# BuildABs/Android/lz4/prefabs/ui/operating.unity3d
# BuildABs/Android/lz4/prefabs/ui/popup.unity3d
# BuildABs/Android/lz4/prefabs/ui/power.unity3d
# BuildABs/Android/lz4/prefabs/ui/recruit.unity3d
# BuildABs/Android/lz4/prefabs/ui/resolve.unity3d
# BuildABs/Android/lz4/prefabs/ui/roleinfo.unity3d
# BuildABs/Android/lz4/prefabs/ui/setting.unity3d
# BuildABs/Android/lz4/prefabs/ui/soulprint.unity3d
# BuildABs/Android/lz4/prefabs/ui/view.unity3d
# BuildABs/Android/lz4/prefabs/ui/vip.unity3d
# BuildABs/Android/lz4/publicartres/animations.unity3d
# BuildABs/Android/lz4/publicartres/materials.unity3d
# BuildABs/Android/lz4/publicartres/models.unity3d
# BuildABs/Android/lz4/publicartres/shaders.unity3d
# BuildABs/Android/lz4/publicartres/textures.unity3d
# BuildABs/Android/lz4/rtexture/cardtexture1.unity3d
# BuildABs/Android/lz4/rtexture/cardtexture2.unity3d
# BuildABs/Android/lz4/rtexture/cardtexture3.unity3d
# BuildABs/Android/lz4/rtexture/cardtexture4.unity3d
# BuildABs/Android/lz4/rtexture/cardtexture5.unity3d
# BuildABs/Android/lz4/rtexture/cardtexture6.unity3d
# BuildABs/Android/lz4/updatepanel.unity3d
# BuildABs/Android/lzma/luabytes.unity3d
# BuildABs/Android/lzma/resconfigs.unity3d
|
2020-10-15 17:40:45 +08:00 |
gaoxin
|
d4e3d2b8f9
|
测试服包版本修改
|
2020-09-05 17:24:09 +08:00 |
gaoxin
|
dc0c3940aa
|
修改测试服热更路径
|
2020-08-27 20:53:42 +08:00 |
gaoxin
|
b2ed38aaac
|
添加海外正式服路径
|
2020-08-27 20:52:58 +08:00 |
JieLing
|
f8e5ba9dfe
|
version文件添加
|
2020-08-26 14:09:00 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
gaoxin
|
eead87dfbb
|
版署version文件提交
|
2020-08-07 17:40:51 +08:00 |
JieLing
|
1f4448346f
|
正式服配置提交
|
2020-07-25 21:56:34 +08:00 |
JieLing
|
150f036966
|
Merge branch 'master_test' into master_release
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
# Assets/Resources/version.txt
|
2020-07-25 21:42:39 +08:00 |
JieLing
|
c41eb0d5a0
|
猕猴桃测试服配置添加,猕猴桃测试服0.1.3
|
2020-07-25 21:40:43 +08:00 |
JieLing
|
e1afd2e60a
|
内网测试 0.16.8
|
2020-07-25 19:49:16 +08:00 |
JieLing
|
cd43d2417f
|
内网测试 0.16.1
|
2020-07-25 15:13:59 +08:00 |
JieLing
|
2164aacc49
|
内网包配置修改
|
2020-07-25 14:52:41 +08:00 |
JieLing
|
7b2bc16abe
|
bugly添加
|
2020-07-23 21:10:35 +08:00 |
ZhangBiao
|
ae502e8322
|
bug修复
|
2020-07-21 16:04:07 +08:00 |
gaoxin
|
70149e951d
|
version文件回滚
|
2020-07-21 14:10:49 +08:00 |
JieLing
|
ebc174791b
|
配置文件修改,猕猴桃正式服0.1.0
|
2020-07-20 21:07:17 +08:00 |
JieLing
|
bd8e859703
|
猕猴桃测试0.1.0
|
2020-07-20 20:52:30 +08:00 |
gaoxin
|
6d3338d6b1
|
配置修改,version文件修改
|
2020-07-20 20:30:49 +08:00 |
JieLing
|
7350a1cf85
|
测试version文件修改
|
2020-07-18 21:06:23 +08:00 |
JieLing
|
6a317d3f7b
|
测试热更0.15.25、svn逻辑同步
|
2020-07-03 11:52:23 +08:00 |
JieLing
|
ab411b3d0d
|
svn逻辑同步
|
2020-07-02 17:04:46 +08:00 |
JieLing
|
5154fdbac0
|
外网0.16.14 内网0.15.25
|
2020-07-01 09:40:20 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
e3b6de5404
|
内网0.15.17 外网 0.16.8
|
2020-06-19 21:44:27 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
7a410e1b60
|
内网测试 0.15.5
|
2020-06-19 16:18:05 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
90e12f1a4a
|
外网0.16.5,测试0.15.11
|
2020-06-08 20:18:49 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
9a7de6479c
|
外网0.16.3
|
2020-06-03 19:01:14 +08:00 |
JieLing
|
6019de7c1e
|
外网0.16.2
|
2020-05-25 19:55:27 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
5a9bbcaa7f
|
打包资源提交 0.15.1
|
2020-05-15 17:55:14 +08:00 |
JieLing
|
6b3a4b5fb9
|
切换为android平台
|
2020-05-15 17:46:08 +08:00 |
JieLing
|
7dea7af830
|
同步
|
2020-05-15 17:03:13 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |