Commit Graph

3056 Commits (f272982e266a7d72170f025b707f9c29e4d19c45)
 

Author SHA1 Message Date
ZhangBiao e39706e312 遴选 社稷大典中对奖励界面的修改,到竞技场界面修改 2020-10-19 14:01:30 +08:00
ZhangBiao 09c3da664e 通用奖励界面 设计大典->竞技场界面修改 2020-10-19 13:54:08 +08:00
gaoxin 5dc4062a46 【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题 2020-10-17 20:08:40 +08:00
gaoxin 6326a8ab9a 【战斗0.0.1-同步local】添加引导战斗暂停接口 2020-10-17 19:03:34 +08:00
gaoxin 0baed21bf6 战斗逻辑同步 2020-10-17 18:35:52 +08:00
gaoxin 3810fc2da1 修复关卡推送礼包报错的问题 2020-10-17 18:19:03 +08:00
gaoxin 5e7bcff321 【竞技场周任务减负-1】前端还没做,表提交错误处理 2020-10-17 16:50:32 +08:00
ZhangBiao bae7d6550e 竞技场界面修改 2020-10-16 19:36:21 +08:00
ZhangBiao 0dbf805ef8 限时召唤 更换主Up神将
(cherry picked from commit 90a5c3f28d)
2020-10-23 17:38:45 +08:00
ZhangBiao 3b3a41c432 主题活动,势不可挡 霸哥修改
(cherry picked from commit dcf74880bc)
2020-10-23 17:38:33 +08:00
JieLing 386992eaa9 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-16 18:13:36 +08:00
ZhangBiao 9ac6eac395 礼包拍脸时机修复 2020-10-16 18:11:24 +08:00
ZhangBiao 4c55e3f1f0 推送礼包 special表id更改 2020-10-16 18:09:13 +08:00
ZhangBiao 8c4ff7e148 推送礼包 完事儿 2020-10-16 17:59:16 +08:00
jiaoyangna 435590808a 推送礼包修改 2020-10-16 17:59:00 +08:00
jiaoyangna 0fe316420a 推送礼包修改 2020-10-16 17:58:46 +08:00
ZhangBiao f0e9063c97 关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改 2020-10-16 17:56:39 +08:00
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
JieLing bfdb7998c6 Merge branch 'master_xma_local' into master_xma_test 2020-10-13 22:33:32 +08:00
gaoxin 8e3e25a450 修复无尽副本过渡期间依然可以进入的问题 2020-10-13 22:32:37 +08:00
jiaoyangna 04e6526819 神州令修改提交 2020-10-15 21:48:41 +08:00
jiaoyangna f35bad0ee2 神州令跳转修改 2020-10-15 21:36:16 +08:00
jiaoyangna 14986fb3f5 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-15 21:30:32 +08:00
jiaoyangna 98c80ed67c 森罗幻境 修改 2020-10-15 21:26:56 +08:00
jiaoyangna 7bea4cf26c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-22 01:25:09 +08:00
jiaoyangna 36559e89a7 【青龙秘宝】秘宝试炼页签下领取积分,升级时,青龙秘宝页签不会出现红点 2020-10-22 01:25:03 +08:00
jiaoyangna 72c09f393c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-21 23:18:44 +08:00
jiaoyangna 97bb590c24 主题活动修改 2020-10-21 23:18:39 +08:00
JieLing 3cee54d991 Merge branch 'master_xma_local' into master_xma_test 2020-10-13 21:33:41 +08:00
JieLing fc51ea9a27 Merge branch 'master_xma_local' into master_xma_test 2020-10-13 16:11:06 +08:00
JieLing bff69e473d 招募玩家详情展示魂印有问题 2020-10-13 15:51:20 +08:00
ZhangBiao 2469c75f90 森罗幻境 炸弹使用描述修改
(cherry picked from commit 3b19043f34)
(cherry picked from commit 677dca14e7)
2020-10-13 14:01:47 +08:00
JieLing 602c8e9e02 监听事件未移除正确 2020-10-12 20:44:15 +08:00
zhangqiang fe8c903b31 限时升级活动打开后 退出一段时间再返回报错 2020-10-12 19:34:33 +08:00
jiaoyangna 2b6705f176 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 17:13:44 +08:00
gaoxin 74abae8e84 修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。 2020-10-12 17:00:46 +08:00
zhangqiang 6f9521e400 线上问题 大闹天宫招募带宝器的英雄是报错 2020-10-12 16:59:53 +08:00
jiaoyangna 31895e8e25 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:56:44 +08:00
jiaoyangna 13b9886ddb Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-12 16:56:10 +08:00
jiaoyangna e84efa0961 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:56:05 +08:00
ZhangBiao e2b0244881 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-12 16:08:23 +08:00
ZhangBiao 767ac32ee1 回春散手动使用 数量不刷新 修复 2020-10-12 16:08:13 +08:00
zhangqiang 721418b30a 线上问题 宝器分解bug 2020-10-12 15:55:04 +08:00
JieLing d58311bb2b Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-12 15:43:06 +08:00
gaoxin 199326c74b 修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。 2020-10-12 15:42:12 +08:00
ZhangBiao aec2eb929c (cherry picked from commit f087c0258b) 2020-10-12 15:39:57 +08:00
ZhangBiao ff33dd07db 森罗回春散使用bug修改
(cherry picked from commit 62f185c859)
2020-10-12 15:15:02 +08:00
ZhangBiao a47d882155 森罗回春散使用 问题修复
(cherry picked from commit 69fee1514f)
2020-10-12 15:14:27 +08:00
zhangqiang 2f31dad427 线上问题 vip 战力计算打开 只是表的 pvp 评分配成0 2020-10-12 14:48:22 +08:00
zhangqiang b92be60aef 线上活动 森罗幻境 引发问题 限时抢购 报错 itemview 报空 5 4 是在别处提交的 限时活动报错 2020-10-12 14:47:56 +08:00