diff --git a/game-server/config/database.ts b/game-server/config/database.ts index a332342d5..65525437e 100644 --- a/game-server/config/database.ts +++ b/game-server/config/database.ts @@ -63,7 +63,7 @@ module.exports = { 'sq4': { 'mongo': 'mongodb://dbop:zyzSQ42022@dds-8vb11ca8d5e88fd41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb11ca8d5e88fd42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-510489410', 'gmmongo': 'mongodb://dbop:zyzSQGm2021@dds-8vb5de93552a67941.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67942.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67943.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?readPreference=secondary&replicaSet=mgset-508112742', - 'redis': 'r-8vb9q6zk7bpcvo456g.redis.zhangbei.rds.aliyuncs.com:6379', + 'redis': 'r-8vb9q6zk7bpcvo456g.redis.zhangbei.rds.aliyuncs.com', 'redispw': 'X9j2TKYy@cE6sSQD' }, }; \ No newline at end of file diff --git a/game-server/xtransitConfig/sq.js b/game-server/xtransitConfig/sq4.js similarity index 100% rename from game-server/xtransitConfig/sq.js rename to game-server/xtransitConfig/sq4.js diff --git a/gm-server/config/config.sq4.ts b/gm-server/config/config.sq4.ts index 2ecace93c..b5a967fa8 100644 --- a/gm-server/config/config.sq4.ts +++ b/gm-server/config/config.sq4.ts @@ -17,7 +17,7 @@ export default (appInfo: EggAppInfo) => { }; config.redis = { - url: 'r-8vb9q6zk7bpcvo456g.redis.zhangbei.rds.aliyuncs.com:6379', // 内网 + url: 'r-8vb9q6zk7bpcvo456g.redis.zhangbei.rds.aliyuncs.com', // 内网 pw: 'X9j2TKYy@cE6sSQD' }; diff --git a/shared/domain/dbGeneral.ts b/shared/domain/dbGeneral.ts index 33b04db3e..335b041d9 100644 --- a/shared/domain/dbGeneral.ts +++ b/shared/domain/dbGeneral.ts @@ -1,6 +1,6 @@ import { prop, mongoose, Ref } from '@typegoose/typegoose'; import { DicWarJson } from '../pubUtils/dictionary/DicWarJson'; -import Hero, { HeroType } from '../db/Hero'; +import Hero, { HeroType, Talent } from '../db/Hero'; import { nowSeconds } from '../pubUtils/timeUtil'; import { DicHero } from '../pubUtils/dictionary/DicHero'; @@ -28,6 +28,8 @@ export class PvpHeroInfo { colorStar?: number = 0; // 觉醒 @prop({ required: false }) quality?: number = 0; // 品质 + @prop({ required: false }) + talent?: Talent[] = []; // 品质 @prop({ required: true, _id: false }) attribute?: string; // 属性 @@ -40,6 +42,8 @@ export class PvpHeroInfo { this.lv = hero.lv; this.colorStar = hero.colorStar; this.quality = hero.quality; + let skin = hero.skins?.find(cur => cur.enable); + if(skin) this.talent = skin.talent; } setRobotInfo(dicHero: DicHero, lv: number) { @@ -130,6 +134,8 @@ export class PvpEnemies extends Enemies { lv: number; @prop({ required: true }) score: number; + @prop({ required: true }) + talent: Talent[]; // score: 这个武将的军功 constructor(warjson: DicWarJson, heroInfo: PvpHeroInfo, score: number, ce: number) { @@ -139,6 +145,7 @@ export class PvpEnemies extends Enemies { this.quality = heroInfo.quality; this.lv = heroInfo.lv; this.score = score; + this.talent = heroInfo.talent; } } diff --git a/web-server/config/config.sq4.ts b/web-server/config/config.sq4.ts index 7b3d93d3e..d34c31e42 100644 --- a/web-server/config/config.sq4.ts +++ b/web-server/config/config.sq4.ts @@ -13,7 +13,7 @@ export default (appInfo: EggAppInfo) => { options: { useNewUrlParser: true, useUnifiedTopology: true }, }; config.redis = { - url: 'r-8vb9q6zk7bpcvo456g.redis.zhangbei.rds.aliyuncs.com:6379', // 内网 + url: 'r-8vb9q6zk7bpcvo456g.redis.zhangbei.rds.aliyuncs.com', // 内网 pw: 'X9j2TKYy@cE6sSQD' };