Skip to content

shoot 1차 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adszzz11 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

shoot 1차 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified build/classes/java/main/dev/navo/game/Client/Client$1.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Client/Client.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Client/ClientHandler.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Client/Room.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Screen/PlayScreen.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Screen/WaitScreen$1.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Screen/WaitScreen$2.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Screen/WaitScreen.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Sprites/Bullet.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Sprites/Character/Crewmate2D$1.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Sprites/Character/Crewmate2D.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/dev/navo/game/Sprites/Character/CrewmateMulti.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/libs/core-1.0.jar
View file
Open in desktop
Binary file not shown.
66 changes: 33 additions & 33 deletions build/tmp/compileJava/source-classes-mapping.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,64 @@ dev/navo/game/Tools/FontGenerator.java
dev/navo/game/Scenes/Result.java
dev.navo.game.Scenes.Result
dev.navo.game.Scenes.Result$1
dev/navo/game/Sprites/Items/SpeedItem.java
dev.navo.game.Sprites.Items.SpeedItem
dev/navo/game/Buffer/EventBuffer.java
dev.navo.game.Buffer.EventBuffer
dev/navo/game/Buffer/Buffer.java
dev.navo.game.Buffer.Buffer
dev/navo/game/Buffer/LoginBuffer.java
dev.navo.game.Buffer.LoginBuffer
dev/navo/game/Sprites/Items/TrapItem.java
dev.navo.game.Sprites.Items.TrapItem
dev/navo/game/Client/ClientHandler.java
dev.navo.game.Client.ClientHandler
dev/navo/game/Sprites/Items/ItemSample.java
dev.navo.game.Sprites.Items.ItemSample
dev/navo/game/Sprites/Weapon.java
dev.navo.game.Sprites.Weapon
dev/navo/game/Tools/Sounds.java
dev.navo.game.Tools.Sounds
dev/navo/game/Sprites/InteractiveTileObject.java
dev.navo.game.Sprites.InteractiveTileObject
dev/navo/game/Tools/B2WorldCreator.java
dev.navo.game.Tools.B2WorldCreator
dev/navo/game/Sprites/Items/HpItem.java
dev.navo.game.Sprites.Items.HpItem
dev/navo/game/Sprites/Character/Crewmate2D.java
dev.navo.game.Sprites.Character.Crewmate2D
dev.navo.game.Sprites.Character.Crewmate2D$1
dev.navo.game.Sprites.Character.Crewmate2D$State
dev/navo/game/Sprites/Weapon.java
dev.navo.game.Sprites.Weapon
dev/navo/game/Sprites/Bullet.java
dev.navo.game.Sprites.Bullet
dev/navo/game/Sprites/InteractiveTileObject.java
dev.navo.game.Sprites.InteractiveTileObject
dev/navo/game/Tools/Images.java
dev.navo.game.Tools.Images
dev/navo/game/Buffer/InGameBuffer.java
dev.navo.game.Buffer.InGameBuffer
dev/navo/game/Client/ClientInitializer.java
dev.navo.game.Client.ClientInitializer
dev/navo/game/Sprites/Character/CrewmateMulti.java
dev.navo.game.Sprites.Character.CrewmateMulti
dev/navo/game/NavoGame.java
dev.navo.game.NavoGame
dev/navo/game/Scenes/Hud.java
dev.navo.game.Scenes.Hud
dev/navo/game/Tools/Images.java
dev.navo.game.Tools.Images
dev/navo/game/Buffer/EventBuffer.java
dev.navo.game.Buffer.EventBuffer
dev/navo/game/Tools/JsonParser.java
dev.navo.game.Tools.JsonParser
dev/navo/game/Buffer/InGameBuffer.java
dev.navo.game.Buffer.InGameBuffer
dev/navo/game/Tools/Util.java
dev.navo.game.Tools.Util
dev/navo/game/Scenes/Hud.java
dev.navo.game.Scenes.Hud
dev/navo/game/Sprites/Items/SpeedItem.java
dev.navo.game.Sprites.Items.SpeedItem
dev/navo/game/Sprites/Character/Cat.java
dev.navo.game.Sprites.Character.Cat
dev.navo.game.Sprites.Character.Cat$1
dev.navo.game.Sprites.Character.Cat$State
dev/navo/game/Sprites/Items/HpItem.java
dev.navo.game.Sprites.Items.HpItem
dev/navo/game/Sprites/Items/ItemSample.java
dev.navo.game.Sprites.Items.ItemSample
dev/navo/game/Sprites/Items/TrapItem.java
dev.navo.game.Sprites.Items.TrapItem
dev/navo/game/Client/ClientSocket.java
dev.navo.game.Client.ClientSocket
dev.navo.game.Client.ClientSocket$1
dev/navo/game/Screen/LoginScreen.java
dev.navo.game.Screen.LoginScreen
dev.navo.game.Screen.LoginScreen$1
dev.navo.game.Screen.LoginScreen$2
dev.navo.game.Screen.LoginScreen$3
dev/navo/game/Client/Room.java
dev.navo.game.Client.Room
dev/navo/game/Client/ClientSocket.java
dev.navo.game.Client.ClientSocket
dev.navo.game.Client.ClientSocket$1
dev/navo/game/Tools/Util.java
dev.navo.game.Tools.Util
dev/navo/game/Screen/IdPwFindScreen.java
dev.navo.game.Screen.IdPwFindScreen
dev.navo.game.Screen.IdPwFindScreen$1
Expand All @@ -65,16 +69,12 @@ dev/navo/game/Screen/IdPwFindScreen.java
dev/navo/game/Client/Client.java
dev.navo.game.Client.Client
dev.navo.game.Client.Client$1
dev/navo/game/Sprites/Bullet.java
dev.navo.game.Sprites.Bullet
dev/navo/game/Screen/SignUpScreen.java
dev.navo.game.Screen.SignUpScreen
dev.navo.game.Screen.SignUpScreen$1
dev.navo.game.Screen.SignUpScreen$2
dev/navo/game/Sprites/Character/Crewmate2D.java
dev.navo.game.Sprites.Character.Crewmate2D
dev.navo.game.Sprites.Character.Crewmate2D$1
dev.navo.game.Sprites.Character.Crewmate2D$State
dev/navo/game/Client/ClientHandler.java
dev.navo.game.Client.ClientHandler
dev/navo/game/Screen/WaitScreen.java
dev.navo.game.Screen.WaitScreen
dev.navo.game.Screen.WaitScreen$1
Expand Down
18 changes: 16 additions & 2 deletions src/dev/navo/game/Client/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,21 @@ public void changeColor(JSONObject json) {
System.out.println("Client 204: " + parentJson);
channel.writeAndFlush(parentJson.toJSONString() + "\r\n");
}

