diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 652c853..88cde08 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/cactusClient/models/OwnPlayer.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java index b578b75..e7b400e 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java @@ -237,6 +237,11 @@ } + public boolean onTouch(View v, MotionEvent event) { + System.out.println("RWTUIFragment touch"); + return false; + } + public void logout() { con = new CharacterConnection(playerId); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java index 2f15c67..10dcb22 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java @@ -108,17 +108,17 @@ otherPlayerCharactersModel = new OtherPlayerCharactersModel(this, universe); otherPlayerCharactersModel.setPlayerId(playerId); + modelManager.addModel(otherPlayerCharactersModel); + bulletsManager = new BulletsManager(this.getResources(), universe); bulletsManager.setPlayerId(playerId); + modelManager.addModel(bulletsManager); - modelManager.addModel(otherPlayerCharactersModel); //objectの通信 movableObjectModel = new MovableObjectModel(this, universe, instanceId); modelManager.addModel(movableObjectModel); //画面の生成 - modelManager.addModel(bulletsManager); - modelManager.addModel(player); modelManager.setInstanceId(instanceId); initGameWindowView(); @@ -134,8 +134,6 @@ player.jump(); } }); - - } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java index 5e97251..dead85d 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java @@ -40,9 +40,6 @@ RWTPad pad = v.findViewById(R.id.pad); pad.addListener(this); - - - if (listener != null) { listener.onCreateFragmentEvent(this); } @@ -54,11 +51,6 @@ System.out.println("RWTUIFragment touch"); return false; } -// -// -// public void onClick(View v) { -// System.out.print("onClick押されましたよ----------------------------------------------------IN RWTUIFragment"); -// } @Override public boolean onEvent(PadEvent event) {