xiekaidong
|
19ced28f90
|
检查棋盘是否是死局的状态
|
2023-04-19 15:49:57 +08:00 |
|
xiekaidong
|
8641c42a20
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 12:06:38 +08:00 |
|
xiekaidong
|
cf7799e633
|
提交第一版查找死局算法
|
2023-04-19 12:06:35 +08:00 |
|
chenxi
|
fa4e1ebd3c
|
战斗加速
|
2023-04-19 11:53:31 +08:00 |
|
chenxi
|
5328e6dc7c
|
战场经验
|
2023-04-19 11:02:51 +08:00 |
|
chenxi
|
0f2a085877
|
变量名错误
|
2023-04-19 10:50:10 +08:00 |
|
chenxi
|
43331ffe05
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 10:47:05 +08:00 |
|
chenxi
|
431c57c353
|
加一个被动
|
2023-04-19 10:47:02 +08:00 |
|
xiekaidong
|
073b4cceab
|
界面处理
|
2023-04-19 09:48:53 +08:00 |
|
xiekaidong
|
0a7cb2a5b9
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 09:32:11 +08:00 |
|
xiekaidong
|
6633f28b66
|
更新图集
|
2023-04-19 09:32:04 +08:00 |
|
chenxi
|
92edaa2a73
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 22:32:13 +08:00 |
|
chenxi
|
65cbffc5e2
|
血条动画
|
2023-04-18 22:32:11 +08:00 |
|
xiekaidong
|
64b4a0962c
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-18 22:26:25 +08:00 |
|
xiekaidong
|
10f6569d95
|
肉鸽技能
|
2023-04-18 22:26:21 +08:00 |
|
chenxi
|
421748cd17
|
更新配置
|
2023-04-18 22:25:33 +08:00 |
|
chenxi
|
e6015e7e8c
|
血条动画
|
2023-04-18 22:22:03 +08:00 |
|
chenxi
|
d836860db8
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 21:32:10 +08:00 |
|
chenxi
|
0fa378ec88
|
生命相关被动改为由队伍记录
|
2023-04-18 21:32:03 +08:00 |
|
xiekaidong
|
bfb9f9834f
|
技能图标变形
|
2023-04-18 21:03:29 +08:00 |
|
chenxi
|
7ee1d620bb
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 20:37:24 +08:00 |
|
chenxi
|
342bae9c82
|
bug
|
2023-04-18 20:37:11 +08:00 |
|
xiekaidong
|
68229e532d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-18 20:37:03 +08:00 |
|
xiekaidong
|
bbc04cf46a
|
bug修改
|
2023-04-18 20:37:00 +08:00 |
|
chenxi
|
6ad53ac174
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 20:09:53 +08:00 |
|
chenxi
|
b1353d74e0
|
被动
|
2023-04-18 20:09:51 +08:00 |
|
xiekaidong
|
22b46a5129
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/userdata/battle/team/battle_unit_entity.lua
|
2023-04-18 19:52:35 +08:00 |
|
xiekaidong
|
0de7ceb3b3
|
切大波次
|
2023-04-18 19:52:15 +08:00 |
|
chenxi
|
2ff99edc4e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 18:59:39 +08:00 |
|
chenxi
|
281d220052
|
被动
|
2023-04-18 18:59:36 +08:00 |
|
xiekaidong
|
74a20b6bbe
|
肉鸽技能属性加成
|
2023-04-18 18:40:14 +08:00 |
|
xiekaidong
|
80e06bcef5
|
选择技能时机调整
|
2023-04-18 18:18:55 +08:00 |
|
xiekaidong
|
293facc310
|
读表
|
2023-04-18 18:06:05 +08:00 |
|
xiekaidong
|
ac5183c0fe
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-18 17:58:32 +08:00 |
|
xiekaidong
|
375efc10de
|
一些肉鸽技能接入战斗
|
2023-04-18 17:58:19 +08:00 |
|
chenxi
|
fd4e6d88c4
|
显示属性
|
2023-04-18 17:43:32 +08:00 |
|
chenxi
|
d0399fe460
|
关键伤害帧
|
2023-04-18 16:05:25 +08:00 |
|
chenxi
|
ad150a5e08
|
伤害数字
|
2023-04-18 11:58:03 +08:00 |
|
chenxi
|
a90d9cf51f
|
fix error
|
2023-04-18 11:54:11 +08:00 |
|
chenxi
|
ff6ebce393
|
重复使用技能
|
2023-04-18 11:52:46 +08:00 |
|
chenxi
|
caa8c1e801
|
.
|
2023-04-18 11:18:01 +08:00 |
|
chenxi
|
9305845ef9
|
merge
|
2023-04-18 11:05:39 +08:00 |
|
chenxi
|
3bc1b7b07a
|
处理护盾以及buff
|
2023-04-18 11:04:27 +08:00 |
|
xiekaidong
|
947fc23ff0
|
棋盘增加属性
|
2023-04-18 10:36:00 +08:00 |
|
chenxi
|
74cffb310d
|
援助技能
|
2023-04-17 22:10:29 +08:00 |
|
chenxi
|
ebf0d93d30
|
普攻和技能
|
2023-04-17 20:20:07 +08:00 |
|
chenxi
|
602983faee
|
使用技能
|
2023-04-17 18:40:39 +08:00 |
|
chenxi
|
5977527c8d
|
删除不用的属性
|
2023-04-17 17:27:37 +08:00 |
|
chenxi
|
a8d3e443cd
|
换人逻辑
|
2023-04-17 17:13:24 +08:00 |
|
chenxi
|
2d3991fcbd
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-17 16:53:09 +08:00 |
|