Commit Graph

693 Commits

Author SHA1 Message Date
7c3b5e985c Merge pull request 'release' (#1) from release into master 2024-01-05 16:30:25 +08:00
dy
3c54ebe0c4 json:
扭蛋机配置概率修改
2024-01-05 16:03:56 +08:00
xichaoyin
8415d675c4 json:
cehua_public/json配置文件同步
2024-01-05 15:24:03 +08:00
xichaoyin
96b71de06d Merge branch 'bugfix' into release 2024-01-05 15:22:38 +08:00
xichaoyin
ef80c8b984 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-05 15:05:17 +08:00
xichaoyin
8560986246 fix:
修复丛林猎手段位奖励漏发问题
2024-01-05 15:05:14 +08:00
xichaoyin
9d82d08738 Merge branch 'release' of http://git.legu.cc/qixin/HJ_Server into release 2024-01-05 13:34:48 +08:00
xichaoyin
86161fca85 feat:
修改阿里云cli 认证 profile 名称
2024-01-05 13:34:46 +08:00
fa25e745eb 次数调整 2024-01-05 10:36:50 +08:00
dcb83e9520 次数调整 2024-01-05 10:00:59 +08:00
dy
bd4f128179 Merge remote-tracking branch 'origin/bugfix' into release 2024-01-05 00:38:57 +08:00
xichaoyin
a04394149d fix:
修复破冰bug
2024-01-05 00:37:40 +08:00
xichaoyin
3b3d61795e Merge remote-tracking branch 'origin/feature/weiwang' into release 2024-01-04 22:30:14 +08:00
xichaoyin
da37b162d9 fix:
破冰礼包一键领取
2024-01-04 22:25:17 +08:00
xichaoyin
8e1c5412d6 fix:
破冰礼包一键领取
2024-01-04 22:20:30 +08:00
xichaoyin
b04ce950cd fix:
充值之后推一次活动红点change
2024-01-04 21:41:21 +08:00
xichaoyin
8ec4a46837 fix:
修复礼包在最后一天可以一键领取所有奖励
2024-01-04 21:36:45 +08:00
xichaoyin
d7f0f22df7 fix:
伙伴招募红点修改
2024-01-04 21:05:11 +08:00
xichaoyin
779709a32f fix:
伙伴招募红点修改
2024-01-04 20:32:31 +08:00
dy
01f57b347f 新增活动脚本 2024-01-04 18:25:27 +08:00
xichaoyin
ec40da9ad5 fix:
修复战斗威望属性没有生效
2024-01-04 18:08:05 +08:00
dy
28adc88ff0 新增活动脚本 2024-01-04 18:04:39 +08:00
xichaoyin
42601c29fd fix:
修改gud中weiwang字段为weiwangbuff
2024-01-04 17:17:10 +08:00
dy
a50b2624ac 累计充值红点 2024-01-04 17:04:01 +08:00
dy
65d306227b 领奖,红点 2024-01-04 16:56:33 +08:00
dy
38b2f9a99e 破冰礼包增加最后一天可领取所有奖励 2024-01-04 16:50:16 +08:00
xichaoyin
2e054daa65 fix:
修复威望系统属性在探险战斗中没有生效
2024-01-04 16:12:55 +08:00
dy
3e1c45aaf9 Merge remote-tracking branch 'origin/bugfix' into bugfix 2024-01-04 16:05:59 +08:00
dy
f1dacd19b6 破冰礼包增加轮次,修复bug 2024-01-04 16:05:52 +08:00
a5e726e811 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-04 15:51:52 +08:00
8afa624f44 跨服聊天分组 2024-01-04 15:51:40 +08:00
dy
6ec6de4d56 破冰礼包拦截前端空字符串请求 2024-01-04 15:37:09 +08:00
52ab7e9979 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-04 14:30:47 +08:00
a1dbacd7fe 积分赛只刷出本服对手 2024-01-04 14:30:37 +08:00
dy
04533c80f4 fix pata/saodang 2024-01-04 11:20:00 +08:00
dy
98a3927966 fix lingzhulaixi 2024-01-04 11:05:05 +08:00
dy
eb73af1dd2 数据监测改为查半小时内在线用户 2024-01-03 22:40:24 +08:00
dy
1dd7bc2175 api pay 2024-01-03 22:10:35 +08:00
dy
ecc17a22a9 api 锁修改,一键接取悬赏 2024-01-03 21:57:12 +08:00
dy
826840455c api 锁修改 2024-01-03 20:19:58 +08:00
dy
60d0e04e33 fix 探险 gamelog 2024-01-03 19:36:28 +08:00
dy
6233a6672e Merge remote-tracking branch 'origin/bugfix' into bugfix 2024-01-03 19:28:34 +08:00
dy
afd856af30 fix 探险 2024-01-03 19:28:22 +08:00
xichaoyin
698c7bd3f6 fix:
修复讨伐海盗挑战boss胜利不扣除战斗次数bug
2024-01-03 18:42:36 +08:00
dy
7dd83e06ef watchdog.json 2024-01-03 17:35:08 +08:00
xichaoyin
3c50fdbd01 fix:
修复威望升级消耗计算错误
2024-01-03 16:27:59 +08:00
xichaoyin
20f0f41c22 fix:
王者荣耀发奖定时器容错修改
2024-01-03 15:47:02 +08:00
dy
6cc58ffd94 还原 2024-01-03 15:22:36 +08:00
dy
8d9ecf30b6 Merge remote-tracking branch 'origin/bugfix' into bugfix
# Conflicts:
#	src/api_s2c/event/leijichongzhi/ApiRec.ts
2024-01-03 14:46:30 +08:00
dy
ec85961633 累计充值轮次加校验 2024-01-03 14:45:51 +08:00