Merge pull request #19 from nhnent/develop

v1.1.2 Release Candidate
nhn · Aug 11, 2017 · 1be12d3 · 1be12d3
2 parents b1fe8a1 + 956d368
commit 1be12d3
Show file tree

Hide file tree

Showing 34 changed files with 26 additions and 26 deletions.
diff --git a/Assets/LINQtoGameObject/Examples/SampleScene.unity b/Assets/LINQtoGameObject/Examples/SampleScene.unity
diff --git a/Assets/Plugins/socket.io/Decoder.cs b/Assets/Plugins/socket.io/Decoder.cs
@@ -37,17 +37,17 @@ public static class Decoder {
                 if (data[readPos] == ',')
                     ++readPos;
 
-                if (data[readPos] != '[')
-                    int.TryParse(ReadChunk(ref data, ref readPos), out pkt.id);
-
                 if (readPos == data.Length)
                     return pkt;
 
+                if (data[readPos] != '[')
+                    int.TryParse(ReadChunk(ref data, ref readPos), out pkt.id);
+
                 pkt.body = data.Substring(readPos);
                 return pkt;
             }
             catch (Exception e) {
-                throw;
+                throw e;
             }
         }
 

diff --git a/Assets/Plugins/socket.io/Encoder.cs b/Assets/Plugins/socket.io/Encoder.cs
@@ -33,7 +33,7 @@ public static class Encoder {
                 return builder.ToString();
             }
             catch (Exception e) {
-                throw;
+                throw e;
             }
         }
 

