xiekaidong
|
b74ed4efeb
|
每日战斗返回
|
2023-06-01 10:15:26 +08:00 |
|
CloudJ
|
e2f2f8ca70
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-01 10:00:13 +08:00 |
|
CloudJ
|
83753326b6
|
抽卡表现 先临时提一波
|
2023-06-01 10:00:10 +08:00 |
|
chenxi
|
2b4dc82363
|
账号相关
|
2023-05-31 22:38:15 +08:00 |
|
chenxi
|
35a6bc5fa7
|
账号绑定
|
2023-05-31 22:23:04 +08:00 |
|
xiekaidong
|
ebb4a77f18
|
每日挑战bug修复
|
2023-05-31 21:13:35 +08:00 |
|
xiekaidong
|
ededa19132
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-31 18:06:18 +08:00 |
|
xiekaidong
|
4c4ae980dc
|
bug修复
|
2023-05-31 18:06:16 +08:00 |
|
chenxi
|
c996e1414e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-31 17:53:44 +08:00 |
|
chenxi
|
fe3c8849b8
|
删除账号
|
2023-05-31 17:53:41 +08:00 |
|
xiekaidong
|
12d73fc941
|
特效反转
|
2023-05-31 17:22:48 +08:00 |
|
xiekaidong
|
10bd5a422d
|
bug修复
|
2023-05-31 16:43:46 +08:00 |
|
xiekaidong
|
9bfc156ad0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-31 16:04:49 +08:00 |
|
xiekaidong
|
8c779f826c
|
bug修复
|
2023-05-31 16:04:46 +08:00 |
|
CloudJ
|
44a7937320
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-31 15:41:44 +08:00 |
|
CloudJ
|
298a0aaa1b
|
修复一些商城的bug
|
2023-05-31 15:41:42 +08:00 |
|
Fang
|
2b92ed0909
|
main界面模块切换逻辑重构
|
2023-05-31 14:40:08 +08:00 |
|
xiekaidong
|
6571f6f480
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-31 14:23:51 +08:00 |
|
xiekaidong
|
89b35ce6aa
|
战斗相关bug修复
|
2023-05-31 14:23:48 +08:00 |
|
Fang
|
325d906a3c
|
每日挑战跨天请求时机优化
|
2023-05-31 11:59:50 +08:00 |
|
xiekaidong
|
19f2695c22
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-31 11:10:33 +08:00 |
|
xiekaidong
|
d4a1b5be93
|
描述修改
|
2023-05-31 11:10:29 +08:00 |
|
Fang
|
17b5f1129c
|
每日挑战界面调整、扣除次数修复
|
2023-05-31 10:24:51 +08:00 |
|
CloudJ
|
521bcf9c1a
|
宝箱钥匙展示规则调整
|
2023-05-31 10:12:13 +08:00 |
|
xiekaidong
|
676ea6bfe8
|
显示bug修复
|
2023-05-30 18:12:39 +08:00 |
|
xiekaidong
|
fdbafd1dfe
|
增加一个战斗内使用的gm命令
|
2023-05-30 15:56:29 +08:00 |
|
xiekaidong
|
03061784f1
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-30 15:41:26 +08:00 |
|
xiekaidong
|
6f59974c33
|
优化代码
|
2023-05-30 15:41:23 +08:00 |
|
chenxi
|
1c4589843c
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 15:33:04 +08:00 |
|
chenxi
|
5d7771fd87
|
解锁新功能弹窗
|
2023-05-30 15:32:58 +08:00 |
|
xiekaidong
|
71daac9cb7
|
表现优化
|
2023-05-30 15:06:33 +08:00 |
|
xiekaidong
|
122c0da462
|
buff描述
|
2023-05-30 14:15:42 +08:00 |
|
xiekaidong
|
8e8930230f
|
容错
|
2023-05-30 11:54:33 +08:00 |
|
陈希
|
bbc196035c
|
Merge branch 'fang/daily_challenge' into 'dev'
每日挑战
See merge request b6-client/b6-lua!1
|
2023-05-30 03:38:33 +00:00 |
|
CloudJ
|
d4b477410d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 11:34:41 +08:00 |
|
CloudJ
|
47ad46fba9
|
审核模式调整
|
2023-05-30 11:34:38 +08:00 |
|
xiekaidong
|
c512a7fe5f
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-30 11:30:08 +08:00 |
|
xiekaidong
|
c3bcb35a33
|
没有战斗动作的技能
|
2023-05-30 11:29:59 +08:00 |
|
Fang
|
9b3a00e809
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
|
2023-05-30 10:35:05 +08:00 |
|
chenxi
|
bcfd27d6f0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 10:17:34 +08:00 |
|
chenxi
|
837f54acda
|
英雄解锁
|
2023-05-30 10:17:31 +08:00 |
|
xiekaidong
|
8f1fd47fd2
|
战斗优化
|
2023-05-30 09:57:18 +08:00 |
|
xiekaidong
|
09e8acb915
|
删除空余行
|
2023-05-29 21:00:24 +08:00 |
|
xiekaidong
|
fe6994625c
|
bug修复
|
2023-05-29 20:56:46 +08:00 |
|
xiekaidong
|
c50f92bbc0
|
bug修复
|
2023-05-29 20:21:05 +08:00 |
|
xiekaidong
|
058ff2220d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 19:25:28 +08:00 |
|
xiekaidong
|
13e752a761
|
bug修复
|
2023-05-29 19:25:25 +08:00 |
|
Fang
|
3880dfd3d2
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# lua/app/common/module_manager.lua
# lua/app/config/buff_daily_challenge.lua
# lua/app/config/chapter.lua
# lua/app/config/hero.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/global.lua
|
2023-05-29 18:24:33 +08:00 |
|
Fang
|
74f242b214
|
每日挑战开启状态变化fix
|
2023-05-29 18:22:17 +08:00 |
|
CloudJ
|
2cd302d0bf
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 18:07:46 +08:00 |
|