cyzhao 9 сар өмнө
parent
commit
7d00544e71

+ 1 - 0
Gameserver/App/model/User/Enum_ActiveTaskCmdType.php

@@ -35,6 +35,7 @@ class Enum_ActiveTaskCmdType extends Enum {
     
     
     const SetSpecialQualGem = 401;       //镶嵌3个普通品质以上宝石 
     const SetSpecialQualGem = 401;       //镶嵌3个普通品质以上宝石 
     const ComposeNumGem = 402;       //合成宝石2次
     const ComposeNumGem = 402;       //合成宝石2次
+    const ComposeNumGem_state = 403;       //合成宝石2次 状态
     
     
     const AnySkillUpLevel_X = 501;       //任意1个法术等级达到2  
     const AnySkillUpLevel_X = 501;       //任意1个法术等级达到2  
     
     

+ 1 - 1
Gameserver/App/model/User/Info_Store.php

@@ -58,7 +58,7 @@ class Info_Store extends Object_ext {
      */
      */
     //public $equipPosition = null;
     //public $equipPosition = null;
     
     
-    
+    public $gemComposeNum = 0;
     
     
     public function initialize() {
     public function initialize() {
         
         

+ 3 - 1
Gameserver/App/model/User/Ins_TaskStep_Active.php

@@ -96,7 +96,7 @@ class Ins_TaskStep_Active extends Object_ext {
                 || $this->mo()->cmd == Enum_ActiveTaskCmdType::PassMainChallengeGate_X_Num || $this->mo()->cmd == Enum_ActiveTaskCmdType::CompleteNumQiLing || $this->mo()->cmd == Enum_ActiveTaskCmdType::CompleteNumSpecialQiLing #
                 || $this->mo()->cmd == Enum_ActiveTaskCmdType::PassMainChallengeGate_X_Num || $this->mo()->cmd == Enum_ActiveTaskCmdType::CompleteNumQiLing || $this->mo()->cmd == Enum_ActiveTaskCmdType::CompleteNumSpecialQiLing #
                 || $this->mo()->cmd == Enum_ActiveTaskCmdType::FightGate_X || $this->mo()->cmd == Enum_ActiveTaskCmdType::PassGate_X_state || $this->mo()->cmd == Enum_ActiveTaskCmdType::CloseSkill ||$this->mo()->cmd == Enum_ActiveTaskCmdType::FightRankPrize_Num  #
                 || $this->mo()->cmd == Enum_ActiveTaskCmdType::FightGate_X || $this->mo()->cmd == Enum_ActiveTaskCmdType::PassGate_X_state || $this->mo()->cmd == Enum_ActiveTaskCmdType::CloseSkill ||$this->mo()->cmd == Enum_ActiveTaskCmdType::FightRankPrize_Num  #
                 || $this->mo()->cmd == Enum_ActiveTaskCmdType::BuyGold || $this->mo()->cmd == Enum_ActiveTaskCmdType::OnReceiveTaskPrize || $this->mo()->cmd == Enum_ActiveTaskCmdType::FightSweepGate || $this->mo()->cmd == Enum_ActiveTaskCmdType::OpenNumBrightBox_state #
                 || $this->mo()->cmd == Enum_ActiveTaskCmdType::BuyGold || $this->mo()->cmd == Enum_ActiveTaskCmdType::OnReceiveTaskPrize || $this->mo()->cmd == Enum_ActiveTaskCmdType::FightSweepGate || $this->mo()->cmd == Enum_ActiveTaskCmdType::OpenNumBrightBox_state #
-                || $this->mo()->cmd == Enum_ActiveTaskCmdType::BuyNumDailyShop_state #               
+                || $this->mo()->cmd == Enum_ActiveTaskCmdType::BuyNumDailyShop_state || $this->mo()->cmd == Enum_ActiveTaskCmdType::ComposeNumGem_state #               
                 ;
                 ;
     }
     }
 
 
@@ -120,6 +120,8 @@ class Ins_TaskStep_Active extends Object_ext {
         }
         }
 
 
         switch ($mo->cmd) {
         switch ($mo->cmd) {
+            case Enum_ActiveTaskCmdType::ComposeNumGem_state:
+                return ctx()->store->gemComposeNum;
             case Enum_ActiveTaskCmdType::BuyNumDailyShop_state:
             case Enum_ActiveTaskCmdType::BuyNumDailyShop_state:
                 $arr = ctx()->privateState->dailyShopReceived;
                 $arr = ctx()->privateState->dailyShopReceived;
                 $num = 0;
                 $num = 0;

+ 4 - 0
Gameserver/App/process/StoreProc.php

@@ -418,9 +418,13 @@ class StoreProc {
         $resultArr = array();
         $resultArr = array();
         foreach ($composeArr as $value) {           
         foreach ($composeArr as $value) {           
             SystemProc::GetGem_GreaterOrangeQual_GemCompose(req()->zoneid, ctx()->baseInfo->name, $value->typeId);//广播
             SystemProc::GetGem_GreaterOrangeQual_GemCompose(req()->zoneid, ctx()->baseInfo->name, $value->typeId);//广播
+            ctx()->store->gemComposeNum += 1;
             $resultArr[] = $value->uid;
             $resultArr[] = $value->uid;
         }
         }
+        
+        
         TaskProc::OnComposeNumGem();
         TaskProc::OnComposeNumGem();
+        TaskProc::OnComposeNumGem_state();
         ctx($user);
         ctx($user);
         UserProc::updateUserInfo();
         UserProc::updateUserInfo();
         return Resp::ok(array(
         return Resp::ok(array(

+ 8 - 0
Gameserver/App/process/TaskProc.php

@@ -554,6 +554,14 @@ class TaskProc {
         self::CheckActiveTaskConditions($taskEventArg);
         self::CheckActiveTaskConditions($taskEventArg);
     }
     }
 
 
+    /**
+     * 合成宝石2次
+     */
+    static function OnComposeNumGem_state() {
+        $taskEventArg = new Ins_TaskEventArgs(Enum_ActiveTaskCmdType::ComposeNumGem_state, Enum_PropelType::add, 1, array());
+        self::CheckActiveTaskConditions($taskEventArg);
+    }
+    
     /**
     /**
      * 任意1个法术等级达到2  
      * 任意1个法术等级达到2  
      */
      */