世界boss未领取奖励邮件合并

Gameserver/App/process/FightProc.php

@@ -1948,11 +1948,40 @@ class FightProc {
 
         $userInfo = UserProc::getUserGame(req()->zoneid, $uid);
         $worldBoss_received = $userInfo->privateState->worldBoss_received;
+        $dic = new \stdClass();
         foreach ($demageList as $dMo) {
             if ($demageVal >= $dMo->demageValId && !in_array($dMo->demageValId, $worldBoss_received)) {
-                EmailProc::SendWorldBossDamageRewardMail(req()->zoneid, $uid, $dMo->reward);
+                if($dMo->reward != null){
+                    $list = explode(';', $dMo->reward);
+                    foreach ($list as $value) {
+                        $arr = explode(',', $value);
+                        $rewardId = $arr[0];
+                        $rewardNum = $arr[1];
+                        if(StlUtil::dictHasProperty($dic, $rewardId)){
+                            $dic->$rewardId += $rewardNum;
+                        } else {
+                            $dic->$rewardId = $rewardNum;
+                        }
+                    }
+                }
+                
+                
             }
         }
+        
+        $str = '';
+        foreach ($dic as $k => $val) {
+            $s = $k.','.$val;
+            if($str == ''){
+                $str = $s;
+            } else {
+                $str = $str.';'.$s; 
+            }           
+        }
+       
+        if($str != null){
+            EmailProc::SendWorldBossDamageRewardMail(req()->zoneid, $uid,$str);
+        }
     }
 
     /**