From 4a887bbf00030ba92cadbbe66e64ec27eb9ad377 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Thu, 28 Jan 2021 18:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=9F=E4=BA=BA=E8=BF=9B=E5=85=A5=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=90=8E,=20=E4=BB=8Egamesvr=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E7=9A=84score?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/WebApi.ts                |  5 +++--
 src/rooms/commands/OnJoinCommand.ts | 14 ++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/common/WebApi.ts b/src/common/WebApi.ts
index 8ae35da..d2e9e63 100644
--- a/src/common/WebApi.ts
+++ b/src/common/WebApi.ts
@@ -35,8 +35,9 @@ export function getUserInfo(accountid: string) {
     })
 }
 
-export function randomUserInfo() {
-  return axios.get(`${ config.info_svr }/randomrobot`)
+export function randomUserInfo(min: number, max: number) {
+  const data = {min, max}
+  return axios.post(`${ config.info_svr }/randomrobot`, data)
     .then(function (response) {
       let res = response.data
       if (res.errcode) {
diff --git a/src/rooms/commands/OnJoinCommand.ts b/src/rooms/commands/OnJoinCommand.ts
index eaefdec..bcaabd2 100644
--- a/src/rooms/commands/OnJoinCommand.ts
+++ b/src/rooms/commands/OnJoinCommand.ts
@@ -23,11 +23,15 @@ export class OnJoinCommand extends Command<CardGameState, {
       return;
     }
     let isRobot = false;
-    let uinfo: {nickname: string, avatar: string}
+    let uinfo: {nickname: string, avatar: string, score: number}
     if (accountId && accountId != 'robot') {
       uinfo = await getUserInfo(accountId)
     } else {
-      uinfo = await randomUserInfo()
+      const fc = global.$cfg.get(BaseConst.FORMULA);
+      let low = (this.room.score * fc.get(70034).number / 100) | 0;
+      let high = (this.room.score * fc.get(70035).number / 100) | 0;
+
+      uinfo = await randomUserInfo(low, high)
     }
     if (accountId && accountId == 'robot') {
       isRobot = true;
@@ -35,6 +39,7 @@ export class OnJoinCommand extends Command<CardGameState, {
     } else if (!accountId) {
       accountId = `player_${client.sessionId}`;
     }
+    // begin of set seat and team
     let idx = count;
     let seatSet = new Set([0,1,2,3])
     for (let [,p] of this.state.players) {
@@ -51,6 +56,7 @@ export class OnJoinCommand extends Command<CardGameState, {
       idx = seatSet.values().next().value
     }
     const team = (idx == 1 || idx == 2) ? 1 : 0;
+    // end of set seat and team
     let player = new Player(client.sessionId, idx, team);
     player.accountId = accountId;
     player.nickname = uinfo.nickname
@@ -60,9 +66,9 @@ export class OnJoinCommand extends Command<CardGameState, {
       let low = fc.get(70034).number;
       let high = fc.get(70035).number;
       let random = getRandom(high, low) / 100 ;
-      player.score = this.room.score * random | 0;
+      player.score = this.room.score * random || 0;
     } else {
-      player.score = score;
+      player.score = uinfo.score;
     }
     this.state.players.set(client.sessionId, player);
     this.room.addAssistClient(client.sessionId);