diff --git a/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$1.class b/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$1.class index ed35b4b..7d9426d 100644 Binary files a/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$1.class and b/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$1.class differ diff --git a/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$2.class b/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$2.class index 7d57849..06e9f4e 100644 Binary files a/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$2.class and b/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$2.class differ diff --git a/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$3.class b/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$3.class index d38b373..7bcbbf3 100644 Binary files a/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$3.class and b/FishGame/bin/com/mypro/basecomponet/AwtMainComponet$3.class differ diff --git a/FishGame/bin/com/mypro/basecomponet/AwtMainComponet.class b/FishGame/bin/com/mypro/basecomponet/AwtMainComponet.class index ca8cd49..b694684 100644 Binary files a/FishGame/bin/com/mypro/basecomponet/AwtMainComponet.class and b/FishGame/bin/com/mypro/basecomponet/AwtMainComponet.class differ diff --git a/FishGame/bin/com/mypro/mainsurface/MainSurface.class b/FishGame/bin/com/mypro/mainsurface/MainSurface.class index 0869d05..3701a36 100644 Binary files a/FishGame/bin/com/mypro/mainsurface/MainSurface.class and b/FishGame/bin/com/mypro/mainsurface/MainSurface.class differ diff --git a/FishGame/src/com/mypro/basecomponet/AwtMainComponet.java b/FishGame/src/com/mypro/basecomponet/AwtMainComponet.java index 727e8d9..d8bdd9e 100644 --- a/FishGame/src/com/mypro/basecomponet/AwtMainComponet.java +++ b/FishGame/src/com/mypro/basecomponet/AwtMainComponet.java @@ -24,9 +24,9 @@ public class AwtMainComponet{ private static boolean isMaximized = false; private static Rectangle normalBounds; - private static final int TITLE_BAR_HEIGHT = 40; - private static final int BUTTON_WIDTH = 50; - private static final int BUTTON_HEIGHT = 40; + private static final int TITLE_BAR_HEIGHT = 55; + private static final int BUTTON_WIDTH = 60; + private static final int BUTTON_HEIGHT = 55; private static int hoveredButton = -1; public static void main(String[] args) throws Exception { @@ -172,49 +172,49 @@ private static void closeWindow() { } public static void drawTitleBar(Graphics g, int width, int height) { - g.setColor(new java.awt.Color(40, 40, 60)); + g.setColor(new java.awt.Color(30, 30, 50)); g.fillRect(0, 0, width, TITLE_BAR_HEIGHT); - g.setColor(new java.awt.Color(60, 60, 80)); - g.drawLine(0, TITLE_BAR_HEIGHT - 1, width, TITLE_BAR_HEIGHT - 1); + g.setColor(new java.awt.Color(100, 100, 150)); + g.fillRect(0, TITLE_BAR_HEIGHT - 3, width, 3); g.setColor(java.awt.Color.WHITE); - g.setFont(new java.awt.Font("Microsoft YaHei", java.awt.Font.BOLD, 16)); - g.drawString("捕鱼游戏", 15, 27); + g.setFont(new java.awt.Font("Microsoft YaHei", java.awt.Font.BOLD, 18)); + g.drawString("捕鱼游戏", 20, 36); int buttonX = width - BUTTON_WIDTH * 3; - java.awt.Color minimizeColor = (hoveredButton == 0) ? new java.awt.Color(80, 80, 100) : new java.awt.Color(60, 60, 80); + java.awt.Color minimizeColor = (hoveredButton == 0) ? new java.awt.Color(100, 150, 200) : new java.awt.Color(70, 70, 100); g.setColor(minimizeColor); g.fillRect(buttonX, 0, BUTTON_WIDTH, BUTTON_HEIGHT); - g.setColor(new java.awt.Color(80, 80, 100)); - g.drawLine(buttonX, 0, buttonX, BUTTON_HEIGHT); + g.setColor(new java.awt.Color(150, 150, 180)); + g.drawRect(buttonX, 0, BUTTON_WIDTH - 1, BUTTON_HEIGHT - 1); g.setColor(java.awt.Color.WHITE); - g.fillRect(buttonX + 12, 18, BUTTON_WIDTH - 24, 4); + g.fillRect(buttonX + 15, 26, BUTTON_WIDTH - 30, 6); buttonX += BUTTON_WIDTH; - java.awt.Color maximizeColor = (hoveredButton == 1) ? new java.awt.Color(80, 80, 100) : new java.awt.Color(60, 60, 80); + java.awt.Color maximizeColor = (hoveredButton == 1) ? new java.awt.Color(100, 150, 200) : new java.awt.Color(70, 70, 100); g.setColor(maximizeColor); g.fillRect(buttonX, 0, BUTTON_WIDTH, BUTTON_HEIGHT); - g.setColor(new java.awt.Color(80, 80, 100)); - g.drawLine(buttonX, 0, buttonX, BUTTON_HEIGHT); + g.setColor(new java.awt.Color(150, 150, 180)); + g.drawRect(buttonX, 0, BUTTON_WIDTH - 1, BUTTON_HEIGHT - 1); g.setColor(java.awt.Color.WHITE); if (isMaximized) { - g.drawRect(buttonX + 12, 10, BUTTON_WIDTH - 26, BUTTON_HEIGHT - 22); - g.drawRect(buttonX + 16, 8, BUTTON_WIDTH - 26, BUTTON_HEIGHT - 22); + g.drawRect(buttonX + 14, 12, BUTTON_WIDTH - 30, BUTTON_HEIGHT - 26); + g.drawRect(buttonX + 18, 10, BUTTON_WIDTH - 30, BUTTON_HEIGHT - 26); } else { - g.drawRect(buttonX + 12, 10, BUTTON_WIDTH - 24, BUTTON_HEIGHT - 20); + g.drawRect(buttonX + 14, 12, BUTTON_WIDTH - 28, BUTTON_HEIGHT - 24); } buttonX += BUTTON_WIDTH; - java.awt.Color closeColor = (hoveredButton == 2) ? new java.awt.Color(220, 50, 50) : new java.awt.Color(200, 40, 40); + java.awt.Color closeColor = (hoveredButton == 2) ? new java.awt.Color(255, 80, 80) : new java.awt.Color(220, 50, 50); g.setColor(closeColor); g.fillRect(buttonX, 0, BUTTON_WIDTH, BUTTON_HEIGHT); - g.setColor(new java.awt.Color(80, 80, 100)); - g.drawLine(buttonX, 0, buttonX, BUTTON_HEIGHT); + g.setColor(new java.awt.Color(255, 120, 120)); + g.drawRect(buttonX, 0, BUTTON_WIDTH - 1, BUTTON_HEIGHT - 1); g.setColor(java.awt.Color.WHITE); - g.drawLine(buttonX + 15, 12, buttonX + BUTTON_WIDTH - 15, BUTTON_HEIGHT - 12); - g.drawLine(buttonX + BUTTON_WIDTH - 15, 12, buttonX + 15, BUTTON_HEIGHT - 12); + g.drawLine(buttonX + 18, 15, buttonX + BUTTON_WIDTH - 18, BUTTON_HEIGHT - 15); + g.drawLine(buttonX + BUTTON_WIDTH - 18, 15, buttonX + 18, BUTTON_HEIGHT - 15); } } diff --git a/FishGame/src/com/mypro/mainsurface/MainSurface.java b/FishGame/src/com/mypro/mainsurface/MainSurface.java index 63cb9f0..29790ae 100644 --- a/FishGame/src/com/mypro/mainsurface/MainSurface.java +++ b/FishGame/src/com/mypro/mainsurface/MainSurface.java @@ -22,7 +22,7 @@ import com.mypro.model.interfaces.Drawable; public class MainSurface extends JPanel{ - private static final int TITLE_BAR_HEIGHT = 40; + private static final int TITLE_BAR_HEIGHT = 55; private boolean gameInitialized = false; private boolean gameStarted = false;