Commit Graph

1397 Commits (9dce11a6ebd7ba2f3cfd2d7177b490a24c1bdaec)
 

Author SHA1 Message Date
wangzhenxing 9dce11a6eb 测试战斗修改提交 2020-08-13 17:36:20 +09:00
ZhangBiao 41cea65207 2020-08-13 17:17:01 +08:00
ZhangBiao d4280f8ed2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 17:07:21 +08:00
ZhangBiao e655562a71 2020-08-13 17:07:05 +08:00
shihongyi bae1143471 剑影仙踪拍脸等级、兑换活动控制 2020-08-13 16:53:07 +08:00
ZhangBiao 9bac8e2bfc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 16:38:57 +08:00
ZhangBiao e397fa88e7 2020-08-13 16:38:40 +08:00
wangzhenxing 442877d3e0 珍奇宝阁预设代码提交 2020-08-13 16:38:20 +09:00
skuld 451a279458 添加轩辕宝境入口描述文字 2020-08-13 15:47:12 +08:00
lihaiyang 76e7b5d406 轩辕宝境怪物属性初版 2020-08-13 15:38:53 +08:00
lihaiyang 8702f62d1f 轩辕宝境开启等级修改为75级 2020-08-13 15:35:05 +08:00
lihaiyang b918f8c06b 轩辕免费次数和购买次数位置修改 2020-08-13 15:33:32 +08:00
jiaoyangna fbf7c3b41d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:44:53 +08:00
jiaoyangna 7de60dea2b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:43:51 +08:00
ZhangBiao a180f63fe7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:43:46 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
ZhangBiao dd3c814c2a 四元阵中 添加 置换入口 2020-08-13 14:43:10 +08:00
gongjiawei c18cb5fc01 音频更新 2020-08-13 14:23:37 +08:00
jiaoyangna beaaeed139 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:21:50 +08:00
lihaiyang 9a75e685ac 轩辕宝境邮件配合 2020-08-13 14:21:28 +08:00
liujiaqi b31f0b52d1 签到宝箱 2020-08-13 13:43:41 +08:00
ZhangBiao d1ec3fa196 每周 每月礼包阴影问题修复 2020-08-13 13:33:48 +08:00
ZhangBiao 2fe27c64ec 2020-08-13 12:33:21 +08:00
ZhangBiao a6d69bd001 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 12:00:38 +08:00
ZhangBiao f4dad25b7a 神将置换bug修复 2020-08-13 12:00:18 +08:00
gaoxin de27163861 合成修改 2020-08-13 11:46:55 +08:00
altair f17e4e319a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 11:13:17 +08:00
altair 9d986d7c0b 修改道具图标及名称 2020-08-13 11:13:00 +08:00
gaoxin b4eef8c285 神将合成显示修改 2020-08-13 11:11:26 +08:00
altair 87bc5b7dfd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 10:29:45 +08:00
altair b9b78ca37e 修改置换玉图标 2020-08-13 10:29:33 +08:00
gaoxin 48d8f3887b 修改神将合成显示问题 2020-08-13 10:28:16 +08:00
liujiaqi 4e54d85fdc 技能选择目标回调 2020-08-13 10:14:39 +08:00
shihongyi dee104669b ##bug 2020-08-13 09:51:22 +08:00
jiaoyangna 937d46ff75 xuanyuan commit 2020-08-12 21:10:47 +08:00
jiaoyangna a9ebd162ec 轩辕 提交 2020-08-12 21:10:36 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
zhangqiang 783583404e 神将合成修改提交 2020-08-12 20:59:20 +08:00
liujiaqi c4938b7bd3 修正英雄主动技能,天赋,法宝,魂印描述增加标点 2020-08-12 20:42:57 +08:00
shihongyi 1de6a6bd83 bug、幻境 2020-08-12 20:41:22 +08:00
altair 4a60554eab Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-12 19:50:33 +08:00
altair fde8f838a6 修改道具图标 2020-08-12 19:50:22 +08:00
zhangqiang 058b18bc6f 最新表 协议数据 2020-08-12 18:29:11 +08:00
gongjiawei 0d0ae17a68 音频更新 2020-08-12 18:11:39 +08:00
gongjiawei a5663aae42 音频更新 2020-08-12 17:53:48 +08:00
ZhangBiao 0931365a3d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-12 17:03:49 +08:00
ZhangBiao 5304368d56 神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
2020-08-12 17:03:39 +08:00
shihongyi 60eb6d985d bugfix 2020-08-12 17:00:26 +08:00
gongjiawei b4e8c6803c 音频更新 2020-08-12 16:02:35 +08:00
gaoxin 809e10df79 Merge branch 'master_develop2' into master_develop 2020-08-12 14:45:01 +08:00