60 Commits

Author SHA1 Message Date
xiekaidong
b75fe6b754 更新配置 2023-06-20 21:03:20 +08:00
chenxi
594a6cced5 更新配置 2023-06-20 19:58:07 +08:00
xiekaidong
749de33dae 更新配置 2023-06-20 15:29:34 +08:00
chenxi
6f33fc030a 更新配置 2023-06-20 14:43:14 +08:00
Fang
b45ee34f5f 导表 2023-06-20 11:44:21 +08:00
Fang
ab4fbf3067 添加重命名与当前昵称相同提示 2023-06-19 16:25:18 +08:00
chenxi
8032ca378d 更新配置 2023-06-16 21:34:30 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
chenxi
e402550d92 更新配置 2023-06-16 12:05:32 +08:00
xiekaidong
c1fb666388 更新配置 2023-06-16 10:09:20 +08:00
xiekaidong
47d8b479f9 连携提示 2023-06-14 18:21:42 +08:00
Fang
98206fea34 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	lua/app/config/avatar.lua.meta
#	lua/app/config/avatar_frame.lua.meta
#	lua/app/config/skill.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/avatar.lua.meta
#	lua/app/config/strings/cn/avatar_frame.lua.meta
#	lua/app/config/strings/cn/hero.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/avatar.lua.meta
#	lua/app/config/strings/de/avatar_frame.lua.meta
#	lua/app/config/strings/en/avatar.lua.meta
#	lua/app/config/strings/en/avatar_frame.lua.meta
#	lua/app/config/strings/fr/avatar.lua.meta
#	lua/app/config/strings/fr/avatar_frame.lua.meta
#	lua/app/config/strings/id/avatar.lua.meta
#	lua/app/config/strings/id/avatar_frame.lua.meta
#	lua/app/config/strings/ja/avatar.lua.meta
#	lua/app/config/strings/ja/avatar_frame.lua.meta
#	lua/app/config/strings/ko/avatar.lua.meta
#	lua/app/config/strings/ko/avatar_frame.lua.meta
#	lua/app/config/strings/pt/avatar.lua.meta
#	lua/app/config/strings/pt/avatar_frame.lua.meta
#	lua/app/config/strings/ru/avatar.lua.meta
#	lua/app/config/strings/ru/avatar_frame.lua.meta
#	lua/app/config/strings/th/avatar.lua.meta
#	lua/app/config/strings/th/avatar_frame.lua.meta
#	lua/app/config/strings/vi/avatar.lua.meta
#	lua/app/config/strings/vi/avatar_frame.lua.meta
#	lua/app/config/strings/zh/avatar.lua.meta
#	lua/app/config/strings/zh/avatar_frame.lua.meta
2023-06-14 11:41:12 +08:00
Fang
a788b1cb8c ui资源补充替换 2023-06-13 16:16:18 +08:00
chenxi
9779e5f4c6 删除多余的lua 2023-06-13 15:12:47 +08:00
chenxi
c65113785d 更新配置 2023-06-13 14:37:42 +08:00
xiekaidong
ad7212ff13 新的肉鸽机制-改变effect概率 2023-06-13 11:11:06 +08:00
Fang
e4dad61f52 活动副本 2023-06-12 15:39:52 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
xiekaidong
abc9c6af93 更新配置 2023-05-31 09:34:19 +08:00
chenxi
e86e750a1b 更新配置 2023-05-30 22:23:19 +08:00
xiekaidong
981c440e5d 更新配置 2023-05-30 21:30:14 +08:00
chenxi
4b7a41f638 基金显示模型 2023-05-30 17:22:42 +08:00
Fang
74f242b214 每日挑战开启状态变化fix 2023-05-29 18:22:17 +08:00
Fang
0288f2a300 boss界面模型比例适配 2023-05-26 18:39:07 +08:00
Fang
b57318f3a6 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-26 18:26:21 +08:00
xiekaidong
c89eb8ef3f 禁锢 2023-05-26 18:08:05 +08:00
xiekaidong
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
chenxi
e552761eea 七天乐 2023-05-26 11:39:23 +08:00
chenxi
56a4f329c3 紧急 2023-05-25 17:05:55 +08:00
chenxi
6f6b8ed3f3 金猪 2023-05-23 18:21:24 +08:00
xiekaidong
ccb54ff7e9 删除多余配置表 2023-05-22 20:37:02 +08:00
xiekaidong
f3946e1424 boss入场动画 2023-05-22 20:29:25 +08:00
xiekaidong
5309687502 果冻 2023-05-19 20:44:38 +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
xiekaidong
98070979dc 多段伤害 2023-05-18 10:58:49 +08:00
chenxi
a1e56df4aa 更新配置 2023-05-17 20:05:18 +08:00
chenxi
f7cd1c6094 战令 2023-05-16 18:17:05 +08:00
chenxi
dc095e626b 配置 2023-05-12 21:08:50 +08:00
chenxi
124feb0b09 任务 2023-05-11 10:09:29 +08:00
chenxi
3c6a538338 设置 2023-05-08 21:10:41 +08:00
chenxi
e724a9e523 更新配置 2023-04-27 16:54:57 +08:00
chenxi
7f3c65c7ef 体力恢复 2023-04-24 21:20:55 +08:00
chenxi
af56d4b400 伤害统计 2023-04-21 22:14:57 +08:00
chenxi
9c70bfbfed 更新配置 2023-04-20 20:54:29 +08:00