xiekaidong
|
c880279be1
|
英雄基金
|
2023-08-18 18:08:48 +08:00 |
|
xiekaidong
|
5b119201cf
|
界面和协议
|
2023-08-17 18:16:06 +08:00 |
|
chenxi
|
bd2ec71dd9
|
Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-lua into dev_20230815
|
2023-08-15 21:46:00 +08:00 |
|
chenxi
|
9dbd673ec2
|
白名单
|
2023-08-15 21:45:52 +08:00 |
|
Fang
|
ff930c7264
|
夏日活动上报修改
|
2023-08-15 20:40:24 +08:00 |
|
Fang
|
f0767abd9f
|
夏日活动上报
|
2023-08-15 20:31:24 +08:00 |
|
xiekaidong
|
4a4b25e11c
|
竞技场弹出礼包界面
|
2023-08-14 14:52:38 +08:00 |
|
Fang
|
84796cd4a8
|
活动礼包弹出逻辑补充
|
2023-08-11 15:08:23 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
xiekaidong
|
5eff2c3633
|
上报和容错
|
2023-08-10 18:41:24 +08:00 |
|
xiekaidong
|
18d447de17
|
名称修改
|
2023-08-10 11:56:45 +08:00 |
|
xiekaidong
|
d311ea14aa
|
Merge branch 'master' into dev_20230815
# Conflicts:
# lua/app/config/avatar_frame.lua
# lua/app/config/chapter_board.lua
# lua/app/config/grid_type.lua
# lua/app/config/strings/cn/avatar.lua
# lua/app/config/strings/cn/avatar_frame.lua
# lua/app/config/strings/en/avatar.lua
# lua/app/config/strings/en/avatar_frame.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/avatar.lua
# lua/app/config/strings/es/avatar_frame.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/id/avatar.lua
# lua/app/config/strings/id/avatar_frame.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/avatar.lua
# lua/app/config/strings/ja/avatar_frame.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ko/avatar.lua
# lua/app/config/strings/ko/avatar_frame.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/avatar.lua
# lua/app/config/strings/pt/avatar_frame.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/th/avatar.lua
# lua/app/config/strings/th/avatar_frame.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/avatar.lua
# lua/app/config/strings/vi/avatar_frame.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/avatar.lua
# lua/app/config/strings/zh/avatar_frame.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/summon.lua
# lua/app/module/battle/component/battle_unit_comp.lua
# lua/app/module/battle/team/battle_team.lua
|
2023-08-10 09:39:07 +08:00 |
|
xiekaidong
|
e8ad813399
|
删除打印
|
2023-08-09 16:50:39 +08:00 |
|
xiekaidong
|
996f3deeee
|
添加打印
|
2023-08-09 16:21:12 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
xiekaidong
|
ad56074c71
|
新增上报
|
2023-08-07 18:15:19 +08:00 |
|
xiekaidong
|
f0ec99f24a
|
字段修改
|
2023-08-07 15:50:46 +08:00 |
|
xiekaidong
|
7aa2b95686
|
宝箱日志上报
|
2023-08-07 15:33:06 +08:00 |
|
xiekaidong
|
f74226c056
|
增加上报属性
|
2023-08-07 10:35:11 +08:00 |
|
xiekaidong
|
f3e4284916
|
修改一下上报信息
|
2023-08-04 11:28:51 +08:00 |
|
xiekaidong
|
a47f18db07
|
日志上报
|
2023-08-03 14:20:16 +08:00 |
|
xiekaidong
|
a90f0f4583
|
bug修复
|
2023-08-01 18:20:35 +08:00 |
|
Fang
|
678a8fbd4c
|
添加音效
|
2023-08-01 11:10:51 +08:00 |
|
xiekaidong
|
0c840c0cc8
|
Merge branch 'battle' into dev_20230809
|
2023-07-31 16:25:48 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
Fang
|
9a3850c145
|
添加英雄升级标签红点，标签红点更新fix
|
2023-07-26 16:14:24 +08:00 |
|
Fang
|
11624308ea
|
动效、fix
|
2023-07-25 22:33:51 +08:00 |
|
Fang
|
a5d2749ede
|
支线基金看完广告直接领奖
|
2023-07-25 19:59:31 +08:00 |
|
Fang
|
6753303909
|
界面跳转未关闭fix
|
2023-07-25 15:44:10 +08:00 |
|
Fang
|
2933776048
|
支线基金
|
2023-07-24 11:54:09 +08:00 |
|
Fang
|
61b302305e
|
装备礼包
|
2023-07-21 09:35:21 +08:00 |
|
xiekaidong
|
100e125c19
|
Merge branch 'dev_20230725' into dungeon
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/module_manager.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
|
2023-07-20 19:45:54 +08:00 |
|
xiekaidong
|
b8751b9229
|
支线副本
|
2023-07-20 19:44:41 +08:00 |
|
xiekaidong
|
8b4933f4f0
|
支线副本
|
2023-07-20 17:41:42 +08:00 |
|
Fang
|
cc7feea039
|
review
|
2023-07-20 16:20:11 +08:00 |
|
Fang
|
28bf5ab6ad
|
装备系统
|
2023-07-20 10:15:42 +08:00 |
|
xiekaidong
|
c2dc577fc6
|
Merge branch 'dev_20230725' into dungeon
|
2023-07-19 20:18:27 +08:00 |
|
xiekaidong
|
2ffd6e88ba
|
装备副本
|
2023-07-19 20:16:17 +08:00 |
|
xiekaidong
|
000bc5e926
|
武器副本的一些界面
|
2023-07-19 16:52:28 +08:00 |
|
chenxi
|
a2e2370d29
|
上报逻辑调整
|
2023-07-19 15:36:40 +08:00 |
|
chenxi
|
dad792f0af
|
初始化AF广告回传sdk
|
2023-07-19 14:59:25 +08:00 |
|
chenxi
|
c643750a33
|
广告价值回传
|
2023-07-19 11:29:43 +08:00 |
|
xiekaidong
|
854ce2b986
|
通用扫荡弹窗
|
2023-07-19 10:39:22 +08:00 |
|
chenxi
|
e20311211e
|
广告价值回传上报
|
2023-07-19 09:49:49 +08:00 |
|
chenxi
|
be2e185a77
|
Merge branch 'master' into dev_20230725
|
2023-07-19 09:48:56 +08:00 |
|
xiekaidong
|
c3e62e4bc2
|
修改一下命名
|
2023-07-18 17:04:09 +08:00 |
|
xiekaidong
|
2610718eb2
|
副本入口
|
2023-07-18 17:01:27 +08:00 |
|
xiekaidong
|
fe73554226
|
上报
|
2023-07-18 16:36:26 +08:00 |
|
xiekaidong
|
a2ca40f00c
|
优化一下性能
|
2023-07-18 15:35:49 +08:00 |
|
xiekaidong
|
ed400f1b75
|
处理一下跨等级上报
|
2023-07-18 15:28:22 +08:00 |
|