xiekaidong
|
b9c9b4d0ce
|
审核模式不显示竞技场礼包
|
2023-07-07 14:13:12 +08:00 |
|
xiekaidong
|
870a1e32d0
|
提审状态不显示竞技场战令
|
2023-07-07 14:06:01 +08:00 |
|
xiekaidong
|
a34edc2fd7
|
快捷切换多语言
|
2023-07-07 11:39:30 +08:00 |
|
Fang
|
b8155b97de
|
成长礼包触发方式修改
|
2023-07-06 18:17:37 +08:00 |
|
xiekaidong
|
7d8b58cef3
|
bug修复
|
2023-07-06 17:28:23 +08:00 |
|
Fang
|
dfb1967899
|
竞技场战令文案替换
|
2023-07-06 14:42:10 +08:00 |
|
Fang
|
c09f030e2a
|
竞技场战令容错处理
|
2023-07-06 10:23:56 +08:00 |
|
xiekaidong
|
d90bff1941
|
引导
|
2023-07-06 09:57:57 +08:00 |
|
Fang
|
73b3a451e9
|
修改头像框界面布局、竞技场赛季刷新fix等
|
2023-07-05 17:48:46 +08:00 |
|
xiekaidong
|
7c3f2cd890
|
竞技场开启引导
|
2023-07-05 15:45:28 +08:00 |
|
xiekaidong
|
cb34322f99
|
竞技场解锁动画
|
2023-07-05 15:33:39 +08:00 |
|
xiekaidong
|
9ae7f3d8a0
|
英雄红点
|
2023-07-05 11:45:41 +08:00 |
|
Fang
|
c07a54b828
|
竞技场fix
|
2023-07-05 10:51:13 +08:00 |
|
xiekaidong
|
faf1e2487d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-04 20:13:28 +08:00 |
|
xiekaidong
|
d7cf21fde6
|
竞技场波次显示
|
2023-07-04 20:13:24 +08:00 |
|
Fang
|
5c4cfdcf28
|
段位图标重叠fix
|
2023-07-04 18:50:18 +08:00 |
|
xiekaidong
|
ce97be9b65
|
Merge branch 'dev' into arena
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
# lua/app/module/battle/controller/battle_controller.lua
# lua/app/ui/main_city/main_city_ui.lua
|
2023-07-04 15:36:04 +08:00 |
|
Fang
|
5cd90eab7e
|
fix
|
2023-07-04 15:14:41 +08:00 |
|
xiekaidong
|
b445b12dff
|
客服系统红点
|
2023-07-04 10:41:10 +08:00 |
|
xiekaidong
|
a454faa670
|
Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
# lua/app/config/strings/cn/global.lua
|
2023-07-03 19:57:49 +08:00 |
|
xiekaidong
|
c976166cc9
|
竞技场弹窗礼包
|
2023-07-03 19:57:39 +08:00 |
|
Fang
|
c2843e5a88
|
完善细节
|
2023-07-03 18:34:51 +08:00 |
|
Fang
|
77b5452d00
|
动效添加
|
2023-07-03 17:16:30 +08:00 |
|
Fang
|
abe661f228
|
空名称处理
|
2023-07-03 14:16:03 +08:00 |
|
Fang
|
83f6a11b03
|
fix
|
2023-06-30 18:45:56 +08:00 |
|
Fang
|
9dc155e593
|
ui动画、结算界面逻辑
|
2023-06-30 16:50:50 +08:00 |
|
Fang
|
52a1631ad4
|
逻辑完善
|
2023-06-29 16:09:54 +08:00 |
|
CloudJ
|
73f1a4d299
|
成长礼包
|
2023-06-29 10:41:31 +08:00 |
|
Fang
|
10f3747396
|
处理新号报错
|
2023-06-29 10:03:42 +08:00 |
|
Fang
|
a522015156
|
逻辑补充
|
2023-06-28 18:36:53 +08:00 |
|
CloudJ
|
9b9bc72aa1
|
战令调整
|
2023-06-28 14:22:37 +08:00 |
|
CloudJ
|
519dc9822e
|
Merge branch 'arena' of git.juzugame.com:b6-client/b6-lua into arena
# Conflicts:
# lua/app/common/module_manager.lua
|
2023-06-28 09:38:58 +08:00 |
|
CloudJ
|
5cbcb29a4d
|
成长礼包
|
2023-06-28 09:38:29 +08:00 |
|
Fang
|
cd09e79bca
|
竞技场
|
2023-06-27 18:27:11 +08:00 |
|
CloudJ
|
b59a8d20d6
|
入门礼包
|
2023-06-27 17:24:32 +08:00 |
|
chenxi
|
fa7d250931
|
设置主城按钮的位置
|
2023-06-20 11:48:16 +08:00 |
|
Fang
|
6e3c2523a5
|
英雄编队拆分出来
|
2023-06-20 11:02:45 +08:00 |
|
xiekaidong
|
e7a0f46fcb
|
传参改一下
|
2023-06-19 15:14:56 +08:00 |
|
Fang
|
e5e12f9b0b
|
修改传参
|
2023-06-19 15:06:54 +08:00 |
|
Fang
|
cbec901af5
|
玩家头像抽象成独立cell
|
2023-06-19 14:58:15 +08:00 |
|
Fang
|
c2734a66fb
|
头像框显示fix
|
2023-06-19 14:38:39 +08:00 |
|
Fang
|
44c81c202d
|
副本入口显示fix
|
2023-06-19 14:17:13 +08:00 |
|
Fang
|
700c007d73
|
添加容错
|
2023-06-19 11:41:16 +08:00 |
|
Fang
|
f3924368ce
|
头像昵称功能
|
2023-06-19 10:57:39 +08:00 |
|
chenxi
|
c1b1d0748a
|
一些界面响应安卓返回键
|
2023-06-15 22:02:38 +08:00 |
|
Fang
|
a003b22ad4
|
副本刷新
|
2023-06-15 17:28:02 +08:00 |
|
xiekaidong
|
e8b6534d3b
|
副本开启引导触发
|
2023-06-15 15:32:27 +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
|
097812e730
|
fix
|
2023-06-14 10:22:34 +08:00 |
|
Fang
|
1d68846a85
|
ui细节调整
|
2023-06-13 18:44:47 +08:00 |
|