diff --git a/Assets/Plugins/socket.io/SocketInitializer.cs b/Assets/Plugins/socket.io/SocketInitializer.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-
 namespace socket.io {
 
     /// <summary>
@@ -76,7 +75,7 @@ public class SocketInitializer : MonoBehaviour {
         /// <param name="url"> WWW URL of a server </param>
         /// <param name="socket"> a socket which will be connected </param>
         /// <returns></returns>
-        public IObservable<Socket> InitAsObservable(Socket socket, bool reconnection, int reconnectionAttempts) {
+        public UniRx.IObservable<Socket> InitAsObservable(Socket socket, bool reconnection, int reconnectionAttempts) {
             Socket = socket;
             Reconnection = reconnection;
             ReconnectionAttempts = reconnectionAttempts;
@@ -91,15 +90,15 @@ public class SocketInitializer : MonoBehaviour {
             if (Reconnection && Socket.OnReconnecting != null)
                 Socket.OnReconnecting(ReconnectionAttempts);
 
-            return Observable.FromCoroutine<Socket>((observer, cancelToken) =>
+            return UniRx.Observable.FromCoroutine<Socket>((observer, cancelToken) =>
                 InitCore(observer, cancelToken));
         }
 
         /// <summary>
         /// The json object to parse the response of PollingURL
         /// </summary>
         [Serializable]
-        class PollingUrlAnswer {
+        struct PollingUrlAnswer {
             public string sid;
             public int pingInterval;
             public int pingTimeout;
@@ -111,7 +110,7 @@ class PollingUrlAnswer {
         /// <param name="observer"> The return value of InitAsObservable() method </param>
         /// <param name="cancelToken"> The cancel token object which signals to stop the currnet coroutine </param>
         /// <returns></returns>
-        IEnumerator InitCore(IObserver<Socket> observer, CancellationToken cancelToken) {
+        IEnumerator InitCore(UniRx.IObserver<Socket> observer, UniRx.CancellationToken cancelToken) {
             // Declare to connect in socket.io v1.0
             _urlQueries.Add("EIO", "3");
             _urlQueries.Add("transport", "polling");
@@ -121,14 +120,15 @@ class PollingUrlAnswer {
             var webSocketTrigger = SocketManager.Instance.GetWebSocketTrigger(BaseUrl);
             if (webSocketTrigger == null || !webSocketTrigger.IsConnected) {
                 var www = new WWW(PollingUrl);
-                while (!www.isDone && !cancelToken.IsCancellationRequested)
+
+                while (!www.isDone && !cancelToken.IsCancellationRequested )
                     yield return null;
 
                 if (cancelToken.IsCancellationRequested)
                     yield break;
 
-                if (www.error != null) {
-                    observer.OnError(new WWWErrorException(www, www.text));
+                if (!string.IsNullOrEmpty(www.error)) {
+                    observer.OnError(new Exception(www.error));
                     yield break;
                 }
 

diff --git a/Assets/Plugins/socket.io/SocketManager.cs b/Assets/Plugins/socket.io/SocketManager.cs
@@ -35,7 +35,7 @@ public class SocketManager : MonoSingleton<SocketManager> {
         public int ReconnectionDelay { get; set; }
 
         public void Connect(Socket socket) {
-            _connectRequests.Add(Tuple.Create(socket, false, 0, DateTime.Now));
+            _connectRequests.Add(UniRx.Tuple.Create(socket, false, 0, DateTime.Now));
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ public class SocketManager : MonoSingleton<SocketManager> {
             if (_connectRequests.Any(r => r.Item1 == socket))
                 return;
 
-            _connectRequests.Add(Tuple.Create(socket, true, reconnectionAttempts, DateTime.Now.AddMilliseconds(ReconnectionDelay)));
+            _connectRequests.Add(UniRx.Tuple.Create(socket, true, reconnectionAttempts, DateTime.Now.AddMilliseconds(ReconnectionDelay)));
 
             if (socket.OnReconnectAttempt != null)
                 socket.OnReconnectAttempt();
@@ -71,7 +71,7 @@ public class SocketManager : MonoSingleton<SocketManager> {
         /// The pended requests to connect a server
         /// (Item1: Url, Item2: Reconnection, Item3: ReconnectionAttempts, Item4: Socket ref, Item5: TimeStamp)
         /// </summary>
-        readonly List<Tuple<Socket, bool, int, DateTime>> _connectRequests = new List<Tuple<Socket, bool, int, DateTime>>();
+        readonly List<UniRx.Tuple<Socket, bool, int, DateTime>> _connectRequests = new List<UniRx.Tuple<Socket, bool, int, DateTime>>();
 
         /// <summary>
         /// WebSocketTrigger instances (WebSocketTrigger is almost same with a session object)

diff --git a/Assets/Plugins/socket.io/WebSocketTrigger.cs b/Assets/Plugins/socket.io/WebSocketTrigger.cs
@@ -17,7 +17,7 @@ public class WebSocketTrigger : ObservableTriggerBase {
         /// Observes received packets and also starts Ping-Pong routine
         /// </summary>
         /// <returns></returns>
-        public IObservable<string> OnRecvAsObservable() {
+        public UniRx.IObservable<string> OnRecvAsObservable() {
             if (_cancelPingPong == null) {
                 _cancelPingPong = gameObject.UpdateAsObservable()
                     .Sample(TimeSpan.FromSeconds(10f))

diff --git a/Assets/__Sample/Client/Acks.unity b/Assets/__Sample/Client/Acks.unity
diff --git a/Assets/__Sample/Client/Connect.unity b/Assets/__Sample/Client/Connect.unity
diff --git a/Assets/__Sample/Client/Events.unity b/Assets/__Sample/Client/Events.unity
diff --git a/Assets/__Sample/Client/Namespace.unity b/Assets/__Sample/Client/Namespace.unity
diff --git a/Assets/__Sample/Client/Src/Acks.cs b/Assets/__Sample/Client/Src/Acks.cs
@@ -9,7 +9,7 @@ namespace Sample {
     public class Acks : MonoBehaviour {
 
         void Start() {
-            var serverUrl = "http://localhost:4444";
+            var serverUrl = "http://localhost:7001";
             var socket = Socket.Connect(serverUrl);
 
             socket.On(SystemEvents.connect, () => {

diff --git a/Assets/__Sample/Client/Src/Connect.cs b/Assets/__Sample/Client/Src/Connect.cs
@@ -9,7 +9,7 @@ namespace Sample {
     public class Connect : MonoBehaviour {
 
         void Start() {
-            var serverUrl = "http://localhost:4444";
+            var serverUrl = "http://localhost:7001";
             var socket = Socket.Connect(serverUrl);
 
             socket.On(SystemEvents.connect, () => {

diff --git a/Assets/__Sample/Client/Src/Events.cs b/Assets/__Sample/Client/Src/Events.cs
@@ -9,7 +9,7 @@ namespace Sample {
     public class Events : MonoBehaviour {
 
         void Start() {
-            var serverUrl = "http://localhost:4444";
+            var serverUrl = "http://localhost:7001";
             var socket = Socket.Connect(serverUrl);
 
             // receive "news" event

diff --git a/Assets/__Sample/Client/Src/Namespace.cs b/Assets/__Sample/Client/Src/Namespace.cs
@@ -9,7 +9,7 @@ namespace Sample {
     public class Namespace : MonoBehaviour {
 
         void Start() {
-            var serverUrl = "http://localhost:4444";
+            var serverUrl = "http://localhost:7001";
 
             // news namespace
             var news = Socket.Connect(serverUrl + "/news");

diff --git a/Assets/__Sample/Server~/acks.js b/Assets/__Sample/Server~/acks.js
@@ -1,7 +1,7 @@
 var app = require('http').createServer(handler)
 var fs = require('fs');
 
-app.listen(4444);
+app.listen(7001);
 
 function handler (req, res) {
     fs.readFile(__dirname + '/index.html',

diff --git a/Assets/__Sample/Server~/connection.js b/Assets/__Sample/Server~/connection.js
@@ -1,7 +1,7 @@
 var app = require('http').createServer(handler)
 var fs = require('fs');
 
-app.listen(4444);
+app.listen(7001);
 
 function handler (req, res) {
   fs.readFile(__dirname + '/index.html',

diff --git a/Assets/__Sample/Server~/events.js b/Assets/__Sample/Server~/events.js
@@ -1,7 +1,7 @@
 var app = require('http').createServer(handler)
 var fs = require('fs');
 
-app.listen(4444);
+app.listen(7001);
 
 function handler (req, res) {
     fs.readFile(__dirname + '/index.html',

diff --git a/Assets/__Sample/Server~/namespace.js b/Assets/__Sample/Server~/namespace.js
@@ -1,7 +1,7 @@
 var app = require('http').createServer(handler)
 var fs = require('fs');
 
-app.listen(4444);
+app.listen(7001);
 
 function handler (req, res) {
     fs.readFile(__dirname + '/index.html',

diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset
diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset
diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset
diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset
diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 5.6.1p2
+m_EditorVersion: 2017.1.0f3
diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset
diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset