gaoxin
|
21ec70a29e
|
【灵兽】抽卡特效位置移动
|
2020-11-01 16:20:04 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
gaoxin
|
68c9726917
|
屏幕适配修改
|
2020-09-05 16:39:10 +08:00 |
gaoxin
|
d1facab9de
|
重复引用的资源路径修改
|
2020-09-03 19:50:26 +08:00 |
gaoxin
|
d405d09c05
|
登录界面动画修改
|
2020-09-01 16:17:20 +08:00 |
JieLing
|
b28309e14e
|
资源位置移动
|
2020-08-25 19:26:51 +08:00 |
JieLing
|
2eeb381608
|
登陆界面资源替换
|
2020-08-25 17:56:55 +08:00 |
JieLing
|
f4292f1f08
|
无极青莲技能效果添加
|
2020-08-25 15:57:19 +08:00 |
JieLing
|
2ef85759a1
|
无敌盾,眩晕效果添加
|
2020-08-25 15:49:52 +08:00 |
ZhangBiao
|
6013365ad1
|
剑影仙踪特效更新
|
2020-08-24 16:07:08 +08:00 |
JieLing
|
acf9a73068
|
重复引用资源修改
|
2020-08-13 19:40:50 +08:00 |
jl_ios
|
02b7e07d20
|
删除无用的sdk资源,bugly添加缺少的文件
|
2020-08-11 14:04:05 +08:00 |
gaoxin
|
8be398717d
|
文件名重复修改
|
2020-07-31 15:09:04 +08:00 |
jiaoyangna
|
c328d4683c
|
特效添加提交
|
2020-07-30 10:08:58 +08:00 |
jiaoyangna
|
38a69a4017
|
编队添加特效
|
2020-07-28 16:54:38 +08:00 |
jiaoyangna
|
99f9e7169e
|
添加特效
|
2020-07-28 15:06:47 +08:00 |
gaoxin
|
87b221b621
|
新技能特效添加
|
2020-07-23 10:23:33 +08:00 |
gaoxin
|
f420ee3bd7
|
Merge branch 'master_develop' into 英雄技能特效添加
# Conflicts:
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ab_lzhl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_axl_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bah_dww01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bxxz_lhzf01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_chdr_qsqy01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_cy_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dhc_dhjf01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dj_hmhx01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dlsm_hskj01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dm_lrzj01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dst_zxtsl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dz_htjl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_eh_hslc01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fhlh_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ft_csl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fx_lrzs01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_gg_alky01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ghn_ysyn01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hdxj_llhl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hhe_swzh01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hsmw_swzh01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hxps_xtcz01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jcdp_dpzc01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jgtn_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhns_ylp01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhxn_wxlz01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jl_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jll_yjl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jls_jlsw01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jmm_myjm01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jw_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jy_jyh01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jzy_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lc_ssym01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ldb_qzjfl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ljgz_hllw01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ls_lshd01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lsx_swz01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lzz_fjlyl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mjn_lhj01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mp_lqfc01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mslz_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mw_mwz01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_dzcx01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_pxz01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_nxq_lyc01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ny_qmsg01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_qxn_yyw01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_rd_gftm01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sdxj_sbj01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sgb_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sjll_bgxp01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tljz_zxxzl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ts_jzlcl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tyxj_tyyq01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_wg_wgfg01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_xllh_aa01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yc_ycmh01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygl_yll01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygps_ysqr01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yj_fjcy01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ylw_pgdm01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zbj_tpywl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zz_zzm01.mp3.meta
# data_execl/base_data/CombatControl.xlsx
|
2020-07-21 14:48:51 +08:00 |
gaoxin
|
bc43f00abc
|
资源名重复刷新
|
2020-07-16 20:14:19 +08:00 |
gaoxin
|
c5ae3c4c0b
|
新特效添加
|
2020-07-16 17:40:22 +08:00 |
gaoxin
|
bfd6a89b20
|
特效资源提交
|
2020-07-13 16:29:38 +08:00 |
JieLing
|
9b97aef3d7
|
内网 0.15.15
|
2020-07-10 18:20:58 +08:00 |
gaoxin
|
ab724d407e
|
嫦娥,东华帝君,洛神特效添加
|
2020-07-10 16:22:40 +08:00 |
2han9B1a0
|
7c7684a714
|
冲突提交
|
2020-07-08 21:19:34 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |