新将活动：活动格式

shared/domain/activityField/newHeroGiftField.ts

@@ -2,37 +2,75 @@ import { ActivityModelType } from '../../db/Activity';
 import { ActivityNewHeroGiftModelType } from '../../db/ActivityNewHeroGift';
 import { ActivityBase } from './activityField';
 
-// 礼包的内容
-export class NewHeroGiftItem {
-    index: number;             // 下标
-    reward: string;         //任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品
-    countMax: number = 0;   //可购买的最大次数，0表示不限制
-    name: string;           //名字
-    consumePoint: number;   //消耗点数
+/******* 存在数据库里的数据 *******/
+interface NewHeroGiftExplain {
+    index: number;
+    explain: string;
+}
 
-    buyCount: number = 0;   //兑换过的次数
+interface NewHeroGiftRewardInDb {
+    index: number;     // 下标
+    cover: string;     // 翻牌背面的图片文件名
+    reward: string;    // 奖励 type&id&count
+    countMax: number;  // 最多抽出次数
+}
 
-    constructor(data: any) {
+interface NewHeroGiftDataInDb {
+    hid: number;           // 左侧的立绘武将
+    position: string;      // 位置 x&y
+    explain: NewHeroGiftExplain[];     // 玩法说明
+    rewards: NewHeroGiftRewardInDb[];  // 奖励
+    consumePoint: number;   // 每转一次消耗的点数
+}
+
+/******* 返回给客户端的数据 *******/
+class NewHeroGiftReward {
+    index: number;     // 下标
+    cover: string;     // 翻牌背面的图片文件名
+    reward: string;    // 奖励 type&id&count
+    countMax: number;  // 最多抽出次数
+    buyCount: number = 0;  // 转出的次数
+
+    constructor(data: NewHeroGiftRewardInDb) {
         this.index = data.index;
+        this.cover = data.cover;
         this.reward = data.reward;
         this.countMax = data.countMax;
-        this.name = data.name;
-        this.consumePoint = data.consumePoint;
-        this.buyCount = 0;
+    }
+
+    addBuyCount() {
+        this.buyCount++;
     }
 }
 
-// 新将礼包数据
 export class NewHeroGiftData extends ActivityBase {
-    name: string = '';//活动名称
-    list: Array<NewHeroGiftItem> = [];//礼包列表
-    totalPoint: number = 0;//获得总点数
-    consumeTotalPoint: number = 0;//消耗总点数
-    explain: { index: number, explain: string }[] = [];//客户端用的说明文字信息
+    hid: number;           // 左侧的立绘武将
+    position: string;      // 位置 x&y
+    consumePoint: number;   // 每转一次消耗的点数
+    explain: NewHeroGiftExplain[];     // 玩法说明
+    rewards: NewHeroGiftReward[] = [];               // 奖励
+
+    totalPoint: number = 0;    // 已获得的点数
+    consumeTotalPoint: number = 0; // 总消耗的点数
+
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
+        this.initData(activityData.data)
+    }
+
+    public initData(data: string) {
+        let dataObj: NewHeroGiftDataInDb = JSON.parse(data);
+        this.hid = dataObj.hid;
+        this.position = dataObj.position;
+        this.explain = dataObj.explain
+        let arr = dataObj.rewards||[];
+        for (let obj of arr) {
+            this.rewards.push(new NewHeroGiftReward(obj))
+        }
+    }
 
     public findItem(index: number) {
-        let itemIndex = this.list.findIndex(obj => { return obj && obj.index === index });
-        return (itemIndex != -1) ? this.list[itemIndex] : null;
+        return this.rewards.find(obj => { return obj && obj.index === index });
     }
 
     //解析玩家购买记录
@@ -40,32 +78,13 @@ export class NewHeroGiftData extends ActivityBase {
         if (!data) {
             return;
         }
-        this.totalPoint = data.totalPoint ? data.totalPoint : 0;
-        let records = data.records ? data.records : [];
-        for (let item of this.list) {
-            let buyRecords = records.filter(obj => { return obj && obj.index === item.index });
-            item.buyCount = buyRecords.length;
-        }
+        this.totalPoint = data.totalPoint||0;
+        let records = data.records||[];
         for (let obj of records) {
+            let item = this.findItem(obj.index);
+            if(item) item.addBuyCount();
             this.consumeTotalPoint += obj.point;
         }
     }
 
-
-    public initData(data: string) {
-        let dataObj = JSON.parse(data);
-        this.name = dataObj.name;
-        this.totalPoint = 0;
-        this.consumeTotalPoint = 0;
-        this.explain = dataObj.explain;
-        let arr = dataObj.data;
-        for (let obj of arr) {
-            this.list.push(new NewHeroGiftItem(obj))
-        }
-    }
-
-    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
-        super(activityData, createTime, serverTime)
-        this.initData(activityData.data)
-    }
 }