상점 기능 완성

클라이언트 / 서버 상점 기능 완성 sql 파일 업데이트
mu29 · Mar 15, 2015 · 389a0b8 · 389a0b8
1 parent 520a765
commit 389a0b8
Show file tree

Hide file tree

Showing 51 changed files with 409 additions and 333 deletions.
diff --git a/Client/Data/Scripts.rxdata b/Client/Data/Scripts.rxdata
diff --git a/Client/Data/System.rxdata b/Client/Data/System.rxdata
diff --git a/Client/User.ini b/Client/User.ini
@@ -1,5 +1,5 @@
 [User]
-id=
+id=1
 [Option]
 bgm=50
 bgs=29

diff --git a/ClientRGSS3/Data/Actors.rxdata b/ClientRGSS3/Data/Actors.rxdata
diff --git a/ClientRGSS3/Data/Animations.rxdata b/ClientRGSS3/Data/Animations.rxdata
diff --git a/ClientRGSS3/Data/Armors.rxdata b/ClientRGSS3/Data/Armors.rxdata
diff --git a/ClientRGSS3/Data/CommonEvents.rxdata b/ClientRGSS3/Data/CommonEvents.rxdata
diff --git a/ClientRGSS3/Data/Enemies.rxdata b/ClientRGSS3/Data/Enemies.rxdata
diff --git a/ClientRGSS3/Data/Items.rxdata b/ClientRGSS3/Data/Items.rxdata
diff --git a/ClientRGSS3/Data/MapInfos.rxdata b/ClientRGSS3/Data/MapInfos.rxdata
diff --git a/ClientRGSS3/Data/Scripts.rxdata b/ClientRGSS3/Data/Scripts.rxdata
diff --git a/ClientRGSS3/Data/Skills.rxdata b/ClientRGSS3/Data/Skills.rxdata
diff --git a/ClientRGSS3/Data/States.rxdata b/ClientRGSS3/Data/States.rxdata
diff --git a/ClientRGSS3/Data/System.rxdata b/ClientRGSS3/Data/System.rxdata
diff --git a/ClientRGSS3/Data/Tilesets.rxdata b/ClientRGSS3/Data/Tilesets.rxdata
diff --git a/ClientRGSS3/Data/Weapons.rxdata b/ClientRGSS3/Data/Weapons.rxdata
diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml
diff --git a/Server/bin/.idea/workspace.xml b/Server/bin/.idea/workspace.xml
diff --git a/Server/bin/database/GameData$Item.class b/Server/bin/database/GameData$Item.class
diff --git a/Server/bin/database/GameData$ItemData.class b/Server/bin/database/GameData$ItemData.class
diff --git a/Server/bin/database/GameData$Job.class b/Server/bin/database/GameData$Job.class
diff --git a/Server/bin/database/GameData$NPC.class b/Server/bin/database/GameData$NPC.class
diff --git a/Server/bin/database/GameData$Portal.class b/Server/bin/database/GameData$Portal.class
diff --git a/Server/bin/database/GameData$Register.class b/Server/bin/database/GameData$Register.class
diff --git a/Server/bin/database/GameData$Reward.class b/Server/bin/database/GameData$Reward.class
diff --git a/Server/bin/database/GameData$Shop.class b/Server/bin/database/GameData$Shop.class
diff --git a/Server/bin/database/GameData$ShopItem.class b/Server/bin/database/GameData$ShopItem.class
diff --git a/Server/bin/database/GameData$Skill.class b/Server/bin/database/GameData$Skill.class
diff --git a/Server/bin/database/GameData$SkillData.class b/Server/bin/database/GameData$SkillData.class
diff --git a/Server/bin/database/GameData$Troop.class b/Server/bin/database/GameData$Troop.class
diff --git a/Server/bin/database/GameData.class b/Server/bin/database/GameData.class
diff --git a/Server/bin/game/Enemy.class b/Server/bin/game/Enemy.class
diff --git a/Server/bin/game/Functions$ItemFunction.class b/Server/bin/game/Functions$ItemFunction.class
diff --git a/Server/bin/game/Functions$NpcFunction.class b/Server/bin/game/Functions$NpcFunction.class
diff --git a/Server/bin/game/Functions$SkillFunction.class b/Server/bin/game/Functions$SkillFunction.class
diff --git a/Server/bin/game/Functions.class b/Server/bin/game/Functions.class
diff --git a/Server/bin/game/User$Message.class b/Server/bin/game/User$Message.class
diff --git a/Server/bin/game/User.class b/Server/bin/game/User.class
diff --git a/Server/bin/network/Handler.class b/Server/bin/network/Handler.class
diff --git a/Server/bin/packet/CTSHeader.class b/Server/bin/packet/CTSHeader.class
diff --git a/Server/bin/packet/Packet.class b/Server/bin/packet/Packet.class
diff --git a/Server/bin/packet/STCHeader.class b/Server/bin/packet/STCHeader.class
diff --git a/Server/src/database/GameData.java b/Server/src/database/GameData.java
@@ -4,6 +4,7 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Vector;
 import java.util.logging.Logger;
