商城bug修复

Gameserver/App/process/ShopProc.php

@@ -145,30 +145,32 @@ class ShopProc {
                     $tag = false;
                     if($qual == $bichu[1] && $xiyoudu == $bichu[2]){
                         $resultStr = $bichu[1].",".$bichu[2];
-                        $user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu1 = 0;
-                        $tag = true;
+                        $user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu1 = 0;                                             
+                        //$tag = true;
                     }
                     
                     if($qual == $bichu2[1] && $xiyoudu == $bichu2[2]){   
                         $resultStr = $bichu2[1].",".$bichu2[2];
                         $user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu2 = 0;
-                        $tag = true;
+                        if($user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu1 == $bichu[0]){                                                   
+                            $user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu1 = 0;
+                        }                                               
+                        //$tag = true;
                     }
                     
-                    if(!$tag){//没有得到杰出或是S级杰出
-                        if($user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu1 == $bichu[0]){
-                            //得杰出
-                            $resultStr = $bichu[1].",".$bichu[2];
-                            $user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu1 = 0;
-                        }
-                        if($user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu2 == $bichu2[0]){
-                            //得S级杰出
-                            $resultStr = $bichu2[1].",".$bichu2[2];
-                            $user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu2 = 0;
-                        }
-                        
+//                    if($tag){                                              
+//                    }
+                    
+                    if($user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu1 == $bichu[0]){                          
+                        $resultStr = $bichu[1].",".$bichu[2];//得杰出  
+                        $user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu1 = 0;
                     }
                     
+                    if($user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu2 == $bichu2[0]){                            
+                            $resultStr = $bichu2[1].",".$bichu2[2];//得S级杰出
+                            $user->privateState->junbeiShop_AllNumRecord->$typeId->num_bichu2 = 0;
+                    }
+                                                                                             
                     if($resultStr != null){
                         $str = explode(',', $resultStr);