Merge branch 'fix/conglinshoulie' into dev

src/api_cross/clsl/ApiRank.ts

@@ -10,14 +10,16 @@ export default async function (call: ApiCall<ReqRank, ResRank>) {
 
     if (G.time < week_zero_time + group_time) {
         call.succ({ rankList: [], myRank: { rank: -1, player: {}, valArr: [] } })
+        return
     }
 
     let a = await G.mongodb.collection('clslCrossUser').findOne({
         uid: call.req.uid
     });
     
-    if (!a){
+    if (!a || !a.group){
         call.succ({ rankList: [], myRank: { rank: -1, player: {}, valArr: [] } })
+        return
     }
 
     let rank: Rank;

src/api_s2c/conglinshoulie/ApiOpen.ts

@@ -18,9 +18,9 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
             fightWinNum: 0,
             buyFightNum: 0
         };
-        
+
         // 隔周刷新星级
-        if(ops?.refreshTime < PublicShared.getToWeekMondayZeroTime()){
+        if (ops?.refreshTime < PublicShared.getToWeekMondayZeroTime()) {
             change.allStar = 0;
             change.curMaxStar = 0;
         }
@@ -35,6 +35,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
     }
 
     call.succ({
+        week: parseInt(PublicShared.getToWeek()) || 7,
         allStar: ops?.allStar || 0,
         danPrize: ops?.danPrize || [],
         curMaxStar: ops?.curMaxStar || 0,

src/shared/protocols/conglinshoulie/PtlOpen.ts

@@ -21,4 +21,6 @@ export type ResOpen = {
     curMaxStar: number;
     /**段位奖励发放记录*/
     danPrize: number[];
+
+    week?:number;  // 返回给客户端用
 };