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 |
|
xiekaidong
|
806ab5170f
|
bug和引导
|
2023-04-21 19:48:08 +08:00 |
|
xiekaidong
|
f6503d5a89
|
引导和报错
|
2023-04-21 18:10:38 +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
|
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
|
b8f9f9786f
|
fix bug
|
2023-04-21 14:45:24 +08:00 |
|
chenxi
|
3010f1f7d5
|
fix bug
|
2023-04-21 14:27:08 +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
|
565cfbc817
|
动画
|
2023-04-21 10:57:27 +08:00 |
|
xiekaidong
|
5ccdd1e417
|
界面调整
|
2023-04-21 10:12:00 +08:00 |
|
xiekaidong
|
06229275bf
|
关卡数据容错
|
2023-04-21 09:56:30 +08:00 |
|
chenxi
|
2e657ff39d
|
fix bug
|
2023-04-20 22:52:32 +08:00 |
|
chenxi
|
de5d0e34e5
|
还原测试代码
|
2023-04-20 22:49:56 +08:00 |
|
xiekaidong
|
c4f034e13e
|
优化
|
2023-04-20 22:28:06 +08:00 |
|
xiekaidong
|
d1c7f22f03
|
修改
|
2023-04-20 21:37:09 +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 |
|
xiekaidong
|
a11f8613e1
|
动画调整
|
2023-04-20 20:30:35 +08:00 |
|
chenxi
|
3a916fd7ee
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-20 18:59:08 +08:00 |
|
chenxi
|
5303638b99
|
伤害数字
|
2023-04-20 18:59:06 +08:00 |
|
xiekaidong
|
1f0cba25d6
|
修复
|
2023-04-20 18:57:04 +08:00 |
|
xiekaidong
|
ccddeb8aa3
|
修复
|
2023-04-20 18:50:19 +08:00 |
|
xiekaidong
|
b9a42b317b
|
动画
|
2023-04-20 18:45:38 +08:00 |
|
chenxi
|
b8517ba934
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-20 18:22:43 +08:00 |
|
chenxi
|
666e36416e
|
tips
|
2023-04-20 18:22:39 +08:00 |
|
xiekaidong
|
6fb864fa79
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-20 18:13:59 +08:00 |
|
xiekaidong
|
c874c9026b
|
特效
|
2023-04-20 18:13:56 +08:00 |
|
chenxi
|
e136291098
|
主城箭头
|
2023-04-20 18:01:39 +08:00 |
|
chenxi
|
f73980c7de
|
奖励显示碎片
|
2023-04-20 17:40:25 +08:00 |
|
xiekaidong
|
3c896cf339
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/strings/cn/buff.lua.meta
|
2023-04-20 15:17:23 +08:00 |
|
xiekaidong
|
06bc25c2d2
|
rogue技能显示修改
|
2023-04-20 15:17:14 +08:00 |
|
chenxi
|
bd57840816
|
buff tips
|
2023-04-20 12:06:33 +08:00 |
|
chenxi
|
ae30c47881
|
战斗buff
|
2023-04-20 11:19:31 +08:00 |
|
chenxi
|
a98cf98c58
|
系数
|
2023-04-19 22:41:01 +08:00 |
|
xiekaidong
|
213c4c1188
|
界面处理
|
2023-04-19 22:31:15 +08:00 |
|
xiekaidong
|
2f28925a71
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 22:20:25 +08:00 |
|
xiekaidong
|
9be9feefbd
|
英雄解锁和强制上阵的判定
|
2023-04-19 22:20:22 +08:00 |
|
chenxi
|
a6b3df378f
|
buff显示逻辑
|
2023-04-19 22:20:07 +08:00 |
|
chenxi
|
87d7f9b597
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 21:07:38 +08:00 |
|
chenxi
|
7118b8790a
|
背景移动
|
2023-04-19 21:07:35 +08:00 |
|