From 8d2112df973b91af09b919967c129c310636a44e Mon Sep 17 00:00:00 2001 From: Raymond Li Date: Fri, 8 Jun 2018 12:33:38 -0400 Subject: [PATCH] updates --- GUI Package/Char1.png => Char1.png | Bin ...achievementList.txt => achievementList.txt | 56 +++++++++--------- ...ewardList.txt => achievementRewardList.txt | 56 +++++++++--------- GUI Package/bgi.jpg => bgi.jpg | Bin GUI Package/gTimer.png => gTimer.png | Bin ...mentsButton.png => mAchievementsButton.png | Bin .../mContractPane.png => mContractPane.png | Bin ...tPaneButton.png => mContractPaneButton.png | Bin .../mFactoryButton.png => mFactoryButton.png | Bin .../mGAMEButton.png => mGAMEButton.png | Bin GUI Package/mMouse.png => mMouse.png | Bin .../mProfileButton.png => mProfileButton.png | Bin ...mRankingsButton.png => mRankingsButton.png | Bin ...mSettingsButton.png => mSettingsButton.png | Bin .../mTasksButton.png => mTasksButton.png | Bin GUI Package/purpose => purpose | 0 src/system.java | 15 +++-- .../theBackButton.png => theBackButton.png | Bin 18 files changed, 67 insertions(+), 60 deletions(-) rename GUI Package/Char1.png => Char1.png (100%) rename GUI Package/achievementList.txt => achievementList.txt (97%) rename GUI Package/achievementRewardList.txt => achievementRewardList.txt (86%) rename GUI Package/bgi.jpg => bgi.jpg (100%) rename GUI Package/gTimer.png => gTimer.png (100%) rename GUI Package/mAchievementsButton.png => mAchievementsButton.png (100%) rename GUI Package/mContractPane.png => mContractPane.png (100%) rename GUI Package/mContractPaneButton.png => mContractPaneButton.png (100%) rename GUI Package/mFactoryButton.png => mFactoryButton.png (100%) rename GUI Package/mGAMEButton.png => mGAMEButton.png (100%) rename GUI Package/mMouse.png => mMouse.png (100%) rename GUI Package/mProfileButton.png => mProfileButton.png (100%) rename GUI Package/mRankingsButton.png => mRankingsButton.png (100%) rename GUI Package/mSettingsButton.png => mSettingsButton.png (100%) rename GUI Package/mTasksButton.png => mTasksButton.png (100%) rename GUI Package/purpose => purpose (100%) rename GUI Package/theBackButton.png => theBackButton.png (100%) diff --git a/GUI Package/Char1.png b/Char1.png similarity index 100% rename from GUI Package/Char1.png rename to Char1.png diff --git a/GUI Package/achievementList.txt b/achievementList.txt similarity index 97% rename from GUI Package/achievementList.txt rename to achievementList.txt index 49b59de..c6063d3 100644 --- a/GUI Package/achievementList.txt +++ b/achievementList.txt @@ -1,28 +1,28 @@ -Journey of a thousand miles starts with one step|win 1 battle -the Success kid|win 100 battles -I'm bald, I'm strong|win 1000 battles -Omae wa mou shindeiru|win 2000 battles -Main heroine of Asadora|lose 10 battles -Letter from 1976|lose 100 battles -I have not failed. I've just found 1000 ways that won't work|lose 1000 battles -Never, never, never give up|lose 2000 battles -It's a trap|miss 100 times -Do u no dewae|miss 1000 times -Can't touch this|miss 5000 times -______________________________________________________ -Somebody toucha my spaghet|fight 10 battles -Dormammu i've come to bargain|fight 100 battles -This is Sparta!|fight 1000 battles -Battleships: Infinity War|fight 2018 battles -SHINJI GET INTO THE ROBOT!!!!!!!|fight 5000 battles -24|total 24 hours played -El psy congroo|total 2036 hours played -Jinrui Hokan|Complete all other achievements -_____________________________________________________ -Wintergarten|build 50 times -BUILD 100|build 100 times -Never gonna give you up|build 1000 times -Senpai noticed me|one character intimacy achieve 100% -Bad romance|dismantle 10 characters -A snap of fingers|dismantle 50 characters -It's bigger from the inside|expand capacity by 100 +Journey of a thousand miles starts with one step|win 1 battle +the Success kid|win 100 battles +I'm bald, I'm strong|win 1000 battles +Omae wa mou shindeiru|win 2000 battles +Main heroine of Asadora|lose 10 battles +Letter from 1976|lose 100 battles +I have not failed. I've just found 1000 ways that won't work|lose 1000 battles +Never, never, never give up|lose 2000 battles +It's a trap|miss 100 times +Do u no dewae|miss 1000 times +Can't touch this|miss 5000 times +______________________________________________________ +Somebody toucha my spaghet|fight 10 battles +Dormammu i've come to bargain|fight 100 battles +This is Sparta!|fight 1000 battles +Battleships: Infinity War|fight 2018 battles +SHINJI GET INTO THE ROBOT!!!!!!!|fight 5000 battles +24|total 24 hours played +El psy congroo|total 2036 hours played +Jinrui Hokan|Complete all other achievements +_____________________________________________________ +Wintergarten|build 50 times +BUILD 100|build 100 times +Never gonna give you up|build 1000 times +Senpai noticed me|one character intimacy achieve 100% +Bad romance|dismantle 10 characters +A snap of fingers|dismantle 50 characters +It's bigger from the inside|expand capacity by 100 diff --git a/GUI Package/achievementRewardList.txt b/achievementRewardList.txt similarity index 86% rename from GUI Package/achievementRewardList.txt rename to achievementRewardList.txt index 43a1896..805facc 100644 --- a/GUI Package/achievementRewardList.txt +++ b/achievementRewardList.txt @@ -1,28 +1,28 @@ -10 0 -50 0 -100 1 -500 5 -75 0 -100 0 -0 10 -10 3 -50 1 -100 0 -500 0 -覧覧覧覧覧覧 -10 1 -50 0 -10 10 -1000 6 -300 10 -240 4 -150 10 -777 7 -覧覧覧覧覧覧 -100 0 -0 10 -200 20 -10 1 -1 5 -100 5 -150 9 +10 0 +50 0 +100 1 +500 5 +75 0 +100 0 +0 10 +10 3 +50 1 +100 0 +500 0 +覧覧覧覧覧覧 +10 1 +50 0 +10 10 +1000 6 +300 10 +240 4 +150 10 +777 7 +覧覧覧覧覧覧 +100 0 +0 10 +200 20 +10 1 +1 5 +100 5 +150 9 diff --git a/GUI Package/bgi.jpg b/bgi.jpg similarity index 100% rename from GUI Package/bgi.jpg rename to bgi.jpg diff --git a/GUI Package/gTimer.png b/gTimer.png similarity index 100% rename from GUI Package/gTimer.png rename to gTimer.png diff --git a/GUI Package/mAchievementsButton.png b/mAchievementsButton.png similarity index 100% rename from GUI Package/mAchievementsButton.png rename to mAchievementsButton.png diff --git a/GUI Package/mContractPane.png b/mContractPane.png similarity index 100% rename from GUI Package/mContractPane.png rename to mContractPane.png diff --git a/GUI Package/mContractPaneButton.png b/mContractPaneButton.png similarity index 100% rename from GUI Package/mContractPaneButton.png rename to mContractPaneButton.png diff --git a/GUI Package/mFactoryButton.png b/mFactoryButton.png similarity index 100% rename from GUI Package/mFactoryButton.png rename to mFactoryButton.png diff --git a/GUI Package/mGAMEButton.png b/mGAMEButton.png similarity index 100% rename from GUI Package/mGAMEButton.png rename to mGAMEButton.png diff --git a/GUI Package/mMouse.png b/mMouse.png similarity index 100% rename from GUI Package/mMouse.png rename to mMouse.png diff --git a/GUI Package/mProfileButton.png b/mProfileButton.png similarity index 100% rename from GUI Package/mProfileButton.png rename to mProfileButton.png diff --git a/GUI Package/mRankingsButton.png b/mRankingsButton.png similarity index 100% rename from GUI Package/mRankingsButton.png rename to mRankingsButton.png diff --git a/GUI Package/mSettingsButton.png b/mSettingsButton.png similarity index 100% rename from GUI Package/mSettingsButton.png rename to mSettingsButton.png diff --git a/GUI Package/mTasksButton.png b/mTasksButton.png similarity index 100% rename from GUI Package/mTasksButton.png rename to mTasksButton.png diff --git a/GUI Package/purpose b/purpose similarity index 100% rename from GUI Package/purpose rename to purpose diff --git a/src/system.java b/src/system.java index a40ff63..6aaba70 100644 --- a/src/system.java +++ b/src/system.java @@ -5,36 +5,43 @@ import java.awt.event.MouseListener; import javax.swing.*; + public class system extends JFrame { - MouseListener directory = new MouseListener(){ + MouseListener directory = new MouseListener() { public void mouseClicked(MouseEvent event) { Object source = event.getSource(); - if(source.equals(baseInter.gameButton)){ + if (source.equals(baseInter.gameButton)) { System.out.println(-1); remove(baseInter); add(gameInter); repaint(); } } + public void mouseEntered(MouseEvent e) { } + public void mouseExited(MouseEvent e) { } + public void mousePressed(MouseEvent e) { } + public void mouseReleased(MouseEvent e) { } }; base baseInter = new base(); game gameInter = new game(); - public system(){ + + public system() { baseInter.gameButton.addMouseListener(directory); add(baseInter); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); this.setResizable(false); - setSize(1300,700); + setSize(1300, 700); setVisible(true); } + public static void main(String[] args) { // TODO Auto-generated method stub system theGame = new system(); diff --git a/GUI Package/theBackButton.png b/theBackButton.png similarity index 100% rename from GUI Package/theBackButton.png rename to theBackButton.png