17 Commits

Author SHA1 Message Date
xiekaidong
fb7de22e94 技能生成规则 2023-04-10 17:03:34 +08:00
xiekaidong
3a0e442a93 战斗返回,消除时界面屏蔽点击 2023-04-10 10:34:37 +08:00
xiekaidong
aacf7bc803 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/buff.lua.meta
#	lua/app/config/chapter.lua
#	lua/app/config/chapter.lua.meta
#	lua/app/config/hero.lua.meta
#	lua/app/config/hero_level.lua
#	lua/app/config/hero_level.lua.meta
#	lua/app/config/skill_hero.lua
#	lua/app/config/skill_hero.lua.meta
#	lua/app/config/strings/cn/chapter.lua.meta
#	lua/app/config/strings/cn/hero.lua.meta
#	lua/app/config/strings/cn/skill_hero.lua.meta
#	lua/app/config/strings/de/chapter.lua.meta
#	lua/app/config/strings/de/hero.lua.meta
#	lua/app/config/strings/de/skill_hero.lua.meta
#	lua/app/config/strings/en/chapter.lua.meta
#	lua/app/config/strings/en/hero.lua.meta
#	lua/app/config/strings/en/skill_hero.lua.meta
#	lua/app/config/strings/fr/chapter.lua.meta
#	lua/app/config/strings/fr/hero.lua.meta
#	lua/app/config/strings/fr/skill_hero.lua.meta
#	lua/app/config/strings/id/chapter.lua.meta
#	lua/app/config/strings/id/hero.lua.meta
#	lua/app/config/strings/id/skill_hero.lua.meta
#	lua/app/config/strings/ja/chapter.lua.meta
#	lua/app/config/strings/ja/hero.lua.meta
#	lua/app/config/strings/ja/skill_hero.lua.meta
#	lua/app/config/strings/ko/chapter.lua.meta
#	lua/app/config/strings/ko/hero.lua.meta
#	lua/app/config/strings/ko/skill_hero.lua.meta
#	lua/app/config/strings/pt/chapter.lua.meta
#	lua/app/config/strings/pt/hero.lua.meta
#	lua/app/config/strings/pt/skill_hero.lua.meta
#	lua/app/config/strings/ru/chapter.lua.meta
#	lua/app/config/strings/ru/hero.lua.meta
#	lua/app/config/strings/ru/skill_hero.lua.meta
#	lua/app/config/strings/th/chapter.lua.meta
#	lua/app/config/strings/th/hero.lua.meta
#	lua/app/config/strings/th/skill_hero.lua.meta
#	lua/app/config/strings/vi/chapter.lua.meta
#	lua/app/config/strings/vi/hero.lua.meta
#	lua/app/config/strings/vi/skill_hero.lua.meta
#	lua/app/config/strings/zh/chapter.lua.meta
#	lua/app/config/strings/zh/hero.lua.meta
#	lua/app/config/strings/zh/skill_hero.lua.meta
2023-04-10 09:58:58 +08:00
xiekaidong
be1b2d1e4f 代码提交 2023-04-10 09:58:43 +08:00
chenxi
96483f028c 英雄列表 2023-04-08 17:52:36 +08:00
chenxi
f2e69642a9 数据处理 2023-04-07 22:23:00 +08:00
chenxi
ee3e56af2a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-07 20:50:14 +08:00
chenxi
0908bfe8bc 章节 2023-04-07 20:50:11 +08:00
xiekaidong
072b6b637d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-07 15:31:33 +08:00
xiekaidong
d9191bd03a 消除逻辑调整一下 2023-04-07 15:31:27 +08:00
chenxi
5c4c44823c 战斗 2023-04-07 15:24:55 +08:00
chenxi
d0db7b388f merge 2023-04-07 15:23:50 +08:00
chenxi
2698e4044b 整理一下 2023-04-07 15:22:56 +08:00
xiekaidong
76ace3a065 棋盘 2023-04-07 11:24:27 +08:00
xiekaidong
a4e1d82b24 棋盘填充逻辑 2023-04-06 18:32:04 +08:00
xiekaidong
ccdd6a778b 棋盘 2023-04-06 10:38:04 +08:00
xiekaidong
e30ad1dbd0 整理代码 2023-04-03 10:59:13 +08:00