2322 Commits

Author SHA1 Message Date
xiekaidong
33673c2f17 逻辑调整 2023-08-28 19:11:47 +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
fcc5114bc5 竞技场入口红点添加段位奖励可领取情况 2023-08-28 18:19:03 +08:00
Fang
0e0ea61a59 段位奖励第一个档位标签显示fix 2023-08-28 17:51:04 +08:00
Fang
36bb8eede2 段位奖励添加奖励光效 2023-08-28 17:41:52 +08:00
Fang
6ec4c2cd40 装备礼包fix 2023-08-28 15:25:38 +08:00
xiekaidong
80d263a6de bug修复 2023-08-28 15:14:42 +08:00
xiekaidong
a24e64ba74 调整一下填充和格子效果的逻辑顺序 2023-08-28 14:50:14 +08:00
xiekaidong
6409d60ae2 登录状态 2023-08-28 14:19:41 +08:00
xiekaidong
0ebb735e8f 封号删除账号 2023-08-28 14:12:36 +08:00
xiekaidong
d5afdffecf 封号功能和屏蔽一些网络冗余操作 2023-08-28 14:04:23 +08:00
xiekaidong
652b75c637 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-lua into dev_20230829 2023-08-28 11:11:08 +08:00
xiekaidong
d05cec484a bug修复 2023-08-28 11:11:04 +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
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
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
xiekaidong
18cd61d870 解锁判定 2023-08-22 18:08:51 +08:00
xiekaidong
5b53c074b0 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-lua into dev_20230829 2023-08-22 17:46:41 +08:00
xiekaidong
b57617a85c 排序 2023-08-22 17:46:28 +08:00
Fang
017be0ef1c 新增皮肤报错fix 2023-08-22 11:56:22 +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
381a4477bd bug修复 2023-08-21 11:22:31 +08:00
xiekaidong
4f20b37d56 更新配置 2023-08-21 10:48:26 +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
chenxi
3230b99fb3 上报参数 2023-08-18 20:13:29 +08:00
xiekaidong
1bb5bb0fb3 诅咒回血被腐败影响 2023-08-18 18:55:46 +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
cd4b4d4105 更新配置 2023-08-18 11:52:03 +08:00
xiekaidong
8ad104e38d 选技能buf修复 2023-08-18 11:44:57 +08:00
xiekaidong
d284ed0bc4 英雄基金 2023-08-18 11:38:21 +08:00