500 Commits

Author SHA1 Message Date
xiekaidong
0445086500 竞技场日志上报 2023-07-06 18:08:53 +08:00
xiekaidong
8ee590a831 bug修复 2023-07-06 17:41:58 +08:00
xiekaidong
994e93468c 引导延迟 2023-07-06 14:43:48 +08:00
xiekaidong
e597b9f7be 战斗中属性加密 2023-07-05 17:05:17 +08:00
xiekaidong
21365f487e 显示问题修复 2023-07-05 14:25:27 +08:00
xiekaidong
afd2c11ef1 连击提示 2023-07-05 11:22:46 +08:00
xiekaidong
9718eca3d7 竞技场任务 2023-07-05 10:15:33 +08:00
xiekaidong
c1592accae 敌方也显示combo 2023-07-04 21:04:50 +08:00
xiekaidong
d030ee5988 bug修复 2023-07-04 20:21:23 +08:00
xiekaidong
d7cf21fde6 竞技场波次显示 2023-07-04 20:13:24 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +08:00
xiekaidong
87cacec30c 竞技场暂停界面 2023-07-04 15:03:37 +08:00
xiekaidong
9b738529fc 竞技场修改为自己先手 2023-07-03 09:46:39 +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
e7c6c45f0d 战斗系数 2023-06-29 21:56:47 +08:00
xiekaidong
1035873eef 战斗bug修复 2023-06-29 21:25:14 +08:00
xiekaidong
cae3580d2c 竞技场敌方自动战斗 2023-06-29 20:51:55 +08:00
xiekaidong
98d46965f9 界面调整 2023-06-29 15:22:42 +08:00
xiekaidong
7f7707094d 竞技场战斗 2023-06-29 14:24:29 +08:00
xiekaidong
c391fb0fbc bug修复 2023-06-29 10:29:46 +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
cd09e79bca 竞技场 2023-06-27 18:27:11 +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
xiekaidong
eb7d04a5dc 修改格子计算方式 2023-06-26 11:13:13 +08:00
xiekaidong
8259a5e787 调整格子效果生效顺序 2023-06-21 16:02:44 +08:00
xiekaidong
d46fdec70a bug修复 2023-06-20 17:50:33 +08:00
xiekaidong
d9a6ccc527 bug修复 2023-06-20 16:28:51 +08:00
xiekaidong
5de785f28e bug修复 2023-06-20 11:35:23 +08:00
xiekaidong
f1b4a21ae6 免控 2023-06-19 11:55:10 +08:00
xiekaidong
9a620ae064 bug修复 2023-06-19 10:13:05 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
xiekaidong
7dae3a6ab5 火蛇海蛇效果 2023-06-16 15:13:38 +08:00
xiekaidong
7b8da9c782 bug修复 2023-06-16 14:29:55 +08:00
xiekaidong
942f06485f bug修复 2023-06-16 10:58:10 +08:00
xiekaidong
027809a5bd 战斗支持血量换皮肤 2023-06-15 18:55:10 +08:00
xiekaidong
c11428b80b bug修复 2023-06-15 17:52:22 +08:00
xiekaidong
3723335174 每日挑战任务完成情况上报 2023-06-15 17:30:08 +08:00
xiekaidong
4cce3bb36b buff显示修改 2023-06-15 14:17:48 +08:00
xiekaidong
3f23f976e3 bug修复 2023-06-14 19:05:15 +08:00
xiekaidong
5214dd8136 伤害数字重叠问题 2023-06-14 18:35:20 +08:00
xiekaidong
e664f4ab0a 连携提示 2023-06-14 18:20:57 +08:00
xiekaidong
918146dda0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-14 15:34:25 +08:00
xiekaidong
e3b8eaa04c 显示buff 2023-06-14 15:34:21 +08:00