diff --git a/cocosocket-client/Mutext.h b/cocosocket-client/Mutext.h index 7c484a3..77e1f22 100644 --- a/cocosocket-client/Mutext.h +++ b/cocosocket-client/Mutext.h @@ -1,6 +1,7 @@ #ifndef MUTEX_H #define MUTEX_H #include +#include class Mutext { private: diff --git a/cocosocket-client/nbproject/private/private.xml b/cocosocket-client/nbproject/private/private.xml index 73b91eb..aef7ea3 100644 --- a/cocosocket-client/nbproject/private/private.xml +++ b/cocosocket-client/nbproject/private/private.xml @@ -6,15 +6,6 @@ - - file:/D:/work/git/cocosocket/cocosocket-client/ThreadPool.h - file:/D:/work/git/cocosocket/cocosocket-client/SocketListerner.cpp - file:/D:/work/git/cocosocket/cocosocket-client/SocketListerner.h - file:/D:/work/git/cocosocket/cocosocket-client/Socket.h - file:/D:/work/git/cocosocket/cocosocket-client/Socket.cpp - file:/D:/work/git/cocosocket/cocosocket-client/Thread.h - file:/D:/work/git/cocosocket/cocosocket-client/Thread.cpp - file:/D:/work/git/cocosocket/cocosocket-client/main.cpp - + diff --git a/cocosocket/pom.xml b/cocosocket/pom.xml index c4e6486..705614d 100644 --- a/cocosocket/pom.xml +++ b/cocosocket/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.beykery cocosocket - 1.1.0 + 1.1.1 jar UTF-8 @@ -111,7 +111,7 @@ io.netty netty-all - 4.1.4.Final + 4.1.10.Final \ No newline at end of file diff --git a/cocosocket/src/main/java/org/ngame/socket/NServer.java b/cocosocket/src/main/java/org/ngame/socket/NServer.java index ba45d2f..d99b765 100644 --- a/cocosocket/src/main/java/org/ngame/socket/NServer.java +++ b/cocosocket/src/main/java/org/ngame/socket/NServer.java @@ -13,7 +13,6 @@ import io.netty.channel.ChannelPipeline; import io.netty.channel.EventLoopGroup; import io.netty.channel.ServerChannel; import io.netty.channel.epoll.Epoll; -import io.netty.channel.epoll.EpollChannelOption; import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.epoll.EpollServerSocketChannel; import io.netty.channel.local.LocalAddress; diff --git a/cocosocket4unity/cocosocket4unity/Kcp.cs b/cocosocket4unity/cocosocket4unity/Kcp.cs index 8cfa784..08cab79 100644 --- a/cocosocket4unity/cocosocket4unity/Kcp.cs +++ b/cocosocket4unity/cocosocket4unity/Kcp.cs @@ -346,7 +346,7 @@ public class Kcp rx_srtt = 1; } } - int rto = rx_srtt + Math.Max(1, 4 * rx_rttval); + int rto = rx_srtt + Math.Max(interval, 4 * rx_rttval); rx_rto = _ibound_(rx_minrto, rto, IKCP_RTO_MAX); }