抽卡：添加抽卡接口

game-server/app/services/eventSercive.ts

@@ -6,6 +6,7 @@ import { genCode, decodeStrSingle, decodeStr, getRandomWithWeight, resResult } f
 import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_TYPE, EVENT_RANDOM_TYPE_ONE_OPEN, EVENT_QUIZ_NUM, EVENT_ANSWER_STATUS, FUNCS_ID } from '../consts';
 import { EVENT_REFRESH_NUM } from '../consts';
 import { STATUS } from '../consts/statusCode';
+import { gameData } from '../pubUtils/data';
 
 /**
  * 从检查接口调用，检查是否有这么个战斗，顺便保存一下battleCode
@@ -193,7 +194,7 @@ export async function refreshEvent(num: number, roleId: string, roleName: string
     }).map(cur => cur.point);
 
     let event = new Array();
-    let dicEvent = getGamedata('dic_zyz_event');
+    let dicEvent = gameData.eventList;
     let role = await RoleModel.findByRoleId(roleId);
     dicEvent = dicEvent.filter(cur => { // 筛选适合等级
         let { suitLevel } = cur;
@@ -268,8 +269,7 @@ export async function refreshEvent(num: number, roleId: string, roleName: string
  * 
  * @param positionStr 
  */
-function randomPosition(positionStr: string, prePoint: Array<number>, curPoint: Array<number>) {
-    let positionArr = decodeStr('point', positionStr, '&');
+function randomPosition(positionArr: number[], prePoint: Array<number>, curPoint: Array<number>) {
     let range = positionArr.filter(point => {return !prePoint.includes(point) && !curPoint.includes(point)});
     if(range.length == 0) { // 如果位置总数不够，就不管prePoint里的
         range = positionArr.filter(point => {return !curPoint.includes(point)});