Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
iammmmmmm committed Nov 29, 2024
2 parents 6e4d96a + 8ce5ee3 commit 515f26a
Show file tree
Hide file tree
Showing 5 changed files with 1,734 additions and 7 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '21'
java-version: '17'

- name: Install libraries
run: |
Expand All @@ -40,8 +40,12 @@ jobs:
- name: Copy packages to staging
run: cp -r target/gluonfx/aarch64-android/gvm/CaiDanCi.* staging

- name: Cat all log file
if: ${{ always() }}
run: cat /home/runner/work/caiDanCi/caiDanCi/target/gluonfx/log/*

- name: Upload
uses: actions/upload-artifact@v4
with:
name: Package
path: staging
path: staging
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

<properties>
<attach.version>4.0.21</attach.version>
<gluonfx.maven.plugin.version>1.0.24</gluonfx.maven.plugin.version>
<gluonfx.maven.plugin.version>1.0.23</gluonfx.maven.plugin.version>
<gluonfx.target>host</gluonfx.target>
<javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
<javafx.version>24-ea+5</javafx.version>
<javafx.version>23</javafx.version>
<main.class>caidanci.HelloApplication</main.class>
<maven.compiler.release>21</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
<app.identifier>${main.class}</app.identifier>
<app.description>The CaiDanCi app</app.description>
<app.description>The CaiDanCi game</app.description>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand All @@ -27,7 +27,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>3.8.1</version>
<version>3.13.0</version>
</plugin>

<plugin>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/caidanci/tools.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ public static double[] getScreenSize() {
System.out.println("屏幕 DPI: " + screenDPI);
return new double[]{screenWidth, screenHeight};
}
public static int[] getCenterPosition(){
var a=getScreenSize();
return new int[]{(int) (a[0] / 2), (int) (a[1] / 2)};
}

public static int[] screenAutoSize(int preWith, int preHeight) {
var screenSize = getScreenSize();
Expand Down
Loading

0 comments on commit 515f26a

Please sign in to comment.