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 |
|
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
|
16c0fe7182
|
添加容错
|
2023-06-25 10:30:21 +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 |
|
Fang
|
98206fea34
|
Merge branch 'dev' into fang/dungeon
# Conflicts:
# lua/app/config/avatar.lua.meta
# lua/app/config/avatar_frame.lua.meta
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/avatar.lua.meta
# lua/app/config/strings/cn/avatar_frame.lua.meta
# lua/app/config/strings/cn/hero.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/avatar.lua.meta
# lua/app/config/strings/de/avatar_frame.lua.meta
# lua/app/config/strings/en/avatar.lua.meta
# lua/app/config/strings/en/avatar_frame.lua.meta
# lua/app/config/strings/fr/avatar.lua.meta
# lua/app/config/strings/fr/avatar_frame.lua.meta
# lua/app/config/strings/id/avatar.lua.meta
# lua/app/config/strings/id/avatar_frame.lua.meta
# lua/app/config/strings/ja/avatar.lua.meta
# lua/app/config/strings/ja/avatar_frame.lua.meta
# lua/app/config/strings/ko/avatar.lua.meta
# lua/app/config/strings/ko/avatar_frame.lua.meta
# lua/app/config/strings/pt/avatar.lua.meta
# lua/app/config/strings/pt/avatar_frame.lua.meta
# lua/app/config/strings/ru/avatar.lua.meta
# lua/app/config/strings/ru/avatar_frame.lua.meta
# lua/app/config/strings/th/avatar.lua.meta
# lua/app/config/strings/th/avatar_frame.lua.meta
# lua/app/config/strings/vi/avatar.lua.meta
# lua/app/config/strings/vi/avatar_frame.lua.meta
# lua/app/config/strings/zh/avatar.lua.meta
# lua/app/config/strings/zh/avatar_frame.lua.meta
|
2023-06-14 11:41:12 +08:00 |
|
Fang
|
ecb24214aa
|
fix
|
2023-06-14 11:38:50 +08:00 |
|
xiekaidong
|
9b24d69fbd
|
交换一下战斗双方死亡的判定顺序
|
2023-06-14 10:41:34 +08:00 |
|
xiekaidong
|
6cf247d86d
|
对手先手期间，英雄不会播放死亡动作bug修复
|
2023-06-14 10:03:21 +08:00 |
|
xiekaidong
|
e010700340
|
技能音效
|
2023-06-13 17:43:55 +08:00 |
|
xiekaidong
|
4846a97b75
|
grideffect=6的处理
|
2023-06-13 15:08:02 +08:00 |
|
xiekaidong
|
ad7212ff13
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:06 +08:00 |
|
xiekaidong
|
90bd77a4b7
|
显示调整
|
2023-06-13 10:36:44 +08:00 |
|
xiekaidong
|
43826faab8
|
界面处理
|
2023-06-13 10:16:58 +08:00 |
|
xiekaidong
|
5def9aed8a
|
战斗
|
2023-06-12 18:54:27 +08:00 |
|
xiekaidong
|
30bfbb5476
|
接入战斗
|
2023-06-12 18:49:59 +08:00 |
|
xiekaidong
|
59289536d1
|
副本战斗
|
2023-06-12 17:58:40 +08:00 |
|
xiekaidong
|
e1c54ef97e
|
Merge branch 'dev' into fang/dungeon
|
2023-06-12 16:56:14 +08:00 |
|
xiekaidong
|
87fe40ed94
|
金币副本
|
2023-06-12 16:46:55 +08:00 |
|
xiekaidong
|
99694fc1d8
|
整合一下战斗任务参数
|
2023-06-12 16:25:11 +08:00 |
|
xiekaidong
|
f07822161f
|
战斗
|
2023-06-12 16:05:58 +08:00 |
|
xiekaidong
|
ee826d12c8
|
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-lua into fang/dungeon
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/config/monster_dungeon_gold.lua
# lua/app/config/monster_dungeon_gold.lua.meta
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/module/dungeon/dungeon_manager.lua
# lua/app/ui/dungeon/dungeon_board_cell.lua
# lua/app/ui/dungeon/dungeon_difficulty_ui.lua
# lua/app/ui/main_city/component/dungeon_comp.lua
# lua/app/ui/main_city/main_city_ui.lua
# lua/app/userdata/dungeon/dungeon_data.lua
# lua/app/userdata/dungeon/dungeon_data_base_comp.lua
# lua/app/userdata/dungeon/dungeon_gold_data_comp.lua
# lua/app/userdata/dungeon/dungeon_shards_data_comp.lua
|
2023-06-12 15:43:30 +08:00 |
|
Fang
|
e4dad61f52
|
活动副本
|
2023-06-12 15:39:52 +08:00 |
|
xiekaidong
|
7a0efdbe09
|
逻辑处理
|
2023-06-12 15:38:32 +08:00 |
|
xiekaidong
|
1c46acc425
|
优化一版战斗结构
|
2023-06-12 15:30:00 +08:00 |
|