弾を撃ち，弾の情報を送受信できるよう実装中

Fork: 0

n-konishi / Cactus-CleanArchitecture

Browse code 弾を撃ち，弾の情報を送受信できるよう実装中 CleanArchitecture chenge_design correct_design master onResponse update ...update2
1 parent dc59158 commit b4db088e9a37c70edffbfa29569d694f5ec1fb12 s-iwatani authored on 16 Oct 2018

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/build.gradle
             minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
    buildToolsVersion '28.0.2'
    buildToolsVersion '28.0.3'
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildToolsVersion '28.0.2'
+    buildToolsVersion '28.0.3'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }

                Ignore Space
               Show notes
              View
            
          
          39 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Bullet.java
     private boolean isCreatedOnServer = false;
    private boolean isDelete = false;
 
    public Bullet(Object3D body, Animation3D animation) {
        super(new Solid3D(body), animation);
        mode = modeOnGround;
        super(body, animation);
    }
 
    public Bullet(Solid3D body, Animation3D animation) {
        super(body, animation);
        mode = modeOnGround;
    }
 
    public void initUuid() {
        if (uuid.equals("")) {
 
 
    @Override
    public void update(double interval) {
        // サーバに弾を作成
        if (!isCreatedOnServer && !instanceId.equals("") && !playerId.equals("")) {
            BulletCreateConnection con = new BulletCreateConnection(instanceId, playerId);
            // set parameter
 
            con.doPost();
        }
 
        // サーバの弾の情報を更新
        updateInterval -= interval;
        if (updateInterval <= 0 && isCreatedOnServer) {
            updateInterval = INIT_UPDATE_INTERVAL;
            bulletUpdateConnection = new BulletUpdateConnection(instanceId, playerId, uuid);
            // set parameter
 
            bulletUpdateConnection.doPut();
        }
//        // サーバに弾を作成
//        if (!isCreatedOnServer && !instanceId.equals("") && !playerId.equals("")) {
//            BulletCreateConnection con = new BulletCreateConnection(instanceId, playerId);
//            // set parameter
//
//            con.doPost();
//        }
//
//        // サーバの弾の情報を更新
//        updateInterval -= interval;
//        if (updateInterval <= 0 && isCreatedOnServer) {
//            updateInterval = INIT_UPDATE_INTERVAL;
//            bulletUpdateConnection = new BulletUpdateConnection(instanceId, playerId, uuid);
//            // set parameter
//
//            bulletUpdateConnection.doPut();
//        }
    }
 
    @Override
    public void setInstanceId(String id) {
     private boolean isCreatedOnServer = false;
     private boolean isDelete = false;
     public Bullet(Object3D body, Animation3D animation) {
+        super(new Solid3D(body), animation);
+        mode = modeOnGround;
+        super(body, animation);
     }
     public Bullet(Solid3D body, Animation3D animation) {
         super(body, animation);
-        mode = modeOnGround;
     }
     public void initUuid() {
         if (uuid.equals("")) {
     @Override
     public void update(double interval) {
+        // サーバに弾を作成
+        if (!isCreatedOnServer && !instanceId.equals("") && !playerId.equals("")) {
+            BulletCreateConnection con = new BulletCreateConnection(instanceId, playerId);
+            // set parameter
+            con.doPost();
+        }
+        // サーバの弾の情報を更新
+        updateInterval -= interval;
+        if (updateInterval <= 0 && isCreatedOnServer) {
+            updateInterval = INIT_UPDATE_INTERVAL;
+            bulletUpdateConnection = new BulletUpdateConnection(instanceId, playerId, uuid);
+            // set parameter
+            bulletUpdateConnection.doPut();
+        }
+//        // サーバに弾を作成
+//        if (!isCreatedOnServer && !instanceId.equals("") && !playerId.equals("")) {
+//            BulletCreateConnection con = new BulletCreateConnection(instanceId, playerId);
+//            // set parameter
+//
+//            con.doPost();
+//        }
+//
+//        // サーバの弾の情報を更新
+//        updateInterval -= interval;
+//        if (updateInterval <= 0 && isCreatedOnServer) {
+//            updateInterval = INIT_UPDATE_INTERVAL;
+//            bulletUpdateConnection = new BulletUpdateConnection(instanceId, playerId, uuid);
+//            // set parameter
+//
+//            bulletUpdateConnection.doPut();
+//        }
     }
     @Override
     public void setInstanceId(String id) {

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java
     @Override
    public void update(double interval) {
        nextConnectRenaimdTime -= interval;
        if (nextConnectRenaimdTime <= 0) {
            nextConnectRenaimdTime = connectInterval;
            con = new BulletGetConnection(instanceId);
            con.setCallBack(this);
            con.doGet();
//            nextConnectRenaimdTime = connectInterval;
//            con = new BulletGetConnection(instanceId);
//            con.setCallBack(this);
//            con.doGet();
        }
    }
 
    @Override
     @Override
     public void update(double interval) {
         nextConnectRenaimdTime -= interval;
         if (nextConnectRenaimdTime <= 0) {
+            nextConnectRenaimdTime = connectInterval;
+            con = new BulletGetConnection(instanceId);
+            con.setCallBack(this);
+            con.doGet();
+//            nextConnectRenaimdTime = connectInterval;
+//            con = new BulletGetConnection(instanceId);
+//            con.setCallBack(this);
+//            con.doGet();
         }
     }
     @Override

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnBullets.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/java3d/Vector3d.java

Ignore Space Show notes View build.gradle

Show line notes below