xiekaidong
|
6596d89003
|
Merge branch 'dev' into battle
|
2023-05-18 20:31:32 +08:00 |
|
chenxi
|
a783d2120c
|
挂机
|
2023-05-18 20:24:04 +08:00 |
|
chenxi
|
88631429fe
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-18 15:39:47 +08:00 |
|
chenxi
|
3cb5152538
|
挂机
|
2023-05-18 15:39:44 +08:00 |
|
xiekaidong
|
170ddb3066
|
技能效果生效条件判定
|
2023-05-18 15:34:17 +08:00 |
|
xiekaidong
|
f431d97537
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-18 10:58:52 +08:00 |
|
xiekaidong
|
98070979dc
|
多段伤害
|
2023-05-18 10:58:49 +08:00 |
|
chenxi
|
0289de2d9a
|
merge
|
2023-05-17 22:28:26 +08:00 |
|
chenxi
|
84be3f721b
|
挂机
|
2023-05-17 22:27:58 +08:00 |
|
xiekaidong
|
d7bee9480c
|
宝箱显示
|
2023-05-17 20:17:56 +08:00 |
|
xiekaidong
|
15cc2bd437
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/chapter_board.lua
# lua/app/config/mail.lua.meta
# lua/app/config/strings/cn/mail.lua.meta
# lua/app/config/strings/de/mail.lua.meta
# lua/app/config/strings/en/mail.lua.meta
# lua/app/config/strings/fr/mail.lua.meta
# lua/app/config/strings/ja/mail.lua.meta
# lua/app/config/strings/ko/mail.lua.meta
# lua/app/config/strings/zh/mail.lua.meta
|
2023-05-17 19:19:35 +08:00 |
|
xiekaidong
|
2023930d62
|
宝箱
|
2023-05-17 19:19:24 +08:00 |
|
chenxi
|
0c775e8215
|
卡牌tips
|
2023-05-17 19:05:29 +08:00 |
|
xiekaidong
|
ad0ab2b8ba
|
宝箱
|
2023-05-17 18:17:09 +08:00 |
|
chenxi
|
b5541f30b6
|
任务
|
2023-05-17 17:26:35 +08:00 |
|
chenxi
|
74c514f7fe
|
战令购买提示
|
2023-05-17 15:00:29 +08:00 |
|
chenxi
|
6e33313f69
|
购买战令界面
|
2023-05-17 14:40:54 +08:00 |
|
chenxi
|
e07eb6a961
|
战令定位
|
2023-05-17 11:14:07 +08:00 |
|
chenxi
|
4a162302ff
|
主城战令显示
|
2023-05-16 22:39:23 +08:00 |
|
chenxi
|
88030484d8
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-16 22:02:45 +08:00 |
|
chenxi
|
f4724ca434
|
战令重复奖励
|
2023-05-16 22:02:42 +08:00 |
|
xiekaidong
|
91cd324e44
|
神灯
|
2023-05-16 20:39:21 +08:00 |
|
xiekaidong
|
e23a631a7d
|
Merge branch 'battle' into dev
# Conflicts:
# lua/app/config/grid_type.lua
# lua/app/config/hero.lua
|
2023-05-16 19:13:37 +08:00 |
|
xiekaidong
|
4605282d53
|
障碍物
|
2023-05-16 19:13:08 +08:00 |
|
chenxi
|
b9023a0a39
|
战令
|
2023-05-16 18:56:54 +08:00 |
|
chenxi
|
f7cd1c6094
|
战令
|
2023-05-16 18:17:05 +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
|
5140ca0824
|
锁定buff
|
2023-05-15 11:03:35 +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
|
6369eab7f6
|
战令
|
2023-05-12 15:32:53 +08:00 |
|
xiekaidong
|
39a2eee61a
|
格子类型的一些配置改为配置表控制
|
2023-05-12 11:43:49 +08:00 |
|
chenxi
|
b5b1ad00e7
|
红点
|
2023-05-12 11:23:06 +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
|
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 |
|