装备奖励返回

Gameserver/App/process/ActiveProc.php

@@ -163,6 +163,7 @@ class ActiveProc {
                     "store" => ctx()->store,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
                     'gold' => ctx()->baseInfo->gold,
                     'cash' => ctx()->baseInfo->cash,
                     'lotteryNum' => ctx()->privateState->lotteryNum,
@@ -349,6 +350,7 @@ class ActiveProc {
                     'heros' => ctx()->heros,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
         ));
     }
 
@@ -405,6 +407,7 @@ class ActiveProc {
                     'privateState' => ctx()->privateState,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
         ));
     }
 
@@ -481,6 +484,7 @@ class ActiveProc {
                     'privateState' => ctx()->privateState,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
         ));
     }
     
@@ -546,6 +550,7 @@ class ActiveProc {
                     'privateState' => ctx()->privateState,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
         ));
     }
 

Gameserver/App/process/EmailProc.php

@@ -191,6 +191,7 @@ class EmailProc {
 
         $reward = implode(';', StoreProc::$reward);
         $reward_Gem = implode(',', StoreProc::$reward_Gem);
+        $reward_equip = implode(',', StoreProc::$reward_equip);
 
         self::logMailDrawed(array($mailId), $uid, $zoneid);                     # 更新数据库中邮件的领取记录
 
@@ -204,6 +205,7 @@ class EmailProc {
                     //'reward' => $mail->appendix
                     'reward' => $reward,
                     'reward_Gem' => $reward_Gem,
+                    'reward_equip' => $reward_equip,
                     'redTip' => $tag,
                     'funUnlockRecord' => ctx()->privateState->funUnlockRecord,
                     'funUnlockRecord_2' => ctx()->privateState->funUnlockRecord_2,
@@ -259,6 +261,7 @@ class EmailProc {
         //$reward = implode(';', $arr);                                           # 拼接下奖励字符串
         $reward = implode(';', StoreProc::$reward);
         $reward_Gem = implode(',', StoreProc::$reward_Gem);
+        $reward_equip = implode(',', StoreProc::$reward_equip);
         $tag = self::IsExistRedTip();
 
         UserProc::updateUserInfo();
@@ -269,6 +272,7 @@ class EmailProc {
                     'num' => $n,
                     'reward' => $reward,
                     'reward_Gem' => $reward_Gem,
+                    'reward_equip' => $reward_equip,
                     'redTip' => $tag,
                     'funUnlockRecord' => ctx()->privateState->funUnlockRecord,
                     'funUnlockRecord_2' => ctx()->privateState->funUnlockRecord_2,

Gameserver/App/process/FightProc.php

@@ -190,6 +190,7 @@ class FightProc {
                     'store' => ctx()->store,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
         ));
     }
 
@@ -338,6 +339,7 @@ class FightProc {
             'task' => ctx()->task,
             'reward' => StoreProc::$reward,
             'reward_Gem' => StoreProc::$reward_Gem,
+            'reward_equip' => StoreProc::$reward_equip,
             'oldLevel' => $oldLevel,
             'newLevel' => $newLevel,
         );
@@ -642,6 +644,7 @@ class FightProc {
             'cash' => ctx()->baseInfo->cash,
             'reward' => StoreProc::$reward,
             'reward_Gem' => StoreProc::$reward_Gem,
+            'reward_equip' => StoreProc::$reward_equip,
             'funUnlockRecord' => ctx()->privateState->funUnlockRecord,
             'funUnlockRecord_2' => ctx()->privateState->funUnlockRecord_2,
         );
@@ -780,6 +783,7 @@ class FightProc {
             //'rewardStr' => $pickups
             'reward' => StoreProc::$reward,
             'reward_Gem' => StoreProc::$reward_Gem,
+            'reward_equip' => StoreProc::$reward_equip,
             'oldLevel' => $oldLevel,
             'newLevel' => $newLevel,
             //'funUnlockRecord' => ctx()->privateState->funUnlockRecord,
@@ -1700,9 +1704,9 @@ class FightProc {
         foreach ($equipDic as $index => $ins_equip) {
             $ins_Equip = new Ins_Equip($ins_equip);
             if ($ins_Equip->mo()->position % 2 == 1) {
-                $attck += GameConfig::equip_levelupgrade_getItem($ins_Equip->mo()->rarity, $ins_Equip->qual . $ins_Equip->mo()->position, $ins_Equip->level)->attckNum;
+                $attck += GameConfig::equip_levelupgrade_getItem($ins_Equip->mo()->rarity, $ins_Equip->qual, $ins_Equip->mo()->position, $ins_Equip->level)->attckNum;
             } elseif ($ins_Equip->mo()->position % 2 == 0) {
-                $hp += GameConfig::equip_levelupgrade_getItem($ins_Equip->mo()->rarity, $ins_Equip->qual . $ins_Equip->mo()->position, $ins_Equip->level)->hpNum;
+                $hp += GameConfig::equip_levelupgrade_getItem($ins_Equip->mo()->rarity, $ins_Equip->qual,$ins_Equip->mo()->position, $ins_Equip->level)->hpNum;
             }
         }
 

Gameserver/App/process/PayProc.php

@@ -108,6 +108,7 @@ class PayProc {
                     'privateState' => ctx()->privateState,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
         ));
     }
 
@@ -1027,6 +1028,7 @@ class PayProc {
                     'privateState' => ctx()->privateState,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
         ));
     }
 

Gameserver/App/process/ShopProc.php

@@ -146,6 +146,7 @@ class ShopProc {
                     'heros' => ctx()->heros,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
         ));
     }
     

Gameserver/App/process/TaskProc.php

@@ -114,6 +114,7 @@ class TaskProc {
                     "store" => ctx()->store,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
                     'gold' => ctx()->baseInfo->gold,
                     'cash' => ctx()->baseInfo->cash,
                     'heros' => ctx()->heros,
@@ -158,6 +159,7 @@ class TaskProc {
                     "store" => ctx()->store,
                     "reward" => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
                     'gold' => ctx()->baseInfo->gold,
                     'cash' => ctx()->baseInfo->cash,
                     'heros' => ctx()->heros,
@@ -226,6 +228,7 @@ class TaskProc {
                     "store" => ctx()->store,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'reward_equip' => StoreProc::$reward_equip,
                     'gold' => ctx()->baseInfo->gold,
                     'cash' => ctx()->baseInfo->cash,
                     'heros' => ctx()->heros,