228 Commits

Author SHA1 Message Date
chenxi
c44ce67f07 任务 2023-05-11 22:22:03 +08:00
chenxi
ff1b5d7ce8 战令解锁任务 2023-05-11 21:42:34 +08:00
chenxi
b1ca8106a9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/act_chapter_store.lua.meta
#	lua/app/config/act_gift.lua
#	lua/app/config/act_growup_gift.lua.meta
#	lua/app/config/act_level_fund.lua.meta
#	lua/app/config/act_sevenday_quest.lua
#	lua/app/config/act_sevenday_quest.lua.meta
#	lua/app/config/act_sevenday_quest_reward.lua.meta
#	lua/app/config/buff.lua
#	lua/app/config/player_exp.lua.meta
#	lua/app/config/strings/cn/task.lua.meta
#	lua/app/config/strings/de/task.lua.meta
#	lua/app/config/strings/en/task.lua.meta
#	lua/app/config/strings/fr/task.lua.meta
#	lua/app/config/strings/ja/task.lua.meta
#	lua/app/config/strings/ko/task.lua.meta
#	lua/app/config/strings/zh/task.lua.meta
2023-05-11 21:34:45 +08:00
chenxi
57bf9204c1 任务 2023-05-11 21:33:48 +08:00
chenxi
479d0e4b39 刷新 2023-05-11 21:04:45 +08:00
chenxi
09e3d41928 任务 2023-05-11 20:05:50 +08:00
xiekaidong
11d28008db 死亡召唤buff 2023-05-11 19:11:21 +08:00
chenxi
482e1a2127 任务 2023-05-11 18:20:10 +08:00
xiekaidong
d9bf3ee52b 修改影响棋盘的技能的逻辑 2023-05-11 11:22:46 +08:00
chenxi
dc81cffe85 任务 2023-05-11 11:22:11 +08:00
chenxi
124feb0b09 任务 2023-05-11 10:09:29 +08:00
xiekaidong
a864b53830 Merge branch 'dev' into battle_buff
# Conflicts:
#	lua/app/config/act_gift.lua
#	lua/app/config/act_gift.lua.meta
#	lua/app/config/bounty_level.lua.meta
#	lua/app/config/bounty_time.lua.meta
#	lua/app/config/buff.lua
#	lua/app/config/task.lua.meta
#	lua/app/config/task_daily.lua.meta
2023-05-10 21:11:51 +08:00
xiekaidong
9a9d4447ac 禁锢 2023-05-10 21:04:30 +08:00
xiekaidong
af0c61130d 冻结buff 2023-05-10 20:53:06 +08:00
xiekaidong
530ea14776 禁锢buff 2023-05-10 16:51:45 +08:00
xiekaidong
b7dda49394 主动技能伤害增加 2023-05-10 15:17:30 +08:00
xiekaidong
1c6ff387fc 反击 2023-05-10 11:53:44 +08:00
xiekaidong
e6ee7b0093 先手buff 2023-05-10 10:10:58 +08:00
xiekaidong
c9558d872e 反伤 2023-05-09 20:39:00 +08:00
xiekaidong
fd44822cd7 不死buff 2023-05-09 20:05:37 +08:00
xiekaidong
199ff4a7a2 bug修复 2023-05-09 19:40:47 +08:00
xiekaidong
1f911a21a7 昏睡buff 2023-05-09 16:49:27 +08:00
xiekaidong
607d9d9d65 流血buff 2023-05-09 15:47:38 +08:00
chenxi
8e590c242b 任务 2023-05-09 15:24:20 +08:00
xiekaidong
187a7ee6bd 灼烧、易伤、中毒、腐败、削弱、诅咒buff提交 2023-05-09 15:15:07 +08:00
chenxi
4b6ee24312 购买体力 2023-05-09 14:52:36 +08:00
chenxi
3c6a538338 设置 2023-05-08 21:10:41 +08:00
chenxi
8022de6c90 设置界面 2023-05-08 20:09:55 +08:00
xiekaidong
518aabb829 buff叠加机制和然烧buff 2023-05-08 16:31:44 +08:00
chenxi
022b6849cc 体力恢复 2023-05-08 16:04:46 +08:00
chenxi
73d6e174d5 章节宝箱bug 2023-05-08 15:55:14 +08:00
chenxi
eb1d1b9fbf 联网 2023-05-08 14:39:11 +08:00
chenxi
d0687f7d37 数据 2023-05-08 11:35:35 +08:00
xiekaidong
18c83cfa0c 联网 2023-05-08 11:02:42 +08:00
xiekaidong
cb0e613e47 Merge branch 'dev' into net 2023-05-08 09:48:06 +08:00
xiekaidong
55ec0dd76c 联网 2023-05-08 09:47:58 +08:00
xiekaidong
2c341db47c 关卡修改 2023-05-06 10:37:02 +08:00
chenxi
5e2644ee6e 主城 2023-05-05 22:03:42 +08:00
xiekaidong
8801943ae3 整理一下代码,接入联网 2023-05-05 18:27:33 +08:00
chenxi
0fe15f3ba1 金猪 2023-05-05 15:39:06 +08:00
chenxi
50a2ff4b9f 金猪 2023-05-05 14:59:02 +08:00
chenxi
be01873d54 金猪 2023-05-05 11:57:41 +08:00
chenxi
47cd13f4ad 一些系统代码 2023-05-05 10:32:50 +08:00
chenxi
e45900ee6f 删除不用的代码 2023-04-27 20:06:36 +08:00
xiekaidong
766e680d3b 日志上报修改 2023-04-27 18:05:17 +08:00
xiekaidong
c0fea24029 技能回收最多3个 2023-04-27 17:43:27 +08:00
xiekaidong
c01cc5c9db bug修复 2023-04-27 15:24:24 +08:00
xiekaidong
383c6ac0dc Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-27 14:23:25 +08:00
xiekaidong
331eb9d3bd bug修复 2023-04-27 14:23:22 +08:00
chenxi
fe39dbe13c 连击bug 2023-04-27 11:27:31 +08:00