From c282ece109dd987633b3aaf3da67ac226c05938e Mon Sep 17 00:00:00 2001
From: xcy <871622040@qq.com>
Date: Mon, 18 Dec 2023 20:08:27 +0800
Subject: [PATCH] Revert "feat:"

This reverts commit e99b5dad155cd87e3c2c0c5acb1522a2aa4a7695.
---
 src/public/fight.ts    |  2 +-
 src/public/pushgift.ts | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/public/fight.ts b/src/public/fight.ts
index c2388b5..c13c029 100644
--- a/src/public/fight.ts
+++ b/src/public/fight.ts
@@ -118,7 +118,7 @@ export class FightFun {
 
         // 主线 爬塔 战败触发推送礼包
         if (result.winSide != 0 && ["tanxian", "pata"].includes(type)) {
-            PushGiftFun.chkLoseGift(call.uid)
+            PushGiftFun.chkLoseGift(data[0].player.uid)
         }
         return result
     }
diff --git a/src/public/pushgift.ts b/src/public/pushgift.ts
index 22fb397..e003088 100644
--- a/src/public/pushgift.ts
+++ b/src/public/pushgift.ts
@@ -54,7 +54,7 @@ export class PushGiftFun {
         let gift_ids = [];
         for (let id in G.gc.tuisonglibao) {
             let conf = G.gc.tuisonglibao[id];
-            if (conf.type == PushGiftType.LvGift && conf.num[0] == lv) {
+            if (conf.type == PushGiftType.LevelGift && conf.num[0] == lv) {
                 gift_ids.push(id);
             }
         }
@@ -157,23 +157,17 @@ export class PushGiftFun {
         // 购买礼包
         let gift;
         for (let gift_id in G.gc.tuisonglibao) {
-            let temp = G.gc.tuisonglibao[gift_id];
-            if (temp.payId.includes(payId)) {
-                gift = temp;
-                break
-            }
+            gift = G.gc.tuisonglibao[gift_id];
+            if (gift.payId.includes(payId)) break;
         }
-        if (!gift) return;
         let index = gift.payId.indexOf(payId);
         let info = await G.mongodb.collection("pushgift").findOne({
             uid: uid, id: gift.id.toString()
         })
         if (info.passTime >= G.time) {
-            await G.mongodb.collection("pushgift").updateOne({
+            G.mongodb.collection("pushgift").updateOne({
                 uid: uid, id: gift.id.toString()
             }, {$inc: {[`buy.${index}`]: 1}})
-            // 推送客户端消息
-            G.server.sendMsgByUid(uid, "msg_s2c/PushGiftChange", 1);
         }
     }
 }
\ No newline at end of file