Commit Graph

570 Commits

Author SHA1 Message Date
dy
14effac507 Merge branch 'feature/json' into dev 2023-12-22 20:33:45 +08:00
dy
30a02fbd36 json 2023-12-22 20:33:34 +08:00
dy
0850a729ed Merge branch 'dev-meirilibao' into dev 2023-12-22 20:26:44 +08:00
dy
7fc9b0564f 每日礼包领取免费 2023-12-22 20:26:25 +08:00
df6927b8ff Merge branch 'feature/pay_for_diamond' into dev 2023-12-22 20:13:43 +08:00
bcca0ebbab fix: 修复最大总额计算错误的 bug 2023-12-22 20:13:18 +08:00
xcy
76626120c4 feat:
累充礼包
2023-12-22 20:02:14 +08:00
xcy
372c84fd05 feat:
proto
2023-12-22 20:00:13 +08:00
xcy
9490faa364 fix:
累充礼包
2023-12-22 19:52:58 +08:00
dy
9df6e2f19f Merge branch 'feature/json' into dev 2023-12-22 19:47:24 +08:00
dy
d00cb7895e json 2023-12-22 19:47:15 +08:00
243265a49c Merge branch 'feature/pay_for_diamond' into dev 2023-12-22 19:27:30 +08:00
7eb34f872d fix: 调整可领取红包的判断逻辑 2023-12-22 19:26:18 +08:00
xcy
27f2ac75c5 fix:
添加接口
2023-12-22 19:21:23 +08:00
xcy
506785f360 fix:
添加接口
2023-12-22 19:20:28 +08:00
9d5b36b223 Merge branch 'feature/pay_for_diamond' into dev 2023-12-22 19:00:34 +08:00
02dccd18a7 fix: 修复细节问题 2023-12-22 19:00:11 +08:00
26a04a778b Merge branch 'feature/pay_for_diamond' into dev 2023-12-22 18:28:45 +08:00
dy
82fd7da144 proto 2023-12-22 18:27:57 +08:00
40774138d2 fix: 将活动改为跨服活动 2023-12-22 18:27:46 +08:00
dy
511a663e6b Merge branch 'feature/dadian' into dev 2023-12-22 18:18:29 +08:00
dy
7f60477a86 游戏内打点 2023-12-22 18:18:10 +08:00
xcy
4c9ad23bc1 fix:
添加接口
2023-12-22 18:04:56 +08:00
dy
2d9d577f8b Merge branch 'feature/json' into dev 2023-12-22 18:01:45 +08:00
dy
acbf8a6ec6 json 2023-12-22 17:57:50 +08:00
b47c729a3c Merge branch 'feature/pay_for_diamond' into dev 2023-12-22 17:09:01 +08:00
eed6dd1b8f fix: 添加红点及玩家发奖 2023-12-22 17:06:19 +08:00
dy
122fc28388 Merge branch 'feature/xiaofeijingsai' into dev 2023-12-22 16:50:33 +08:00
dy
c3ba3934d4 消费竞赛定时器发奖,每天0点5分检测活动 结束 2023-12-22 16:49:21 +08:00
dec4ce2cc4 Merge branch 'feature/pay_for_diamond' into dev 2023-12-22 16:35:25 +08:00
36b15af077 fix: 添加 price 回参表示领取门槛 2023-12-22 16:34:54 +08:00
xcy
efe5bd3216 fix:
email 过滤 prizelist
2023-12-22 16:15:22 +08:00
xcy
a2d16fb530 fix:
email 过滤 prizelist
2023-12-22 16:15:06 +08:00
xcy
32c779a5a4 fix:
异步查库改为同步插库
2023-12-22 16:07:15 +08:00
xcy
753dd8decb fix:
异步查库改为同步插库
2023-12-22 16:06:57 +08:00
xcy
2720d5e59a fix:
异步查库改为同步插库
2023-12-22 16:02:11 +08:00
dy
8837ded042 Merge branch 'feature/json' into feature/xiaofeijingsai 2023-12-22 16:00:28 +08:00
xcy
791dbc5472 fix:
异步查库改为同步插库
2023-12-22 16:00:23 +08:00
dy
1ed15d2b5c Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 15:01:40 +08:00
dy
7c3da937a5 Merge branch 'feature/json' into dev 2023-12-22 15:01:30 +08:00
dy
6b80b07cfe json 2023-12-22 15:01:23 +08:00
dy
a135acbc93 Merge branch 'master' into feature/json 2023-12-22 15:00:23 +08:00
304a67e56f Merge branch 'feature/pay_for_diamond' into dev 2023-12-22 15:00:20 +08:00
2a492a8919 fix: 修复玩家可以重复领取的 bug 2023-12-22 14:59:33 +08:00
dy
ffbb2b3af3 Merge branch 'bugfix' into dev 2023-12-22 14:39:25 +08:00
7ca6fe75e3 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2023-12-22 14:34:18 +08:00
dy
a0bdc11a05 Merge remote-tracking branch 'origin/dev-leijichongzhi' into dev 2023-12-22 14:34:08 +08:00
dda11bb122 事件容错处理 2023-12-22 14:33:49 +08:00
xcy
6526d386c4 feat:
累充礼包
2023-12-22 14:33:43 +08:00
dy
8710d7d04f Merge branch 'feature/xiaofeijingsai' into dev 2023-12-22 14:11:02 +08:00