From c401fc565702ea5f0e67b9143d35b0a04b078a46 Mon Sep 17 00:00:00 2001 From: marc barbier Date: Mon, 4 Jan 2021 13:00:57 +0100 Subject: [PATCH] ajout debut de phase --- .../myapplication/Game/GameLogicThread.java | 3 +++ app/src/main/res/drawable/t_pb_battlephase.png | Bin 0 -> 11077 bytes 2 files changed, 3 insertions(+) create mode 100644 app/src/main/res/drawable/t_pb_battlephase.png diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java index 60892f0..8ba42a4 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java @@ -88,6 +88,7 @@ public class GameLogicThread extends Thread{ //loading textures Bitmap bitmapYourTurn = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_pb_your_turn); Bitmap bitmapEnemyTurn = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_pb_enemy_turn); + Bitmap bitmapBattlePhase = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_pb_battlephase); Bitmap bitmapButtonEnd = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_btn_boutonfintour); Bitmap bitmap= BitmapFactory.decodeResource(cont.getResources(), R.drawable.t_b_board_background); @@ -254,8 +255,10 @@ public class GameLogicThread extends Thread{ //c'est le role de la command meule de faire perde des cartes au joeur int nbmeule = coms.recieveInt(); deck.draw(nbmeule); + break; case Command.BATTLE: + renderer.addToDraw(new DrawableSelfRemoving(new DrawableBitmap(bitmapBattlePhase,0,0,"battlePhase",100F,50F),1)); isYourBattlePhase=true; isYourMainPhase=false; break; diff --git a/app/src/main/res/drawable/t_pb_battlephase.png b/app/src/main/res/drawable/t_pb_battlephase.png new file mode 100644 index 0000000000000000000000000000000000000000..e0dec4aee93e8d2f09526a3d10a40bfd26b731c6 GIT binary patch literal 11077 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 literal 0 HcmV?d00001