删减代码

Gameserver/App/model/User/Data_Guild.php

@@ -1,326 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * 公会数据结构
- */
-class Data_Guild extends HashSaver {
-
-    /**
-     * 公会的ID
-     * @var int
-     */
-    public $guildId;
-
-    /**
-     * 公会名称
-     * @var string
-     */
-    public $name;
-
-    /**
-     * 公会的等级
-     * @var int
-     */
-    public $level = 1;
-
-//    /**
-//     * 奖杯积分
-//     * @var int
-//     */
-//    public $cupScore = 0;
-
-    /**
-     * 玩家申请加入公会列表
-     * @var object
-     */
-    public $applylist;
-
-    /**
-     * 会长的OpenID
-     * @var string
-     */
-    public $chairman_id = "";
-
-    /**
-     * 会长 name
-     * @var string
-     */
-    public $chairman_name = "";
-
-//    /**
-//     * @var array 副会长集合
-//     */
-//    public $viceChairManArr = array();
-//
-//    /**
-//     * @var array 干部
-//     */
-//    public $officerManArr = array();
-
-    /**
-     * 公会成员
-     * @var array
-     */
-    public $members = array();
-
-    /**
-     * 公会的宗旨/公告
-     * @var string
-     */
-    public $declare = "";
-
-    /**
-     * 创建时间戳
-     * @var type
-     */
-    public $createts = 0;
-
-    /**
-     * 允许一键(快速)加入, 默认开启,1是需要审核,2,不允许任何人加入
-     * @var int
-     */
-    public $enableQuickIn = 0;
-
-    /**
-     * 徽章
-     * @var int
-     */
-//    public $guild_img = 0;
-
-    /**
-     * 加入公会所需条件
-     * @var int
-     */
-//    public $condition;
-//    /**
-//     * 弹劾 同意
-//     * @var type
-//     */
-//    public $accuse_agreed = array();
-//
-//    /**
-//     * 弹劾 拒接
-//     *  @var type
-//     */
-//    public $accuse_refuse = array();
-//    /**
-//     * 弹劾 时间
-//     * @var int
-//     */
-//    public $accuseTs = 0;
-//    /**
-//     * 弹劾 冷却时间
-//     * @var int
-//     */
-//    public $accuse_coolTime = 0;
-//    /**
-//     * 公会总贡献
-//     * @var int
-//     */
-//    public $allContribute = 0;
-//    /**
-//     * 公会公告编辑冷却时间
-//     * @var int
-//     */
-//    public $announcement_CoolingTs = 0;
-//
-//    /**
-//     * 公会公告内容
-//     * @var type
-//     */
-//    public $announcement_content = array();
-//    /**
-//     * 公会礼包购买数量记录
-//     * @var type
-//     */
-//    public $giftnum_record;
-
-    /**
-     * 检察公会最大人数 
-     * @return boolean
-     */
-    function checkmemberfull() { //根据成员的 贡献度
-        $levelInfo = GameConfig::guildlevel_getItem($this->level);
-        return count($this->members) >= $levelInfo->maxPersoNum;
-    }
-
-    function updateGuildMemberCount() {
-        daoInst()->update(GuildProc::tabGuild)
-                ->data(array('membercount' => count($this->members)))
-                ->where('guildId')->eq($this->guildId)
-                ->andWhere('zoneid')->eq(req()->zoneid)
-                ->exec();
-    }
-
-    /**
-     * 创建新公会
-     * @param type $mem
-     * @return Data_Guild
-     */
-    public static function NewGuildInit($creator_uid, $creator_name, $guildName, $declare = "公告", $guild_img = "-") {
-        $guildInfo = new Data_Guild();
-        $guildInfo->guildId = self::CreateNewGuildID();
-        $guildInfo->createts = now();
-        $guildInfo->members = array($creator_uid);
-        $guildInfo->level = 1;
-//        $guildInfo->cupScore = 0;
-        $guildInfo->applylist = ObjectInit();
-//        $guildInfo->condition = ObjectInit();
-//        $guildInfo->giftnum_record = ObjectInit();
-
-        $guildInfo->chairman_id = $creator_uid;
-        $guildInfo->chairman_name = $creator_name;
-        $guildInfo->name = $guildName;
-
-        $guildInfo->declare = $declare;
-//        $guildInfo->guild_img = $guild_img;
-        $guildInfo->enableQuickIn = 0;                                          # 0 可以直接加入, 1 需要审批, 2 不允许任何人加入
-//        $guildInfo->chairmanLastLogin = $base->lastLogin;
-        return $guildInfo;
-    }
-
-    private static function CreateNewGuildID() {
-        $key_id = MemKey_Guild::constGetCurrentMaxGuildID(req()->zoneid);
-        return gMem()->increment($key_id);
-    }
-
-}
-
-// <editor-fold defaultstate="collapsed" desc="闲置">
-
-/**
- * 玩家请求加入公会的消息结构体
- */
-class UserApplyForGuildModel {
-
-    public $uid;
-    public $ts;
-    public $approved = false;
-    public $name;
-    public $level;
-
-    /**
-     * 创建一条新的请求信息
-     * @param type $oid
-     * @return UserApplyForGuildModel Description
-     */
-    public static function CreateApplyInfo($uid, $name, $level) {
-        $ret = new UserApplyForGuildModel();
-        $ret->uid = $uid;
-        $ret->ts = now();
-        $ret->name = $name;
-        $ret->level = $level;
-        $ret->approved = false;
-
-        return $ret;
-    }
-
-}
-
-/**
- * 公会值日消息类型
- */
-class GuildJournalType {
-
-    const Join = 1; //加入
-    const requestDonate = 2; //请求捐献
-    const Quit = 3; //退会
-    const ChangeChairMan = 4; //改变会长
-    const BuyGift = 5; //购买礼包
-
-}
-
-/**
- * 公会日志数据体
- */
-class GuildJournalModel {
-
-    public $ts;
-    public $uid;
-    public $type;
-    public $datas;
-
-    public static function CreateJoin($uid, $name) {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::Join;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-        return $journal;
-    }
-
-    public static function RequestDonate($uid, $name, $cardId, $cardCount) {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::requestDonate;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-        $journal->datas [] = $cardId;
-        $journal->datas [] = $cardCount;
-        $journal->datas [] = 0; //现在已得到的捐献数量
-        return $journal;
-    }
-
-    public static function CreateQuit($uid, $name) {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::Quit;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-        return $journal;
-    }
-
-    public static function CreateChangeChairman($uid, $name, $transferedid, $transferedname) {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::ChangeChairMan;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-        $journal->datas [] = $transferedid;
-        $journal->datas [] = $transferedname;
-        return $journal;
-    }
-
-    public static function BuyGift($uid, $name) {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::BuyGift;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-
-        return $journal;
-    }
-
-}
-
-class GuildAnnouncementModel extends Object_ext {
-
-    public $ts;
-    public $title;
-    public $content;
-
-    function __construct($tag, $ts, $title, $content) {
-        if (1 == func_num_args() && $tag) {                                     # 默认的Object初始化方法
-            parent::__construct($tag);
-        } else {
-            $this->ts = $ts;
-            $this->title = $title;
-            $this->content = $content;
-        }
-    }
-
-}
-
-// </editor-fold>

Gameserver/App/model/User/Data_UserGame.php

