Fang
|
c2734a66fb
|
头像框显示fix
|
2023-06-19 14:38:39 +08:00 |
|
Fang
|
44c81c202d
|
副本入口显示fix
|
2023-06-19 14:17:13 +08:00 |
|
xiekaidong
|
2c9d262fee
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-19 12:03:20 +08:00 |
|
xiekaidong
|
ccab76a58b
|
buff回合数等于1时也显示
|
2023-06-19 12:03:13 +08:00 |
|
Fang
|
579b7e0880
|
首通奖励显示fix
|
2023-06-19 11:57:44 +08:00 |
|
Fang
|
700c007d73
|
添加容错
|
2023-06-19 11:41:16 +08:00 |
|
Fang
|
f3924368ce
|
头像昵称功能
|
2023-06-19 10:57:39 +08:00 |
|
Fang
|
29e2e33888
|
结算界面相同奖励合并
|
2023-06-19 10:25:40 +08:00 |
|
chenxi
|
13edfce314
|
界面调整
|
2023-06-16 17:32:01 +08:00 |
|
chenxi
|
15d01c9dde
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-16 17:16:01 +08:00 |
|
chenxi
|
bd6aa57fa1
|
界面调整
|
2023-06-16 17:15:58 +08:00 |
|
xiekaidong
|
35a4f25366
|
邮件容错
|
2023-06-16 16:59:54 +08:00 |
|
xiekaidong
|
7dae3a6ab5
|
火蛇海蛇效果
|
2023-06-16 15:13:38 +08:00 |
|
xiekaidong
|
2f3bf147d1
|
修改显示
|
2023-06-16 11:33:20 +08:00 |
|
Fang
|
36b340003a
|
去掉文本冒号
|
2023-06-16 10:22:29 +08:00 |
|
xiekaidong
|
f2047f1833
|
战斗内相应安卓返回键
|
2023-06-16 10:14:20 +08:00 |
|
chenxi
|
c1b1d0748a
|
一些界面响应安卓返回键
|
2023-06-15 22:02:38 +08:00 |
|
xiekaidong
|
64498c02a6
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-15 17:30:11 +08:00 |
|
xiekaidong
|
3723335174
|
每日挑战任务完成情况上报
|
2023-06-15 17:30:08 +08:00 |
|
Fang
|
a003b22ad4
|
副本刷新
|
2023-06-15 17:28:02 +08:00 |
|
Fang
|
e090ddf3a7
|
副本文本冒号fix
|
2023-06-15 17:24:19 +08:00 |
|
chenxi
|
c6361d035f
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-15 16:26:00 +08:00 |
|
chenxi
|
2c2e67caee
|
客服
|
2023-06-15 16:25:58 +08:00 |
|
xiekaidong
|
e8b6534d3b
|
副本开启引导触发
|
2023-06-15 15:32:27 +08:00 |
|
xiekaidong
|
b951d8d2b7
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-15 14:07:13 +08:00 |
|
xiekaidong
|
f215a8124a
|
bug修复
|
2023-06-15 14:07:10 +08:00 |
|
Fang
|
193ea8902f
|
金币副本新增boss抗性
|
2023-06-15 10:46:36 +08:00 |
|
xiekaidong
|
2807860d92
|
容错
|
2023-06-14 19:09:26 +08:00 |
|
chenxi
|
119a6eaa27
|
支付
|
2023-06-14 18:57:09 +08:00 |
|
chenxi
|
119d9c8e22
|
隐私政策
|
2023-06-14 18:56:18 +08:00 |
|
chenxi
|
a2a3bb5180
|
多语言
|
2023-06-14 16:19:04 +08:00 |
|
chenxi
|
d3bb4c3698
|
Merge branch 'dev_ios' into dev
|
2023-06-14 15:40:47 +08:00 |
|
chenxi
|
d3a00e325c
|
兑换码
|
2023-06-14 15:39:21 +08:00 |
|
chenxi
|
34332c6af9
|
merge cdkey
|
2023-06-14 15:04:56 +08:00 |
|
chenxi
|
5934e03198
|
cdkey
|
2023-06-14 15:04:26 +08:00 |
|
Fang
|
98206fea34
|
Merge branch 'dev' into fang/dungeon
# Conflicts:
# lua/app/config/avatar.lua.meta
# lua/app/config/avatar_frame.lua.meta
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/avatar.lua.meta
# lua/app/config/strings/cn/avatar_frame.lua.meta
# lua/app/config/strings/cn/hero.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/avatar.lua.meta
# lua/app/config/strings/de/avatar_frame.lua.meta
# lua/app/config/strings/en/avatar.lua.meta
# lua/app/config/strings/en/avatar_frame.lua.meta
# lua/app/config/strings/fr/avatar.lua.meta
# lua/app/config/strings/fr/avatar_frame.lua.meta
# lua/app/config/strings/id/avatar.lua.meta
# lua/app/config/strings/id/avatar_frame.lua.meta
# lua/app/config/strings/ja/avatar.lua.meta
# lua/app/config/strings/ja/avatar_frame.lua.meta
# lua/app/config/strings/ko/avatar.lua.meta
# lua/app/config/strings/ko/avatar_frame.lua.meta
# lua/app/config/strings/pt/avatar.lua.meta
# lua/app/config/strings/pt/avatar_frame.lua.meta
# lua/app/config/strings/ru/avatar.lua.meta
# lua/app/config/strings/ru/avatar_frame.lua.meta
# lua/app/config/strings/th/avatar.lua.meta
# lua/app/config/strings/th/avatar_frame.lua.meta
# lua/app/config/strings/vi/avatar.lua.meta
# lua/app/config/strings/vi/avatar_frame.lua.meta
# lua/app/config/strings/zh/avatar.lua.meta
# lua/app/config/strings/zh/avatar_frame.lua.meta
|
2023-06-14 11:41:12 +08:00 |
|
Fang
|
ecb24214aa
|
fix
|
2023-06-14 11:38:50 +08:00 |
|
Fang
|
097812e730
|
fix
|
2023-06-14 10:22:34 +08:00 |
|
chenxi
|
8eed1c6a97
|
cdkey临时界面
|
2023-06-13 20:53:53 +08:00 |
|
xiekaidong
|
3c54f4e9c8
|
英雄升级特效
|
2023-06-13 18:49:55 +08:00 |
|
Fang
|
1d68846a85
|
ui细节调整
|
2023-06-13 18:44:47 +08:00 |
|
xiekaidong
|
e010700340
|
技能音效
|
2023-06-13 17:43:55 +08:00 |
|
Fang
|
a788b1cb8c
|
ui资源补充替换
|
2023-06-13 16:16:18 +08:00 |
|
xiekaidong
|
ee6a38b813
|
修改每日挑战战斗界面的任务入口
|
2023-06-13 15:24:48 +08:00 |
|
xiekaidong
|
81f68ec173
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-13 15:08:05 +08:00 |
|
xiekaidong
|
4846a97b75
|
grideffect=6的处理
|
2023-06-13 15:08:02 +08:00 |
|
chenxi
|
823dac78f8
|
金猪倒计时
|
2023-06-13 11:59:35 +08:00 |
|
chenxi
|
da49331705
|
Merge branch 'dev_shenhe' into dev_ios
|
2023-06-13 10:45:42 +08:00 |
|
chenxi
|
95fd46ed94
|
Merge branch 'dev_shenhe' into dev
|
2023-06-13 10:43:59 +08:00 |
|
chenxi
|
00ec7c553d
|
账号绑定的apple处理
|
2023-06-13 10:41:19 +08:00 |
|