Commit Graph

2751 Commits (11ee456279f8d2f22d5fd2a703cb048c40e92a1e)

Author SHA1 Message Date
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
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
zhangqiang a0f81de2ce 灵兽最大等级白片 2021-03-05 12:15:39 +08:00
jiaoyangna 37e5733d1a 本地化 2021-03-05 11:45:42 +08:00
jiaoyangna 32618d66bf 神衣天降修改 2021-03-05 09:57:11 +08:00
zhangqiang fe8da6eada 【限时活动】 2021-03-04 23:14:42 +08:00
zhangqiang 1cfa70da67 【主题活动】 2021-03-04 22:56:51 +08:00
zhangqiang 7770865a40 【主题活动修改】 2021-03-04 22:15:24 +08:00
zhangqiang d249f78e8f 【灵兽特惠】 2021-03-04 21:22:02 +08:00
gaoxin 30083c2449 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 21:01:26 +08:00
gaoxin 7198279fcc 【bug】修复ScrollCycleView回收导致报错的问题 2021-03-04 21:01:21 +08:00
zhangqiang e97fd92b92 【乾坤宝盒单抽卡死】 2021-03-04 20:35:21 +08:00
gaoxin a578651df9 Merge branch 'xma/dev_temp' into xma/dev 2021-03-04 19:49:17 +08:00
gaoxin 1c210301fd 【本地化】后端写死文本改为表配置 2021-03-04 19:48:38 +08:00
gaoxin d3a1cba41c 【管理】包配置管理加入 2021-03-04 19:29:15 +08:00
jiaoyangna ba7a5fbb18 本地化提交 2021-03-04 19:04:33 +08:00
zhangqiang f3fba14341 【点金排行榜】 2021-03-04 17:37:53 +08:00
jiaoyangna 8325cf0537 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 17:02:04 +08:00
jiaoyangna 09870ee552 除了中文其他语言不播音效 2021-03-04 17:02:00 +08:00
zhangqiang 3d9d5b0ed3 【20201001主题】 2021-03-04 16:58:28 +08:00
gaoxin 999e8e8cf4 Merge branch 'xma/dev' into xma/dev_temp 2021-03-04 16:51:55 +08:00
gaoxin 6f4a793bc5 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 16:47:57 +08:00
gaoxin d31b9298df 【本地化】lua文本重新导出 2021-03-04 16:44:37 +08:00
jiaoyangna 0991575155 提示修改 2021-03-04 16:43:47 +08:00
zhangqiang 86fd6724c1 【圣物选择】 2021-03-04 14:58:41 +08:00
jiaoyangna b3af8709ae 巅峰赛帮助文本修改 2021-03-04 14:28:46 +08:00
gaoxin 7d2a90fd90 Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev
# Conflicts:
#	AssetBundles/version.txt
2021-03-04 13:47:59 +08:00
ZhangBiao 052767a836 【本地化】鸿蒙阵修改 2021-03-04 11:05:19 +08:00
ZhangBiao 7805c09f4d Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 10:16:42 +08:00
ZhangBiao 7d678094a3 【本地化】 2021-03-04 10:16:31 +08:00
jiaoyangna 90a87ee396 本地化 提交 2021-03-04 10:16:07 +08:00
ZhangBiao 4861711fbc 【本地化】 2021-03-03 18:25:34 +08:00
jiaoyangna ef65fb91f4 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 17:46:19 +08:00
jiaoyangna cf5300bab2 图片提交 2021-03-03 17:46:08 +08:00
zhangqiang 1e1c325229 【神将】 2021-03-03 17:45:34 +08:00
ZhangBiao f01cdd582e Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 17:04:26 +08:00
ZhangBiao 6fe7b9ed28 【本地化】 2021-03-03 17:04:17 +08:00
zhangqiang 1ffe352007 【灵兽】 2021-03-03 16:59:52 +08:00