cyzhao 6 місяців тому
батько
коміт
e1b2f017bf

+ 7 - 10
Gameserver/App/process/FightProc.php

@@ -620,12 +620,9 @@ class FightProc {
 
         if ($tag) {
             my_Assert(!in_array($mask, $gateInfo->FirstReward), ErrCode::gate_GatePriceHasReceive);
-            $gateInfo->FirstReward[] = $mask;
+            $gateInfo->FirstReward[] = $mask;                 
             StoreProc::AddMultiItemInStore($prize);
-            
-            if(count(StoreProc::$reward_equip) > 0){
-                self::funUnlock_equip_firstTime();
-            }
+                       
         }
         ctx()->gates->GateList->$gateId = $gateInfo;
         TaskProc::OnReceiveGateBoxReward();
@@ -720,9 +717,9 @@ class FightProc {
             $reward = StoreProc::Distribute_Rewards($waveMo->rewardItem);
             StoreProc::AddMultiItemInStore($reward);
             
-            if(count(StoreProc::$reward_equip) > 0){
-                self::funUnlock_equip_firstTime();
-            }
+//            if(count(StoreProc::$reward_equip) > 0){
+//                self::funUnlock_equip_firstTime();
+//            }
         }
 
         # 图纸奖励: 数量min-max, 部位随机
@@ -876,11 +873,11 @@ class FightProc {
         foreach ($dic as $id => $mo) {
             $tag = false;
             if ($mo->unlockTip == 1) {//$mo->unlockGateId == $gateId
-                if ($mo->unlockType1 != null && $mo->unlockType1 == Enum_FunUnlockType::equip_firstTime && ctx()->store->equip == null) {
+                if ($mo->unlockType1 != null && $mo->unlockType1 == Enum_FunUnlockType::equip_firstTime && count(StlUtil::dictToArray(ctx()->store->equip)) == 0) {
                     $tag = true;
                 }
 
-                if ($mo->unlockType2 != null && $mo->unlockType2 == Enum_FunUnlockType::equip_firstTime && ctx()->store->equip == null) {
+                if ($mo->unlockType2 != null && $mo->unlockType2 == Enum_FunUnlockType::equip_firstTime && count(StlUtil::dictToArray(ctx()->store->equip)) == 0) {
                     $tag = true;
                 }
             }

+ 1 - 1
Gameserver/App/process/ShopProc.php

@@ -369,7 +369,7 @@ class ShopProc {
             }
         }
         //TaskProc::OnOpenNumBrightBox_state($typeId, $buyNum);
-        FightProc::funUnlock_equip_firstTime();
+        //FightProc::funUnlock_equip_firstTime();
     }
 
     /**

+ 1 - 0
Gameserver/App/process/StoreProc.php

@@ -1199,6 +1199,7 @@ class StoreProc {
                         $equip = self::initEquip($itemId);
                         $uid = $equip->uid;
                         ctx()->store(true)->equip->$uid = $equip;
+                        FightProc::funUnlock_equip_firstTime();
                         self::$reward_equip[] = $uid;
                     }
                     break;