xiekaidong
|
70058e8cc6
|
bug修复
|
2023-04-21 20:50:52 +08:00 |
|
xiekaidong
|
ac9bea5776
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 20:43:52 +08:00 |
|
chenxi
|
7c0e51ff80
|
音效
|
2023-04-21 20:39:53 +08:00 |
|
xiekaidong
|
24a775cfe8
|
bug修复
|
2023-04-21 20:37:07 +08:00 |
|
chenxi
|
552418bdfd
|
清理资源
|
2023-04-21 20:28:04 +08:00 |
|
chenxi
|
57d77849f3
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 20:22:30 +08:00 |
|
chenxi
|
6ecbce4127
|
技能
|
2023-04-21 20:22:27 +08:00 |
|
xiekaidong
|
ee1b719517
|
更新配置
|
2023-04-21 19:49:20 +08:00 |
|
xiekaidong
|
98f2fabf75
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 19:48:11 +08:00 |
|
xiekaidong
|
806ab5170f
|
bug和引导
|
2023-04-21 19:48:08 +08:00 |
|
chenxi
|
3a6d68db2f
|
屏蔽
|
2023-04-21 19:24:49 +08:00 |
|
chenxi
|
5982d0083a
|
fix 报错
|
2023-04-21 18:38:31 +08:00 |
|
chenxi
|
a561683853
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 18:22:32 +08:00 |
|
chenxi
|
8701bda613
|
更新配置
|
2023-04-21 18:22:29 +08:00 |
|
xiekaidong
|
5dc6d24503
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/tutorial.lua
|
2023-04-21 18:10:50 +08:00 |
|
xiekaidong
|
f6503d5a89
|
引导和报错
|
2023-04-21 18:10:38 +08:00 |
|
chenxi
|
031034db50
|
特效大小和层级
|
2023-04-21 17:58:51 +08:00 |
|
chenxi
|
0e43cbbbd0
|
更新配置
|
2023-04-21 17:44:07 +08:00 |
|
chenxi
|
63e0947664
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 17:43:39 +08:00 |
|
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 |
|