xiekaidong
|
d68d2257fe
|
Merge branch 'dev_20230725' into dungeon
|
2023-07-20 21:47:21 +08:00 |
|
xiekaidong
|
cd41579159
|
支线副本
|
2023-07-20 21:46:49 +08:00 |
|
Fang
|
015de6fc70
|
英雄升级显示、战斗报错fix
|
2023-07-20 21:23:02 +08:00 |
|
xiekaidong
|
100e125c19
|
Merge branch 'dev_20230725' into dungeon
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/module_manager.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
|
2023-07-20 19:45:54 +08:00 |
|
xiekaidong
|
b8751b9229
|
支线副本
|
2023-07-20 19:44:41 +08:00 |
|
xiekaidong
|
8b4933f4f0
|
支线副本
|
2023-07-20 17:41:42 +08:00 |
|
Fang
|
cc7feea039
|
review
|
2023-07-20 16:20:11 +08:00 |
|
xiekaidong
|
2ffd6e88ba
|
装备副本
|
2023-07-19 20:16:17 +08:00 |
|
xiekaidong
|
000bc5e926
|
武器副本的一些界面
|
2023-07-19 16:52:28 +08:00 |
|
xiekaidong
|
3ed70b6c87
|
Merge branch 'master' into dev_20230725
|
2023-07-18 09:33:07 +08:00 |
|
xiekaidong
|
8ea47bc34f
|
战斗引导问题
|
2023-07-17 18:35:17 +08:00 |
|
xiekaidong
|
85f016086d
|
层数buff完善
|
2023-07-17 14:46:02 +08:00 |
|
xiekaidong
|
de16d711ec
|
层数护盾
|
2023-07-17 14:28:55 +08:00 |
|
chenxi
|
6848735fd9
|
merge master
|
2023-07-14 17:06:39 +08:00 |
|
xiekaidong
|
b1dd325b05
|
伤害公式
|
2023-07-13 18:18:22 +08:00 |
|
xiekaidong
|
90711c7e2a
|
英雄属性增加，以及战斗伤害治疗公式修改
|
2023-07-13 18:02:46 +08:00 |
|
xiekaidong
|
99a26d953d
|
侧边栏增加前往优惠商城的按钮，修改战斗内技能链接显示bug
|
2023-07-13 15:52:18 +08:00 |
|
xiekaidong
|
b1561991c6
|
更新配置
|
2023-07-10 18:30:30 +08:00 |
|
xiekaidong
|
1759c04305
|
修改战斗伤害公式
|
2023-07-10 16:07:32 +08:00 |
|
xiekaidong
|
da664585a0
|
Merge branch 'master' into dev
# Conflicts:
# lua/app/module/battle/controller/battle_controller.lua
|
2023-07-07 17:17:01 +08:00 |
|
xiekaidong
|
28b9d2bc7f
|
bug修复
|
2023-07-06 18:43:02 +08:00 |
|
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
|
6408b6c028
|
每日挑战bug修复
|
2023-06-29 17:13:25 +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 |
|