chenxi
|
1f86476cb0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 17:20:43 +08:00 |
|
chenxi
|
8833471b90
|
限制技能
|
2023-04-19 17:20:28 +08:00 |
|
xiekaidong
|
c8ba1688a0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/module/battle/controller/battle_controller_stage.lua
|
2023-04-19 17:20:07 +08:00 |
|
xiekaidong
|
ecdeca90ec
|
切大波次节奏调整
|
2023-04-19 17:19:39 +08:00 |
|
chenxi
|
4e629d3da4
|
层级
|
2023-04-19 17:10:23 +08:00 |
|
chenxi
|
c4a922aba8
|
生成怪的逻辑
|
2023-04-19 16:47:11 +08:00 |
|
chenxi
|
681c0965f2
|
不用额外的开销
|
2023-04-19 16:31:51 +08:00 |
|
chenxi
|
9c7db3193d
|
更新配置
|
2023-04-19 16:29:20 +08:00 |
|
chenxi
|
dbf3ffa581
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 16:27:50 +08:00 |
|
chenxi
|
f7b2b736f8
|
入场表现
|
2023-04-19 16:27:47 +08:00 |
|
xiekaidong
|
e07380e7e5
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 15:50:09 +08:00 |
|
xiekaidong
|
f6847beaa8
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 15:50:00 +08:00 |
|
chenxi
|
904a57760d
|
恢复战斗速度的时机
|
2023-04-19 15:49:58 +08:00 |
|
xiekaidong
|
19ced28f90
|
检查棋盘是否是死局的状态
|
2023-04-19 15:49:57 +08:00 |
|
chenxi
|
bfdf418a39
|
大小
|
2023-04-19 15:39:54 +08:00 |
|
chenxi
|
f9b9dc1726
|
大小
|
2023-04-19 15:36:44 +08:00 |
|
chenxi
|
f0cb7a6d73
|
更新配置
|
2023-04-19 15:05:27 +08:00 |
|
chenxi
|
6569fabe48
|
技能可能不可用
|
2023-04-19 15:04:01 +08:00 |
|
chenxi
|
ea69a44b75
|
修改错名的命名
|
2023-04-19 14:17:17 +08:00 |
|
chenxi
|
53f73118a2
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 12:23:59 +08:00 |
|
chenxi
|
37476932d7
|
支援间隔
|
2023-04-19 12:23:56 +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 |
|