宠物合成bug修复

Gameserver/App/model/Const/sm_gate_chapter.php

@@ -38,5 +38,10 @@ class sm_gate_chapter
     */
     public $desc;
 
+    /**
+    * @var Int32 解锁所需通关关卡ID  
+    */
+    public $unlockGateId;
+
 }
 

Gameserver/App/process/PetProc.php

@@ -699,7 +699,14 @@ class PetProc {
                 my_Assert(StlUtil::dictHasProperty($petDic, $pUid), ErrCode::user_store_NotExistPet);
 
                 my_Assert(ctx()->store(true)->petUid_fight_position != $pUid, ErrCode::user_store_NotSelectPet_fight);
-                my_Assert(!in_array($pUid, ctx()->store(true)->petUids_supportFight_position), ErrCode::user_store_NotSelectPet_supportfight);
+                $supportDic = ctx()->store(true)->petUids_supportFight_position;
+                if(StlUtil::dictHasProperty($supportDic, 1)){
+                    my_Assert($pUid != $supportDic[1], ErrCode::user_store_NotSelectPet_supportfight);
+                }
+                if(StlUtil::dictHasProperty($supportDic, 2)){
+                    my_Assert($pUid != $supportDic[2], ErrCode::user_store_NotSelectPet_supportfight);
+                }
+                
                 
                 $costIns_pet = new Ins_Pet($petDic->$pUid);
                 my_Assert($costIns_pet->qual == $costQual, ErrCode::user_store_equipMaterialQualErr);