chenxi
|
b9023a0a39
|
战令
|
2023-05-16 18:56:54 +08:00 |
|
chenxi
|
f7cd1c6094
|
战令
|
2023-05-16 18:17:05 +08:00 |
|
chenxi
|
dcc1d8377d
|
更新配置
|
2023-05-15 21:37:14 +08:00 |
|
chenxi
|
e15888698e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-15 21:32:16 +08:00 |
|
chenxi
|
32051d90c6
|
战令
|
2023-05-15 21:32:13 +08:00 |
|
xiekaidong
|
0bb8c242d0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-15 11:03:41 +08:00 |
|
xiekaidong
|
5140ca0824
|
锁定buff
|
2023-05-15 11:03:35 +08:00 |
|
chenxi
|
d1f4d67668
|
商城界面
|
2023-05-15 10:43:10 +08:00 |
|
chenxi
|
aa18b68b20
|
宝箱界面
|
2023-05-15 09:36:48 +08:00 |
|
chenxi
|
dc095e626b
|
配置
|
2023-05-12 21:08:50 +08:00 |
|
chenxi
|
7e26dee2d3
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-12 21:07:07 +08:00 |
|
chenxi
|
dfc705fbe8
|
商城
|
2023-05-12 21:07:05 +08:00 |
|
xiekaidong
|
fa0b4a354a
|
Merge branch 'battle' into dev
|
2023-05-12 20:29:39 +08:00 |
|
xiekaidong
|
2775d669ba
|
bug修复
|
2023-05-12 20:29:30 +08:00 |
|
xiekaidong
|
5f4b142a3f
|
锁定格子
|
2023-05-12 19:56:35 +08:00 |
|
xiekaidong
|
9bf1f41725
|
修改消除逻辑，方便以后扩展
|
2023-05-12 17:03:14 +08:00 |
|
chenxi
|
f26e58c31d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-12 15:32:57 +08:00 |
|
chenxi
|
6369eab7f6
|
战令
|
2023-05-12 15:32:53 +08:00 |
|
xiekaidong
|
673bfccc40
|
增加一个技能
|
2023-05-12 14:44:01 +08:00 |
|
chenxi
|
2a8dd6bbca
|
主城资源栏
|
2023-05-12 11:54:45 +08:00 |
|
xiekaidong
|
39a2eee61a
|
格子类型的一些配置改为配置表控制
|
2023-05-12 11:43:49 +08:00 |
|
chenxi
|
7005bd8c0f
|
帮助界面
|
2023-05-12 11:28:11 +08:00 |
|
chenxi
|
552e95f5f7
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-12 11:23:09 +08:00 |
|
chenxi
|
b5b1ad00e7
|
红点
|
2023-05-12 11:23:06 +08:00 |
|
xiekaidong
|
16ab6b1296
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-12 10:55:48 +08:00 |
|
xiekaidong
|
af3fc811ff
|
技能机制修改
|
2023-05-12 10:55:40 +08:00 |
|
chenxi
|
4306ab73ad
|
任务
|
2023-05-12 10:44:57 +08:00 |
|
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
|
4e95b11e21
|
任务
|
2023-05-11 21:29:27 +08:00 |
|
chenxi
|
479d0e4b39
|
刷新
|
2023-05-11 21:04:45 +08:00 |
|
xiekaidong
|
4bf948f670
|
表现修改一下
|
2023-05-11 20:14:59 +08:00 |
|
chenxi
|
09e3d41928
|
任务
|
2023-05-11 20:05:50 +08:00 |
|
xiekaidong
|
240517e04e
|
调整一下队伍死亡判定逻辑
|
2023-05-11 19:17:29 +08:00 |
|
xiekaidong
|
11d28008db
|
死亡召唤buff
|
2023-05-11 19:11:21 +08:00 |
|
chenxi
|
482e1a2127
|
任务
|
2023-05-11 18:20:10 +08:00 |
|
xiekaidong
|
7a7bde728e
|
消灭随机1种颜色的棋子并回血技能机制
|
2023-05-11 17:21:53 +08:00 |
|
xiekaidong
|
bea9daf0bc
|
随机消灭x行列空闲元素技能机制
|
2023-05-11 16:57:39 +08:00 |
|
xiekaidong
|
5f7cca6351
|
打乱棋盘的技能机制
|
2023-05-11 15:31:06 +08:00 |
|
xiekaidong
|
9d70b5b8b1
|
随机消除x个技能元素 的技能机制
|
2023-05-11 15:17:42 +08:00 |
|
xiekaidong
|
5fc337e78b
|
改变棋盘所有元素的技能机制
|
2023-05-11 14:31:24 +08:00 |
|
chenxi
|
760527284d
|
任务
|
2023-05-11 11:26:46 +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
|
f89e3f1256
|
调整战斗节奏顺序
|
2023-05-11 09:59:10 +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 |
|