xiekaidong
|
f48194bfd1
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-14 17:59:15 +08:00 |
|
xiekaidong
|
642eb4d247
|
战斗回合概念
|
2023-04-14 17:59:12 +08:00 |
|
chenxi
|
0d7d3a5b72
|
merge
|
2023-04-14 15:55:14 +08:00 |
|
chenxi
|
7400f41cea
|
伤害工时
|
2023-04-14 15:54:51 +08:00 |
|
xiekaidong
|
ab14bce85c
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-14 15:18:17 +08:00 |
|
xiekaidong
|
d1c95c8979
|
战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理
|
2023-04-14 15:18:14 +08:00 |
|
chenxi
|
fb1571ca1f
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-13 23:21:44 +08:00 |
|
chenxi
|
06145762e1
|
.
|
2023-04-13 23:21:40 +08:00 |
|
xiekaidong
|
c0eedc10ce
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-13 22:30:12 +08:00 |
|
xiekaidong
|
8424303c97
|
英雄改一下
|
2023-04-13 22:30:08 +08:00 |
|
chenxi
|
15a182cd30
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-13 22:04:25 +08:00 |
|
chenxi
|
d5c99276b5
|
冒伤害
|
2023-04-13 22:04:22 +08:00 |
|
xiekaidong
|
d1b80d3527
|
英雄养成
|
2023-04-13 21:13:43 +08:00 |
|
chenxi
|
61127f4261
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-12 23:10:25 +08:00 |
|
chenxi
|
f41759dff4
|
移动攻击表现
|
2023-04-12 23:10:22 +08:00 |
|
xiekaidong
|
f268d99606
|
reward显示
|
2023-04-12 21:46:16 +08:00 |
|
chenxi
|
f970cd2ec5
|
merge
|
2023-04-12 21:15:24 +08:00 |
|
chenxi
|
25d13668e6
|
战斗
|
2023-04-12 21:14:10 +08:00 |
|
xiekaidong
|
cbad76a7d9
|
技能回收和吐出来
|
2023-04-12 21:03:07 +08:00 |
|
xiekaidong
|
a2e859e6ee
|
处理一下主界面
|
2023-04-12 17:55:01 +08:00 |
|
xiekaidong
|
e68d5a1982
|
一些棋盘上的技能调整
|
2023-04-12 16:23:06 +08:00 |
|
xiekaidong
|
de7643a18f
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-12 15:16:33 +08:00 |
|
xiekaidong
|
4b1875aafd
|
棋盘新的读取方式
|
2023-04-12 15:16:30 +08:00 |
|
chenxi
|
39fed0bb6d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-12 11:56:48 +08:00 |
|
chenxi
|
fb3888697f
|
gm工具
|
2023-04-12 11:56:45 +08:00 |
|
xiekaidong
|
4c752c0e78
|
调整一些逻辑
|
2023-04-12 11:19:24 +08:00 |
|
xiekaidong
|
e1e2573d23
|
修改一下填充逻辑
|
2023-04-12 10:24:06 +08:00 |
|
xiekaidong
|
b61b6a6f85
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-11 22:12:55 +08:00 |
|
xiekaidong
|
990a27220e
|
肉鸽技能和指令集
|
2023-04-11 22:12:52 +08:00 |
|
chenxi
|
8de863c989
|
主城金币
|
2023-04-11 21:58:05 +08:00 |
|
chenxi
|
46d338e13d
|
显示模型
|
2023-04-11 20:52:14 +08:00 |
|
chenxi
|
dd6e751174
|
修复一些报错
|
2023-04-11 20:33:13 +08:00 |
|
chenxi
|
4b621b0e07
|
上阵
|
2023-04-11 20:05:03 +08:00 |
|
chenxi
|
903e4899ca
|
merge
|
2023-04-11 18:24:00 +08:00 |
|
chenxi
|
4d31d587de
|
战斗
|
2023-04-11 18:23:25 +08:00 |
|
xiekaidong
|
85061a5126
|
一些肉鸽技能
|
2023-04-11 17:26:02 +08:00 |
|
chenxi
|
ed7bf4ace4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-10 21:54:54 +08:00 |
|
chenxi
|
83eda24cc4
|
英雄界面
|
2023-04-10 21:54:51 +08:00 |
|
xiekaidong
|
918f55e814
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-10 21:13:34 +08:00 |
|
xiekaidong
|
eb0856345f
|
一些技能的实现
|
2023-04-10 21:13:31 +08:00 |
|
chenxi
|
9dc6bff28e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-10 17:09:03 +08:00 |
|
chenxi
|
8a19ab4781
|
战斗
|
2023-04-10 17:09:00 +08:00 |
|
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
|
f2e69642a9
|
数据处理
|
2023-04-07 22:23:00 +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
|
d0db7b388f
|
merge
|
2023-04-07 15:23:50 +08:00 |
|