CloudJ
|
1fb818d12b
|
提交一波
|
2023-05-23 18:37:09 +08:00 |
|
xiekaidong
|
fb0ebff007
|
Merge branch 'battle' into dev
|
2023-05-23 16:40:13 +08:00 |
|
xiekaidong
|
637264f383
|
格挡动作表现、反击界面表现
|
2023-05-23 16:39:29 +08:00 |
|
CloudJ
|
38a9faffb6
|
提交一波
|
2023-05-23 16:37:01 +08:00 |
|
xiekaidong
|
1e6e99de9a
|
伤害数字
|
2023-05-23 15:05:23 +08:00 |
|
CloudJ
|
74e2ecbb76
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-05-23 14:17:44 +08:00 |
|
CloudJ
|
13d53c5166
|
提一波
|
2023-05-23 14:17:29 +08:00 |
|
chenxi
|
0db618ef69
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 21:23:18 +08:00 |
|
chenxi
|
78e03328ce
|
邮件
|
2023-05-22 21:23:07 +08:00 |
|
xiekaidong
|
f3946e1424
|
boss入场动画
|
2023-05-22 20:29:25 +08:00 |
|
CloudJ
|
46a2c52ca4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-05-22 17:50:24 +08:00 |
|
CloudJ
|
066b5cdef9
|
cache
|
2023-05-22 17:50:02 +08:00 |
|
CloudJ
|
58de179979
|
每日特惠
|
2023-05-22 17:27:12 +08:00 |
|
xiekaidong
|
3f747de9aa
|
boss的buff自动提示
|
2023-05-22 17:23:36 +08:00 |
|
xiekaidong
|
3aa34c82f8
|
Merge branch 'battle' into dev
|
2023-05-22 16:38:27 +08:00 |
|
xiekaidong
|
8ae7df28e2
|
通用技能tips
|
2023-05-22 16:38:04 +08:00 |
|
chenxi
|
8617d9e407
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 16:22:29 +08:00 |
|
chenxi
|
e97c1cd4e9
|
玩家升级界面
|
2023-05-22 16:22:26 +08:00 |
|
CloudJ
|
aec28d95e8
|
shop
|
2023-05-22 16:14:57 +08:00 |
|
CloudJ
|
99fedebb96
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 16:14:47 +08:00 |
|
xiekaidong
|
14dfdecddc
|
Merge branch 'battle' into dev
# Conflicts:
# lua/app/config/strings/cn/global.lua
|
2023-05-22 15:59:54 +08:00 |
|
xiekaidong
|
528ac6a89b
|
技能tips
|
2023-05-22 15:59:17 +08:00 |
|
chenxi
|
15692a0127
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 11:22:01 +08:00 |
|
chenxi
|
a47b2bdf2c
|
先屏蔽金猪
|
2023-05-22 11:21:55 +08:00 |
|
xiekaidong
|
2959b8db73
|
弹窗
|
2023-05-22 10:24:45 +08:00 |
|
CloudJ
|
d1d0c736cb
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 09:59:08 +08:00 |
|
chenxi
|
deeeedbfaa
|
金猪
|
2023-05-19 23:02:02 +08:00 |
|
xiekaidong
|
fd2c150b19
|
bug修复
|
2023-05-19 21:44:36 +08:00 |
|
xiekaidong
|
d4d1249f09
|
bug修复
|
2023-05-19 21:37:56 +08:00 |
|
xiekaidong
|
d2eff9d230
|
随机位置
|
2023-05-19 20:59:18 +08:00 |
|
xiekaidong
|
4708ed1ae2
|
随机
|
2023-05-19 20:55:41 +08:00 |
|
xiekaidong
|
9067a7ffa1
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 20:44:41 +08:00 |
|
xiekaidong
|
5309687502
|
果冻
|
2023-05-19 20:44:38 +08:00 |
|
chenxi
|
e85131f041
|
任务
|
2023-05-19 20:43:35 +08:00 |
|
xiekaidong
|
1fcf0137e3
|
死局问题修改
|
2023-05-19 20:09:32 +08:00 |
|
CloudJ
|
52bd3a3167
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/global/global_const.lua
|
2023-05-19 20:03:48 +08:00 |
|
CloudJ
|
f04108a58d
|
tmp
|
2023-05-19 20:03:28 +08:00 |
|
chenxi
|
0ab51fcc07
|
购买体力和邮箱
|
2023-05-19 18:32:23 +08:00 |
|
xiekaidong
|
b8d7fa533d
|
战斗内部计数相关任务
|
2023-05-19 18:18:33 +08:00 |
|
xiekaidong
|
58d366ba9d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 18:00:05 +08:00 |
|
xiekaidong
|
f6d5546d2b
|
战斗任务数据
|
2023-05-19 18:00:03 +08:00 |
|
chenxi
|
502f35bf2e
|
体力不足得时候弹出来购买体力界面
|
2023-05-19 17:08:19 +08:00 |
|
chenxi
|
af59a3f9a2
|
体力不足的时候弹出来购买体力
|
2023-05-19 17:05:28 +08:00 |
|
chenxi
|
23de1b57e0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 16:37:04 +08:00 |
|
chenxi
|
a78be93bc1
|
宝箱tips
|
2023-05-19 16:36:59 +08:00 |
|
xiekaidong
|
d1fe14d396
|
删除打印
|
2023-05-19 16:31:26 +08:00 |
|
xiekaidong
|
ff56360efa
|
技能机制
|
2023-05-19 16:27:54 +08:00 |
|
xiekaidong
|
8316e48633
|
随机技能机制
|
2023-05-19 15:15:02 +08:00 |
|
xiekaidong
|
aae0f74648
|
新增消除类型
|
2023-05-19 10:51:48 +08:00 |
|
xiekaidong
|
7ab28c41b4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 10:00:16 +08:00 |
|