|
@@ -172,9 +172,9 @@ class ActiveProc {
|
|
|
StoreProc::removeItemFromStore($req->userInfo->game->store,$sList[0],$sList[1]);
|
|
|
|
|
|
$itemType = self::activeRandom($shenmo->per, $shenmo);
|
|
|
- $aid =self::getActiveRandomItem_3($itemType, $shenmo);//随机出的id
|
|
|
+ $aid =self::getActiveRandomItem_3($itemType, $shenmo,$type);//随机出的id
|
|
|
if($shenmiaoInfo->activeDic->$type->num% glc()->Active_UR_Num == 0){
|
|
|
- $aid =self::getActiveRandomItem_3(Enum_ActiveItemType::Ur, $shenmo);
|
|
|
+ $aid =self::getActiveRandomItem_3(Enum_ActiveItemType::Ur, $shenmo,$type);
|
|
|
$list[] = $aid;
|
|
|
} else {
|
|
|
$list[] = $aid;
|
|
@@ -194,14 +194,14 @@ class ActiveProc {
|
|
|
$tag = true;
|
|
|
}
|
|
|
if($n==10 && $tag == false){
|
|
|
- $list[] =self::getActiveRandomItem_3(self::randSsrUr($shenmo->per), $shenmo);
|
|
|
+ $list[] =self::getActiveRandomItem_3(self::randSsrUr($shenmo->per), $shenmo,$type);
|
|
|
} else {
|
|
|
- $list[] =self::getActiveRandomItem_3($itemType, $shenmo);
|
|
|
+ $list[] =self::getActiveRandomItem_3($itemType, $shenmo,$type);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if($shenmiaoInfo->activeDic->$type->totalNum >= glc()->Active_UR_Num){//第90次必得
|
|
|
- $aid =self::getActiveRandomItem_3(Enum_ActiveItemType::Ur, $shenmo);
|
|
|
+ $aid =self::getActiveRandomItem_3(Enum_ActiveItemType::Ur, $shenmo,$type);
|
|
|
$list[0] = $aid;
|
|
|
$shenmiaoInfo->activeDic->$type->totalNum = 0;
|
|
|
}
|
|
@@ -285,7 +285,7 @@ class ActiveProc {
|
|
|
* @param sm_shenmiao $mo
|
|
|
* @return type
|
|
|
*/
|
|
|
- public static function getActiveRandomItem_3($type,$mo) {
|
|
|
+ public static function getActiveRandomItem_3($type,$mo,$activeType) {
|
|
|
$shenmiaoInfo = req()->userInfo->game->shenmiao;
|
|
|
|
|
|
$id = 0;
|
|
@@ -306,7 +306,7 @@ class ActiveProc {
|
|
|
$tNum += $sList[1];
|
|
|
}
|
|
|
|
|
|
- if($shenmiaoInfo->activeDic->$type->isUpSsr == 1){
|
|
|
+ if($shenmiaoInfo->activeDic->$activeType->isUpSsr == 1){
|
|
|
$rand = rand(1,$tNum);
|
|
|
$start = 0;
|
|
|
foreach ($dic as $k=>$val) {
|
|
@@ -317,7 +317,7 @@ class ActiveProc {
|
|
|
}
|
|
|
$start = $end;
|
|
|
}
|
|
|
- $shenmiaoInfo->activeDic->$type->isUpSsr = 0;
|
|
|
+ $shenmiaoInfo->activeDic->$activeType->isUpSsr = 0;
|
|
|
} else {
|
|
|
$rand = rand(1,10000);
|
|
|
$start = 0;
|
|
@@ -327,7 +327,7 @@ class ActiveProc {
|
|
|
$id = $k;
|
|
|
break;
|
|
|
} else {//随机到普通的id
|
|
|
- $shenmiaoInfo->activeDic->$type->isUpSsr = 1;
|
|
|
+ $shenmiaoInfo->activeDic->$activeType->isUpSsr = 1;
|
|
|
$id = self::randList(explode(',', $mo->ssrList));
|
|
|
break;
|
|
|
}
|
|
@@ -350,7 +350,7 @@ class ActiveProc {
|
|
|
$tNum += $sList[1];
|
|
|
}
|
|
|
|
|
|
- if($shenmiaoInfo->activeDic->$type->isUpUr == 1){
|
|
|
+ if($shenmiaoInfo->activeDic->$activeType->isUpUr == 1){
|
|
|
$rand = rand(1,$tNum);
|
|
|
$start = 0;
|
|
|
foreach ($dic as $k=>$val) {
|
|
@@ -361,7 +361,7 @@ class ActiveProc {
|
|
|
}
|
|
|
$start = $end;
|
|
|
}
|
|
|
- $shenmiaoInfo->activeDic->$type->$isUpUr = 0;
|
|
|
+ $shenmiaoInfo->activeDic->$activeType->$isUpUr = 0;
|
|
|
} else {
|
|
|
$rand = rand(1,10000);
|
|
|
$start = 0;
|
|
@@ -371,7 +371,7 @@ class ActiveProc {
|
|
|
$id = $k;
|
|
|
break;
|
|
|
} else {
|
|
|
- $shenmiaoInfo->activeDic->$type->isUpUr = 1;
|
|
|
+ $shenmiaoInfo->activeDic->$activeType->isUpUr = 1;
|
|
|
$id = self::randList(explode(',', $mo->urList));
|
|
|
break;
|
|
|
}
|