活动：每日兑换铜币活动

game-server/app/services/dailyCoinService.ts

@@ -0,0 +1,59 @@
+import { ACTIVITY_TYPE, DAILY_MEAL_TYPE } from '../consts';
+import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityDailyCoinModel, ActivityDailyCoinModelType } from '../db/ActivityDailyCoin';
+import { ServerlistModel } from '../db/Serverlist';
+import { DailyCoinData } from '../domain/activityField/dailyCoinField';
+
+
+/**
+   * 获取活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function dailyCoinActivity(serverId: number, roleId: string) {
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.DAILY_COIN, new Date());
+    if (activityDataArray.length === 0) {
+        return null;
+    }
+    let activityData: ActivityModelType = activityDataArray[0];
+    let playerData = new DailyCoinData(activityData);
+
+    let playerRecord: ActivityDailyCoinModelType = await ActivityDailyCoinModel.findData(serverId, activityData.activityId, roleId, playerData.beginTime);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
+}
+
+
+/**
+   * 玩家玩家活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerDailyCoinData(activityId: number, serverId: number, roleId: string) {
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
+    let playerData = new DailyCoinData(activityData);
+
+    let playerRecord: ActivityDailyCoinModelType = await ActivityDailyCoinModel.findData(serverId, activityData.activityId, roleId, playerData.beginTime);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
+}
+
+export function mergeData(data: any[]) {
+    let newDate = [];
+    for (let item of data) {
+        let index = newDate.findIndex(obj => { return obj.id === item.id });
+        if (index != -1) {
+            newDate[index].count += item.count;
+        } else {
+            newDate = newDate.concat(item);
+        }
+    }
+    return newDate;
+}

game-server/app/services/giftPackageService.ts

@@ -22,6 +22,7 @@ export async function useGiftPackage(roleId: string, roleName: string, sid: stri
     if (!giftPackageData) {
         return result
     }
+    console.log('dddddddddddddd', giftID, JSON.stringify(giftPackageData))
     let giftType = giftPackageData.type;//礼包类型
     let reward = giftPackageData.reward;//奖励内容,数组
     switch (giftType) {
@@ -100,6 +101,8 @@ function rewardItemData(reward: Array<RewardParam>) {
 }
 
 export function getSelectedReward(giftData: DicGiftPackage, selected: Array<number>): Array<RewardParam> {
+    console.log('bbbbbbbbbbbbbbbbbbb', JSON.stringify(selected), JSON.stringify(giftData))
+
     let selectedReward: Array<RewardParam> = [];
     for (let i = 0; i < selected.length; i++) {
         let index = selected[i];

game-server/app/services/selfServiceShopActivityService.ts

@@ -1,13 +1,13 @@
-import { ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE, REFRESH_TIME, STATUS } from '../consts';
+import { ACTIVITY_TYPE, REFRESH_TIME, STATUS } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivitySelfServiceGoodsModel, ActivitySelfServiceGoodsModelType } from '../db/ActivitySelfServiceGoods';
 import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../db/ActivitySelfServiceShop';
-import { ActivitySelfServiceModel, ActivitySelfServiceModelType } from '../db/ActivitySelfService';
+import { ActivitySelfServiceModel } from '../db/ActivitySelfService';
 import { ServerlistModel } from '../db/Serverlist';
 import { RewardParam } from '../domain/activityField/rewardField';
 import { SelfServiceShopData, SelfServiceShopItem } from '../domain/activityField/selfServiceShopField';
 import { gameData } from '../pubUtils/data';
-import { addReward, getSelectedReward } from './giftPackageService';
+import { addReward, getSelectedReward, stringToRewardParam } from './giftPackageService';
 import moment = require('moment');
 
 /**
@@ -57,11 +57,9 @@ export async function getPlayerActivityData(activityId: number, serverId: number
         challengeBeginTime = moment(new Date()).startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').toDate();
         challengeEndTime = moment(challengeBeginTime).add(1, 'd').toDate()
     } else {
-        console.log("dddddddddddddddd", curDate.hour(), curDate.hours())
         challengeBeginTime = moment(new Date()).startOf('d').add(REFRESH_TIME, 'h').toDate();
         challengeEndTime = moment(challengeBeginTime).add(1, 'd').toDate()
     }
-    console.log("dddddddddddddddd", challengeBeginTime, challengeEndTime)
     let records = (playerSelfServerData && playerSelfServerData.challengeRecords) ? playerSelfServerData.challengeRecords : [];
     for (let record of records) {
         console.log(challengeBeginTime, challengeEndTime, record.time)
@@ -85,16 +83,17 @@ export async function getPlayerActivityData(activityId: number, serverId: number
    * @param {number} priceType 价格类型
    *
    */
-export async function addSelfServiceShopGiftReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], activityId: number, roundIndex: number, index: number) {
+
+export async function addSelfServiceShopGiftReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], activityId: number, roundIndex: number, index: number, item: SelfServiceShopItem) {
     let playerGoods: ActivitySelfServiceGoodsModelType[] = await ActivitySelfServiceGoodsModel.findDataByIndex(activityId, roleId, roundIndex, index);
 
     let rewardArray: Array<RewardParam> = [];
     for (let obj of playerGoods) {
-        let giftID = obj.gift;
         let selectedIndex = obj.rewardIndex;
-        let giftPackageData = gameData.giftPackage.get(giftID);
-        let selectedReward: Array<RewardParam> = getSelectedReward(giftPackageData, [selectedIndex])
-        rewardArray = rewardArray.concat(selectedReward)
+        let cellIndex = obj.cellIndex;
+        let giftData = item.findCellIndex(cellIndex);
+        let rewards: Array<RewardParam> = stringToRewardParam(giftData.gift);
+        rewardArray = rewardArray.concat(rewards[selectedIndex])
     }
     let goodsStr = '';
     for (let obj of rewardArray) {
@@ -102,7 +101,7 @@ export async function addSelfServiceShopGiftReward(roleId: string, roleName: str
     }
     let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray);
     //购买记录
-    console.log('dddddddd', rewardArray.length, serverId, activityId, roleId, roundIndex, index, goodsStr)
+    console.log('dddddddd', rewardArray.length, serverId, activityId, roleId, roundIndex, index, goodsStr, JSON.stringify(item))
     await ActivitySelfServiceShopModel.addBuyRecord(serverId, activityId, roleId, roundIndex, index, goodsStr);
     return result
 }
@@ -141,7 +140,7 @@ export async function makeSelfServerShop(roleId: string, roleName: string, sid:
             }
         }
     }
-    let result = await addSelfServiceShopGiftReward(roleId, roleName, sid, serverId, funcs, activityId, playerData.roundIndex, item.index);
+    let result = await addSelfServiceShopGiftReward(roleId, roleName, sid, serverId, funcs, activityId, playerData.roundIndex, item.index, item);
     item.buyCount += 1;
     return {
         code: 0,