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

game-server/app/servers/battle/handler/normalBattleHandler.ts

@@ -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

@@ -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

@@ -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,11 +20,20 @@ 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 });
-            for(let obj of result) {
+        } else if(goodInfo.goodType == GOOD_TYPE.ITEM) { // 消耗品
-                returnGoods.push({dropType: goods.type, times: goods.times, ...obj})
+            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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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': {
+        case 'point': {
-          let [x, y] = arr;
+          let [x] = arr;
-          if(isNaN(x) || isNaN(y)) throw new Error('data table format wrong');
+          if(isNaN(x)) throw new Error('data table format wrong');
-          result = { x: parseInt(x), y: parseInt(y) };
+          result = x;
           break;
         }
       }

shared/resource/jsons/dic_zyz_gk_main.json

@@ -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,