595 Commits

Author SHA1 Message Date
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
xiekaidong
5be91b491c 暂存 2023-06-12 15:21:26 +08:00
xiekaidong
47ee292697 更改近身攻击距离 2023-06-12 10:09:42 +08:00
xiekaidong
225fa8ad1f 每日挑战不显示每日buff信息 2023-06-12 09:46:51 +08:00
Fang
bf1e7b7885 活动副本 2023-06-09 18:46:22 +08:00
xiekaidong
cb8006c377 显示修复 2023-06-07 17:47:29 +08:00
xiekaidong
6cb971d493 战斗bi日志上报 2023-06-06 18:06:38 +08:00
xiekaidong
32df7d9516 修改上报 2023-06-06 15:25:21 +08:00
xiekaidong
0867e84815 切换波次时自动关闭buff弹窗 2023-06-06 14:12:50 +08:00
chenxi
7a83365fe2 只有战斗胜利才算完成任务 2023-06-06 11:10:29 +08:00
xiekaidong
c218e5a359 音效 2023-06-06 10:59:34 +08:00
xiekaidong
cc77a77193 消除显示优化 2023-06-05 20:51:50 +08:00
xiekaidong
0441e09d12 bug修复 2023-06-05 18:24:06 +08:00
xiekaidong
628da8aade 音效容错 2023-06-05 16:24:06 +08:00
xiekaidong
ba52482a95 技能选择规则优化 2023-06-05 10:46:18 +08:00
xiekaidong
5340ecd4b7 bug修复 2023-06-05 10:36:30 +08:00
xiekaidong
eb2872b7ee 修改bug,优化战斗流程逻辑 2023-06-03 19:11:19 +08:00
xiekaidong
c2ddb208b9 更改一下死亡召唤触发时机 2023-06-03 17:46:24 +08:00
xiekaidong
44ff406135 boss机制棋盘效果处理 2023-06-02 22:28:22 +08:00
xiekaidong
fd4b60dfd2 多段伤害音效 2023-06-02 20:22:54 +08:00
xiekaidong
1689436124 新增障碍物效果类型 2023-06-02 20:13:38 +08:00
xiekaidong
14f51d2900 水泡动画 2023-06-02 19:01:33 +08:00
xiekaidong
5a9558184b 火箭动画 2023-06-02 17:58:18 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
aaafadf812 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-02 15:15:13 +08:00
xiekaidong
dd86bf5283 战斗速度 2023-06-02 15:15:10 +08:00
chenxi
75a1352777 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 12:11:35 +08:00
chenxi
b609f796ba 只有主线关卡战斗结算显示金猪 2023-06-02 12:11:29 +08:00
xiekaidong
738a57f9f4 bug修复 2023-06-02 11:53:55 +08:00
xiekaidong
197fcb9518 过场动画 2023-06-02 11:07:23 +08:00
xiekaidong
09598b076b bug修复 2023-06-01 21:06:59 +08:00
xiekaidong
143f67c2f3 特效问题修复 2023-06-01 18:18:54 +08:00
xiekaidong
1198d7cd88 bug修复 2023-06-01 17:44:57 +08:00
xiekaidong
9a6c3966cb bug修复 2023-06-01 17:25:28 +08:00
xiekaidong
2bc46d2d30 优化战斗中的table 2023-06-01 16:29:01 +08:00
xiekaidong
ebb4a77f18 每日挑战bug修复 2023-05-31 21:13:35 +08:00