267 Commits

Author SHA1 Message Date
xiekaidong
8e17ed9850 技能显示bug修复 2023-07-07 18:00:02 +08:00
xiekaidong
b6171cef38 竞技场暂停界面可滑动 2023-07-07 11:43:53 +08:00
Fang
e580b332a9 添加头像、头像框道具解锁逻辑 2023-07-07 11:04:22 +08:00
xiekaidong
8ee590a831 bug修复 2023-07-06 17:41:58 +08:00
Fang
47418bab2e 竞技场宝箱增加每日次数控制 2023-07-06 10:24:53 +08:00
xiekaidong
0162bce262 显示 2023-07-05 18:35:58 +08:00
xiekaidong
c9b32741cb Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-05 17:55:03 +08:00
xiekaidong
7abf7a253b bug修复 2023-07-05 17:54:59 +08:00
Fang
73b3a451e9 修改头像框界面布局、竞技场赛季刷新fix等 2023-07-05 17:48:46 +08:00
Fang
f24f8d5e75 显示修复 2023-07-05 15:55:44 +08:00
Fang
68f80b45d3 竞技场ad宝箱功能补全 2023-07-05 15:02:59 +08:00
xiekaidong
c2622e3013 bug修复 2023-07-05 14:44:48 +08:00
xiekaidong
21365f487e 显示问题修复 2023-07-05 14:25:27 +08:00
xiekaidong
6209b4be52 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-05 11:22:49 +08:00
xiekaidong
afd2c11ef1 连击提示 2023-07-05 11:22:46 +08:00
Fang
bb12bdd100 添加段位变化特效 2023-07-05 11:14:37 +08:00
Fang
c07a54b828 竞技场fix 2023-07-05 10:51:13 +08:00
xiekaidong
d4237d18b9 适配 2023-07-05 10:42:28 +08:00
xiekaidong
9718eca3d7 竞技场任务 2023-07-05 10:15:33 +08:00
xiekaidong
c1592accae 敌方也显示combo 2023-07-04 21:04:50 +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
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
Fang
5cd90eab7e fix 2023-07-04 15:14:41 +08:00
xiekaidong
6b60a73944 竞技场主动退出判负 2023-07-04 15:12:33 +08:00
xiekaidong
87cacec30c 竞技场暂停界面 2023-07-04 15:03:37 +08:00
xiekaidong
2d9c5b02b8 Merge branch 'new_arena' into arena 2023-07-04 10:44:09 +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
xiekaidong
f672783ab5 节奏调整 2023-06-30 20:54:17 +08:00
xiekaidong
4aa36c0122 Merge branch 'arena' into new_arena 2023-06-30 20:49:21 +08:00
xiekaidong
a51ee6d872 竞技场战斗流程更改 2023-06-30 20:47:22 +08:00
Fang
83f6a11b03 fix 2023-06-30 18:45:56 +08:00
xiekaidong
3f4f62903d bug修复 2023-06-30 17:54:07 +08:00
Fang
9dc155e593 ui动画、结算界面逻辑 2023-06-30 16:50:50 +08:00
xiekaidong
84f1f27c3c 战斗处理 2023-06-30 16:03:51 +08:00
xiekaidong
2ad12c4b46 竞技场节奏调整 2023-06-30 14:45:30 +08:00
xiekaidong
1035873eef 战斗bug修复 2023-06-29 21:25:14 +08:00
xiekaidong
36526bcd5e 战斗调整 2023-06-29 21:14:24 +08:00
xiekaidong
cae3580d2c 竞技场敌方自动战斗 2023-06-29 20:51:55 +08:00
Fang
52a1631ad4 逻辑完善 2023-06-29 16:09:54 +08:00
xiekaidong
98d46965f9 界面调整 2023-06-29 15:22:42 +08:00
xiekaidong
7f7707094d 竞技场战斗 2023-06-29 14:24:29 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +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