zhangqiang
|
1cfa70da67
|
【主题活动】
|
2021-03-04 22:56:51 +08:00 |
zhangqiang
|
7770865a40
|
【主题活动修改】
|
2021-03-04 22:15:24 +08:00 |
jiaoyangna
|
1acfbabcde
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 21:33:24 +08:00 |
jiaoyangna
|
29f1ae90e0
|
预设提交
|
2021-03-04 21:33:19 +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 |
liujiaqi
|
4b2ee650e3
|
【资源】资源名调整
|
2021-03-04 20:21:33 +08:00 |
gaoxin
|
8750406dfc
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 20:19:42 +08:00 |
gaoxin
|
0c29596eb1
|
【配置】服务器配置还原到version.txt中
|
2021-03-04 20:19:26 +08:00 |
zhangqiang
|
a29e0db487
|
【主题活动】
|
2021-03-04 20:18:37 +08:00 |
jiaoyangna
|
21e0998228
|
图片提交
|
2021-03-04 20:17:22 +08:00 |
gaoxin
|
099c0603bb
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 19:59:36 +08:00 |
zhangqiang
|
0f25668d0f
|
【1008主题活动修改】
|
2021-03-04 19:50:26 +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
|
0b9394188a
|
【修改
|
2021-03-04 19:03:09 +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
|
abad647f16
|
【本地化】新增资源导入
|
2021-03-04 16:47:35 +08:00 |
gaoxin
|
265fb5684e
|
删除奇怪的资源文件
|
2021-03-04 16:44:55 +08:00 |
gaoxin
|
999010d8ca
|
冗余资源删除
|
2021-03-04 16:44:49 +08:00 |
gaoxin
|
d31b9298df
|
【本地化】lua文本重新导出
|
2021-03-04 16:44:37 +08:00 |
jiaoyangna
|
0991575155
|
提示修改
|
2021-03-04 16:43:47 +08:00 |
jiaoyangna
|
7a6808a8d1
|
图片提交
|
2021-03-04 16:05:43 +08:00 |
zhangqiang
|
249cddb935
|
【显示兑换】
|
2021-03-04 15:18:31 +08:00 |
zhangqiang
|
6bbb1c7671
|
Revert "【新live2】导入 缺25"
This reverts commit 7d8145a3b9 .
|
2021-03-04 15:16:46 +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 |
zhangqiang
|
7d8145a3b9
|
【新live2】导入 缺25
|
2021-03-04 11:44:19 +08:00 |
ZhangBiao
|
2d8acdfcd9
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 11:05:28 +08:00 |
ZhangBiao
|
052767a836
|
【本地化】鸿蒙阵修改
|
2021-03-04 11:05:19 +08:00 |
jiaoyangna
|
f309c54436
|
导出代码和预设的翻译表
|
2021-03-04 11:04:47 +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
|
a7e578eea8
|
【本地化】
|
2021-03-03 18:31:18 +08:00 |
ZhangBiao
|
4861711fbc
|
【本地化】
|
2021-03-03 18:25:34 +08:00 |
ZhangBiao
|
37dcb0d6ad
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 18:07:38 +08:00 |
ZhangBiao
|
c7ab8fcb8b
|
【本地化】
|
2021-03-03 18:07:29 +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 |