@@ -85,25 +85,7 @@ class Data_UserGame extends HashSaver {
     public $profile;
 
     /**
-     * 圣哲学院
-     * @var Info_College
-     */
-    public $college;
-
-    /**
-     * 神庙
-     * @var Info_ShenMiao
-     */
-    public $shenmiao;
-
-    /**
-     * 宝石系统
-     * @var Info_Gem
-     */
-    public $Gem;
-
-    /**
-     * 
+     *
      * @var Info_Pay
      */
     public $pay;
@@ -125,7 +107,7 @@ class Data_UserGame extends HashSaver {
      * @return \UserGameModel
      */
     public function initialize() {
-        my_Assert(GameConfig::primordial_data(), "找不到账号初始化数据");         # 防御 
+        my_Assert(GameConfig::primordial_data(), "找不到账号初始化数据");         # 防御
         $this->baseInfo = new Info_UserBase();
         $this->baseInfo->initialize();
 
@@ -138,7 +120,6 @@ class Data_UserGame extends HashSaver {
 //        $this->task->initialize();                                              # 任务初始化
         $this->taskCardShop = new Info_TaskCard_Shop();
         //$this->college->initialize();//改为按天解锁了
-        $this->shenmiao->initialize();
     }
 
     /**
@@ -154,18 +135,17 @@ class Data_UserGame extends HashSaver {
 //            $this->store->initialize();                                         # 添加默认物品
             $this->heros = new Info_UserGameHero();                             # 英雄数据
 //            $this->heros->InitializeHero();                                     # 添加初始英雄
-            $this->gates = new Info_UserGateDifficulty();                            # 初始化关卡默认数据 
-            $this->newMap = new Info_NewMap();                                  # 初始化改版地图2022.3 
-            $this->NewbieGuide = new Info_NewbieGuide();                        # 初始化新手引导结构 
-            $this->userSecretshop = new Info_UserSecretshop();                  # 神秘商店 
+            $this->gates = new Info_UserGateDifficulty();                            # 初始化关卡默认数据
+            $this->newMap = new Info_NewMap();                                  # 初始化改版地图2022.3
+            $this->NewbieGuide = new Info_NewbieGuide();                        # 初始化新手引导结构
+            $this->userSecretshop = new Info_UserSecretshop();                  # 神秘商店
             $this->taskCardShop = new Info_TaskCard_Shop();                     # 任务卡商店
-            $this->college = new Info_College();
-            $this->Gem = new Info_Gem();
-            $this->shenmiao = new Info_ShenMiao();
+
+
             $this->pay = new Info_Pay();
             $this->profile = new Data_UserProfile();                                     # 初始化用户画像模块
         } else {                                                                # 实参
-            parent::__construct($arg);                                          # 调用Object的构造函数 
+            parent::__construct($arg);                                          # 调用Object的构造函数
 
             $this->base()->fixArray();
             $this->privateData()->fixArray();
@@ -323,19 +303,6 @@ class Data_UserGame extends HashSaver {
         return $this->profile;
     }
 
-    /**
-     * 圣哲学院
-     * @param bool $save 是否需要回存
-     * @return Info_College
-     */
-    public function college($save = true) {
-        $this->college = new Info_College($this->college);
-        if ($save) {
-            self::save_tag("college");
-        }
-        return $this->college;
-    }
-
     /**
      * 新手引导
      * @param bool $save 是否需要回存
@@ -362,6 +329,6 @@ class Data_UserGame extends HashSaver {
         return $this->heroTeamConfig;
     }
 
-    // 
+    //
 // </editor-fold>
 }

Gameserver/App/model/User/Data_UserGuild.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * 玩家公会数据
- */
-class Data_UserGuild extends HashSaver {
-
-    /**
-     * @var int 时间戳, 用于清理每日申请记录
-     */
-    public $ts;
-
-    /**
-     * @var int 时间戳, 玩家加入/创建公会的时间
-     */
-    public $joints;
-
-    /**
-     * @var int 所属公会id
-     */
-    public $guildId = 0;
-
-    /**
-     * @var array 已经申请的公会列表
-     */
-    public $appliedguildlist = array();
-
-    /**
-     * @var dic<int,int> 申请过的公会记录
-     */
-    public $appliedguildRecord;
-//    
-
-    /**
-     * @var string 公会名称
-     */
-    public $guildName = "";
-
-    /**
-     * 角色类型
-     * @var type
-     */
-    public $position = "";
-
-    /**
-     * @var int 创建公会冷却时间
-     */
-    public $create_coding = 0;
-
-    /**
-     * 清理
-     * @return Data_UserGuild
-     */
-    public function Clear() {
-        $this->ts = now();
-        $this->joints = now();                                                  // 玩家公会的创建时间
-        $this->guildId = 0;
-
-        $this->appliedguildlist = array();
-        $this->appliedguildRecord = ObjectInit();
-
-        $this->position = ""; //职位
-
-        return $this;
-    }
-
-    /**
-     * 初始化个人公会信息 
-     */
-    public function __construct($args = null) {
-        if (isset($args)) {
-            parent::__construct($args);
-        } else {
-            $this->ts = now();
-            $this->joints = now();                                              // 玩家公会的创建时间
-            $this->guildId = 0;
-            $this->appliedguildlist = array();
-            $this->appliedguildRecord = ObjectInit();
-        }
-    }
-
-}

Gameserver/App/model/User/Data_WorldBoss.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- *  世界boss数据模型
- * @author gwang
- */
-class Data_WorldBoss extends HashSaver {
-
-    /**
-     * @var int 模板id
-     */
-    public $mo_id;
-
-    /**
-     * @var int 第x期(时间戳) 用法: ts ==当天开始时间
-     * 两个时间段 中午12点至下午1点 晚上8点到9点
-     */
-    public $ts_term;
-
-    /**
-     * @var 剩余血量
-     */
-    public $cur_blood;
-
-    /**
-     * @var 反击列表
-     */
-    public $strike_back_list;
-
-    /**
-     * @var 结算状态
-     */
-    public $settlement_state;
-
-    /**
-     * 重置世界boss
-     */
-    public function reset() {
-        $this->cur_blood = $this->mo()->hp;
-    }
-
-    /**
-     * @return \sm_hero 怪物模板数据
-     */
-    public function mo() {
-        return GameConfig::hero_getItem($this->mo_id);
-    }
-
-}

Gameserver/App/model/User/Enum_Active.php

@@ -1,71 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of Enum_Active
- *
- * @author cyzhao
- */
-class Enum_Active extends Enum{
-
-    /**
-     * 新手活动
-     */
-    const NewWish = 1;
-
-    /**
-     * 常驻活动
-     */
-    const OpenWish= 2;
-    /**
-     * 唤灵师活动
-     */
-    const HuanlingshiActive= 3;
-    /**
-     * 言灵活动
-     */
-    const YanlingActive= 4;
-    /**
-     * 武器活动
-     */
-    const WuqiActive= 5;
-}
-
-class Enum_ActiveItemType extends Enum{
-
-    /**
-     * 
-     */
-    const R = 1;
-
-    /**
-     * 
-     */
-    const Sr= 2;
-    /**
-     *
-     */
-    const Ssr= 3;
-  
-}
-
-/**
-     * 
-     */
-    //const Sr = 1;
-
-    /**
-     * 
-     */
-    //const Ssr= 2;
-    /**
-     *
-     */
-    //const Ur= 3;

Gameserver/App/model/User/Enum_Auction.php

@@ -1,28 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of Enum_Active
- *
- * @author cyzhao
- */
-class Enum_Auction extends Enum{
-
-    /**
-     * 竞拍
-     */
-    const Auction = 1;
-
-    /**
-     * 一口价
-     */
-    const AllPrice= 2;
-   
-}

Gameserver/App/model/User/Enum_College.php

@@ -1,31 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of Enum_College
- *
- * @author cyzhao
- */
-class Enum_College extends Enum{
-    /**
-     * 
-     */
-    const none = 0;
-
-    /**
-     * 
-     */
-    const update = 1;
-
-    /**
-     * 
-     */
-    const finish= 2;
-}

Gameserver/App/model/User/Enum_ExploreType.php

@@ -1,37 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of Enum_ExploreType
- *
- * @author c'y'zhao
- */
-class Enum_ExploreType extends Enum{
-    const Area = 1;
-    const Npc  = 2;
-    const Item = 3;
-    const Plot = 4;
-    const Border = 5;
-    const Other = 6;
-}
-
-class Enum_ExploreSubType extends Enum{
-    const Default = 0;    // 默认
-  
-    const Store =1;        // 杂货店 
-    const Smithy=2;           // 铁匠铺     
-    const Storehouse=3;       // 储物箱   
-    const Teleporter=4;       // 传送点  
-    const Reword=5;           // 悬赏商人   
-    const Email=6;            // 邮箱      
-    const Entry=7;            // 副本入口       
-    const Export=8;           // 副本出口
-    const paihangbang=9;         //排行榜
-}

Gameserver/App/model/User/Enum_FootHoldType.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of Enum_FootHoldType
- * 据点类型
- * @author gwang
- * @version 
- *     2022.3.11 Created.
- */
-class Enum_FootHoldType extends Enum {
-
-    /**
-     * 城镇 (类似于回城时的那个城镇)
-     */
-    const Town = 0;
-
-    /**
-     * 据点
-     */
-    const FootHold = 1;
-
-    /**
-     * 非据点 (孵化器不刷新怪物)
-     */
-    const NoneFootHold = 2;
-
-    /**
-     * Boss怪 据点( Boss具有特定性?)
-     */
-    const BossFootHold = 3;
-
-}

Gameserver/App/model/User/Info_College.php

@@ -1,363 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of CollegeInfo
- *
- * @author cyzhao
- */
-class Info_College extends Object_ext {
-
-    /**
-     * 当前所在的级别
-     */
-    public $collegeId = 1;
-    /// <summary>
-    /// 所处的课程id
-    /// </summary>
-    public $courseId = 1001;
-
-    /**
-     * 将领取课程奖励的保存在这
-     * @var type
-     */
-    #[ArrayType]
-    public $comCourseList = array();
-    /// <summary>
-    /// 任务卡信息
-    /// </summary>
-    //public List<missCourseItem> compMissCardList = new List<missCourseItem>();
-    public $compMissCardDic = null;
-
-    /**
-     * 当前课程进度，进入下一个课程清0
-     * @var type
-     */
-    public $progress = 0;
-
-    /**
-     * 年级奖励领取记录
-     * @var type
-     */
-    #[ArrayType]
-    public $collegeRewardList = array();
-
-    /**
-     *
-     * @var type
-     */
-    public $maskCollege = 0;
-
-    /**
-     *
-     * @var type
-     */
-    public $ingTaskCardDic = null;
-
-    /**
-     * 圣哲学院功能结算时间
-     * @var type
-     */
-    public $funUnluckTs = 0;
-
-    /**
-     * 累计积分
-     * @var type
-     */
-    public $score = 0;
-
-    /**
-     *
-     * @var type
-     */
-    #[ArrayType]
-    public $scoreRewardList = array();
-
-    /**
-     * 构造函数
-     * @param type $args
-     */
-    public function __construct($args = null) {
-        if ($args == null) {
-            $this->compMissCardDic = new \stdClass();
-            $this->ingTaskCardDic = new \stdClass();
-        } else {
-            parent::__construct($args);
-        }
-    }
-
-    /**
-     * 废弃了
-     */
-    //public function initialize() {
-//        $this->compMissCardDic = new \stdClass();
-//        $dic = GameConfig::course_getItem($this->courseId);
-//        $misslist = explode(',',$dic->misslist);
-//        foreach ($misslist as $id) {
-//            $item = new ins_missCourseItem();
-//            $item->initialize($id);
-//            $this->compMissCardDic->$id = $item;
-//        }
-    //$this->initCompMissCardDic();
-    //}
-
-    public function initCompMissCardDic() {
-        $this->compMissCardDic = new \stdClass();
-        $dic = GameConfig::course_getItem($this->courseId);
-        $misslist = explode(',', $dic->misslist);
-        foreach ($misslist as $id) {
-            $item = new ins_missCourseItem();
-            $item->initialize($id);
-            $this->compMissCardDic->$id = $item;
-        }
-    }
-
-    /**
-     * 修改任务卡状态
-     * @param type $id
-     * @param type $state
-     */
-    public function modifyTaskCardState($id, $state) {
-        $ingTaskCardDic = $this->ingTaskCardDic;
-        foreach ($ingTaskCardDic as $collegeId => $courseDic) {
-            foreach ($courseDic as $courseId => $cardDic) {
-                foreach ($cardDic as $cardId => $val) {
-                    if ($cardId == $id) {
-                        TaskProc::OnFinishSchoolTask();
-                        $this->ingTaskCardDic->$collegeId->$courseId->$cardId->type = $state;
-                        break 3;
-                    }
-                }
-            }
-        }
-
-//        if(!StlUtil::dictHasProperty($this->compMissCardDic, $id)){
-//            return;
-//        }
-//        $this->compMissCardDic->$id->type = $state;
-//        $this->progress += 1;
-    }
-
-    /**
-     * 废弃
-     */
-    public function updataCourseNew() {
-        //检测是否到下一年级
-//        $collegeDic = GameConfig::college_getItem($this->collegeId);
-//        if(in_array($this->courseId +1,explode(',', $collegeDic->cList))){
-//            $this->courseId += 1;
-//            $this->initCompMissCardDic();
-//            $this->progress = 0;
-//        } else {
-
-        $this->collegeRewardList[] = $this->collegeId;
-        //TaskProc::OnFinishAllSchoolTaskOfGrade($this->collegeId);
-
-        $this->collegeId += 1;
-        $newCollegeDic = GameConfig::college_getItem($this->collegeId);
-        if ($newCollegeDic == null) {
-            $this->maskCollege = Enum_College::finish;
-            $this->collegeId -= 1;
-        } elseif ($newCollegeDic != null && $newCollegeDic->cList == null) {
-            $this->maskCollege = Enum_College::update;
-        } else {
-            $cList = explode(',', $newCollegeDic->cList);
-            $this->courseId = $cList[0];
-            $this->initCompMissCardDic();
-        }
-//        }
-    }
-
-    /**
-     * 废弃
-     */
-    public function updataCourse() {
-        $this->comCourseList[] = $this->courseId;
-        //检测是否到下一年级
-        $collegeDic = GameConfig::college_getItem($this->collegeId);
-        if (in_array($this->courseId + 1, explode(',', $collegeDic->cList))) {
-            $this->courseId += 1;
-            $this->initCompMissCardDic();
-            $this->progress = 0;
-        }
-
-//        else {
-//            $this->collegeId += 1;
-//            $newCollegeDic = GameConfig::college_getItem($this->collegeId);
-//            $cList = explode(',', $newCollegeDic->cList);
-//            $this->courseId = $cList[0];
-//            $this->initCompMissCardDic();
-//            $this->progress = 0;
-//        }
-    }
-
-    //废弃
-    public function checkCollege() {
-        if ($this->maskCollege == Enum_College::update) {
-            $dic = GameConfig::college_getItem($this->collegeId);
-            if ($dic != null && $dic->cList != null) {
-                $this->maskCollege = 0;
-                $cList = explode(',', $dic->cList);
-                $this->courseId = $cList[0];
-                $this->initCompMissCardDic();
-            }
-        }
-    }
-
-//------------------new---------------------
-
-    /**
-     * 根据天 初始化
-     * @return type
-     */
-    public function initTaskCard() {
-        if ($this->funUnluckTs == 0) {
-            return;
-        }
-
-        $day = TimeUtil::totalDays($this->funUnluckTs);
-        $curDay = TimeUtil::totalDays(time());
-        $num = $curDay - $day;
-
-        $collegeMo = GameConfig::college();
-        $college = (array) $collegeMo;
-        ksort($college);
-
-        $index = 0;
-        foreach ($college as $collegeId => $collegeMo) {
-            $courseArr = explode(',', $collegeMo->cList);
-
-            if (!StlUtil::dictHasProperty($this->ingTaskCardDic, $collegeId)) {
-                $this->ingTaskCardDic->$collegeId = new \stdClass();
-            }
-            $collegeDic = $this->ingTaskCardDic->$collegeId;
-            foreach ($courseArr as $courseId) {
-                if (!StlUtil::dictHasProperty($collegeDic, $courseId)) {
-                    $mo = GameConfig::course_getItem($courseId);
-                    $arr = explode(',', $mo->misslist);
-                    $dic = new \stdClass();
-                    foreach ($arr as $cardId) {
-                        $item = new ins_missCourseItem();
-                        $item->initialize($cardId);
-
-                        $cid = StoreProc::PutTaskCardInStore($cardId);                      // 存入背包
-                        NormalEventProc::OnTaskCard_Actived($cid, null);                        # 带入事件
-
-                        $item->indexId = $cid;
-                        $taskCard = new Ins_TaskCard(ctx()->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;
-                            $item->type = Enum_TaskCardStateType::finish;
-                            TaskProc::OnFinishSchoolTask();
-                            NormalEventProc::OnTaskCard_Finish($taskCard->uid, null);           # 广播卡完成事件
-                        }
-                        $dic->$cardId = $item;
-                        //统计
-                        StatisticsProc::TargetStatistics(Enum_TargetStatistics::collegeCouseId_UnlockUserNum, $cardId);
-                        ctx()->store->taskcards->$cid = $taskCard;
-                    }
-                    //$this->ingTaskCardDic->$courseId = $dic;
-                    $collegeDic->$courseId = $dic;
-                }
-                $this->ingTaskCardDic->$collegeId = $collegeDic;
-                if ($index >= $num) {
-                    break 2;
-                }
-                $index += 1;
-            }
-        }
-        ctx()->college->ingTaskCardDic = $this->ingTaskCardDic;
-
-        //--------------------
-        //$courseDic = GameConfig::course();
-//        $index = 0;
-//        foreach ($courseDic as $courseId => $mo) {
-//            if(!StlUtil::dictHasProperty($this->ingTaskCardDic, $courseId)){
-//                $arr = explode(',',$mo->misslist);
-//                $dic = new \stdClass();
-//                foreach ($arr as $cardId) {
-//                    $item = new ins_missCourseItem();
-//                    $item->initialize($cardId);
-//
-//                    $cid = StoreProc::PutTaskCardInStore($cardId);                      // 存入背包
-//                    NormalEventProc::OnTaskCard_Actived($cid, null);                        # 带入事件
-//
-//                    $item->indexId = $cid;
-//                    $taskCard = new Ins_TaskCard(ctx()->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;
-//                        $item->type = Enum_TaskCardStateType::finish;
-//                        TaskProc::OnFinishSchoolTask();
-//                        NormalEventProc::OnTaskCard_Finish($taskCard->uid, null);           # 广播卡完成事件
-//                    }
-//                    $dic->$cardId = $item;
-//                    ctx()->store->taskcards->$cid = $taskCard;
-//                }
-//                $this->ingTaskCardDic->$courseId = $dic;
-//            }
-//
-//            if($index >= $num){
-//                break;
-//            }
-//            $index += 1;
-//        }
-    }
-
-    /**
-     * 圣哲学院功能结算时间
-     */
-    public function setFunUnluckTs() {
-        if ($this->funUnluckTs != 0) {
-            return;
-        }
-
-        $this->funUnluckTs = time();
-        $this->initTaskCard();
-    }
-
-    /**
-     * 记录已经领取奖励的课程
-     * @param type $id
-     */
-//    public function addReceiveCourseList($id) {
-//        $this->comCourseList[] = $id;
-//    }
-
-    /**
-     * 累计积分
-     * @param type $val
-     */
-    public function addScore($val) {
-        $this->score += $val;
-    }
-
-}

Gameserver/App/model/User/Info_Gem.php

@@ -1,34 +0,0 @@
-<?php
-namespace loyalsoft;
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- * Description of Ins_Gem
- *
- * @author cyzhao
- */
-class Info_Gem extends Object_ext{
-    
-    /**
-     * 研究等级
-     * @var type
-     */
-    public $level = 1;
-    
-    /**
-     * 构造函数
-     * @param type $args
-     */
-    public function __construct($args = null) {    
-        if($args == null){
-            //$this->compMissCardDic = new \stdClass();
-            //$this->ingTaskCardDic = new \stdClass();
-        } else {
-            parent::__construct($args);   
-        }                    
-    }
-}

Gameserver/App/model/User/Info_Map.php

@@ -1,103 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * 玩家关卡地图数据
- * @author gwang
- * @deprecated since 2022.3 换开放地图版转 Info_NewMap->Ins_FootHold
- * @version 
- *         1.0.0 Created at 2021年3月2日14:32:52 关卡分三层处理 大陆->区域->关卡.
- */
-class Info_Map extends Object_ext {
-
-    /**
-     * 大陆数据
-     * @var dict<int,Ins_Mainland>
-     */
-    public $mainlands;
-
-    /**
-     * 战斗关卡记录--1.记录剧情关卡记录；2.副本唤灵师关卡 3.副本武器关卡 4.副本言灵关卡  
-     * @param type $arg
-     */
-    public $battleRecord = array();
-
-    function __construct($arg = null) {
-        if (null === $arg) {
-//            $this->battleRecord = new \stdClass();
-//            $arr = array();
-//            $arr[] = 1;
-//            $arr[] = 2;
-//            $arr[] = 3;
-//            $arr[] = 4;
-//            foreach ($arr as $key) {
-//                $this->battleRecord->$key = array();
-//            }
-            // 直接初始化8个大陆的基本数据
-            $this->mainlands = ObjectInit();
-            foreach (GameConfig::gate_mainland() as $id => $land) {
-                $ins = new Ins_Mainland();
-                $ins->landId = $id;
-                if (1 == $id) {                                                 # 第一个大陆, 直接开启第一个区域
-                    $zones = explode(',', $land->containZones);
-                    $zoneid = $zones[0];
-                    $zone = new Ins_Mapzone();
-                    $zone->zoneid = $zoneid;
-                    $zonecfg = GameConfig::gate_zone_getItem($zoneid);
-                    my_Assert($zonecfg, ErrCode::err_const_no);
-                    $gateIds = explode(',', $zonecfg->contains);
-                    $zone->gates[] = $gateIds[0];
-                    $ins->normal->$zoneid = $zone;
-                }
-                $this->mainlands->$id = $ins;
-            }
-        } else {
-            parent::__construct($arg);
-        }
-    }
-
-    public function addBattleRecord($gateId) {
-        if (!in_array($gateId, $this->battleRecord)) {
-            if (strlen($gateId) == 8 && substr($gateId, 0, 3) == 2001) {
-                $type = Enum_TargetStatistics::HuanLingShiGateId_ComUserNum;
-            } elseif (strlen($gateId) == 8 && substr($gateId, 0, 3) == 2002) {
-                $type = Enum_TargetStatistics::WeaponGateId_ComUserNum;
-            } elseif (strlen($gateId) == 8 && substr($gateId, 0, 3) == 2003) {
-                $type = Enum_TargetStatistics::YanLingGateId_ComUserNum;
-            } else {
-                $type = Enum_TargetStatistics::storyGateId_ComUserNum;
-            }
-
-            $arr = $this->battleRecord;
-            $arr[] = $gateId;
-            $this->battleRecord = $arr;
-            StatisticsProc::TargetStatistics($type, $gateId);
-        }
-    }
-
-    public function addBattleNumRecord($gateId, $ret) {
-        if (strlen($gateId) == 8 && substr($gateId, 0, 3) == 2001) {
-            $type = Enum_TargetStatistics::HuanLingShiGateId_BattleNum;
-        } elseif (strlen($gateId) == 8 && substr($gateId, 0, 3) == 2002) {
-            $type = Enum_TargetStatistics::WeaponGateId_BattleNum;
-        } elseif (strlen($gateId) == 8 && substr($gateId, 0, 3) == 2003) {
-            $type = Enum_TargetStatistics::YanLingGateId_BattleNum;
-        } else {
-            $type = Enum_TargetStatistics::storyGateId_BattleNum;
-        }
-        $battleNum = 0;
-        $passNum = 0;
-        if ($ret == true) {
-            $battleNum = 1;
-            $passNum = 1;
-        } else {
-            $battleNum = 1;
-            $passNum = 0;
-        }
-
-        $ctx = $battleNum . "/" . $passNum;
-        StatisticsProc::TargetStatistics($type, $gateId, $ctx);
-    }
-
-}

Gameserver/App/model/User/Info_NewMap.php

@@ -1,119 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of Info_NewMap
- * 玩家地图数据
- * @author gwang
- * @version
- *        2022.3.11 改版 据点 >> 大地图 >> 世界地图模式
- */
-class Info_NewMap extends Object_ext {
-
-    /**
-     * 当前所在地图的id
-     * @var type
-     */
-    public $curMapId;
-
-    /**
-     * 已解锁据点列表
-     * @var dic< 据点id, Ins_FootHold >
-     */
-    public $unlockedFootholds;
-
-    /**
-     * 已经解锁的地图上的区域、npc、道具等等信息
-     * @var type
-     */
-    public $unlockMapTypeList;
-
-    /**
-     * 回城券使用的传送阵记录
-     * @var type
-     */
-    public $huichengquanRecord = null;
-
-    /**
-     * 当前地图所在区里面的传送门目的地的mapid
-     * 回城券=>从当前地图回据点
-     * 传送门=>从据点回到回城前的地图
-     * @var type
-     */
-    public $lastMapId = 0;
-
-    /**
-     * 当前据点id
-     * @var type
-     */
-    public $curFootholdId = 0;
-
-    function __construct($arg = null) {
-        if (null === $arg) {
-            // 直接初始化8个大陆的基本数据
-            $initMapid = 503099;                                                # 新手村的id
-            $this->lastMapId = $initMapid;
-            $this->curMapId = $initMapid;                                       # 当前位置为新手村
-            $this->curFootholdId = $initMapid;                                      # 当前据点id
-            $this->unlockedFootholds = ObjectInit();
-
-            $gateZonemo = GameConfig::gate_zone_getItem(501007);
-            if ($gateZonemo != null) {
-                $list = explode(',', $gateZonemo->contains);
-                foreach ($list as $id) {
-                    $mo = GameConfig::gate_getItem($id);
-                    $footHold = new Ins_FootHold();
-                    $footHold->mapId = $mo->gateId;
-                    $footHold->curMapType = $mo->mapType;
-                    if ($id == $initMapid) {
-                        $footHold->unlocked = 1;
-                        $footHold->transmissionIsOk = true;
-                    }
-                    $this->unlockedFootholds->$id = $footHold;
-                }
-            }
-
-
-
-//            $mo = GameConfig::gate_getItem($initMapid);
-//            $footHold = new Ins_FootHold();
-//            $footHold->mapId = $mo->gateId;
-//            $footHold->curMapType = $mo->mapType;
-//            $this->unlockedFootholds->$initMapid = $footHold;                   # 初始化解锁新手村据点数据
-            #
-            // 把2号据点也解锁
-//            $initMapid = 503100;                                                  # 新手村的id
-//            // $this->curMapId = $initMapid;                                       # 当前位置为新手村
-//            // $this->unlockedFootholds = ObjectInit();
-//            $mo = GameConfig::gate_getItem($initMapid);
-//            $footHold = new Ins_FootHold();
-//            $footHold->mapId = $mo->gateId;
-//            $footHold->curMapType = $mo->mapType;
-//            $this->unlockedFootholds->$initMapid = $footHold;                   # 初始化解锁新手村据点数据
-//
-//            $dixiachengId = 503001;
-//            $mo = GameConfig::gate_getItem($dixiachengId);
-//            $footHold = new Ins_FootHold();
-//            $footHold->mapId = $mo->gateId;
-//            $footHold->curMapType = $mo->mapType;
-//            $this->unlockedFootholds->$dixiachengId = $footHold;
-//
-//            $dixiachengId = 503002;
-//            $mo = GameConfig::gate_getItem($dixiachengId);
-//            $footHold = new Ins_FootHold();
-//            $footHold->mapId = $mo->gateId;
-//            $footHold->curMapType = $mo->mapType;
-//            $this->unlockedFootholds->$dixiachengId = $footHold;
-
-            $this->unlockMapTypeList = ObjectInit();                            #初始化--已经解锁的地图上的区域、npc、道具等等信息
-            $unlockStr = "503099_2_1011_". now();
-            $this->unlockMapTypeList->$initMapid[] = $unlockStr;
-            
-            $this->huichengquanRecord = ObjectInit();                                #
-        } else {
-            parent::__construct($arg);
-        }
-    }
-
-}

Gameserver/App/model/User/Info_PublicState.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * 玩家公共数据(跨区)
- * @version
- *          1.0.0 Created at 2017-4-19. 添加英雄评分记录 by --gwang
- * @author gwang (mail@wanggangzero.cn)
- * @copyright ? 2017-4-19, SJZ LoyalSoft Corporation & gwang. All rights reserved.
- */
-class Info_PublicState extends HashSaver {
-
-    /**
-     * 评过分的英雄id
-     * @var []
-     */
-    public $scoredheros;
-
-    /**
-     * 玩家注册时初始化
-     */
-    public function __construct($arg = null) {
-        parent::__construct($arg);
-//        if (null == $this->scoredheros) {                                       # 防御空值
-//            $this->scoredheros = ArrayInit();
-//        }
-    }
-
-}

Gameserver/App/model/User/Info_ShenMiao.php

@@ -1,127 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of Info_ShenMiao
- *
- * @author cyzhao
- */
-class Info_ShenMiao extends Object_ext {
-    
-    /**
-     * 新手祈愿是否已经完成 0：没有
-     * @var type
-     */
-    public $isComNewWish = 0;
-
-    /**
-     * 活动信息
-     * @var type
-     */
-    public $activeDic = null;
-
-    /**
-     * 构造函数
-     * @param type $args
-     */
-    public function __construct($args = null) {    
-        if($args == null){
-            $this->activeDic = new \stdClass();
-        } else {
-            parent::__construct($args);   
-        }                    
-    }
-    
-    public function initialize() {
-        $this->initActiveItem();//创建账号 初始化活动信息
-    }
-    
-    /**
-     * 初始化活动信息
-     */
-    public function initActiveItem() { 
-        $nowTs = time();
-   
-        if($this->activeDic == null){
-            $this->activeDic = new \stdClass();
-        }
-        
-        $aDic = new \stdClass();
-        $enum = new Enum_Active();
-        $list = array_values($enum->getConstList());            
-        foreach ($list as $type) {
-            if($type == null){
-                continue;
-            }
-            if(StlUtil::dictHasProperty($this->activeDic, $type)){
-                if($type == Enum_Active::NewWish){
-                    if($this->activeDic->$type->totalNum >= glc()->UserWishNumLimit){
-                        $this->isComNewWish = 1;
-                        StlUtil::dictRemove($this->activeDic, $type);
-                        StlUtil::dictPropertyRandom($dict);
-                    }
-                } else if($type > Enum_Active::HuanlingshiActive){//检测时间是否过期
-                    $shenmiaoMo = GameConfig::shenmiao_getItem($this->activeDic->$type->id);
-                    if($shenmiaoMo->startTs >= $nowTs || $nowTs > $shenmiaoMo->endTs){
-                        $list = GameConfig::shenmiaoTypeList_getItemArray($type);
-                        if($list != null){
-                            foreach ($list as $val) {                 
-                                if($val->startTs <=$nowTs && $nowTs<= $val->endTs){
-                                    $item = new Ins_active();
-                                    $item->id = $val->id;         
-                                    $this->activeDic->$type = $item;
-                                }                
-                            }
-                        }                       
-                    }                                     
-                }
-            } else {
-                if($this->isComNewWish == 0 && $type == Enum_Active::NewWish){
-                    $dic = GameConfig::shenmiaoTypeList_getItemArray($type)[0];      
-                    $item = new Ins_active();
-                    $item->id = $dic->id;         
-                    $this->activeDic->$type = $item;
-                } elseif ($type == Enum_Active::OpenWish) {
-                    $dic = GameConfig::shenmiaoTypeList_getItemArray($type)[0];      
-                    $item = new Ins_active();
-                    $item->id = $dic->id;         
-                    $this->activeDic->$type = $item;
-                } else {
-                    $list = GameConfig::shenmiaoTypeList_getItemArray($type);
-                    if($list != null){
-                        foreach ($list as $val) {                 
-                            if($val->startTs <=$nowTs && $nowTs<= $val->endTs){
-                                $item = new Ins_active();
-                                $item->id = $val->id;         
-                                $this->activeDic->$type = $item;
-                            }                
-                        }
-                    }
-                }                             
-            }                                 
-        }
-    }
-    
-    /**
-     * 新手 常驻
-     * @param type $type
-     */
-    public function createRegularActiveData($type) {
-        
-    }
-    /**
-     * 不定期
-     * @param type $type
-     */
-    public function createLrregularActiveData($type) {
-        
-    }
-    
-}

Gameserver/App/model/User/Info_TaskCard_Shop.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of Info_TaskCard_Shop
- * 任务卡商店
- * @author gwang
- */
-class Info_TaskCard_Shop extends Object_ext {
-
-    /**
-     * @var int 上次刷新时间戳
-     */
-    public $lastRefreshTs = 0;
-
-    /**
-     * @var array 当前展示的卡片列表
-     */
-    #[ArrayType]
-    public $curCards = array();
-
-    /**
-     * @var array 已卖出记录
-     */
-    #[ArrayType]
-    public $selled = array();
-
-}

Gameserver/App/model/User/Info_UserGameHero.php

@@ -1,98 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of UserGameHeroModel
- * @version
- *          1.0.0 Created at 2017-2-14. by --gwang
- * @author gwang (mail@wanggangzero.cn)
- * @copyright ? 2017-2-14, SJZ LoyalSoft Corporation & gwang. All rights reserved.
- */
-
-/**
- * 玩家收集的英雄的卡牌集合
- */
-class Info_UserGameHero extends Object_ext {
-
-    /**
-     * 当前展示的英雄的UID
-     * @var type string
-     */
-    public $displayHeroUID;
-
-    /**
-     * 好友支援的英雄的UID
-     * @var type string
-     */
-    public $firendSupportHeroUID;
-
-    /**
-     * 当前收集卡牌的数量上限(可扩容)
-     * @var type int
-     */
-    public $maxCollectCount;
-
-    /**
-     * 英雄集合
-     * @var {}
-     */
-    public $collectHeros;
-
-    /**
-     * 记录一下曾经的最大UID
-     * @var type int
-     */
-    public $recordMaxUID;
-
-    /**
-     *
-     * @param CRedisUtil $mem
-     */
-    public function InitializeHero() {
-        $this->displayHeroUID = null;
-        $this->firendSupportHeroUID = null;
-        $this->maxCollectCount = glc()->Game_CollectHero_BasicMaxCount;
-        $this->recordMaxUID = 0;
-        $this->collectHeros = ObjectInit();                                     # 初始化英雄集合
-        $hids = GameConfig::primordial_data()->User_Heros;                      # 设置初始英雄
-        my_Assert(null != $hids, ErrCode::err_const_no);
-        foreach ($hids as $heroModelId_yanlingid) {
-            list($heroModelId, $yanlingId) = explode('_', $heroModelId_yanlingid);
-            $uid = HeroProc::CreateNewGameHeroUID($this->collectHeros, $this->recordMaxUID);
-            $this->recordMaxUID = $uid;
-            $hero = HeroProc::getGameHeroModelInstance($heroModelId, $uid);
-            StatisticsProc::TargetStatistics(Enum_TargetStatistics::HuanLingShiId_UserNum, $heroModelId);
-            StatisticsProc::TargetStatistics(Enum_TargetStatistics::HuanLingShiLevel_UserNum, $heroModelId, "1");
-//            // 初始化言灵
-//            $yanlingMo = GameConfig::item_yanling_getItem($yanlingId);
-//            my_Assert(null != $yanlingMo, ErrCode::err_const_no);
-//            $yl_uid = StoreProc::PutYanLingInStore($yanlingMo->typeId, req());
-//            ctx()->store->yanling->$yl_uid->herouid = $uid;
-//            $position = $yanlingMo->position;
-//            $hero->yanling->$position = array("itemuid" => $yl_uid);            # 装备位置
-
-            $this->collectHeros->$uid = $hero;
-            $this->displayHeroUID = $uid;
-            $this->firendSupportHeroUID = $uid;
-        }
-    }
-
-    /**
-     *
-     * @param type $heroMoId
-     * @return Ins_UserHero
-     */
-    public function GetHeroByMoID($heroMoId) {
-        my_Assert(null != $this->collectHeros, ErrCode::err_innerfault);
-
-        foreach ($this->collectHeros as $hid => $hero) {
-            isEditor() and $hero = new Ins_UserHero();
-            if ($hero->typeId == $heroMoId) {
-                return $hero;
-            }
-        }
-        return null;
-    }
-
-}

Gameserver/App/model/User/Info_UserGateDifficulty.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * 玩家关卡数据 extends Object
- * @version
- *          1.0.0 Created at 2017-2-14. by --gwang
- * @author gwang (mail@wanggangzero.cn)
- * @copyright ? 2017-2-14, SJZ LoyalSoft Corporation & gwang. All rights reserved.
- */
-class Info_UserGateDifficulty extends Object_ext {
-    ///目前是按关卡的难度来分的结果
-
-    /**
-     * 普通关卡
-     */
-    public $normal;
-
-    /**
-     * 困难关卡
-     */
-    public $hard;
-
-    /**
-     * 精英关卡
-     */
-    public $elite;
-
-//
-// <editor-fold defaultstate="collapsed" desc="'淘汰'的功能">
-
-    /**
-     * 战斗总次数
-     * @deprecated since 2021年3月2日 没人关注这个了 
-     */
-    public $TotalNum;
-
-    /**
-     * 当天战斗的次数
-     * @deprecated since version 2021.3.2 策划都不知道有这种设定了吧, 狗熊掰棒子
-     */
-    public $Times;
-
-    /**
-     * 已经消灭的bossid集合
-     * @deprecated since version 2021.3.2 没人关注这个了(缺少延续性)
-     * @var array
-     */
-    public $killedBoss;
-
-    /**
-     * 章节星数奖励
-     * @deprecated since version 2021.3.2 后面没有评星的需求了, 打关卡主要是掉落物品.
-     * @var { "chapterId":{"1":[],"2":[],"3":[]},"chapterId":{...}:.... }
-     */
-    public $chapterStarsRwd;
-
-// </editor-fold>
-//
-
-    function __construct($arg = null) {
-        if (null === $arg) {
-            $this->TotalNum = 0;
-            $this->Times = 0;
-            $this->normal = new Ins_UserGatesModel();
-            $this->normal->initialize();
-            $this->hard = new Ins_UserGatesModel;
-            $this->hard->initialize();
-            $this->elite = new Ins_UserGatesModel;
-            $this->elite->initialize();
-            $this->killedBoss = ArrayInit();
-            $this->chapterStarsRwd = ObjectInit();
-        } else {
-            parent::__construct($arg);
-        }
-    }
-
-}

Gameserver/App/model/User/Info_UserGuild.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-//
-///*
-// * To change this license header, choose License Headers in Project Properties.
-// * To change this template file, choose Tools | Templates
-// * and open the template in the editor.
-// */
-//
-///**
-// * Description of UserGuildModel
-// *
-// * @author cyzhao
-// */
-//class UserGuildModel {
-//
-//    //put your code here
-//    public static function Clear() {
-//        $userGuildinfo = new UserGuildModel();
-//        $userGuildinfo->ts = now();
-//        $userGuildinfo->joints = now(); //玩家公会的创建时间
-//        $userGuildinfo->guildId = 0;
-//        //s$userGuildinfo->guildName;
-//        $userGuildinfo->cupScore = 0;
-//        $userGuildinfo->appliedguildlist = array();
-//        $userGuildinfo->appliedguildRecord = ObjectInit();
-//        $userGuildinfo->contribute = 0; //贡献度
-////        $userGuildinfo->level;
-////        $userGuildinfo->name;
-//        //$userGuildinfo->fightPower;
-//        $userGuildinfo->requestCardTs = 0;
-//        $userGuildinfo->donateCount = ObjectInit();
-//        $userGuildinfo->allDonateCount = 0;
-//        //$userGuildinfo->position = 0; //职位
-//
-//        return $userGuildinfo;
-//    }
-//
-//    /**
-//     * 检查玩家每日需要清理的状态
-//     * @param UserGuildModel $userGuildInfo
-//     */
-//    static function checkFirstlog($userGuildInfo) {
-//        #每天清理
-//        if (TimeUtil::tsDay() > TimeUtil::tsDay($userGuildInfo->ts)) {
-//            $userGuildInfo->allDonateCount = 0;
-//        }
-//        #清理过期捐献信息
-//        $donateCount = $userGuildInfo->donateCount;
-//        foreach ($donateCount as $key => $value) {
-//            if (now() - $value->ts >= glc()->Guild_DonateCoolingTime) {//捐献冷却时间到了
-//                unset($donateCount->$key);
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 初始化个人公会信息
-//     * @param type $userGuildInfo
-//     * @param type $uid
-//     * @param type $baseInfo
-//     * @param type $mem
-//     * @param type $guildId
-//     * @param type $zoneid
-//     */
-//    static function userGuildInfoInit($userGuildInfo, $uid, $baseInfo, $mem, $zoneid) {
-//        #self::Clear();
-//        $userGuildInfo->ts = now();
-////        if ($guildId != 0) {
-////            $guildInfo = GuildProc::getMemGuildInfo($mem, $guildId, $zoneid);
-////            $userGuildInfo->guildName = $guildInfo->name;
-////        }
-////        $key_cur = MemKey_GameRun::Game_PVPScoreByZone_zset($zoneid);   # 总积分榜
-////        $score = $mem->zscore($key_cur, $uid);
-////        $cupScore = $score == null ? 0 : $score;
-////        $userGuildInfo->cupScore = $cupScore;
-//        $userGuildInfo->name = $baseInfo->name;
-//        $userGuildInfo->level = $baseInfo->level;
-//        //$userGuildInfo->fightPower = GuildProc::initFightTeamInfo($mem, $uid, $zoneid); #$game->heroTeamConfig;
-//        $userGuildInfo->uid = $uid;
-//        $userGuildInfo->headImg = $baseInfo->headImg;
-//        $userGuildInfo->imgBorderId = $baseInfo->imgBorderId;
-//    }
-//
-//}

Gameserver/App/model/User/Info_UserInteract.php

@@ -1,179 +0,0 @@
-<?php
-
-//
-//namespace loyalsoft;
-//
-///**
-// * 用户交互信息数据模型
-// * 注：mem中是独立于userInfo的存在, 以减少交互操作的时候出现写入冲突产生覆盖的情况。
-// * attention: 读写数据的时候,利用redis的watch机制实现事务写入,加上自动重试机制. (Ps.这是目标,gwang.20170426153414)
-// *
-// * @version
-// *          1.0.0 Created at 2017-3-25. by --gwang
-// * @author gwang (mail@wanggangzero.cn)
-// * @copyright ? 2017-3-25, SJZ LoyalSoft Corporation & gwang. All rights reserved.
-// */
-//class UserInteractModel extends Object_ext
-//{
-//
-//    public $uid;
-//    public $zoneid;
-//    // ------------字段声明-------------
-//
-//    /**
-//     * 邮件列表
-//     * @var object
-//     */
-//    public $mailQueue;
-//
-//    /**
-//     * 邮件序列id
-//     * @var int
-//     */
-//    public $mailMaxId = 0;
-//
-//    /**
-//     * 系统邮件记录[存在于系统公共缓冲区的邮件仅能接收一次]
-//     * @var array
-//     */
-//    public $sysMailRecord;
-//
-//// ------------ 初始化 ------------------
-//
-//    /**
-//     * 创建账号的时候执行初始化.
-//     */
-//    public function initialize()
-//    {
-//        $this->mailQueue = ObjectInit();
-//        $this->mailMaxId = 10000;
-//        $this->sysMailRecord = ArrayInit();
-//    }
-//
-//// ----------- 方法 ---------------------
-//    // <editor-fold defaultstate="collapsed" desc="     公开方法    ">
-//
-//    /**
-//     * 新增系统邮件
-//     * @param int  $sysId    邮件的id
-//     * @param string $title  邮件标题
-//     * @param type $content  邮件正文
-//     * @param type $itemid   道具id （附加于tag字段）
-//     * @param type $startts  生效时间
-//     * @param type $endts    过期时间
-//     * @param type $interact  目标交互体
-//     */
-//    static function insertSysMail($sysId, $title, $content, $itemid, $startts, $endts, &$interact)
-//    {
-//        self::insertMail("0", "系统邮件", "", "", 1, $title, $content, $itemid, $startts, $endts, $interact);
-//        if ($sysId != 0) {
-//            $sysMailRecord = $interact->sysMailRecord;
-//            $sysMailRecord[] = $sysId;
-//            $interact->sysMailRecord = $sysMailRecord;
-//        }
-//    }
-//
-//    /**
-//     * 新增邮件
-//     * @param string $fromoid 发送人的oid
-//     * @param type $name      发送人的呢称
-//     * @param type $pf        pf
-//     * @param type $img       图像
-//     * @param type $type      邮件类型
-//     * @param string $title   邮件标题
-//     * @param string $content 邮件正文
-//     * @param type $tag   额外标签可以传递数据
-//     * @param ts $startts 生效时间
-//     * @param ts $endts   过期时间
-//     * @param UserInteractModel $interact 目标交互体
-//     * @return void
-//     */
-//    static function insertMail($fromoid, $name, $pf, $img, $type, $title, $content, $tag, $startts, $endts, &$interact)
-//    {
-//        if (CommUtil::tsCurrent() > $endts) {
-//            return;
-//        }
-//        $interact->mailMaxId++;
-//        $mailMaxId = $interact->mailMaxId;
-//        $mail = new EmailModel;
-//        $mail->fromoid = $fromoid;
-//        $mail->name = $name;
-//        $mail->pf = $pf;
-//        $mail->img = $img;
-//        $mail->type = $type;
-//        $mail->title = $title;
-//        $mail->content = $content;
-//        $mail->tag = $tag;
-//        $mail->startts = $startts;
-//        $mail->endts = $endts;
-//        $mail->ts = CommUtil::tsCurrent();
-//        $interact->mailQueue->$mailMaxId = $mail;
-//        # 记录日志
-//        self::_insertMailRecord($interact->oid, $interact->zoneid, $mail, $mailMaxId);
-//    }
-//
-//    /**
-//     * 插入发送邮件的日志
-//     * @param string uid
-//     * @param int $zoneid
-//     * @param EmailModel $mail
-//     * @param int $mailId
-//     */
-//    static function _insertMailRecord($uid, $zoneid, $mail, $mailId)
-//    {
-//        $sql = <<<ins
-//INSERT INTO `tab_mailrecord` (oid,`zoneid`,mailId, fromoid,`name`, pf,img,type,title,content,tag,startts,endts,insertts)
-//    VALUES ('%s',%d,%d,'%s','%s','%s','%s',%d,'%s','%s','%s',%d,%d,now());
-//ins;
-//        $insertstr = sprintf($sql, $uid, $zoneid, $mailId, $mail->fromoid, $mail->name, #
-//                $mail->pf, $mail->img, $mail->type, $mail->title, $mail->content, #
-//                $mail->tag, $mail->startts, $mail->endts);
-//        daoInst()->query($insertstr);
-//    }
-//
-//    /**
-//     * 获取邮件序列[自动过滤尚未到(生效)期的邮件,自动删除已过期的邮件]
-//     * @param UserInteractModel $interact Description
-//     */
-//    static function getMailQueue($interact)
-//    {
-//        $mailList = ObjectInit();
-//        $mailQueue = $interact->mailQueue;
-//        foreach ($mailQueue as $mailId => $mail) {
-//            $ts = CommUtil::tsCurrent();
-//            if ($ts >= $mail->startts) {
-//                if ($ts > $mail->endts) {
-//                    self::deleteMail($mailId, $interact);
-//                } else {
-//                    $mailList->$mailId = $mail;
-//                }
-//            }
-//        }
-//        return $mailList;
-//    }
-//
-//    /**
-//     * 删除邮件[附件接收完毕之后]
-//     * @param type $mailId
-//     * @param UserInteractModel $interact Description
-//     */
-//    static function deleteMail($mailId, &$interact)
-//    {
-//        self::_drawMailRecord($mailId, $interact); # 领取记录
-//        StlUtil::dictRemove($interact->mailQueue, $mailId);
-//    }
-//
-//    /**
-//     * 更新领取记录
-//     * @param type $mailId
-//     * @param UserInteractModel $interact
-//     */
-//    static function _drawMailRecord($mailId, $interact)
-//    {
-//        $sql = "update tab_mailrecord set drawedts=now() where mailId=%d and zoneid=%s and uid=%s;";
-//        $updatestr = sprintf($sql, $mailId, $interact->zoneid, $interact->uid);
-//        daoInst()->query($updatestr);
-//    }
-//
-//// </editor-fold>
-//}

Gameserver/App/model/User/Info_UserPVP.php

@@ -1,156 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- *  玩家竞技场数据
- * @version
- *          2.0.0 改自原PVP数据(内容基本全换). 2020.5.7 -- gwang
- *          1.0.0 Created at 2017-7-4. by --gwang
- * @author gwang (mail@wanggangzero.cn)
- * @copyright ? 2017-7-4, SJZ LoyalSoft Corporation & gwang. All rights reserved.
- */
-class Info_UserPVP extends Object_ext {
-
-    /**
-     * @var array[string] 每日/当天已挑战对手记录(有想法设定尽量不重复当天已经刷到过的对手)
-     */
-    #[ArrayType]
-    public $dailyMatchRecord = array();
-
-    /**
-     * @var object 防守阵容
-     */
-    #[ArrayType]
-    public $defTeam = array("0", "0", "0");
-
-    /**
-     * @var int 竞技币
-     */
-    public $pvpCoins = 0;
-
-    /**
-     * @var int 竞技场挑战票
-     */
-    public $fightTicket = 0;
-
-    /**
-     * @var 下次刷新时间
-     */
-    public $fightTicketRefreshTs = 0;
-
-    /**
-     * @var int 每天有3次免费挑战次数,每天8天重置
-     */
-    public $freeFightTickets = 0;
-
-    /**
-     * @var int 挑战记录最后拉取时间戳(晚于此时间戳的记录为新记录,显示小红点)
-     */
-    public $lastCheckDefLog_ts = 0;
-
-    /**
-     * @var type 当前竞技商店内道具列表(子结构可以记录售罄状态)
-     */
-    public $curShopItems;
-
-    /**
-     * @var int 商店下次刷新的时间戳(24小时自动刷新, 提前刷新扣钻)
-     */
-    public $shopRefreshTs = 0;
-
-    /**
-     * @var 今日未发放奖励(tsDay < today =>发放奖励并同步到today)
-     */
-    public $haventReward_tsDay = 0;
-
-    /**
-     * @var 赛季未发放奖励(seasonId < curSeason =>发放奖励并同步到curSeason)
-     */
-    public $haventReward_season = 0;
-
-    /**
-     * @var ts 下次刷新对手时间戳,控制下刷新频率
-     */
-    public $nextRefreshTs = 0;
-
-    /**
-     * @var int 总胜利场次
-     */
-    public $totalWin = 0;
-
-    public function refreshDailyData() {
-        // 刷新免费挑战次数
-        if (totalDays($this->fightTicketRefreshTs) <= totalDays()) {                    # 刷新时间<=今天,该刷新了
-            $this->freeFightTickets = 3;                                        # 重置为3, 此处的3可以改为读取配置数据
-            $this->fightTicketRefreshTs = now() + 86400;                        # 刷新时间设置为明天
-        }
-    }
-
-    /**
-     * 发送上榜奖励(昨天的奖励,以及上一赛季的奖励)
-     * @param type $zoneid
-     * @param type $uid
-     * @param type $seasonId
-     */
-    public function sendRewardEmail($zoneid, $uid, $seasonId) {
-        $key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $seasonId); # 积分总榜
-        if ($this->haventReward_season >= 0 && $this->haventReward_season < $seasonId) { # 尚未发放上赛季奖励
-            $haventKey = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $this->haventReward_season);
-            // todo:发放上赛季奖励邮件
-            $rank = PVPProc::_getRank_by_uid($uid, $haventKey);                    # 查询上赛季排名
-            if ($rank <= PVPProc::pvpMaxRank) {                                    # 防御未上榜
-                foreach (GameConfig::pvp_rankreward() as $cfg) {
-                    isEditor() and $cfg = new \sm_pvp_rankreward();
-                    if ($rank >= $cfg->minRank && $rank <= $cfg->maxRank) {     # 找到对应的名次段
-                        EmailProc::SendPvpRankReward_Season($zoneid, $uid, $rank); # 发放奖励邮件(竞技币)
-                    }
-                }
-                UserProc::updateUserInfo();
-            }
-        }
-        $this->haventReward_season = $seasonId;                                  # 更新待发奖赛季
-        if ($this->haventReward_tsDay < totalDays() - 7) {
-            $this->haventReward_tsDay = totalDays() - 7;
-        }
-        for ($this->haventReward_tsDay; $this->haventReward_tsDay < totalDays(); $this->haventReward_tsDay++) {
-//        if ($this->haventReward_tsDay == tsDay() - 1) {                          # 尚未发放昨天奖励
-            $haventKey_day = MemKey_GameRun::Game_PVPScoreByZone_zset_Day($zoneid, $this->haventReward_tsDay);
-            if (!gMem()->exists($haventKey_day) && $this->haventReward_tsDay == totalDays() - 1) { # 昨天的积分记录不存在
-                gMem()->zcopy($key, $haventKey_day);                            # 复制一份当前积分作为昨天的截止积分榜
-            } else {
-                // 不是昨天登录的, 且没有对应的数据 就不再复制当前数据了.直接未上榜处理
-            }
-            $rank = PVPProc::_getRank_by_uid($uid, $haventKey_day);                # 查询上一天排名
-            if ($rank <= PVPProc::pvpMaxRank) {                                    # 防御未上榜
-                foreach (GameConfig::pvp_rankreward() as $cfg) {
-                    isEditor() and $cfg = new \sm_pvp_rankreward();
-                    if ($rank >= $cfg->minRank && $rank <= $cfg->maxRank) {     # 找到对应的名次段
-                        EmailProc::SendPvpRankReward_Lastday($zoneid, $uid, $rank); # 发放奖励邮件(竞技币)
-                    }
-                }
-                UserProc::updateUserInfo();
-            }
-//        }
-        }
-        $this->haventReward_tsDay = totalDays();                                     # 更新待发放奖励日期
-    }
-
-    public function __construct($arg = null) {
-        parent::__construct($arg);
-        if (null == $this->curShopItems) {
-            $this->curShopItems = GameConfig::pvp_shop();
-        }
-        if ($this->defTeam[0] <= 0) {
-            $one = 1;
-            if (null != ctx()) {
-                $teamCfg = JsonUtil::decode(ctx()->heroTeamConfig);
-                $teams = $teamCfg->teamDic;
-                if (isset($teams->$one->heros)) {
-                    $this->defTeam = array_slice($teams->$one->heros, 0, 3);
-                }
-            }
-        }
-    }
-
-}

Gameserver/App/model/User/Info_UserSecretshop.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * 玩家神秘商城数据
- * @version
- *          1.0.0 Created at 2017-10-21. by --gwang
- * @author gwang (mail@wanggangzero.cn)
- * @copyright ? 2017-10-21, SJZ LoyalSoft Corporation & gwang. All rights reserved.
- */
-class Info_UserSecretshop extends Object_ext
-{
-
-    /**
-     * @var object {itemid:cishu,itemid:cishu,...} 当前商品列表
-     */
-    public $currentItems;
-
-    /**
-     * @var int 上次刷新时间戳
-     */
-    public $lastRefreshTs = 0;
-
-    /**
-     * @var int 当天付费刷新次数
-     */
-    public $refreshedTimes = 0;
-
-    /**
-     * 构造函数,能够智能提取关联数组或者是object中的字段进行初始化.
-     * Ps. 不会进行递归类型检查, php的serilize函数也没有附带字段的类型信息
-     */
-    function __construct($arg = null)
-    {
-        if (func_num_args() == 1 && !is_null($arg)) {
-            parent::__construct($arg);
-        }
-        if (is_null($this->currentItems)) {
-            $this->currentItems = ObjectInit();
-        }
-    }
-
-}

Gameserver/App/model/User/Info_UserShop.php

@@ -1,160 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-use Attribute;
-
-/**
- * Description of UserShopInfoModel
- * 商城相关数据
- * @author Administrator
- */
-class Info_UserShop extends Object_ext {
-    //put your code here
-
-    /**
-     * 已购每日礼包集合
-     * @var []
-     */
-    #[ArrayType]
-    public $purchasedDailyLimitPackages = array();
-
-    /**
-     * 已购每周礼包集合
-     * @var []
-     */
-    #[ArrayType]
-    public $purchasedWeeklyLimitPackages = array();
-
-    /**
-     * 已购每月礼包集合
-     * @var []
-     */
-    #[ArrayType]
-    public $purchasedMonthlyLimitPackages = array();
-
-    /**
-     * @var int 普通月卡购买时间戳
-     */
-    public $monthlyVIP1_ts = 0;
-
-    /**
-     * @var int 至尊月卡购买时间戳
-     */
-    public $monthlyVIP2_ts = 0;
-
-    /**
-     * 每日特惠礼包领取记录
-     * @var type
-     */
-    #[ArrayType]
-    public $daliySpecialPackages = array();
-
-    /**
-     * 重置每日特惠时间
-     * @var type
-     */
-    public $daliySpecialClear_ts = 0;
-
-    /**
-     * 每日特惠卡周卡开始时间
-     * @var type
-     */
-    public $daliySpecial_ts = 0;
-
-    /*
-     * 充值返利奖品记录
-     */
-
-    #[ArrayType]
-    public $rechargeRebateRewardsList = array();
-
-    /*
-     * 限时活动--礼包领取记录
-     */
-
-    #[ArrayType]
-    public $limitTsRewardsList = array();
-
-    /**
-     * 充值功能里记录充值金额,每种不同的金额都有一次首充,所以要做记录
-     * @var type
-     */
-    #[ArrayType]
-    public $rechargeRecordList = array();
-
-    /**
-     * @var int/ins_Accumulate 商城累充功能数据
-     */
-    public $shopAccumulateData = 0;
-    
-    /**
-     * 
-     * @var type
-     */
-    public $fRechargeTime;
-    
-    /**
-     * 首充记录
-     * @var type
-     */
-    public $fRechargeRecord;
-    
-    /**
-     * 每天累计金额统计数值
-     * @var type 
-     */
-    public $dayRechargeAmt = 0;
-
-    /**
-     * 每周累计金额统计数值
-     * @var type 
-     */
-    public $weekRechargeAmt = 0;
-
-    /**
-     * 每天累计奖励领取记录
-     * @var type 
-     */
-    #[ArrayType]
-    public $dayRechargeReceived = array();
-
-    /**
-     * 每周累计奖励领取记录
-     * @var type 
-     */
-    #[ArrayType]
-    public $weekRechargeReceived = array();
-
-    /**
-     * 终身礼包购买记录
-     * @var type 
-     */
-    #[ArrayType]
-    public $lifelongGiftReceived = array();
-    
-    /**
-     * 套装礼包购买记录
-     * @var type 
-     */
-    public $suitGiftStartTs = 0;
-    
-    /**
-     * 套装礼包购买记录
-     * @var type 
-     */
-    #[ArrayType]
-    public $suitGiftReceived = array();
-    
-    /**
-     * 
-     */
-    public function __construct($args = null) {    
-        if($args == null){
-            $this->fRechargeTime = new \stdClass();
-            $this->fRechargeRecord = new \stdClass();
-        } else {
-            parent::__construct($args);   
-        }                    
-    }
-}

Gameserver/App/model/User/Ins_Accumulate.php

@@ -1,119 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of Ins_Accumulate
- * 累充功能
- * @author gwang
- */
-class Ins_Accumulate {
-
-    /**
-     * @var int 内部数据 |31~16(bitflag)|15~0(tsDay_begin)|
-     */
-    private $data = 0;
-    private static $amountArr = array(6, 38, 98);
-    private static $dayArr = array(1, 2, 3);
-
-    /**
-     * 计算定位
-     * @staticvar array $amountArr
-     * @staticvar array $dayArr
-     * @param type $amount
-     * @param type $day
-     * @return int
-     */
-    private static function getIndex($amount, $day): int {
-        my_Assert(in_array($amount, self::$amountArr), "累充金额错误!");
-        my_Assert(in_array($day, self::$dayArr), "累充奖励天数错误!");
-        $x = array_search($amount, self::$amountArr);
-        $y = array_search($day, self::$dayArr);
-        $i = $x * 3 + $y;            # 6-1,6-2,6-3,38-1,38-2,38-3,98-1,98-2,98-3
-        return 16 + $i;
-    }
-
-    /**
-     * @param int $amount 金额(6,38,98)
-     * @param int $day    第几天(1,2,3)
-     * @return bool 判断指定礼包是否已领取
-     */
-    public function IsDrawed($amount, $day): bool {
-        return Bits::GetBitValue($this->data, self::getIndex($amount, $day));
-    }
-
-    /**
-     * 设置已领取指定礼包
-     * @param int $amount 金额(6,38,98)
-     * @param int $day    第几天(1,2,3)
-     * @return int 最新data
-     */
-    public function SetDrawd($amount, $day): int {
-        return Bits::SetBitValue($this->data, self::getIndex($amount, $day), true);
-    }
-
-    /**
-     * 设置开始时间(tsDay)
-     * @param type $tsDay
-     * @return int 内部data值
-     */
-    public function SetBeginDay($tsDay): int {
-        $this->data &= -65535;
-        $this->data |= $tsDay;
-        return $this->data;
-    }
-
-    /**
-     * @return int 开始于哪天
-     */
-    public function BeginDay(): int {
-        return $this->data & 65535;       # 低16位保存开始时间
-    }
-
-    /**
-     * @return int
-     */
-    public function Day() {
-        return tsDay() - $this->BeginDay() + 1;
-    }
-
-    /**
-     * @return int 结束于哪天
-     */
-    public function EndDay(): int {
-        return $this->BeginDay() + 3;
-    }
-
-    /**
-     * 构造函数
-     * @param type $intVal
-     */
-    public function __construct($intVal = 0) {
-        my_Assert($intVal > 0, "咱不接受负数参数!");                              # 防御: 不会出现负值
-        $this->data = $intVal;
-    }
-
-    /**
-     * @return int 实际的数据
-     */
-    public function Data(): int {
-        return $this->data;
-    }
-
-    /**
-     * 方便调试打印
-     * @return string
-     */
-    public function __toString() {
-        $nl = (php_sapi_name() === 'cli') ? PHP_EOL : "<br/>";
-        $str = "" . __CLASS__ . $nl;
-        foreach (self::$amountArr as $amt) {
-            foreach (self::$dayArr as $d) {
-                $str .= "($amt,$d) := " . ($this->IsDrawed($amt, $d) ? "true" : "false") . $nl;
-            }
-        }
-        $str .= "BeginDay := {$this->BeginDay()}";
-        return $str;
-    }
-
-}

Gameserver/App/model/User/Ins_AuctionItemModel.php

@@ -1,91 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of Ins_AuctionItemModel
- *
- * @author cyzhao
- */
-class Ins_AuctionItemModel {
-
-    /**
-     * 拍品id, uniq
-     * @var type
-     */
-    public $itemid;
-
-    /**
-     * 分区id
-     * @var type
-     */
-    public $zoneid;
-
-    /**
-     * 物品内容
-     * @var string  "itemid,num;itemid,num;..."
-     */
-    public $contents; # 物品内容
-
-    /**
-     * 起拍价
-     * @var int
-     */
-    public $startprice;
-
-    /**
-     * 一口价
-     * @var type
-     */
-    public $buyoutPrice;
-
-    /**
-     * 加价幅度（每次加价不得低于加价幅度，高于加价幅度可以自由出价）
-     * @var int
-     */
-    public $addstep;
-
-    /**
-     * 标签1
-     * @var type
-     */
-    public $tag1; //标签1
-
-    /**
-     * 标签2
-     * @var type
-     */
-    public $tag2; //标签2
-    // ---- 运行时字段 -----
-
-    /**
-     * 开始时间
-     * @var int
-     */
-    public $startts; #
-
-    /**
-     * 结束时间
-     * @var int
-     */
-    public $endts; #
-    public $sellerid;  # 卖家ID
-    public $sellername; # 卖家昵称
-
-    /**
-     *
-     * 竞价历史
-     * @var object:{ts:{oid:"",name:"",price:""},ts2:{...}}
-     */
-    public $auchistory;
-
-    /**
-     * 当前最高出价
-     * @var int
-     */
-    public $currprice;
-    public $currpeopleid; # 当前最高价者ID
-    public $currpeoplename; # 当前最高价者昵称
-    public $result; # 拍卖结果, 结算以后会有:成交,流拍
-   
-}

Gameserver/App/model/User/Ins_ChuansongzhenMapData.php

@@ -1,42 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of Ins_ChuansongzhenMapData
- *
- * @author c'y'zhao
- */
-class Ins_ChuansongzhenMapData extends Object_ext{
-    
-    public $mapId;
-
-
-    /**
-     * @var int 使用传送门的场景的地图id
-     */
-    public $lastMapId;
-
-    /**
-     * @var float 具体位置 x
-     */
-    public $position_x;
-    
-    /**
-     * 具体位置 y
-     * @var float
-     */
-    public $position_y;
-    
-    /**
-     * 具体位置 z
-     * @var float
-     */
-    public $position_z;
-}

Gameserver/App/model/User/Ins_FootHold.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of Ins_FootHold
- * 据点信息数据结构
- * @author gwang
- * @version
- *         2022.3.11 created.
- */
-class Ins_FootHold extends Object_ext {
-
-    /**
-     * @var int 据点编号
-     */
-    public $mapId;
-
-    /**
-     * @var Enum_FootHoldType 当前地图类型(某些条件下可以修改地图类型从据点转为非据点)
-     */
-    public $curMapType;
-
-    /**
-     * 探索进度
-     * @var type
-     */
-    public $curExploreProgress = 0;
-
-    /**
-     * @var bool 探索奖励是否已经领取
-     */
-    public $exploreRewardGeted = false;
-
-    /**
-     * @var bool 传送阵是否可用
-     */
-    public $transmissionIsOk = false;
-
-    /**
-     * @var 已经解锁(第一次跳转到本地图后解锁), 0 未解锁, 1 已解锁
-     */
-    public $unlocked = 0;
-
-}

Gameserver/App/model/User/Ins_Mainland.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * 八大陆数据 extends Object
- * 困难难度不会垮大陆关联, 只在本大陆中同一个区域或者不同区域之间互相关联(此系采访策划后答复)
- * @deprecated since 2022.3 换开放地图版转 Info_NewMap->Ins_FootHold
- * @version
- *          1.0.0 八大陆数据 at 2021年3月2日14:37:51 -gwang  
- * @author gwang (mail@wanggangzero.cn)
- * @copyright ? 2017-2-14, SJZ LoyalSoft Corporation & gwang. All rights reserved.
- */
-class Ins_Mainland extends Object_ext {
-
-    /**
-     * @var int 当前大陆id
-     */
-    public $landId;
-
-    /**
-     * 普通关卡
-     */
-    public $normal;
-
-    /**
-     * 困难关卡
-     */
-    public $hard;
-
-    /**
-     * 精英关卡
-     */
-    public $elite;
-
-    function __construct($arg = null) {
-        if (null === $arg) {
-            $this->normal = new \stdClass();
-            $this->hard = new \stdClass();
-            $this->elite = new \stdClass;
-        } else {
-            parent::__construct($arg);
-        }
-    }
-
-    public function getZoneMos() {
-        $ldc = GameConfig::gate_mainland_getItem($this->landId);
-        $zidArr = explode(',', $ldc->containZones);
-        $ret = array();
-        $w = (array) GameConfig::gate_zone();
-        array_walk($w, function ($v, $k) use ($zidArr, &$ret) {
-            if (in_array($k, $zidArr)) {
-                $ret[] = $v;
-            }
-        });
-        return $ret;
-    }
-
-}

Gameserver/App/model/User/Ins_Mapzone.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * 玩家关卡地图区域数据
- * @author gwang
- * @deprecated since 2022.3 换开放地图版转 Info_NewMap->Ins_FootHold
- */
-class Ins_Mapzone extends Object_ext {
-
-    /**
-     * 当前区域id
-     * @var type
-     */
-    public $zoneid;
-
-    /**
-     * 最后一次挑战的关卡ID
-     * @var int
-     */
-    public $latest = 1;
-
-    /**
-     * 已挑战的最高关卡Id(用于限定解锁关卡)
-     * @var int
-     */
-    public $highest = 1;
-
-    /**
-     * 关卡具体数据()
-     * @var array[]
-     */
-    public $gates = array();
-
-    /**
-     * 构造函数
-     * @param type $arg
-     */
-    function __construct($arg = null) {
-        if (null === $arg) {
-            $this->gates = array();
-        } else {
-            parent::__construct($arg);
-        }
-    }
-
-}

Gameserver/App/model/User/Ins_TaskStep.php

@@ -86,18 +86,7 @@ class Ins_TaskStep extends Object_ext {
                 foreach ($arr as $plot) {
                     isEditor() and $plot = new \sm_plot();
                     if (!empty($plot->presentItem)) {
-                        if (strtolower($plot->presentItem) == strtolower("unlockBuild")) { # 特殊处理, 剧情中解锁建筑
-                            ctx()->privateState->unlockedBuild[] = $plot->presentEffect;
-                            if ($plot->presentEffect == 1000) {
-                                $college = new Info_College();
-                                $college->setFunUnluckTs();
-                            }
-                            StatisticsProc::TargetStatistics(Enum_TargetStatistics::unlockbuidId, $plot->presentEffect);
-                        } else if (strtolower($plot->presentItem) == strtolower("rename")) {
-                            // 跳过特殊字符串
-                        } else {
-                            StoreProc::AddMultiItemInStore($plot->presentItem);
-                        }
+                        StoreProc::AddMultiItemInStore($plot->presentItem);
                     }
                     if (!empty($plot->recycleItem)) {
                         $val = explode(",", $plot->recycleItem);
@@ -109,10 +98,6 @@ class Ins_TaskStep extends Object_ext {
             case Enum_EventActionType::UnlockBuild:                             # 解锁建筑
                 ctx()->privateState->unlockedBuild[] = $act->parameters;
                 StatisticsProc::TargetStatistics(Enum_TargetStatistics::unlockbuidId, $act->parameters);
-                if ($act->parameters == 1000) {
-                    $college = new Info_College();
-                    $college->setFunUnluckTs();
-                }
                 break;
         }
     }
@@ -254,8 +239,8 @@ class Ins_TaskStep extends Object_ext {
 //                        //break;
 //                    }
                     if ($yl->level >= $lv) {
-                        $lv = $yl->level;                      
-                    }                   
+                        $lv = $yl->level;
+                    }
                 }
                 return $lv;
             case Enum_TaskCmdType::HeroWearingYanling:                 # 检查唤灵师是否已经装备了言灵
@@ -291,7 +276,7 @@ class Ins_TaskStep extends Object_ext {
             case Enum_TaskCmdType::passEndlessCarbonN:                          # 通关无尽塔X层
 //                isEditor() and $hero = new Ins_UserHero();
                 $num = ctx()->privateState->endlessTower - 1;
-                return $num;               
+                return $num;
             default:
                 break;
         }
@@ -367,5 +352,4 @@ class Ins_TaskStep extends Object_ext {
                 break;
         }
     }
-
 }

