Commit Graph

178 Commits (0dd925c92422c366d5f6e66cf3a53aa442e2c371)

Author SHA1 Message Date
JieLing 30d5959d7f Merge branch 'master_xma_test' into master_online_hw 2020-11-18 11:32:59 +08:00
jiaoyangna 44a1d94860 神医天降修改 2020-11-13 15:47:04 +08:00
zhangqiang 21988be4e2 【觉醒】 觉醒成功替换资源 2020-11-13 11:18:46 +08:00
zhangqiang e9d984b329 Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-11-12 19:34:29 +08:00
zhangqiang 8b15fe28eb 【献祭坛】11.5 资源提换 2020-11-12 18:12:02 +08:00
ZhangBiao 2c143deea9 Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-11-12 17:21:42 +08:00
zhangqiang b1128dd88e 【献祭坛】适配调试 2020-11-12 17:05:34 +08:00
jiaoyangna 358ecb8166 [玄机妙算] 提交 2020-11-12 15:10:52 +08:00
jiaoyangna a6483b3181 [灵兽特惠] 提交 2020-11-12 11:31:33 +08:00
zhangqiang 0ca5e4ea13 【觉醒】bug 2020-11-11 20:21:37 +08:00
JieLing c9b22fb912 Merge branch 'master_xma_test' into master_online_hw 2020-11-11 10:04:31 +08:00
zhangqiang 48e6d33b7b 【神将觉醒】 效果图 资源 提交 2020-11-10 17:29:38 +08:00
ZhangBiao d493246f2f 【灵兽抽卡】 开坑 2020-11-10 11:34:19 +08:00
jiaoyangna 22038419b7 神医天降提交 2020-11-06 19:54:00 +08:00
ZhangBiao 5e130a7585 Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 16:17:12 +08:00
jiaoyangna e8be02de87 [移山倒海] 提交 2020-11-06 10:49:08 +08:00
jiaoyangna 509357e333 Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-04 10:54:54 +08:00
JieLing f88884aa12 Merge branch 'master_xma_test' into master_online_hw 2020-11-04 10:49:28 +08:00
jiaoyangna e92e63444b 皮肤提交 2020-11-03 17:27:32 +08:00
JieLing 04ba352791 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
ZhangBiao 8640018b87 【易经宝库】开坑 搭界面 和做动画 2020-11-02 18:05:24 +08:00
gaoxin 3cdc100777 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
gaoxin 23253f96a2 【社稷大典】名字重复的资源处理 2020-11-01 16:23:08 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
liujiaqi c16a291063 逍遥特权图标资源 2020-10-30 13:28:10 +08:00
jiaoyangna 4b88ce6eb3 【运筹帷幄】限时召唤界面,up将白片 2020-10-30 10:09:04 +08:00
zhangqiang 6c1cf4de1a 【运筹帷幄】1 2020-10-30 10:08:41 +08:00
gaoxin 9add8d8dbf 【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题) 2020-10-27 13:53:32 +08:00
JieLing e1a8028ec6 【资源】部分资源位置修改,防止热更资源过大 2020-10-27 11:03:08 +08:00
jiaoyangna d8f5a48811 【累计充值】提示修改 2020-10-26 16:51:47 +08:00
JieLing 16264aa29e Merge branch 'master_xma_test' into master_online_hw 2020-10-21 07:40:25 +08:00
yuanshuai 885de6fe9b 逍遙游自动游历开启 相关脚本资源提交 2020-10-20 16:17:13 +08:00
gaoxin 19135670ce Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-19 20:40:14 +08:00
gaoxin 364c9c99fc 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +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
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
zhangqiang f2d3f045aa 森罗幻境提交1 2020-10-12 14:46:05 +08:00
jiaoyangna aa9878a1f2 势不可挡 提交 2020-10-10 16:14:18 +08:00
jiaoyangna 8ff0382e41 丹心碧血主界面icon 修改提交 2020-10-15 14:06:16 +08:00
jiaoyangna d249eb412f 丹心碧血提交 2020-10-15 14:05:56 +08:00
jiaoyangna 7c38428100 丹心碧血图片提交 2020-10-15 14:04:45 +08:00
jiaoyangna 054ea80a3c 活动icon 提交 2020-09-29 10:30:19 +08:00
liujiaqi 783c61eed8 修复新玩家登陆卡在登陆100% 2020-09-27 20:40:20 +08:00
JieLing 907d092c04 遗漏同步提交 2020-09-27 18:27:20 +08:00
ZhangBiao c4706208ef 三界除魔功能添加 2020-09-27 16:43:33 +08:00
zhangqiang bd6fdce461 遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-27 16:12:21 +08:00
gaoxin 7b7def3f8f 勇冠三军,叱咤风云活动添加 2020-09-27 16:09:55 +08:00
jiaoyangna b97569c645 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-02 17:22:22 +08:00
jiaoyangna d2e94cfdea hero compound and replace 2020-09-02 17:21:54 +08:00