Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tank Background #129

Merged
merged 7 commits into from
Jan 17, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
color change
  • Loading branch information
jessicayzhao committed Dec 9, 2024
commit f7d3b21b23e707c13469672fc10cdccbd9a2040b
14 changes: 7 additions & 7 deletions NERODesign/content/Tank.qml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ Rectangle {

property bool isFocused: false

property int playerScore: 0
property int playerScore: 1
property int aiScore: 0

property bool playerWin: false
@@ -132,7 +132,7 @@ Rectangle {
radius: (playerScoreDisplay.height - 2) / 2
anchors.left: parent.left
anchors.top: parent.top
color: tank.playerScore >= 1 ? "royalblue" : "white"
color: tank.playerScore >= 1 ? "royalblue" : "#c5cee4"
border.color: "transparent"
z: -1
}
@@ -153,7 +153,7 @@ Rectangle {
height: playerScoreDisplay.height
anchors.left: separator1.right
anchors.top: parent.top
color: tank.playerScore >= 2 ? "royalblue" : "white"
color: tank.playerScore >= 2 ? "royalblue" : "#c5cee4"
border.color: "transparent"
z: -1
}
@@ -173,7 +173,7 @@ Rectangle {
radius: (playerScoreDisplay.height - 2) / 2
anchors.right: parent.right
anchors.top: parent.top
color: tank.playerScore >= 3 ? "royalblue" : "white"
color: tank.playerScore >= 3 ? "royalblue" : "#c5cee4"
border.color: "transparent"
z: -2
}
@@ -219,7 +219,7 @@ Rectangle {
radius: (aiScoreDisplay.height - 2) / 2
anchors.left: parent.left
anchors.top: parent.top
color: tank.aiScore >= 1 ? "#d44562" : "white"
color: tank.aiScore >= 1 ? "#d44562" : "#c5cee4"
border.color: "transparent"
z: -1
}
@@ -240,7 +240,7 @@ Rectangle {
height: aiScoreDisplay.height
anchors.left: separator2.right
anchors.top: parent.top
color: tank.aiScore >= 2 ? "#d44562" : "white"
color: tank.aiScore >= 2 ? "#d44562" : "#c5cee4"
border.color: "transparent"
z: -1
}
@@ -260,7 +260,7 @@ Rectangle {
radius: (aiScoreDisplay.height - 2) / 2
anchors.right: parent.right
anchors.top: parent.top
color: tank.aiScore >= 3 ? "#d44562" : "white"
color: tank.aiScore >= 3 ? "#d44562" : "#c5cee4"
border.color: "transparent"
z: -2
}
Loading