update

pama1234 · Apr 3, 2023 · 3d18525 · 3d18525
1 parent e2eea3f
commit 3d18525
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/...1/framework0001-neat/src/main/java/pama1234/util/neat/raimannma/architecture/Network.java b/...1/framework0001-neat/src/main/java/pama1234/util/neat/raimannma/architecture/Network.java
@@ -99,7 +99,7 @@ public void createConnection() {
    *
    * @param network_a parent network 1
    * @param network_b parent network 2
-   * @param equal    indicate that networks are equally fit
+   * @param equal     indicate that networks are equally fit
    * @return new network created from mixing parent networks
    */
   public static Network crossover(final Network network_a,final Network network_b,final boolean equal) {

diff --git a/framework0002/framework0002-android/build.gradle b/framework0002/framework0002-android/build.gradle
@@ -22,8 +22,10 @@ android {
 }
 
 dependencies {
-  // implementation project(':game0001:game0001-core')
+  implementation project(':framework')
   // compileOnly project(":gdx-vr-core")
   // implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
   // implementation "com.google.vr:sdk-base:1.190.0"
+
+  implementation 'net.java.dev.jna:jna:5.13.0'
 }
diff --git a/game0003/game0003-core/src/main/java/pama1234/gdx/game/duel/Duel.java b/game0003/game0003-core/src/main/java/pama1234/gdx/game/duel/Duel.java
@@ -119,6 +119,9 @@ public void display() {
       text("real time score",0,pu);
       text("a - "+Tools.getFloatString(system.myGroup.player.engine.getScore(1)),0,pu*2);
       text("b - "+Tools.getFloatString(system.otherGroup.player.engine.getScore(1)),0,pu*3);
+      text("final score",0,pu*4);
+      text("a - "+Tools.getFloatString(system.myGroup.player.engine.getScore(0)),0,pu*5);
+      text("b - "+Tools.getFloatString(system.otherGroup.player.engine.getScore(0)),0,pu*6);
     }
   }
   @Override

diff --git a/game0003/game0003-core/src/main/java/pama1234/gdx/game/duel/util/ai/nnet/NetworkGroup.java b/game0003/game0003-core/src/main/java/pama1234/gdx/game/duel/util/ai/nnet/NetworkGroup.java
@@ -23,7 +23,8 @@
  * +--> vision -> logic -> behavior -+
  * |                                 |
  * +------------- world <------------+
- * }</pre>
+ * }
+ * </pre>
  */
 public class NetworkGroup{
   public FloatBlock input,output;
@@ -63,6 +64,6 @@ public void setScore(int scoreType,float score) {
     world.network.floatData[scoreType]=score;
   }
   public float getScore(int index) {//TODO
-      return logic.network.floatData[index];
+    return logic.network.floatData[index];
   }
 }
diff --git a/game0003/game0003-core/src/main/java/pama1234/gdx/game/duel/util/state/PlayGameState.java b/game0003/game0003-core/src/main/java/pama1234/gdx/game/duel/util/state/PlayGameState.java
@@ -47,8 +47,8 @@ public void displayMessage() {
   }
   @Override
   public void checkStateTransition() {
-    if(system.myGroup.player.isNull()) system.currentState(new GameResultState(duel,system,system.myGroup.id,TextUtil.used.lose));
-    else if(system.otherGroup.player.isNull()) system.currentState(new GameResultState(duel,system,system.otherGroup.id,TextUtil.used.win));
+    if(system.myGroup.player.isNull()) system.currentState(new GameResultState(duel,system,system.otherGroup.id,TextUtil.used.lose));
+    else if(system.otherGroup.player.isNull()) system.currentState(new GameResultState(duel,system,system.myGroup.id,TextUtil.used.win));
   }
   public void checkCollision() {
     final ActorGroup myGroup=duel.system.myGroup;

diff --git a/game0003/game0003-core/src/main/java/pama1234/gdx/launcher/MainApp.java b/game0003/game0003-core/src/main/java/pama1234/gdx/launcher/MainApp.java
@@ -20,7 +20,7 @@ public MainApp() {
     screenList=Arrays.asList(null,
       Duel.class,//几何决斗
       Screen0021.class//着色器测试
-      );
+    );
   }
   @Override
   public void create() {