dededebug

sheriyuo · Jun 6, 2023 · ba41472 · ba41472
1 parent a9d79e5
commit ba41472
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/Object/bot.cpp b/Object/bot.cpp
@@ -233,7 +233,7 @@ void Bot::run()
     curPlayer = 0;
     judge->PlaceAPiece(finalx, finaly);
     if(judge->runMode == 2 || judge->runMode == 3) // 发送 MOVE_OP 以及处理 recData
-        judge->send(NetworkData(OPCODE::MOVE_OP, QString(QChar('A'+finalx))+QString(QChar('1'+finaly)), ""));
+        judge->send(NetworkData(OPCODE::MOVE_OP, QString(QChar('A'+finalx))+QString(QChar('1'+finaly)), QString::number(QDateTime::currentMSecsSinceEpoch())));
     double curRatio = judgeBoard();
     if(curRatio < 0.5)
     {

diff --git a/Object/judge.cpp b/Object/judge.cpp
@@ -332,7 +332,8 @@ void Judge::connect()
         }
         else
         {
-            send(NetworkData(OPCODE::CHAT_OP, "", ""));
+            // server cannot initiate new game
+            // send(NetworkData(OPCODE::CHAT_OP, "", ""));
             socketConnected = true;
         }
     }

diff --git a/Widget/gamewidget.cpp b/Widget/gamewidget.cpp
@@ -193,7 +193,7 @@ void GameWidget::mousePressEvent(QMouseEvent *event)
 
         if(!judge->runMode) emit turnForBot();
         if(judge->runMode == 2 || judge->runMode == 3) // 发送 MOVE_OP 以及处理 recData
-            judge->send(NetworkData(OPCODE::MOVE_OP, QString(QChar('A'+row-1))+QString(QChar('1'+column-1)), ""));
+            judge->send(NetworkData(OPCODE::MOVE_OP, QString(QChar('A'+row-1))+QString(QChar('1'+column-1)), QString::number(QDateTime::currentMSecsSinceEpoch())));
         startTimer();
     }
     else sendMessage(2);

diff --git a/Widget/startwidget.cpp b/Widget/startwidget.cpp
@@ -46,8 +46,8 @@ StartWidget::StartWidget(Judge *j, QWidget *parent) :
     connect(ui->startAsBlack, &QPushButton::clicked, this, &StartWidget::on_startAsBlack_clicked_OFFL);
     connect(ui->startAsWhite, &QPushButton::clicked, this, &StartWidget::on_startAsWhite_clicked_OFFL);
     connect(confirmD, &OptionDialog::OK, this, [&](){
-        if(oppoRole == 1) {sendStartAsWhite(); on_startAsWhite_clicked_OFFL();}
-        else {sendStartAsBlack(); on_startAsBlack_clicked_OFFL();}
+        if(oppoRole == 1) {sendStartAsWhite(true); on_startAsWhite_clicked_OFFL();}
+        else {sendStartAsBlack(true); on_startAsBlack_clicked_OFFL();}
         confirmD->close();
     });
     connect(confirmD, &OptionDialog::NO, this, [&](){
@@ -121,15 +121,13 @@ void StartWidget::goOFFL()
     connect(ui->startAsBlack, &QPushButton::clicked, this, &StartWidget::on_startAsBlack_clicked_OFFL);
     connect(ui->startAsWhite, &QPushButton::clicked, this, &StartWidget::on_startAsWhite_clicked_OFFL);
 }
-void StartWidget::sendStartAsBlack()
+void StartWidget::sendStartAsBlack(bool isReply)
 {
-    NetworkData d = NetworkData(OPCODE::READY_OP, judge->usrnameOL, "b");
-    judge->send(d);
+    judge->send(NetworkData(OPCODE::READY_OP, judge->usrnameOL, isReply?"":"b"));
 }
-void StartWidget::sendStartAsWhite()
+void StartWidget::sendStartAsWhite(bool isReply)
 {
-    NetworkData d = NetworkData(OPCODE::READY_OP, judge->usrnameOL, "w");
-    judge->send(d);
+    judge->send(NetworkData(OPCODE::READY_OP, judge->usrnameOL, isReply?"":"w"));
 }
 void StartWidget::sendReject() {judge->send(NetworkData(OPCODE::REJECT_OP, judge->usrnameOL, ""));}
 

diff --git a/Widget/startwidget.h b/Widget/startwidget.h
@@ -46,8 +46,8 @@ private slots:
 
 private:
     void paintEvent(QPaintEvent *event) override;
-    void sendStartAsBlack(); // 联机
-    void sendStartAsWhite(); // 联机
+    void sendStartAsBlack(bool isReply = false); // 联机
+    void sendStartAsWhite(bool isReply = false); // 联机
     void sendReject(); // 联机被拒
 
     Judge* judge;