upgrade pomelo to 2.2.x

NetEase · Jan 20, 2017 · 9c2e9f2 · 9c2e9f2
1 parent 3c0672a
commit 9c2e9f2
Show file tree

Hide file tree

Showing 8 changed files with 195 additions and 3,955 deletions.
diff --git a/game-server/package.json b/game-server/package.json
@@ -3,10 +3,10 @@
   "version": "0.2.0",
   "private": false,
   "dependencies": {
-    "pomelo": "1.x",
+    "bearcat": "^0.4.29",
     "crc": ">=0.0.1",
+    "pomelo": "^2.2.3",
     "pomelo-collection": ">=0.1.0",
-    "pomelo-logger": "0.1.x",
-    "bearcat": "0.2.x"
+    "pomelo-logger": "0.1.x"
   }
-}
+}
diff --git a/web-server/public/js/app.js b/web-server/public/js/app.js
@@ -1,6 +1,8 @@
 __resources__["/app.js"] = {
-  meta: {mimetype: "application/javascript"},
-
+  meta: {
+    mimetype: "application/javascript"
+  },
+
   data: function(exports, require, module, __filename, __dirname) {
     var gameMsgHandler = require('msgHandler'); // server message handler
     var Area = require('area');
@@ -91,8 +93,8 @@ __resources__["/app.js"] = {
       return getArea().getCurPlayer();
     }
 
-    function getResMgr(){
-      if(!resMgr){
+    function getResMgr() {
+      if (!resMgr) {
         resMgr = new ResMgr();
       }
 
@@ -104,7 +106,7 @@ __resources__["/app.js"] = {
      * @param data {Object} The init data for area
      * @api private
      */
-    function configData(data){
+    function configData(data) {
       data.skch = skch;
       data.gd = gd;
       data.gv = gv;
@@ -130,5 +132,4 @@ __resources__["/app.js"] = {
     exports.getCurPlayer = getCurPlayer;
     exports.changeView = changeView;
   }
-};
-
+};
diff --git a/web-server/public/js/lib/pomeloclient.js b/web-server/public/js/lib/pomeloclient.js
@@ -327,7 +327,7 @@
       url +=  ':' + port;
     }
 
-    socket = io.connect(url, {'force new connection': true, reconnect: true});
+    socket = io(url, {'force new connection': true, reconnect: true});
 
     socket.on('connect', function(){
       console.log('[pomeloclient.init] websocket connected!');