xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 秘境json字段

Browse Source
This commit is contained in:
luying
2020-11-18 13:39:32 +08:00
parent b4c0dc7da7
commit 4f9d996003
16 changed files with 152 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
game-server/app/servers/battle/handler/expeditionBattleHandler.ts
View File

@@ -7,7 +7,7 @@ import { ExpeditionPointModel } from '../../../db/ExpeditionPoint';
import { RoleModel } from '../../../db/Role';
import { calculateSumCE, genCode } from '../../../pubUtils/util';
import { getPointRewardStatus, getResetRemainCnt, findOrCreateEnemies } from '../../../services/expeditionService';
import { EXPEDITION_CONST } from '../../../consts/consts';
import { EXPEDITION_CONST, EXPEDITION_WAR_RECORD_STATUS } from '../../../consts/consts';
import { WarReward } from '../../../services/warRewardService';
import { handleFixedReward } from '../../../services/rewardService';
import { getAp, setAp } from '../../../services/actionPointService';
@@ -39,7 +39,7 @@ export class ExpeditionBattleHandler {
expeditionRecord = await ExpeditionRecordModel.createRecord({
roleId, roleName, heroes: [], myCe
});
await findOrCreateEnemies(roleId, myCe, expeditionRecord.expeditionCode, 1, 0);
await findOrCreateEnemies(roleId, myCe, expeditionRecord.expeditionCode, 1, EXPEDITION_WAR_RECORD_STATUS.WAITING);
}
// 每一关的挑战状态
@@ -90,7 +90,7 @@ export class ExpeditionBattleHandler {
let { expeditionCode, heroes } = await ExpeditionRecordModel.createRecord({
roleId, roleName, heroes: [], myCe
});
await findOrCreateEnemies(roleId, myCe, expeditionCode, 1, 0);
await findOrCreateEnemies(roleId, myCe, expeditionCode, 1, EXPEDITION_WAR_RECORD_STATUS.WAITING);
await RoleModel.increaseExpeditionResetCnt(roleId, needRefresh, curTime);
let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCode(expeditionCode);
let curLv = 0;
@@ -119,13 +119,13 @@ export class ExpeditionBattleHandler {
let { myCe } = await ExpeditionRecordModel.getExpeditionRecordByCode(expeditionCode);
let curExpeditionWarRecord = await findOrCreateEnemies(roleId, myCe, expeditionCode, expeditionId, 0);
let curExpeditionWarRecord = await findOrCreateEnemies(roleId, myCe, expeditionCode, expeditionId, EXPEDITION_WAR_RECORD_STATUS.WAITING);
if(!curExpeditionWarRecord) {
return resResult(STATUS.EXPEDITION_MATCH_NO_PLAYER);
}
let { battleId, enemyFrom, enemies, battleStatus, ce: curCe } = curExpeditionWarRecord;
let nextCe = 0; // 下一关战力
let nextExpeditionWarRecord = await findOrCreateEnemies(roleId, myCe, expeditionCode, expeditionId + 1, -1);
let nextExpeditionWarRecord = await findOrCreateEnemies(roleId, myCe, expeditionCode, expeditionId + 1, EXPEDITION_WAR_RECORD_STATUS.HIDE);
if(nextExpeditionWarRecord) nextCe = nextExpeditionWarRecord.ce;
return resResult(STATUS.SUCCESS, {
@@ -171,7 +171,7 @@ export class ExpeditionBattleHandler {
if(!expeditionWarRecord ) {
return resResult(STATUS.EXPEDITION_MISS_WAR_RECORD);
}
if(expeditionWarRecord.battleStatus == 1) {
if(expeditionWarRecord.battleStatus == EXPEDITION_WAR_RECORD_STATUS.SUCCESS) {
return resResult(STATUS.EXPEDITION_DUPLICATE_CHALLENGE);
}
@@ -186,7 +186,7 @@ export class ExpeditionBattleHandler {
}
}, true);
let result = await ExpeditionWarRecordModel.updateBattleCode(expeditionCode, expeditionId, 0, battleCode);
let result = await ExpeditionWarRecordModel.updateBattleCode(expeditionCode, expeditionId, EXPEDITION_WAR_RECORD_STATUS.WAITING, battleCode);
return resResult(STATUS.SUCCESS, {
expeditionCode,
@@ -245,7 +245,8 @@ export class ExpeditionBattleHandler {
// 更新我方剩余血量
await ExpeditionRecordModel.updateHeroStatus(expeditionCode, expeditionRecord.heroes, heroes);
// 更新敌人剩余状态及战斗状态
expeditionWarRecord = await ExpeditionWarRecordModel.updateEnemiesStatus(expeditionCode, expeditionId, isSuccess?1:2, enemies);
let battleStatus = isSuccess?EXPEDITION_WAR_RECORD_STATUS.SUCCESS:EXPEDITION_WAR_RECORD_STATUS.FAIL;
expeditionWarRecord = await ExpeditionWarRecordModel.updateEnemiesStatus(expeditionCode, expeditionId, battleStatus, enemies);
// 更新battleRecord状态
await BattleRecordModel.updateBattleRecordByCode(battleCode, {
$set: { status: isSuccess?1: 2, star }
@@ -259,9 +260,11 @@ export class ExpeditionBattleHandler {
let reward = await warReward.saveReward(1);
let actordata = await roleLevelup(roleId, isSuccess?warInfo.kingExp:0);// 主公升级经验
// 更新下一关状态
await ExpeditionWarRecordModel.updateStatus(expeditionCode, expeditionId + 1, 0);
if(isSuccess) {
// 更新下一关状态
await ExpeditionWarRecordModel.updateStatus(expeditionCode, expeditionId + 1, EXPEDITION_WAR_RECORD_STATUS.WAITING);
}
return resResult(STATUS.SUCCESS, {
expeditionCode, expeditionId,
battleCode, battleId,

23
game-server/app/servers/battle/handler/towerBattleHandler.ts
View File

@@ -154,36 +154,39 @@ export class TowerBattleHandler {
let roleName = session.get('roleName');
let curTime = new Date();
let { towerLv, towerTaskRefTime } = await RoleModel.findByRoleId(roleId);
let { towerLv, towerTaskRefTime, towerTaskReCnt = 0 } = await RoleModel.findByRoleId(roleId);
let curTasks = await TowerTaskRecModel.getCurTasks(roleId); // 当前显示中的任务
const needRefresh = shouldRefresh(towerTaskRefTime, curTime, TOWER_TASK_CONST.REFRESH_TIME);
if(needRefresh) {
const batchCode = genCode(8);
await RoleModel.resetTowerCnt(roleId, curTime); // 重置派遣次数
let {waitingTaskCode, doingTaskCode, doingIds} = getDoingOrWaitingTasks(curTasks, curTime);
await TowerTaskRecModel.hideTask(roleId, waitingTaskCode); // 隐藏没有在做的任务
await TowerTaskRecModel.updateBatchCode(roleId, doingTaskCode, batchCode); // 更新留下来的旧任务的batchCode
await createCurTasks(towerLv, batchCode, roleId, roleName, doingTaskCode.length, TOWER_TASK_CONST.RAND_CNT-doingTaskCode.length, doingIds); // 新建任务
curTasks = await TowerTaskRecModel.getCurTasks(roleId);
// 重置派遣次数
const role = await RoleModel.resetTowerCnt(roleId, curTime);
towerTaskReCnt = role.towerTaskReCnt;
}
let refRemainTime = getRemainTime(curTime);
let costGold = TOWER_TASK_CONST.COST_GOLD;
let nextCostGold = calculateNum(GOLD_COST_RATIO.TOWER_TASK_REF, {num: towerTaskReCnt + 1}, 50);
return resResult(STATUS.SUCCESS, { curTasks: treatTask(curTasks, curTime), refRemainTime, nextCostGold: costGold });
return resResult(STATUS.SUCCESS, { curTasks: treatTask(curTasks, curTime), refRemainTime, nextCostGold });
}
async refreshTasks(msg: {}, session: BackendSession) {
let roleId = session.get('roleId');
let roleName = session.get('roleName');
let curTime = new Date();
let { towerLv, towerTaskCnt = 0 } = await RoleModel.findByRoleId(roleId);
let { towerLv, towerTaskCnt = 0, towerTaskReCnt=0 } = await RoleModel.findByRoleId(roleId);
if(TOWER_TASK_CONST.MAX_TASK_REF_CNT <= towerTaskCnt) { // 每派遣一个任务加一，最多8个完成任务
return resResult(STATUS.TOWER_REF_CNT_NOT_ENOUGH);
}
let costGold = TOWER_TASK_CONST.COST_GOLD;
let costGold = calculateNum(GOLD_COST_RATIO.TOWER_TASK_REF, {num: towerTaskReCnt}, 50);
let {gold} = await RoleModel.findByRoleId(roleId);
if(costGold > gold) {
return resResult(STATUS.TOWER_GOLD_NOT_ENOUGH);
@@ -197,9 +200,11 @@ export class TowerBattleHandler {
await TowerTaskRecModel.updateBatchCode(roleId, doingTaskCode, batchCode); // 更新留下来的旧任务的batchCode
await createCurTasks(towerLv, batchCode, roleId, roleName, 0, waitingTaskCode.length, doingIds);
curTasks = await TowerTaskRecModel.getCurTasks(roleId);
await RoleModel.increaseTowerRefCnt(roleId, 1);
let refRemainTime = getRemainTime(curTime);
return resResult(STATUS.SUCCESS, { curTasks: treatTask(curTasks, curTime), costGold, nextCostGold:costGold, refRemainTime});
let nextCostGold = calculateNum(GOLD_COST_RATIO.TOWER_TASK_REF, {num: towerTaskReCnt + 1}, 50);
return resResult(STATUS.SUCCESS, { curTasks: treatTask(curTasks, curTime), costGold, nextCostGold, refRemainTime});
}
async sendTaskHero(msg: {batchCode: string, tasks: Array<{taskCode: string, heroes: Array<number>}>}, session: BackendSession) {
@@ -227,12 +232,12 @@ export class TowerBattleHandler {
if (task.heroes.length !== taskInfo.actorNeeded) { // 武将数，从策划表中读取
return resResult(STATUS.TOWER_TASK_MAX_HERO);
}
let hasHero = await checkBattleHeroes(roleId, task.heroes);
if(!hasHero) return resResult(STATUS.BATTLE_HERO_NOT_FOUND);
if (tasksCode.indexOf(task.taskCode) === -1) {
return resResult(STATUS.TOWER_TASK_CODE_NOT_FOUND);
}
if (usedHeroes.length > 0) { // 是否在其他任务重使用了武将
let hasHero = await checkBattleHeroes(roleId, task.heroes);
if(!hasHero) return resResult(STATUS.BATTLE_HERO_NOT_FOUND);
let used = !!task.heroes.find(seqId => usedHeroes.indexOf(seqId) !== -1);
if (used) {
return resResult(STATUS.TOWER_TASK_HERO_HAS_USED);

9
shared/consts/consts.ts
View File

@@ -133,6 +133,13 @@ export const EVENT_ANSWER_STATUS = {
WRONG: 2
};
export const EXPEDITION_WAR_RECORD_STATUS = {
HIDE: -1,
WAITING: 0,
SUCCESS: 1,
FAIL: 2
};
export const EVENT_START_BATTLE = 101;
export const HANG_UP_CONSTS = {
@@ -206,7 +213,7 @@ export const GONGSHI = {
*/
export const GOLD_COST_RATIO = {
"TOWER_HANG_SPDUP": { "A": 0, "B": 50 }, // 天梯挂机加速花费
"TPWER_TASK_REF": { "A": 0, "B": 200 }, // 天梯派遣刷新花费
"TOWER_TASK_REF": { "A": 0, "B": 50 }, // 天梯派遣刷新花费
"DAILY_REF_NUM": { "A": 50, "B": 0 }, // 每日购买次数花费
"DUNGRON_BUY_NUM": { "A": 0, "B": 50 } // 秘境购买次数花费
}

5
shared/db/ExpeditionWarRecord.ts
View File

@@ -1,5 +1,6 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
import { EXPEDITION_WAR_RECORD_STATUS } from '../consts/consts';
class Enemies {
@prop({ required: true })
@@ -56,7 +57,7 @@ export default class ExpeditionWarRecord extends BaseModel {
@prop({ required: true, default: '' })
battleCode: string; // 关联关卡唯一值
@prop({ required: true, default: 0 })
battleStatus: number; // 是否通过, 0-可挑战 1-成功 2-挑战失败
battleStatus: number; // 是否通过, -1-已生成 0-可挑战 1-成功 2-挑战失败
@prop({ required: true, default: 0 })
enemyFrom: number; // 敌军数据来源：1-配表的敌军队，2-玩家
@prop({ required: true, default: '' })
@@ -67,7 +68,7 @@ export default class ExpeditionWarRecord extends BaseModel {
ce: number; // 敌军战力
public static async getRecordByCode(expeditionCode: string, lean = true) {
const result = await ExpeditionWarRecordModel.find({ expeditionCode, battleStatus: {$gte: 0} }).select('expeditionId battleId battleCode battleStatus ce').sort({expeditionId: 1}).lean(lean);
const result = await ExpeditionWarRecordModel.find({ expeditionCode, battleStatus: {$gte: EXPEDITION_WAR_RECORD_STATUS.WAITING} }).select('expeditionId battleId battleCode battleStatus ce').sort({expeditionId: 1}).lean(lean);
return result;
}

9
shared/db/Role.ts
View File

@@ -126,6 +126,8 @@ export default class Role extends BaseModel {
towerTaskCnt: number; // 刷新派遣任务的次数，向上累加，每天8个
@prop({ required: false})
towerTaskRefTime: Date; // 刷新派遣任务的时间
@prop({ required: true, default: 0})
towerTaskReCnt: number; // 刷新派遣任务刷新次数
// 奇遇事件相关
@prop({ required: true, default: 0 })
@@ -273,7 +275,7 @@ export default class Role extends BaseModel {
// 重置派遣次数
public static async resetTowerCnt(roleId: string, curTime: Date, lean = true) {
const role = await RoleModel.findOneAndUpdate({roleId}, {towerTaskCnt: 0, towerTaskRefTime: curTime}, {new: true}).lean(lean);
const role = await RoleModel.findOneAndUpdate({roleId}, {towerTaskCnt: 0, towerTaskRefTime: curTime, towerTaskReCnt: 0}, {new: true}).lean(lean);
return role;
}
// 刷新派遣任务次数增长
@@ -281,6 +283,11 @@ export default class Role extends BaseModel {
const role = await RoleModel.findOneAndUpdate({roleId}, {$inc: {towerTaskCnt: num}}, {new: true}).lean(lean);
return role;
}
// 派遣任务增加刷新次数
public static async increaseTowerRefCnt(roleId: string, num: number, lean = true) {
const role = await RoleModel.findOneAndUpdate({roleId}, {$inc: {towerTaskReCnt: num}}, {new: true}).lean(lean);
return role;
}
// 刷新远征重置次数
public static async increaseExpeditionResetCnt(roleId: string, needRefresh: boolean, curTime: Date, lean = true) {

14
shared/resource/jsons/dic_zyz_gk_dungeon.json
View File

@@ -1,8 +1,8 @@
[
{
"war_id": 104,
"dispatchJsonId": 104,
"bg_img_id": 602,
"war_id": 5001,
"dispatchJsonId": 5001,
"bg_img_id": 104,
"script_id": 0,
"fixReward": "10205&1|17001&10|17005&2|17006&3",
"warType": 6,
@@ -24,9 +24,9 @@
"iconInMap": "city&1"
},
{
"war_id": 105,
"dispatchJsonId": 105,
"bg_img_id": 603,
"war_id": 5002,
"dispatchJsonId": 5002,
"bg_img_id": 104,
"script_id": 0,
"fixReward": "10005&1|17002&10|17007&2|17008&3",
"warType": 6,
@@ -40,7 +40,7 @@
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"cost": 0,
"recommendedPower": 10008,
"previousGk": 104,
"previousGk": 5001,
"lvLimted": 0,
"heroInUI": "2&10|1&9|1&1001",
"detailUIBg": "dengeon1",

16
shared/resource/jsons/dic_zyz_gk_dungeonElite.json
View File

@@ -1,8 +1,8 @@
[
{
"war_id": 106,
"dispatchJsonId": 106,
"bg_img_id": 601,
"war_id": 5501,
"dispatchJsonId": 5501,
"bg_img_id": 104,
"script_id": 0,
"fixReward": "10205&1|17001&10|17005&2|17006&3",
"warType": 13,
@@ -16,7 +16,7 @@
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"cost": 0,
"recommendedPower": 10008,
"previousGk": 105,
"previousGk": 5002,
"lvLimted_1": 0,
"heroInUI": "2&10|1&9|1&1001",
"detailUIBg": "dengeon1",
@@ -24,9 +24,9 @@
"iconInMap": "city&1"
},
{
"war_id": 107,
"dispatchJsonId": 107,
"bg_img_id": 107,
"war_id": 5502,
"dispatchJsonId": 5501,
"bg_img_id": 104,
"script_id": 0,
"fixReward": "10005&1|17002&10|17007&2|17008&3",
"warType": 13,
@@ -40,7 +40,7 @@
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"cost": 0,
"recommendedPower": 10008,
"previousGk": 106,
"previousGk": 5503,
"lvLimted_1": 0,
"heroInUI": "2&10|1&9|1&1001",
"detailUIBg": "dengeon1",

20
shared/resource/warJsons/4001.json
View File

@@ -2,7 +2,7 @@
{
"warID": 4001,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 0,
@@ -22,7 +22,7 @@
{
"warID": 4001,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 1,
@@ -42,7 +42,7 @@
{
"warID": 4001,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 2,
@@ -62,7 +62,7 @@
{
"warID": 4001,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 3,
@@ -82,7 +82,7 @@
{
"warID": 4001,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 4,
@@ -102,7 +102,7 @@
{
"warID": 4001,
"actorName": "李典",
"actorID": 312,
"actorId": 312,
"dataId": 2001,
"relation": 2,
"outIndex": 0,
@@ -122,7 +122,7 @@
{
"warID": 4001,
"actorName": "贾诩",
"actorID": 314,
"actorId": 314,
"dataId": 2002,
"relation": 2,
"outIndex": 1,
@@ -142,7 +142,7 @@
{
"warID": 4001,
"actorName": "许褚",
"actorID": 315,
"actorId": 315,
"dataId": 2003,
"relation": 2,
"outIndex": 2,
@@ -162,7 +162,7 @@
{
"warID": 4001,
"actorName": "邓艾",
"actorID": 309,
"actorId": 309,
"dataId": 2004,
"relation": 2,
"outIndex": 3,
@@ -182,7 +182,7 @@
{
"warID": 4001,
"actorName": "曹仁",
"actorID": 311,
"actorId": 311,
"dataId": 2005,
"relation": 2,
"outIndex": 4,

20
shared/resource/warJsons/4002.json
View File

@@ -2,7 +2,7 @@
{
"warID": 4002,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 0,
@@ -21,7 +21,7 @@
{
"warID": 4002,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 1,
@@ -40,7 +40,7 @@
{
"warID": 4002,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 2,
@@ -59,7 +59,7 @@
{
"warID": 4002,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 3,
@@ -78,7 +78,7 @@
{
"warID": 4002,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 4,
@@ -97,7 +97,7 @@
{
"warID": 4002,
"actorName": "贾诩",
"actorID": 314,
"actorId": 314,
"dataId": 2001,
"relation": 2,
"outIndex": 0,
@@ -116,7 +116,7 @@
{
"warID": 4002,
"actorName": "曹仁",
"actorID": 311,
"actorId": 311,
"dataId": 2002,
"relation": 2,
"outIndex": 1,
@@ -135,7 +135,7 @@
{
"warID": 4002,
"actorName": "邓艾",
"actorID": 309,
"actorId": 309,
"dataId": 2003,
"relation": 2,
"outIndex": 2,
@@ -154,7 +154,7 @@
{
"warID": 4002,
"actorName": "许褚",
"actorID": 315,
"actorId": 315,
"dataId": 2004,
"relation": 2,
"outIndex": 3,
@@ -173,7 +173,7 @@
{
"warID": 4002,
"actorName": "李典",
"actorID": 312,
"actorId": 312,
"dataId": 2005,
"relation": 2,
"outIndex": 4,

20
shared/resource/warJsons/4003.json
View File

@@ -2,7 +2,7 @@
{
"warID": 4003,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 0,
@@ -21,7 +21,7 @@
{
"warID": 4003,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 1,
@@ -40,7 +40,7 @@
{
"warID": 4003,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 2,
@@ -59,7 +59,7 @@
{
"warID": 4003,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 3,
@@ -78,7 +78,7 @@
{
"warID": 4003,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 4,
@@ -97,7 +97,7 @@
{
"warID": 4003,
"actorName": "曹仁",
"actorID": 311,
"actorId": 311,
"dataId": 2001,
"relation": 2,
"outIndex": 0,
@@ -116,7 +116,7 @@
{
"warID": 4003,
"actorName": "许褚",
"actorID": 315,
"actorId": 315,
"dataId": 2002,
"relation": 2,
"outIndex": 1,
@@ -135,7 +135,7 @@
{
"warID": 4003,
"actorName": "贾诩",
"actorID": 314,
"actorId": 314,
"dataId": 2003,
"relation": 2,
"outIndex": 2,
@@ -154,7 +154,7 @@
{
"warID": 4003,
"actorName": "邓艾",
"actorID": 309,
"actorId": 309,
"dataId": 2004,
"relation": 2,
"outIndex": 3,
@@ -173,7 +173,7 @@
{
"warID": 4003,
"actorName": "李典",
"actorID": 312,
"actorId": 312,
"dataId": 2005,
"relation": 2,
"outIndex": 4,

20
shared/resource/warJsons/4004.json
View File

@@ -2,7 +2,7 @@
{
"warID": 4004,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 0,
@@ -21,7 +21,7 @@
{
"warID": 4004,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 1,
@@ -40,7 +40,7 @@
{
"warID": 4004,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 2,
@@ -59,7 +59,7 @@
{
"warID": 4004,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 3,
@@ -78,7 +78,7 @@
{
"warID": 4004,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 4,
@@ -97,7 +97,7 @@
{
"warID": 4004,
"actorName": "贾诩",
"actorID": 314,
"actorId": 314,
"dataId": 2001,
"relation": 2,
"outIndex": 0,
@@ -116,7 +116,7 @@
{
"warID": 4004,
"actorName": "曹仁",
"actorID": 311,
"actorId": 311,
"dataId": 2002,
"relation": 2,
"outIndex": 1,
@@ -135,7 +135,7 @@
{
"warID": 4004,
"actorName": "许褚",
"actorID": 315,
"actorId": 315,
"dataId": 2003,
"relation": 2,
"outIndex": 2,
@@ -154,7 +154,7 @@
{
"warID": 4004,
"actorName": "邓艾",
"actorID": 309,
"actorId": 309,
"dataId": 2004,
"relation": 2,
"outIndex": 3,
@@ -173,7 +173,7 @@
{
"warID": 4004,
"actorName": "李典",
"actorID": 312,
"actorId": 312,
"dataId": 2005,
"relation": 2,
"outIndex": 4,

20
shared/resource/warJsons/4005.json
View File

@@ -2,7 +2,7 @@
{
"warID": 4005,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 0,
@@ -21,7 +21,7 @@
{
"warID": 4005,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 1,
@@ -40,7 +40,7 @@
{
"warID": 4005,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 2,
@@ -59,7 +59,7 @@
{
"warID": 4005,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 3,
@@ -78,7 +78,7 @@
{
"warID": 4005,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 4,
@@ -97,7 +97,7 @@
{
"warID": 4005,
"actorName": "贾诩",
"actorID": 314,
"actorId": 314,
"dataId": 2001,
"relation": 2,
"outIndex": 0,
@@ -116,7 +116,7 @@
{
"warID": 4005,
"actorName": "曹仁",
"actorID": 311,
"actorId": 311,
"dataId": 2002,
"relation": 2,
"outIndex": 1,
@@ -135,7 +135,7 @@
{
"warID": 4005,
"actorName": "许褚",
"actorID": 315,
"actorId": 315,
"dataId": 2003,
"relation": 2,
"outIndex": 2,
@@ -154,7 +154,7 @@
{
"warID": 4005,
"actorName": "邓艾",
"actorID": 309,
"actorId": 309,
"dataId": 2004,
"relation": 2,
"outIndex": 3,
@@ -173,7 +173,7 @@
{
"warID": 4005,
"actorName": "李典",
"actorID": 312,
"actorId": 312,
"dataId": 2005,
"relation": 2,
"outIndex": 4,

20
shared/resource/warJsons/4006.json
View File

@@ -2,7 +2,7 @@
{
"warID": 4006,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 0,
@@ -21,7 +21,7 @@
{
"warID": 4006,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 1,
@@ -40,7 +40,7 @@
{
"warID": 4006,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 2,
@@ -59,7 +59,7 @@
{
"warID": 4006,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 3,
@@ -78,7 +78,7 @@
{
"warID": 4006,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 4,
@@ -97,7 +97,7 @@
{
"warID": 4006,
"actorName": "贾诩",
"actorID": 314,
"actorId": 314,
"dataId": 2001,
"relation": 2,
"outIndex": 0,
@@ -116,7 +116,7 @@
{
"warID": 4006,
"actorName": "曹仁",
"actorID": 311,
"actorId": 311,
"dataId": 2002,
"relation": 2,
"outIndex": 1,
@@ -135,7 +135,7 @@
{
"warID": 4006,
"actorName": "许褚",
"actorID": 315,
"actorId": 315,
"dataId": 2003,
"relation": 2,
"outIndex": 2,
@@ -154,7 +154,7 @@
{
"warID": 4006,
"actorName": "邓艾",
"actorID": 309,
"actorId": 309,
"dataId": 2004,
"relation": 2,
"outIndex": 3,
@@ -173,7 +173,7 @@
{
"warID": 4006,
"actorName": "李典",
"actorID": 312,
"actorId": 312,
"dataId": 2005,
"relation": 2,
"outIndex": 4,

20
shared/resource/warJsons/4007.json
View File

@@ -2,7 +2,7 @@
{
"warID": 4007,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 0,
@@ -21,7 +21,7 @@
{
"warID": 4007,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 1,
@@ -40,7 +40,7 @@
{
"warID": 4007,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 2,
@@ -59,7 +59,7 @@
{
"warID": 4007,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 3,
@@ -78,7 +78,7 @@
{
"warID": 4007,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 4,
@@ -97,7 +97,7 @@
{
"warID": 4007,
"actorName": "邓艾",
"actorID": 309,
"actorId": 309,
"dataId": 2001,
"relation": 2,
"outIndex": 0,
@@ -116,7 +116,7 @@
{
"warID": 4007,
"actorName": "许褚",
"actorID": 315,
"actorId": 315,
"dataId": 2002,
"relation": 2,
"outIndex": 1,
@@ -135,7 +135,7 @@
{
"warID": 4007,
"actorName": "李典",
"actorID": 312,
"actorId": 312,
"dataId": 2003,
"relation": 2,
"outIndex": 2,
@@ -154,7 +154,7 @@
{
"warID": 4007,
"actorName": "曹仁",
"actorID": 311,
"actorId": 311,
"dataId": 2004,
"relation": 2,
"outIndex": 3,
@@ -173,7 +173,7 @@
{
"warID": 4007,
"actorName": "贾诩",
"actorID": 314,
"actorId": 314,
"dataId": 2005,
"relation": 2,
"outIndex": 4,

20
shared/resource/warJsons/4008.json
View File

@@ -2,7 +2,7 @@
{
"warID": 4008,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 0,
@@ -21,7 +21,7 @@
{
"warID": 4008,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 1,
@@ -40,7 +40,7 @@
{
"warID": 4008,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 2,
@@ -59,7 +59,7 @@
{
"warID": 4008,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 3,
@@ -78,7 +78,7 @@
{
"warID": 4008,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 4,
@@ -97,7 +97,7 @@
{
"warID": 4008,
"actorName": "曹仁",
"actorID": 311,
"actorId": 311,
"dataId": 2001,
"relation": 2,
"outIndex": 0,
@@ -116,7 +116,7 @@
{
"warID": 4008,
"actorName": "贾诩",
"actorID": 314,
"actorId": 314,
"dataId": 2002,
"relation": 2,
"outIndex": 1,
@@ -135,7 +135,7 @@
{
"warID": 4008,
"actorName": "李典",
"actorID": 312,
"actorId": 312,
"dataId": 2003,
"relation": 2,
"outIndex": 2,
@@ -154,7 +154,7 @@
{
"warID": 4008,
"actorName": "许褚",
"actorID": 315,
"actorId": 315,
"dataId": 2004,
"relation": 2,
"outIndex": 3,
@@ -173,7 +173,7 @@
{
"warID": 4008,
"actorName": "邓艾",
"actorID": 309,
"actorId": 309,
"dataId": 2005,
"relation": 2,
"outIndex": 4,

20
shared/resource/warJsons/4009.json
View File

@@ -2,7 +2,7 @@
{
"warID": 4009,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 0,
@@ -21,7 +21,7 @@
{
"warID": 4009,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 1,
@@ -40,7 +40,7 @@
{
"warID": 4009,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 2,
@@ -59,7 +59,7 @@
{
"warID": 4009,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 3,
@@ -78,7 +78,7 @@
{
"warID": 4009,
"actorName": "我军",
"actorID": 0,
"actorId": 0,
"dataId": 0,
"relation": 0,
"outIndex": 4,
@@ -97,7 +97,7 @@
{
"warID": 4009,
"actorName": "邓艾",
"actorID": 309,
"actorId": 309,
"dataId": 2001,
"relation": 2,
"outIndex": 0,
@@ -116,7 +116,7 @@
{
"warID": 4009,
"actorName": "李典",
"actorID": 312,
"actorId": 312,
"dataId": 2002,
"relation": 2,
"outIndex": 1,
@@ -135,7 +135,7 @@
{
"warID": 4009,
"actorName": "贾诩",
"actorID": 314,
"actorId": 314,
"dataId": 2003,
"relation": 2,
"outIndex": 2,
@@ -154,7 +154,7 @@
{
"warID": 4009,
"actorName": "曹仁",
"actorID": 311,
"actorId": 311,
"dataId": 2004,
"relation": 2,
"outIndex": 3,
@@ -173,7 +173,7 @@
{
"warID": 4009,
"actorName": "许褚",
"actorID": 315,
"actorId": 315,
"dataId": 2005,
"relation": 2,
"outIndex": 4,