Commit 1bb3d978 authored by 刘家荣's avatar 刘家荣 💬
Browse files

Merge remote-tracking branch 'origin/itr2-front' into itr2-back 

# Conflicts:
#	src/controller/AppController.java
#	src/controller/BulletAnim.java
#	src/controller/ChessClickController.java
#	src/model/game/Game.java
parents 90ded261 7feef0d4

BugChess.iml

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  <component name="NewModuleRootManager" inherit-compiler-output="true">

    <exclude-output />

    <content url="file://$MODULE_DIR$">

      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />

    </content>

res/CBP 1.0.png

0 → 100644
+212 KiB
Loading image diff...

res/nameLabel.png

0 → 100644
+3.32 KiB
Loading image diff...

res/普通disco的伴奏.wav

0 → 100644
+35.4 MiB

File added.

No diff preview for this file type.

View file

src/Main.java

+0 −3
Original line number Diff line number Diff line 
import controller.AppController;

import view.ChessGameFrame;



import javax.swing.*;



public class Main {

    public static void main(String[] args) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE