Merge branch 'feature/login'

Conflicts:
	game-server/app/servers/role/handler/heroHandler.ts
	game-server/app/services/redisService.ts
	shared/consts/index.ts
	shared/resource/jsons/dic_zyz_gk_main.json

shared/consts/constModules/sysConst.ts

@@ -7,6 +7,10 @@ export const ENCRYPT_KEY = 'fiqaxijabbantusmprc234fj';
 
 export const AUTH_SMS_CNT_PER_DAY = 8;
 
+export const ADULT_AGE = 18;
+export const GUEST_MAX_TIME = 60 * 60 * 100; // 游客体验时间
+export const GUEST_DAY = 15; // 同一设备15天内不得重复体验游客模式
+
 export const COUNTER = {
     UID: { name: 'uid', def: 1 },
     GMUID: { name: 'gmuid', def: 1 },
@@ -392,4 +396,17 @@ export enum BLOCK_OPEATE {
   REMOVE_BLACK = 2,
   REMOVE_AND_APPLY = 3,
   REMOVE_FRIEND = 4
+}
+
+export enum TIME_FORMAT {
+    TYPE_SLASH = 1
+}
+
+export enum ADDICTION_PREVENTION_CODE {
+    FAIL = -1,
+    SUCCESS = 1,     // 接口的返回
+    GUEST = 1,       // 返回给客户端时，游客时间超时
+    CURFEW = 2,      // 每日22时至次日8时,未成年禁止游戏
+    HOLIDAY = 3,     // 法定节假日每日累计不得超过3小时
+    WORKDAY = 4,     // 非法定节假日每日累计不得超过1.5小时
 }