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 |
|
xiekaidong
|
8259a5e787
|
调整格子效果生效顺序
|
2023-06-21 16:02:44 +08:00 |
|
xiekaidong
|
d46fdec70a
|
bug修复
|
2023-06-20 17:50:33 +08:00 |
|
xiekaidong
|
942f06485f
|
bug修复
|
2023-06-16 10:58:10 +08:00 |
|
xiekaidong
|
c11428b80b
|
bug修复
|
2023-06-15 17:52:22 +08:00 |
|
xiekaidong
|
3f23f976e3
|
bug修复
|
2023-06-14 19:05:15 +08:00 |
|
xiekaidong
|
e664f4ab0a
|
连携提示
|
2023-06-14 18:20:57 +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 |
|
xiekaidong
|
9b24d69fbd
|
交换一下战斗双方死亡的判定顺序
|
2023-06-14 10:41:34 +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
|
43826faab8
|
界面处理
|
2023-06-13 10:16:58 +08:00 |
|
xiekaidong
|
30bfbb5476
|
接入战斗
|
2023-06-12 18:49:59 +08:00 |
|
xiekaidong
|
e1c54ef97e
|
Merge branch 'dev' into fang/dungeon
|
2023-06-12 16:56:14 +08:00 |
|
xiekaidong
|
99694fc1d8
|
整合一下战斗任务参数
|
2023-06-12 16:25:11 +08:00 |
|
xiekaidong
|
1c46acc425
|
优化一版战斗结构
|
2023-06-12 15:30:00 +08:00 |
|
xiekaidong
|
5be91b491c
|
暂存
|
2023-06-12 15:21:26 +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
|
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
|
1689436124
|
新增障碍物效果类型
|
2023-06-02 20:13:38 +08:00 |
|
xiekaidong
|
5a9558184b
|
火箭动画
|
2023-06-02 17:58:18 +08:00 |
|
xiekaidong
|
eb1354f807
|
先更新一下格子
|
2023-06-02 16:54:16 +08:00 |
|
xiekaidong
|
dd86bf5283
|
战斗速度
|
2023-06-02 15:15:10 +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 |
|
xiekaidong
|
10bd5a422d
|
bug修复
|
2023-05-31 16:43:46 +08:00 |
|
xiekaidong
|
6f59974c33
|
优化代码
|
2023-05-30 15:41:23 +08:00 |
|
xiekaidong
|
71daac9cb7
|
表现优化
|
2023-05-30 15:06:33 +08:00 |
|
xiekaidong
|
122c0da462
|
buff描述
|
2023-05-30 14:15:42 +08:00 |
|
Fang
|
9b3a00e809
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
|
2023-05-30 10:35:05 +08:00 |
|
xiekaidong
|
8f1fd47fd2
|
战斗优化
|
2023-05-30 09:57:18 +08:00 |
|
Fang
|
3880dfd3d2
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# lua/app/common/module_manager.lua
# lua/app/config/buff_daily_challenge.lua
# lua/app/config/chapter.lua
# lua/app/config/hero.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/global.lua
|
2023-05-29 18:24:33 +08:00 |
|
xiekaidong
|
6f084d2c91
|
战斗死亡延迟
|
2023-05-29 09:45:36 +08:00 |
|
xiekaidong
|
2430e09f7e
|
bug修复
|
2023-05-26 20:03:33 +08:00 |
|
Fang
|
b57318f3a6
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
|
2023-05-26 18:26:21 +08:00 |
|