387 Commits

Author SHA1 Message Date
chenxi
f18e16103c 邮箱 2023-05-22 11:36:26 +08:00
chenxi
2f24834d5e 更新配置 2023-05-19 21:57:36 +08:00
xiekaidong
5309687502 果冻 2023-05-19 20:44:38 +08:00
chenxi
0ab51fcc07 购买体力和邮箱 2023-05-19 18:32:23 +08:00
xiekaidong
f6d5546d2b 战斗任务数据 2023-05-19 18:00:03 +08:00
xiekaidong
43dc8332f8 更新配置 2023-05-19 16:29:02 +08:00
chenxi
ece138f7e3 更新配置 2023-05-18 22:11:31 +08:00
chenxi
4e1f4c2dbb Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/hero.lua
#	lua/app/config/item.lua
#	lua/app/config/skill.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
2023-05-18 22:11:16 +08:00
chenxi
df51c37505 更新配置 2023-05-18 22:10:22 +08:00
xiekaidong
8225215773 导表 2023-05-18 22:10:04 +08:00
chenxi
b6da2f4bd6 挂机 2023-05-18 22:09:43 +08:00
chenxi
a1e98528ca 更新配置 2023-05-18 20:32:10 +08:00
chenxi
a783d2120c 挂机 2023-05-18 20:24:04 +08:00
xiekaidong
98070979dc 多段伤害 2023-05-18 10:58:49 +08:00
chenxi
8ebd69c6de Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-17 20:05:23 +08:00
chenxi
a1e56df4aa 更新配置 2023-05-17 20:05:18 +08:00
xiekaidong
5b4d00eca5 更新配置 2023-05-17 19:20:30 +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
ad0ab2b8ba 宝箱 2023-05-17 18:17:09 +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
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
f7cd1c6094 战令 2023-05-16 18:17:05 +08:00
chenxi
dcc1d8377d 更新配置 2023-05-15 21:37:14 +08:00
chenxi
32051d90c6 战令 2023-05-15 21:32:13 +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
chenxi
6369eab7f6 战令 2023-05-12 15:32:53 +08:00
xiekaidong
39a2eee61a 格子类型的一些配置改为配置表控制 2023-05-12 11:43:49 +08:00
xiekaidong
11d28008db 死亡召唤buff 2023-05-11 19:11:21 +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
e6ee7b0093 先手buff 2023-05-10 10:10:58 +08:00
xiekaidong
607d9d9d65 流血buff 2023-05-09 15:47:38 +08:00
xiekaidong
187a7ee6bd 灼烧、易伤、中毒、腐败、削弱、诅咒buff提交 2023-05-09 15:15:07 +08:00
chenxi
3c6a538338 设置 2023-05-08 21:10:41 +08:00
xiekaidong
518aabb829 buff叠加机制和然烧buff 2023-05-08 16:31:44 +08:00
xiekaidong
3cc17442b6 更新配置 2023-05-08 11:50:53 +08:00
chenxi
50a2ff4b9f 金猪 2023-05-05 14:59:02 +08:00
chenxi
92771ae95d 更新配置 2023-04-27 19:19:25 +08:00
chenxi
549e285299 修改配置 2023-04-27 19:08:14 +08:00
chenxi
e724a9e523 更新配置 2023-04-27 16:54:57 +08:00
chenxi
47a75078dc 更新配置 2023-04-26 22:32:08 +08:00
chenxi
a903fe2950 更新配置 2023-04-26 19:01:23 +08:00
xiekaidong
de21e5e1a8 界面调整和gm修改 2023-04-26 18:25:17 +08:00
chenxi
f1274720e8 更新配置 2023-04-26 14:17:54 +08:00