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

..

buff.lua

任务

2023-05-11 10:09:29 +08:00

buff.lua.meta

更新配置

2023-04-19 20:05:47 +08:00

chapter.lua

章节

2023-04-07 20:50:11 +08:00

chapter.lua.meta

章节

2023-04-07 20:50:11 +08:00

global.lua

体力恢复

2023-04-24 21:20:55 +08:00

global.lua.meta

整理代码

2023-04-03 10:59:13 +08:00

hero.lua

多段伤害

2023-05-18 10:58:49 +08:00

hero.lua.meta

章节

2023-04-07 20:50:11 +08:00

item.lua

更新配置

2023-05-18 22:10:22 +08:00

item.lua.meta

整理代码

2023-04-03 10:59:13 +08:00

skill_hero.lua

章节

2023-04-07 20:50:11 +08:00

skill_hero.lua.meta

章节

2023-04-07 20:50:11 +08:00

skill_rogue.lua

更新配置

2023-05-18 22:10:22 +08:00

skill_rogue.lua.meta

章节

2023-04-07 20:50:11 +08:00

skill.lua

更新配置

2023-05-18 22:10:22 +08:00

skill.lua.meta

移动攻击表现

2023-04-12 23:10:22 +08:00