diff --git a/User1 b/User1 index d11e932..ad541a2 100644 --- a/User1 +++ b/User1 @@ -15,9 +15,9 @@ null null 0 0 -4 3 -2 -4430 +7 6 +16 +6102 0 0 1 2 3 4 null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null diff --git a/gLOSE.png b/gLOSE.png index 98890f9..e8f19cc 100644 Binary files a/gLOSE.png and b/gLOSE.png differ diff --git a/gWIN.png b/gWIN.png index f8dabe9..d0909d9 100644 Binary files a/gWIN.png and b/gWIN.png differ diff --git a/rankL.txt b/rankL.txt index f710388..8746f0c 100644 --- a/rankL.txt +++ b/rankL.txt @@ -1,2 +1,2 @@ 1 3 2 -4 1 1 +14 1 1 diff --git a/rankW.txt b/rankW.txt index 5eafec9..5ede4fc 100644 --- a/rankW.txt +++ b/rankW.txt @@ -1,2 +1,2 @@ 1 3 2 -3 0 0 +4 0 0 diff --git a/src/game.java b/src/game.java index 529def9..aafc92b 100644 --- a/src/game.java +++ b/src/game.java @@ -155,17 +155,18 @@ public void mouseReleased(MouseEvent e) { public game(){ setSize(1300,700); setLayout(null); - mapSeparator.setBounds(bInsets.left+647,bInsets.top+125,6,525); - add(mapSeparator); - winWord.setBounds(bInsets.left,bInsets.top+190,1300,300); + + winWord.setBounds(bInsets.left,bInsets.top,1300,700); winWord.addMouseListener(hide); add(winWord); winWord.setVisible(false); - losWord.setBounds(bInsets.left,bInsets.top+190,1300,300); + losWord.setBounds(bInsets.left,bInsets.top,1300,700); losWord.addMouseListener(hide); add(losWord); losWord.setVisible(false); setMap(true); + mapSeparator.setBounds(bInsets.left+647,bInsets.top+125,6,525); + add(mapSeparator); gButtons.add(backButton); gButtons.add(startButton); gButtons.add(leaveButton); @@ -222,11 +223,6 @@ public void actionPerformed(ActionEvent e) { bgi.setBounds(bInsets.left,bInsets.top,1300,700); add(bgi); setBackground(Color.DARK_GRAY); - for(int i =0;i<10;i++){ - for(int j =0;j<10;j++){ - - } - } setVisible(true); } @@ -318,7 +314,7 @@ public void setMap(boolean firstTime){ } if(!firstTime){ userMap[i][j].setText(""); - userMap[i][j].setText(""); + enemMap[i][j].setText(""); } userMap[i][j].setBorder(new LineBorder(Color.white)); enemMap[i][j].setBorder(new LineBorder(Color.white)); diff --git a/src/system.java b/src/system.java index c0e3e8b..456ebbf 100644 --- a/src/system.java +++ b/src/system.java @@ -40,8 +40,8 @@ public void mouseClicked(MouseEvent event) { System.out.println(-1); remove(baseInter); add(gameInter); - enterGame(); repaint(); + enterGame(); return; } if (source.equals(baseInter.rankingButton)) { @@ -222,6 +222,7 @@ JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, new ImageIcon("gNani.pn if(AIcombat){ for(int i =0;i<10;i++){ for(int j =0;j<10;j++){ + game.enemMap[i][j].setText("");; game.userMap[i][j].setBackground(Color.white); game.userMap[i][j].removeMouseListener(gameInter.unitDis); }