diff --git a/game-server/app/servers/gm/handler/gmRoleHandler.ts b/game-server/app/servers/gm/handler/gmRoleHandler.ts index 4c0580846..146ab336f 100644 --- a/game-server/app/servers/gm/handler/gmRoleHandler.ts +++ b/game-server/app/servers/gm/handler/gmRoleHandler.ts @@ -45,7 +45,9 @@ export class GmRoleHandler { } if(lv && lv > 0) { let exp = getExpByLv(lv - 1)?.sum||0; - await RoleModel.updateRoleInfo(roleId, { lv, exp }) + let role = await RoleModel.updateRoleInfo(roleId, { lv, exp }) + let r = new Rank(REDIS_KEY.USER_LV, { serverId: serverId }); + await r.setRankWithRoleInfo(roleId, lv, Date.now(), role); let uids = [{ uid: roleId, sid }]; pinus.app.get('channelService').pushMessageByUids('onPlayerExpChange', resResult(STATUS.SUCCESS, { isLvUp: false, lv, exp diff --git a/game-server/app/servers/role/handler/rankHandler.ts b/game-server/app/servers/role/handler/rankHandler.ts index ca5c42e90..cfde3dc52 100644 --- a/game-server/app/servers/role/handler/rankHandler.ts +++ b/game-server/app/servers/role/handler/rankHandler.ts @@ -1,4 +1,4 @@ -import { Application, BackendSession, HandlerService, } from "pinus"; +import { Application, BackendSession, HandlerService, pinus, } from "pinus"; import { resResult } from "../../../pubUtils/util"; import { STATUS, RANK_TYPE_TO_KEY, ROLE_SELECT, RANK_TYPE, HERO_SELECT, GUILD_SELECT, RANK_FIRST_REWARD_STATUS, ITEM_CHANGE_REASON } from "../../../consts"; import { RoleModel } from "../../../db/Role"; @@ -11,6 +11,7 @@ import { addItems } from "../../../services/rewardService"; import { HeroModel, HeroUpdate } from "../../../db/Hero"; import { RewardInter } from "../../../pubUtils/interface"; import { GuildRankInfo, RoleAndGuildRankInfo, RoleRankInfo } from "../../../domain/rank"; +import { RankFirstType } from "../../../db/RankFirst"; export default function (app: Application) { new HandlerService(app, {}); @@ -176,6 +177,8 @@ export class RoleHandler { let num = ranks.length > 0 ? ranks[0].num : 0; if (num < dicReward.condition) continue; + console.log('*******receiveReward', id, redisKey, type, num, dicReward.condition) + if (role.rankReceived.includes(id)) continue; let reward = dicReward.reward; diff --git a/game-server/app/servers/role/remote/roleRemote.ts b/game-server/app/servers/role/remote/roleRemote.ts index 3049d2aa0..dd05d5021 100644 --- a/game-server/app/servers/role/remote/roleRemote.ts +++ b/game-server/app/servers/role/remote/roleRemote.ts @@ -41,7 +41,7 @@ export class RoleRemote { } this.rankFirstRewards.get(rank.serverId).set(rank.id, rank); } - this.app.set('rankFirstRewards', rankFirstRewards); + this.app.set('rankFirstRewards', this.rankFirstRewards); } public setRankFirst(rank: RankFirstType) { diff --git a/shared/resource/jsons/dic_zyz_event.json b/shared/resource/jsons/dic_zyz_event.json index 69d0d1223..a30690a85 100644 --- a/shared/resource/jsons/dic_zyz_event.json +++ b/shared/resource/jsons/dic_zyz_event.json @@ -155,7 +155,7 @@ "suitLevel": "1&60", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "8&9&10&11", "winDialogue": "12&13", "loseDialogue": "14&15", @@ -170,10 +170,10 @@ "actorIDForQuestion": 0, "winReward": "17052&2", "loseReward": "17052&1", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -188,10 +188,10 @@ "actorIDForQuestion": 0, "winReward": "17053&1", "loseReward": "17053&1", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "2&3", "winDialogue": "&", "loseDialogue": "&", @@ -206,10 +206,10 @@ "actorIDForQuestion": 0, "winReward": "60001&80", "loseReward": "60001&40", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -224,10 +224,10 @@ "actorIDForQuestion": 14, "winReward": "11001&4000", "loseReward": "11001&2000", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&", @@ -242,10 +242,10 @@ "actorIDForQuestion": 14, "winReward": "31002&200", "loseReward": "31002&100", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&", @@ -260,10 +260,10 @@ "actorIDForQuestion": 12, "winReward": "17054&60", "loseReward": "17054&30", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "20&21&22&23&24", "winDialogue": "25&", "loseDialogue": "26&", @@ -278,10 +278,10 @@ "actorIDForQuestion": 0, "winReward": "17055&4", "loseReward": "17055&2", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 2001, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "5&6", "winDialogue": "3&", "loseDialogue": "7&", @@ -296,10 +296,10 @@ "actorIDForQuestion": 0, "winReward": "31001&10000", "loseReward": "31001&5000", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 2002, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "27&28&29&30&31", "winDialogue": "32&33", "loseDialogue": "34&", @@ -314,10 +314,10 @@ "actorIDForQuestion": 0, "winReward": "17051&400", "loseReward": "17051&200", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 2003, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "8&9&10&11", "winDialogue": "12&13", "loseDialogue": "14&15", @@ -332,10 +332,10 @@ "actorIDForQuestion": 0, "winReward": "71001&2", "loseReward": "71001&1", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -350,10 +350,10 @@ "actorIDForQuestion": 0, "winReward": "17044&2", "loseReward": "17044&1", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "2&3", "winDialogue": "&", "loseDialogue": "&", @@ -368,10 +368,10 @@ "actorIDForQuestion": 0, "winReward": "22001&2", "loseReward": "22001&1", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -386,10 +386,10 @@ "actorIDForQuestion": 14, "winReward": "17052&4", "loseReward": "17052&2", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&", @@ -404,10 +404,10 @@ "actorIDForQuestion": 14, "winReward": "17053&2", "loseReward": "17053&1", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&", @@ -422,10 +422,10 @@ "actorIDForQuestion": 12, "winReward": "60001&120", "loseReward": "60001&60", - "suitLevel": "20&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "20&21&22&23&24", "winDialogue": "25&", "loseDialogue": "26&", @@ -440,10 +440,10 @@ "actorIDForQuestion": 0, "winReward": "11001&6000", "loseReward": "11001&3000", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 2001, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "5&6", "winDialogue": "3&", "loseDialogue": "7&", @@ -458,10 +458,10 @@ "actorIDForQuestion": 0, "winReward": "31002&250", "loseReward": "31002&125", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 2002, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "27&28&29&30&31", "winDialogue": "32&33", "loseDialogue": "34&", @@ -476,10 +476,10 @@ "actorIDForQuestion": 0, "winReward": "17054&80", "loseReward": "17054&40", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 2003, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "8&9&10&11", "winDialogue": "12&13", "loseDialogue": "14&15", @@ -494,10 +494,10 @@ "actorIDForQuestion": 0, "winReward": "17055&6", "loseReward": "17055&3", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -512,10 +512,10 @@ "actorIDForQuestion": 0, "winReward": "31001&15000", "loseReward": "31001&7500", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "2&3", "winDialogue": "&", "loseDialogue": "&", @@ -530,10 +530,10 @@ "actorIDForQuestion": 0, "winReward": "17051&600", "loseReward": "17051&300", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -548,10 +548,10 @@ "actorIDForQuestion": 14, "winReward": "71001&3", "loseReward": "71001&2", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&", @@ -566,10 +566,10 @@ "actorIDForQuestion": 14, "winReward": "17044&2", "loseReward": "17044&1", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&", @@ -584,10 +584,10 @@ "actorIDForQuestion": 12, "winReward": "17045&1", "loseReward": "17045&1", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 0, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "20&21&22&23&24", "winDialogue": "25&", "loseDialogue": "26&", @@ -602,10 +602,10 @@ "actorIDForQuestion": 0, "winReward": "22001&2", "loseReward": "22001&1", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 2001, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "5&6", "winDialogue": "3&", "loseDialogue": "7&", @@ -620,10 +620,10 @@ "actorIDForQuestion": 0, "winReward": "17052&6", "loseReward": "17052&3", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 2002, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "27&28&29&30&31", "winDialogue": "32&33", "loseDialogue": "34&", @@ -638,10 +638,10 @@ "actorIDForQuestion": 0, "winReward": "17053&3", "loseReward": "17053&2", - "suitLevel": "40&100", + "suitLevel": "90&100", "warId": 2003, "weight": 26, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "8&9&10&11", "winDialogue": "12&13", "loseDialogue": "14&15", @@ -656,10 +656,10 @@ "actorIDForQuestion": 0, "winReward": "60001&80", "loseReward": "60001&40", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -674,10 +674,10 @@ "actorIDForQuestion": 0, "winReward": "11001&2000", "loseReward": "11001&1000", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -692,10 +692,10 @@ "actorIDForQuestion": 0, "winReward": "31002&150", "loseReward": "31002&75", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "2&3", "winDialogue": "&", "loseDialogue": "&", @@ -710,10 +710,10 @@ "actorIDForQuestion": 0, "winReward": "17054&40", "loseReward": "17054&20", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -728,10 +728,10 @@ "actorIDForQuestion": 14, "winReward": "17055&2", "loseReward": "17055&1", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&", @@ -746,10 +746,10 @@ "actorIDForQuestion": 14, "winReward": "31001&5000", "loseReward": "31001&2500", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "16&17", "winDialogue": "18&", "loseDialogue": "19&", @@ -764,10 +764,10 @@ "actorIDForQuestion": 12, "winReward": "17051&200", "loseReward": "17051&100", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "20&21&22&23&24", "winDialogue": "25&", "loseDialogue": "26&", @@ -782,10 +782,10 @@ "actorIDForQuestion": 0, "winReward": "71001&1", "loseReward": "71001&1", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 2001, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "5&6", "winDialogue": "3&", "loseDialogue": "7&", @@ -800,10 +800,10 @@ "actorIDForQuestion": 0, "winReward": "17044&1", "loseReward": "17044&1", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 2002, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "27&28&29&30&31", "winDialogue": "32&33", "loseDialogue": "34&", @@ -818,10 +818,10 @@ "actorIDForQuestion": 0, "winReward": "22001&1", "loseReward": "22001&1", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 2003, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "8&9&10&11", "winDialogue": "12&13", "loseDialogue": "14&15", @@ -836,10 +836,10 @@ "actorIDForQuestion": 0, "winReward": "17052&2", "loseReward": "17052&1", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -854,10 +854,10 @@ "actorIDForQuestion": 0, "winReward": "17053&1", "loseReward": "17053&1", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "2&3", "winDialogue": "&", "loseDialogue": "&", @@ -872,10 +872,10 @@ "actorIDForQuestion": 0, "winReward": "60001&80", "loseReward": "60001&40", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&", @@ -890,10 +890,10 @@ "actorIDForQuestion": 0, "winReward": "60001&80", "loseReward": "60001&40", - "suitLevel": "1&60", + "suitLevel": "90&100", "warId": 0, "weight": 13, - "movePointArray": "81&83&85&87", + "movePointArray": "&", "startDialogue": "1&4", "winDialogue": "&", "loseDialogue": "&",