2291 Commits

Author SHA1 Message Date
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
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
xiekaidong
dd3d4d812a 一些优化和容错 2023-08-18 10:55:51 +08:00
xiekaidong
9fa692f53f 英雄基金 2023-08-18 09:50:44 +08:00
Fang
0c1a32e322 未解锁英雄装备升级有红点处理 2023-08-17 19:08:37 +08:00
Fang
3f31bec399 容错处理 2023-08-17 19:05:59 +08:00
xiekaidong
87cedf6a28 更新配置 2023-08-17 18:59:17 +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
xiekaidong
7fdadd75b4 层级调整 2023-08-16 11:27:54 +08:00
xiekaidong
c60d8cfdcb 更新配置 2023-08-16 11:00:12 +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
xiekaidong
ad1aaffe74 更新配置 2023-08-15 21:39:25 +08:00
Fang
41e3a090f9 审核处理 2023-08-15 21:24:55 +08:00
Fang
ff930c7264 夏日活动上报修改 2023-08-15 20:40:24 +08:00
Fang
f0767abd9f 夏日活动上报 2023-08-15 20:31:24 +08:00
xiekaidong
4ffcda7f0e 优化 2023-08-15 19:41:17 +08:00
xiekaidong
5d910f5ebc 容错和容错 2023-08-15 19:34:02 +08:00
xiekaidong
a62d759abc 更新配置 2023-08-15 18:42:55 +08:00
xiekaidong
b3a00ab628 优化 2023-08-15 18:42:13 +08:00
xiekaidong
eeeadeace0 复活判定逻辑 2023-08-15 17:32:54 +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
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
xiekaidong
c515a8be09 战斗任务统计 2023-08-15 12:15:21 +08:00
xiekaidong
27388b3238 bug修复 2023-08-15 11:51:36 +08:00
Fang
fbe290212e 导表 2023-08-15 11:37:27 +08:00