Gameserver/App/model/User/Ins_UGate.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of UGateModel
- * @version
- *          1.0.0 Created at 2017-2-14. by --gwang
- * @author gwang (mail@wanggangzero.cn)
- * @copyright ? 2017-2-14, SJZ LoyalSoft Corporation & gwang. All rights reserved.
- */
-class Ins_UGate extends Object_ext {
-
-    /**
-     *
-     * @var int 得分评星 
-     */
-    public $star = 0;
-    public $cleared = 0;
-
-    /**
-     *
-     * @var int 挑战次数
-     */
-    public $challengeTimes = 0;
-
-}

Gameserver/App/model/User/Ins_UserGatesModel.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * 玩家关卡数据模型
- * 当前进度,体力,积分等等...
- * @author gwang
- */
-class Ins_UserGatesModel extends Object_ext {
-
-    /**
-     * 最后一次挑战的关卡ID
-     * @var int
-     */
-    public $latest = 1;
-
-    /**
-     * 已挑战的最高关卡Id(用于限定解锁关卡)
-     * @var int
-     */
-    public $highest = 503000;   // 直接开到第9关                       
-
-    /**
-     * 关卡具体数据
-     * @var assoc_array/stdclass
-     */
-    public $gates;
-
-    //put your code here
-
-    /**
-     * 初始化
-     * @return Ins_UserGatesModel
-     */
-    function initialize() {
-        // 用于给各个字段赋默认初始值
-        $this->gates = ObjectInit();
-        return $this;
-    }
-
-}

