JieLing
|
4905938974
|
Merge branch 'master_xma_local' into master_xma_test
|
2021-04-10 17:47:08 +08:00 |
JieLing
|
ea7282bbbb
|
Merge branch 'xma/dev' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-04-10 17:23:38 +08:00 |
JieLing
|
d49d33260e
|
Merge branch 'xma/dev-b' into xma/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-04-10 16:44:39 +08:00 |
zhangqiang
|
f3a3c34e7c
|
【邮件】协议超问题 修改 2
|
2021-04-10 16:19:33 +08:00 |
zhangqiang
|
8ab2496c28
|
【邮件】增加协议 点击邮件再获取内容
|
2021-04-10 15:37:10 +08:00 |
ZhangBiao
|
692e1de637
|
偶现会显示妖晶或者经验有【200%】标识 修复
|
2021-04-10 14:15:10 +08:00 |
ZhangBiao
|
385e107b75
|
【boss来袭】越南语BOSS展示显示中文修复
|
2021-04-10 13:30:32 +08:00 |
gaoxin
|
d620d4ff5e
|
【金钱显示】修复每日豪礼销毁再打开报错,更换MoneyNumView字体文件加载方式
|
2021-04-10 11:07:47 +08:00 |
zhangqiang
|
26e998ee59
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 21:54:01 +08:00 |
zhangqiang
|
d73a1adcfb
|
【登录】修复海外登录服无法登录的问题
|
2021-04-09 21:53:47 +08:00 |
ZhangBiao
|
0b2c480b1d
|
【神将进阶】选择进阶神将名字无翻译
|
2021-04-09 21:21:48 +08:00 |
ZhangBiao
|
0f3c59a017
|
【图鉴皮肤】暂时关闭图鉴中皮肤
|
2021-04-09 21:12:56 +08:00 |
ZhangBiao
|
671ba829ca
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 20:31:55 +08:00 |
ZhangBiao
|
da0d4f49d6
|
【装备详情】界面调整
|
2021-04-09 20:31:45 +08:00 |
zhangqiang
|
ccbc758738
|
【未获得装备属性展示】
|
2021-04-09 20:22:25 +08:00 |
gaoxin
|
7aace673ab
|
【本地化】天书密卷修复在其他语言下文字重叠的问题
|
2021-04-09 20:14:15 +08:00 |
gaoxin
|
e56ab6a0a2
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 20:04:22 +08:00 |
gaoxin
|
cf78c74d3c
|
【本地化】修复试炼副本答题界面未翻译的问题
|
2021-04-09 20:04:17 +08:00 |
ZhangBiao
|
8cd52f0f83
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 19:40:06 +08:00 |
gaoxin
|
53cc2ff930
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 19:39:54 +08:00 |
ZhangBiao
|
8becd11f4d
|
【神衣天降】按钮价格修改
|
2021-04-09 19:39:50 +08:00 |
gaoxin
|
ea06cd97e6
|
【本地化】部分界面文字错误修复
|
2021-04-09 19:39:48 +08:00 |
ZhangBiao
|
831d48f0ef
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 19:09:09 +08:00 |
ZhangBiao
|
e83e9ae889
|
【魂印】购买确认界面的魂印图标错误,没有添加圆形遮罩
|
2021-04-09 19:08:59 +08:00 |
gaoxin
|
e4144075ef
|
【乾坤宝盒】单抽光效在不同分辨率下显示错误
|
2021-04-09 18:28:32 +08:00 |
gaoxin
|
8e677abe4e
|
【本地化】GM界面不再翻译
|
2021-04-09 18:20:07 +08:00 |
gaoxin
|
e55e8b51ee
|
【本地化】越南vip资源提交
|
2021-04-09 18:19:42 +08:00 |
gaoxin
|
0cc7de1597
|
【本地化工具】添加不导出文件配置,gm界面不再导出翻译
|
2021-04-09 18:02:32 +08:00 |
gaoxin
|
26fda17758
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 17:38:24 +08:00 |
gaoxin
|
ea5648839c
|
【配置文件】添加对游戏语音,健康提示显示的配置
|
2021-04-09 17:38:18 +08:00 |
ZhangBiao
|
e0449a4e47
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 17:13:15 +08:00 |
ZhangBiao
|
a53f876a2f
|
【青龙秘宝】文字跳帧
|
2021-04-09 17:13:03 +08:00 |
jiaoyangna
|
82794896a0
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 16:56:11 +08:00 |
jiaoyangna
|
8d2bdf6228
|
限时神装 皮肤预览修改提交
|
2021-04-09 16:56:07 +08:00 |
ZhangBiao
|
3827aa3a15
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 16:53:04 +08:00 |
ZhangBiao
|
5814ca39db
|
【青龙秘宝】文字超框修改
|
2021-04-09 16:51:49 +08:00 |
gaoxin
|
bfa2f1300f
|
【天宫寻宝】帮助按钮位置移动
|
2021-04-09 16:49:02 +08:00 |
gaoxin
|
495f588c2e
|
【logo】还原Logo
|
2021-04-09 16:35:36 +08:00 |
jiaoyangna
|
f0f2c0714c
|
菩提树神图片提交
(cherry picked from commit acca43f54c )
|
2021-04-09 16:21:42 +08:00 |
jiaoyangna
|
c82b907b54
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 16:20:30 +08:00 |
jiaoyangna
|
acca43f54c
|
菩提树神图片提交
|
2021-04-09 16:20:26 +08:00 |
gaoxin
|
196dfa34dd
|
【GM】添加红点数据查看工具
|
2021-04-09 16:14:24 +08:00 |
gaoxin
|
3418b63e02
|
【本地化】天宫寻宝文字关闭
|
2021-04-09 16:04:21 +08:00 |
ZhangBiao
|
ce0a6a55d1
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 15:58:49 +08:00 |
ZhangBiao
|
a2065c13f2
|
【社稷大典】领取贡献等级奖励,界面会重复播放打开时的动画
|
2021-04-09 15:58:20 +08:00 |
jiaoyangna
|
55be27ca63
|
立绘修改提交
(cherry picked from commit 66763117a3 )
|
2021-04-09 15:26:54 +08:00 |
gaoxin
|
17c39e0d74
|
【本地化】翻译资源导入
|
2021-04-09 15:25:29 +08:00 |
jiaoyangna
|
66763117a3
|
立绘修改提交
|
2021-04-09 15:22:27 +08:00 |
ZhangBiao
|
1d447aee82
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 14:48:09 +08:00 |
ZhangBiao
|
5de102eb06
|
【天枢密卷】灯笼文字超框修改
|
2021-04-09 14:48:01 +08:00 |