Merge branch 'dev' of http://ylsjtt.game7000.com:3000/YLSJ/jzhj2024server into dev

Gameserver/App/process/FightProc.php

@@ -220,7 +220,7 @@ class FightProc {
                 $posId = rand(1, 6);
                 $qual = $list[0];
                 foreach ($dic as $key => $gemMo) {
-                    if ($gemMo->qual == $qual && $gemMo->position == $posId) {
+                    if ($gemMo->qual == $qual && $gemMo->position == $posId && $gemMo->isfixed_predicateId == 0) {
                         $gemStr = $gemMo->typeId . ',' . $list[1];
 
                         SystemProc::GetGem_GreaterOrangeQual_SweepMainGateIndex(req()->zoneid, ctx()->baseInfo->name, Ins_GateInfo::gateNum($passGateId), $gateName, $gemMo->typeId);

Gameserver/App/process/ShopProc.php

@@ -282,7 +282,7 @@ class ShopProc {
                         $gemDic = GameConfig::gem();
                         $gemList = array();
                         foreach ($gemDic as $key => $value) {
-                            if ($value->qual == $qual) {
+                            if ($value->qual == $qual && $value->isfixed_predicateId == 0) {
                                 $gemList[] = $value;
                             }
                         }

Gameserver/App/process/StoreProc.php

@@ -474,7 +474,7 @@ class StoreProc {
                 $composeQual = $synthesisList[1];
                 $composeNum = $synthesisList[2];
 
-                if ($composeQual != 0 && $composePosition != 0 && $composeQual == $qual && $posId == $composePosition) {
+                if ($composeQual != 0 && $composePosition != 0 && $composeQual == $qual && $posId == $composePosition && $value->isfixed_predicateId == 0) {
                     return $value;
                 }
             }