Commit Graph

4381 Commits (f70ffde7d1cd57258415933bb79e624a0866e70d)
 

Author SHA1 Message Date
zhangqiang cd4735e17f 【资源导入】猪八戒新皮肤特效 2020-12-15 10:11:02 +08:00
zhangqiang 9630a4a016 【套装属性】 bug修改 2020-12-14 17:52:37 +08:00
zhangqiang 74df46d7a8 【套装属性】 bug修改 2020-12-14 17:51:44 +08:00
Fuhaifeng 3c197b7e4e FHF _DEV1 2020-12-14 10:53:49 +08:00
gaoxin 06f487a176 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-12 18:00:38 +08:00
ZhangBiao 4c73219b39 【森罗幻境】诸多bug 修复 2020-12-12 18:00:18 +08:00
ZhangBiao 4da5b2ac46 【易经宝库】 2020-12-12 17:53:34 +08:00
ZhangBiao 242a85a27e 【道具自选箱】宝箱开启数量不能为0 2020-12-12 17:53:27 +08:00
jiaoyangna 720d4f5d8c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-12 17:22:07 +08:00
zhangqiang 475badacc1 博闻强识图片修改 2020-12-12 17:21:28 +08:00
jiaoyangna 0a1e1666f7 【博文多识】 2020-12-12 17:21:13 +08:00
zhangqiang 1e91b33cdd Merge branch 'master_xma_local' into 0功能/1209更新内容 2020-12-12 17:08:37 +08:00
zhangqiang 66c74f5a76 【装备套装】 2020-12-12 17:08:14 +08:00
zhangqiang 328af3f66b 【装备套装】 2020-12-12 17:07:22 +08:00
wangzhenxing 9f4d3cd182 [战斗] 大闹天宫圣物相关被动,同步成和校验服一样 2020-12-12 17:58:37 +09:00
gaoxin ec3636c842 【战斗】检测不灭的方式修改 2020-12-12 16:59:15 +09:00
zhangqiang 09cea38bbd 【每日登陆领奖】背景显示不全,多次点击后各奖励详情不再弹窗 bug 修复 2020-12-12 13:58:37 +08:00
zhangqiang 10132cc75f 【每日登陆领奖】背景显示不全,多次点击后各奖励详情不再弹窗 bug 修复 2020-12-12 13:57:18 +08:00
gaoxin 8b98b9e7e3 【战斗】检测不灭的方式修改 2020-12-11 18:10:46 +08:00
zhangqiang cedbc1222f 【装备套装】 套装属性向下兼容 2020-12-11 17:33:24 +08:00
zhangqiang 03e0e73665 【装备套装】 套装属性向下兼容 2020-12-11 17:31:11 +08:00
ZhangBiao 82eeaa5084 【森罗幻境】诸多bug修复 2020-12-11 17:21:04 +08:00
zhangqiang 6ef26cdc8f 博闻强识图片修改 2020-12-11 15:33:50 +08:00
jiaoyangna 175752ea75 [跨服十绝阵] 提交 2020-12-11 15:28:44 +08:00
zhangqiang 9f2ab54d65 【跨服天梯】 提交 2020-12-11 14:08:57 +08:00
zhangqiang d20ed07826 【跨服天梯】 提交 2020-12-11 11:59:33 +08:00
ZhangBiao e151ca86c7 【易经宝库】 2020-12-10 16:57:26 +08:00
ZhangBiao d2d9818fa9 【道具自选箱】宝箱开启数量不能为0 2020-12-10 16:41:06 +08:00
zhangqiang 200d59bb4d 【灵兽召唤】 1209bug 抽灵兽的动画,有一瞬间的黑屏 2020-12-10 14:42:22 +08:00
zhangqiang b8871d725c 【竞技场】 1209bug 竞技场跳过战斗按钮,解锁条件同关卡 2020-12-10 14:41:45 +08:00
zhangqiang 72e1cd322b 【灵兽召唤】 1209bug 抽灵兽的动画,有一瞬间的黑屏 2020-12-10 14:18:38 +08:00
zhangqiang 90df5e453f 【竞技场】 1209bug 竞技场跳过战斗按钮,解锁条件同关卡 2020-12-10 13:37:44 +08:00
jiaoyangna 84f6ea27ed 【博文多识】 2020-12-10 11:38:11 +08:00
zhangqiang 5aa90e75ac 【特效】 金乌特效移动位置 2020-12-10 10:53:59 +08:00
wangzhenxing 9b6e041a27 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-10 10:29:33 +09:00
wangzhenxing f6ef3b3d3b 战斗结束输出单位剩余血量日志 2020-12-10 10:28:56 +09:00
ZhangBiao 63c20aaab9 【道具自选箱】选择的数量为0直接关闭调整 2020-12-09 18:12:13 +08:00
ZhangBiao 2803b978c1 【道具自选箱】bug修复
(cherry picked from commit 6df7f2ef10)
2020-12-09 18:12:06 +08:00
ZhangBiao 9b58c897bf 【易经宝库】最中间的未开启 拿到大奖报错修改 2020-12-09 18:11:58 +08:00
ZhangBiao f9f31f5a44 【道具自选箱】选择的数量为0直接关闭调整 2020-12-09 18:02:15 +08:00
ZhangBiao 0937827967 【道具自选箱】bug修复
(cherry picked from commit 6df7f2ef10)
2020-12-09 17:28:43 +08:00
ZhangBiao 8289957799 【易经宝库】最中间的未开启 拿到大奖报错修改 2020-12-09 09:57:49 +08:00
zhangqiang 4493972a2f 【首冲】 首冲测试战斗修改提交 2020-12-08 17:14:08 +08:00
zhangqiang 2a6e0fdf34 【大闹天宫 bug】 失败后保存血量前端报错修改 2020-12-08 17:14:01 +08:00
zhangqiang 934e74672e 【首冲】 首冲测试战斗修改提交 2020-12-08 16:13:23 +08:00
zhangqiang b46e0f9105 【大闹天宫 bug】 失败后保存血量前端报错修改 2020-12-08 15:24:00 +08:00
ZhangBiao b9a3f19509 【GM】钱降一位、一键宝物、一键装备(顶级)
(cherry picked from commit 4ef08d456e)
2020-12-08 15:05:35 +08:00
ZhangBiao 4ef08d456e 【GM】钱降一位、一键宝物、一键装备(顶级) 2020-12-08 15:03:59 +08:00
ZhangBiao 2b3ad467dd 【百宝商会】时间字体颜色提交 2020-12-07 19:48:21 +08:00
ZhangBiao 1c7ac7e8cc 【青龙秘宝】修复延时
(cherry picked from commit 758c59dcae)
2020-12-07 19:18:04 +08:00