Commit Graph

4469 Commits (0ab7c3177a16d8a839d5f48d9f3b1fdae10b5cee)

Author SHA1 Message Date
jiaoyangna 0ab7c3177a 还原文字提交 2021-04-09 12:06:17 +08:00
ZhangBiao ca5257e28d Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 11:07:14 +08:00
ZhangBiao 8893dd7d7b 【活动优化】日周月礼包增加角标及妖晶数量变更 2021-04-09 11:05:08 +08:00
zhangqiang 3bd507747e 【车迟斗法】车迟斗法倒计时不是在战斗结束开始计算 2021-04-09 10:57:31 +08:00
ZhangBiao 115b2ee04d Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 09:18:03 +08:00
wangzhenxing af967ecf93 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 21:10:41 +08:00
wangzhenxing d19f1cce1c [战斗]=====被动214,238修改 bug:1014491 1013881 2021-04-08 21:09:29 +08:00
zhangqiang a3647d7cbe 【排行榜】与排行第一切磋后返回,不显示小人形象 2021-04-08 21:07:36 +08:00
zhangqiang 19ba1ffc5a 【分解】神将达到上限,分解后,再获得神将依然提示已达上限,重登正常 2021-04-08 21:03:47 +08:00
gaoxin 075101090d 【首充】文字显示调整 2021-04-08 20:52:01 +08:00
ZhangBiao 3edd56034a Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 20:48:31 +08:00
ZhangBiao b3aa8ebf2a 【神将置换】英雄名过长修改 2021-04-08 20:48:17 +08:00
gaoxin ba17f4fdc2 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 20:40:05 +08:00
gaoxin eab8a42191 【灵兽特惠】金钱显示兼容 2021-04-08 20:40:00 +08:00
zhangqiang 393a05ee99 【大闹天宫】生死簿神将头像边框颜色与品质不符 2021-04-08 20:27:21 +08:00
gaoxin 4a1a95d9fd 【八日登录】修复第四天后的提示白片 2021-04-08 20:23:06 +08:00
gaoxin f49bb49041 【每日豪礼】金钱显示走活动表 2021-04-08 20:20:09 +08:00
gaoxin effab48074 【每日豪礼】金钱数量走表 2021-04-08 20:10:25 +08:00
gaoxin 4a3d61b159 【每日豪礼】金钱显示兼容处理 2021-04-08 20:07:19 +08:00
gaoxin 840153d911 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 20:07:03 +08:00
gaoxin 645fc52869 【金钱组件】添加旋转接口 2021-04-08 20:06:57 +08:00
zhangqiang d1f88d5b33 【红点】退出公会,入口依然显示红点 2021-04-08 20:03:19 +08:00
ZhangBiao 56c0462062 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 19:58:51 +08:00
ZhangBiao 78c1b12067 【森罗幻境】小游戏转盘,灵兽碎片显示整只灵兽 2021-04-08 19:58:41 +08:00
zhangqiang cc6137697a 加打印 2021-04-08 19:45:04 +08:00
gaoxin 601e1c0971 【本地化】资源文件压缩处理 2021-04-08 18:37:17 +08:00
gaoxin b7ddc9ae4e 【本地化工具】名称检测工具优化 2021-04-08 18:30:21 +08:00
gaoxin 9de990fafd 【本地化】资源名修正 2021-04-08 18:29:09 +08:00
gaoxin 10f502dc14 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 18:16:47 +08:00
gaoxin 500d54469d 【扫光】挂机,充值界面扫光光效添加 2021-04-08 18:16:28 +08:00
zhangqiang 2be3a11fe7 【尝试修复邮件红点】 2021-04-08 18:15:29 +08:00
ZhangBiao 4977de55ba 【坐骑】界面文字适应修改 2021-04-08 18:01:29 +08:00
gaoxin 3ccf1e6c44 【语音】添加是否播放游戏语音的控制字段 2021-04-08 17:32:40 +08:00
gaoxin 795657a213 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 17:31:38 +08:00
gaoxin 680d3e2e7d 【金钱显示】修复累计充值第一个商品显示错误 2021-04-08 17:31:32 +08:00
ZhangBiao fe2e122607 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 17:24:52 +08:00
ZhangBiao 0d3f84f5e1 【自选宝箱】文字提示暂无外语版本,改回 2021-04-08 17:24:39 +08:00
jiaoyangna 32f5e051ad Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 17:03:34 +08:00
jiaoyangna 7784e3a9d1 主题活动提交
(cherry picked from commit d9c500fb36)
2021-04-08 17:03:29 +08:00
zhangqiang fa8e10ed9c 【大闹天宫】赛季重置是圣物新字显示bug 2021-04-08 16:58:39 +08:00
ZhangBiao 89c8179840 【自选宝箱】还是修改 2021-04-08 15:36:27 +08:00
ZhangBiao a7328fdfaf Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 15:02:10 +08:00
ZhangBiao 16db37cf29 【自选宝箱】 2021-04-08 15:02:01 +08:00
zhangqiang da4270b99b 【公会公告】 2021-04-08 14:59:19 +08:00
ZhangBiao cb5c940e25 【自选宝箱】文字提示 2021-04-08 14:53:36 +08:00
ZhangBiao 68539ff1ff Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 14:44:17 +08:00
ZhangBiao adc2d56559 【自选箱】遮盖文字修改 2021-04-08 14:44:08 +08:00
zhangqiang b206d79a68 【竞技守卫】翻译 2021-04-08 14:15:04 +08:00
gaoxin 45bb99f9c7 【公会】公会红包公告不会随语言切换 2021-04-08 12:00:50 +08:00
zhangqiang 8e7537a761 【首冲】钱显示修改 2021-04-08 11:47:22 +08:00