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 |
|
CloudJ
|
27d3a92769
|
调整抽卡货币检测判定位置
|
2023-05-30 15:26:53 +08:00 |
|
xiekaidong
|
a828972f43
|
更新配置
|
2023-05-30 15:08:16 +08:00 |
|
xiekaidong
|
cb73d1a2ec
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-30 15:06:36 +08:00 |
|
xiekaidong
|
71daac9cb7
|
表现优化
|
2023-05-30 15:06:33 +08:00 |
|
CloudJ
|
9ce34e29d0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 14:49:42 +08:00 |
|
CloudJ
|
51dfbf1528
|
礼包整理
|
2023-05-30 14:49:39 +08:00 |
|
chenxi
|
2f720561f5
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 14:30:05 +08:00 |
|
chenxi
|
a4ace76f2f
|
主城战令名字
|
2023-05-30 14:30:02 +08:00 |
|
xiekaidong
|
334f7e870b
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-30 14:15:45 +08:00 |
|
xiekaidong
|
122c0da462
|
buff描述
|
2023-05-30 14:15:42 +08:00 |
|
chenxi
|
b29d0185b1
|
英雄解锁排序
|
2023-05-30 14:09:43 +08:00 |
|
chenxi
|
8c120b88c4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 12:16:46 +08:00 |
|
chenxi
|
5a3aeceae8
|
英雄解锁
|
2023-05-30 12:16:40 +08:00 |
|
xiekaidong
|
53e915f937
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-30 11:54:51 +08:00 |
|
xiekaidong
|
8e8930230f
|
容错
|
2023-05-30 11:54:33 +08:00 |
|
chenxi
|
b253e3946e
|
容错
|
2023-05-30 11:52:34 +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 |
|
CloudJ
|
d15e52a41d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 10:38:10 +08:00 |
|
CloudJ
|
b64ea50f65
|
审核模式增加mall_treasure表
|
2023-05-30 10:38:07 +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
|
df3442ea8b
|
正式文本
|
2023-05-30 10:22:20 +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 |
|
CloudJ
|
d280b4ef3d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 10:13:55 +08:00 |
|
CloudJ
|
1d21fd5ff5
|
红点
|
2023-05-30 10:13:53 +08:00 |
|
xiekaidong
|
6f9b12fbdd
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-30 09:57:22 +08:00 |
|
xiekaidong
|
8f1fd47fd2
|
战斗优化
|
2023-05-30 09:57:18 +08:00 |
|
CloudJ
|
c01f881307
|
配置表
|
2023-05-30 09:43:49 +08:00 |
|
CloudJ
|
08e95f0ff3
|
商城红点去掉toast
|
2023-05-30 09:43:29 +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 |
|
CloudJ
|
058c2aec8a
|
商城红点
|
2023-05-29 18:06:40 +08:00 |
|
xiekaidong
|
7b858220aa
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 17:54:04 +08:00 |
|
xiekaidong
|
34494cdb1f
|
bug修复
|
2023-05-29 17:54:02 +08:00 |
|
CloudJ
|
23fca8d7bf
|
更新首充界面
|
2023-05-29 17:15:54 +08:00 |
|
CloudJ
|
2f15a426bc
|
更新配置表
|
2023-05-29 16:25:50 +08:00 |
|