观战玩家进入

assets/10001/src/game/logic/TeenPattieUpLayerLogic.ts

@@ -222,7 +222,6 @@ export class TeenPattieUpLayerLogic extends Component {
         }
         if(TeenPattieCommData.getInstance().isGame){
             //退出游戏确认
-            // UIManager.getInstance().show(`10001`, GamePanelConst.Game_Close_TeenPattie, UILayerIndex.TopLayer);
             const title = Game10001Res.getInstance()?.getString(`game.title.exit`);
             const msg = Game10001Res.getInstance()?.getString(`game.tip.wantToExit`);
             const cancelName = Game10001Res.getInstance()?.getString(`game.btn.cancel`);

assets/10001/src/game/system/TeenpattieGameProxySystem.ts

@@ -177,17 +177,17 @@ export class TeenpattieGameProxySystem extends Component {
         Message.send(TeenPattieEventType.CurrRound, value.data.data.gameRound);
         Message.send(TeenPattieEventType.BetTotal,value.data.data.betTotal);
 
+        Message.send(TeenPattieEventType.SetCurrGameStatus);
 
         if(value.data.data.curPlayerSeat <= 0 && value.data.data.gameRound <= 0){
             if(value.data.data.time > 51){
-                Message.send(TeenPattieEventType.GameMatchTips,true);
+                if(!TeenPattieCommData.getInstance().isCurrWatch) Message.send(TeenPattieEventType.GameMatchTips,true);
             }else{
-                if(value.data.data.time > 0) TeenpattieGameProxySystem.upPlayer?.startCutDown(true,value.data.data.time);
+                if(value.data.data.time > 0 && value.data.data.time < 10) TeenpattieGameProxySystem.upPlayer?.startCutDown(true,value.data.data.time);
             }
             return;
         }
 
-        Message.send(TeenPattieEventType.SetCurrGameStatus);
         //当前正在出牌的玩家
         if(value.data.data.time <= 0) return;
         const data = {
@@ -429,8 +429,14 @@ export class TeenpattieGameProxySystem extends Component {
 
     /**玩家加入 */
     private onPlayerJoin(value:any){
-        let index:number = this.getPlayerIndex(value.data.SeatId)
-        console.warn("玩家加入游戏ID", index);
+        console.warn("玩家加入游戏ID", value.data.SeatId);
+        if(value.data.SeatId == -1){
+            const str:string = TeenPattiePathTool.formatString(I18Manager.getInstance().getString("game.tip.WatchBattle"),value.data.nickname);
+            window["Toast"]?.getInstance().showToast(str);
+            TeenPattieCommData.getInstance().allWatchPlayerData.push(value.data);
+            return;
+        }
+        let index:number = this.getPlayerIndex(value.data.SeatId);
         this.setPlayerJoinData(index,value.data);
         TeenPattieCommData.getInstance()._allPlayerData.push(value.data);
         TeenPattieCommData.getInstance().allPlayerId.push(value.data.SeatId);