wangzhenxing
|
443ba942cf
|
[功能]================称号功能提交
|
2021-04-12 16:23:57 +08:00 |
gaoxin
|
e02af6286e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 16:04:53 +08:00 |
gaoxin
|
56bf418509
|
Merge branch 'xma/dev' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua
|
2021-04-12 16:04:46 +08:00 |
ZhangBiao
|
42cd84f7aa
|
【十五日登陆】刷新时间提交
(cherry picked from commit 135e13dcbb )
|
2021-04-12 15:32:56 +08:00 |
ZhangBiao
|
b088d21df4
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-04-12 15:31:00 +08:00 |
ZhangBiao
|
135e13dcbb
|
【十五日登陆】刷新时间提交
|
2021-04-12 15:30:11 +08:00 |
jiaoyangna
|
b26f09d6a3
|
添加不显示前往按钮的跳转
|
2021-04-12 15:12:12 +08:00 |
JieLing
|
9e0710a861
|
Merge remote-tracking branch 'origin/master_xma_local' into xma/dev
|
2021-04-12 15:11:16 +08:00 |
ZhangBiao
|
e986b8d956
|
【十五日】
(cherry picked from commit 0e41801daf )
|
2021-04-12 15:06:57 +08:00 |
ZhangBiao
|
276e0129fe
|
【十五日登陆】修改提交
(cherry picked from commit 8e0177d3ed )
|
2021-04-12 15:06:43 +08:00 |
ZhangBiao
|
0e41801daf
|
【十五日】
|
2021-04-12 15:04:33 +08:00 |
JieLing
|
4ea8d525e1
|
Merge branch 'master_xma_test' into master_xma_local
|
2021-04-12 15:03:18 +08:00 |
ZhangBiao
|
8e0177d3ed
|
【十五日登陆】修改提交
|
2021-04-12 15:02:49 +08:00 |
JieLing
|
9cd895e8e9
|
【资源处理】meta文件提交,文件压缩优化
|
2021-04-12 15:00:57 +08:00 |
jiaoyangna
|
034ed82f0f
|
皮肤错误修改
|
2021-04-12 14:02:03 +08:00 |
JieLing
|
52a2ecabd6
|
【活动开启】提审服关闭日周月礼包
|
2021-04-12 10:46:32 +08:00 |
JLIOSM1
|
e99b368abb
|
【adjust】修复打点错误
|
2021-04-11 04:21:55 +08:00 |
JieLing
|
e8dd8f9bea
|
【活动】未开启的活动页签不再显示
|
2021-04-11 02:14:55 +08:00 |
wangzhenxing
|
ad9fdfd09e
|
[战斗]==============大闹天宫同步最新战斗逻辑
|
2021-04-10 22:13:10 +08:00 |
wangzhenxing
|
450e2b412b
|
[战斗]==================同步最新被动逻辑
|
2021-04-10 21:58:27 +08:00 |
JieLing
|
be7e69d66b
|
Merge branch 'master_xma_local' into master_xma_test
|
2021-04-10 19:43:07 +08:00 |
JieLing
|
169253497d
|
Merge branch 'xma/dev' into master_xma_local
|
2021-04-10 19:42:42 +08:00 |
JieLing
|
9ffdf791ce
|
Merge branch 'xma/dev-b' into xma/dev
|
2021-04-10 19:42:14 +08:00 |
gaoxin
|
798eedde7b
|
【adjust】包名修改
|
2021-04-10 19:22:13 +08:00 |
JLIOSM1
|
47a6118d81
|
【adjust】添加创建角色事件
|
2021-04-10 19:17:41 +08:00 |
gaoxin
|
52fb286afa
|
【本地化】修复第一次安装包时无法根据当前系统语言修改游戏内语言的问题
|
2021-04-10 19:08:57 +08:00 |
JieLing
|
c0e722bec0
|
Merge branch 'master_xma_local' into master_xma_test
|
2021-04-10 18:52:07 +08:00 |
JieLing
|
8836fac87b
|
Merge branch 'xma/dev' into master_xma_local
|
2021-04-10 18:51:39 +08:00 |
JieLing
|
3b0ba8f3d6
|
Merge branch 'xma/dev-b' into xma/dev
|
2021-04-10 18:50:52 +08:00 |
ZhangBiao
|
1981cc1836
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-10 17:58:04 +08:00 |
ZhangBiao
|
cc34d28e8d
|
【公会红包】报错修改
|
2021-04-10 17:57:49 +08:00 |
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 |