叫分 UI完善

1f6cb762 · changjiuxiong · 8fa5f270 · 8fa5f270 · 1f6cb762 · 8fa5f270
11 changed file
--- a/dist/css/app.247c5e90.css
+++ b/dist/css/app.247c5e90.css
-.pokerDesk[data-v-01129a70]{height:100%;width:100px;border:1px solid;border-radius:16px;float:left;margin-left:-50px;background-color:azure;font-size:30px;background-repeat:no-repeat;background-size:cover}.poker[data-v-01129a70]:hover{background-color:#faebd7}.selected[data-v-01129a70]{margin-top:-20px}.s[data-v-01129a70]{background-image:url(../img/s.aa339508.jpg)}.x[data-v-01129a70]{background-image:url(../img/x.aa03af01.png)}
\ No newline at end of file
--- a/dist/css/app.2488601e.css
+++ b/dist/css/app.2488601e.css
+.pokerDesk[data-v-22fc0616]{height:100%;width:100px;border:1px solid;border-radius:16px;float:left;margin-left:-50px;background-color:azure;font-size:30px;background-repeat:no-repeat;background-size:cover}.poker[data-v-22fc0616]:hover{background-color:#faebd7}.selected[data-v-22fc0616]{margin-top:-20px}.s[data-v-22fc0616]{background-image:url(../img/s.aa339508.jpg)}.x[data-v-22fc0616]{background-image:url(../img/x.aa03af01.png)}
\ No newline at end of file
--- a/dist/css/app.ad699e7c.css
+++ b/dist/css/app.ad699e7c.css
-.pokerDesk[data-v-7bd525ec]{height:100%;width:100px;border:1px solid;border-radius:16px;float:left;margin-left:-50px;background-color:azure;font-size:30px;background-repeat:no-repeat;background-size:cover}.poker[data-v-7bd525ec]:hover{background-color:#faebd7}.selected[data-v-7bd525ec]{margin-top:-20px}.s[data-v-7bd525ec]{background-image:url(../img/s.aa339508.jpg)}.x[data-v-7bd525ec]{background-image:url(../img/x.aa03af01.png)}
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Vue App</title><link href=css/app.ad699e7c.css rel=preload as=style><link href=js/app.92687945.js rel=preload as=script><link href=js/chunk-vendors.caf18475.js rel=preload as=script><link href=css/app.ad699e7c.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.caf18475.js></script><script src=js/app.92687945.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Vue App</title><link href=css/app.2488601e.css rel=preload as=style><link href=js/app.a3964205.js rel=preload as=script><link href=js/chunk-vendors.fc173c6b.js rel=preload as=script><link href=css/app.2488601e.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.fc173c6b.js></script><script src=js/app.a3964205.js></script></body></html>
\ No newline at end of file
--- a/dist/js/app.92687945.js
+++ b/dist/js/app.92687945.js
--- a/dist/js/app.9cf8ce5a.js
+++ b/dist/js/app.9cf8ce5a.js
--- a/dist/js/app.9cf8ce5a.js.map
+++ b/dist/js/app.9cf8ce5a.js.map
--- a/dist/js/app.a3964205.js
+++ b/dist/js/app.a3964205.js
--- a/dist/js/app.92687945.js.map
+++ b/dist/js/app.92687945.js.map
--- a/src/components/Game.vue
+++ b/src/components/Game.vue
@@ -79,6 +79,11 @@
              pass
          </div>
      </div>
+      <div v-if="game.stage==='jiaoFen'&&game.playerList[0].jiaoFen!=-1" :style="{ marginLeft: playerJiaoFenMargin + 'px' }" style="position: fixed;bottom:350px;width: 100%;height: 200px">
+          <div style="height:100%;width:100px;float: left;margin-left:-50px;font-size: 50px;color:#ff0000">
+              {{game.playerList[0].jiaoFen}}分
+          </div>
+      </div>

      <div style="position: fixed;top:40px;left: 20px;height:200px;width:100px;border: solid 1px;border-radius: 8px;background-color: azure;text-align: center">
          <p v-show="game.stage==='play'" style="color:red;font-size: 20px">
@@ -110,7 +115,7 @@
              pass
          </div>
      </div>
-      <div v-if="game.stage==='jiaoFen'" style="position: fixed;top:100px;left:200px;height: 200px;">
+      <div v-if="game.stage==='jiaoFen'&&game.playerList[2].jiaoFen!=-1" style="position: fixed;top:100px;left:200px;height: 200px;">
          <div style="height:100%;width:100px;float: left;margin-left:-50px;font-size: 50px;color:#ff0000">
              {{game.playerList[2].jiaoFen}}分
          </div>
@@ -145,7 +150,7 @@
              pass
          </div>
      </div>
-      <div v-if="game.stage==='jiaoFen'" style="position: fixed;top:100px;right:200px;height: 200px;">
+      <div v-if="game.stage==='jiaoFen'&&game.playerList[1].jiaoFen!=-1" style="position: fixed;top:100px;right:200px;height: 200px;">
          <div style="height:100%;width:100px;float: left;margin-left:-50px;font-size: 50px;color:#ff0000">
              {{game.playerList[1].jiaoFen}}分
          </div>
@@ -178,6 +183,9 @@ export default {
      buttonMarginLeft: function(){
          return (window.innerWidth - 400)/2;
      },
+      playerJiaoFenMargin: function(){
+          return window.innerWidth/2 - 30;
+      },

      deskPoker: function(){
          if(this.game.deskPokerObj && this.game.deskPokerObj.poker){

--- a/src/doudizhu/Player.js
+++ b/src/doudizhu/Player.js
@@ -5,7 +5,7 @@ class Player{
    constructor(param) {
        param = param || {};
        this.ready = false; //已准备
-        this.jiaoFen = 0; //叫分
+        this.jiaoFen = -1; //叫分
        this.pokerList = [];
        this.name = param.name || 'noName'+Math.random();
        this.type = param.type || 'nongmin';
@@ -53,7 +53,7 @@ class Player{

    reset(){
        this.ready = false;
-        this.jiaoFen = 0;
+        this.jiaoFen = -1;
        this.pokerList = [];
        this.type = 'nongmin';
        this.classifyObj = null;