Commit Graph

1054 Commits (18d94c1026b282e911e1be09f16fe7cab309985b)
 

Author SHA1 Message Date
szxhzz 96fe229ade Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 19:44:15 +08:00
szxhzz 3814874c3f 音频更新 2020-07-28 19:43:35 +08:00
gongjiawei b9f6ef86e7 音频更新 2020-07-28 19:39:27 +08:00
gongjiawei efbfff0b3e 音頻跟新 2020-07-28 19:35:51 +08:00
szxhzz c879b10480 音频更新 2020-07-28 19:31:04 +08:00
jiaoyangna a3298ae117 星星预设提交 2020-07-28 19:21:16 +08:00
jiaoyangna a30e9e1757 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 19:18:50 +08:00
jiaoyangna 8a2a443168 星星提交 2020-07-28 19:18:45 +08:00
szxhzz b0c0bf5da0 配置表更新 2020-07-28 19:08:28 +08:00
jiaoyangna bf77931b88 边框修改提交 2020-07-28 18:38:19 +08:00
altair a6b232757c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 18:22:19 +08:00
altair 2e046d4d74 修改特效 2020-07-28 18:22:11 +08:00
gaoxin e3e317fb5c 音频压缩、加载格式修改 2020-07-28 18:01:53 +08:00
Genkins 7649e67049 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:58:39 +08:00
Genkins 65252cb36d 添加图片优化工具 2020-07-28 17:57:02 +08:00
altair 05486c779b 修改帮助文字 2020-07-28 17:55:44 +08:00
altair fff72e4047 修改图片 2020-07-28 17:53:50 +08:00
altair f9b8b938ff Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:50:23 +08:00
zhangqiang acba506782 寻宝添加6星显示 2020-07-31 18:40:22 +08:00
altair 4b9a9d27d2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	data_execl/base_data/ItemConfig.xlsx
2020-07-28 17:50:18 +08:00
altair 2168db33a3 修改道具图片 2020-07-28 17:43:02 +08:00
liujiaqi 68b9b28901 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:37:01 +08:00
liujiaqi f9c686d56e 技能描述修改 2020-07-28 17:36:45 +08:00
gaoxin 0922b8f587 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:31:24 +08:00
gaoxin a603520fdb Merge branch '接入SDK' into master_develop 2020-07-28 17:30:59 +08:00
gaoxin c9b4e71ab7 新aar资源替换 2020-07-28 17:30:06 +08:00
liujiaqi ce3d5f8eda 技能描述修改 2020-07-28 17:28:53 +08:00
ZhangBiao 88effd78f1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:26:50 +08:00
ZhangBiao 6c316bf7de 2020-07-28 17:25:50 +08:00
gaoxin 2df9b068b9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:24:15 +08:00
gaoxin fbff3d2a2a 删除音频文件导入时自动设置文件格式的问题 2020-07-28 17:20:25 +08:00
gaoxin 72921a8f51 修复行动时遭受异常状态死亡时会继续释放技能的问题 2020-07-28 17:19:57 +08:00
ZhangBiao 99e1c1d52a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:18:03 +08:00
ZhangBiao 1f474fd636 2020-07-28 17:17:55 +08:00
liujiaqi b1e011e049 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:07:22 +08:00
liujiaqi 1ff4c353a6 bug礼包和入群礼包 2020-07-28 17:06:54 +08:00
shihongyi 4ea92473b9 bugfix 2020-07-28 17:06:37 +08:00
ZhangBiao 771826da9c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:01:58 +08:00
ZhangBiao 018adbe85d 天宫秘宝入口关闭,修改乾坤宝盒魂印弹窗 2020-07-28 17:01:48 +08:00
gaoxin 5d6586a9a5 部分界面适配修改 2020-07-28 17:00:19 +08:00
jiaoyangna 25d535fa4c 关闭特效 2020-07-28 16:57:12 +08:00
jiaoyangna 60bf046b81 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 16:54:43 +08:00
jiaoyangna 38a69a4017 编队添加特效 2020-07-28 16:54:38 +08:00
ZhangBiao e2a8af9028 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 16:45:38 +08:00
zhangqiang 2a87d43fd0 bug 2020-07-31 17:36:06 +08:00
ZhangBiao ddfbb25e2e 森罗bug修复 2020-07-28 16:45:28 +08:00
altair 701faa8360 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 16:38:57 +08:00
altair f48b05e535 修改特效配置,挂机对话,帮助文字 2020-07-28 16:38:49 +08:00
gaoxin 5f6783fc13 新通用被击特效提交 2020-07-28 16:30:03 +08:00
kansa 29b60d30c4 修改大闹天空圣物掉落 2020-07-28 16:29:25 +08:00