xiekaidong
|
dc5a37ac0f
|
一些细节调整
|
2023-04-15 16:47:18 +08:00 |
|
xiekaidong
|
328515c82a
|
开宝箱
|
2023-04-15 14:57:34 +08:00 |
|
xiekaidong
|
f74a7f6080
|
关卡宝箱
|
2023-04-15 14:45:42 +08:00 |
|
xiekaidong
|
f9541d56d8
|
血条
|
2023-04-14 22:23:03 +08:00 |
|
xiekaidong
|
88b9067fc4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-14 22:19:25 +08:00 |
|
xiekaidong
|
3b909a2a81
|
一些界面修改和接入关卡结算
|
2023-04-14 22:19:22 +08:00 |
|
chenxi
|
3269a4c6a3
|
增加最大血量
|
2023-04-14 21:25:01 +08:00 |
|
chenxi
|
c6ae8e7c99
|
血量
|
2023-04-14 21:21:03 +08:00 |
|
chenxi
|
93ee4653af
|
战斗buff
|
2023-04-14 20:34:36 +08:00 |
|
chenxi
|
b7524f89e2
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-14 20:33:07 +08:00 |
|
xiekaidong
|
47439bf597
|
增加一些判定条件
|
2023-04-14 18:26:16 +08:00 |
|
chenxi
|
0d084c0438
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-14 18:22:39 +08:00 |
|
chenxi
|
3666e425ff
|
buff加属性
|
2023-04-14 18:22:36 +08:00 |
|
xiekaidong
|
f420d73d7a
|
报错修改
|
2023-04-14 18:18:22 +08:00 |
|
xiekaidong
|
15f1d9c1cf
|
更新配置
|
2023-04-14 18:02:06 +08:00 |
|
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
|
e88e9e9e98
|
配置
|
2023-04-14 15:57:14 +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
|
442e59c95a
|
攻击属性
|
2023-04-14 00:21:26 +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
|
0d2e914210
|
战斗rogue技能接入上阵
|
2023-04-13 21:30:07 +08:00 |
|
xiekaidong
|
d1b80d3527
|
英雄养成
|
2023-04-13 21:13:43 +08:00 |
|
xiekaidong
|
72199d8993
|
本地存档
|
2023-04-13 18:16:37 +08:00 |
|
chenxi
|
f79124999a
|
英雄属性
|
2023-04-13 14:32:47 +08:00 |
|
chenxi
|
c955bc3e26
|
更新配置
|
2023-04-13 14:27:58 +08:00 |
|
chenxi
|
49b025234e
|
加点日志
|
2023-04-13 14:20:00 +08:00 |
|
chenxi
|
af67250075
|
加点log
|
2023-04-13 12:10:02 +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
|
d5bedb659a
|
加一个大卡片信息
|
2023-04-12 22:11:46 +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
|
eb17b324c4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/ui/battle/battle_ui.lua
|
2023-04-12 21:03:40 +08:00 |
|
xiekaidong
|
cbad76a7d9
|
技能回收和吐出来
|
2023-04-12 21:03:07 +08:00 |
|
chenxi
|
31bdd83dae
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-12 18:31:33 +08:00 |
|
chenxi
|
dc66b8833a
|
清理战斗
|
2023-04-12 18:31:30 +08:00 |
|
xiekaidong
|
9722405d9e
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-12 17:55:04 +08:00 |
|
xiekaidong
|
a2e859e6ee
|
处理一下主界面
|
2023-04-12 17:55:01 +08:00 |
|
chenxi
|
89497ab68e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-12 17:07:17 +08:00 |
|
chenxi
|
94e369cd25
|
时区
|
2023-04-12 17:06:24 +08:00 |
|