server type

Author: Evan Hu

src/main/java/info/xiaomo/gengine/network/mina/config/MinaClientConfig.java

@@ -34,7 +34,7 @@ public class MinaClientConfig extends BaseServerConfig {
 
 	// 当前服务器的类型,如当前服务器是gameserver.那么对应ServerType.GameServer = 10
 	@Element(required = false)
-	private ServerType type = ServerType.GATE;
+	private Integer type = ServerType.GATE;
 
 	// 其他配置,如配置服务器允许开启的地图
 	@Element(required = false)
@@ -79,14 +79,14 @@ public void setSoLinger(int soLinger) {
 	/**
 	 * <p>Getter for the field <code>type</code>.</p>
 	 */
-	public ServerType getType() {
+	public Integer getType() {
 		return type;
 	}
 
 	/**
 	 * <p>Setter for the field <code>type</code>.</p>
 	 */
-	public void setType(ServerType type) {
+	public void setType(Integer type) {
 		this.type = type;
 	}
 
@@ -150,7 +150,7 @@ public void setMaxConnectCount(int maxConnectCount) {
 	@Root
 	public static class MinaClienConnToConfig extends BaseServerConfig {
 		@Element(required = true)
-		private ServerType type = ServerType.GATE;
+		private Integer type = ServerType.GATE;
 
 		// 链接到服务器的地址
 		@Element(required = true)
@@ -160,11 +160,11 @@ public static class MinaClienConnToConfig extends BaseServerConfig {
 		@Element(required = true)
 		private int port = 8500;
 
-		public ServerType getType() {
+		public Integer getType() {
 			return type;
 		}
 
-		public void setType(ServerType type) {
+		public void setType(Integer type) {
 			this.type = type;
 		}
 
@@ -192,7 +192,7 @@ public void setPort(int port) {
 		@Override
 		public int hashCode() {
 			int hash = 5;
-			hash = 47 * hash + type.ordinal();
+			hash = 47 * hash + type;
 			hash = 47 * hash + id;
 			return hash;
 		}
@@ -206,7 +206,7 @@ public boolean equals(Object obj) {
 				return false;
 			}
 			final MinaClienConnToConfig other = (MinaClienConnToConfig) obj;
-			if (type != other.type) {
+			if (!type.equals(other.type)) {
 				return false;
 			}
 			if (id != other.id) {

src/main/java/info/xiaomo/gengine/network/mina/config/MinaServerConfig.java

@@ -54,7 +54,7 @@ public class MinaServerConfig extends BaseServerConfig {
 
     // 服务器类型
     @Element(required = false)
-    private ServerType type = ServerType.GATE;
+    private Integer type = ServerType.GATE;
 
     //http服务器端口
     @Element(required = false)
@@ -233,14 +233,14 @@ public void setIp(String ip) {
     /**
      * <p>Getter for the field <code>type</code>.</p>
      */
-    public ServerType getType() {
+    public Integer getType() {
         return type;
     }
 
     /**
      * <p>Setter for the field <code>type</code>.</p>
      */
-    public void setType(ServerType type) {
+    public void setType(Integer type) {
         this.type = type;
     }
 

src/main/java/info/xiaomo/gengine/network/netty/config/NettyClientConfig.java

@@ -24,7 +24,7 @@ public class NettyClientConfig extends BaseServerConfig {
 
 	// 当前服务器的类型,如当前服务器是gameServer.那么对应ServerType.GameServer = 10
 	@Element(required = false)
-	private ServerType type = ServerType.GATE;
+	private Integer type = ServerType.GATE;
 
 	// 其他配置,如配置服务器允许开启的地图
 	@Element(required = false)

src/main/java/info/xiaomo/gengine/network/server/ServerType.java

@@ -6,64 +6,44 @@
  * <p>
  * 2017-03-30
  */
-public enum ServerType {
-	NONE(-1),
+public interface ServerType {
+	int NONE = -1;
+
 	/**
 	 * 网关
 	 */
-	GATE(1),
+	int GATE = 1;
 
 	/**
 	 * 游戏
 	 */
-	GAME(2),
+	int GAME = 2;
+
 	/**
 	 * 集群管理服
 	 */
-	CLUSTER(3),
-	LOG(4),
+	int CLUSTER = 3;
+
+	int LOG = 4;
+
 	/**
 	 * 聊天
 	 */
-	CHAT(5),
-	PAY(6),
+	int CHAT = 5;
+
+	int PAY = 6;
+
 	/**
 	 * 大厅
 	 */
-	HALL(7),
+	int HALL = 7;
 
 	// 游戏100开始
 
 	//备用 1000开始
-	GAME_1(1001),
-	GAME_2(1002),
-	GAME_3(1003),
-	GAME_4(1004),
-	GAME_5(1005),
-	GAME_6(1006),
-	GAME_7(1007),
-	GAME_8(1008),
-
-
-	;
-
-
-	private final int type;
+	int GAME_1 = 1001;
 
-	ServerType(int type) {
-		this.type = type;
-	}
+	int GAME_2 = 1002;
 
-	public static ServerType valueOf(int type) {
-		for (ServerType t : ServerType.values()) {
-			if (t.getType() == type) {
-				return t;
-			}
-		}
-		return NONE;
-	}
 
-	public int getType() {
-		return type;
-	}
 }

src/main/java/info/xiaomo/gengine/script/ScriptManager.java

@@ -18,12 +18,12 @@ public class ScriptManager {
 	static {
 		scriptPool = new ScriptPool();
 		try {
-			String property = System.getProperty("user.dir")+"/game-fish";
-			String path = property + "-scripts" + File.separator + "src" + File.separator + "main" + File.separator // 脚本路径
+			String property = System.getProperty("user.dir") + "/game-server-fish";
+			String path = property + "-script" + File.separator + "src" + File.separator + "main" + File.separator // 脚本路径
 					+ "java" + File.separator;
-			String outpath = property + File.separator + "target" + File.separator + "scriptsbin" + File.separator; // class类编译路径
+			String outPath = property + File.separator + "target" + File.separator + "script" + File.separator; // class类编译路径
 			String jarsDir = property + File.separator + "target" + File.separator; // jar包路径
-			scriptPool.setSource(path, outpath, jarsDir);
+			scriptPool.setSource(path, outPath, jarsDir);
 		} catch (Exception ignored) {
 		}
 	}