705 Commits

Author SHA1 Message Date
xiekaidong
fe245efaba 接入数据 2023-09-01 11:55:16 +08:00
xiekaidong
54c95564ba 修改一下 2023-09-01 10:52:08 +08:00
xiekaidong
0498aaf75f 战斗波次加密 2023-09-01 10:41:55 +08:00
xiekaidong
b6b342c435 boss_rush战斗 2023-09-01 10:23:48 +08:00
xiekaidong
049d7508ea bossrush 2023-08-31 20:18:14 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
xiekaidong
20eb5d0a41 bug修复 2023-08-28 19:15:27 +08:00
xiekaidong
0990640b97 每日任务宝箱动画 2023-08-28 18:56:20 +08:00
Fang
fcc5114bc5 竞技场入口红点添加段位奖励可领取情况 2023-08-28 18:19:03 +08:00
Fang
0e0ea61a59 段位奖励第一个档位标签显示fix 2023-08-28 17:51:04 +08:00
Fang
6ec4c2cd40 装备礼包fix 2023-08-28 15:25:38 +08:00
Fang
de49d604ad 档位奖励进度显示fix 2023-08-28 10:14:38 +08:00
Fang
ef77d515f2 段位奖励段位图标显示修改 2023-08-25 10:36:06 +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
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
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