diff --git a/src/assets/js/waybill.js b/src/assets/js/waybill.js index 3beb615b..68e76fc0 100644 --- a/src/assets/js/waybill.js +++ b/src/assets/js/waybill.js @@ -22,77 +22,75 @@ function autoask(newData) { Proachcolor: "" } // 庄问路 - if (newData.ludan_banker) { - if (newData.ludan_banker.waybill) { - const bigEyeRoad = newData.ludan_banker.waybill.bigEyeRoad - const pathway = newData.ludan_banker.waybill.pathway - const roach = newData.ludan_banker.waybill.roach - if (bigEyeRoad[0]) { - if (bigEyeRoad[bigEyeRoad.length - 1].result == 1) { - askObg.BbigEyeRoadcolor = "red" - } else { - askObg.BbigEyeRoadcolor = "blue" - } - askObg.BbigEyeRoadisshow = true + if (newData.ludan_banker && newData.ludan_banker.waybill) { + const bigEyeRoad = newData.ludan_banker.waybill.bigEyeRoad + const pathway = newData.ludan_banker.waybill.pathway + const roach = newData.ludan_banker.waybill.roach + if (bigEyeRoad[0]) { + if (bigEyeRoad[bigEyeRoad.length - 1].result == 1) { + askObg.BbigEyeRoadcolor = "red" } else { - askObg.BbigEyeRoadisshow = false - } - if (pathway[0]) { - if (pathway[pathway.length - 1].result == 1) { - askObg.Bpathwaycolor = "red" - } else { - askObg.Bpathwaycolor = "blue" - } - askObg.Bpathwayisshow = true - } else { - askObg.Bpathwayisshow = false - } - if (roach[0]) { - if (roach[roach.length - 1].result == 1) { - askObg.Broachcolor = "red" - } else { - askObg.Broachcolor = "blue" - } - askObg.Broachisshow = true - } else { - askObg.Broachisshow = false + askObg.BbigEyeRoadcolor = "blue" } + askObg.BbigEyeRoadisshow = true + } else { + askObg.BbigEyeRoadisshow = false } - // 闲问路 - if (newData.ludan_player.waybill) { - const bigEyeRoad = newData.ludan_player.waybill.bigEyeRoad - const pathway = newData.ludan_player.waybill.pathway - const roach = newData.ludan_player.waybill.roach - if (bigEyeRoad[0]) { - if (bigEyeRoad[bigEyeRoad.length - 1].result == 1) { - askObg.PbigEyeRoadcolor = "red" - } else { - askObg.PbigEyeRoadcolor = "blue" - } - askObg.PbigEyeRoadisshow = true + if (pathway[0]) { + if (pathway[pathway.length - 1].result == 1) { + askObg.Bpathwaycolor = "red" } else { - askObg.PbigEyeRoadisshow = false + askObg.Bpathwaycolor = "blue" } - if (pathway[0]) { - if (pathway[pathway.length - 1].result == 1) { - askObg.Ppathwaycolor = "red" - } else { - askObg.Ppathwaycolor = "blue" - } - askObg.Ppathwayisshow = true + askObg.Bpathwayisshow = true + } else { + askObg.Bpathwayisshow = false + } + if (roach[0]) { + if (roach[roach.length - 1].result == 1) { + askObg.Broachcolor = "red" } else { - askObg.Ppathwayisshow = false + askObg.Broachcolor = "blue" } - if (roach[0]) { - if (roach[roach.length - 1].result == 1) { - askObg.Proachcolor = "red" - } else { - askObg.Proachcolor = "blue" - } - askObg.Proachisshow = true + askObg.Broachisshow = true + } else { + askObg.Broachisshow = false + } + } + // 闲问路 + if (newData.ludan_player && newData.ludan_player.waybill) { + const bigEyeRoad = newData.ludan_player.waybill.bigEyeRoad + const pathway = newData.ludan_player.waybill.pathway + const roach = newData.ludan_player.waybill.roach + if (bigEyeRoad[0]) { + if (bigEyeRoad[bigEyeRoad.length - 1].result == 1) { + askObg.PbigEyeRoadcolor = "red" } else { - askObg.Proachisshow = false + askObg.PbigEyeRoadcolor = "blue" } + askObg.PbigEyeRoadisshow = true + } else { + askObg.PbigEyeRoadisshow = false + } + if (pathway[0]) { + if (pathway[pathway.length - 1].result == 1) { + askObg.Ppathwaycolor = "red" + } else { + askObg.Ppathwaycolor = "blue" + } + askObg.Ppathwayisshow = true + } else { + askObg.Ppathwayisshow = false + } + if (roach[0]) { + if (roach[roach.length - 1].result == 1) { + askObg.Proachcolor = "red" + } else { + askObg.Proachcolor = "blue" + } + askObg.Proachisshow = true + } else { + askObg.Proachisshow = false } } return askObg @@ -106,7 +104,7 @@ function waybillAsk(canvas, type, data, game_id) { if (data.ludan_banker && data.ludan_banker.waybill) { ask(canvas, data.ludan_banker, data.ludan, game_id) } - } else if (type == "palyer") { + } else if (type == "player") { if (data.ludan_player && data.ludan_player.waybill) { ask(canvas, data.ludan_player, data.ludan, game_id) } @@ -190,7 +188,8 @@ function ask(canvas, newdata, olddata, game_id) { askbigRoad: false, askbigEyeRoad: false, askpathway: false, - askroach: false + askroach: false, + asksanxing: false } if (n_s_last_x > o_s_last_x) { askroad.askshowroad = true @@ -262,7 +261,7 @@ function waybillConfig(canvas, data, game_id, ask, askroad) { rows = 6 // Strict Width-Based Calculation for Compact Layout // Target fewer columns to make cells larger as requested - let targetCols = 14 + let targetCols = 22 unit = (width / targetCols) * dpr // Use float to fill width exactly cols = parseInt(width / (unit / dpr)) @@ -657,11 +656,8 @@ function cutRoad( Tab = cols - 1 } } else { - if (ask && askroad) { - Tab = cols - 1 - } else { - Tab = cols - 2 - } + // Keep space for integrated Ask Panel at bottom right + Tab = cols - 7 } // 初始位置 if (billnumber == 1) { @@ -872,7 +868,7 @@ function Drawline(ctb, unit, rows, cols, billnumber) { var CanvasWidht = unit * cols var CanvasHeight = unit * rows ctb.lineWidth = 1 //线条宽度 - ctb.strokeStyle = "#d9d9d9" //线条颜色 + ctb.strokeStyle = "#f0f0f0" //线条颜色 ctb.beginPath() ctb.moveTo(0, 0.5) ctb.lineTo(CanvasWidht, 0.5) @@ -905,7 +901,7 @@ function multipleDrawline(ctb, unit, rows, cols) { var CanvasWidht = unit * cols var CanvasHeight = unit * rows ctb.lineWidth = 1 //线条宽度 - ctb.strokeStyle = "#d9d9d9" //线条颜色 + ctb.strokeStyle = "#f0f0f0" //线条颜色 ctb.beginPath() ctb.moveTo(0, 0.5) ctb.lineTo(CanvasWidht, 0.5) @@ -1027,11 +1023,11 @@ function SoloPath(gameId, ctb, unit, x, y, type, corners) { } break } - ctb.arc(unit * (x - 0.5), radius + unit * (y - 1), unit * 0.4, 0, Math.PI * 2) + ctb.arc(unit * (x - 0.5), radius + unit * (y - 1), unit * 0.45, 0, Math.PI * 2) ctb.fillStyle = color ctb.fill() - ctb.font = "bold " + unit * 0.54 + "px Arial" - ctb.fillStyle = "#ddd" // 颜色 + ctb.font = "bold " + unit * 0.6 + "px Arial" + ctb.fillStyle = "#fff" // 颜色 ctb.textAlign = "center" ctb.textBaseline = "middle" ctb.fillText(fonts, unit * (x - 0.5), radius + unit * (y - 1)) diff --git a/src/components/PlayTable/TableBaccarat.vue b/src/components/PlayTable/TableBaccarat.vue index 6940ec9b..9ae8fac1 100644 --- a/src/components/PlayTable/TableBaccarat.vue +++ b/src/components/PlayTable/TableBaccarat.vue @@ -333,10 +333,11 @@ export default { white-space: nowrap; } .label-large { - font-size: 30px; + font-size: 32px; // Increased visibility font-weight: 800; - margin-bottom: 2px; + margin-bottom: 4px; white-space: nowrap; + text-shadow: 0 2px 4px rgba(0,0,0,0.6); } .odds { @@ -380,12 +381,12 @@ export default { // Grid Item Style (Digital Table Look) .grid-item { - background: rgba(9, 60, 50, 0.7); // Deep Teal Transparent + background: rgba(9, 60, 50, 0.85); // Deep Teal, slightly more opaque border: 1px solid #59cfa8; // Cyan/Green Border - box-shadow: inset 0 0 10px rgba(0,0,0,0.3); + box-shadow: inset 0 0 15px rgba(0,0,0,0.5); // Stronger inner shadow &:active { - background: rgba(9, 60, 50, 0.9); + background: rgba(9, 60, 50, 0.95); border-color: #7fffd4; } } diff --git a/src/components/PlayWay.vue b/src/components/PlayWay.vue index 0631dc09..de5441c6 100644 --- a/src/components/PlayWay.vue +++ b/src/components/PlayWay.vue @@ -6,53 +6,68 @@
-