chenxi
|
53f18c5b8a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-06 11:10:39 +08:00 |
|
chenxi
|
7a83365fe2
|
只有战斗胜利才算完成任务
|
2023-06-06 11:10:29 +08:00 |
|
CloudJ
|
17984d56ae
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/audio_manager.lua
|
2023-06-06 11:08:52 +08:00 |
|
CloudJ
|
9a5d42c753
|
音效
|
2023-06-06 11:08:37 +08:00 |
|
xiekaidong
|
c218e5a359
|
音效
|
2023-06-06 10:59:34 +08:00 |
|
xiekaidong
|
611d962181
|
增加棋盘查看字段
|
2023-06-05 21:07:38 +08:00 |
|
xiekaidong
|
cc77a77193
|
消除显示优化
|
2023-06-05 20:51:50 +08:00 |
|
chenxi
|
baa1c4280e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 18:32:54 +08:00 |
|
chenxi
|
16975e700e
|
充值后没有绑定则提示绑定
|
2023-06-05 18:32:51 +08:00 |
|
xiekaidong
|
0441e09d12
|
bug修复
|
2023-06-05 18:24:06 +08:00 |
|
chenxi
|
6e20c37abf
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 16:25:44 +08:00 |
|
chenxi
|
30d134ecc8
|
调整一下侧边栏的按钮顺序
|
2023-06-05 16:25:41 +08:00 |
|
xiekaidong
|
e3420eeb8a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 16:24:22 +08:00 |
|
xiekaidong
|
628da8aade
|
音效容错
|
2023-06-05 16:24:06 +08:00 |
|
chenxi
|
253ae25580
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 16:23:58 +08:00 |
|
chenxi
|
5216c8ff69
|
侧边栏优化
|
2023-06-05 16:23:55 +08:00 |
|
xiekaidong
|
f8871a3109
|
加一个GM快速查看棋盘
|
2023-06-05 16:13:05 +08:00 |
|
xiekaidong
|
523397f39a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 11:05:03 +08:00 |
|
xiekaidong
|
c43e51b3d4
|
每日挑战引导
|
2023-06-05 11:05:00 +08:00 |
|
CloudJ
|
d5cd39c3fb
|
替换UI
|
2023-06-05 10:57:30 +08:00 |
|
xiekaidong
|
ec365ee0d8
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 10:46:26 +08:00 |
|
xiekaidong
|
ba52482a95
|
技能选择规则优化
|
2023-06-05 10:46:18 +08:00 |
|
Fang
|
a8f727c014
|
每日挑战首次解锁显示fix
|
2023-06-05 10:41:20 +08:00 |
|
xiekaidong
|
5340ecd4b7
|
bug修复
|
2023-06-05 10:36:30 +08:00 |
|
CloudJ
|
954d4c317d
|
商城跳转功能
|
2023-06-03 23:29:23 +08:00 |
|
xiekaidong
|
eb2872b7ee
|
修改bug，优化战斗流程逻辑
|
2023-06-03 19:11:19 +08:00 |
|
xiekaidong
|
c2ddb208b9
|
更改一下死亡召唤触发时机
|
2023-06-03 17:46:24 +08:00 |
|
xiekaidong
|
83db836cb1
|
新增一个战斗用gm命令
|
2023-06-03 15:48:37 +08:00 |
|
xiekaidong
|
44ff406135
|
boss机制棋盘效果处理
|
2023-06-02 22:28:22 +08:00 |
|
xiekaidong
|
fd4b60dfd2
|
多段伤害音效
|
2023-06-02 20:22:54 +08:00 |
|
xiekaidong
|
7151a033d7
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-02 20:13:41 +08:00 |
|
xiekaidong
|
1689436124
|
新增障碍物效果类型
|
2023-06-02 20:13:38 +08:00 |
|
chenxi
|
126807c97b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-02 19:20:23 +08:00 |
|
chenxi
|
bbf6b96d92
|
提示
|
2023-06-02 19:20:20 +08:00 |
|
xiekaidong
|
63b03dba2a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-02 19:01:36 +08:00 |
|
xiekaidong
|
14f51d2900
|
水泡动画
|
2023-06-02 19:01:33 +08:00 |
|
chenxi
|
dbff5a9565
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-02 19:00:29 +08:00 |
|
chenxi
|
ab68ef30a9
|
变量名错误
|
2023-06-02 19:00:26 +08:00 |
|
Fang
|
5ee2be8837
|
fix
|
2023-06-02 18:42:19 +08:00 |
|
Fang
|
b6936a2c4a
|
功能解锁飞行动画
|
2023-06-02 18:35:36 +08:00 |
|
chenxi
|
2f2a993c12
|
打完第二章后七天乐没有开启的bug
|
2023-06-02 18:20:15 +08:00 |
|
xiekaidong
|
5a9558184b
|
火箭动画
|
2023-06-02 17:58:18 +08:00 |
|
chenxi
|
c73734a068
|
更新配置
|
2023-06-02 17:20:31 +08:00 |
|
chenxi
|
8fccdca0c8
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-02 17:07:12 +08:00 |
|
chenxi
|
ec5d5fbc82
|
gm
|
2023-06-02 17:07:09 +08:00 |
|
xiekaidong
|
eb1354f807
|
先更新一下格子
|
2023-06-02 16:54:16 +08:00 |
|
chenxi
|
e02584c648
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-02 16:52:38 +08:00 |
|
xiekaidong
|
202e8e74c9
|
增加一个gm
|
2023-06-02 15:52:17 +08:00 |
|
chenxi
|
3eee5957f6
|
账号相关提示
|
2023-06-02 15:48:12 +08:00 |
|
xiekaidong
|
aaafadf812
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-02 15:15:13 +08:00 |
|