Commit Graph

3812 Commits (742767461c3209e7203669b34517ecd2920bb1e4)
 

Author SHA1 Message Date
zhangqiang 6fbed83b28 巅峰赛修改提交 2020-07-16 14:13:27 +08:00
ZhangBiao afa02aae2e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-16 13:45:50 +08:00
ZhangBiao 9d47ce9767 小游戏bug修复 2020-07-16 13:45:07 +08:00
liujiaqi 0cc615cb27 321星英雄技能特效 2020-07-16 11:51:56 +08:00
kansa 95a3be3363 修改全部怪物属性 2020-07-16 11:14:38 +08:00
szxhzz 43f2a437a6 音频更新 2020-07-16 11:03:09 +08:00
jiaoyangna c282e19b5e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-16 10:49:10 +08:00
jiaoyangna adc3b71e40 分解修改提交 2020-07-16 10:49:01 +08:00
shihongyi c8134ea18c 微调 2020-07-16 10:33:09 +08:00
JieLing 9f6fa391c4 删除战斗音效加速的效果 2020-07-16 10:22:51 +08:00
zhangqiang 2c744690bc 赛程数据合并 2020-07-16 10:13:32 +08:00
shihongyi 3d8efc8c95 紫色寻宝无法完成bug 2020-07-16 10:06:07 +08:00
altair 752cd999cc 添加英雄特效 2020-07-15 20:00:54 +08:00
gaoxin 8974820606 生成warp文件,修复本地运行时的错误 2020-07-15 19:15:00 +08:00
kansa be9537ce9a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 18:47:07 +08:00
kansa d00251dfd7 修改森罗幻境次元炸弹配置方法 2020-07-15 18:45:52 +08:00
gongjiawei b175124c6b 音频更新 2020-07-15 18:39:45 +08:00
zhangqiang bdf9331b79 巅峰战提交 2020-07-15 18:23:40 +08:00
gongjiawei f84d08ffeb 音频更新 2020-07-15 18:14:51 +08:00
gaoxin 037290c657 sdk工程加入猕猴桃sdk 2020-07-15 17:53:40 +08:00
ZhangBiao 6f9b8e7aca Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 17:33:41 +08:00
ZhangBiao cbe238fc9d 跳过战斗特权 修改 2020-07-15 17:33:19 +08:00
skuld bca13d2d6f 增加献祭英雄和分解宝物时的单次数量限制 2020-07-15 17:26:45 +08:00
ZhangBiao 18c189cd0c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 16:36:52 +08:00
ZhangBiao de9290e4a0 物品掉落特效+跳过按钮 2020-07-15 16:35:51 +08:00
shihongyi 9709e4abfb 首充英雄换孙悟空,跳过特权 2020-07-15 16:35:17 +08:00
jiaoyangna e15bf9a7b2 轩辕宝镜资源提交 2020-07-15 16:27:58 +08:00
gongjiawei cb7af0967b 音频更新 2020-07-15 16:19:11 +08:00
gongjiawei deee98f641 音频更新 2020-07-15 15:48:00 +08:00
ZhangBiao 81f8a73de0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 15:03:30 +08:00
ZhangBiao 9497cfae78 bug修改 2020-07-15 15:03:23 +08:00
gongjiawei 5e229778e0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 14:54:49 +08:00
gongjiawei dc5799c229 音频更新 2020-07-15 14:54:27 +08:00
ZhangBiao fc4e2c35ff bug修改 2020-07-15 14:50:00 +08:00
gaoxin 7605156317 sdk结构修改 2020-07-15 13:44:37 +08:00
ZhangBiao 9e23f56e00 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 13:41:44 +08:00
ZhangBiao 9f59d1f574 森罗幻境 小游戏与效果图的差异修改 2020-07-15 13:41:29 +08:00
zhangqiang ed5a942875 探宝红点未完成 2020-07-15 13:34:13 +08:00
liujiaqi ac8a07f482 老英雄名 2020-07-15 13:33:26 +08:00
shihongyi 9eccc41a8c 调整宝物精炼消耗 2020-07-15 12:14:57 +08:00
shihongyi 7f77abd772 跳过战斗特权 2020-07-15 11:43:28 +08:00
ZhangBiao de81c1f5c2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 11:15:41 +08:00
ZhangBiao 10414deee5 领取挂机宝箱时,增加道具获取动画效果 修改 2020-07-15 11:15:29 +08:00
jiaoyangna ee95a1ee55 【探宝优化】增加每日探宝次数限制 2020-07-15 11:07:32 +08:00
zhangqiang b682f97e66 首充第一版修改 2020-07-15 10:36:57 +08:00
ZhangBiao 2ab6d17841 森罗小游戏修改 2020-07-14 21:03:44 +08:00
zhangqiang f3048c9904 巅峰赛 修改 2020-07-14 20:27:23 +08:00
liujiaqi a2ea55a33f 预览战斗修改 2020-07-14 20:01:24 +08:00
liujiaqi 931181e762 预览战斗修改,开服狂欢修改 2020-07-14 19:36:20 +08:00
skuld a302b02fe0 增加每日探宝次数上限 2020-07-14 17:11:03 +08:00