xiekaidong
|
fdbafd1dfe
|
增加一个战斗内使用的gm命令
|
2023-05-30 15:56:29 +08:00 |
|
chenxi
|
9feb782b67
|
界面文本
|
2023-05-30 15:50:18 +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
|
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 |
|
陈希
|
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
|
47ad46fba9
|
审核模式调整
|
2023-05-30 11:34:38 +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 |
|
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
|
058c2aec8a
|
商城红点
|
2023-05-29 18:06:40 +08:00 |
|
CloudJ
|
23fca8d7bf
|
更新首充界面
|
2023-05-29 17:15:54 +08:00 |
|
CloudJ
|
2f15a426bc
|
更新配置表
|
2023-05-29 16:25:50 +08:00 |
|
CloudJ
|
0faa73f5f2
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 15:38:15 +08:00 |
|
CloudJ
|
81fe73352d
|
商城开启条件
|
2023-05-29 15:38:13 +08:00 |
|
chenxi
|
71b9dd23a1
|
解锁逻辑
|
2023-05-29 15:19:24 +08:00 |
|
CloudJ
|
2fffb5c88a
|
商城
|
2023-05-29 15:10:04 +08:00 |
|
chenxi
|
d47baeebc1
|
调整一下英雄解锁的逻辑
|
2023-05-29 15:06:25 +08:00 |
|
CloudJ
|
8cc59343b7
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 14:05:35 +08:00 |
|
CloudJ
|
f8a4bf7935
|
多语言
|
2023-05-29 14:05:32 +08:00 |
|
chenxi
|
6c4e4da30a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 12:01:54 +08:00 |
|
chenxi
|
a68579db48
|
修复任务bug
|
2023-05-29 12:01:46 +08:00 |
|
xiekaidong
|
5d92a06f2f
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 11:20:03 +08:00 |
|
xiekaidong
|
28cebc3702
|
引导表现
|
2023-05-29 11:20:00 +08:00 |
|
chenxi
|
e99af16f39
|
从任务跳转去战令，如果没有购买一定要弹出购买界面
|
2023-05-29 11:15:30 +08:00 |
|
CloudJ
|
8ed5c657b1
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/module/maincity/maincity_const.lua
|
2023-05-29 11:04:25 +08:00 |
|
CloudJ
|
792830c90e
|
首充礼包
|
2023-05-29 11:03:43 +08:00 |
|
chenxi
|
5ab6aac2b6
|
代码重命名
|
2023-05-29 10:54:10 +08:00 |
|
chenxi
|
b76db94a30
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-26 22:43:46 +08:00 |
|
chenxi
|
66c0f4810f
|
战令滑动区域
|
2023-05-26 22:43:43 +08:00 |
|
CloudJ
|
d53e491175
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-26 19:57:16 +08:00 |
|
CloudJ
|
c106607a65
|
成长礼包逻辑
|
2023-05-26 19:57:13 +08:00 |
|
chenxi
|
dc96cf269e
|
调整侧标栏按钮位置
|
2023-05-26 19:25:41 +08:00 |
|
chenxi
|
7cfdc4a2f1
|
奖励图标
|
2023-05-26 18:47:31 +08:00 |
|
Fang
|
0288f2a300
|
boss界面模型比例适配
|
2023-05-26 18:39:07 +08:00 |
|
Fang
|
b57318f3a6
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
|
2023-05-26 18:26:21 +08:00 |
|