Merge branch 'master' into feature/backend

# Conflicts:
#	game-server/app/servers/connector/handler/entryHandler.ts
#	game-server/app/servers/role/handler/itemHandler.ts
#	shared/consts/constModules/sysConst.ts
#	shared/pubUtils/util.ts
#	web-server/app.ts
#	web-server/app/service/Auth.ts

game-server/config/serverProtos.ts

@@ -55,6 +55,8 @@ module.exports = {
             "message Good": {
                 'required uInt32 id': 1,
                 'required uInt32 count': 2,
+                'required uInt32 reason': 3,
+                'required sInt32 inc': 4,
             },
             'repeated Good goods': 1,
         },
@@ -145,14 +147,14 @@ module.exports = {
     //     'required uInt32 code': 2,
     //     'required Data data': 3
     // },
-    'onEquipDel': {
-        'message Data': {
-            'repeated uInt32 equips': 1
-        },
-        'required string msg': 1,
-        'required uInt32 code': 2,
-        'required Data data': 3
-    },
+    // 'onEquipDel': {
+    //     'message Data': {
+    //         'repeated uInt32 equips': 1
+    //     },
+    //     'required string msg': 1,
+    //     'required uInt32 code': 2,
+    //     'required Data data': 3
+    // },
     // 'onHeadChange': {
     //     'message Data': {
     //         "message FigureInfo": {