Merge branch 'develop'

Author: 박찬영/게임기술팀/NK

Assets/Plugins/socket.io/Decoder.cs

@@ -30,6 +30,7 @@ public static Packet Decode(this string data) {
 
                 if (data[readPos] == '/')
                     pkt.nsp = ReadChunk(ref data, ref readPos);
+
                 if (readPos == data.Length)
                     return pkt;
 
@@ -38,6 +39,7 @@ public static Packet Decode(this string data) {
 
                 if (data[readPos] != '[')
                     int.TryParse(ReadChunk(ref data, ref readPos), out pkt.id);
+
                 if (readPos == data.Length)
                     return pkt;
 

Assets/Plugins/socket.io/Socket.cs

@@ -8,7 +8,7 @@ namespace socket.io {
     public class Socket : MonoBehaviour {
 
         /// <summary>
-        /// 네임스페이스 ("/"은 기본값으로 글로벌 네임스페이스임)
+        /// Namespace ("/" is the default namespace which means global namespace.)
         /// </summary>
         public string nsp = "/";
 
@@ -89,7 +89,7 @@ void DispatchPacket(Packet pkt) {
         readonly Dictionary<int, Action<string>> _acks = new Dictionary<int, Action<string>>();
 
         /// <summary>
-        /// Acks를 받기 위한 패킷 아이디 할당용 카운팅 필드
+        /// The unique value generator for acks message id.
         /// </summary>
         int _idGenerator = -1;
 
@@ -123,7 +123,7 @@ public void Emit(string evtName) {
             Emit(evtName, string.Empty, null);
         }
 
-        #region 시스템 이벤트 핸들러
+        #region System-Event handlers
         public Action onConnect;
         public Action onConnectTimeOut;
         public Action onReconnectAttempt;

Assets/Plugins/socket.io/SocketManager.cs

@@ -8,6 +8,9 @@
 
 namespace socket.io {
 
+    /// <summary>
+    /// SocketManager manages Socket and WebSocketTrigger instances
+    /// </summary>
     public class SocketManager : MonoSingleton<SocketManager> {
 
         public Socket Connect(string url) {

Assets/__Sample/Src.meta

@@ -2,13 +2,15 @@
 using socket.io;
 
 namespace Sample {
-
+    
     /// <summary>
-    /// http://socket.io/docs/#sending-and-getting-data-(acknowledgements) 샘플
+    /// The sample show how to acks the message you sent.
     /// </summary>
     public class Acks : MonoBehaviour {
 
         void Start() {
+            Config.serverUrl = "http://localhost:80";
+
             var socket = Socket.Connect(Config.serverUrl);
             socket.On("connect", () => {
                 socket.Emit("ferret", "\"toby\"", (string r) => {

Assets/__Sample/Acks.cs renamed to Assets/__Sample/Src/Acks.cs

@@ -12,7 +12,9 @@
 namespace Sample {
 
     /// <summary>
-    /// https://github.com/socketio/socket.io/tree/master/examples/chat - Unity3D client code
+    /// The deco code which implements the client-side of Chat service.
+    /// You can download Chat service server-side code from URL below
+    /// (https://github.com/socketio/socket.io/tree/master/examples/chat)
     /// </summary>
     public class Chat : MonoBehaviour {
 
@@ -27,9 +29,6 @@ public class Chat : MonoBehaviour {
         GameObject _chat;
 
         void Awake() {
-            // Set the server address here~
-            Config.serverUrl = "http://10.77.38.110:3000";
-
             _login = gameObject.Descendants().First(d => d.name == "Login Panel");
             _login.SetActive(false);
 
@@ -46,7 +45,7 @@ struct Message {
             public string username;
             public string message;
 
-            #region 컬러 테이블
+            #region User name color table
             /// <summary>
             /// User's name color table
             /// </summary>
@@ -116,7 +115,7 @@ struct Login {
         string _userName;
 
         IEnumerator Start() {
-            yield return null;
+            Config.serverUrl = "http://localhost:3000";
 
             var socket = Socket.Connect(Config.serverUrl);
             yield return new WaitUntil(() => socket.IsConnected);

Assets/__Sample/Acks.cs.meta renamed to Assets/__Sample/Src/Acks.cs.meta

@@ -1,6 +1,10 @@
 namespace Sample {
 
     public static class Config {
+        
+        /// <summary>
+        /// Change this value to connect a HTTP server you want.
+        /// </summary>
         public static string serverUrl = "http://localhost:80";
     }