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

Gameserver/App/process/StoreProc.php

@@ -418,7 +418,7 @@ class StoreProc {
                 for ($i = 1; $i <=5; $i++) {
                     if(!StlUtil::dictHasProperty($dic, $i)){
                         $dic->$i = $ins_gem;                       
-                        StlUtil::dictRemove($user->store->gemStore, $uid);
+                        //StlUtil::dictRemove($user->store->gemStore, $uid);
                         break;
                     }
                 }
@@ -428,29 +428,30 @@ class StoreProc {
                 //满不满都高替低品阶
                 my_Assert(StlUtil::dictHasProperty($dic, $replaceUId), ErrCode::user_store_NoExistGemReplace);
                 $replace_ins_Gem = new Ins_Gem($dic->$replaceUId); //这个uid是5个坑位的index id
-                my_Assert($replace_ins_Gem->mo()->qual < $ins_gem->mo()->qual, ErrCode::user_store_NoExistGemReplace);
-                $id = $replace_ins_Gem->uid;
-                $user->store->gemStore->$id = $replace_ins_Gem;
+                my_Assert($replace_ins_Gem->mo()->qual < $ins_gem->mo()->qual, ErrCode::user_store_NoExistGemReplace);              
                 $dic->$replaceUId = $ins_gem;
-                StlUtil::dictRemove($user->store->gemStore, $uid);
+                
+//                $id = $replace_ins_Gem->uid;
+//                $user->store->gemStore->$id = $replace_ins_Gem;
+//                $dic->$replaceUId = $ins_gem;
+//                StlUtil::dictRemove($user->store->gemStore, $uid);
                 //$user->store->gemEquip->$pag->$posId = $dic;
                 break;
             case 3://手动
                 my_Assert(count((array)$dic)>=5, ErrCode::user_store_GemCanotSet);                
                 my_Assert(StlUtil::dictHasProperty($dic, $replaceUId), ErrCode::user_store_NoExistGemReplace);
                 $replace_ins_Gem = new Ins_Gem($dic->$replaceUId);
-                $id = $replace_ins_Gem->uid;
+                //$id = $replace_ins_Gem->uid;
                 if($tag_gem != null){//如果有u那
                     my_Assert($replace_ins_Gem->uid == $tag_gem->uid, ErrCode::user_store_SameGemCanotEquip); //点的不是u一样的，则提示同一件装备无法镶嵌多个技能相同的宝石 【错误】
                     //有U一样的，则点击正好是这个直接替换                  
-                    $user->store->gemStore->$id = $replace_ins_Gem;
-                    $dic->$replaceUId = $ins_gem;  
-                   
+                    //$user->store->gemStore->$id = $replace_ins_Gem;
+                    $dic->$replaceUId = $ins_gem;                   
                 } else {
-                    $user->store->gemStore->$id = $replace_ins_Gem;
+                    //$user->store->gemStore->$id = $replace_ins_Gem;
                     $dic->$replaceUId = $ins_gem;   
                 }                
-                StlUtil::dictRemove($user->store->gemStore, $uid);
+                //StlUtil::dictRemove($user->store->gemStore, $uid);
                 break;
             case 4://不能
                 //1.小品阶替大品阶  或是  相等的，在不满的时候不允许    2. //满的  相等不允许替                      
@@ -495,10 +496,9 @@ class StoreProc {
         }
         
         if($tag_index >0 && $tag_gem != null){          
-            StlUtil::dictRemove($posDic->$tag_pos, $tag_index);
-            
+            StlUtil::dictRemove($posDic->$tag_pos, $tag_index);           
             $user->store->gemEquip->$pag = $posDic;
-            $user->store->gemStore->$uid = $tag_gem;
+            //$user->store->gemStore->$uid = $tag_gem;
         }
         ctx($user);
         UserProc::updateUserInfo();

Gameserver/App/process/TaskProc.php

@@ -79,26 +79,26 @@ class TaskProc {
      * 初始化成就信息
      */
     public static function initAchieveData() {
-        $dic = GameConfig::achieve_new();
-        if($dic == null){
-            return;
-        }
-        
-        $achieveDic = ctx()->task->achieveDic;
-        if(count((array)$achieveDic) > 0){
-            return;
-        }
-        
-        foreach ($dic as $key => $value) {
-            $item = new Ins_Achieve();
-            $typeId = $value->typeId;
-            $item->typeId = $typeId;
-            $item->cmd = $value->cmd;
-            //$item->max = explode(',', $value->condition)[0];
-            $item->max = $value->num;
-            $achieveDic->$typeId = $item;
-        }
-        ctx()->task->achieveDic = $achieveDic;
+//        $dic = GameConfig::achieve_new();
+//        if($dic == null){
+//            return;
+//        }
+//        
+//        $achieveDic = ctx()->task->achieveDic;
+//        if(count((array)$achieveDic) > 0){
+//            return;
+//        }
+//        
+//        foreach ($dic as $key => $value) {
+//            $item = new Ins_Achieve();
+//            $typeId = $value->typeId;
+//            $item->typeId = $typeId;
+//            $item->cmd = $value->cmd;
+//            //$item->max = explode(',', $value->condition)[0];
+//            $item->max = $value->num;
+//            $achieveDic->$typeId = $item;
+//        }
+//        ctx()->task->achieveDic = $achieveDic;
     }
     
     //检测成就条件