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

shared/domain/dbGeneral.ts

@@ -222,6 +222,10 @@ export class Figure {
     unlockedId?: number[];			// 当前已经解锁了的type
     @prop({ required: true, default: false })
     unlocked: boolean = false;			// 是否已解锁
+    
+    // 埋点用
+    inc?: number;
+    reason?: number;
 
     public get status () {           // 虚拟字段status，当前头像是否已经解锁
         if(!this.unlocked) return this.unlocked; // 未解锁