feat(稷下学宫): c67747d87到5ff932e83

This commit is contained in:
luying
2023-09-04 14:48:16 +08:00
parent 9b391ef61f
commit 58e58a8a38
16 changed files with 10586 additions and 9645 deletions

View File

@@ -35,6 +35,8 @@ class RougeCharaRecord {
apSkill?: number; // 玩家选择的怒气技能卡
@prop({ required: false, default: 0 })
shield?: number
@prop({ required: false, default: 0 })
others?: string
@prop({ required: false })
damage?: number;
@prop({ required: false })

View File

@@ -44,7 +44,7 @@ export default class RougelikeCard extends BaseModel {
useCount?: number // 可使用次数
public static async updateByCode(gameCode: string, cardCode: string, params: { $set?: RougelikeCardPara, $inc?: { lv?: number } }, lean = true) {
public static async updateByCode(gameCode: string, cardCode: string, params: { $set?: RougelikeCardPara, $inc?: { lv?: number, useCount?: number } }, lean = true) {
const result: RougelikeCardType = await RougelikeCardModel.findOneAndUpdate({ gameCode, cardCode }, params, { new: true, upsert: true }).lean(lean);
return result;
}

View File

@@ -51,6 +51,9 @@ export default class RougelikeChara extends BaseModel {
@prop({ required: true, default: 0 })
shield: number; // 盾
@prop({ required: true, default: 0 })
others: string; // 盾其他数据
@prop({ required: true, default: 0 })
roundSkill: number; // 玩家选择的回合技能卡

View File

@@ -97,7 +97,6 @@ export class Shop {
discountPrice: number; //购买时折扣价格
}
export class WeightRecord {
@prop({ required: false, default: 0 })
originalWight?: number;
@@ -118,6 +117,18 @@ export class WeightRecord {
@prop({ required: false, default: 0 })
finalWeight?: number;
}
export class RandomRec {
@prop({ required: false, default: 0 })
id?: number;
@prop({ required: false, default: 0 })
planId?: number; // 方案编号
@prop({ required: false, default: 0 })
cardId?: number; // 角色卡id
@prop({ required: false, default: 0 })
weight?: number; // 权重
@prop({ required: false, type: WeightRecord, default: {} })
weightRecords?: WeightRecord;
}
export class Option {
@prop({ required: true, default: 0 })
@@ -130,8 +141,8 @@ export class Option {
@prop({ required: false, type: Number, default: [] })
passiveCardIds?: number[]; //高级学员自带特性卡
@prop({ required: false, type: WeightRecord, default: {} })
weightRecord?: WeightRecord //用于测试权重记录
// @prop({ required: false, type: WeightRecord, default: {} })
// weightRecord?: WeightRecord //用于测试权重记录
}
export class RewardIn {
@prop({ required: true, default: 0 })
@@ -144,6 +155,8 @@ export class RewardIn {
groupStatus: number; // 组选择 0-未选择 1-已选择
@prop({ required: true, default: 0 })
chooseNum: number; // 这一组总共能选的数量3选2
@prop({ required: false, default: 0 })
reRandRewardCnt: number; // 重新随机奖励
}
/**
@@ -203,8 +216,8 @@ export default class RougelikeRecordDetail extends BaseModel {
@prop({ required: false, type: RewardIn, default: [] })
rewards?: RewardIn[]; // 通用过关后的奖励,挑战后的奖励
@prop({ required: false, default: 0 })
reRandRewardCnt: number; // 重新随机奖励
@prop({ required: false, type: RandomRec, default: [] })
weightRecords?: RandomRec[];
public static async updateByCode(gameCode: string, detailCode: string, params: { $set: RougelikeRecordDetailPara, $inc?: { reRandRewardCnt: 1 } }, lean = true) {
const result: RougelikeRecordDetailType = await RougelikeRecordDetailModel.findOneAndUpdate({ gameCode, detailCode }, params, { new: true, upsert: true }).lean(lean);

View File

@@ -47,9 +47,13 @@ export interface RougeDamageInter {
hp: number;
ap: number;
shield: number;
others: string;
damage: number;
heal: number;
unserDamage: number;
isAp: boolean;
isRound: boolean;
maxHp?:number;
}
export interface Uid {
@@ -116,6 +120,7 @@ export class CommonChara {
maxHp: number; // 最大hp
ap: number; // 当前怒气
shield: number;
others: string;
roundSkill: number; // 玩家选择的回合技能卡
apSkill: number; // 玩家选择的怒气技能卡
@@ -128,6 +133,7 @@ export class CommonChara {
this.maxHp = chara?.maxHp || 0;
this.ap = chara?.ap || 0;
this.shield = chara?.shield || 0;
this.others = chara?.others || '';
this.roundSkill = chara?.roundSkill || 0;
this.apSkill = chara?.apSkill || 0;
}
@@ -161,23 +167,23 @@ export interface CommonNode {
};
export interface WeightRecord {
originalWight?: number;
passiveRedWight?: number;
holyRedWight?: number;
authorAddWeight?: number;
passiveLableNum?: number;
passiveLableNumAddWeight?: number;
holyLableNum?: number;
holyLableNumAddWeight?: number;
finalWeight?: number;
}
// export interface WeightRecord {
// originalWight?: number;
// passiveRedWight?: number;
// holyRedWight?: number;
// authorAddWeight?: number;
// passiveLableNum?: number;
// passiveLableNumAddWeight?: number;
// holyLableNum?: number;
// holyLableNumAddWeight?: number;
// finalWeight?: number;
// }
export interface RewardOption {
optionIndex: number; // 第几个选项
rewardId: number; // 角色卡的id或特性卡的id或圣物的id
optionStatus: number; // 0-没有选择这个奖励 1-选择了这个奖励
passiveCardIds?: number[]; //高级学员自带特性卡
weightRecord?: WeightRecord //用于测试权重记录
// weightRecord?: WeightRecord //用于测试权重记录
}
export interface CommonReward {

View File

@@ -3,7 +3,7 @@
"id": 1,
"challengeId": 1,
"effectId": "10010103&",
"content": "<color=#2e190a>接下来2场战斗敌军攻击提高30%</color>",
"content": "<color=#2e190a>接下来2场战斗敌军生命提高30%</color>",
"condition": 2,
"reward": "31002&10"
},
@@ -35,7 +35,7 @@
"id": 5,
"challengeId": 5,
"effectId": "10050203&",
"content": "<color=#2e190a>接下来2场战斗战斗结束后我军学员生命不低于80%</color>",
"content": "<color=#2e190a>接下来任意2场战斗战斗结束后我军学员生命不低于80%</color>",
"condition": 2,
"reward": "31002&50"
},
@@ -43,7 +43,7 @@
"id": 6,
"challengeId": 6,
"effectId": "10060102&",
"content": "<color=#2e190a>接下来2场战斗战斗过程中我军学员无法使用怒气技</color>",
"content": "<color=#2e190a>接下来任意2场战斗战斗过程中我军学员使用怒气技</color>",
"condition": 2,
"reward": "31002&60"
},
@@ -51,7 +51,7 @@
"id": 7,
"challengeId": 7,
"effectId": "10070102&",
"content": "<color=#2e190a>接下来2场战斗战斗过程中我军学员无法使用回合技</color>",
"content": "<color=#2e190a>接下来任意2场战斗战斗过程中我军学员使用回合技</color>",
"condition": 2,
"reward": "31002&70"
},
@@ -59,7 +59,7 @@
"id": 8,
"challengeId": 8,
"effectId": "10080102&",
"content": "<color=#2e190a>接下来2次选择特性卡时可选择的卡片数量1</color>",
"content": "<color=#2e190a>接下来2次选择特性卡时随机出的卡片数量-1</color>",
"condition": 2,
"reward": "31002&80"
},
@@ -67,7 +67,7 @@
"id": 9,
"challengeId": 9,
"effectId": "10090102&",
"content": "<color=#2e190a>接下来2场战斗每场战斗只能上阵2名学员</color>",
"content": "<color=#2e190a>接下来任意2场战斗每场战斗上阵不超出2名学员</color>",
"condition": 2,
"reward": "31002&90"
}

File diff suppressed because it is too large Load Diff

View File

@@ -55,7 +55,7 @@
"kind": 1,
"param": "count&",
"name": "挑战效果",
"info": "接下来X场战斗战斗过程中我军学员无法使用怒气技",
"info": "接下来X场战斗战斗过程中我军学员使用怒气技",
"conditon": "count",
"tips": "&"
},
@@ -65,7 +65,7 @@
"kind": 1,
"param": "count&",
"name": "挑战效果",
"info": "接下来X场战斗战斗过程中我军学员无法使用回合技",
"info": "接下来X场战斗战斗过程中我军学员使用回合技",
"conditon": "count",
"tips": "&"
},
@@ -83,9 +83,9 @@
"id": 1009,
"effectType": 1009,
"kind": 1,
"param": "count&",
"param": "count&num",
"name": "挑战效果",
"info": "接下来X场战斗每场战斗只能上阵2名学员",
"info": "接下来X场战斗每场战斗只能不超出X名学员",
"conditon": "count",
"tips": "&"
},
@@ -295,7 +295,7 @@
"kind": 2,
"param": "num&属性id&value",
"name": "圣物效果",
"info": "每场战斗第X回合后全员属性id提高Y",
"info": "每场战斗第X回合后全员属性id提高Y用seid实现",
"conditon": "&",
"tips": "num填多少表示num%"
},
@@ -373,7 +373,7 @@
"id": 3007,
"effectType": 3007,
"kind": 3,
"param": "nodeType&nodeType|X",
"param": "X&nodeType&nodeType",
"name": "法阵效果",
"info": "某些nodeType后获得的试炼币增加X%",
"conditon": "&",

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -13,7 +13,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1000",
"heroRatioPlan": 1,
"heroValue": 300000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "&"
},
@@ -31,7 +31,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1000",
"heroRatioPlan": 1,
"heroValue": 400000,
"heroValue": 4000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "&"
},
@@ -45,11 +45,11 @@
"buyRewardPlan": 0,
"layerCount": 15,
"layerPlan": 301,
"challengePlan": 3,
"challengePlan": 7,
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1001",
"heroRatioPlan": 1,
"heroValue": 500000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "1&1&5|1&2&3"
},
@@ -67,7 +67,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1001",
"heroRatioPlan": 1,
"heroValue": 600000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "1&1&10|1&2&5"
},
@@ -85,7 +85,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1002",
"heroRatioPlan": 1,
"heroValue": 700000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "1&1&10|1&2&7|1&3&3"
},
@@ -103,7 +103,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1002",
"heroRatioPlan": 1,
"heroValue": 800000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "1&1&12|1&2&10|1&3&5"
},
@@ -121,7 +121,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1003",
"heroRatioPlan": 1,
"heroValue": 900000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "1&1&12|1&2&10|1&3&5|1&4&1"
},
@@ -139,7 +139,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1003",
"heroRatioPlan": 1,
"heroValue": 500000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "2&1&5|2&2&3"
},
@@ -157,7 +157,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1004",
"heroRatioPlan": 1,
"heroValue": 600000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "2&1&10|2&2&5"
},
@@ -175,7 +175,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1004",
"heroRatioPlan": 1,
"heroValue": 700000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "2&1&10|2&2&7|2&3&3"
},
@@ -193,7 +193,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1005",
"heroRatioPlan": 1,
"heroValue": 800000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "2&1&12|2&2&10|2&3&5"
},
@@ -211,7 +211,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1005",
"heroRatioPlan": 1,
"heroValue": 900000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "2&1&12|2&2&10|2&3&5|2&4&1"
},
@@ -229,7 +229,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1006",
"heroRatioPlan": 1,
"heroValue": 500000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "3&1&5|3&2&3"
},
@@ -247,7 +247,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1006",
"heroRatioPlan": 1,
"heroValue": 600000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "3&1&10|3&2&5"
},
@@ -265,7 +265,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1007",
"heroRatioPlan": 1,
"heroValue": 700000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "3&1&10|3&2&7|3&3&3"
},
@@ -283,7 +283,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1007",
"heroRatioPlan": 1,
"heroValue": 800000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "3&1&12|3&2&10|3&3&5"
},
@@ -301,7 +301,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1008",
"heroRatioPlan": 1,
"heroValue": 900000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "3&1&12|3&2&10|3&3&5|3&4&1"
},
@@ -319,7 +319,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1008",
"heroRatioPlan": 1,
"heroValue": 500000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "4&1&5|4&2&3"
},
@@ -337,7 +337,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1009",
"heroRatioPlan": 1,
"heroValue": 600000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "4&1&10|4&2&5"
},
@@ -355,7 +355,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1009",
"heroRatioPlan": 1,
"heroValue": 700000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "4&1&10|4&2&7|4&3&3"
},
@@ -373,7 +373,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1010",
"heroRatioPlan": 1,
"heroValue": 800000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "4&1&12|4&2&10|4&3&5"
},
@@ -391,7 +391,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1010",
"heroRatioPlan": 1,
"heroValue": 900000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "4&1&12|4&2&10|4&3&5|4&4&1"
},
@@ -409,7 +409,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1011",
"heroRatioPlan": 1,
"heroValue": 500000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "5&1&5|5&2&3"
},
@@ -427,7 +427,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1011",
"heroRatioPlan": 1,
"heroValue": 600000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "5&1&10|5&2&5"
},
@@ -445,7 +445,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1012",
"heroRatioPlan": 1,
"heroValue": 700000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "5&1&10|5&2&7|5&3&3"
},
@@ -463,7 +463,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1012",
"heroRatioPlan": 1,
"heroValue": 800000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "5&1&12|5&2&10|5&3&5"
},
@@ -481,7 +481,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1013",
"heroRatioPlan": 1,
"heroValue": 900000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "5&1&12|5&2&10|5&3&5|5&4&1"
},
@@ -499,7 +499,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1013",
"heroRatioPlan": 1,
"heroValue": 500000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "6&1&5|6&2&3"
},
@@ -517,7 +517,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1014",
"heroRatioPlan": 1,
"heroValue": 600000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "6&1&10|6&2&5"
},
@@ -535,7 +535,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1014",
"heroRatioPlan": 1,
"heroValue": 700000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "6&1&10|6&2&7|6&3&3"
},
@@ -553,7 +553,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1015",
"heroRatioPlan": 1,
"heroValue": 800000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "6&1&12|6&2&10|6&3&5"
},
@@ -571,7 +571,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1015",
"heroRatioPlan": 1,
"heroValue": 900000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "6&1&12|6&2&10|6&3&5|6&4&1"
},
@@ -589,7 +589,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1016",
"heroRatioPlan": 1,
"heroValue": 500000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "7&1&5|7&2&3"
},
@@ -607,7 +607,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1016",
"heroRatioPlan": 1,
"heroValue": 600000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "7&1&10|7&2&5"
},
@@ -625,7 +625,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1017",
"heroRatioPlan": 1,
"heroValue": 700000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "7&1&10|7&2&7|7&3&3"
},
@@ -643,7 +643,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1017",
"heroRatioPlan": 1,
"heroValue": 800000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "7&1&12|7&2&10|7&3&5"
},
@@ -661,7 +661,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1018",
"heroRatioPlan": 1,
"heroValue": 900000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "7&1&12|7&2&10|7&3&5|7&4&1"
},
@@ -679,7 +679,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1018",
"heroRatioPlan": 1,
"heroValue": 500000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "8&1&5|8&2&3"
},
@@ -697,7 +697,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1019",
"heroRatioPlan": 1,
"heroValue": 600000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "8&1&10|8&2&5"
},
@@ -715,7 +715,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1019",
"heroRatioPlan": 1,
"heroValue": 700000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "8&1&10|8&2&7|8&3&3"
},
@@ -733,7 +733,7 @@
"randomEventPlan": 1,
"firstReward": "31002&50|31001&1020",
"heroRatioPlan": 1,
"heroValue": 800000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "8&1&12|8&2&10|8&3&5"
},
@@ -751,7 +751,7 @@
"randomEventPlan": 1,
"firstReward": "31002&100|31001&1020",
"heroRatioPlan": 1,
"heroValue": 900000,
"heroValue": 3000,
"heroSecondAttrLevel": 1,
"takeoutRewardShow": "8&1&12|8&2&10|8&3&5|8&4&1"
}