xiekaidong
|
bfb9f9834f
|
技能图标变形
|
2023-04-18 21:03:29 +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
|
281d220052
|
被动
|
2023-04-18 18:59:36 +08:00 |
|
chenxi
|
74cffb310d
|
援助技能
|
2023-04-17 22:10:29 +08:00 |
|
chenxi
|
602983faee
|
使用技能
|
2023-04-17 18:40:39 +08:00 |
|
xiekaidong
|
65f695030e
|
局内升级
|
2023-04-17 15:43:23 +08:00 |
|
chenxi
|
b311395f10
|
怪物技能
|
2023-04-16 22:59:00 +08:00 |
|
chenxi
|
fc44d4dc8f
|
切波次
|
2023-04-16 22:23:34 +08:00 |
|
xiekaidong
|
3b909a2a81
|
一些界面修改和接入关卡结算
|
2023-04-14 22:19:22 +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
|
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
|
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 |
|
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
|
e68d5a1982
|
一些棋盘上的技能调整
|
2023-04-12 16:23:06 +08:00 |
|
xiekaidong
|
4b1875aafd
|
棋盘新的读取方式
|
2023-04-12 15:16:30 +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
|
dd6e751174
|
修复一些报错
|
2023-04-11 20:33:13 +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 |
|
xiekaidong
|
6cbe98fd6a
|
删除测试代码
|
2023-04-10 21:17:24 +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
|
be1b2d1e4f
|
代码提交
|
2023-04-10 09:58:43 +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 |
|