xiekaidong
|
81623a7aa2
|
i18nbug修复
|
2023-04-21 17:36:56 +08:00 |
|
chenxi
|
a0b27ce82d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/monster_chapter.lua
# lua/app/config/skill.lua
|
2023-04-21 17:12:31 +08:00 |
|
chenxi
|
2a9f4350b0
|
普攻改成数组
|
2023-04-21 17:11:59 +08:00 |
|
xiekaidong
|
60a5d5551f
|
初始化数据
|
2023-04-21 17:05:36 +08:00 |
|
xiekaidong
|
57de5cf3e7
|
更新配置
|
2023-04-21 16:50:54 +08:00 |
|
xiekaidong
|
c512d7f984
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 16:49:30 +08:00 |
|
xiekaidong
|
150e128135
|
关卡固定肉鸽技能、技能可以开始就任意链接
|
2023-04-21 16:49:27 +08:00 |
|
chenxi
|
c6ea40de7e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 16:27:27 +08:00 |
|
chenxi
|
9a0ebd1318
|
技能抖屏
|
2023-04-21 16:27:24 +08:00 |
|
xiekaidong
|
867bf72134
|
引导，更新配置
|
2023-04-21 16:26:57 +08:00 |
|
xiekaidong
|
5d1bc62572
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 16:10:31 +08:00 |
|
xiekaidong
|
eeb0af1262
|
战斗引导
|
2023-04-21 16:10:28 +08:00 |
|
chenxi
|
4d4bd0fc61
|
技能特效
|
2023-04-21 15:52:50 +08:00 |
|
chenxi
|
3ed97017f3
|
fix bug
|
2023-04-21 14:52:44 +08:00 |
|
chenxi
|
b8f9f9786f
|
fix bug
|
2023-04-21 14:45:24 +08:00 |
|
chenxi
|
3010f1f7d5
|
fix bug
|
2023-04-21 14:27:08 +08:00 |
|
chenxi
|
d3ee3c6799
|
fix bug
|
2023-04-21 14:21:54 +08:00 |
|
chenxi
|
4186ffdb94
|
宝箱红点
|
2023-04-21 12:02:47 +08:00 |
|
chenxi
|
40ee7a40ff
|
红点规则
|
2023-04-21 12:00:42 +08:00 |
|
chenxi
|
67cc032ffb
|
红点逻辑
|
2023-04-21 11:56:41 +08:00 |
|
xiekaidong
|
8683156a3c
|
bug修复
|
2023-04-21 11:00:11 +08:00 |
|
xiekaidong
|
01e691fceb
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 10:57:34 +08:00 |
|
xiekaidong
|
565cfbc817
|
动画
|
2023-04-21 10:57:27 +08:00 |
|
chenxi
|
3abfa8ce27
|
打赢最新的关卡去下一关
|
2023-04-21 10:56:25 +08:00 |
|
chenxi
|
bffd98de70
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 10:55:16 +08:00 |
|
chenxi
|
79bad73dfe
|
打赢后去下一关
|
2023-04-21 10:55:13 +08:00 |
|
xiekaidong
|
5ccdd1e417
|
界面调整
|
2023-04-21 10:12:00 +08:00 |
|
xiekaidong
|
06229275bf
|
关卡数据容错
|
2023-04-21 09:56:30 +08:00 |
|
chenxi
|
c068622521
|
战斗加速的逻辑
|
2023-04-20 23:08:28 +08:00 |
|
chenxi
|
2e657ff39d
|
fix bug
|
2023-04-20 22:52:32 +08:00 |
|
chenxi
|
de5d0e34e5
|
还原测试代码
|
2023-04-20 22:49:56 +08:00 |
|
chenxi
|
e7c01c9c5d
|
更新
|
2023-04-20 22:39:43 +08:00 |
|
xiekaidong
|
c4f034e13e
|
优化
|
2023-04-20 22:28:06 +08:00 |
|
chenxi
|
60b7a2677e
|
服务器解锁英雄
|
2023-04-20 22:14:38 +08:00 |
|
xiekaidong
|
47b08b4443
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-20 21:52:08 +08:00 |
|
xiekaidong
|
f4ef82e141
|
英雄解锁逻辑
|
2023-04-20 21:52:01 +08:00 |
|
chenxi
|
a8261cd641
|
merge
|
2023-04-20 21:48:51 +08:00 |
|
chenxi
|
817985422c
|
英雄随机碎片
|
2023-04-20 21:47:14 +08:00 |
|
xiekaidong
|
5727821969
|
英雄解锁条件
|
2023-04-20 21:43:03 +08:00 |
|
xiekaidong
|
d1c7f22f03
|
修改
|
2023-04-20 21:37:09 +08:00 |
|
xiekaidong
|
e34b3df0aa
|
删除代码
|
2023-04-20 21:28:42 +08:00 |
|
xiekaidong
|
44102b81b9
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/skill_rogue.lua
# lua/app/config/tutorial.lua.meta
# lua/app/config/tutorial_start.lua.meta
# lua/app/module/battle/battle_const.lua
|
2023-04-20 21:26:51 +08:00 |
|
xiekaidong
|
a2e20a7c37
|
技能解锁
|
2023-04-20 21:26:35 +08:00 |
|
chenxi
|
325b34a691
|
tips最小限制
|
2023-04-20 21:08:03 +08:00 |
|
chenxi
|
9c70bfbfed
|
更新配置
|
2023-04-20 20:54:29 +08:00 |
|
chenxi
|
9ac4b10ba2
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-20 20:53:29 +08:00 |
|
chenxi
|
32edfe2a3a
|
波次之间回血
|
2023-04-20 20:53:26 +08:00 |
|
xiekaidong
|
75bca07d4d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-20 20:30:39 +08:00 |
|
xiekaidong
|
a11f8613e1
|
动画调整
|
2023-04-20 20:30:35 +08:00 |
|
chenxi
|
94b3c3ddc5
|
伤害数字对象池
|
2023-04-20 20:22:14 +08:00 |
|