✨ feat(聊天): 添加ur武将广播

game-server/app/servers/role/handler/heroHandler.ts

@@ -9,7 +9,7 @@ import { ItemModel } from '../../../db/Item';
 import { gameData, getHeroExpByLv, getHeroStarByQuality, getHeroWakeByQuality, getHeroLvByExp, getMaxGradeByjobClass, getJobByGradeAndClass, getConnectLvByExp, getEquipByJobClassAndEPlace, getScollByStar, getExpByLv, getConnectMaxLv, getFriendShipByIdAndLv } from '../../../pubUtils/data';
 import { ItemInter, RewardInter } from '../../../pubUtils/interface';
 import { getDropItems, FIGURE_UNLOCK_CONDITION, ITID } from '../../../consts/constModules/itemConst'
-import { pushComposeOrangeHero, pushHeroQualityUpMsg, pushHeroStarMax, pushHeroWakeUp } from '../../../services/chatService';
+import { pushHeroStarMax, pushHeroWakeUp } from '../../../services/chatService';
 import { PvpDefenseModel } from '../../../db/PvpDefense';
 import { checkTask, checkTaskInHeroGiveFavor, checkTaskInHeroQUalityUp, checkTaskInHeroStarUp, checkTaskInHeroTrain, checkTaskInHeroWakeUp } from '../../../services/task/taskService';
 import { isNumber, pick } from 'underscore';
@@ -60,7 +60,6 @@ export class HeroHandler {
         // createHero
         let { heroes, resultHeroes } = await createHero(roleId, roleName, sid, serverId, { hid, count: 1 });
 
-        pushComposeOrangeHero(roleId, roleName, serverId, resultHeroes[0]);
         return resResult(STATUS.SUCCESS, { curHero: {hid}, addHeros: heroes });
     }
 

game-server/app/services/role/createHero.ts

@@ -15,6 +15,7 @@ import { RoleModel, RoleType, RoleUpdate } from "../../db/Role";
 import { sendMessageToUserWithSuc } from "../pushService";
 import { checkTaskInCreateHero } from "../task/taskService";
 import { filterHeroes } from "../dataService";
