diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 327a66c..ee1e5f5 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/Actor.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/Actor.java index 42f03e3..eb1666d 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/Actor.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/Actor.java @@ -129,12 +129,11 @@ } // TODO: 2018/06/11 物体と人のあたり判定の記述 - for (ArrayList collidableList: collidableListList) { for (Placeable anothor: collidableList) { //自分と物体のあたり判定 CollisionResult cr2 = PhysicsUtility.checkCollision(body,null,(Solid3D)(anothor.getBody()),null); - + if(cr2 !=null){ boolean flag = false; onCollisionStay(anothor);//k.呼び出される diff --git a/build.gradle b/build.gradle index 741b9e8..22d7231 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files }