78 Commits

Author SHA1 Message Date
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00
xiekaidong
a623c25f6f pvp战斗概念引入 2023-06-26 15:28:40 +08:00
xiekaidong
63cfbbca68 bug修复 2023-06-20 21:02:13 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
xiekaidong
027809a5bd 战斗支持血量换皮肤 2023-06-15 18:55:10 +08:00
xiekaidong
eb2872b7ee 修改bug,优化战斗流程逻辑 2023-06-03 19:11:19 +08:00
Fang
b57318f3a6 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-26 18:26:21 +08:00
xiekaidong
c89eb8ef3f 禁锢 2023-05-26 18:08:05 +08:00
xiekaidong
7fa2c93ad5 每日战斗战斗部分 2023-05-26 15:42:35 +08:00
xiekaidong
bff772a1de 技能刷新接入联网 2023-05-24 10:01:36 +08:00
xiekaidong
f3946e1424 boss入场动画 2023-05-22 20:29:25 +08:00
xiekaidong
20bf29490f 容错 2023-05-22 18:13:19 +08:00
xiekaidong
528ac6a89b 技能tips 2023-05-22 15:59:17 +08:00
xiekaidong
91cd324e44 神灯 2023-05-16 20:39:21 +08:00
xiekaidong
5140ca0824 锁定buff 2023-05-15 11:03:35 +08:00
xiekaidong
2775d669ba bug修复 2023-05-12 20:29:30 +08:00
xiekaidong
5f4b142a3f 锁定格子 2023-05-12 19:56:35 +08:00
xiekaidong
18c83cfa0c 联网 2023-05-08 11:02:42 +08:00
xiekaidong
c0fea24029 技能回收最多3个 2023-04-27 17:43:27 +08:00
chenxi
54174019ee 技能加速 2023-04-26 14:17:08 +08:00
xiekaidong
c30fe950b2 章节障碍物和棋盘地图 2023-04-25 18:38:49 +08:00
chenxi
391f7b7925 普攻次数 2023-04-24 17:37:31 +08:00
xiekaidong
a6489466e9 第二次刷新棋盘时,不下落空元素的bug修复 2023-04-24 09:46:42 +08:00
chenxi
984b4e2b50 伤害数字高度 2023-04-23 18:45:04 +08:00
xiekaidong
664b2b2590 bug和显示优化 2023-04-23 17:22:11 +08:00
chenxi
133625a519 技能 2023-04-23 10:34:30 +08:00
xiekaidong
c2bfaf937f 增加容错 2023-04-23 09:55:01 +08:00
chenxi
e4edcfcf69 被动技能 2023-04-22 00:05:49 +08:00
xiekaidong
e7c262c34b 死局随机棋盘 2023-04-21 23:16:41 +08:00
xiekaidong
a4951d9f89 bug修复 2023-04-21 21:45:03 +08:00
chenxi
2a9f4350b0 普攻改成数组 2023-04-21 17:11:59 +08:00
xiekaidong
a2e20a7c37 技能解锁 2023-04-20 21:26:35 +08:00
xiekaidong
06bc25c2d2 rogue技能显示修改 2023-04-20 15:17:14 +08:00
xiekaidong
a43068daf4 bug修复 2023-04-19 18:02:32 +08:00
chenxi
fa4e1ebd3c 战斗加速 2023-04-19 11:53:31 +08:00
chenxi
5328e6dc7c 战场经验 2023-04-19 11:02:51 +08:00
xiekaidong
bfb9f9834f 技能图标变形 2023-04-18 21:03:29 +08:00
xiekaidong
22b46a5129 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/userdata/battle/team/battle_unit_entity.lua
2023-04-18 19:52:35 +08:00
xiekaidong
0de7ceb3b3 切大波次 2023-04-18 19:52:15 +08:00
chenxi
281d220052 被动 2023-04-18 18:59:36 +08:00
chenxi
74cffb310d 援助技能 2023-04-17 22:10:29 +08:00
chenxi
602983faee 使用技能 2023-04-17 18:40:39 +08:00
xiekaidong
65f695030e 局内升级 2023-04-17 15:43:23 +08:00
chenxi
b311395f10 怪物技能 2023-04-16 22:59:00 +08:00
chenxi
fc44d4dc8f 切波次 2023-04-16 22:23:34 +08:00
xiekaidong
3b909a2a81 一些界面修改和接入关卡结算 2023-04-14 22:19:22 +08:00
xiekaidong
f48194bfd1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-14 17:59:15 +08:00
xiekaidong
642eb4d247 战斗回合概念 2023-04-14 17:59:12 +08:00
chenxi
0d7d3a5b72 merge 2023-04-14 15:55:14 +08:00
chenxi
7400f41cea 伤害工时 2023-04-14 15:54:51 +08:00