363 Commits

Author SHA1 Message Date
xiekaidong
13a137a6fd bug修复 2023-08-04 15:16:19 +08:00
xiekaidong
8266b13b9a 棋盘机制调整 2023-08-04 14:24:01 +08:00
xiekaidong
bcb336d344 不过修复 2023-08-03 16:09:58 +08:00
xiekaidong
4c8eff015e 显示bug修复 2023-08-03 09:47:21 +08:00
xiekaidong
24d90bfd1c 战斗血条优化 2023-08-02 20:34:25 +08:00
xiekaidong
62ee8bab01 木棍边缘障碍物 2023-08-02 18:07:44 +08:00
xiekaidong
e954484a13 技能机制优化 2023-08-01 17:35:58 +08:00
xiekaidong
caf1fd0af9 战斗续关 2023-07-31 16:22:05 +08:00
xiekaidong
78704c6e35 bug修复 2023-07-24 20:54:47 +08:00
xiekaidong
b8751b9229 支线副本 2023-07-20 19:44:41 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
xiekaidong
2ffd6e88ba 装备副本 2023-07-19 20:16:17 +08:00
xiekaidong
8ea47bc34f 战斗引导问题 2023-07-17 18:35:17 +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
21365f487e 显示问题修复 2023-07-05 14:25:27 +08:00
xiekaidong
9718eca3d7 竞技场任务 2023-07-05 10:15:33 +08:00
xiekaidong
c1592accae 敌方也显示combo 2023-07-04 21:04:50 +08:00
xiekaidong
d7cf21fde6 竞技场波次显示 2023-07-04 20:13:24 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +08:00
xiekaidong
9b738529fc 竞技场修改为自己先手 2023-07-03 09:46:39 +08:00
xiekaidong
a51ee6d872 竞技场战斗流程更改 2023-06-30 20:47:22 +08:00
xiekaidong
3f4f62903d bug修复 2023-06-30 17:54:07 +08:00
xiekaidong
84f1f27c3c 战斗处理 2023-06-30 16:03:51 +08:00
xiekaidong
e7c6c45f0d 战斗系数 2023-06-29 21:56:47 +08:00
xiekaidong
cae3580d2c 竞技场敌方自动战斗 2023-06-29 20:51:55 +08:00
xiekaidong
7f7707094d 竞技场战斗 2023-06-29 14:24:29 +08:00
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
3723335174 每日挑战任务完成情况上报 2023-06-15 17:30:08 +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
Fang
ecb24214aa fix 2023-06-14 11:38:50 +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
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