Bläddra i källkod

fixed: 圣哲学院领取奖励时同步背包.

gwang 4 år sedan
förälder
incheckning
8be45a3620

+ 1 - 1
Gameserver/Amfphp/model/User/Enum_TaskCmdType.php

@@ -14,7 +14,7 @@ class Enum_TaskCmdType extends Enum {
     const HeroSkillUnlock = 15;                                                 # 
     const HeroWearupWeapon_quality = 16;                                        # 唤灵师装备X品质的武器(num:1,paras:[herotypeId,quality])(装备界面)
     const HeroWearupYanling = 17;                                               # 唤灵师装备xx(id)言灵 (num:1,paras:[herotypeId,yanlingid])(言灵配置界面)
-    const AnyYanlingLevelUp = 18;                                               # 任意言灵等级提升(num:1,paras:[])(言灵界面)
+    const AnyYanlingLevelUp = 18;                                               # 任意言灵等级提升(num:1,paras:[])(言灵详情界面)
     // -----
     const PassGateN = 21;                                                       # 通过指定剧情关卡(num:1,paras:[关卡id,难度(1,2,3)])(跳关卡选择)
     const passCarbonN = 22;                                                     # 

+ 50 - 48
Gameserver/Amfphp/process/CollegeProc.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace loyalsoft;
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
@@ -14,25 +16,26 @@ namespace loyalsoft;
  * @author cyzhao
  */
 class CollegeProc {
-     /**
+
+    /**
      * 逻辑分发
      * 所有的Proc中必须有这样一个方法
      * @param Req $req
      */
     public static function procMain($req) {
         switch ($req->cmd) {
-            case CmdCode::cmd_college_ActiveTaskCard:                                 
+            case CmdCode::cmd_college_ActiveTaskCard:
                 return CollegeProc::ActiveTaskCard($req);
-            case CmdCode::cmd_college_ReceiveCollegeReward:                              
+            case CmdCode::cmd_college_ReceiveCollegeReward:
                 return CollegeProc::ReceiveCollegeReward($req);
-            case CmdCode::cmd_college_ReceiveCourseReward:                              
+            case CmdCode::cmd_college_ReceiveCourseReward:
                 return CollegeProc::ReceiveCourseReward($req);
-            
+
             default:
                 Err(ErrCode::cmd_err);
         }
     }
-    
+
     /**
      * 激活
      * @param Req $req
@@ -41,44 +44,44 @@ class CollegeProc {
         list($taskCardId) = $req->paras;
         $collegeInfo = $req->userInfo->game->college;
         $compMissCardDic = $collegeInfo->compMissCardDic;
-        if(!StlUtil::dictHasProperty($compMissCardDic, $taskCardId)){
+        if (!StlUtil::dictHasProperty($compMissCardDic, $taskCardId)) {
             return Resp::err(ErrCode::college_notExistTaskCard);
         }
-        
-        if($compMissCardDic->$taskCardId->type >Enum_TaskCardStateType::notopen){
+
+        if ($compMissCardDic->$taskCardId->type > Enum_TaskCardStateType::notopen) {
             return Resp::err(ErrCode::college_TaskCardStateError);
         }
-        
-        $cid = StoreProc::PutTaskCardInStore($taskCardId, $req);//存入背包
+
+        $cid = StoreProc::PutTaskCardInStore($taskCardId, $req); //存入背包
         NormalEventProc::OnTaskCard_Actived($cid, null);                # 带入事件
         $compMissCardDic->$taskCardId->indexId = $cid;
         $compMissCardDic->$taskCardId->type = Enum_TaskCardStateType::ing;
-        
+
         $taskCard = new Ins_TaskCard($req->userInfo->game->store->taskcards->$cid);          # 任务卡对象
         $taskCard->state = Enum_TaskCardStateType::ing;
-               
+
         TaskProc::OnGetSchoolTask();
         foreach ($taskCard->curSteps as &$tsp) {                                # 初期里面只有一个任务
             $tsp = new Ins_TaskStep($tsp);
             if ($tsp->isStatusType()) {                                         # 如果是道具收集类的, 扣除所收集道具
                 $tsp->autoCalcStatusCur();
             }
-        }             
+        }
         if ($taskCard->IsFinish()) {                                            # 检查是否任务卡的所有步骤都已完成
-            $taskCard->state = Enum_TaskCardStateType::finish;        
+            $taskCard->state = Enum_TaskCardStateType::finish;
             $compMissCardDic->$taskCardId->type = Enum_TaskCardStateType::finish;
             TaskProc::OnFinishSchoolTask();
             NormalEventProc::OnTaskCard_Finish($taskCard->uid, null);           # 广播卡完成事件
         }
         $req->userInfo->game->college->compMissCardDic = $compMissCardDic;
         $req->userInfo->game->store->taskcards->$cid = $taskCard;
-        UserProc::updateUserInfo();      
-        
+        UserProc::updateUserInfo();
+
         //$compMissCardDic->$taskCardId->type = 2;
-        
-        return Resp::ok(array('store' => $req->userInfo->game->store,'college'=>$req->userInfo->game->college));         # 返回值更新背包
+
+        return Resp::ok(array('store' => $req->userInfo->game->store, 'college' => $req->userInfo->game->college));         # 返回值更新背包
     }
-    
+
     /**
      * 领取一个年级的奖励
      * @param Req $req
@@ -89,26 +92,25 @@ class CollegeProc {
         $tag = true;
         $cList = explode(',', $newCollegeDic->cList);
         foreach ($cList as $cId) {
-            if(!in_array($cId,$collegeInfo->comCourseList)){
-                $tag = false; 
+            if (!in_array($cId, $collegeInfo->comCourseList)) {
+                $tag = false;
             }
         }
-        
-        if(!$tag){
-            return Resp::err(ErrCode::college_courseNumError); 
-        }                 
+
+        if (!$tag) {
+            return Resp::err(ErrCode::college_courseNumError);
+        }
         StoreProc::AddMultiItemInStore($req, GameConfig::course_getItem($collegeInfo->courseId)->prize);      # 发放奖励
-        
-        $college = new Info_College($req->userInfo->game->college);       
-        $college->updataCourseNew();  
-        
+
+        $college = new Info_College($req->userInfo->game->college);
+        $college->updataCourseNew();
+
         $req->userInfo->game->college = $college;
-        UserProc::updateUserInfo();     
-        
-        return Resp::ok(array('college'=>$req->userInfo->game->college));  
-        
+        UserProc::updateUserInfo();
+
+        return Resp::ok(array('store' => $req->userInfo->game->store, 'college' => $req->userInfo->game->college));
     }
-    
+
     /**
      * 领取课程奖励
      * @param Req $req
@@ -116,27 +118,27 @@ class CollegeProc {
     public static function ReceiveCourseReward($req) {
         //list($taskCardId) = $req->paras;
         $collegeInfo = $req->userInfo->game->college;
-               
+
         $tag = true;
         foreach ($collegeInfo->compMissCardDic as $key => $value) {
-            if($value->type != Enum_TaskCardStateType::drawed){
+            if ($value->type != Enum_TaskCardStateType::drawed) {
                 $tag = false;
                 break;
             }
         }
-        
-        if(!$tag){
-            return Resp::err(ErrCode::college_taskCardNumError); 
+
+        if (!$tag) {
+            return Resp::err(ErrCode::college_taskCardNumError);
         }
-              
+
         StoreProc::AddMultiItemInStore($req, GameConfig::course_getItem($collegeInfo->courseId)->prize);      # 发放奖励
-        
-        $college = new Info_College($req->userInfo->game->college);          
-        $college->updataCourse();                
+
+        $college = new Info_College($req->userInfo->game->college);
+        $college->updataCourse();
         $req->userInfo->game->college = $college;
-        UserProc::updateUserInfo();     
-        
-        return Resp::ok(array('college'=>$req->userInfo->game->college));  
-        
+        UserProc::updateUserInfo();
+
+        return Resp::ok(array('store' => $req->userInfo->game->store, 'college' => $req->userInfo->game->college));
     }
+
 }