public void shoot(float x, float y, Crewmate2D.State state) {
JSONObject parentJson = new JSONObject();
JSONObject childJson=new JSONObject();
childJson.put("owner",Room.getRoom().getMyCrewmate().owner);
childJson.put("x",x);
childJson.put("y",y);
System.out.println("asdfasdf:"+state.toString());
childJson.put("state",state.toString());
parentJson.put("Header","Event");
parentJson.put("Function","3");
parentJson.put("roomCode",Room.getRoom().getRoomCode());
parentJson.put("Body",childJson);
channel.writeAndFlush(parentJson.toJSONString() + "\r\n");
System.out.println(parentJson);
}
//업데이트 보내기
public void updateSender(final Crewmate2D user, final Room room) {
System.out.println("updateSender set");
Expand All @@ -233,7 +247,7 @@ public void run() {
System.out.println("send : "+parentJson.toJSONString());
channel.writeAndFlush(parentJson.toJSONString() + "\r\n");
try {
Thread.sleep(100);
Thread.sleep(75);
} catch (InterruptedException e) {
inGameThread = false;
e.toString();
Expand Down
3 changes: 3 additions & 0 deletions src/dev/navo/game/Client/ClientHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ private void eventHandler(JSONObject json) {
case "2": // 색 변경
Room.getRoom().changeUserColor((JSONObject)json.get("Body"));
break;
case "3":
Room.getRoom().makeBullet((JSONObject)json.get("Body"));
break;
case "4":
Room.getRoom().deleteUser(json.get("Body").toString());
break;
Expand Down
28 changes: 28 additions & 0 deletions src/dev/navo/game/Client/Room.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package dev.navo.game.Client;

import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.Vector2;
import dev.navo.game.Screen.PlayScreen;
import dev.navo.game.Screen.WaitScreen;
import dev.navo.game.Sprites.Bullet;
import dev.navo.game.Sprites.Character.Crewmate2D;
Expand Down Expand Up @@ -53,7 +55,33 @@ public static void setMyCrewmate(Crewmate2D crewmate) {
myCrewmate = crewmate;
Client.getInstance().enter(crewmate.getCrewmateEnterJson());
}
public void makeBullet(JSONObject json) {
if(!myCrewmate.owner.equals(json.get("owner").toString())) {
switch (json.get("state").toString()) {
case "UP":
bullets.add(new Bullet(PlayScreen.world, new Vector2(Float.parseFloat(json.get("x").toString())
,Float.parseFloat(json.get("y").toString()))
,Crewmate2D.State.UP));
break;
case "DOWN":
bullets.add(new Bullet(PlayScreen.world, new Vector2(Float.parseFloat(json.get("x").toString())
,Float.parseFloat(json.get("y").toString()))
,Crewmate2D.State.DOWN));
break;
case "RIGHT":
bullets.add(new Bullet(PlayScreen.world, new Vector2(Float.parseFloat(json.get("x").toString())
,Float.parseFloat(json.get("y").toString()))
,Crewmate2D.State.RIGHT));
break;
case "LEFT":
bullets.add(new Bullet(PlayScreen.world, new Vector2(Float.parseFloat(json.get("x").toString())
,Float.parseFloat(json.get("y").toString()))
,Crewmate2D.State.LEFT));
break;
}

}
}
public void drawCrewmates(SpriteBatch batch, String user) {
for(CrewmateMulti crewmate : crewmates) {
if(!user.equals(crewmate.owner)) {
Expand Down
25 changes: 14 additions & 11 deletions src/dev/navo/game/Screen/PlayScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.badlogic.gdx.physics.box2d.*;
import com.badlogic.gdx.utils.viewport.FitViewport;
import com.badlogic.gdx.utils.viewport.Viewport;
import dev.navo.game.Client.Client;
import dev.navo.game.Client.Room;
import dev.navo.game.NavoGame;
import dev.navo.game.Scenes.Hud;
Expand Down Expand Up @@ -46,7 +47,7 @@ public class PlayScreen implements Screen {
private TiledMap map;
private OrthogonalTiledMapRenderer renderer;

private World world;
public static World world;
private Box2DDebugRenderer b2dr;

private Crewmate2D myCrewmate;
Expand Down Expand Up @@ -136,7 +137,8 @@ public void handleInput ( float dt){
Util.moveInputHandle(myCrewmate, maxSpeed, moveSpeed);

if (Gdx.input.isKeyJustPressed(Input.Keys.X) && myCrewmate.getAttackDelay() <= 0) {
myBullets.add(new Bullet(world, this, new Vector2(myCrewmate.getX(), myCrewmate.getY()), myCrewmate.currentState)); // 총알 생성
myBullets.add(new Bullet(world, new Vector2(myCrewmate.getX(), myCrewmate.getY()), myCrewmate.currentState)); // 총알 생성
Client.getInstance().shoot(myCrewmate.getX(),myCrewmate.getY(),myCrewmate.currentState);
myCrewmate.setAttackDelay(0.3f);//공격 딜레이 설정
// To DO : Client.getInstance().shoot(); 쏘는 방향, x, y, type
}
Expand Down Expand Up @@ -186,16 +188,17 @@ public void update (float dt){
break;
}
}
}for(int i = 0; i < otherBullets.size() ; i++){
bullet = otherBullets.get(i);
for (Rectangle block : blocks) {
if (bullet.getX() >= block.getX() - bullet.getWidth() && bullet.getX() <= block.getX() + block.getWidth())
if (bullet.getY() >= block.getY() - bullet.getHeight() && bullet.getY() <= block.getY() + block.getHeight()) {
myBullets.remove(i--);
break;
}
}
}
// for(int i = 0; i < otherBullets.size() ; i++){
// bullet = otherBullets.get(i);
// for (Rectangle block : blocks) {
// if (bullet.getX() >= block.getX() - bullet.getWidth() && bullet.getX() <= block.getX() + block.getWidth()&&!myBullets.isEmpty())
// if (bullet.getY() >= block.getY() - bullet.getHeight() && bullet.getY() <= block.getY() + block.getHeight()) {
// myBullets.remove(i--);
// break;
// }
// }
// }

// Crewmate2D crewmate;
//// for (int i = 0; i < bullets.size(); i++) {
Expand Down
2 changes: 1 addition & 1 deletion src/dev/navo/game/Sprites/Bullet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class Bullet extends Sprite {
private final static float SPEED = 250f; // 이동 속도
private final static int RANGE = 150; // 총알 사거리

public Bullet(World world, PlayScreen screen, Vector2 v, Crewmate2D.State crewmateState){
public Bullet(World world, Vector2 v, Crewmate2D.State crewmateState){
// super(screen.getAtlas().findRegion("Bullet"));
super(Images.mainAtlas.findRegion("Bullet"));
isCollision = false;
Expand Down