CloudJ
|
4e5316033a
|
抽卡部分
|
2023-05-24 10:07:07 +08:00 |
|
xiekaidong
|
bff772a1de
|
技能刷新接入联网
|
2023-05-24 10:01:36 +08:00 |
|
CloudJ
|
ada108ac82
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 18:37:12 +08:00 |
|
CloudJ
|
1fb818d12b
|
提交一波
|
2023-05-23 18:37:09 +08:00 |
|
xiekaidong
|
d3e38d6583
|
Merge branch 'battle' into dev
|
2023-05-23 18:35:42 +08:00 |
|
xiekaidong
|
e5bcfa3f09
|
冰冻状态、昏睡状态
|
2023-05-23 18:35:08 +08:00 |
|
chenxi
|
6f6b8ed3f3
|
金猪
|
2023-05-23 18:21:24 +08:00 |
|
chenxi
|
c95e0cb014
|
merge
|
2023-05-23 17:04:04 +08:00 |
|
chenxi
|
ee23cd83ad
|
金猪和邮件
|
2023-05-23 17:02:14 +08:00 |
|
CloudJ
|
38a9faffb6
|
提交一波
|
2023-05-23 16:37:01 +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 |
|
xiekaidong
|
20bf29490f
|
容错
|
2023-05-22 18:13:19 +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 |
|
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 |
|
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
|
f18e16103c
|
邮箱
|
2023-05-22 11:36:26 +08:00 |
|
chenxi
|
a1cfb3d3c3
|
邮箱
|
2023-05-19 21:55:40 +08:00 |
|
chenxi
|
d739908228
|
任务红点
|
2023-05-19 21:23:06 +08:00 |
|
xiekaidong
|
1718c96004
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 20:00:12 +08:00 |
|
xiekaidong
|
d51624b93b
|
容错
|
2023-05-19 20:00:06 +08:00 |
|
chenxi
|
0ab51fcc07
|
购买体力和邮箱
|
2023-05-19 18:32:23 +08:00 |
|
chenxi
|
9d398707e0
|
任务宝箱tips
|
2023-05-19 16:51:24 +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
|
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 |
|
chenxi
|
9ab1297bce
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-18 22:09:46 +08:00 |
|
chenxi
|
b6da2f4bd6
|
挂机
|
2023-05-18 22:09:43 +08:00 |
|
xiekaidong
|
82d95ee5fd
|
被动、buff触发时机
|
2023-05-18 20:43:10 +08:00 |
|
xiekaidong
|
6596d89003
|
Merge branch 'dev' into battle
|
2023-05-18 20:31:32 +08:00 |
|
chenxi
|
a783d2120c
|
挂机
|
2023-05-18 20:24:04 +08:00 |
|
chenxi
|
88631429fe
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-18 15:39:47 +08:00 |
|
chenxi
|
3cb5152538
|
挂机
|
2023-05-18 15:39:44 +08:00 |
|
xiekaidong
|
170ddb3066
|
技能效果生效条件判定
|
2023-05-18 15:34:17 +08:00 |
|
xiekaidong
|
f431d97537
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-18 10:58:52 +08:00 |
|
xiekaidong
|
98070979dc
|
多段伤害
|
2023-05-18 10:58:49 +08:00 |
|
chenxi
|
0289de2d9a
|
merge
|
2023-05-17 22:28:26 +08:00 |
|
chenxi
|
84be3f721b
|
挂机
|
2023-05-17 22:27:58 +08:00 |
|
xiekaidong
|
d7bee9480c
|
宝箱显示
|
2023-05-17 20:17:56 +08:00 |
|
xiekaidong
|
15cc2bd437
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/chapter_board.lua
# lua/app/config/mail.lua.meta
# lua/app/config/strings/cn/mail.lua.meta
# lua/app/config/strings/de/mail.lua.meta
# lua/app/config/strings/en/mail.lua.meta
# lua/app/config/strings/fr/mail.lua.meta
# lua/app/config/strings/ja/mail.lua.meta
# lua/app/config/strings/ko/mail.lua.meta
# lua/app/config/strings/zh/mail.lua.meta
|
2023-05-17 19:19:35 +08:00 |
|