35 Commits

Author SHA1 Message Date
puxuan
9c5492c5b5 竞技场取消 2025-11-07 16:11:54 +08:00
puxuan
0736e58c5f 主界面图标 2025-09-28 16:09:37 +08:00
puxuan
e5e23cc06c fix bug 2025-09-15 11:41:23 +08:00
kai
f47437d866 竞技场 2025-06-29 16:15:56 +08:00
Fang
327cffeb56 竞技场锦标赛 2023-09-28 10:23:25 +08:00
Fang
77191e5707 竞技场结算时同步当前积分 2023-09-15 17:37:56 +08:00
Fang
f15917914c 竞技场段位奖励 2023-08-23 14:40:52 +08:00
xiekaidong
c515a8be09 战斗任务统计 2023-08-15 12:15:21 +08:00
Fang
34282dc81b 竞技场宝箱弹出规则优化、bugfix 2023-08-11 15:37:26 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
xiekaidong
42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua
2023-08-08 15:58:56 +08:00
xiekaidong
1620d69548 英雄竞技场段位解锁 2023-08-03 18:07:24 +08:00
xiekaidong
a47f18db07 日志上报 2023-08-03 14:20:16 +08:00
xiekaidong
b1df62d3a4 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:15:46 +08:00
xiekaidong
0beaf804a9 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:11 +08:00
Fang
b16f75f42e 竞技场挑战前判断阵容、超框 2023-07-07 11:54:27 +08:00
Fang
34dfc5edb2 fix 2023-07-06 18:30:17 +08:00
xiekaidong
0445086500 竞技场日志上报 2023-07-06 18:08:53 +08:00
Fang
9a7b8d316d 竞技场bi上报 2023-07-06 11:59:28 +08:00
Fang
73b3a451e9 修改头像框界面布局、竞技场赛季刷新fix等 2023-07-05 17:48:46 +08:00
Fang
68f80b45d3 竞技场ad宝箱功能补全 2023-07-05 15:02:59 +08:00
xiekaidong
9718eca3d7 竞技场任务 2023-07-05 10:15:33 +08:00
Fang
6099fe08fb fix 2023-07-04 18:29:05 +08:00
Fang
a7aa915569 中途退出不重置对手 2023-07-04 15:24:12 +08:00
Fang
5cd90eab7e fix 2023-07-04 15:14:41 +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
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
626c9b94f1 提交 2023-06-28 21:25:54 +08:00
Fang
a522015156 逻辑补充 2023-06-28 18:36:53 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00