From 703a128811f4e60c9660435c2dedd726b4d3d823 Mon Sep 17 00:00:00 2001
From: qiaoxin <qiaoxin@bantus.cn>
Date: Thu, 17 Jun 2021 17:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/activity/handler/dailyGKHandler.ts | 14 +++++++-------
 .../servers/activity/handler/refreshShopHandler.ts |  2 +-
 shared/consts/constModules/activityConst.ts        |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/game-server/app/servers/activity/handler/dailyGKHandler.ts b/game-server/app/servers/activity/handler/dailyGKHandler.ts
index 403db2b42..bc95b41d4 100644
--- a/game-server/app/servers/activity/handler/dailyGKHandler.ts
+++ b/game-server/app/servers/activity/handler/dailyGKHandler.ts
@@ -61,16 +61,16 @@ export class DailyGKHandler {
         if (!dailyItemData) {
             return resResult(STATUS.ACTIVITY_DATA_ERROR);
         }
-        if (dailyItemData.isSuccess) {//已经达成
-            return resResult(STATUS.ACTIVITY_REWARDED);
-        }
+        // if (dailyItemData.isSuccess) {//已经达成
+        //     return resResult(STATUS.ACTIVITY_REWARDED);
+        // }
 
-        await ActivityDailyGKModel.addRecord(serverId, activityId, roleId, dayIndex);
+        // await ActivityDailyGKModel.addRecord(serverId, activityId, roleId, dayIndex);
 
-        let rewardParamArr: Array<RewardParam> = stringToRewardParam(dailyItemData.reward);
-        let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
+        // let rewardParamArr: Array<RewardParam> = stringToRewardParam(dailyItemData.reward);
+        // let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
 
-        dailyItemData.isSuccess = true;
+        // dailyItemData.isSuccess = true;
         return resResult(STATUS.SUCCESS, {
             gkId: dailyItemData.gk
         });
diff --git a/game-server/app/servers/activity/handler/refreshShopHandler.ts b/game-server/app/servers/activity/handler/refreshShopHandler.ts
index b30f3ac09..6a12278cd 100644
--- a/game-server/app/servers/activity/handler/refreshShopHandler.ts
+++ b/game-server/app/servers/activity/handler/refreshShopHandler.ts
@@ -29,7 +29,7 @@ export class RefreshShopHandler {
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
 
-        let playerData = await getRefreshShopActivity(serverId, roleId);
+        let playerData = await getPlayerRefreshShopData(activityId, serverId, roleId);
         if (!playerData) {
             return resResult(STATUS.ACTIVITY_MISSING);
         }
diff --git a/shared/consts/constModules/activityConst.ts b/shared/consts/constModules/activityConst.ts
index 3c3d1ae29..3bb5e18d6 100644
--- a/shared/consts/constModules/activityConst.ts
+++ b/shared/consts/constModules/activityConst.ts
@@ -47,6 +47,7 @@ export enum ACTIVITY_TYPE {
     DAILY_GK = 32, // 每日关卡（每日开启一关）
     REFRESH_SHOP = 33, // 通用的刷新商店（分页，可刷新，限制购买次数，支持rmb与资源兑换）
     REFRESH_TASK = 34, // 通用的刷新任务（分页，可刷新，限制领取次数）
+    MONOPOLY = 35, //大富翁游戏
 }
 
 /**