Gameserver/App/model/User/Ins_Weapon.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of Ins_Weapon
- *
- * @author gwang
- */
-class Ins_Weapon extends Object_ext {
-
-//put your code here
-    public $typeId = 0;
-    public $herouid = 0;
-    
-    /**
-     * 星级 突破的时候会长星
-     * @var type
-     */
-    public $starLevel = 0;
-    
-    /**
-     * 等级
-     * @var type
-     */
-    public $level=1;
-    
-    /**
-     * 经验
-     * @var type
-     */
-    public $exp=0;
-
-    public function __construct($arg = null) {
-        parent::__construct($arg);
-    }
-
-    /**
-     * @return \sm_item_weapon item_weapon 武器的模板数据 
-     */
-    public function mo() {
-        return GameConfig::item_weapon_getItem($this->typeId);
-    }
-
-}

Gameserver/App/model/User/Ins_YanLin.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/**
- * Description of Ins_YanLin
- *
- * @author cyzhao
- */
-class Ins_YanLin extends Object_ext {
-
-    /**
-     * 言灵id
-     * @var type
-     */
-    public $typeId = 0;
-
-    /**
-     * 挂在的英雄的uid
-     * @var type
-     */
-    public $herouid = 0;
-
-    /**
-     * 当前的等级的经验--注意不是星级的经验
-     * @var type
-     */
-    public $curStarExp = 0;
-
-    /**
-     * 当前的星级
-     * @var type
-     */
-    public $starLv = 0;
-
-    /**
-     * 言灵的等级
-     * @var type
-     */
-    public $level = 1;
-    
-    /**
-     * 镶嵌宝石id
-     * @var type
-     */
-    public $gemId = 0;
-    
-    /**
-     * 品阶
-     * @var type
-     */
-    public $quality = 0;
-
-    public function __construct($args = null) {
-        parent::__construct($args);                    
-    }
-
-    public function initialize($missId) {
-        
-    }
-
-    /**
-     * @return \sm_item_yanling mo
-     */
-    public function mo() {
-        return GameConfig::item_yanling_getItem($this->typeId);
-    }
-
-}

