1184 Commits

Author SHA1 Message Date
xiekaidong
859bbd42b9 增加容错 2023-08-29 14:54:54 +08:00
xiekaidong
0990640b97 每日任务宝箱动画 2023-08-28 18:56:20 +08:00
xiekaidong
d23ea152e2 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-lua into dev_20230829 2023-08-28 18:36:05 +08:00
xiekaidong
6c5f5a16c2 显示修复 2023-08-28 18:36:01 +08:00
Fang
36bb8eede2 段位奖励添加奖励光效 2023-08-28 17:41:52 +08:00
Fang
6ec4c2cd40 装备礼包fix 2023-08-28 15:25:38 +08:00
xiekaidong
0ebb735e8f 封号删除账号 2023-08-28 14:12:36 +08:00
Fang
de49d604ad 档位奖励进度显示fix 2023-08-28 10:14:38 +08:00
Fang
ef77d515f2 段位奖励段位图标显示修改 2023-08-25 10:36:06 +08:00
xiekaidong
787b04bfc7 动画 2023-08-24 18:28:56 +08:00
xiekaidong
59ef7b2f09 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-lua into dev_20230829 2023-08-24 18:25:55 +08:00
xiekaidong
19399ae3a6 更改基金开启时间 2023-08-24 18:25:46 +08:00
陈希
5f4bf206df Merge branch 'fang/装备礼包' into 'dev_20230829'
装备升级礼包

See merge request b6-client/b6-lua!13
2023-08-24 10:24:21 +00:00
Fang
e76e7ccab6 段位奖励展示修改、添加收集标签红点 2023-08-24 18:09:23 +08:00
Fang
2da8da07d0 装备升级礼包 2023-08-24 17:29:33 +08:00
xiekaidong
4d5c23a6b6 容错 2023-08-24 14:30:39 +08:00
xiekaidong
bc42d8e4a8 界面处理 2023-08-23 17:46:31 +08:00
xiekaidong
b2a829741b 界面调整 2023-08-23 17:35:27 +08:00
Fang
f15917914c 竞技场段位奖励 2023-08-23 14:40:52 +08:00
Fang
7b0f71065f fix 2023-08-21 15:53:22 +08:00
Fang
a68c4c79f2 连续快速扫荡显示fix 2023-08-21 14:55:07 +08:00
Fang
bff1f50a2b 连续快速扫荡显示fix 2023-08-21 14:37:53 +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
7babd6aaec 英雄排序方式 2023-08-18 18:46:44 +08:00
xiekaidong
0137884ad9 一些描述 2023-08-18 18:35:38 +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
xiekaidong
9fa692f53f 英雄基金 2023-08-18 09:50:44 +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
xiekaidong
7fdadd75b4 层级调整 2023-08-16 11:27:54 +08:00
xiekaidong
4ffcda7f0e 优化 2023-08-15 19:41:17 +08:00
xiekaidong
5d910f5ebc 容错和容错 2023-08-15 19:34:02 +08:00
xiekaidong
b3a00ab628 优化 2023-08-15 18:42:13 +08:00
Fang
1ccef0858b 红点遮挡处理 2023-08-15 16:17:21 +08:00
Fang
fe726dbebf 显示fix 2023-08-15 15:34:27 +08:00
Fang
8cfd6358d8 bug fix 2023-08-15 15:08:07 +08:00
Fang
2f59d74b96 竞技场皮肤属性完善 2023-08-15 12:20:17 +08:00
Fang
73257960b8 bug fix 2023-08-15 11:30:21 +08:00
Fang
e802a03550 活动等级达到最大报错fix 2023-08-15 10:28:20 +08:00
Fang
39ae534750 皮肤道具点开界面 2023-08-14 19:34:02 +08:00
xiekaidong
4a4b25e11c 竞技场弹出礼包界面 2023-08-14 14:52:38 +08:00
Fang
0eebc9b6cd 英雄生命值显示fix 2023-08-14 11:12:57 +08:00
Fang
a1a13036c9 夏日活动战令购买spine动画调换 2023-08-14 09:58:26 +08:00
Fang
391e171497 资源替换 2023-08-11 17:02:08 +08:00
Fang
fde89edddb 装备副本界面添加礼包入口 2023-08-11 16:34:50 +08:00