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

Gameserver/App/base/CmdCode.php

@@ -393,6 +393,15 @@ class CmdCode {
      */
     const fight_MainTZGetReward = 6820;
 
+    /**
+     * 每天重置挑战红点
+     */
+    const fight_ResetChallange_RedMask = 6821;
+    /**
+     * 每天重置启灵红点
+     */
+    const fight_ResetQiling_RedMask = 6822;
+    
 // </editor-fold>
 // <editor-fold defaultstate="collapsed" desc="系统操作码 - 69xx">
 

Gameserver/App/model/User/Info_PrivateState.php

@@ -262,6 +262,18 @@ class Info_PrivateState extends Object_ext {
     
     public $upLevel = 0;
 
+    /**
+     * 挑战红点
+     * @var type
+     */
+    public $challange_RedMask = 0;
+
+    /**
+     * 启灵红点
+     * @var type
+     */
+    public $qiling_RedMask = 0;
+    
     public function initialize() {
         $this->junbeiShopNumRecord = new \stdClass();
         $this->junbeiShop_AllNumRecord = new \stdClass();

Gameserver/App/process/FightProc.php

@@ -58,10 +58,33 @@ class FightProc {
                 return self::MainTZPass();
             case CmdCode::fight_MainTZGetReward:                                # 6820 主线挑战--领取奖励
                 return self::MainTZGetReward();
+            case CmdCode::fight_ResetChallange_RedMask:                         # 6821 每天重置挑战红点    
+                return self::ResetChallange_RedMask();
+            case CmdCode::fight_ResetQiling_RedMask:                            # 6822 每天重置启灵红点    
+                return self::ResetQiling_RedMask();
             default:
                 Err(ErrCode::cmd_err);
         }
     }
+    
+    /**
+     * 6821 每天重置挑战红点   
+     */
+    static function ResetChallange_RedMask() {
+        
+        ctx()->privateState->challange_RedMask = 1;
+        UserProc::updateUserInfo();
+        return Resp::ok();
+    }
+    
+    /**
+     *  6822 每天重置启灵红点    
+     */
+    static function ResetQiling_RedMask() {
+        ctx()->privateState->qiling_RedMask = 1;
+        UserProc::updateUserInfo();
+        return Resp::ok();
+    }
 
     /**
      * 6819 主线挑战 -- 通关
@@ -319,6 +342,9 @@ class FightProc {
         ctx()->gates->fightSweepNum = 0;
         ctx()->gates()->TowerGateInfo()->RefreshSkillTimes = 0;
         ctx()->gates()->TowerGateInfo()->TodayChanNum = glc()->tower_daily_chanceNum;
+        
+        ctx()->privateState->challange_RedMask = 0;
+        ctx()->privateState->qiling_RedMask = 0;
     }
 
     /**
@@ -973,11 +999,13 @@ class FightProc {
 
         $store = $userInfo->store;
         $heros = $userInfo->heros;
-
+        $gates = $userInfo->gates;    
+        
         UserProc::updateUserInfo();
         $ret = array(
             'store' => $store,
             'heros' => $heros,
+            'gates' => $gates,
         );
         return Resp::ok($ret);
     }

Gameserver/App/process/TaskProc.php

@@ -74,6 +74,8 @@ class TaskProc {
                     "store" => ctx()->store,
                     "reward" => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
+                    'gold'=> ctx()->baseInfo->gold,
+                    'cash'=> ctx()->baseInfo->cash,
         ));
     }
 
@@ -132,7 +134,9 @@ class TaskProc {
         return Resp::ok(array("task" => ctx()->task,
                     "store" => ctx()->store,
                     'reward' => StoreProc::$reward,
-                    'reward_Gem' => StoreProc::$reward_Gem,                  
+                    'reward_Gem' => StoreProc::$reward_Gem,   
+                    'gold'=> ctx()->baseInfo->gold,
+                    'cash'=> ctx()->baseInfo->cash,
         ));
     }