Gameserver/App/model/User/Ins_active.php

@@ -1,72 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of Ins_active
- *
- * @author cyzhao
- */
-class Ins_active extends Object_ext{
-    
-    /**
-     * 活动id
-     * @var type
-     */
-    public $id=0; 
-
-    /**
-     * 抽奖次数--一次抽奖的次数记录，因为一次抽奖累计10次了也有必出
-     * @var type
-     */
-    public $num=0;
-
-    /**
-     * 10连抽的次数 90次保底一次ur
-     * @var type
-     */
-    public $totalNum=0;
-
-    /**
-     * 每90次内是否已经出过ur了。0：否 1：是---废弃
-     * @var type
-     */
-    public $isUr = 0;
-    
-    /**
-     * 只要出的是ur，第一次是普通ur；下一次就upUr
-     * @var type
-     */
-    public $isUpUr = 0;
-    /**
-     * 只要出的是Ssr，第一次是普通ssr；下一次就upssr
-     * @var type
-     */
-    public $isUpSsr = 0;
-    
-    /**
-     * 10次或是10连抽是否
-     * @var type
-     */
-    public $isSsr = 0;
-
-    public function __construct($args = null) {
-        if($args == null){
-            
-        } else {
-            parent::__construct($args);
-        }
-        
-        
-    }
-
-    public function initialize() {
-        
-    }
-}

