Fang
|
692277440e
|
定时器处理
|
2023-08-24 18:20:58 +08:00 |
|
Fang
|
e76e7ccab6
|
段位奖励展示修改、添加收集标签红点
|
2023-08-24 18:09:23 +08:00 |
|
Fang
|
2da8da07d0
|
装备升级礼包
|
2023-08-24 17:29:33 +08:00 |
|
xiekaidong
|
b2a829741b
|
界面调整
|
2023-08-23 17:35:27 +08:00 |
|
Fang
|
f15917914c
|
竞技场段位奖励
|
2023-08-23 14:40:52 +08:00 |
|
xiekaidong
|
18cd61d870
|
解锁判定
|
2023-08-22 18:08:51 +08:00 |
|
xiekaidong
|
b57617a85c
|
排序
|
2023-08-22 17:46:28 +08:00 |
|
xiekaidong
|
0549a8b37b
|
bug修复
|
2023-08-21 10:33:14 +08:00 |
|
xiekaidong
|
08553687ae
|
Merge branch 'master' into dev_20230829
# Conflicts:
# lua/app/common/event_manager.lua
|
2023-08-21 09:48:11 +08:00 |
|
xiekaidong
|
0146396ccf
|
报错修复
|
2023-08-21 09:47:01 +08:00 |
|
xiekaidong
|
7babd6aaec
|
英雄排序方式
|
2023-08-18 18:46:44 +08:00 |
|
xiekaidong
|
57682466f6
|
Merge branch 'herofund' into dev_20230829
|
2023-08-18 18:09:20 +08:00 |
|
xiekaidong
|
c880279be1
|
英雄基金
|
2023-08-18 18:08:48 +08:00 |
|
xiekaidong
|
b5fb7a7e28
|
英雄基金
|
2023-08-18 14:39:01 +08:00 |
|
xiekaidong
|
d284ed0bc4
|
英雄基金
|
2023-08-18 11:38:21 +08:00 |
|
xiekaidong
|
dd3d4d812a
|
一些优化和容错
|
2023-08-18 10:55:51 +08:00 |
|
Fang
|
0c1a32e322
|
未解锁英雄装备升级有红点处理
|
2023-08-17 19:08:37 +08:00 |
|
Fang
|
3f31bec399
|
容错处理
|
2023-08-17 19:05:59 +08:00 |
|
xiekaidong
|
5b119201cf
|
界面和协议
|
2023-08-17 18:16:06 +08:00 |
|
Fang
|
e85bf4888d
|
优化夏日活动请求
|
2023-08-17 12:06:56 +08:00 |
|
xiekaidong
|
254a27563a
|
战令一键领取
|
2023-08-16 17:35:17 +08:00 |
|
Fang
|
e85055d67a
|
头像、头像框道具解锁优化
|
2023-08-16 11:52:00 +08:00 |
|
Fang
|
41e3a090f9
|
审核处理
|
2023-08-15 21:24:55 +08:00 |
|
Fang
|
f0767abd9f
|
夏日活动上报
|
2023-08-15 20:31:24 +08:00 |
|
Fang
|
8cfd6358d8
|
bug fix
|
2023-08-15 15:08:07 +08:00 |
|
xiekaidong
|
2aff8266ac
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815
|
2023-08-15 14:59:18 +08:00 |
|
xiekaidong
|
aff0c425bf
|
背景特效
|
2023-08-15 14:59:15 +08:00 |
|
Fang
|
2f59d74b96
|
竞技场皮肤属性完善
|
2023-08-15 12:20:17 +08:00 |
|
Fang
|
e802a03550
|
活动等级达到最大报错fix
|
2023-08-15 10:28:20 +08:00 |
|
xiekaidong
|
5bd2b94cd8
|
技能位置
|
2023-08-15 09:21:50 +08:00 |
|
Fang
|
4845fd5480
|
报错fix
|
2023-08-14 18:40:22 +08:00 |
|
Fang
|
8b51ce9f07
|
容错
|
2023-08-14 18:32:28 +08:00 |
|
xiekaidong
|
4b2744d5c7
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815
|
2023-08-14 16:27:56 +08:00 |
|
xiekaidong
|
9249ee3210
|
重生处理
|
2023-08-14 16:27:52 +08:00 |
|
Fang
|
e3ef0c1f5f
|
容错处理
|
2023-08-14 16:13:22 +08:00 |
|
Fang
|
0eebc9b6cd
|
英雄生命值显示fix
|
2023-08-14 11:12:57 +08:00 |
|
Fang
|
34282dc81b
|
竞技场宝箱弹出规则优化、bugfix
|
2023-08-11 15:37:26 +08:00 |
|
Fang
|
84796cd4a8
|
活动礼包弹出逻辑补充
|
2023-08-11 15:08:23 +08:00 |
|
Fang
|
ba449382a9
|
细节完善
|
2023-08-11 14:26:52 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
xiekaidong
|
4c65578099
|
更新配置
|
2023-08-11 10:41:09 +08:00 |
|
xiekaidong
|
5eff2c3633
|
上报和容错
|
2023-08-10 18:41:24 +08:00 |
|
xiekaidong
|
5b8030552d
|
皮肤技能表现
|
2023-08-10 10:48:30 +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
|
1ecb11124d
|
补充
|
2023-08-09 17:18:14 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
Fang
|
92a147c14c
|
装备礼包弹出fix
|
2023-08-09 10:57:58 +08:00 |
|
xiekaidong
|
1eb1295c1c
|
金猪
|
2023-08-09 10:21:13 +08:00 |
|
xiekaidong
|
8f07e19054
|
新机制
|
2023-08-08 16:37:57 +08:00 |
|
xiekaidong
|
26862b0e02
|
Merge branch 'dev_20230815' into battle
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/es/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
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/helper/battle_buff_handle.lua
|
2023-08-08 16:02:24 +08:00 |
|