Commit Graph

3214 Commits (2be3a11fe79bf23ca6637fab3a633ca520478722)

Author SHA1 Message Date
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
gaoxin 45bb99f9c7 【公会】公会红包公告不会随语言切换 2021-04-08 12:00:50 +08:00
zhangqiang 8e7537a761 【首冲】钱显示修改 2021-04-08 11:47:22 +08:00
zhangqiang 972e585d8a 【300】 2021-04-08 11:08:54 +08:00
zhangqiang 4b1f021ac0 【累计充值】 2021-04-08 10:18:24 +08:00
zhangqiang e84bdaf457 【每日好礼】 2021-04-07 21:07:42 +08:00
jiaoyangna 4926d16dc2 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 20:28:16 +08:00
jiaoyangna efd1c6fab9 逍遥预设提交 2021-04-07 20:28:12 +08:00
wangzhenxing dada859ec6 [战斗]========battleutil 添加判断数组长度方法 2021-04-07 20:14:43 +08:00
zhangqiang 894a8bcfd4 【问题提交】 2021-04-07 19:52:25 +08:00
ZhangBiao 31d0a4ea93 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 17:48:15 +08:00
ZhangBiao 83f173bc74 【天枢密卷】提交 2021-04-07 17:48:07 +08:00
jiaoyangna f49bb447fc Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 17:47:00 +08:00
jiaoyangna 8696940dda 逍遥提交 2021-04-07 17:46:56 +08:00
ZhangBiao 027de719b6 【福星高照、限时神装】 2021-04-07 17:20:23 +08:00
ZhangBiao 21b97b3985 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 16:59:56 +08:00
ZhangBiao 6117dd2363 【牛气冲天】翻译修改 2021-04-07 16:59:47 +08:00
zhangqiang 69d3f4a331 【bug 主要是翻译】 2021-04-07 16:38:26 +08:00
jiaoyangna 6794c272c0 逍遥游提交 2021-04-07 16:30:20 +08:00
jiaoyangna 40351af4da Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 16:12:32 +08:00
jiaoyangna 17bc3ce580 逍遥boss 提交 2021-04-07 16:12:29 +08:00
ZhangBiao 33c598e2d9 【天数密卷】按钮文字旋转 2021-04-07 15:22:32 +08:00
ZhangBiao bfaa5195b5 Revert "【表删除】报错处理"
This reverts commit b163fc3035.
2021-04-07 11:54:39 +08:00
zhangqiang b05c9a8c1c 【bug】 十绝阵翻译修改引用 2021-04-07 11:43:25 +08:00
ZhangBiao c9f0efe3f6 【无尽森罗】无法进入修改 2021-04-07 11:35:48 +08:00
ZhangBiao 704dd1ffa5 【化虚坛】未翻译 2021-04-07 11:20:58 +08:00
ZhangBiao 58d20c0bd3 【限时活动】没东西有红点 2021-04-07 11:05:26 +08:00
zhangqiang 132e4c1260 【bug】奖励排行拉不到底部 2021-04-07 10:30:47 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
gaoxin d6319948f2 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
gaoxin d90b9145b8 Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b 2021-04-06 15:24:46 +08:00
gaoxin cf5a2a46fa 【本地化】还原文本到代码种 2021-04-06 15:23:27 +08:00
gaoxin fc28c2c0a3 Merge branch 'china/dev' into gx/china/dev_tr 2021-04-06 15:21:49 +08:00
gaoxin 08c5c7b423 【本地化】导出文本 2021-04-06 15:21:38 +08:00