Commit Graph

4470 Commits (98e2ad0e3be5e352755ec78da33de4bc3ac291a5)
 

Author SHA1 Message Date
jiaoyangna 64d267b232 乾坤宝盒时间调整 2021-03-07 15:32:28 +08:00
jiaoyangna 21a607b7c4 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 15:16:47 +08:00
jiaoyangna 99dcf2ed40 灵兽等级显示错误修改 2021-03-07 15:16:40 +08:00
gaoxin ac312d9227 【本地化】关闭一些界面显示 2021-03-07 14:58:16 +08:00
gaoxin 906c44ae95 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 14:57:12 +08:00
gaoxin 7490911418 【本地化】修改文本位置 2021-03-07 14:57:07 +08:00
jiaoyangna 6878db8818 限时招募提交 2021-03-07 14:40:48 +08:00
jiaoyangna 0b975da446 限时招募提交 2021-03-07 14:16:58 +08:00
zhangqiang 02821bf9d6 【本地化】 2021-03-05 18:35:32 +08:00
jiaoyangna cdd2ec63f6 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 18:34:04 +08:00
jiaoyangna bf45224c5f 升级修改提交 2021-03-05 18:33:46 +08:00
gaoxin b8af05773d 【本地化】竞技场编队文字修改 2021-03-05 18:18:22 +08:00
zhangqiang a9d251494c 【本地化】 2021-03-05 17:59:38 +08:00
ZhangBiao 9792e57e9b 【系统弹窗】提交 2021-03-05 17:27:57 +08:00
gaoxin cb219de48a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 17:19:36 +08:00
gaoxin 1a54f29a6d 【本地化】修复鸿蒙碑指引超出屏幕范围 2021-03-05 17:19:21 +08:00
zhangqiang e9bd743af5 【本地化】 2021-03-05 17:18:07 +08:00
gaoxin 9ca66e9f40 【本地化】修复魂印选择名字重叠 2021-03-05 17:07:59 +08:00
wangzhenxing 130a7d6548 [战斗]=============272被动修改 根据配置回合数开始计算概率 2021-03-05 18:02:31 +09:00
gaoxin f11127e3cc 【本地化】限时礼包预设漏提交,成就文字过长修改 2021-03-05 16:57:48 +08:00
gaoxin 6b6fd062c8 【本地化】战斗统计部分效果添加翻译 2021-03-05 16:56:27 +08:00
gaoxin 1e784087c9 【本地化】限时礼包限购提示文字本地化修改 2021-03-05 16:41:59 +08:00
jiaoyangna b7f9f620c3 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 16:38:39 +08:00
jiaoyangna d7d95d826c csv 提交 2021-03-05 16:38:35 +08:00
zhangqiang ea3ad6d934 【本地化】 2021-03-05 16:26:39 +08:00
jiaoyangna 1937e33d8e Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Expert/PatFacePanel.prefab
2021-03-05 16:07:20 +08:00
jiaoyangna 91f1fefe1a 本地化提交 2021-03-05 16:06:51 +08:00
zhangqiang 9f1b0aa44b 【本地化】 2021-03-05 15:55:54 +08:00
gaoxin 63b4a7e32c Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 15:42:22 +08:00
gaoxin c512fdbcff 【本地化】图片资源名反了 2021-03-05 15:42:17 +08:00
wangzhenxing 74ebe19f74 [战斗]====================大闹天宫圣物修改提交 2021-03-05 16:26:50 +09:00
ZhangBiao 8ad9913800 【本地化】我要变强修改 2021-03-05 15:24:43 +08:00
ZhangBiao 16982ef939 提交 2021-03-05 15:19:47 +08:00
ZhangBiao 11ee456279 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 15:14:32 +08:00
ZhangBiao 3c32b2aa4a 【本地化】我要变强 灵兽lv修改 2021-03-05 15:14:22 +08:00
zhangqiang 0af293c7d9 【巅峰赛 部分】 2021-03-05 15:12:15 +08:00
gaoxin 2cf5293192 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 15:04:27 +08:00
gaoxin a8052da594 【本地化】优化战斗内文字显示 2021-03-05 15:04:14 +08:00
jiaoyangna 9a687232c9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 15:02:33 +08:00
jiaoyangna 9cfbc69d17 限时活动红点不消失修改 2021-03-05 15:02:29 +08:00
gaoxin 0dcbc50496 【本地化】战斗内字体修改 2021-03-05 14:55:44 +08:00
gaoxin 99e373bda2 【协议】修复登录成功确认协议丢失 2021-03-05 14:53:03 +08:00
gaoxin c97b14319c 【本地化】随即名字本地化处理 2021-03-05 14:43:27 +08:00
ZhangBiao eaac0b6cd1 Revert "【本地化】随机名字本地化"
This reverts commit 8dadc2d54b.
2021-03-05 14:36:19 +08:00
ZhangBiao 38d5687359 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 14:32:40 +08:00
ZhangBiao 8dadc2d54b 【本地化】随机名字本地化 2021-03-05 14:32:29 +08:00
zhangqiang 5c641ef598 【灵兽主界面等级 + 升级成功】 2021-03-05 14:13:13 +08:00
jiaoyangna d1f18c39b3 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 14:01:03 +08:00
jiaoyangna 7c5fd4408e 本地化提交 2021-03-05 14:00:45 +08:00
ZhangBiao 005e54b036 【大闹天宫】招募节点修改 2021-03-05 13:54:19 +08:00