Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/MyWebSocketServer.java

@@ -33,7 +33,7 @@ public class MyWebSocketServer extends WebSocketServer {
                 InetSocketAddress myHost = new InetSocketAddress(ip, 9090);
                 mInstance = new MyWebSocketServer(myHost);
                 mInstance.setReuseAddr(true);
-                mInstance.setConnectionLostTimeout(5);
+                mInstance.setConnectionLostTimeout(15);
             }
         }
         return mInstance;

gameRes/gameChineseSeme/20307/audio1.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "bc6f62dd-3f89-475f-a228-db88f0b37cd6",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.44,
+  "duration": 0.792,
   "subMetas": {}
 }

gameRes/gameChineseSeme/23614/audio1.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "81d94eaf-111e-485a-baa4-3bbcb9a712fb",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.368,
+  "duration": 0.72,
   "subMetas": {}
 }

gameRes/gameChineseSeme/24425/audio1.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "afe7149b-0f38-435b-8eb7-4df8e73a4304",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.416,
+  "duration": 0.864,
   "subMetas": {}
 }

gameRes/gameChineseSeme/32701/audio1.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "739ce5d0-5b97-4f00-9b0c-cfddff1c2267",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.368,
+  "duration": 0.684,
   "subMetas": {}
 }

gameRes/gameChineseSeme/37027/audio2.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "98766368-153a-4d33-bfaf-dcd02916c192",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.584,
+  "duration": 0.864,
   "subMetas": {}
 }

gameRes/gameChineseSeme/40493/audio1.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "a3abb998-278c-4ef2-bd93-47a84a79b999",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.392,
+  "duration": 0.684,
   "subMetas": {}
 }