xcy
|
59a07175e6
|
Merge branch 'bugfix' into dev
|
2023-12-29 18:43:58 +08:00 |
|
dy
|
718add173f
|
Merge branch 'feature/json' into dev
|
2023-12-29 16:52:17 +08:00 |
|
dy
|
94cf1f9c4f
|
Merge branch 'bugfix' into dev
|
2023-12-29 16:26:22 +08:00 |
|
dy
|
be8691ce6d
|
Merge branch 'bugfix' into dev
|
2023-12-29 16:21:55 +08:00 |
|
dy
|
f7cf497ded
|
Merge branch 'bugfix' into dev
|
2023-12-29 14:22:17 +08:00 |
|
dy
|
3462540159
|
Merge branch 'bugfix' into dev
# Conflicts:
# src/public/pay.ts
|
2023-12-29 13:53:02 +08:00 |
|
xcy
|
52a112085b
|
Merge remote-tracking branch 'origin/bugfix' into dev
|
2023-12-28 18:46:58 +08:00 |
|
xcy
|
2894f384b9
|
Merge remote-tracking branch 'origin/bugfix' into dev
# Conflicts:
# src/public/rank/rank.ts
|
2023-12-28 18:22:20 +08:00 |
|
xcy
|
2739774842
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-28 18:20:15 +08:00 |
|
dy
|
17aa676fa9
|
Merge branch 'bugfix' into dev
|
2023-12-28 16:16:09 +08:00 |
|
xcy
|
34ce5c01aa
|
fix:
修复终身卡邮件没有type
|
2023-12-28 15:19:06 +08:00 |
|
xcy
|
4fa797f93d
|
fix:
终身卡发放奖励bug修复
|
2023-12-28 14:49:17 +08:00 |
|
xcy
|
be85366d04
|
fix:
终身卡定时器log
|
2023-12-28 14:43:00 +08:00 |
|
dy
|
e1430b6411
|
Merge branch 'bugfix' into dev
|
2023-12-28 14:18:58 +08:00 |
|
xcy
|
0b2a9f3dc7
|
累计充值累计金额修改为累计vip经验(金额*10)
|
2023-12-28 13:44:53 +08:00 |
|
xcy
|
b79d80beed
|
fix:
修复终身卡每周奖励未发放bug
|
2023-12-28 11:49:44 +08:00 |
|
Your Name
|
3898cee713
|
fix:
修复悬赏任务一键领取3倍奖励逻辑错误
|
2023-12-28 11:11:34 +08:00 |
|
Your Name
|
dda879b037
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2023-12-28 10:10:05 +08:00 |
|
Your Name
|
99e84d65a5
|
fix:修复悬赏任务一键领取特权问题
|
2023-12-28 10:09:58 +08:00 |
|
dy
|
2811d16323
|
Merge branch 'bugfix' into dev
|
2023-12-28 10:06:30 +08:00 |
|
xcy
|
0e93358e74
|
fix:
丛林猎手优化
|
2023-12-28 00:02:12 +08:00 |
|
dy
|
57c5a8a5e7
|
Revert "fix pay"
This reverts commit b9a556ea30.
|
2023-12-27 22:56:55 +08:00 |
|
dy
|
7b5c470f52
|
fix 红点
|
2023-12-27 22:31:09 +08:00 |
|
dy
|
b013e9042c
|
Merge branch 'bugfix' into dev
|
2023-12-27 22:10:19 +08:00 |
|
dy
|
b9a556ea30
|
fix pay
|
2023-12-27 22:09:53 +08:00 |
|
dy
|
757f1ba4b8
|
Merge branch 'feature/xiaofeijingsai' into release
|
2023-12-27 21:06:44 +08:00 |
|
dy
|
1158f26eaa
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-27 21:06:10 +08:00 |
|
dy
|
722e92a54b
|
消费竞赛
|
2023-12-27 21:05:53 +08:00 |
|
dy
|
2309ff4a9c
|
Merge branch 'feature/json' into release
|
2023-12-27 20:50:05 +08:00 |
|
dy
|
6efe04ed6d
|
Merge branch 'feature/json' into dev
|
2023-12-27 20:49:47 +08:00 |
|
dy
|
c0e6f6516c
|
cehua json
|
2023-12-27 20:49:23 +08:00 |
|
dy
|
d6d8b39afe
|
Merge branch 'feature/json' into release
# Conflicts:
# src/json/attr.json
# src/json/huodong.json5
|
2023-12-27 20:21:51 +08:00 |
|
dy
|
27ec272347
|
cehua json
|
2023-12-27 20:21:13 +08:00 |
|
dy
|
47f16b583a
|
Merge branch 'feature/xiaofeijingsai' into release
|
2023-12-27 20:20:23 +08:00 |
|
dy
|
82d323d5c8
|
Merge branch 'feature/yuandan' into release
# Conflicts:
# src/public/pay.ts
|
2023-12-27 20:20:01 +08:00 |
|
dy
|
dced990c89
|
Merge remote-tracking branch 'origin/fix_rank' into release
|
2023-12-27 20:19:25 +08:00 |
|
dy
|
968ce25e5f
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 20:10:25 +08:00 |
|
dy
|
12300703b5
|
每日刷新付费礼包
|
2023-12-27 20:09:59 +08:00 |
|
dy
|
944a675af3
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 20:00:01 +08:00 |
|
dy
|
6fa3a8224c
|
Merge branch 'bugfix' into dev
|
2023-12-27 19:59:57 +08:00 |
|
dy
|
2e84333776
|
fix 元旦任务计数
|
2023-12-27 19:59:50 +08:00 |
|
dy
|
add9c7c562
|
fix 元旦任务
|
2023-12-27 19:49:33 +08:00 |
|
dy
|
479c309481
|
Merge branch 'bugfix' into dev
|
2023-12-27 19:32:03 +08:00 |
|
dy
|
dbb012675a
|
fix 自选支付
|
2023-12-27 19:30:49 +08:00 |
|
dy
|
b2eb783dc1
|
Merge branch 'feature/json' into dev
# Conflicts:
# src/json/huodong.json5
|
2023-12-27 19:16:06 +08:00 |
|
dy
|
771c4a2ceb
|
cehua json
|
2023-12-27 19:15:51 +08:00 |
|
dy
|
3e198b688e
|
Merge branch 'master' into feature/json
|
2023-12-27 19:15:27 +08:00 |
|
dy
|
892717ca09
|
Merge branch 'bugfix' into dev
|
2023-12-27 19:13:24 +08:00 |
|
dy
|
7af728b68c
|
fix 自选购买
|
2023-12-27 19:13:17 +08:00 |
|
dy
|
837e9b58c8
|
fix 元旦红点
|
2023-12-27 18:50:36 +08:00 |
|