chore: bump to rust 1.80 to utilize LazyLock;

fix: bug in modder not initialized

Author: Xerxes-2

Cargo.lock

@@ -2,6 +2,7 @@
 name = "majsoul_max_rs"
 version = "0.4.9"
 edition = "2021"
+rust-version = "1.80"
 
 [lib]
 
@@ -14,7 +15,6 @@ name = "majsoul_max_rs"
 anyhow = "1.0.86"
 base64 = "0.22.1"
 bytes = "1.6.1"
-once_cell = "1.19.0"
 prost-reflect = { version = "0.14.0", features = ["serde"] }
 reqwest = { version = "0.12.5", features = [
     "json",

Cargo.toml

@@ -1,5 +1,5 @@
 
-��	
+��	
 
 liqi.protolq"|
 NotifyCaptcha
@@ -1348,7 +1348,7 @@ finishTime
 open	 
(Ropen#
 public_notice
  
(	RpublicNotice!
-contest_type 
(RcontestType"�
+contest_type 
(RcontestType"�
 CustomizedContestDetail
 	unique_id
 
(RuniqueId
 
@@ -1375,7 +1375,9 @@ finishTime
 signup_start_time 
(RsignupStartTime&
 signup_end_time 
(RsignupEndTime
 signup_type 
(R
-signupType"�

+signupType
+
+auto_match 
(R	autoMatch"�

 CustomizedContestPlayerReport
 	rank_rule
 
(RrankRule
 rank 
(Rrank
@@ -3043,15 +3045,16 @@ resourceId%
 observer_level 
(RobserverLevel"L
 ReqEnterCustomizedContest
 	unique_id
 
(RuniqueId
-lang 
(	Rlang"�

+lang 
(	Rlang"�
 ResEnterCustomizedContest
 error
 
(2	.lq.ErrorRerror<
 detail_info 
(2.lq.CustomizedContestDetailR
 detailInfoF
 player_report 
(2!.lq.CustomizedContestPlayerReportRplayerReport
 is_followed 
(R
 isFollowed
-state 
(Rstate"B
+state 
(Rstate
+is_admin 
(RisAdmin"B
 #ReqFetchCustomizedContestOnlineInfo
 	unique_id
 
(RuniqueId"k
 #ResFetchCustomizedContestOnlineInfo
@@ -3905,14 +3908,28 @@ activityId?
 activity_id
 
(R
 activityId
 bag_id 
(RbagId
-pos (Rpos"�

+pos (Rpos"�

+ContestSetting>
+level_limit
 (2.lq.ContestSetting.LevelLimitR
+levelLimit
+
+game_limit 
(R	gameLimit)
+system_broadcast 
(RsystemBroadcast6
+
+LevelLimit
+type
 
(Rtype
+value 
(Rvalue"�
 ReqCreateCustomizedContest
 name
 
(	Rname
 	open_show 
(RopenShow8
 game_rule_setting 
(2.lq.GameModeRgameRuleSetting
 
 start_time 
(R	startTime
-end_time 
(RendTime"Z
+end_time 
(RendTime
+
+auto_match 
(R	autoMatch
+	rank_rule 
(RrankRule;
+contest_setting 
(2.lq.ContestSettingRcontestSetting"Z
 ResCreateCustomizedContest
 error
 
(2	.lq.ErrorRerror
 	unique_id 
(RuniqueId":
@@ -3922,7 +3939,7 @@ $ResFetchManagerCustomizedContestList
 error
 
(2	.lq.ErrorRerror5
 contests (2.lq.CustomizedContestBaseRcontests"?
  ReqFetchManagerCustomizedContest
-	unique_id
 
(RuniqueId"�
+	unique_id
 
(RuniqueId"�
  ResFetchManagerCustomizedContest
 error
 
(2	.lq.ErrorRerror
 name 
(	Rname
@@ -3937,7 +3954,8 @@ auto_match 
(R	autoMatch
 check_state	 
(R
 checkState#
 checking_name
- 
(	RcheckingName"�
+ 
(	RcheckingName;
+contest_setting 
(2.lq.ContestSettingRcontestSetting"�
 !ReqUpdateManagerCustomizedContest
 name
 
(	Rname
 	open_show 
(RopenShow8
@@ -3948,7 +3966,57 @@ start_time 
(R	startTime
 	unique_id 
(RuniqueId
 
 auto_match 
(R	autoMatch
-	rank_rule 
(RrankRule"
+	rank_rule 
(RrankRule;
+contest_setting	 
(2.lq.ContestSettingRcontestSetting"f
+ReqFetchContestPlayerRank
+	unique_id
 
(RuniqueId
+limit 
(Rlimit
+offset 
(Roffset"�
+ResFetchContestPlayerRank
+error
 
(2	.lq.ErrorRerror
+total 
(Rtotal<
+rank (2(.lq.ResFetchContestPlayerRank.SeasonRankRrankI
+player_data 
(2(.lq.ResFetchContestPlayerRank.PlayerDataR
+playerData�
+ContestPlayerAccountData(
+total_game_count
 
(RtotalGameCountk
+recent_games (2H.lq.ResFetchContestPlayerRank.ContestPlayerAccountData.ContestGameResultRrecentGames�

+highest_series_points (2N.lq.ResFetchContestPlayerRank.ContestPlayerAccountData.ContestSeriesGameResultRhighestSeriesPointsH
+ContestGameResult
+rank
 
(Rrank
+total_point 
(R
+totalPoint�

+ContestSeriesGameResult
+key
 
(Rkeyb
+results (2H.lq.ResFetchContestPlayerRank.ContestPlayerAccountData.ContestGameResultRresults�

+
+SeasonRank
+
+account_id
 
(R	accountId
+nickname 
(	RnicknameJ
+data 
(26.lq.ResFetchContestPlayerRank.ContestPlayerAccountDataRdatal
+
+PlayerData
+rank
 
(RrankJ
+data 
(26.lq.ResFetchContestPlayerRank.ContestPlayerAccountDataRdata"6
+ReqFetchReadyPlayerList
+	unique_id
 
(RuniqueId"�

+ResFetchReadyPlayerList
+error
 
(2	.lq.ErrorRerror6
+list (2".lq.ResFetchReadyPlayerList.PlayerRlistC
+Player
+
+account_id
 
(R	accountId
+nickname 
(	Rnickname"�

+ReqCreateGamePlan
+	unique_id
 
(RuniqueId!
+account_list (RaccountList&
+game_start_time 
(RgameStartTime#
+shuffle_seats 
(RshuffleSeats
+ai_level 
(RaiLevel"Y
+"ResGenerateContestManagerLoginCode
+error
 
(2	.lq.ErrorRerror
+code 
(	Rcode"
 ActionMJStart"U
 NewRoundOpenedTiles
 seat
 
(Rseat
@@ -4741,7 +4809,7 @@ account_id
 
(R	accountId
 NULL
 AUTH

 SYNCING	
-READY2��

+READY2�

 Lobby;
 fetchConnectionInfo.lq.ReqCommon.lq.ResConnectionInfo6
 fetchQueueInfo.lq.ReqCommon.lq.ResFetchQueueInfo+
@@ -5073,7 +5141,11 @@ bindOauth2.lq.ReqBindOauth2.lq.ResCommon9
 createCustomizedContest.lq.ReqCreateCustomizedContest.lq.ResCreateCustomizedContestw
 !fetchManagerCustomizedContestList(.lq.ReqFetchmanagerCustomizedContestList(.lq.ResFetchManagerCustomizedContestListk
 fetchManagerCustomizedContest$.lq.ReqFetchManagerCustomizedContest$.lq.ResFetchManagerCustomizedContestV
-updateManagerCustomizedContest%.lq.ReqUpdateManagerCustomizedContest.lq.ResCommon2�
+updateManagerCustomizedContest%.lq.ReqUpdateManagerCustomizedContest.lq.ResCommonV
+fetchContestPlayerRank.lq.ReqFetchContestPlayerRank.lq.ResFetchContestPlayerRankP
+fetchReadyPlayerList.lq.ReqFetchReadyPlayerList.lq.ResFetchReadyPlayerList6
+createGamePlan.lq.ReqCreateGamePlan.lq.ResCommonX
+generateContestManagerLoginCode.lq.ReqCommon&.lq.ResGenerateContestManagerLoginCode2�
 FastTest,
 authGame.lq.ReqAuthGame.lq.ResAuthGame,
 	enterGame.lq.ReqCommon.lq.ResEnterGame,

liqi_config/liqi.desc

@@ -1843,6 +1843,7 @@ message CustomizedContestDetail {
     uint32 signup_start_time = 17;
     uint32 signup_end_time = 18;
     uint32 signup_type = 19;
+    uint32 auto_match = 20;
 }
 
 message CustomizedContestPlayerReport {
@@ -2759,6 +2760,10 @@ service Lobby {
     rpc fetchManagerCustomizedContestList (ReqFetchmanagerCustomizedContestList) returns (ResFetchManagerCustomizedContestList);
     rpc fetchManagerCustomizedContest (ReqFetchManagerCustomizedContest) returns (ResFetchManagerCustomizedContest);
     rpc updateManagerCustomizedContest (ReqUpdateManagerCustomizedContest) returns (ResCommon);
+    rpc fetchContestPlayerRank (ReqFetchContestPlayerRank) returns (ResFetchContestPlayerRank);
+    rpc fetchReadyPlayerList (ReqFetchReadyPlayerList) returns (ResFetchReadyPlayerList);
+    rpc createGamePlan (ReqCreateGamePlan) returns (ResCommon);
+    rpc generateContestManagerLoginCode (ReqCommon) returns (ResGenerateContestManagerLoginCode);
 }
 
 message ResConnectionInfo {
@@ -4695,6 +4700,7 @@ message ResEnterCustomizedContest {
     CustomizedContestPlayerReport player_report = 3;
     bool is_followed = 4;
     uint32 state = 5;
+    bool is_admin = 6;
 }
 
 message ReqFetchCustomizedContestOnlineInfo {
@@ -6033,13 +6039,29 @@ message ReqIslandActivityUnlockBagGrid {
     repeated uint32 pos = 3;
 }
 
+message ContestSetting {
+
+    repeated LevelLimit level_limit = 1;
+    uint32 game_limit = 2;
+    uint32 system_broadcast = 3;
+
+    message LevelLimit {
+
+        uint32 type = 1;
+        uint32 value = 2;
+    }
+}
+
 message ReqCreateCustomizedContest {
 
     string name = 1;
     uint32 open_show = 2;
     GameMode game_rule_setting = 3;
     uint32 start_time = 4;
     uint32 end_time = 5;
+    uint32 auto_match = 6;
+    uint32 rank_rule = 7;
+    ContestSetting contest_setting = 8;
 }
 
 message ResCreateCustomizedContest {
@@ -6076,6 +6098,7 @@ message ResFetchManagerCustomizedContest {
     uint32 rank_rule = 8;
     uint32 check_state = 9;
     string checking_name = 10;
+    ContestSetting contest_setting = 11;
 }
 
 message ReqUpdateManagerCustomizedContest {
@@ -6088,6 +6111,86 @@ message ReqUpdateManagerCustomizedContest {
     uint32 unique_id = 6;
     uint32 auto_match = 7;
     uint32 rank_rule = 8;
+    ContestSetting contest_setting = 9;
+}
+
+message ReqFetchContestPlayerRank {
+
+    uint32 unique_id = 1;
+    uint32 limit = 2;
+    uint32 offset = 3;
+}
+
+message ResFetchContestPlayerRank {
+
+    Error error = 1;
+    uint32 total = 2;
+    repeated SeasonRank rank = 3;
+    PlayerData player_data = 4;
+
+    message ContestPlayerAccountData {
+
+        uint32 total_game_count = 1;
+        repeated ContestGameResult recent_games = 2;
+        repeated ContestSeriesGameResult highest_series_points = 3;
+
+        message ContestGameResult {
+
+            uint32 rank = 1;
+            int32 total_point = 2;
+        }
+
+        message ContestSeriesGameResult {
+
+            uint32 key = 1;
+            repeated ContestGameResult results = 2;
+        }
+    }
+
+    message SeasonRank {
+
+        uint32 account_id = 1;
+        string nickname = 2;
+        ContestPlayerAccountData data = 3;
+    }
+
+    message PlayerData {
+
+        uint32 rank = 1;
+        ContestPlayerAccountData data = 2;
+    }
+}
+
+message ReqFetchReadyPlayerList {
+
+    uint32 unique_id = 1;
+}
+
+message ResFetchReadyPlayerList {
+
+    Error error = 1;
+    repeated Player list = 2;
+
+    message Player {
+
+        uint32 account_id = 1;
+        string nickname = 2;
+    }
+}
+
+message ReqCreateGamePlan {
+
+    uint32 unique_id = 1;
+    repeated uint32 account_list = 2;
+    uint32 game_start_time = 3;
+    uint32 shuffle_seats = 4;
+    uint32 ai_level = 5;
+}
+
+message ResGenerateContestManagerLoginCode {
+
+    Error error = 1;
+    string code = 2;
 }
 
 message ActionMJStart {

liqi_config/liqi.json

@@ -35,5 +35,5 @@
   "helperSwitch": 1,
   "modSwitch": 0,
   "autoUpdate": 1,
-  "liqiVersion": "v0.11.48.w"
+  "liqiVersion": "v0.11.58.w"
 }