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

Gameserver/App/base/CmdCode.php

@@ -91,7 +91,13 @@ class CmdCode {
      *  走完片头后给值 1
      */
     const cmd_user_setAnimation = 6004;
-    const cmd_user_readAnnouncement = 6005;
+    
+    /**
+     * 替换头像
+     */
+    const cmd_user_replaceHeadImg = 6005;
+
+
     // </editor-fold>
     // <editor-fold defaultstate="collapsed" desc="活动操作码 - 61xx">
 

Gameserver/App/model/User/Info_Heros.php

@@ -34,7 +34,7 @@ class Info_Heros extends Object_ext {
                 $insHero = new Ins_Hero();
                 $insHero->Id = $heroId;
                 $insHero->isUnlock = 0;
-                if($heroId == 1 && $heroId == 2){
+                if($heroId == 1 || $heroId == 2){
                     $insHero->isUnlock = 1;
                 }
                 

Gameserver/App/model/User/Info_PrivateState.php

@@ -182,13 +182,6 @@ class Info_PrivateState extends Object_ext {
      * @var int
      */
     public $honourCardShop_ts = 0;
-    
-    /**
-     * 
-     * @var type
-     */
-    #[ArrayType]
-    public $announcement = array();
 
     /**
      * 关看广告得到体力次数

Gameserver/App/process/FightProc.php

@@ -507,6 +507,7 @@ class FightProc {
             'gates' => ctx()->gates,
             'store' => ctx()->store,
             'task'=> ctx()->task,
+            'gold'=> ctx()->baseInfo->gold,
         );
         return Resp::ok($ret);
     }

Gameserver/App/process/ShopProc.php

@@ -509,12 +509,10 @@ class ShopProc {
             if (now() - ctx()->privateState->monthCardShop_ts >= $monthTs) {
                 ctx()->privateState->monthCardShop_ts = 0;
             } else {
-                //EmailProc::SendMonthCardRewardMail($zoneid, $uid, $reward);
+                $mo = GameConfig::shop_monthcard_getItem(1);               
+                EmailProc::SendMonthCardRewardMail(req()->zoneid, req()->uid, $mo->daily_reward);
             }
         }
-//        if(ctx()->privateState->monthCardShop_ts >0 && now() - ctx()->privateState->monthCardShop_ts >= $monthTs){
-//            ctx()->privateState->monthCardShop_ts = 0;
-//        }
 
         if (ctx()->privateState->honourCardShop_ts > 0 && now() - ctx()->privateState->honourCardShop_ts >= $monthTs) {
             ctx()->privateState->honourCardShop_ts = 0;

Gameserver/App/process/UserProc.php

@@ -27,25 +27,23 @@ class UserProc {
             case CmdCode::cmd_user_gameconstinfo:                               # 6002 下载游戏配置
                 return UserProc::downloadConstInfo();
             case CmdCode::cmd_user_setAnimation:                                # 6004 片头播放记录
-                return UserProc::setAnimation();
-            case CmdCode::cmd_user_readAnnouncement:                            # 6005 
-                return UserProc::readAnnouncement();
+                return UserProc::setAnimation();         
+            case CmdCode::cmd_user_replaceHeadImg:                              # 6005 替换头像
+                return UserProc::replaceHeadImg();
             default:
                 Err(ErrCode::cmd_err);
         }
     }
     
     /**
-     * 6005
+     * 6005 替换头像
      * @return type
      */
-    public static function readAnnouncement() {
-        list($id) = req()->paras;
+    public static function replaceHeadImg() {
+        list($img) = req()->paras;
+
+        ctx()->baseInfo->headImg = $img;
 
-        if(!in_array($id, ctx()->privateState->announcement) ){
-            ctx()->privateState->announcement[] = $id;
-        }        
-        
         UserProc::updateUserInfo();
         $ret = array();
         return Resp::ok($ret);
@@ -288,21 +286,21 @@ class UserProc {
     static function OnNewDay($isnew) {
         ShopProc::DailyShopItemRand();
         ShopProc::ShopDailyClear();
-        self::clear();
+        //self::clear();
         FightProc::FightDailyClear();
         //TaskProc::initAchieveData();   
         TaskProc::ResetTask();
     }
     
-    static function clear() {      
-        $dic = GameConfig::announcement();
-        foreach ($dic as $mo) {
-            if(now() > $mo->endTs && in_array($mo->id,ctx()->privateState->announcement)){
-                StlUtil::arrayRemove(ctx()->privateState->announcement, $mo->id);
-            }
-        }
-        
-    }
+//    static function clear() {      
+//        $dic = GameConfig::announcement();
+//        foreach ($dic as $mo) {
+//            if(now() > $mo->endTs && in_array($mo->id,ctx()->privateState->announcement)){
+//                StlUtil::arrayRemove(ctx()->privateState->announcement, $mo->id);
+//            }
+//        }
+//        
+//    }
 
 // <editor-fold defaultstate="collapsed" desc="创建新用户">