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

关卡添加消耗品结算，奇遇的坐标改为点id

Browse Source
This commit is contained in:
luying
2020-10-20 11:38:13 +08:00
parent a96c4c4182
commit 16085ca55d
13 changed files with 8230 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/normalBattleHandler.ts
+30 -2
View File
@@ -11,6 +11,7 @@ import { getAp, setAp } from '../../../services/actionPointService';
import { setBattleStatus, startEvent } from '../../../services/eventSercive';
import { STATUS } from '../../../consts/statusCode';
import { resResult } from '../../../pubUtils/util';
import { HeroModel } from '../../../db/Hero';
export default function(app: Application) {
return new NormalBattleHandler(app);
@@ -101,7 +102,6 @@ export class NormalBattleHandler {
// 关卡结算，记录使用的武将，获得奖励
async battleEnd(msg: {battleCode: string, battleId: number, isSuccess: boolean, star: number, heroes: Array<any>, }, session: BackendSession) {
const { battleCode, battleId, isSuccess, heroes, star } = msg;
let roleId = session.get('roleId');
let roleName = session.get('roleName');
@@ -181,6 +181,12 @@ export class NormalBattleHandler {
}, true);
let { status } = updateResult;
let curHeroes = [];
for(let hid of heroes) {
let hero = await HeroModel.findByHidAndRole(hid, roleId);
curHeroes.push(hero);
}
// 主线关卡某个关卡触发事件开启
let eventStatus = session.get('eventStatus')||0;
if(battleId == EVENT_START_BATTLE && eventStatus == 0) {
@@ -194,7 +200,29 @@ export class NormalBattleHandler {
battleCode, battleId, status, towerStatus,
goods: reward, towerBonus, towerReward,
apJson,
dailyNum
dailyNum,
kingExp: warInfo.kingExp,
heroes: curHeroes,
actordata: [
{
lv : 20,
exp : 700,
getExp : 1300,
mostExp : 2000
},
{
lv : 21,
exp : 0,
getExp : 3000,
mostExp : 3000
},
{
lv : 22,
exp : 0,
getExp : 700,
mostExp : 4000,
}
]
});
}
game-server/app/services/eventSercive.ts
+5 -5
View File
@@ -129,14 +129,14 @@ export async function refreshEvent(num: number, roleId: string, roleName: string
let index = Math.floor(Math.random() * randomList.length);
let dic = randomList[index];
let position = randomPosition(dic.position);
let point = randomPosition(dic.movePointArray);
let question = dic.eventType == EVENT_TYPE.QUIZ?randomQuestion(EVENT_QUIZ_NUM): undefined;
let eventCode = genCode(8);
let data = await EventRecordModel.saveEventRecord(eventCode, {
roleId, refTime: t, eventId: dic.eventID,
roleName, turn, type: dic.eventType, battleId: dic.warId||0, quality: dic.quality,
status: EVENT_RECORD_STATUS.WAITING,
position, question
point, question
});
event.push(data);
randomList.splice(index, 1);
@@ -148,14 +148,14 @@ export async function refreshEvent(num: number, roleId: string, roleName: string
let {dic} = getRandomWithWeight(randomList);
console.log(JSON.stringify(dic))
// if(!dic) break;
let position = randomPosition(dic.position);
let point = randomPosition(dic.movePointArray);
let eventCode = genCode(8);
let question = dic.eventType == EVENT_TYPE.QUIZ?randomQuestion(EVENT_QUIZ_NUM): [];
let data = await EventRecordModel.saveEventRecord(eventCode, {
roleId, refTime: t, eventId: dic.eventID,
roleName, type: dic.eventType, battleId: dic.warId||0, quality: dic.quality,
status: EVENT_RECORD_STATUS.WAITING,
position, question
point, question
});
event.push(data)
}
@@ -165,7 +165,7 @@ export async function refreshEvent(num: number, roleId: string, roleName: string
}
function randomPosition(positionStr: string) {
let positionArr = decodeStr('position', positionStr);
let positionArr = decodeStr('point', positionStr, '&');
let index = Math.floor(Math.random() * positionArr.length);
return positionArr[index]
}
game-server/app/services/rewardService.ts
+71 -2
View File
@@ -1,5 +1,7 @@
import { GOOD_TYPE } from './../consts/consts';
import { EquipModel } from './../db/Equip';
import { ItemModel } from './../db/Item';
import { ScriptItemModel } from './../db/ScriptItem';
import { CounterModel } from './../db/Counter';
import { decodeStr } from '../pubUtils/util';
import { getGoodById } from '../pubUtils/gamedata';
@@ -18,13 +20,22 @@ export async function handleReward(roleId: string, roleName: string, rewards: Ar
let returnGoods = new Array();
for(let goods of rewards) {
let goodInfo = getGoodById(goods.gid);
let result = new Array<any>()
if(goodInfo.goodType == GOOD_TYPE.EQUIP) { // 装备
let result = await rewardWeapons(roleId, roleName, goodInfo, {id: goods.gid, cnt: goods.count });
result = await rewardWeapons(roleId, roleName, goodInfo, {id: goods.gid, cnt: goods.count });
} else if(goodInfo.goodType == GOOD_TYPE.ITEM) { // 消耗品
result = await rewardItems(roleId, roleName, goodInfo, {id: goods.gid, cnt: goods.count });
} else if(goodInfo.goodType == GOOD_TYPE.SCRIPT_ITEM) { // 剧情物品
result = await rewardScriptItems(roleId, roleName, goodInfo, {id: goods.gid, cnt: goods.count });
} else if (goodInfo.goodType == GOOD_TYPE.HERO_SOUL) { // 武将碎片
} else { // 货币
}
for(let obj of result) {
returnGoods.push({dropType: goods.type, times: goods.times, ...obj})
}
}
}
return returnGoods;
}
@@ -49,3 +60,61 @@ async function rewardWeapons (roleId: string, roleName: string, dicGood: any, w
}
return weaponsData;
}
// 消耗品
async function rewardItems (roleId: string, roleName: string, dicGood: any, data: {id:number,cnt:number }) {
let goods = new Array();
let itemcount = data.cnt;
let itemid = data.id;
let item = await ItemModel.findbyItemid(itemid, roleId);
if(item) {
let result = await ItemModel.changeItemCount(item.seqId, itemcount);
goods.push(result);
} else {
const seqId = await CounterModel.getNewCounter('itemid')||-1;
const itemInfo = {
roleId,
roleName: roleName,
itemid,
itemName: dicGood.name,
seqId,
count: itemcount,
type: dicGood.goodType
}
let result = await ItemModel.createItem(itemInfo);
goods.push(result);
}
return goods;
}
// 剧情道具
async function rewardScriptItems (roleId: string, roleName: string, dicGood: any, data: {id:number,cnt:number }) {
let goods = [];
let itemcount = data.cnt;
let itemid = data.id;
let item = await ScriptItemModel.findbyItemid(itemid, roleId);
if(item) {
let result = await ScriptItemModel.changeItemCount(item.seqId, itemcount);
goods.push(result);
} else {
const seqId = await CounterModel.getNewCounter('scriptitemid')||-1;
const itemInfo = {
roleId,
roleName: roleName,
itemid,
itemName: dicGood.name,
seqId,
count: itemcount,
type: dicGood.goodType
}
let result = await ScriptItemModel.createItem(itemInfo);
goods.push(result);
}
return goods;
}
game-server/app/services/warRewardService.ts
-1
View File
@@ -97,7 +97,6 @@ export class WarReward {
this.handleConditionReward(num);
await this.handleRandomReward(num);
console.log(this.rewards)
let returnGoods = await handleReward(this.roleId, this.roleName, this.rewards);
return returnGoods;
}
shared/consts/consts.ts
+3 -1
View File
@@ -27,7 +27,9 @@ export const BATTLE_REWARD_TYPE = {
export const GOOD_TYPE = {
EQUIP: 1,
ITEM: 2
ITEM: 2,
SCRIPT_ITEM: 3,
HERO_SOUL: 4
};
export const WAR_TYPE = {
shared/db/EventRecord.ts
+4 -4
View File
@@ -41,13 +41,13 @@ export default class EventRecord extends BaseModel {
@prop({ required: true, default: 0 })
turn: number; // 随机的轮数，保证每个event_id都能随机到一次再进行下一轮
@prop({ required: true })
position: {x:number, y: number}; // 位置
point: number; // 位置
@prop({ required: true, type: Question, default: [] })
question: Array<Question>; // 题库id
public static async getEventRecordByTime(roleId: string, refTime: number, lean=true ) {
let data = await EventRecordModel.find({roleId, refTime}).select('eventCode eventId type quality status battleId position question').lean(lean);
let data = await EventRecordModel.find({roleId, refTime}).select('eventCode eventId type quality status battleId point question').lean(lean);
return data;
}
@@ -68,10 +68,10 @@ export default class EventRecord extends BaseModel {
return data;
}
public static async saveEventRecord(eventCode: string, params: {roleId: string, refTime: number, eventId: number, roleName:string, turn?: number, type: number, quality: number, battleId?: number, status: number, position: {x:number, y:number}, question: Array<any> } , lean=true ) {
public static async saveEventRecord(eventCode: string, params: {roleId: string, refTime: number, eventId: number, roleName:string, turn?: number, type: number, quality: number, battleId?: number, status: number, point: number, question: Array<any> } , lean=true ) {
let doc = new EventRecordModel();
let update = Object.assign(doc.toJSON(), params, {eventCode});
let data = await EventRecordModel.findOneAndUpdate({eventCode}, { $set: update }, {upsert: true, new: true}).select('eventCode eventId type quality status battleId position question').lean(lean);
let data = await EventRecordModel.findOneAndUpdate({eventCode}, { $set: update }, {upsert: true, new: true}).select('eventCode eventId type quality status battleId point question').lean(lean);
return data;
}
shared/db/HeroSoul.ts
+51
View File
@@ -0,0 +1,51 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
@index({ roleId: 1, hid: 1 })
@index({ seqId: 1 })
export default class HeroSoul extends BaseModel {
@prop({ required: true })
roleId: string; // 角色 id
@prop({ required: true })
roleName: string; // 角色名称
@prop({ required: true })
itemid: number; // 道具 id
@prop({ required: true })
itemName: string; // 道具名称
@prop({ required: true })
hid: number; // 武将 id
@prop({ required: true })
hName: string; // 武将名称
@prop({ required: true })
seqId: number; // 将魂表自增 id
@prop({ required: true, default: 0 })
count: number; // 道具数量
public static async findbyRole(roleId: string, lean = true) {
const items = await HeroSoulModel.find({ roleId }).lean(lean);
return items;
}
public static async findbyItemid(itemid: number, roleId: string, lean = true) {
const equips = await HeroSoulModel.findOne({ itemid, roleId }).lean(lean);
return equips;
}
public static async changeItemCount(seqId: number, count: number, lean = true) {
const equips = await HeroSoulModel.findOneAndUpdate({ seqId }, {$inc:{count}}).lean(lean);
return equips;
}
public static async createItem(itemInfo: {roleId: string, roleName: string, itemid: number, seqId: number, itemName: string, count: number}, lean = true) {
const doc = new HeroSoulModel();
const update = Object.assign(doc.toJSON(), itemInfo);
const item = await HeroSoulModel.findOneAndUpdate({ seqId: itemInfo.seqId }, update, {upsert: true, new: true}).lean(lean);
return item;
}
}
export const HeroSoulModel = getModelForClass(HeroSoul);
shared/db/Item.ts
+5 -3
View File
@@ -2,7 +2,7 @@ import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
@index({ roleId: 1, hid: 1, itemid: 1 })
@index({ roleId: 1, itemid: 1 })
@index({ seqId: 1 })
export default class Item extends BaseModel {
@prop({ required: true })
@@ -13,6 +13,8 @@ export default class Item extends BaseModel {
@prop({ required: true })
itemid: number; // 道具 id
@prop({ required: true })
type: number; // 装备类型
@prop({ required: true })
itemName: string; // 道具名称
@prop({ required: true })
seqId: number; // 道具表自增 id
@@ -31,11 +33,11 @@ export default class Item extends BaseModel {
}
public static async changeItemCount(seqId: number, count: number, lean = true) {
const equips = await ItemModel.findOneAndUpdate({ seqId }, {$inc:{count}}).lean(lean);
const equips = await ItemModel.findOneAndUpdate({ seqId }, {$inc:{count}}, {upsert: true, new: true}).lean(lean);
return equips;
}
public static async createItem(itemInfo: {roleId: string, roleName: string, itemid: number, seqId: number, itemName: string, count: number}, lean = true) {
public static async createItem(itemInfo: {roleId: string, roleName: string, itemid: number, seqId: number, itemName: string, count: number, type: number}, lean = true) {
const doc = new ItemModel();
const update = Object.assign(doc.toJSON(), itemInfo);
const item = await ItemModel.findOneAndUpdate({ seqId: itemInfo.seqId }, update, {upsert: true, new: true}).lean(lean);
shared/db/ScriptItem.ts
+49
View File
@@ -0,0 +1,49 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
@index({ roleId: 1, itemid: 1 })
@index({ seqId: 1 })
export default class ScriptItem extends BaseModel {
@prop({ required: true })
roleId: string; // 角色 id
@prop({ required: true })
roleName: string; // 角色名称
@prop({ required: true })
itemid: number; // 道具 id
@prop({ required: true })
type: number; // 装备类型
@prop({ required: true })
itemName: string; // 道具名称
@prop({ required: true })
seqId: number; // 道具表自增 id
@prop({ required: true, default: 0 })
count: number; // 道具数量
public static async findbyRole(roleId: string, lean = true) {
const items = await ScriptItemModel.find({ roleId }).lean(lean);
return items;
}
public static async findbyItemid(itemid: number, roleId: string, lean = true) {
const equips = await ScriptItemModel.findOne({ itemid, roleId }).lean(lean);
return equips;
}
public static async changeItemCount(seqId: number, count: number, lean = true) {
const equips = await ScriptItemModel.findOneAndUpdate({ seqId }, {$inc:{count}}, {upsert: true, new: true}).lean(lean);
return equips;
}
public static async createItem(itemInfo: {roleId: string, roleName: string, itemid: number, seqId: number, itemName: string, count: number, type: number}, lean = true) {
const doc = new ScriptItemModel();
const update = Object.assign(doc.toJSON(), itemInfo);
const item = await ScriptItemModel.findOneAndUpdate({ seqId: itemInfo.seqId }, update, {upsert: true, new: true}).lean(lean);
return item;
}
}
export const ScriptItemModel = getModelForClass(ScriptItem);
shared/pubUtils/util.ts
+7 -7
View File
@@ -14,11 +14,11 @@ const moment = require('moment');
return code;
}
export function decodeStr(type, str) {
export function decodeStr(type, str, splitForm='|') {
if(str == '&'|| !str) {
return []
} else {
return str.split('|').map(cur => {
return str.split(splitForm).map(cur => {
return decodeStrSingle(type,cur);
});
};
@@ -29,7 +29,7 @@ const moment = require('moment');
return {}
} else {
let arr = str.split('&');
let result = {};
let result: any;
switch (type) {
case 'fixReward': {
let [gid, count] = arr;
@@ -61,10 +61,10 @@ const moment = require('moment');
result = { id: parseInt(id), value: parseInt(value) };
break;
}
case 'position': {
let [x, y] = arr;
if(isNaN(x) || isNaN(y)) throw new Error('data table format wrong');
result = { x: parseInt(x), y: parseInt(y) };
case 'point': {
let [x] = arr;
if(isNaN(x)) throw new Error('data table format wrong');
result = x;
break;
}
}
shared/resource/jsons/dic_goods.json
+7138 -1
View File
File diff suppressed because one or more lines are too long
shared/resource/jsons/dic_zyz_event.json
+144 -180
View File
@@ -5,17 +5,16 @@
"quality": 1,
"name": "天降宝箱*铜币",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "1&20",
"warId": 0,
"weight": 1,
"position": "1&3|2&4",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "&",
"loseDialogue": "&",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -30,17 +29,16 @@
"quality": 1,
"name": "天降宝箱*元宝",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "1&20",
"warId": 0,
"weight": 1,
"position": "1&3|2&5",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "&",
"loseDialogue": "&",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -55,17 +53,16 @@
"quality": 1,
"name": "天降宝箱*材料",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "1&20",
"warId": 0,
"weight": 1,
"position": "1&3|2&6",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "&",
"loseDialogue": "&",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -80,17 +77,16 @@
"quality": 1,
"name": "答题*体力",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "1&20",
"warId": 0,
"weight": 1,
"position": "1&3|2&7",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -105,17 +101,16 @@
"quality": 1,
"name": "答题*将魂",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "1&20",
"warId": 0,
"weight": 1,
"position": "1&3|2&8",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -130,17 +125,16 @@
"quality": 1,
"name": "答题*经验书",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "1&20",
"warId": 0,
"weight": 1,
"position": "1&3|2&9",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -155,17 +149,16 @@
"quality": 1,
"name": "山贼拦路*待定",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "1&20",
"warId": 2001,
"weight": 1,
"position": "1&3|2&10",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -180,17 +173,16 @@
"quality": 1,
"name": "救援村落*待定",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "1&20",
"warId": 2002,
"weight": 1,
"position": "1&3|2&11",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -205,17 +197,16 @@
"quality": 1,
"name": "比武切磋*待定",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "1&20",
"warId": 2003,
"weight": 1,
"position": "1&3|2&12",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -230,17 +221,16 @@
"quality": 1,
"name": "天降宝箱*铜币2",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "21&40",
"warId": 0,
"weight": 1,
"position": "1&3|2&13",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -255,17 +245,16 @@
"quality": 2,
"name": "天降宝箱*元宝2",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "21&40",
"warId": 0,
"weight": 1,
"position": "1&3|2&14",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -280,17 +269,16 @@
"quality": 2,
"name": "天降宝箱*材料2",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "21&40",
"warId": 0,
"weight": 1,
"position": "1&3|2&15",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -305,17 +293,16 @@
"quality": 2,
"name": "答题*体力2",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "21&40",
"warId": 0,
"weight": 1,
"position": "1&3|2&16",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -330,17 +317,16 @@
"quality": 2,
"name": "答题*将魂2",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "21&40",
"warId": 0,
"weight": 1,
"position": "1&3|2&17",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -355,17 +341,16 @@
"quality": 2,
"name": "答题*经验书2",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "21&40",
"warId": 0,
"weight": 1,
"position": "1&3|2&18",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -380,17 +365,16 @@
"quality": 2,
"name": "山贼拦路*待定2",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "21&40",
"warId": 2001,
"weight": 1,
"position": "1&3|2&19",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -405,17 +389,16 @@
"quality": 2,
"name": "救援村落*待定2",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "21&40",
"warId": 2002,
"weight": 1,
"position": "1&3|2&20",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -430,17 +413,16 @@
"quality": 2,
"name": "比武切磋*待定2",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "21&40",
"warId": 2003,
"weight": 1,
"position": "1&3|2&21",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -455,17 +437,16 @@
"quality": 3,
"name": "天降宝箱*铜币3",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "41&100",
"warId": 0,
"weight": 2,
"position": "1&3|2&22",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -480,17 +461,16 @@
"quality": 3,
"name": "天降宝箱*元宝3",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "41&100",
"warId": 0,
"weight": 2,
"position": "1&3|2&23",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -505,17 +485,16 @@
"quality": 3,
"name": "天降宝箱*材料3",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "41&100",
"warId": 0,
"weight": 2,
"position": "1&3|2&24",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -530,17 +509,16 @@
"quality": 3,
"name": "答题*体力3",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "41&100",
"warId": 0,
"weight": 2,
"position": "1&3|2&25",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -555,17 +533,16 @@
"quality": 3,
"name": "答题*将魂3",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "41&100",
"warId": 0,
"weight": 2,
"position": "1&3|2&26",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -580,17 +557,16 @@
"quality": 3,
"name": "答题*经验书3",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "41&100",
"warId": 0,
"weight": 2,
"position": "1&3|2&27",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -605,17 +581,16 @@
"quality": 3,
"name": "山贼拦路*待定3",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "41&100",
"warId": 2001,
"weight": 2,
"position": "1&3|2&28",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -630,17 +605,16 @@
"quality": 3,
"name": "救援村落*待定3",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "41&100",
"warId": 2002,
"weight": 2,
"position": "1&3|2&29",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -655,17 +629,16 @@
"quality": 3,
"name": "比武切磋*待定3",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "41&100",
"warId": 2003,
"weight": 2,
"position": "1&3|2&30",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -680,17 +653,16 @@
"quality": 4,
"name": "天降宝箱*铜币4",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "61&100",
"warId": 0,
"weight": 4,
"position": "1&3|2&31",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -705,17 +677,16 @@
"quality": 4,
"name": "天降宝箱*元宝4",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "61&100",
"warId": 0,
"weight": 4,
"position": "1&3|2&32",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -730,17 +701,16 @@
"quality": 4,
"name": "天降宝箱*材料4",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "61&100",
"warId": 0,
"weight": 4,
"position": "1&3|2&33",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -755,17 +725,16 @@
"quality": 4,
"name": "答题*体力4",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "61&100",
"warId": 0,
"weight": 4,
"position": "1&3|2&34",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -780,17 +749,16 @@
"quality": 4,
"name": "答题*将魂4",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "61&100",
"warId": 0,
"weight": 4,
"position": "1&3|2&35",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -805,17 +773,16 @@
"quality": 4,
"name": "答题*经验书4",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "61&100",
"warId": 0,
"weight": 4,
"position": "1&3|2&36",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -830,17 +797,16 @@
"quality": 4,
"name": "山贼拦路*待定4",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "61&100",
"warId": 2001,
"weight": 4,
"position": "1&3|2&37",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -855,17 +821,16 @@
"quality": 4,
"name": "救援村落*待定4",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "61&100",
"warId": 2002,
"weight": 4,
"position": "1&3|2&38",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
@@ -880,17 +845,16 @@
"quality": 4,
"name": "比武切磋*待定4",
"sSpineInUI": 0,
"rScriptId": 0,
"winReward": 0,
"loseReward": 0,
"suitLevel": "61&100",
"warId": 2003,
"weight": 4,
"position": "1&3|2&39",
"movePointArray": "26&27&28&29",
"startDialogue": "1&2",
"winDialogue": "1&2",
"loseDialogue": "1&2",
"__EMPTY": 0,
"__EMPTY_1": 0,
"__EMPTY_2": 0,
"__EMPTY_3": 0,
"fobiddenCharactor": 0,
"victoryInfoInUI": 0,
"loseInfoInUI": 0,
shared/resource/jsons/dic_zyz_gk_main.json
+1 -1
View File
@@ -4,7 +4,7 @@
"dispatchJsonId": 101,
"bg_img_id": 101,
"script_id": 101,
"fixReward": "1&2",
"fixReward": "1&2|10001&3",
"conditionReward": "2&1&1|1&1&0",
"randomReward": "3&1&5",
"warType": 1,