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
|
a7aa915569
|
中途退出不重置对手
|
2023-07-04 15:24:12 +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 |
|
CloudJ
|
4a04a6a32a
|
竞技场战令替换
|
2023-07-03 10:28:47 +08:00 |
|
xiekaidong
|
dc669243e0
|
英雄红点优化
|
2023-07-03 10:06:09 +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 |
|
xiekaidong
|
7f7707094d
|
竞技场战斗
|
2023-06-29 14:24:29 +08:00 |
|
xiekaidong
|
8bc3bdba34
|
报错修复
|
2023-06-29 10:12:33 +08:00 |
|
xiekaidong
|
c259b2ed58
|
Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
# lua/app/module/battle/battle_const.lua
|
2023-06-28 21:25:19 +08:00 |
|
xiekaidong
|
d4d92cf97d
|
pvp战斗和整合pve战斗
|
2023-06-28 21:24:15 +08:00 |
|
Fang
|
a522015156
|
逻辑补充
|
2023-06-28 18:36:53 +08:00 |
|
CloudJ
|
8246f19b27
|
战令弹窗时间记录
|
2023-06-28 14:24:21 +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
|
b88c471ce0
|
Merge branch 'dev' into arena
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-06-27 17:25:42 +08:00 |
|
CloudJ
|
b59a8d20d6
|
入门礼包
|
2023-06-27 17:24:32 +08:00 |
|
xiekaidong
|
f17eeb8e68
|
Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
|
2023-06-26 15:28:43 +08:00 |
|
xiekaidong
|
a623c25f6f
|
pvp战斗概念引入
|
2023-06-26 15:28:40 +08:00 |
|
CloudJ
|
fdc773df09
|
竞技场战令
|
2023-06-26 11:26:28 +08:00 |
|
Fang
|
54242318ed
|
审核处理
|
2023-06-21 21:20:35 +08:00 |
|
xiekaidong
|
839be62398
|
增加容错
|
2023-06-20 21:55:39 +08:00 |
|
xiekaidong
|
63cfbbca68
|
bug修复
|
2023-06-20 21:02:13 +08:00 |
|
Fang
|
364cec49b5
|
添加头像背景品质
|
2023-06-20 14:22:55 +08:00 |
|
Fang
|
ab4fbf3067
|
添加重命名与当前昵称相同提示
|
2023-06-19 16:25:18 +08:00 |
|
Fang
|
45e6b4d856
|
跨天关闭副本关卡选择界面
|
2023-06-19 15:58:51 +08:00 |
|
xiekaidong
|
c440197d57
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-19 11:55:16 +08:00 |
|
xiekaidong
|
f1b4a21ae6
|
免控
|
2023-06-19 11:55:10 +08:00 |
|
Fang
|
700c007d73
|
添加容错
|
2023-06-19 11:41:16 +08:00 |
|
Fang
|
f3924368ce
|
头像昵称功能
|
2023-06-19 10:57:39 +08:00 |
|
xiekaidong
|
aa5f557c75
|
怪物经验可配置根据血量的分段经验
|
2023-06-16 18:42:41 +08:00 |
|
xiekaidong
|
7dae3a6ab5
|
火蛇海蛇效果
|
2023-06-16 15:13:38 +08:00 |
|
xiekaidong
|
82d6a78a6a
|
bug修复
|
2023-06-16 11:48:57 +08:00 |
|
xiekaidong
|
2f8ba2991c
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-15 18:55:13 +08:00 |
|
xiekaidong
|
027809a5bd
|
战斗支持血量换皮肤
|
2023-06-15 18:55:10 +08:00 |
|
chenxi
|
b48bb85c5f
|
上报字段统一一下
|
2023-06-15 18:46:32 +08:00 |
|
chenxi
|
e97edc01df
|
战令等级bug
|
2023-06-15 16:57:32 +08:00 |
|
Fang
|
da6e53abfe
|
修改副本显示顺序、碎片副本奖励逻辑
|
2023-06-15 16:08:37 +08:00 |
|
xiekaidong
|
4cce3bb36b
|
buff显示修改
|
2023-06-15 14:17:48 +08:00 |
|
Fang
|
193ea8902f
|
金币副本新增boss抗性
|
2023-06-15 10:46:36 +08:00 |
|
chenxi
|
9666158491
|
adjust上报
|
2023-06-14 21:43:02 +08:00 |
|