@@ -15,8 +16,8 @@ public class GameData extends DataBase {
 	public static Hashtable<Integer, SkillData> skill = new Hashtable<>();
 	public static Hashtable<Integer, Troop> troop = new Hashtable<>();
 	public static Hashtable<Integer, NPC> npc = new Hashtable<>();
+	public static Hashtable<Integer, Shop> shop = new Hashtable<>();
 	public static Vector<Reward> reward = new Vector<>();
-	public static Vector<Shop> shop = new Vector<>();
 	public static Vector<Portal> portal = new Vector<>();
 
 	private static Logger logger = Logger.getLogger(GameData.class.getName());
@@ -59,9 +60,17 @@ public static void loadSettings() throws SQLException {
 			troop.put(rs.getInt("no"), new Troop(rs));
 		logger.info("에너미 정보 로드 완료.");
 
+		ArrayList<ShopItem> shopItems = new ArrayList<>();
 		rs = executeQuery("SELECT * FROM `setting_shop`;");
 		while (rs.next())
-			shop.addElement(new Shop(rs));
+			shopItems.add(new ShopItem(rs));
+
+		for (ShopItem shopItem : shopItems) {
+			int shopNo = shopItem.getNo();
+			if (!shop.containsKey(shopNo))
+				shop.put(shopNo, new Shop(shopNo));
+			shop.get(shopNo).addItem(shopItem.getItemNo());
+		}
 		logger.info("상점 정보 로드 완료.");
 
 		rs = executeQuery("SELECT * FROM `setting_portal`;");
@@ -922,15 +931,42 @@ public String getFunction() {
 	}
 
 	public static class Shop {
+		private int no;
+		private Hashtable<Integer, ItemData> items;
+
+		public Shop(int _no) {
+			no = _no;
+			items = new Hashtable<>();
+		}
+
+		public int getNo() {
+			return no;
+		}
+
+		public void addItem(int itemNo) {
+			items.put(items.size() + 1, item.get(itemNo));
+		}
+
+		public ItemData getItem(int index) {
+			if (items.containsKey(index))
+				return items.get(index);
+
+			return null;
+		}
+
+		public Hashtable<Integer, ItemData> getAllItems() {
+			return items;
+		}
+	}
+
+	public static class ShopItem {
 		private int no;
 		private int itemNo;
-		private int rate;
 
-		public Shop(ResultSet rs) {
+		public ShopItem(ResultSet rs) {
 			try {
 				no = rs.getInt("no");
 				itemNo = rs.getInt("item_no");
-				rate = rs.getInt("rate");
 			} catch (SQLException e) {
 				e.printStackTrace();
 			}
@@ -943,10 +979,6 @@ public int getNo() {
 		public int getItemNo() {
 			return itemNo;
 		}
-
-		public int getRate() {
-			return rate;
-		}
 	}
 
 	public static class Portal {

diff --git a/Server/src/game/Enemy.java b/Server/src/game/Enemy.java
@@ -309,10 +309,13 @@ private void assault(Character target) {
         target.animation(attackAnimation);
 
         // 실 데미지를 계산
-        int attackDamage = (damage - target.getDefense()) * (damage - target.getDefense());
+        int attackDamage = damage - target.getDefense();
         boolean isFatal = critical > random.nextInt(100);
         if (isFatal) attackDamage *= 2;
 
+        if (attackDamage < 0)
+            attackDamage = 0;
+
         if (target.getClass().getName().equals("game.User")) {
             // 타겟이 유저인 경우
             User u = (User) target;

diff --git a/Server/src/game/Functions.java b/Server/src/game/Functions.java
@@ -54,8 +54,10 @@ public void testNpc(User user, Npc npc) {
             else if (msg.getMessage() == 5)
                 msg.update(10, 2);
             else if (msg.getMessage() == 10) {
-                if (msg.getSelect() == 0)
+                if (msg.getSelect() == 0) {
+                    user.openShop(1);
                     msg.close();
+                }
                 else if (msg.getSelect() == 1) {
                     user.getCtx().writeAndFlush(Packet.createGuild(100000));
                     msg.close();

diff --git a/Server/src/game/User.java b/Server/src/game/User.java
@@ -1634,15 +1634,37 @@ public boolean nowTrading() {
 	}
 
 	// 상점 열기
-	public void openShop(int no) {
-		for (Shop shop : GameData.shop) {
-			if (shop.getNo() == no) {
-				GameData.ItemData itemData = GameData.item.get(shop.getItemNo());
-				ctx.writeAndFlush(Packet.setShopItem(itemData.getNo(), itemData.getPrice()));
-			}
+	public void openShop(int _no) {
+		ctx.writeAndFlush(Packet.openShopWindow(_no));
+		for (ItemData shopItem : GameData.shop.get(_no).getAllItems().values()) {
+			ctx.writeAndFlush(Packet.setShopItem(shopItem.getNo(), shopItem.getPrice()));
 		}
 	}
 
+	// 상점 아이템 구매
+	public void buyShopItem(int _shopNo, int _index, int _amount) {
+		if (!GameData.shop.containsKey(_shopNo))
+			return;
+
+		Shop shop = GameData.shop.get(_shopNo);
+
+		if (shop.getItem(_index) == null)
+			return;
+
+		ItemData item = shop.getItem(_index);
+
+		if (item.getType() == Type.Item.ITEM)
+			_amount = _amount > item.getMaxLoad() ? item.getMaxLoad() : _amount;
+		else
+			_amount = 1;
+
+		if (gold < item.getPrice() * _amount)
+			return;
+
+		loseGold(item.getPrice() * _amount);
+		gainItem(item.getNo(), _amount);
+	}
+
 	// 파티 번호 설정
 	public void setPartyNo(int _partyNo) {
 		partyNo = _partyNo;
@@ -1953,19 +1975,7 @@ public void assault(Character target) {
 		}
 	}
 
-	// 다른 작업을 하고 있는지 (대화, 거래)
-	private boolean isBusy() {
-		// 대화 중
-		if (message.isStart())
-			return true;
-
-		// 거래 중
-		if (nowTrading())
-			return true;
-
-		return false;
-	}
-
+	// 채팅
 	public void chat(String _message) {
 		Vector<User> mapUsers = Map.getMap(map).getField(seed).getUsers();
 		switch (_message.split(" ")[0]) {
@@ -1983,6 +1993,19 @@ public void chat(String _message) {
 		}
 	}
 
+	// 다른 작업을 하고 있는지 (대화, 거래)
+	private boolean isBusy() {
+		// 대화 중
+		if (message.isStart())
+			return true;
+
+		// 거래 중
+		if (nowTrading())
+			return true;
+
+		return false;
+	}
+
 	public void update() {
 
 	}

diff --git a/Server/src/network/Handler.java b/Server/src/network/Handler.java
@@ -129,6 +129,9 @@ public void channelRead (ChannelHandlerContext ctx, Object msg) {
 			case CTSHeader.BREAK_UP_GUILD:
 				User.get(ctx).breakUpGuild();
 				break;
+			case CTSHeader.BUY_SHOP_ITEM:
+				User.get(ctx).buyShopItem((int) packet.get("shopNo"), (int) packet.get("index"), (int) packet.get("amount"));
+				break;
     	}
     }
 

diff --git a/Server/src/packet/CTSHeader.java b/Server/src/packet/CTSHeader.java
@@ -37,4 +37,5 @@ public final class CTSHeader {
 	public final static int QUIT_GUILD = 119;
 	public final static int KICK_GUILD = 120;
 	public final static int BREAK_UP_GUILD = 121;
+	public final static int BUY_SHOP_ITEM = 122;
 }
diff --git a/Server/src/packet/Packet.java b/Server/src/packet/Packet.java
@@ -486,6 +486,14 @@ public static JSONObject closeMessageWindow() {
 		return packet;
 	}
 
+	public static JSONObject openShopWindow(int no) {
+		JSONObject packet = new JSONObject();
+		packet.put("header", STCHeader.OPEN_SHOP_WINDOW);
+		packet.put("no", no);
+
+		return packet;
+	}
+
 	public static JSONObject setShopItem(int no, int price) {
 		JSONObject packet = new JSONObject();
 		packet.put("header", STCHeader.SET_SHOP_ITEM);

diff --git a/Server/src/packet/STCHeader.java b/Server/src/packet/STCHeader.java
@@ -46,4 +46,5 @@ public final class STCHeader {
 	public final static int INVITE_GUILD = 122;
 	public final static int SET_GUILD_MEMBER = 123;
 	public final static int REMOVE_GUILD_MEMBER = 124;
+	public final static int OPEN_SHOP_WINDOW = 125;
 }
diff --git a/danbi.sql b/danbi.sql
@@ -4,7 +4,7 @@ Source Host: localhost
 Source Database: danbi
 Target Host: localhost
 Target Database: danbi
-Date: 2015-03-10 ¿ÀÈÄ 6:11:04
+Date: 2015-03-15 ¿ÀÈÄ 10:32:56
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -164,8 +164,7 @@ CREATE TABLE `setting_reward` (
 -- ----------------------------
 CREATE TABLE `setting_shop` (
   `no` int(11) DEFAULT NULL,
-  `item_no` int(11) DEFAULT '1',
-  `rate` int(11) DEFAULT '50'
+  `item_no` int(11) DEFAULT '1'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ----------------------------
@@ -265,12 +264,12 @@ CREATE TABLE `user` (
   `speed` int(11) NOT NULL DEFAULT '4',
   `admin` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`no`)
-) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records 
 -- ----------------------------
-INSERT INTO `equip` VALUES ('1', '2', '0', '0', '0', '0', '0', '0');
+INSERT INTO `equip` VALUES ('1', '6', '0', '0', '0', '0', '0', '0');
 INSERT INTO `equip` VALUES ('2', '0', '0', '0', '0', '0', '0', '0');
 INSERT INTO `equip` VALUES ('3', '0', '0', '0', '0', '0', '0', '0');
 INSERT INTO `equip` VALUES ('4', '0', '0', '0', '0', '0', '0', '0');
@@ -280,19 +279,30 @@ INSERT INTO `equip` VALUES ('9', '0', '0', '0', '0', '0', '0', '0');
 INSERT INTO `equip` VALUES ('11', '0', '0', '0', '0', '0', '0', '0');
 INSERT INTO `equip` VALUES ('12', '0', '0', '0', '0', '0', '0', '0');
 INSERT INTO `equip` VALUES ('13', '1', '0', '0', '0', '0', '0', '0');
-INSERT INTO `guild` VALUES ('1', 'ë©”ë¡±ë©”ë¡±ã…‡ã…‡');
-INSERT INTO `item` VALUES ('1', '8', '1', '4', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `equip` VALUES ('15', '0', '0', '0', '0', '0', '0', '0');
+INSERT INTO `equip` VALUES ('16', '0', '0', '0', '0', '0', '0', '0');
+INSERT INTO `item` VALUES ('12', '1', '1', '6', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `item` VALUES ('12', '1', '1', '5', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `item` VALUES ('12', '1', '1', '4', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `item` VALUES ('12', '1', '1', '3', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `item` VALUES ('12', '8', '8', '2', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `item` VALUES ('12', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `item` VALUES ('1', '1', '1', '7', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `item` VALUES ('1', '1', '1', '6', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1');
+INSERT INTO `item` VALUES ('1', '1', '1', '5', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `item` VALUES ('1', '1', '1', '4', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
 INSERT INTO `item` VALUES ('1', '1', '1', '3', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
-INSERT INTO `item` VALUES ('1', '1', '1', '2', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1');
+INSERT INTO `item` VALUES ('1', '8', '5', '2', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
 INSERT INTO `item` VALUES ('1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
+INSERT INTO `item` VALUES ('1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0');
 INSERT INTO `setting_item` VALUES ('1', 'ëª©ë„', 'ë‚˜ë¬´ë¡œ ë§Œë“  ê²€', '001-Weapon01', '0', '1', '0', '100', '10', '10', '10', '10', '5', '4', '3', '2', '1', '10', '5', '5', '2', '0', '1', '1', null);
 INSERT INTO `setting_item` VALUES ('2', 'ëƒ„ë¹„ ëšœê»‘', 'ë°©íŒ¨ê°€ ì—†ìœ¼ë‹ˆ ì´ê±°ë¼ë„ ì“°ìž', '009-Shield01', '0', '1', '1', '10', '0', '0', '5', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', null);
 INSERT INTO `setting_item` VALUES ('3', 'ë°€ì§šëª¨ìž', 'ë‚œ í•´ì ì™•ì´ ë  ì‚¬ë‚˜ì´!', '010-Head01', '0', '1', '2', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '0', '1', '1', null);
 INSERT INTO `setting_item` VALUES ('4', 'ì«„ì«„ì´ ìž ì˜·', 'ìž…ì„ ì˜·ì´ ì—†ë‹¤', '014-Body02', '0', '1', '3', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', null);
 INSERT INTO `setting_item` VALUES ('5', 'ëˆ„ë”ê¸° ë§í† ', 'ëˆ„ê°€ ì“°ë˜ê±¸ê¹Œ', '019-Accessory04', '0', '1', '4', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', null);
 INSERT INTO `setting_item` VALUES ('6', 'ë“±ì‚°í™”', 'ì•„ë¹  ë“±ì‚°í™”ë¥¼ í›”ì³¤ë‹¤', '020-Accessory05', '0', '1', '5', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', null);
 INSERT INTO `setting_item` VALUES ('7', 'ê¸ˆë°˜ì§€', 'ëŒìž”ì¹˜ë•Œ ë°›ì€ ê¸ˆë°˜ì§€', '016-Accessory01', '0', '1', '6', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', null);
-INSERT INTO `setting_item` VALUES ('8', 'í¬ì…˜', 'ëì§€ ì´ ì•„ì´í…œì€', '021-Potion01', '0', '1', '7', '0', '0', '0', '0', '0', '0', '0', '0', '100', '0', '0', '0', '0', '0', '1', '10', '1', 'potion');
+INSERT INTO `setting_item` VALUES ('8', 'í¬ì…˜', 'ëì§€ ì´ ì•„ì´í…œì€', '021-Potion01', '0', '1', '7', '100', '0', '0', '0', '0', '0', '0', '0', '10000', '0', '0', '0', '0', '0', '1', '10', '1', 'potion');
 INSERT INTO `setting_job` VALUES ('1', 'ì „ì‚¬', '1000', '5', '1', '0', '0');
 INSERT INTO `setting_job` VALUES ('2', 'ë§ˆë²•ì‚¬', '5', '10', '0', '0', '1');
 INSERT INTO `setting_job` VALUES ('3', 'ë„ì ', '7', '7', '0', '1', '0');
@@ -304,10 +314,10 @@ INSERT INTO `setting_register` VALUES ('2', '1', '002-Fighter02', '1', '0', '0',
 INSERT INTO `setting_register` VALUES ('3', '2', '004-Fighter04', '1', '0', '0', '1');
 INSERT INTO `setting_reward` VALUES ('1', '1', '1', '10000');
 INSERT INTO `setting_reward` VALUES ('1', '8', '1', '10000');
-INSERT INTO `setting_shop` VALUES ('1', '8', '50');
+INSERT INTO `setting_shop` VALUES ('1', '8');
 INSERT INTO `setting_skill` VALUES ('1', 'í¬ë¡œìŠ¤ ì»·', 'ì „ì‚¬ì˜ ê¸°ë³¸ì ì¸ ê¸°ìˆ . ì ì„ ë‘ì°¨ë¡€ ë²¤ë‹¤.', 'ê·¼ì ‘ ê³µê²©', '1', '20', '5', '10', '0', '67', '050-Skill07', 'crossCut');
-INSERT INTO `setting_troop` VALUES ('1', 'ë‹¤ëžŒì¥', '168-Small10', '4', '0', '1', '10', '10', '10', '4', '3', '1', '1', '1', '10', '50', '50', '5', '5', '1', '5', '5', '2', '30', '1', '10', '100', '1', 'chipmunkSkill', '50', null);
-INSERT INTO `user` VALUES ('1', '1', 'PPAkXhcIYGcDVjdCgY/hHg==', 'í…ŒìŠ¤íŠ¸', '0', '1', '1', '001-Fighter01', '1', '33', '19', '20', '58', '19', '4454', '36', '7', '160', '202000', '1', '0', '15', '8', '4', '4', '0');
+INSERT INTO `setting_troop` VALUES ('1', 'ë‹¤ëžŒì¥', '168-Small10', '4', '0', '10', '10', '10', '10', '4', '1', '1', '1', '1', '10', '50', '50', '5', '5', '2', '5', '5', '2', '30', '1', '10', '100', '1', 'chipmunkSkill', '50', null);
+INSERT INTO `user` VALUES ('1', '1', 'PPAkXhcIYGcDVjdCgY/hHg==', 'í…ŒìŠ¤íŠ¸', '0', '0', '1', '001-Fighter01', '1', '33', '19', '20', '68', '21', '9002', '46', '9', '800', '212000', '2', '0', '3', '11', '2', '4', '0');
 INSERT INTO `user` VALUES ('2', '22', '2', '22', '0', '0', '2', '002-Fighter02', '1', '0', '0', '0', '0', '0', '10000', '0', '1', '0', '0', '1', '0', '3', '9', '2', '4', '0');
 INSERT INTO `user` VALUES ('3', '3', '3', '3', '0', '0', '3', '004-Fighter04', '2', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '1', '0', '13', '7', '2', '4', '0');
 INSERT INTO `user` VALUES ('4', '11', '1', '1', '0', '0', '1', '001-Fighter01', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '1', '0', '1', '4', '6', '4', '0');
@@ -318,6 +328,8 @@ INSERT INTO `user` VALUES ('8', 'a', 'KkPhAQH4Tx5uyU3BEt3KAQ==', 'a', '0', '0',
 INSERT INTO `user` VALUES ('9', 'b', 'hqxcuUK5XT5yO4I6W1/2JQ==', 'b', '0', '0', 'a', '001-Fighter01', '1', '0', '0', '0', '0', '0', '-90', '0', '1', '0', '0', '1', '0', '3', '6', '6', '4', '0');
 INSERT INTO `user` VALUES ('10', '123', 'PPAkXhcIYGcDVjdCgY/hHg==', '1213', '0', '0', '1', '001-Fighter01', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '1', '0', '0', '0', '2', '4', '0');
 INSERT INTO `user` VALUES ('11', 'chip', 'wtUrc38hNLCxbeFjlTKA1g==', '???', '0', '0', 'never', '004-Fighter04', '2', '0', '0', '0', '0', '0', '-27', '0', '1', '0', '0', '1', '0', '0', '0', '2', '4', '0');
-INSERT INTO `user` VALUES ('12', '2', 'gKBvNUyp+H1+LZJgpXESyA==', '2', '0', '0', '2', '002-Fighter02', '1', '0', '0', '0', '10', '2', '2901', '15', '3', '10', '6300', '1', '0', '18', '3', '6', '4', '0');
+INSERT INTO `user` VALUES ('12', '2', 'gKBvNUyp+H1+LZJgpXESyA==', '2', '0', '0', '2', '002-Fighter02', '1', '0', '0', '0', '10', '2', '2874', '15', '3', '30', '6600', '2', '0', '2', '12', '2', '4', '0');
 INSERT INTO `user` VALUES ('13', 'test', 'MMobYwa4me92vrmWJTDIow==', 'test', '0', '0', 'test@co.kr', '001-Fighter01', '1', '0', '0', '0', '10', '2', '1875', '16', '3', '10', '500', '1', '0', '9', '11', '2', '4', '0');
 INSERT INTO `user` VALUES ('14', 'í•œê¸€ì•ˆë˜ëƒ', 'PPAkXhcIYGcDVjdCgY/hHg==', 'í•œê¸€ì•ˆë˜ëƒ', '0', '0', '1', '001-Fighter01', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '1', '0', '0', '0', '2', '4', '0');
+INSERT INTO `user` VALUES ('15', 'linja', 'A8BiSgM3VJ+dnGJ/C+st8Q==', 'ë¦°ìž', '0', '0', 'linja0@naver.com', '001-Fighter01', '1', '0', '0', '0', '10', '2', '2991', '15', '3', '20', '0', '1', '0', '18', '8', '4', '4', '0');
+INSERT INTO `user` VALUES ('16', 'ë§ˆë‹ˆì•„', '3Kzn9z+j4YQPX+NoV4KkWA==', 'ë§ˆë‹ˆì•„', '0', '0', 'mania@co.kr', '001-Fighter01', '1', '0', '0', '0', '5', '1', '2000', '10', '2', '0', '0', '1', '0', '13', '3', '6', '4', '0');
-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     [User]
-    id=
+    id=1
     [Option]
     bgm=50
     bgs=29
@@ Expand Down @@