|
@@ -134,10 +134,10 @@ class ActiveProc {
|
|
|
$tag = true;
|
|
|
}
|
|
|
if ($n == 10 && $tag == false && $shenmiaoInfo->activeDic->$type->totalNum > 10) {
|
|
|
- $list[] = self::getActiveRandomItem(Enum_ActiveItemType::Ssr, $shenmo); //self::randSsrUr($shenmo->per)
|
|
|
+ $list[] = self::getActiveRandomItem(Enum_ActiveItemType::Sr, $shenmo); //self::randSsrUr($shenmo->per)
|
|
|
} else {
|
|
|
if ($shenmiaoInfo->activeDic->$type->totalNum <= 10) {
|
|
|
- $itemType = Enum_ActiveItemType::Sr;
|
|
|
+ $itemType = Enum_ActiveItemType::R;
|
|
|
}
|
|
|
$nId = self::getActiveRandomItem($itemType, $shenmo);
|
|
|
$list[] = $nId;
|
|
@@ -208,11 +208,11 @@ class ActiveProc {
|
|
|
$aid = self::getActiveRandomItem_3($itemType, $shenmo, $type); //随机出的id
|
|
|
}
|
|
|
|
|
|
- if ($shenmiaoInfo->activeDic->$type->num % glc()->Active_UR_Num == 0 && $itemType != Enum_ActiveItemType::Ur) {
|
|
|
+ if ($shenmiaoInfo->activeDic->$type->num % glc()->Active_UR_Num == 0 && $itemType != Enum_ActiveItemType::Ssr) {
|
|
|
if ($type == Enum_Active::OpenWish) {
|
|
|
- $aid = self::getActiveRandomItem(Enum_ActiveItemType::Ur, $shenmo);
|
|
|
+ $aid = self::getActiveRandomItem(Enum_ActiveItemType::Ssr, $shenmo);
|
|
|
} else {
|
|
|
- $aid = self::getActiveRandomItem_3(Enum_ActiveItemType::Ur, $shenmo, $type);
|
|
|
+ $aid = self::getActiveRandomItem_3(Enum_ActiveItemType::Ssr, $shenmo, $type);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -239,9 +239,9 @@ class ActiveProc {
|
|
|
}
|
|
|
if ($n == 10 && $tag == false) {
|
|
|
if ($type == Enum_Active::OpenWish) {
|
|
|
- $list[] = self::getActiveRandomItem(Enum_ActiveItemType::Ssr, $shenmo); //self::randSsrUr($shenmo->per)
|
|
|
+ $list[] = self::getActiveRandomItem(Enum_ActiveItemType::Sr, $shenmo); //self::randSsrUr($shenmo->per)
|
|
|
} else {
|
|
|
- $list[] = self::getActiveRandomItem_3(Enum_ActiveItemType::Ssr, $shenmo, $type);
|
|
|
+ $list[] = self::getActiveRandomItem_3(Enum_ActiveItemType::Sr, $shenmo, $type);
|
|
|
}
|
|
|
} else {
|
|
|
if ($type == Enum_Active::OpenWish) {
|
|
@@ -253,9 +253,9 @@ class ActiveProc {
|
|
|
}
|
|
|
if ($shenmiaoInfo->activeDic->$type->totalNum >= glc()->Active_UR_Num) {//第90次必得
|
|
|
if ($type == Enum_Active::OpenWish) {
|
|
|
- $aid = self::getActiveRandomItem(Enum_ActiveItemType::Ur, $shenmo);
|
|
|
+ $aid = self::getActiveRandomItem(Enum_ActiveItemType::Ssr, $shenmo);
|
|
|
} else {
|
|
|
- $aid = self::getActiveRandomItem_3(Enum_ActiveItemType::Ur, $shenmo, $type);
|
|
|
+ $aid = self::getActiveRandomItem_3(Enum_ActiveItemType::Ssr, $shenmo, $type);
|
|
|
}
|
|
|
$list[0] = $aid;
|
|
|
$shenmiaoInfo->activeDic->$type->totalNum = 0;
|
|
@@ -343,16 +343,16 @@ class ActiveProc {
|
|
|
public static function getActiveRandomItem($type, $mo) {
|
|
|
$id = 0;
|
|
|
switch ($type) {
|
|
|
+ case Enum_ActiveItemType::R:
|
|
|
+ $id = self::prizeTypeRand($mo->rList);
|
|
|
+ //$id = self::randList(explode(',', $mo->srList));
|
|
|
+ break;
|
|
|
case Enum_ActiveItemType::Sr:
|
|
|
$id = self::prizeTypeRand($mo->srList);
|
|
|
- //$id = self::randList(explode(',', $mo->srList));
|
|
|
+ //$id = self::randList(explode(',', $mo->ssrList));
|
|
|
break;
|
|
|
case Enum_ActiveItemType::Ssr:
|
|
|
$id = self::prizeTypeRand($mo->ssrList);
|
|
|
- //$id = self::randList(explode(',', $mo->ssrList));
|
|
|
- break;
|
|
|
- case Enum_ActiveItemType::Ur:
|
|
|
- $id = self::prizeTypeRand($mo->urList);
|
|
|
//$id = self::randList(explode(',', $mo->urList));
|
|
|
break;
|
|
|
default:
|
|
@@ -372,14 +372,14 @@ class ActiveProc {
|
|
|
|
|
|
$id = 0;
|
|
|
switch ($type) {
|
|
|
- case Enum_ActiveItemType::Sr:
|
|
|
- $id = self::prizeTypeRand($mo->srList);
|
|
|
+ case Enum_ActiveItemType::R:
|
|
|
+ $id = self::prizeTypeRand($mo->rList);
|
|
|
//$id = self::randList(explode(',', $mo->srList));
|
|
|
break;
|
|
|
- case Enum_ActiveItemType::Ssr:
|
|
|
- if ($mo->ssrUp != null) {
|
|
|
+ case Enum_ActiveItemType::Sr:
|
|
|
+ if ($mo->srUp != null) {
|
|
|
$dic = new \stdClass();
|
|
|
- $ssrList = explode(';', $mo->ssrUp);
|
|
|
+ $ssrList = explode(';', $mo->srUp);
|
|
|
|
|
|
$tNum = 0;
|
|
|
foreach ($ssrList as $val) {
|
|
@@ -415,7 +415,7 @@ class ActiveProc {
|
|
|
}
|
|
|
if ($sNum >= $count) { //随机到普通的id
|
|
|
$shenmiaoInfo->activeDic->$activeType->isUpSsr = 1;
|
|
|
- $id = self::prizeTypeRand($mo->ssrList);
|
|
|
+ $id = self::prizeTypeRand($mo->srList);
|
|
|
//$id = self::randList(explode(',', $mo->ssrList));
|
|
|
break;
|
|
|
}
|
|
@@ -423,14 +423,14 @@ class ActiveProc {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- $id = self::prizeTypeRand($mo->ssrList);
|
|
|
+ $id = self::prizeTypeRand($mo->srList);
|
|
|
//$id = self::randList(explode(',', $mo->ssrList));
|
|
|
}
|
|
|
break;
|
|
|
- case Enum_ActiveItemType::Ur:
|
|
|
- if ($mo->ssrUp != null) {
|
|
|
+ case Enum_ActiveItemType::Ssr:
|
|
|
+ if ($mo->srUp != null) {
|
|
|
$dic = new \stdClass();
|
|
|
- $urList = explode(';', $mo->urUp);
|
|
|
+ $urList = explode(';', $mo->ssrUp);
|
|
|
$tNum = 0;
|
|
|
foreach ($urList as $val) {
|
|
|
$sList = explode(',', $val);
|
|
@@ -466,7 +466,7 @@ class ActiveProc {
|
|
|
}
|
|
|
if ($sNum >= $count) {
|
|
|
$shenmiaoInfo->activeDic->$activeType->isUpUr = 1;
|
|
|
- $id = self::prizeTypeRand($mo->urList);
|
|
|
+ $id = self::prizeTypeRand($mo->ssrList);
|
|
|
//$id = self::randList(explode(',', $mo->urList));
|
|
|
break;
|
|
|
}
|
|
@@ -475,7 +475,7 @@ class ActiveProc {
|
|
|
}
|
|
|
} else {
|
|
|
//$id = self::randList(explode(',', $mo->urList));
|
|
|
- $id = self::prizeTypeRand($mo->urList);
|
|
|
+ $id = self::prizeTypeRand($mo->ssrList);
|
|
|
}
|
|
|
break;
|
|
|
default:
|