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/abilityConst.ts

@@ -4,9 +4,6 @@
  * 属性 id
  */
 
-
-import { JOB_TYPE } from "..";
-
 export enum ABI_TYPE{
     /**生命 */
     ABI_HP = 1,
@@ -41,12 +38,33 @@ export enum ABI_TYPE{
     ABI_DEF_IGNORE = 15,
     /**吸血等级 */
     ABI_BLOOD_SUCK = 16,
-    /**怒气 */
+    /**怒气恢复效果 */
     ABI_AP = 17,
+    /**暴击伤害 */
+    ABI_DAMAGE_CRI = 18,
 
     ABI_MAX,
 }
 
+// 主属性
+export const ABI_TYPE_MAIN =  [
+    ABI_TYPE.ABI_HP,
+    ABI_TYPE.ABI_ATK,
+    ABI_TYPE.ABI_DEF,
+    ABI_TYPE.ABI_MDEF
+];
+
+// 次级属性
+export const ABI_TYPE_SUB = [
+    ABI_TYPE.ABI_HIT,
+    ABI_TYPE.ABI_CRI,
+    ABI_TYPE.ABI_FLEE,
+    ABI_TYPE.ABI_ANT_CRI,
+    ABI_TYPE.ABI_DAMAGE_INCREASE,
+    ABI_TYPE.ABI_DAMAGE_DECREASE,
+    ABI_TYPE.ABI_DEF_IGNORE,
+    ABI_TYPE.ABI_DAMAGE_CRI
+];
 
 export enum SEID_TYPE {
     /**属性固定值加成(数值) */
@@ -63,39 +81,10 @@ export enum ABI_STAGE {
     ATK = 2,
     DEF = 3,
     MDEF = 4,
-    AGI = 5,
-    LUK = 6,
-    END = 6
+    END = 4
 }
 
 export const ATTR = {}
-//武将训练等级
-export const HEROTARIN = {
-    1: "hp",
-    2: "atk",
-    3: "def",
-    4: "mdef",
-    5: "agi",
-    6: "luk"
-};
-//战力系数
-export const CE_RATIO = {
-    "hp" : 1,
-    "atk" : 2,
-    "matk": 2,
-    "def": 2,
-    "mdef": 2,
-    "agi": 2,
-    "luk": 0,
-    "hit": 0,
-    "cri": 0,
-    "flee": 0,
-    "antCri": 0,
-    "damageIncrease": 0,
-    "damageDecrease": 0,
-    "defIngnore": 0,
-    "bloodSuck": 0,
-};
 
 export const HERO_ATTR = {
     1: "hp",    // 生命
@@ -114,44 +103,30 @@ export const HERO_ATTR = {
     14: "damageDecrease",  // 伤害减免等级
     15: "defIngnore",  // 忽视防御等级
     16: "bloodSuck",   // 吸血等级
-    17: "ap"    // 怒气
+    17: "damageCri",    // 暴击伤害
+    18: "ap"    // 暴击伤害
 };
 
-export const JEWEL_ATTR = {
-    1: "hp",
-    2: "atk",
-    3: "def",
-    4: "mdef",
-    5: "agi",
-    6: "luk"
-}
-const BASE_ATTR = {
-    'hp' : 1 ,
-    'atk' : 2,
-    'def' : 3,
-    'mdef' : 4
-}
-export const ABI_TYPE_TO_STAGE = new Map<number,  number | ((jobType: number) => number)>([
+export const ABI_TYPE_TO_STAGE = new Map<number,  number>([
     [ABI_STAGE.HP, ABI_TYPE.ABI_HP],
-    [ABI_STAGE.ATK, (jobType:number) => { return jobType == JOB_TYPE.PHYSIC?ABI_TYPE.ABI_ATK: ABI_TYPE.ABI_MATK}],
+    [ABI_STAGE.ATK, ABI_TYPE.ABI_ATK],
     [ABI_STAGE.DEF, ABI_TYPE.ABI_DEF],
-    [ABI_STAGE.MDEF, ABI_TYPE.ABI_MDEF],
-    [ABI_STAGE.AGI, ABI_TYPE.ABI_AGI],
-    [ABI_STAGE.LUK, ABI_TYPE.ABI_LUK]
+    [ABI_STAGE.MDEF, ABI_TYPE.ABI_MDEF]
 ]);
 
 export function getAtrrNameById(attrId: number):string {
     return HERO_ATTR[attrId];
 };
 
-export function getAttrCeRatio(attr: string):number {
-    return CE_RATIO[attr];
-};
-
-export function getAttrNameByJobStage(jobStage: number) {
-    return HEROTARIN[jobStage];
-};
-
-export function getTeraphAttr() {
-    return BASE_ATTR;
-};
+export enum CE_CONST {
+    FLEE_VALUE = 0.3, // 格挡价值
+    PUT_HIT = 50000, // 投放总命中
+    HIT_RATE_BASE = 0.75, // 命中率基础
+    HIT_RATE_MAX = 1, // 命中率上限
+    HIT_RATE_MIN = 0, // 命中率下限
+    PUT_ANT_CRI = 50000, // 投放总抗暴
+    CRI_RATE_BASE = 0.05, // 暴击率基础
+    CRI_RATE_MAX = 0.75, // 暴击率上限
+    CRI_RATE_MIN = 0.05, // 暴击率下限
+    CRI_VALUE_BASE = 1.5, // 暴击价值基础
+} 

shared/consts/constModules/calcuConst.ts

@@ -14,7 +14,3 @@ export const GOLD_COST_RATIO = {
   "DAILY_REF_NUM": { "A": 50, "B": 0 },    // 每日购买次数花费
   "DUNGRON_BUY_NUM": { "A": 0, "B": 50 }   // 秘境购买次数花费
 }
-
-export const EXPRESSION = {
-  "CE": "1*hp+2*atk+2*matk+2*def+2*mdef+2*agi+2*luk+0*hit+0*cri+0*flee+0*antCri+0*damageIncrease+0*damageDecrease+0*defIngnore+0*bloodSuck"
-}

shared/consts/constModules/heroConst.ts

@@ -18,7 +18,9 @@ export const HERO_SYSTEM_TYPE = {
     ADD_SKIN: 15,
     SCHOOL: 16,
     SCROLL: 17,
-    TITLE:18,
+    TITLE: 18,
+    TERAPH: 19,
+    TERAPH_UP: 20
 };
 
 // 武将上限
@@ -36,4 +38,6 @@ export const JOB_TYPE = {
 }
 
 // 武将战力放大系数
-export const HERO_CE_RATIO = 100;
+export const HERO_CE_RATIO = 100;
+// 次级属性放大系数
+export const HERO_SUB_ATTR_RATIO = 1000;

shared/consts/constModules/httpConst.ts

@@ -0,0 +1,6 @@
+export enum BANTU_VID_ADDR {
+    HOST = 'https://sdks.trgame.cn',
+    IDCARD = '/vid/idcard',           // 实名认证
+    REPORT_ONLINE = '/addiction_prevention/report_online'
+}
+export const BANTU_VID_APP_KEY = '05c1c495369769e3c5d98426e9c8c2c0';

shared/consts/constModules/selectConst.ts

@@ -7,7 +7,7 @@ export enum ROLE_SELECT {
    // 显示申请需要的信息
    SHOW_FRIEND_APPLY_LIST = 'roleId roleName ce headHid sHid lv title job quitTime vLv guildName friendCnt recFrdApplyCnt serverId userInfo.serverType',
    HANDLE_APPLY = 'roleId friendCnt lv',
-   ATTR = 'globalCeAttr',
+   ATTR = 'attr',
    GET_LV = 'lv',
    GET_ROLE_ID = 'roleId',
    GET_MY_SERVER = 'lv serverId userInfo.serverType',
@@ -15,8 +15,8 @@ export enum ROLE_SELECT {
 };
 
 export enum HERO_SELECT {
-   ENTRY = '-ceAttr',
-   HERO_DETAIL = 'roleId roleName hid hName ce lv star colorStar quality job skins ceAttr'
+   ENTRY = '-attr',
+   HERO_DETAIL = 'roleId roleName hid hName ce lv star colorStar quality job skins attr'
 }
 
 export enum EQUIP_SELECT {

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小时
 }