Gameserver/App/model/User/Ins_battleItem.php

@@ -1,29 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of Ins_battleItem
- *
- * @author c'y'zhao
- */
-class Ins_battleItem extends Object_ext{
-    public $index = 0;
-
-    public $id = 0;
-
-    public $num = 0;
-    public $isAuto = 1;//默认不是
-    
-    public $attrVal = 0;//默认不是
-
-    public function __construct($arg = null) {
-        parent::__construct($arg);   
-    }
-}

Gameserver/App/model/User/Ins_storage.php

@@ -1,30 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of Ins_storage
- *
- * @author c'y'zhao
- */
-class Ins_storage extends Object_ext {
-    public $itemDic = null;
-
-    public $equipment = null;
-
-    public $yanling = null;
-
-    public function __construct($arg = null) {
-        parent::__construct($arg);
-        
-        $this->itemDic = ObjectInit();
-        $this->equipment = ObjectInit();
-        $this->yanling = ObjectInit();
-    }
-}

Gameserver/App/model/User/ins_missCourseItem.php

@@ -1,40 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace loyalsoft;
-
-/**
- * Description of missCourseItem
- *
- * @author cyzhao
- */
-class ins_missCourseItem extends Object_ext{
-    /**
-     * 任务id
-     */
-    public $missCardId = 0;
-
-    /**
-     * 这个id== 背包里的uid；实际就是为了区别多个相同的卡的；默认为0；一旦这个卡被激活就有固定值了
-     */
-    public $indexId=0;
-
-    /**
-     *  任务状态
-     */
-    public $type =1;
-   
-    public function __construct($args=null) {      
-        parent::__construct($args);       
-    }
-    
-    public function initialize($missId) {
-        $this->missCardId = $missId;
-        $this->type = Enum_TaskCardStateType::ing;
-    }
-}

Gameserver/App/process/UserProc.php

@@ -432,9 +432,7 @@ class UserProc {
             PayProc::m_refreshChargeOrders();                                   # 刷新订单, 多平台版本
             PayProc::checkDeltest();                                            # 检查内侧充值记录(函数内部会只检查一次)
             //PayProc::SuitGiftTsRecord();
-            $college = new Info_College(ctx()->college);
-            $college->initTaskCard();
-            ctx()->college = $college;
+
             ctx()->privateState->bornPlace = 0;
             ShopProc::resetDaliySpecialPackages();                              #每日特惠领奖每日重置
             PayProc::suitGiftCheck();