317 Commits

Author SHA1 Message Date
chenxi
a78be93bc1 宝箱tips 2023-05-19 16:36:59 +08:00
chenxi
680992e0b6 挂机表现 2023-05-19 15:10:44 +08:00
chenxi
e55fdab3dd 快速挂机界面 2023-05-19 14:56:50 +08:00
chenxi
49002c4407 挂机表现 2023-05-19 14:49:27 +08:00
chenxi
b6da2f4bd6 挂机 2023-05-18 22:09:43 +08:00
chenxi
a783d2120c 挂机 2023-05-18 20:24:04 +08:00
chenxi
3cb5152538 挂机 2023-05-18 15:39:44 +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
3059cf0689 描述 2023-05-17 19:17:12 +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
8c2d9c26bb 多语言 2023-05-17 16:26:33 +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
2430f90295 适配 2023-05-16 22:04:17 +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
22d9bb9b3d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-16 21:22:55 +08:00
xiekaidong
97e5506ab2 神灯障碍物 2023-05-16 21:22:52 +08:00
xiekaidong
91cd324e44 神灯 2023-05-16 20:39:21 +08:00
chenxi
2b64929a70 弹窗调整 2023-05-16 19:41:14 +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
32051d90c6 战令 2023-05-15 21:32:13 +08:00
chenxi
d1f4d67668 商城界面 2023-05-15 10:43:10 +08:00
chenxi
aa18b68b20 宝箱界面 2023-05-15 09:36:48 +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
chenxi
6369eab7f6 战令 2023-05-12 15:32:53 +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
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
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
4e95b11e21 任务 2023-05-11 21:29:27 +08:00
xiekaidong
4bf948f670 表现修改一下 2023-05-11 20:14:59 +08:00
chenxi
482e1a2127 任务 2023-05-11 18:20:10 +08:00
xiekaidong
9d70b5b8b1 随机消除x个技能元素 的技能机制 2023-05-11 15:17:42 +08:00