543 Commits

Author SHA1 Message Date
xiekaidong
c0c0c8f93e 优化章节礼包弹出逻辑 2023-07-13 16:52:38 +08:00
xiekaidong
061ac748ec 试玩 2023-07-12 09:43:49 +08:00
Fang
7de42dd068 碎片副本奖励展示优化 2023-07-11 14:53:19 +08:00
xiekaidong
61a23d81c9 Merge branch 'master' into dev_20230712 2023-07-11 11:05:47 +08:00
xiekaidong
0beaf804a9 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:11 +08:00
xiekaidong
1759c04305 修改战斗伤害公式 2023-07-10 16:07:32 +08:00
xiekaidong
460a60a34f 木兰试玩 2023-07-10 12:00:32 +08:00
xiekaidong
b9c9b4d0ce 审核模式不显示竞技场礼包 2023-07-07 14:13:12 +08:00
Fang
e580b332a9 添加头像、头像框道具解锁逻辑 2023-07-07 11:04:22 +08:00
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00
xiekaidong
0445086500 竞技场日志上报 2023-07-06 18:08:53 +08:00
Fang
47418bab2e 竞技场宝箱增加每日次数控制 2023-07-06 10:24:53 +08:00
Fang
ebaf680eeb 头像框解锁fix 2023-07-06 10:23:56 +08:00
xiekaidong
f13f1f3e3a 引导处理一下 2023-07-05 21:58:38 +08:00
xiekaidong
55a7ec4b82 战斗开始时更新英雄数据 2023-07-05 18:24:33 +08:00
xiekaidong
61b76292c9 英雄面板属性加密 2023-07-05 17:25:14 +08:00
xiekaidong
e7028105c8 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-05 17:05:20 +08:00
xiekaidong
e597b9f7be 战斗中属性加密 2023-07-05 17:05:17 +08:00
Fang
f24f8d5e75 显示修复 2023-07-05 15:55:44 +08:00
xiekaidong
9ae7f3d8a0 英雄红点 2023-07-05 11:45:41 +08:00
Fang
c07a54b828 竞技场fix 2023-07-05 10:51:13 +08:00
Fang
6099fe08fb fix 2023-07-04 18:29:05 +08:00
xiekaidong
045b774449 战斗速度 2023-07-04 18:24:33 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +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
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