Merge branch 'master' into develop

wutcst · Jun 24, 2023 · 063d9e9 · 063d9e9
2 parents 8569781 + b812083
commit 063d9e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
@@ -10,9 +10,17 @@ name: Java CI with Maven feature
 
 on:
   push:
-    branches: [ "Wuaoni" ]
+    branches:
+      - feature-gameCommand-wj 
+      - feature-ItemNPC-ld
+      - feature-GUI-qyl
+      - feature-SaveLoaderPLayer-wan
   pull_request:
-    branches: [ "Wuaoni" ]
+    branches:
+      - feature-gameCommand-wj 
+      - feature-ItemNPC-ld
+      - feature-GUI-qyl
+      - feature-SaveLoaderPLayer-wan
 
 jobs:
   build:

diff --git a/src/main/java/cn/edu/whut/sept/zuul/Main.java b/src/main/java/cn/edu/whut/sept/zuul/Main.java
@@ -7,3 +7,4 @@ public static void main(String[] args) {
         game.play();
     }
 }
+