texas-poker-core 1.2.1 → 1.2.3

package/README.md

@@ -313,4 +313,10 @@ bufix
 修复 player.actionble 判断错误
 
 ## 1.2.1
-完善texas.start逻辑
+完善texas.start逻辑
+## 1.2.2
+完善player.checkIfCanAct的逻辑
+## 1.2.3
+测试ncu
+## 1.2.3
+测试ncu

package/dist/Controller/index.js

@@ -370,7 +370,7 @@ var Controller = /*#__PURE__*/function () {
     value: function end() {
       if (this.status !== 'on') this.reportError(new _error.default(2100, '游戏不在进行中, 无法结束'));
       this.clearTimer();
-      _classPrivateFieldSet(_status, this, 'waiting');
+      _classPrivateFieldSet(_status, this, 'end');
       this.resetActivePlayer();
     }
   }, {

package/dist/Player/index.js

@@ -8,10 +8,7 @@ require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.number.constructor.js");
-require("core-js/modules/es.object.get-own-property-descriptor.js");
-require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.get-prototype-of.js");
-require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -43,8 +40,6 @@ var _utils = require("../utils");
 var _config = require("../config");
 var _Player;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -643,15 +638,13 @@ var Player = exports.Player = /*#__PURE__*/function () {
   }, {
     key: "getUserInfo",
     value: function getUserInfo() {
-      return _objectSpread(_objectSpread({}, _classPrivateFieldGet(_userInfo, this)), {}, {
-        // 余额需要用实时的, 而不是来自于数据库
-        balance: this.balance
-      });
+      return _classPrivateFieldGet(_userInfo, this);
     }
   }, {
     key: "checkIfCanAct",
     value: function checkIfCanAct() {
-      if (_classPrivateFieldGet(_status, this) !== 'active') this.reportError(new _error.default(2003, '不可行动'));
+      if (_classPrivateFieldGet(_controller, this).status !== 'on') this.reportError(new _error.default(2003, '游戏不在进行中, 不可行动'));
+      if (_classPrivateFieldGet(_status, this) !== 'active') this.reportError(new _error.default(2003, '没有控制权, 无法行动'));
     }
   }, {
     key: "toString",

package/dist/Room/index.js

@@ -255,7 +255,11 @@ var Room = /*#__PURE__*/function () {
       if (_classPrivateFieldGet(_private, this) && _classPrivateFieldGet(_privateKey, this) !== key) this.reportError(new _error.default(2003, '私密房间不可加入'));
       if (!_classPrivateFieldGet(_allowPlayersToWatch, this) && this.playersCountOnSeat === _classPrivateFieldGet(_maximumCountOfPlayers, this)) this.reportError(new _error.default(2003, '房间设置了不可观战,并且玩家已满,不可加入'));
       if (!_classPrivateFieldGet(_allowPlayersToWatch, this) && player.lowestBetAmount < _classPrivateFieldGet(_lowestBetAmount, this)) this.reportError(new _error.default(2003, '房间设置了不可观战, 并且您的余额小于房间的最底下注,无法加入'));
-      var seatStatus = this.playersCountOnSeat === _classPrivateFieldGet(_maximumCountOfPlayers, this) ? 'hang' : 'on-set';
+
+      // 人数已满 或者 游戏不在准备阶段, 都直接到观战席
+      // 要注意一点, 游戏也会在end阶段持续几秒, 这个时候也需要到观战席
+      // 防止在结算过程中,玩家加入坐席导致交互问题
+      var seatStatus = this.playersCountOnSeat === _classPrivateFieldGet(_maximumCountOfPlayers, this) || _classPrivateFieldGet(_controller, this).status !== 'waiting' ? 'hang' : 'on-set';
       if (seatStatus === 'hang') {
         _classPrivateFieldGet(_playersHang, this).add(player);
       } else {
@@ -283,6 +287,7 @@ var Room = /*#__PURE__*/function () {
   }, {
     key: "seat",
     value: function seat(player) {
+      if (_classPrivateFieldGet(_controller, this).status !== 'waiting') this.reportError(new _error.default(2003, '游戏还未结束, 无法入座'));
       if (!player || !_classPrivateFieldGet(_idToPlayerMap, this).has(player.getUserInfo().id)) this.reportError(new _error.default(2003, '您不在房间中,无法入座'));
       if (this.getPlayerSeatStatus(player) === 'on-set') this.reportError(new _error.default(2003, '您已在坐席中,请勿重复操作'));
       if (this.playersCountOnSeat === _classPrivateFieldGet(_maximumCountOfPlayers, this)) this.reportError(new _error.default(2003, '位置已满,无法加入坐席'));
@@ -298,6 +303,7 @@ var Room = /*#__PURE__*/function () {
   }, {
     key: "watch",
     value: function watch(player) {
+      if (_classPrivateFieldGet(_controller, this).status !== 'waiting') this.reportError(new _error.default(2003, '游戏正在进行中, 无法加入观战席'));
       if (!player || !_classPrivateFieldGet(_idToPlayerMap, this).has(player.getUserInfo().id)) this.reportError(new _error.default(2003, '您不在房间中,无法观战'));
       if (this.getPlayerSeatStatus(player) === 'hang') this.reportError(new _error.default(2003, '您已在观战席中,请勿重复操作'));
       _classPrivateFieldGet(_playersHang, this).add(player);

package/dist/Texas/index.js

@@ -158,7 +158,7 @@ var Texas = /*#__PURE__*/function (_GameEventEmitter2) {
             case 0:
               if (this.room.getPlayersBySeatStatus('on-set').length < 2) this.handleError(new _error.default(2100, '玩家数量不足, 无法开始游戏'));
               if (this.room.status === 'unReady') this.handleError(new _error.default(2100, '玩家位置未确认, 无法进行游戏'));
-              if (this.controller.status !== 'waiting') this.handleError(new _error.default(2100, '游戏已经开始, 请勿重复操作'));
+              if (this.controller.status !== 'waiting') this.handleError(new _error.default(2100, '游戏已经开始, 请勿重复开始游戏'));
               this.resetBeforeGameStart();
               this.dealer.dealCards();
               _context.next = 7;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "texas-poker-core",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "德州扑克核心功能",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/types/Player/index.d.ts

@@ -111,18 +111,7 @@ export declare class Player implements GameComponent {
     returnNextPlayerIf(filter: (player: Player) => boolean): Player | null;
     getAction(): Action | undefined;
     getRole(): Role | undefined;
-    getUserInfo(): {
-        balance: number;
-        id: number;
-        /**
-         * 昵称
-         */
-        name?: string;
-        /**
-         * 用户头像
-         */
-        avatar?: string;
-    };
+    getUserInfo(): User;
     checkIfCanAct(): void;
     toString(): string;
     log(prefix?: string): void;

package/types/Room/index.d.ts

@@ -24,12 +24,7 @@ declare class Room implements GameComponent {
         onSeatCount: number;
         allowPlayersToWatch: boolean;
         maximumCountOfPlayers: number;
-        owner: Omit<{
-            balance: number;
-            id: number;
-            name?: string;
-            avatar?: string;
-        }, "balance">;
+        owner: Omit<import("../Player").User, "balance">;
     };
     getAllPlayers(): Player[];
     get totalPlayersCount(): number;