+import { pushGetHero } from "../sysChatService";
 
 /**
  * 创建多个武将
@@ -71,6 +72,7 @@ import { filterHeroes } from "../dataService";
         for(let hero of heroes) {
             showHeroes.push(new HeroShowParam(hero));
             resultHeroes.push(hero);
+            pushGetHero(roleId, roleName, serverId, hero);
         }
 
         await SkinModel.insertSkins(roleId, roleName, skins);

game-server/app/services/sysChatService.ts

@@ -18,11 +18,12 @@ export async function pushHeroQualityUpMsg(roleId: string, roleName: string, ser
     await pushNormalHeroInfoBySource(roleId, roleName, serverId, MSG_SOURCE.HERO_QUALITY_UP, heroInfo);
 }
 
-export async function pushComposeOrangeHero(roleId: string, roleName: string, serverId: number | string, heroInfo: Partial<HeroType>) {
+export async function pushGetHero(roleId: string, roleName: string, serverId: number | string, heroInfo: Partial<HeroType>) {
-    if (heroInfo.quality < HERO_INITIAL_QUALITY.ORANGE) {
+    if (heroInfo.quality == HERO_INITIAL_QUALITY.ORANGE) {
-        return;
+        await pushNormalHeroInfoBySource(roleId, roleName, serverId, MSG_SOURCE.GET_ORANGE_HERO, heroInfo);
+    } else if(heroInfo.quality == HERO_INITIAL_QUALITY.UR){
+        await pushNormalHeroInfoBySource(roleId, roleName, serverId, MSG_SOURCE.GET_UR_HERO, heroInfo);
     }
-    await pushNormalHeroInfoBySource(roleId, roleName, serverId, MSG_SOURCE.COMPOSE_ORANGE_HERO, heroInfo);
 }
 
 export async function pushHeroStarMax(roleId: string, roleName: string, serverId: number | string, heroInfo: Partial<HeroType>) {

shared/consts/constModules/chatConst.ts

@@ -58,7 +58,7 @@ export const MSG_SOURCE = {
     PRIVATE_SEND_GIFT: 1,
     TEAM_ROLE: 2,
     HERO_QUALITY_UP: 3,
-    COMPOSE_ORANGE_HERO: 4,
+    GET_ORANGE_HERO: 4,
     HERO_STAR_MAX: 5,
     GUILD_NOTICE: 6,
     GUILD_STRUCTURE_LV_UP: 7,
@@ -82,6 +82,7 @@ export const MSG_SOURCE = {
     EQUIP_STAR_UP: 25,
     EQUIP_QUALITY_UP: 26,
     LADDER_FIRST_CHANGE: 27,
+    GET_UR_HERO: 28,
 }
 
 export const DEFAULT_MSG_PER_PAGE = 10;

shared/consts/constModules/heroConst.ts

@@ -56,7 +56,8 @@ export const HERO_SUB_ATTR_RATIO = 1000;
 export const HERO_INITIAL_QUALITY = {
   BLUE: 1,
   PURPLE: 2,
-  ORANGE: 3
+  ORANGE: 3,
+  UR: 4,
 }
 
 export const CHECK_HERO_CONSUME = true;

shared/resource/jsons/dic_zyz_chat_system.json

@@ -41,7 +41,7 @@
     },
     {
         "id": 4,
-        "name": "COMPOSE_ORANGE_HERO",
+        "name": "GET_ORANGE_HERO",
         "mean": "玩家获得传奇武将（橙）",
         "type": "1&",
         "template": "<color=#2e190a>恭喜</color><color=#3bbb7e>%d</color><color=#2e190a>时来运转，获得传奇武将%d</color>",
@@ -94,8 +94,8 @@
         "name": "GUILD_BOSS_SUC",
         "mean": "军团BOSS胜利",
         "type": "3&",
-        "template": "<color=#2e190a>恭喜主公，军团BOSS</color><color=#e36c31>%d</color><color=#2e190a>被成功压制，拍卖行即将开启</color>",
+        "template": "<color=#2e190a>恭喜主公，军团BOSS</color><color=#e36c31>%d</color><color=#2e190a>被成功压制,海量拍品已加入拍卖行</color>",
-        "worldchat": "<color=#faf3e0>恭喜各位小主公，军团BOSS</color><color=#d57e53>%d</color><color=#faf3e0>被成功压制，拍卖行即将开启</color>",
+        "worldchat": "<color=#faf3e0>恭喜各位小主公，军团BOSS</color><color=#d57e53>%d</color><color=#faf3e0>被成功压制,海量拍品已加入拍卖行</color>",
         "bubble": "<outline color=#1c1613 width=2><color=#faf3e0>恭喜各位小主公，军团BOSS</color><color=#d57e53>%d</color><color=#faf3e0>被成功压制，拍卖行即将开启</color></outline>",
         "comments": "1:%d(BOSS名)"
     },
@@ -278,5 +278,15 @@
         "worldchat": "<color=#faf3e0>恭喜</color><color=#7feebd>%d</color><color=#faf3e0>，在名将擂台中攻擂成功，登顶第一</color>",
         "bubble": "<outline color=#1c1613 width=2><color=#faf3e0>恭喜</color><color=#7feebd>%d</color><color=#faf3e0>，在名将擂台中攻擂成功，登顶第一</color></outline>",
         "comments": "1:%d(玩家名)"
+    },
+    {
+        "id": 28,
+        "name": "GET_UR_HERO",
+        "mean": "玩家获得神话武将（ur）",
+        "type": "1&",
+        "template": "<color=#2e190a>恭喜</color><color=#3bbb7e>%d</color><color=#2e190a>时来运转，获得神话武将%d</color>",
+        "worldchat": "<color=#faf3e0>恭喜</color><color=#7feebd>%d</color><color=#faf3e0>时来运转，获得神话武将%d</color>",
+        "bubble": "<outline color=#1c1613 width=2><color=#faf3e0>恭喜</color><color=#7feebd>%d</color><color=#faf3e0>时来运转，获得神话武将%d</color></outline>",
+        "comments": "1:%d(玩家名)；2:%d(武将名)"
     }
 ]