调整类命名前缀.

Gameserver/Amfphp/AutoLoad.php

@@ -52,7 +52,7 @@ require_once ROOTDIR . '/process/FightProc/PVPProc.php';
 require_once ROOTDIR . '/process/EventProc/CornerSignEventProc.php';            # 角标更新各处插入
 require_once ROOTDIR . '/process/EventProc/NormalEventProc.php';                # 2020年12月新版事件系统 
 require_once ROOTDIR . '/model/User/UserInfoMo.php';                            # 玩家全部数据模型
-require_once ROOTDIR . '/model/User/UserGameModel.php';                         # 游戏数据
-require_once ROOTDIR . '/model/User/UserProfile.php';                           # 玩家画像
+require_once ROOTDIR . '/model/User/Data_UserGame.php';                         # 游戏数据
+require_once ROOTDIR . '/model/User/Data_UserProfile.php';                      # 玩家画像
 
 AutoLoad::Init();                                                              // 直接执行初始化

Gameserver/Amfphp/Services/AppServer.php

@@ -60,7 +60,7 @@ class AppServer {
     private static function AfterProc($req, &$resp) {
         if ($req->userInfoChanged) {                                            # 回写玩家数据
             if (!UserProc::setUserInfo($req->userInfo)) {                       # 失败, 改写返回值
-                Err(ErrCode::err_innerfault);
+                Err(ErrCode::err_innerfault, "回写玩家数据");
             }
         }
         if (isset($req->updateInfo)) {                                          # 透传参数

Gameserver/Amfphp/main.php

@@ -29,7 +29,7 @@ function getRootURL() {
  * 经验证,复杂逻辑(会多次读取配置信息时)可以有效改善性能. -gwang 2020.11.24 
  * @var boolean (部署环境)是否允许代码生成
  */
-define('CodeGen_Enabled', true)
+define('CodeGen_Enabled', FALSE)
         and CodeGen_Enabled
         and define('CodeGen_Folder', ROOTDIR . '/../../CodeGen/');              # 代码生成功能的输出位置
 
@@ -57,9 +57,16 @@ function daoInst() {
 function gMem() {
     static $cmem = null;
     if ($cmem == null) {
-        $cmem = new CRedisUtil();
         $nosql = config::Inst()->nosql;
+//        $use_ext = true;                # 使用扩展,测试用(暂时仅支持php7)                       
+//        if ($use_ext) {
+//            $cmem = new \Redis();       # 还是需要重写下, 之前的CRedisUtil已经增加了json_encode/decode.
+//            $cmem->connect($nosql->host, $nosql->port);
+//            $cmem->auth($nosql->pwd);
+//        } else {
+        $cmem = new CRedisUtil();
         $cmem->conn($nosql->host, $nosql->port, $nosql->pwd);
+//        }
     }
     return $cmem;
 }

Gameserver/Amfphp/model/User/UserGameModel.php → Gameserver/Amfphp/model/User/Data_UserGame.php

@@ -7,16 +7,16 @@ namespace loyalsoft;
  * 游戏数据
  * @author gwang (mail@wanggangzero.cn)
  */
-class UserGameModel extends HashSaver {
+class Data_UserGame extends HashSaver {
 
     /**
-     * @var UserBaseInfo 基础数据
+     * @var Info_UserBase 基础数据
      */
     public $baseInfo;
 
     /**
      * 玩家仓库
-     * @var StoreModel
+     * @var Info_Store
      */
     public $store;
 
@@ -28,35 +28,35 @@ class UserGameModel extends HashSaver {
 
     /**
      * 英雄
-     * @var UserGameHeroModel
+     * @var Info_UserGameHero
      */
     public $heros;
 
     /**
      * 私有字段
-     * @var PrivateStateModel
+     * @var Info_PrivateState
      */
     public $privateState;
 
     /**
-     * @var UserSecretShopModel 玩家神秘商城数据
+     * @var Info_UserSecretshop 玩家神秘商城数据
      */
     public $userSecretshop;
 
     /**
      * 关卡
-     * @var UserGateDifficulty
+     * @var Info_UserGateDifficulty
      */
     public $gates;
 
     /**
-     * @var UserTaskInfo 玩家任务数据
+     * @var Info_UserTask 玩家任务数据
      */
     public $task;
 
     /**
      *
-     * @var UserPVPModel pvp信息
+     * @var Info_UserPVP pvp信息
      */
     public $pvp;
 
@@ -79,7 +79,7 @@ class UserGameModel extends HashSaver {
     public $NewbieGuideOver = 1;
 
     /**
-     * @var UserProfile 角色画像
+     * @var Data_UserProfile 角色画像
      */
     public $profile;
 
@@ -89,7 +89,7 @@ class UserGameModel extends HashSaver {
      */
     public function initialize() {
         my_Assert(GameConfig::primordial_data(), "找不到账号初始化数据");         # 防御 
-        $this->baseInfo = new UserBaseInfo();
+        $this->baseInfo = new Info_UserBase();
         $this->baseInfo->initialize();
 
         # 添加默认战队设置
@@ -97,7 +97,7 @@ class UserGameModel extends HashSaver {
         $this->store->initialize();                                             # 添加默认物品
         $this->privateState->currentId = count((array) $this->store->equipment) + 1;
         $this->heros->InitializeHero();                                         # 添加初始英雄
-        $this->pvp = new UserPVPModel();
+        $this->pvp = new Info_UserPVP();
         $this->task->initialize();                                              # 任务初始化
     }
 
@@ -108,29 +108,29 @@ class UserGameModel extends HashSaver {
     public function __construct($arg = null) {
         if (null === $arg) {                                                    # 未传参数的情况下
             $this->shopdata = ObjectInit();                                     # 商城数据
-            $this->privateState = new PrivateStateModel();                      # 私有字段
+            $this->privateState = new Info_PrivateState();                      # 私有字段
             $this->privateState->initialize();                                  # 初始化默认数据
-            $this->store = new StoreModel();                                    # 背包数据
+            $this->store = new Info_Store();                                    # 背包数据
 //            $this->store->initialize();                                         # 添加默认物品
-            $this->heros = new UserGameHeroModel();                             # 英雄数据
+            $this->heros = new Info_UserGameHero();                             # 英雄数据
 //            $this->heros->InitializeHero();                                     # 添加初始英雄
-            $this->gates = new UserGateDifficulty();                            # 初始化关卡默认数据
+            $this->gates = new Info_UserGateDifficulty();                            # 初始化关卡默认数据
 //            $this->heroManual = new HeroManualModel();                          # 初始化图鉴数据结构
             $this->NewbieGuide = ObjectInit();                                  # 初始化新手引导结构
 //            $this->pvp = new UserPVPModel();                                    # 初始化pvp模块
-            $this->userSecretshop = new userSecretshopModel();                  # 神秘商店
-            $this->task = new UserTaskInfo();                                   # 任务数据
+            $this->userSecretshop = new Info_UserSecretshop();                  # 神秘商店
+            $this->task = new Info_UserTask();                                   # 任务数据
         } else {                                                                # 实参
             parent::__construct($arg);                                          # 调用Object的构造函数
         }
-        $this->profile = new UserProfile();                                     # 初始化用户画像模块
+        $this->profile = new Data_UserProfile();                                     # 初始化用户画像模块
     }
 
     // <editor-fold defaultstate="collapsed" desc="   functions   ">
 
     /**
      * 设置钻石数
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $amt 数量
      */
     static public function set_Cash($user, $amt) {
@@ -142,7 +142,7 @@ class UserGameModel extends HashSaver {
 
     /**
      * 扣除玩家晶石
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $amt
      */
     static public function Consume_Spar($user, $amt) {
@@ -157,7 +157,7 @@ class UserGameModel extends HashSaver {
 
     /**
      * 扣除玩家钻石
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $amt
      * @return bool 成功与否
      */
@@ -173,7 +173,7 @@ class UserGameModel extends HashSaver {
 
     /**
      * 扣除玩家金币
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $amt
      */
     static public function Consume_Gold($user, $amt) {
@@ -188,7 +188,7 @@ class UserGameModel extends HashSaver {
 
     /**
      * 扣除玩家友情点
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $amt
      */
     static public function Consume_FriendShipPoint($user, $amt) {
@@ -203,7 +203,7 @@ class UserGameModel extends HashSaver {
 
     /**
      * 扣除玩家碎片
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $segmentId 碎片ID
      * @param int $amt  数量
      * @return boolean true 成功, false 失败
@@ -222,7 +222,7 @@ class UserGameModel extends HashSaver {
 
     /**
      * 增加用户钻石
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param type $amt
      * @return type
      */
@@ -234,7 +234,7 @@ class UserGameModel extends HashSaver {
 
     /**
      * 增加用户友情点
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param type $amt
      * @return type
      */
@@ -279,7 +279,7 @@ class UserGameModel extends HashSaver {
 
     /**
      * 用户获得金币
-     * @param UserGameModel $user 玩家数据
+     * @param Data_UserGame $user 玩家数据
      * @param int $amt
      */
     static function Add_Gold(&$user, $amt) {

Gameserver/Amfphp/model/User/UserProfile.php → Gameserver/Amfphp/model/User/Data_UserProfile.php

@@ -5,7 +5,7 @@ namespace loyalsoft;
 /**
  * 玩家付费模式数据画像
  */
-class UserPaymentProfile extends Object_ext {
+class Data_UserPaymentProfile extends Object_ext {
 
     /**
      * @var int 付费总额
@@ -48,12 +48,12 @@ class UserPaymentProfile extends Object_ext {
  * @author gwang (mail@wanggangzero.cn)
  * @copyright ? 2017-9-23, SJZ LoyalSoft Corporation & gwang. All rights reserved.
  */
-class UserProfile extends Object_ext {
+class Data_UserProfile extends Object_ext {
 //put your code here
 
     /**
      * 付费画像
-     * @var UserPaymentProfile
+     * @var Data_UserPaymentProfile
      */
     public $payment;
 
@@ -75,7 +75,7 @@ class UserProfile extends Object_ext {
 
     public function __construct($arg = null) {
         parent::__construct($arg);
-        $this->payment = new UserPaymentProfile($this->payment);
+        $this->payment = new Data_UserPaymentProfile($this->payment);
     }
 
 }

Gameserver/Amfphp/model/User/UserZoneInfoModel.php → Gameserver/Amfphp/model/User/Data_UserZoneInfo.php

@@ -14,7 +14,7 @@ namespace loyalsoft;
  *   2015年1月28日 暂定玩家玩过的分区集合为 分区id:等级的关联数组，若是后期有要求提供
  * 更多信息（等级以外）再行修改。
  */
-class UserZoneInfoModel
+class Data_UserZoneInfo
 {
 
     /**
@@ -25,7 +25,7 @@ class UserZoneInfoModel
 
     /**
      * 玩家上次登录的分区信息
-     * @var ZoneInfoModel
+     * @var Ins_ZoneInfo
      */
     public $lastZone;
 

Gameserver/Amfphp/model/User/PrivateStateModel.php → Gameserver/Amfphp/model/User/Info_PrivateState.php

@@ -3,10 +3,10 @@
 namespace loyalsoft;
 
 /**
- * Description of UserGameDataModel
+ * Description of Info_PrivateState
  * 私有状态标志字
  */
-class PrivateStateModel extends Object_ext {
+class Info_PrivateState extends Object_ext {
 // ------------字段声明------------- 
 
     /**

Gameserver/Amfphp/model/User/PublicStateModel.php → Gameserver/Amfphp/model/User/Info_PublicState.php

@@ -9,7 +9,7 @@ namespace loyalsoft;
  * @author gwang (mail@wanggangzero.cn)
  * @copyright ? 2017-4-19, SJZ LoyalSoft Corporation & gwang. All rights reserved.
  */
-class PublicStateModel extends HashSaver {
+class Info_PublicState extends HashSaver {
 
     /**
      * 评过分的英雄id

Gameserver/Amfphp/model/User/StoreModel.php → Gameserver/Amfphp/model/User/Info_Store.php

@@ -7,7 +7,7 @@ namespace loyalsoft;
  * 玩家背包/仓库数据模型
  * @author gwang
  */
-class StoreModel extends Object_ext {
+class Info_Store extends Object_ext {
 
     /**
      * 其他道具

Gameserver/Amfphp/model/User/UserBaseInfo.php → Gameserver/Amfphp/model/User/Info_UserBase.php

@@ -1,19 +1,12 @@
 <?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 UserBaseInfo
- *
- * @author Administrator
+ * 玩家基本信息
+ * @author gwang(wanggangzero@qq.com)
  */
-class UserBaseInfo {
+class Info_UserBase {
     //put your code here
 
     /**

Gameserver/Amfphp/model/User/UserGameHeroModel.php → Gameserver/Amfphp/model/User/Info_UserGameHero.php

@@ -13,7 +13,7 @@ namespace loyalsoft;
 /**
  * 玩家收集的英雄的卡牌集合
  */
-class UserGameHeroModel extends Object_ext {
+class Info_UserGameHero extends Object_ext {
 
     /**
      * 当前展示的英雄的UID
@@ -84,7 +84,7 @@ class UserGameHeroModel extends Object_ext {
         my_Assert(null != $this->collectHeros, ErrCode::err_innerfault);
 
         foreach ($this->collectHeros as $hid => $hero) {
-            isEditor() and $hero = new UserHeroModel();
+            isEditor() and $hero = new Ins_UserHero();
             if ($hero->typeId == $heroMoId) {
                 return $hero;
             }

Gameserver/Amfphp/model/User/UserGateDifficulty.php → Gameserver/Amfphp/model/User/Info_UserGateDifficulty.php

@@ -9,7 +9,7 @@ namespace loyalsoft;
  * @author gwang (mail@wanggangzero.cn)
  * @copyright ? 2017-2-14, SJZ LoyalSoft Corporation & gwang. All rights reserved.
  */
-class UserGateDifficulty extends Object_ext {
+class Info_UserGateDifficulty extends Object_ext {
     ///目前是按关卡的难度来分的结果
 
     /**
@@ -53,11 +53,11 @@ class UserGateDifficulty extends Object_ext {
         if (null === $arg) {
             $this->TotalNum = 0;
             $this->Times = 0;
-            $this->normal = new UserGatesModel();
+            $this->normal = new Ins_UserGatesModel();
             $this->normal->initialize();
-            $this->hard = new UserGatesModel;
+            $this->hard = new Ins_UserGatesModel;
             $this->hard->initialize();
-            $this->elite = new UserGatesModel;
+            $this->elite = new Ins_UserGatesModel;
             $this->elite->initialize();
             $this->killedBoss = ArrayInit();
             $this->chapterStarsRwd = ObjectInit();

Gameserver/Amfphp/model/User/Info_UserGuild.php

@@ -0,0 +1,87 @@
+<?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/Amfphp/model/User/UserPVPModel.php → Gameserver/Amfphp/model/User/Info_UserPVP.php

@@ -10,7 +10,7 @@ namespace loyalsoft;
  * @author gwang (mail@wanggangzero.cn)
  * @copyright ? 2017-7-4, SJZ LoyalSoft Corporation & gwang. All rights reserved.
  */
-class UserPVPModel extends Object_ext {
+class Info_UserPVP extends Object_ext {
 
     /**
      * @var array[string] 每日/当天已挑战对手记录(有想法设定尽量不重复当天已经刷到过的对手)

Gameserver/Amfphp/model/User/userSecretshopModel.php → Gameserver/Amfphp/model/User/Info_UserSecretshop.php

@@ -9,7 +9,7 @@ namespace loyalsoft;
  * @author gwang (mail@wanggangzero.cn)
  * @copyright ? 2017-10-21, SJZ LoyalSoft Corporation & gwang. All rights reserved.
  */
-class userSecretshopModel extends Object_ext
+class Info_UserSecretshop extends Object_ext
 {
 
     /**

Gameserver/Amfphp/model/User/UserShopInfoModel.php → Gameserver/Amfphp/model/User/Info_UserShop.php

@@ -1,11 +1,5 @@
 <?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;
 
 /**
@@ -13,7 +7,7 @@ namespace loyalsoft;
  * 商城相关数据
  * @author Administrator
  */
-class UserShopInfoModel extends Object_ext {
+class Info_UserShop extends Object_ext {
     //put your code here
 
     /**

Gameserver/Amfphp/model/User/UserTaskInfo.php → Gameserver/Amfphp/model/User/Info_UserTask.php

@@ -7,7 +7,7 @@ namespace loyalsoft;
  * @author wanggangzero@qq.com
  * @version 1.0.0 2020.7.8 created by gwang
  */
-class UserTaskInfo extends Object_ext {
+class Info_UserTask extends Object_ext {
 
     /**
      * 当前任务节点id
@@ -73,7 +73,7 @@ class UserTaskInfo extends Object_ext {
             $dts = GameConfig::task_daily();
             $this->taskListDaily = ObjectInit();
             foreach ($dts as $tid => $t) {
-                $task = new TaskInfo();
+                $task = new Ins_TaskInfo();
                 $task->taskId = $tid;
                 $this->taskListDaily->$tid = $task;
             }
@@ -88,7 +88,7 @@ class UserTaskInfo extends Object_ext {
         my_Assert(null != $tmo, ErrCode::err_const_no);
         switch ($tmo->ban) {    // 每日,剧情...
         }
-        $task = new TaskInfo();
+        $task = new Ins_TaskInfo();
         $task->taskId = $taskId;
         $this->taskListPlot->$taskId = $task;
     }
@@ -96,45 +96,45 @@ class UserTaskInfo extends Object_ext {
     function AfterInit() {
         foreach ($this->taskListPlot as $taskId => &$task) {
             $tmo = GameConfig::task_getItem($taskId);
-            $task = new TaskInfo($task);
+            $task = new Ins_TaskInfo($task);
             my_Assert(null != $tmo, ErrCode::err_const_no);
             switch ($tmo->tasktype) {                                               # 有可能添加任务的时候, 任务就已经完成了. 所以这里需要直接做一个检查...
                 case EnumTaskType::CommanderLevelUpTo:
-                    $taskParam = new TaskParams(EnumTaskType::CommanderLevelUpTo, req()->userInfo->game->baseInfo->level);
+                    $taskParam = new Ins_TaskParams(EnumTaskType::CommanderLevelUpTo, req()->userInfo->game->baseInfo->level);
                     $task->bCheckProgress($taskParam);
                     break;
                 case EnumTaskType::HeroLevelUpTo:
                     $heroMoId = $tmo->canshu1;
-                    $userHeros = new UserGameHeroModel(req()->userInfo->game->heros);
+                    $userHeros = new Info_UserGameHero(req()->userInfo->game->heros);
                     $hero = $userHeros->GetHeroByMoID($heroMoId);
                     $level = 0;
                     if ($hero != null) {
                         $level = $hero->level;
                     }
-                    $taskParam = new TaskParams(EnumTaskType::HeroLevelUpTo, $hero->typeId, $hero->level);
+                    $taskParam = new Ins_TaskParams(EnumTaskType::HeroLevelUpTo, $hero->typeId, $hero->level);
                     $task->bCheckProgress($taskParam);
                     break;
                 case EnumTaskType::HeroGradeUpTo:
                     $heroMoId = $tmo->canshu1;
-                    $userHeros = new UserGameHeroModel(req()->userInfo->game->heros);
+                    $userHeros = new Info_UserGameHero(req()->userInfo->game->heros);
                     $hero = $userHeros->GetHeroByMoID($heroMoId);
                     $level = 0;
                     if ($hero != null) {
                         $level = $hero->grade;
                     }
-                    $taskParam = new TaskParams(EnumTaskType::HeroLevelUpTo, $heroMoId, $level);
+                    $taskParam = new Ins_TaskParams(EnumTaskType::HeroLevelUpTo, $heroMoId, $level);
                     $task->bCheckProgress($taskParam);
                     break;
                 case EnumTaskType::HeroSegmentNumberTo:
                     $segId = $tmo->canshu1;
-                    $store = new StoreModel(req()->userInfo->game->store);
+                    $store = new Info_Store(req()->userInfo->game->store);
                     $num = $store->GetItemCount($segId);
-                    $taskParam = new TaskParams(EnumTaskType::HeroSegmentNumberTo, $segId, $num);
+                    $taskParam = new Ins_TaskParams(EnumTaskType::HeroSegmentNumberTo, $segId, $num);
                     $task->bCheckProgress($taskParam);
                     break;
                 case EnumTaskType::HeroSkillUnlock:
                     $heroMoId = $tmo->canshu1;
-                    $userHeros = new UserGameHeroModel(req()->userInfo->game->heros);
+                    $userHeros = new Info_UserGameHero(req()->userInfo->game->heros);
                     $hero = $userHeros->GetHeroByMoID($heroMoId);
                     $subSkillMo = GameConfig::subSkill_getItem($tmo->canshu2);
                     my_Assert(null != $subSkillMo, ErrCode::err_const_no);
@@ -143,7 +143,7 @@ class UserTaskInfo extends Object_ext {
                     if ($hero != null && in_array($tmo->canshu2, $hero->subSkills->$mSkillId)) {
                         $subSkillId = $tmo->canshu2;
                     }
-                    $taskParam = new TaskParams(EnumTaskType::HeroSkillUnlock, $heroMoId, $subSkillId);
+                    $taskParam = new Ins_TaskParams(EnumTaskType::HeroSkillUnlock, $heroMoId, $subSkillId);
                     $task->bCheckProgress($taskParam);
                     break;
                 case EnumTaskType::PassGateN:
@@ -164,14 +164,14 @@ class UserTaskInfo extends Object_ext {
                             $gates = req()->userInfo->game->gates->normal;
                             break;
                     }
-                    $taskParam = new TaskParams(EnumTaskType::PassGateN, $gates->highest, $diffculty);
+                    $taskParam = new Ins_TaskParams(EnumTaskType::PassGateN, $gates->highest, $diffculty);
                     $task->bCheckProgress($taskParam);
                     break;
                 case EnumTaskType::passCarbonN:
                     break;
                 case EnumTaskType::PvPWinNumberTo:
-                    $pvp = new UserPVPModel(req()->userInfo->game->pvp);                       # 设计玩家pvp数据结构
-                    $taskParam = new TaskParams(EnumTaskType::PvPWinNumberTo, $pvp->totalWin); # 任务参数
+                    $pvp = new Info_UserPVP(req()->userInfo->game->pvp);                       # 设计玩家pvp数据结构
+                    $taskParam = new Ins_TaskParams(EnumTaskType::PvPWinNumberTo, $pvp->totalWin); # 任务参数
                     $task->bCheckProgress($taskParam);
                     break;
                 case EnumTaskType::PvPScoreTo:
@@ -180,13 +180,13 @@ class UserTaskInfo extends Object_ext {
                     $seasonId = PVPProc::GetCurSeasonID();                                     # 当前赛季ID
                     $key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $seasonId); # 积分总榜
                     $score = self::_getScore_by_uid($uid, $key);                               # 玩家积分
-                    $taskParam = new TaskParams(EnumTaskType::PvPScoreTo, $score);             # 任务参数
+                    $taskParam = new Ins_TaskParams(EnumTaskType::PvPScoreTo, $score);             # 任务参数
                     $task->bCheckProgress($taskParam);
                     break;
                 case EnumTaskType::UserPowerTo:
                     $key = MemKey_GameRun::Game_FightPowerRank_zset(req()->zoneid);            # redis key 
                     $power = gMem()->zscore($key, req()->uid);                                 # 查询战斗力
-                    $taskParam = new TaskParams(EnumTaskType::UserPowerTo, $power);
+                    $taskParam = new Ins_TaskParams(EnumTaskType::UserPowerTo, $power);
                     $task->bCheckProgress($taskParam);
                     break;
                 case EnumTaskType::UserCollectScoreTo:
@@ -202,7 +202,7 @@ class UserTaskInfo extends Object_ext {
     function IsAllPlotTaskOver() {
         $bYes = true;
         foreach ($this->taskListPlot as $tid => $task) {
-            isEditor() and $task = new TaskInfo($task);
+            isEditor() and $task = new Ins_TaskInfo($task);
             if (!$task->rewardGeted) {
                 $bYes = false;
                 break;

Gameserver/Amfphp/model/User/EmailModel.php → Gameserver/Amfphp/model/User/Ins_Email.php

@@ -9,7 +9,7 @@ namespace loyalsoft;
  * @author gwang (mail@wanggangzero.cn)
  * @copyright ? 2017-4-27, SJZ LoyalSoft Corporation & gwang. All rights reserved.
  */
-class EmailModel extends Object_ext {
+class Ins_Email extends Object_ext {
 
     /**
      * 邮件编号

Gameserver/Amfphp/model/User/TaskCardVo.php → Gameserver/Amfphp/model/User/Ins_TaskCard.php

@@ -7,7 +7,7 @@ namespace loyalsoft;
  * 任务卡
  * @author gwang
  */
-class TaskCardVo extends Object_ext {
+class Ins_TaskCard extends Object_ext {
 
     /**
      * @var type 这个物品在玩家身上唯一的id
@@ -56,7 +56,7 @@ class TaskCardVo extends Object_ext {
             $cfg = GameConfig::item_taskcard_getItem($this->typeId);
             my_Assert(null != $cfg, ErrCode::err_const_no);
             foreach (explode(',', $cfg->tasksteps) as $taskStepTypeId) {
-                $arr [] = new TaskStepVo($taskStepTypeId);
+                $arr [] = new Ins_TaskStep($taskStepTypeId);
             }
             $this->curSteps = $arr;
         } else {

Gameserver/Amfphp/model/User/TaskInfo.php → Gameserver/Amfphp/model/User/Ins_TaskInfo.php

@@ -1,17 +1,11 @@
 <?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;
 
 /**
  * 任务信息
  */
-class TaskInfo extends Object_ext {
+class Ins_TaskInfo extends Object_ext {
 
     /**
      *

Gameserver/Amfphp/model/User/TaskParams.php → Gameserver/Amfphp/model/User/Ins_TaskParams.php

@@ -11,7 +11,7 @@ namespace loyalsoft;
 /**
  * 任务参数,用于任务进度判定逻辑
  */
-class TaskParams {
+class Ins_TaskParams {
 
     public function __construct($_taskType, $_canshu1 = null, $_canshu2 = null) {
         $this->taskType = $_taskType;

Gameserver/Amfphp/model/User/TaskStepVo.php → Gameserver/Amfphp/model/User/Ins_TaskStep.php

@@ -5,7 +5,7 @@ namespace loyalsoft;
 /**
  * 任务步骤
  */
-class TaskStepVo extends Object_ext {
+class Ins_TaskStep extends Object_ext {
 
     /**
      * @var type 查询用的id
@@ -47,7 +47,7 @@ class TaskStepVo extends Object_ext {
     }
 
     /**
-     * @param TaskParams $taskParam
+     * @param Ins_TaskParams $taskParam
      * @return bool
      */
     public function check($taskParam) {

Gameserver/Amfphp/model/User/UGateModel.php → Gameserver/Amfphp/model/User/Ins_UGate.php

@@ -9,7 +9,7 @@ namespace loyalsoft;
  * @author gwang (mail@wanggangzero.cn)
  * @copyright ? 2017-2-14, SJZ LoyalSoft Corporation & gwang. All rights reserved.
  */
-class UGateModel extends Object_ext {
+class Ins_UGate extends Object_ext {
 
     /**
      *

Gameserver/Amfphp/model/User/UserGatesModel.php → Gameserver/Amfphp/model/User/Ins_UserGatesModel.php

@@ -7,7 +7,7 @@ namespace loyalsoft;
  * 当前进度,体力,积分等等...
  * @author gwang
  */
-class UserGatesModel extends Object_ext {
+class Ins_UserGatesModel extends Object_ext {
 
     /**
      * 最后一次挑战的关卡ID
@@ -31,7 +31,7 @@ class UserGatesModel extends Object_ext {
 
     /**
      * 初始化
-     * @return UserGatesModel
+     * @return Ins_UserGatesModel
      */
     function initialize() {
         // 用于给各个字段赋默认初始值

Gameserver/Amfphp/model/User/UserHeroModel.php → Gameserver/Amfphp/model/User/Ins_UserHero.php

@@ -45,7 +45,7 @@ class EHeroProperties extends Enum {
 /**
  * 玩家的英雄的实体数据
  */
-class UserHeroModel extends Object_ext {
+class Ins_UserHero extends Object_ext {
 
     /**
      * 唯一的英雄ID

Gameserver/Amfphp/model/User/ZoneInfoModel.php → Gameserver/Amfphp/model/User/Ins_ZoneInfo.php

@@ -13,7 +13,7 @@ namespace loyalsoft;
 /**
  * 分区信息
  */
-class ZoneInfoModel {
+class Ins_ZoneInfo {
 
     /**
      * 构造函数

Gameserver/Amfphp/model/User/UserGuildModel.php

@@ -1,86 +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/Amfphp/model/User/UserInfoMo.php

@@ -23,7 +23,7 @@ class UserInfoMo {
 
     /**
      * 玩家游戏数据
-     * @var UserGameModel
+     * @var Data_UserGame
      */
     public $game;
 

Gameserver/Amfphp/model/User/ZoneListItemInfoModel.php

@@ -2,25 +2,26 @@
 
 namespace loyalsoft;
 
-/**
- * Description of ZoneListItemInfoModel
- * @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 ZoneListItemInfoModel
-{
-
-    public $zoneid;
-    public $name;
-    public $isNew;
-    public $status;
-    public $isRecommended;
-    public $publicTs;
-
-}
+//
+///**
+// * Description of ZoneListItemInfoModel
+// * @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 ZoneListItemInfoModel
+//{
+//
+//    public $zoneid;
+//    public $name;
+//    public $isNew;
+//    public $status;
+//    public $isRecommended;
+//    public $publicTs;
+//
+//}

Gameserver/Amfphp/process/ActiveProc.php

@@ -63,8 +63,8 @@ class ActiveProc {
      * @return type
      */
     static function drawTiliGift($req) {
-        $user = new UserGameModel($req->userInfo->game);
-        $privateState = new PrivateStateModel($user->privateState);
+        $user = new Data_UserGame($req->userInfo->game);
+        $privateState = new Info_PrivateState($user->privateState);
         $hour = date('G');
         if (in_array($hour, $privateState->dailyDrawedTiliGift)) {              # 判断是否已领取
             return Resp::err(ErrCode::active_hasgetted);
@@ -73,7 +73,7 @@ class ActiveProc {
         if (!in_array($hour, $arr)) {
             return Resp::err(ErrCode::active_illegal);              # 不满足条件
         }
-        UserGameModel::Add_tili($req, glc()->activity_presentTili_number); # 发放奖励
+        Data_UserGame::Add_tili($req, glc()->activity_presentTili_number); # 发放奖励
 
         $privateState->dailyDrawedTiliGift[] = $hour;
         $req->userInfo->game->privateState = $privateState;
@@ -105,8 +105,8 @@ class ActiveProc {
      * @param Req $req
      */
     static function drawRegGift($req) {
-        $user = new UserGameModel($req->userInfo->game);
-        $privateState = new PrivateStateModel($user->privateState);
+        $user = new Data_UserGame($req->userInfo->game);
+        $privateState = new Info_PrivateState($user->privateState);
         $giftId = $req->paras[0];                                               # 礼包id
         $giftModel = GameConfig::activity_reggift_getItem($giftId);             # 取礼包常亮数据
         if (null == $giftModel) {
@@ -154,7 +154,7 @@ class ActiveProc {
      */
     static function drawOnlineGift($req) {
         $user = $req->userInfo->game;
-        $privateState = new PrivateStateModel($user->privateState);
+        $privateState = new Info_PrivateState($user->privateState);
         $giftid = $req->paras[0];                                               # 提取参数: 礼包的编号
         $giftData = GameConfig::activity_onlinegift_getItem($giftid);           # 在线礼包常量数据
         my_Assert(null != $giftData, ErrCode::onlinegift_constno_err);          # 防御找不到配置数据
@@ -206,8 +206,8 @@ class ActiveProc {
      * @param Req $req
      */
     static function drawActivePackageByCode($req) {
-        $user = new UserGameModel($req->userInfo->game);
-        $privateState = new PrivateStateModel($user->privateState);             # 快速访问
+        $user = new Data_UserGame($req->userInfo->game);
+        $privateState = new Info_PrivateState($user->privateState);             # 快速访问
         list( $activeId, $codestring) = $req->paras;                            # 取参数 活动id, 兑换码
         $active = GameConfig::activity_getItem($activeId);                      # 活动数据
         my_Assert(null != $active, ErrCode::active_const_no_err);
@@ -388,7 +388,7 @@ class ActiveProc {
     static function Day7_DrawReward($req) {
         // 设计7日数据结构
         list($day) = $req->paras;                                               # 参数: 领取第x天的奖励
-        $private = new PrivateStateModel($req->userInfo->game->privateState);   # 私有数据
+        $private = new Info_PrivateState($req->userInfo->game->privateState);   # 私有数据
         my_Assert(count($private->LoginDays) >= $day, ErrCode::active_day7_totaldays);
         my_Assert(!in_array($day, $private->day7_drawed), ErrCode::active_hasgetted);
         $day_rwd = GameConfig::activity_day7_getItem($day);                     # 查询奖励数据

Gameserver/Amfphp/process/EmailProc.php

@@ -183,7 +183,7 @@ class EmailProc {
         $mails = self::getMailQueue($zoneid, $uid);                             # 提取邮件列表
         // 有奖励的邮件，全部处理，领取奖励。无奖励的邮件，不处理。因为全部领取邮件功能只限于处理有奖励的物品，无奖励的不管 
         foreach ($mails as $m) {                                                # 遍历所有邮件
-            isEditor() and $m = new EmailModel;
+            isEditor() and $m = new Ins_Email;
             if ($m->isExistReward()) {                                          # 先判断邮件，是否存在附件
                 if ($m->drawedts > 0) {                                         # 已领取邮件跳过
                     continue;
@@ -230,7 +230,7 @@ class EmailProc {
         $mails = self::getMailQueue($zoneid, $uid);                             # 取邮件队列
         $n = 0;                                                                 # 记个数,看一共删除几封邮件
         foreach ($mails as $m) {
-            isEditor() and $m = new EmailModel;
+            isEditor() and $m = new Ins_Email;
             if ($m->readts <= 0) {                                              # 未读邮件跳过
                 continue;
             }
@@ -256,7 +256,7 @@ class EmailProc {
      * @param type $rank
      */
     public static function SendMonthlyVIPDailyReward($zoneid, $uid, $cardName, $reward) {
-        $mail = new EmailModel(null, enum_Mail_Type::SysTemMail, "月卡奖励", #
+        $mail = new Ins_Email(null, enum_Mail_Type::SysTemMail, "月卡奖励", #
                 $cardName . "每日奖励", $reward);
         self::InsertMail($zoneid, $uid, $mail);
     }
@@ -274,7 +274,7 @@ class EmailProc {
                 $arr = explode(',', $rkrwd->reward_season);
                 $itemid = $arr[0];
                 $num = $arr[1];
-                $mail = new EmailModel(null, enum_Mail_Type::SysTemMail, "竞技场赛季上榜奖励", #
+                $mail = new Ins_Email(null, enum_Mail_Type::SysTemMail, "竞技场赛季上榜奖励", #
                         "恭喜您在上赛季的竞技场战斗中获得总榜" . $rkrwd->rankName . "的奖励", #
                         "$itemid,$num");
                 self::InsertMail($zoneid, $uid, $mail);
@@ -296,7 +296,7 @@ class EmailProc {
                 $arr = explode(',', $rkrwd->reward_day);
                 $itemid = $arr[0];
                 $num = $arr[1];
-                $mail = new EmailModel(null, enum_Mail_Type::SysTemMail, "竞技场每日上榜奖励", #
+                $mail = new Ins_Email(null, enum_Mail_Type::SysTemMail, "竞技场每日上榜奖励", #
                         "恭喜您在昨天的竞技场战斗中获得总榜" . $rkrwd->rankName . "的奖励", #
                         "$itemid,$num");
                 self::InsertMail($zoneid, $uid, $mail);
@@ -316,7 +316,7 @@ class EmailProc {
         $arr = explode(',', $content);
         $itemid = $arr[0];
         $num = intval($arr[1]) * 2;                                             # 2倍返还
-        $mail = new EmailModel(null, enum_Mail_Type::SysTemMail, "删档内侧补偿", #
+        $mail = new Ins_Email(null, enum_Mail_Type::SysTemMail, "删档内侧补偿", #
                 "感谢您在之前的删档内侧活动中充值购买$name.", "$itemid, $num");
         self::InsertMail($zoneid, $uid, $mail);
     }
@@ -329,7 +329,7 @@ class EmailProc {
      * @param type $num
      */
     public static function SendTestItemsMail($zoneid, $uid, $itemid, $num) {
-        $mail = new EmailModel(null, enum_Mail_Type::SysTemMail, "内部测试-道具发放邮件", #
+        $mail = new Ins_Email(null, enum_Mail_Type::SysTemMail, "内部测试-道具发放邮件", #
                 "请领取", "$itemid, $num");
         self::InsertMail($zoneid, $uid, $mail);
     }
@@ -345,7 +345,7 @@ class EmailProc {
      * @param type $rank
      */
     public static function SendGuildApplyRefusedMail($zoneid, $uid, $guildName) {
-        $mail = new EmailModel(null, enum_Mail_Type::GuildApplyRefuseMail, "公会申请结果", #
+        $mail = new Ins_Email(null, enum_Mail_Type::GuildApplyRefuseMail, "公会申请结果", #
                 "很遗憾" . $guildName . "公会拒绝了您的加入申请", "", "公会");
         self::InsertMail($zoneid, $uid, $mail);
     }
@@ -360,7 +360,7 @@ class EmailProc {
         $itemId = $chipArr[0];
         $itemNum = $chipArr[1];
         $content = $itemNum == null ? "请求捐献结算时间截止，没有得到捐献碎片" : "请求捐献结算时间截止，领取已获得碎片";
-        $mail = new EmailModel(null, enum_Mail_Type::GuildDonateSettle, "公会捐献碎片结算", #
+        $mail = new Ins_Email(null, enum_Mail_Type::GuildDonateSettle, "公会捐献碎片结算", #
                 $content, "$itemId, $itemNum", "公会");
         self::InsertMail($zoneid, $uid, $mail);
     }
@@ -372,7 +372,7 @@ class EmailProc {
      * @param type $rank
      */
     public static function SendGuildCashGiftReward($zoneid, $uid, $itemId, $num) {
-        $mail = new EmailModel(null, enum_Mail_Type::GuildCashGiftReward, "公会礼包回赠", #
+        $mail = new Ins_Email(null, enum_Mail_Type::GuildCashGiftReward, "公会礼包回赠", #
                 "系统回赠礼品", "$itemId, $num", "公会");
         self::InsertMail($zoneid, $uid, $mail);
     }
@@ -384,7 +384,7 @@ class EmailProc {
      * @param type $content
      */
     public static function SendGuildNoticeMail($zoneid, $uid, $title, $content) {
-        $mail = new EmailModel(null, enum_Mail_Type::GuildNoticeMail, $title, #
+        $mail = new Ins_Email(null, enum_Mail_Type::GuildNoticeMail, $title, #
                 $content, "", "公会");
         self::InsertMail($zoneid, $uid, $mail);
     }
@@ -397,7 +397,7 @@ class EmailProc {
      * 插入邮件
      * @param int $zoneid
      * @param string $uid
-     * @param EmailModel $mail
+     * @param Ins_Email $mail
      */
     private static function InsertMail($zoneid, $uid, $mail) {
         $mem = gMem();
@@ -421,7 +421,7 @@ class EmailProc {
      * 回写mail数据
      * @param type $zoneid
      * @param type $uid
-     * @param EmailModel $mail
+     * @param Ins_Email $mail
      */
     private static function updateMail($zoneid, $uid, $mail) {
         gMem()->hset(MemKey_User::Mail_Queue_hash($zoneid, $uid), $mail->mailId, $mail);
@@ -441,7 +441,7 @@ class EmailProc {
      * 
      * @param type $zoneid
      * @param type $uid
-     * @param EmailModel $mail
+     * @param Ins_Email $mail
      */
     private static function logMail($zoneid, $uid, $mail) {
         $data = array(
@@ -514,7 +514,7 @@ class EmailProc {
                 if ($ts < $sysMail->startts) {
                     continue;                                                   # 系统邮件尚未生效, 跳过
                 }                                                               # else => 有效期内,继续处理
-                $mail = new EmailModel($sysMail);                               # 创建邮件
+                $mail = new Ins_Email($sysMail);                               # 创建邮件
                 $mail->type = enum_Mail_Type::SysTemMail;                       # 设置邮件类型为系统邮件
                 $mail->sender_uid = $mail->sender_name = "系统";                # 设置发送者昵称和uid为系统
                 self::InsertMail($zoneid, $uid, $mail);                         # 插入邮件
@@ -535,7 +535,7 @@ class EmailProc {
         $key = MemKey_User::Mail_Queue_hash($zoneid, $uid);
         $arr = $mem->hgetall($key);                                             # 所有邮件
         $del = array_filter((array) $arr, function($v) use($ts) {
-            $email = new EmailModel($v);
+            $email = new Ins_Email($v);
             return $email->ExpireTs() < $ts;                                    # 选出过期邮件
         });
         if (count($del)) {                                                      # >0
@@ -558,7 +558,7 @@ class EmailProc {
 //        var_dump($mkeys);
         $mails = (array) gMem()->hmget($key, $mkeys);                           # mget
         $ret = array_map(function($v) {
-            return new EmailModel($v);                                          # 装箱
+            return new Ins_Email($v);                                          # 装箱
         }, $mails);
         return array_values($ret);
     }
@@ -568,12 +568,12 @@ class EmailProc {
      * @param int $zoneid
      * @param string $uid
      * @param int $mailId
-     * @return EmailModel
+     * @return Ins_Email
      */
     private static function getMail($zoneid, $uid, $mailId) {
         $m = gMem()->hget(MemKey_User::Mail_Queue_hash($zoneid, $uid), $mailId);
         my_Assert($m, ErrCode::email_not_found);
-        return new EmailModel($m);
+        return new Ins_Email($m);
     }
 
     /**

Gameserver/Amfphp/process/EventProc.php

@@ -35,7 +35,7 @@ class EventProc {
     }
 
     static function Init() {
-        Event::register('onpay', array(new UserProfile(req()->userInfo->game->profile), "OnPay"));
+        Event::register('onpay', array(new Data_UserProfile(req()->userInfo->game->profile), "OnPay"));
     }
 
     /**

Gameserver/Amfphp/process/FightProc.php

@@ -72,7 +72,7 @@ class FightProc {
      */
     static function ClearByDay($req) {
         SweepGatesProc::ClearGateTimes($req);                                   # 清理每个难度副本的每日战斗次数 
-        $pvp = new UserPVPModel($req->userInfo->game->pvp);
+        $pvp = new Info_UserPVP($req->userInfo->game->pvp);
         $pvp->refreshDailyData();
         $pvp->sendRewardEmail($req->zoneid, $req->uid, PVPProc::GetCurSeasonID());
         $req->userInfo->game->pvp = $pvp;

Gameserver/Amfphp/process/FightProc/PVPProc.php

@@ -166,7 +166,7 @@ class PVPProc {
      * @param req $req
      */
     public static function pvpShopMain($req) {
-        $pvp = new UserPVPModel($req->userInfo->game->pvp);                     # PVP信息
+        $pvp = new Info_UserPVP($req->userInfo->game->pvp);                     # PVP信息
         if ($pvp->shopRefreshTs < now()) {                                      # 检查刷新时间<now => 刷新商品列表
             $pvp->shopRefreshTs = now() + glc()->PVP_shop_refresh_interval;     # 更新刷新时间
             $pvp->curShopItems = GameConfig::pvp_shop();                        # 重刷道具
@@ -182,7 +182,7 @@ class PVPProc {
      */
     public static function pvpShopBuy($req) {
         $index = $req->paras[0];                                                # 参数:道具索引(typeId)
-        $pvp = new UserPVPModel($req->userInfo->game->pvp);                     # PVP 数据
+        $pvp = new Info_UserPVP($req->userInfo->game->pvp);                     # PVP 数据
         my_Assert(CommUtil::isPropertyExists($pvp->curShopItems, $index), ErrCode::err_innerfault); # 没有找到改商品
 //        isEditor() && $citem = new \sm_pvp_shop();
         $citem = $pvp->curShopItems->$index;                                    # 查询物品数据
@@ -204,9 +204,9 @@ class PVPProc {
      */
     public static function pvpShopRefresh($req) {
         // 扣除刷新消耗
-        $pvp = new UserPVPModel($req->userInfo->game->pvp);
+        $pvp = new Info_UserPVP($req->userInfo->game->pvp);
         $costCash = glc()->PVP_shop_refresh_cash;
-        my_Assert(UserGameModel::Consume_Cash($req->userInfo->game, $costCash), ErrCode::notenough_cash_msg);
+        my_Assert(Data_UserGame::Consume_Cash($req->userInfo->game, $costCash), ErrCode::notenough_cash_msg);
 //        $pvp->shopRefreshTs = now() + glc()->PVP_shop_refresh_interval;         # 更新刷新时间
         $pvp->curShopItems = GameConfig::pvp_shop();                            # 重刷道具
         $req->userInfo->game->pvp = $pvp;                                       # 回写
@@ -245,7 +245,7 @@ class PVPProc {
     static function pvpMainInfo($req) {
         $uid = $req->uid;                                                       # 快速访问UID
         $zoneid = $req->zoneid;                                                 # 快速访问zoneid
-        $pvp = new UserPVPModel($req->userInfo->game->pvp);                     # 设计玩家pvp数据结构
+        $pvp = new Info_UserPVP($req->userInfo->game->pvp);                     # 设计玩家pvp数据结构
         $pvp->refreshDailyData();                                               # 刷新免费挑战次数
         $seasonId = self::GetCurSeasonID();                                     # 当前赛季ID
         $key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $seasonId); # 积分总榜
@@ -277,7 +277,7 @@ class PVPProc {
      */
     static function pvp_Refresh($req) {
         // 刷新无花费, 间隔时间3秒(客户端控制得了)
-        $pvp = new UserPVPModel($req->userInfo->game->pvp);
+        $pvp = new Info_UserPVP($req->userInfo->game->pvp);
         $ts = now();
         my_Assert($pvp->nextRefreshTs < $ts, ErrCode::pvp_refresh_time);        # 验证时间间隔
         $pvp->curMatches = self::getNewMatches($pvp, $req->uid, $req->zoneid);
@@ -361,7 +361,7 @@ class PVPProc {
      */
     public static function pvp_setTeam($req) {
         $heros = $req->paras[0];                                                # para: 新阵容
-        $pvp = new UserPVPModel($req->userInfo->game->pvp);
+        $pvp = new Info_UserPVP($req->userInfo->game->pvp);
         my_Assert(is_array($heros), ErrCode::paras_err);                        # 参数检查
         $pvp->defTeam = $heros;                                                 # 更新阵容
         $req->userInfo->game->pvp = $pvp;
@@ -381,12 +381,12 @@ class PVPProc {
         # 回存数据
         # 返回
         my_Assert($amt > 0, ErrCode::paras_err);                                # 数量>0
-        $pvp = new UserPVPModel($req->userInfo->game->pvp);
+        $pvp = new Info_UserPVP($req->userInfo->game->pvp);
         $g = glc();
         $costCash = $g->PVP_pk_ticket_price * $amt;                             # 计算消耗钻石
         my_Assert($costCash > 0, ErrCode::pvp_ticket_cost_ilegal);              # 定价数据异常
 
-        if (!UserGameModel::Consume_Cash($req->userInfo->game->baseInfo, $costCash)) {    # 扣除钻石失败
+        if (!Data_UserGame::Consume_Cash($req->userInfo->game->baseInfo, $costCash)) {    # 扣除钻石失败
             return Resp::err(ErrCode::notenough_cash_msg);
         }
         $pvp->fightTicket += $amt;                                              # 发放挑战票
@@ -450,7 +450,7 @@ class PVPProc {
         $offLog = $req->mem->zrange($key_off, 0, self::maxLogCount);            # 主动挑战数据
         $defLog = $req->mem->zrange($key_def, 0, self::maxLogCount);            # 防守数据
         // Ps. 挑战记录分为2个榜, 且按照时间戳记录,晚于指定时间戳的判定为未读消息,挑战记录最多记录50条
-        $pvp = new UserPVPModel($req->userInfo->game->pvp);                     # 玩家竞技场数据
+        $pvp = new Info_UserPVP($req->userInfo->game->pvp);                     # 玩家竞技场数据
         $pvp->lastCheckDefLog_ts = now();                                       # 记录时间戳 
         UserProc::updateUserInfo();                                             # 回写数据 
         array_walk($offLog, function (&$i) {                                    # 解码一下
@@ -549,7 +549,7 @@ class PVPProc {
 
     /**
      * 获取对手匹配结果
-     * @param UserPVPModel $pvp
+     * @param Info_UserPVP $pvp
      * @param CRedisutil $mem
      * @param type $uid
      * @param type $zoneid

Gameserver/Amfphp/process/FightProc/SweepGatesProc.php

@@ -77,7 +77,7 @@ class SweepGatesProc {
     public static function DrawChapterStarsReward($req) {
         list($chapterId, $hard, $stars) = $req->paras;                          # 参数: 章节id, 难度, 分数
         $hard = $hard + 1;
-        $userGates = new UserGateDifficulty($req->userInfo->game->gates);
+        $userGates = new Info_UserGateDifficulty($req->userInfo->game->gates);
         if (!property_exists($userGates->chapterStarsRwd . $chapterId)) {       # 防御第一次读取本章节数据
             $userGates->chapterStarsRwd->$chapterId = ObjectInit();
         }
@@ -99,13 +99,13 @@ class SweepGatesProc {
         $userGateL = null;
         switch ($hard) {                                                        # 取不同难度数据记录
             case 1:
-                $userGateL = new UserGatesModel($userGates->normal);
+                $userGateL = new Ins_UserGatesModel($userGates->normal);
                 break;
             case 2:
-                $userGateL = new UserGatesModel($userGates->hard);
+                $userGateL = new Ins_UserGatesModel($userGates->hard);
                 break;
             case 3:
-                $userGateL = new UserGatesModel($userGates->elite);
+                $userGateL = new Ins_UserGatesModel($userGates->elite);
                 break;
             default:
                 break;
@@ -171,8 +171,8 @@ class SweepGatesProc {
 //        echoLine("wwTT");
 //        var_dump($rewardStr);
         $rewardArr = self::SetRewards($req, $rewardStr);                           # 发通关奖励 
-        UserGameModel::Add_Gold($req->userInfo->game->baseInfo, $gold);                   # 发金币
-        UserGameModel::Add_Exp($req->userInfo->game->baseInfo, $exp);                     # 给玩家(指挥官)增加经验
+        Data_UserGame::Add_Gold($req->userInfo->game->baseInfo, $gold);                   # 发金币
+        Data_UserGame::Add_Exp($req->userInfo->game->baseInfo, $exp);                     # 给玩家(指挥官)增加经验
         UserProc::updateUserInfo();                                             # 回写玩家数据.
 #
         TaskProc::OnPassGateN($gateId, $difficulty);
@@ -239,7 +239,7 @@ class SweepGatesProc {
             Err(ErrCode::err_arenasgate_indexillegal);
         }
 
-        $uGate = new UGateModel();                                              # 当前关卡的记录数据
+        $uGate = new Ins_UGate();                                              # 当前关卡的记录数据
         if (isset($diffCult->gates->$gateId)) {
             $uGate = $diffCult->gates->$gateId;
         }
@@ -280,7 +280,7 @@ class SweepGatesProc {
         }
         $diffCult->latest = $gateId;                                            # 记录上次挑战关卡id
 
-        $uGate = new UGateModel();                                              # 当前关卡的记录数据
+        $uGate = new Ins_UGate();                                              # 当前关卡的记录数据
         if (isset($diffCult->gates->$gateId)) {
             $uGate = $diffCult->gates->$gateId;
         }
@@ -367,11 +367,11 @@ class SweepGatesProc {
             }
         }
 
-        UserGameModel::Add_Gold($req->userInfo->game->baseInfo, $gold);        # 发放金币奖励
+        Data_UserGame::Add_Gold($req->userInfo->game->baseInfo, $gold);        # 发放金币奖励
         if ($err) {
             return Resp::err($err);
         }
-        UserGameModel::Add_Exp($req->userInfo->game->baseInfo, $exp);                     # 发放经验奖励
+        Data_UserGame::Add_Exp($req->userInfo->game->baseInfo, $exp);                     # 发放经验奖励
         UserProc::updateUserInfo();                                         # 在获取战利品哪里已经update了.
         $result = array(
             'store' => $req->userInfo->game->store,

Gameserver/Amfphp/process/HeroProc.php

@@ -79,7 +79,7 @@ class HeroProc {
         my_default_Obj($cHeros);
         my_Assert(CommUtil::isPropertyExists($cHeros, $huid), ErrCode::hero_no); # 1.检查是否存在要解锁的英雄
 #                                                                               # 2.判断英雄的该技能能否升级.... 
-        $targetHero = new UserHeroModel($cHeros->$huid);                        # 直接类型识别 
+        $targetHero = new Ins_UserHero($cHeros->$huid);                        # 直接类型识别 
         $targteHeroSkills = $targetHero->subSkills;                             # 取出这个英雄的技能数据 
         my_default_Arr($targteHeroSkills->$mainSkillId);                        # 保护子技能数组数据结构
         my_Assert(!CommUtil::isInArray($targteHeroSkills->$mainSkillId, $subSkillId), "子技能已解锁"); # 子技能已经解锁
@@ -89,7 +89,7 @@ class HeroProc {
 
         $sm = GameConfig::subSkill_getItem($subSkillId);                        # 4.取出该技能升级消耗的常量数据
         my_Assert(null != $sm, ErrCode::err_const_no);                          # 找不到子技能配置数据 
-        my_Assert(UserGameModel::Consume_Gold($user->baseInfo, $sm->unlockCost), #        # 5. 扣除金币消耗
+        my_Assert(Data_UserGame::Consume_Gold($user->baseInfo, $sm->unlockCost), #        # 5. 扣除金币消耗
                 ErrCode::notenough_gold_msg);
         array_push($targteHeroSkills->$mainSkillId, $subSkillId);               # 添加技能
         $targetHero->subSkills = $targteHeroSkills;
@@ -111,7 +111,7 @@ class HeroProc {
         my_default_Obj($collectHeros);                                          # 防御变量为空
         my_Assert(CommUtil::isPropertyExists($collectHeros, $huid), ErrCode::hero_no);   # 1.检查是否存在要升级的英雄
 #                                                                               # 2.判断英雄的该技能能否升级....
-        $targetHero = new UserHeroModel($cHeros->$huid);                        # 直接类型识别
+        $targetHero = new Ins_UserHero($cHeros->$huid);                        # 直接类型识别
         $targteHeroSkills = $targetHero->subSkills;                            # 取出这个英雄的技能数据 
         my_default_Arr($targteHeroSkills->$mainSkillId);                       # 保护数据结构
         my_Assert(CommUtil::isInArray($targteHeroSkills->$mainSkillId, $subSkillId), "子技能id错误");     # 子技能id
@@ -122,7 +122,7 @@ class HeroProc {
 //        if (null == $sm) {
 //            return \Resp::err(ErrCode::err_const_no, '找不到子技能配置数据');
 //        }
-        my_Assert(UserGameModel::Consume_Gold($user->baseInfo, $costGold), ErrCode::notenough_gold_msg); # 5. 扣除金币消耗
+        my_Assert(Data_UserGame::Consume_Gold($user->baseInfo, $costGold), ErrCode::notenough_gold_msg); # 5. 扣除金币消耗
         unset($targteHeroSkills->$mainSkillId, $subSkillId);                    # 替换技能
         array_push($targteHeroSkills->$mainSkillId, $targetSubSkillId);
         $targetHero->subSkills = $targteHeroSkills;
@@ -142,7 +142,7 @@ class HeroProc {
         $collectHeros = $user->heros->collectHeros;
         my_default_Obj($collectHeros);                                          # 防御变量为空
         my_Assert(CommUtil::isPropertyExists($collectHeros, $huid), ErrCode::hero_no);   # 1.检查是否存在要升级的英雄
-        $targetHero = new UserHeroModel($collectHeros->$huid);
+        $targetHero = new Ins_UserHero($collectHeros->$huid);
         $targteHeroSkills = $targetHero->subSkills;                             # 取出这个英雄的技能数据 
         my_Assert(CommUtil::isPropertyExists($targteHeroSkills, $mainSkillId), "玩家数据结构有问题.");     # 主技能Id.
         my_Assert(CommUtil::isInArray($targteHeroSkills->$mainSkillId, $subSkillId), "子技能id错误");     # 子技能id
@@ -150,7 +150,7 @@ class HeroProc {
 
         $sm = GameConfig::subSkill_getItem($subSkillId);                        # 4.取出该技能升级消耗的常量数据
         my_Assert(null != $sm, ErrCode::err_const_no);                          # 找不到子技能配置数据
-        my_Assert(UserGameModel::Consume_Gold($user->baseInfo, $sm->upgradeCost), ErrCode::notenough_gold_msg);  # 5. 扣除金币消耗
+        my_Assert(Data_UserGame::Consume_Gold($user->baseInfo, $sm->upgradeCost), ErrCode::notenough_gold_msg);  # 5. 扣除金币消耗
 
         unset($targteHeroSkills->$mainSkillId, $subSkillId);                    # 替换技能
         array_push($targteHeroSkills->$mainSkillId, $sm->nextLevel_Id);
@@ -174,12 +174,12 @@ class HeroProc {
         $collectHeros = $user->heros->collectHeros;                             # 角色容器
         my_default_Obj($collectHeros);                                          # 保证不为null
         my_Assert(CommUtil::isPropertyExists($collectHeros, $huid), ErrCode::hero_no);  # 1.检查是否存在要升级的英雄 
-        $upHero = new UserHeroModel($collectHeros->$huid);                      # 直接类型识别
+        $upHero = new Ins_UserHero($collectHeros->$huid);                      # 直接类型识别
         my_Assert($upHero->grade < "S", ErrCode::hero_strength_maxstrengthlevel); # 已经达到S级 
         $heroUpgradeCostCfg = GameConfig::heroextra_level_getItem($upHero->typeId, $nextGrade);
 
         my_Assert($heroUpgradeCostCfg, ErrCode::hero_strength_cost_const_no);    # 1.检查是否存在这个升阶数据的模板
-        my_Assert(UserGameModel::Consume_HeroSegment($user, #                    # 扣除碎片  
+        my_Assert(Data_UserGame::Consume_HeroSegment($user, #                    # 扣除碎片  
                         $heroUpgradeCostCfg->segID, $heroUpgradeCostCfg->segNum), ErrCode::hero_segment_not_enough);                              # 碎片数量不足
         # 扣除碎片成功
         $upHero->grade = $nextGrade;                                            # 5.强化英雄进行成功升阶 
@@ -205,7 +205,7 @@ class HeroProc {
         my_default_Obj($collectHeros);
         my_Assert(is_int($costNumber) && $costNumber >= 1, ErrCode::paras_err); # 参数合法性判断
         my_Assert(CommUtil::isPropertyExists($collectHeros, $huid), ErrCode::hero_no); # 玩家拥有此英雄
-        $targetHero = new UserHeroModel($collectHeros->$huid);                  # 智能感知辅助
+        $targetHero = new Ins_UserHero($collectHeros->$huid);                  # 智能感知辅助
         my_Assert($targetHero->HeroCanLevelUp(), "英雄不可升级");                # 2. 检查玩家等级是否可以继续升级, Ps. 全局限制 + 指挥官等级限制
         $myPacketItems = $user->store->items;                                   # 检查道具的数量，在背包中是否充足
         my_Assert(CommUtil::isPropertyExists($myPacketItems, $costItemId), ErrCode::store_itemnotenough); # 
@@ -349,7 +349,7 @@ class HeroProc {
             return Resp::err(ErrCode::hero_no);
         }
         # 2.检查是否存在要升级的英雄的神血的血脉值 是否达到100%
-        isEditor() and $strengthHero = new UserHeroModel();
+        isEditor() and $strengthHero = new Ins_UserHero();
         $strengthHero = $collectHeros->$huid;
 
         # 检查是否存在当前 神血的的消耗常量数据 以及血脉值 是否达到100%
@@ -465,9 +465,9 @@ class HeroProc {
         $bDeal = false;
         if ($enoughMoney === true) {
             if ($requireMoneyType === "gold") {
-                $bDeal = UserGameModel:: Consume_Gold($user->baseInfo, $requireMoneyNum);
+                $bDeal = Data_UserGame:: Consume_Gold($user->baseInfo, $requireMoneyNum);
             } else if ($requireMoneyType === "cash") {
-                $bDeal = UserGameModel:: Consume_Cash($user->baseInfo, $requireMoneyNum);
+                $bDeal = Data_UserGame:: Consume_Cash($user->baseInfo, $requireMoneyNum);
             }
         }
 
@@ -517,7 +517,7 @@ class HeroProc {
             return Resp::err(ErrCode::hero_no);
         }
 # 2.检查是否已经达到最大星级
-        isEditor() and $strengthHero = new UserHeroModel();
+        isEditor() and $strengthHero = new Ins_UserHero();
         $strengthHero = $collectHeros->$huid;
         if ($strengthHero->curStar >= $g->Hero_Star_MaxStarLevel) {
             return Resp::err(ErrCode::hero_star_maxstarlevel);
@@ -660,9 +660,9 @@ class HeroProc {
         $bDeal = false;
         if ($enoughMoney === true) {
             if ($requireMoneyType === "gold") {
-                $bDeal = UserGameModel:: Consume_Gold($user->baseInfo, $requireMoneyNum);
+                $bDeal = Data_UserGame:: Consume_Gold($user->baseInfo, $requireMoneyNum);
             } else if ($requireMoneyType === "cash") {
-                $bDeal = UserGameModel:: Consume_Cash($user->baseInfo, $requireMoneyNum);
+                $bDeal = Data_UserGame:: Consume_Cash($user->baseInfo, $requireMoneyNum);
             }
         }
 
@@ -713,7 +713,7 @@ class HeroProc {
             return Resp::err(ErrCode::hero_no);
         }
 # 2.检查是否已经达到最大星级
-        isEditor() and $strengthHero = new UserHeroModel();
+        isEditor() and $strengthHero = new Ins_UserHero();
         $strengthHero = $collectHeros->$huid;
         if ($strengthHero->curStar >= $g->Hero_Star_MaxStarLevel) {
             return Resp::err(ErrCode::hero_star_maxstarlevel);
@@ -821,7 +821,7 @@ class HeroProc {
                 if ($user->baseInfo->gold < $costGold) {
                     return Resp::err(ErrCode::notenough_gold_msg);
                 } else {
-                    $bDeal = UserGameModel:: Consume_Gold($user->baseInfo, $costGold);
+                    $bDeal = Data_UserGame:: Consume_Gold($user->baseInfo, $costGold);
                 }
             } else if ($costGold == 0) {
                 $bDeal = true;
@@ -890,13 +890,13 @@ class HeroProc {
                 $realPrice = $heroCfg->cashPrice;
                 my_Assert($realPrice == $costMoneyNum, ErrCode::paras_err);
                 my_Assert($costMoneyNum >= 0, ErrCode::paras_err);
-                my_Assert(UserGameModel::Consume_Cash($user->baseInfo, $costMoneyNum), ErrCode::err_msg_cashnotenough);
+                my_Assert(Data_UserGame::Consume_Cash($user->baseInfo, $costMoneyNum), ErrCode::err_msg_cashnotenough);
                 break;
             case "gold":
                 $realPrice = $heroCfg->goldPrice;
                 my_Assert($realPrice == $costMoneyNum, ErrCode::paras_err);
                 my_Assert($costMoneyNum >= 0, ErrCode::paras_err);
-                my_Assert(UserGameModel::Consume_Gold($user->baseInfo, $costMoneyNum), ErrCode::err_msg_goldnotenough);
+                my_Assert(Data_UserGame::Consume_Gold($user->baseInfo, $costMoneyNum), ErrCode::err_msg_goldnotenough);
                 break;
             default :
                 Err(ErrCode::paras_err, "参数错误: [costType] " . $costType);
@@ -930,7 +930,7 @@ class HeroProc {
         $realCost = $arr[$index];
         my_Assert($realCost == $costCash, ErrCode::paras_err);                  # 参数错误
         my_Assert($costCash >= 0, ErrCode::paras_err);
-        my_Assert(UserGameModel::Consume_Cash($user, $costCash), ErrCode::err_msg_goldnotenough); # 扣除宝石
+        my_Assert(Data_UserGame::Consume_Cash($user, $costCash), ErrCode::err_msg_goldnotenough); # 扣除宝石
         $user->heros->maxCollectCount += $buyNum;                               # 修改上限
         UserProc::updateUserInfo();
         return Resp::ok(array(
@@ -959,7 +959,7 @@ class HeroProc {
      * @param Req $req
      * @param int $heromodelId 原型数据id
      * @param int $star        星级
-     * @return UserHeroModel
+     * @return Ins_UserHero
      */
     static function AddHeroWithStar(&$req, $heromodelId, $star) {
         $user = $req->userInfo->game;
@@ -998,12 +998,12 @@ class HeroProc {
      * 根据一个英雄的模板id,来获得一个英雄的实例数据 
      * @param string $heroModelId 模板数据ID
      * @param string $uid 唯一ID
-     * @return UserHeroModel
+     * @return Ins_UserHero
      */
     static function getGameHeroModelInstance($heroModelId, $uid) {
         $heroCfg = GameConfig::hero_getItem($heroModelId);
         my_Assert(null != $heroCfg, ErrCode::err_const_no);                     # 检查是否存在这个英雄的模板
-        $hero = new UserHeroModel();
+        $hero = new Ins_UserHero();
 //        $hero->strengthLevel = $heroCfg->dengjie;
         $hero->curStar = $heroCfg->xingji;
         $hero->typeId = $heroCfg->heroId;
@@ -1060,7 +1060,7 @@ class HeroProc {
         $collectHeros = $req->userInfo->game->heros->collectHeros;
         my_default_Obj($collectHeros);
         my_Assert(CommUtil::isPropertyExists($collectHeros, $heroUID), ErrCode::hero_no); # 要升级的英雄不存在
-        $targetHero = new UserHeroModel($collectHeros->$heroUID);               # 英雄对象 
+        $targetHero = new Ins_UserHero($collectHeros->$heroUID);               # 英雄对象 
         $playerLimit = GameConfig::playerlevel_getItem($req->userInfo->game->baseInfo->level)->hero_max_level;
         $maxLevel = min(glc()->Hero_Upgrade_BasicMaxLevel, $playerLimit);       # 最大等级= max(英雄最高等级上限,玩家等级限制的上限)
         if ($targetHero->level >= $maxLevel) {
@@ -1120,7 +1120,7 @@ class HeroProc {
      * 计算队伍战斗力, 添加到战斗力隐藏榜单中, for pvp back matchers, -wg 2017.07.13
      * @param type $zoneid
      * @param type $uid
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @return type
      */
     static function CalcTeamFightPower($zoneid, $uid, $user) {
@@ -1137,7 +1137,7 @@ class HeroProc {
                     $hero = $heros->collectHeros->$hid;
                     if ($hero) {
 //                        $fp += self::calcHeroFightPower($hero);
-                        $h = new UserHeroModel($hero);
+                        $h = new Ins_UserHero($hero);
                         $fp += $h->GetPower();
                     }
                 }
@@ -1153,13 +1153,13 @@ class HeroProc {
      * @version 1.0.0 改造自原来的队伍战斗力统计方法 --gwang 2020.4.23
      * @param type $zoneid
      * @param type $uid
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @return type
      */
     static function CalcUserFightPower($zoneid, $uid, $user) {
         $fp = 0;                                                                # 总战力:返回值
         foreach ($user->heros->collectHeros as $hid => $hero) {
-            $h = new UserHeroModel($hero);
+            $h = new Ins_UserHero($hero);
             $fp += $h->GetPower();
         }
         $key_fp = MemKey_GameRun::Game_FightPowerRank_zset($zoneid);            # 战力榜
@@ -1177,7 +1177,7 @@ class HeroProc {
 
     /**
      * 计算hero战斗力, for pvp back matchers, -wg 2017.07.13
-     * @param UserHeroModel $hero
+     * @param Ins_UserHero $hero
      * @return int
      */
     static private function calcHeroFightPower($hero) {
@@ -1197,7 +1197,7 @@ class HeroProc {
 
     /**
      * 计算hero的属性,, for pvp back matchers, -wg 2017.07.13
-     * @param UserHeroModel $hero
+     * @param Ins_UserHero $hero
      * @param type $propertyname
      */
     private static function calcHeroProperty($hero, $propertyname) {

Gameserver/Amfphp/process/PayProc.php

@@ -272,7 +272,7 @@ class PayProc {
      */
     public static function m_pay_getDynamic($req) {
         $user = $req->userInfo->game;
-        $userSecretshop = new userSecretshopModel($user->userSecretshop);
+        $userSecretshop = new Info_UserSecretshop($user->userSecretshop);
         // 参数提取
         $refreshType = $req->paras[0];                                          # 刷新类型(参数)0,不刷,1,免费刷,2,钻石刷
         switch ($refreshType) {
@@ -287,7 +287,7 @@ class PayProc {
                 }                                                               # 可以继续刷新,
                 $cishu = $userSecretshop->refreshedTimes + 1;                   # 下次
                 $amt = GameConfig::secretshop_refresh_getItem($cishu)->price;
-                if (!UserGameModel::Consume_Cash($user, $amt)) {                # 扣除本次所需费用, 余额不足, 返回错误信息
+                if (!Data_UserGame::Consume_Cash($user, $amt)) {                # 扣除本次所需费用, 余额不足, 返回错误信息
                     return Resp::err(ErrCode::notenough_cash_msg);
                 }
                 $userSecretshop->refreshedTimes++;                              # 增加当天付费刷新计数
@@ -318,7 +318,7 @@ class PayProc {
     /**
      * 更新神秘商城物品
      * @param Req $req
-     * @param UserSecretshopModel $userSecretshop Description
+     * @param Info_UserSecretshop $userSecretshop Description
      */
     private static function refreshDynamicShopItems($req, &$userSecretshop) {
         $userSecretshop->lastRefreshTs = now();
@@ -376,7 +376,7 @@ class PayProc {
      * @param Req $req
      */
     private static function clearDailyLimits($req) {
-        $userSecretshop = new userSecretshopModel($req->userInfo->game->userSecretshop);
+        $userSecretshop = new Info_UserSecretshop($req->userInfo->game->userSecretshop);
         $userSecretshop->refreshedTimes = 0;
         $req->userInfo->game->userSecretshop = $userSecretshop;
     }
@@ -387,8 +387,8 @@ class PayProc {
      * @param Req $req
      */
     public static function m_pay_buyDynamic($req) {
-        $user = new UserGameModel($req->userInfo->game);
-        $userSecretshop = new userSecretshopModel($user->userSecretshop);
+        $user = new Data_UserGame($req->userInfo->game);
+        $userSecretshop = new Info_UserSecretshop($user->userSecretshop);
         // 参数提取
         $itemId = $req->paras[0];                                               # 商品id (点一次购买一个)
         $num = 1;                                                               # 暂时固定为一次购买一个
@@ -405,12 +405,12 @@ class PayProc {
         $amt = $shopItem->price * pow(2, $cishu);                               # 计算价格
         switch ($shopItem->pricetype) {
             case 1:
-                if (!UserGameModel::Consume_Cash($user->baseInfo, $amt)) {                # 扣除钻石
+                if (!Data_UserGame::Consume_Cash($user->baseInfo, $amt)) {                # 扣除钻石
                     return Resp::err(ErrCode::notenough_cash_msg);
                 }
                 break;
             case 2:
-                if (!UserGameModel::Consume_Gold($user->baseInfo, $amt)) {                # 扣除金币
+                if (!Data_UserGame::Consume_Gold($user->baseInfo, $amt)) {                # 扣除金币
                     return Resp::err(ErrCode::notenough_gold_msg);
                 }
                 break;
@@ -495,7 +495,7 @@ class PayProc {
                 $bDeal = true;
                 break;
             case 2:                                                             # 金币
-                if (!UserGameModel::Consume_Gold($user->baseInfo, $amt * $num)) {         # 更新玩家金币余额
+                if (!Data_UserGame::Consume_Gold($user->baseInfo, $amt * $num)) {         # 更新玩家金币余额
                     return Resp::err(ErrCode::notenough_gold_msg);
                 }                                                               # 更新(扣除)玩家游戏币(金币)余额
                 $bDeal = true;
@@ -553,7 +553,7 @@ class PayProc {
             if ($user->cash < $amt) {                       # 余额不足
                 $err = ErrCode::notenough_cash_msg;
             } else {                                        # 更新玩家游戏币余额
-                UserGameModel::set_Cash($user, $user->cash - $amt);
+                Data_UserGame::set_Cash($user, $user->cash - $amt);
             }
         }
         return $err;
@@ -570,7 +570,7 @@ class PayProc {
     static function _SaveUserGold($req, $amt) {
         $err = ErrCode::ok;
         $user = $req->userInfo->game;
-        if (!UserGameModel::Consume_Gold($user->baseInfo, $amt)) {        # 更新玩家金币余额
+        if (!Data_UserGame::Consume_Gold($user->baseInfo, $amt)) {        # 更新玩家金币余额
             $err = ErrCode::notenough_gold_msg;
         }
         return $err;

Gameserver/Amfphp/process/ShopProc.php

@@ -44,7 +44,7 @@ class ShopProc {
 
     public static function BuyMonthlyVip($req) {
         $packageId = $req->paras[0];                                            # 参数; 礼包id
-        $shopdata = new UserShopInfoModel($req->userInfo->game->shopdata);
+        $shopdata = new Info_UserShop($req->userInfo->game->shopdata);
         $packageCfg = GameConfig::shop_monthVIP_getItem($packageId);
         my_Assert(null != $packageCfg, ErrCode::err_const_no);
         if ($packageCfg->subType == 4) {
@@ -88,7 +88,7 @@ class ShopProc {
      */
     public static function BuyLimitPackage($req) {
         $packageId = $req->paras[0];                                            # 参数; 礼包id
-        $shopdata = new UserShopInfoModel($req->userInfo->game->shopdata);
+        $shopdata = new Info_UserShop($req->userInfo->game->shopdata);
         $packageCfg = GameConfig::shop_limit_getItem($packageId);
         my_Assert(null != $packageCfg, ErrCode::err_const_no);
 
@@ -139,7 +139,7 @@ class ShopProc {
         CLog::info("shop-每日检查-清除每日/周限量礼包购买记录");
         $zoneid = $req->zoneid;
         $uid = $req->uid;
-        $shopdata = new UserShopInfoModel($req->userInfo->game->shopdata);
+        $shopdata = new Info_UserShop($req->userInfo->game->shopdata);
         $shopdata->purchasedDailyLimitPackages = array();                       # 每天重置
         if (date("N") == 1) {                                                   # 周一重置
             $shopdata->purchasedWeeklyLimitPackages = array();

Gameserver/Amfphp/process/StoreProc.php

@@ -188,7 +188,7 @@ class StoreProc {
 
     /**
      * 从仓库中移除指定数量的物品
-     * @param StoreModel $store
+     * @param Info_Store $store
      * @param type $itemId
      * @param type $itemcount
      * @return type
@@ -213,7 +213,7 @@ class StoreProc {
     /**
      * 从仓库移出装备
      * @param type $itemId  uid
-     * @param StoreModel $store
+     * @param Info_Store $store
      * @return boolean
      */
     static function removeEquipFromStore($uid, $typeId, &$req) {
@@ -228,7 +228,7 @@ class StoreProc {
 
     /**
      * 从仓库移除碎片
-     * @param StoreModel $store
+     * @param Info_Store $store
      * @param int $segmentId
      * @param int $num
      * @return bool 成功/失败
@@ -244,7 +244,7 @@ class StoreProc {
 
     /**
      * 向仓库添加碎片
-     * @param StoreModel $store
+     * @param Info_Store $store
      * @param int $segmentId
      * @param int $num
      */
@@ -266,7 +266,7 @@ class StoreProc {
     /**
      * 将其他物品放入仓库
      * @param type $itemId
-     * @param UserGameModel $game
+     * @param Data_UserGame $game
      */
     static function PutItemInStore($itemId, &$game) {
         if (CommUtil::isPropertyExists($game->store->items, $itemId)) {// 如果仓库中已经有这种元素，则其数目+1
@@ -295,19 +295,19 @@ class StoreProc {
             $smItem = GameConfig::item_base_getItem($itemId);                   # 道具mo
             switch ($smItem->subType) {                                         # 根据类型分别添加到容器中
                 case META_EXP:                                                  # 指挥官经验
-                    UserGameModel::Add_Exp($user->baseInfo, $num);
+                    Data_UserGame::Add_Exp($user->baseInfo, $num);
                     break;
                 case META_GOLD_ITEMID:                                          # 金币
-                    UserGameModel::Add_Gold($user->baseInfo, $num);
+                    Data_UserGame::Add_Gold($user->baseInfo, $num);
                     break;
                 case META_CASH_ITEMID:                                          # 钻石
-                    UserGameModel::Add_Cash($user->baseInfo, $num);
+                    Data_UserGame::Add_Cash($user->baseInfo, $num);
                     break;
                 case META_tili_ITEMID:                                          # 体力       
-                    UserGameModel::Add_tili($req, $num);
+                    Data_UserGame::Add_tili($req, $num);
                     break;
                 case META_FriendShipPoit_ItemId:                                # 友情值
-                    UserGameModel::Add_FriendPoint($user->baseInfo, $num);
+                    Data_UserGame::Add_FriendPoint($user->baseInfo, $num);
                     break;
                 case META_PVPCOIN_ITEMID:                                       # 竞技币
                     $user->pvp->pvpCoins += $num;
@@ -443,20 +443,20 @@ class StoreProc {
         if ($itembaseMo->pileNum > 0) {                                         // 可叠加
             $taskCard = null;
             foreach ($req->userInfo->game->store->taskcards as $uuid => &$val) {
-                $val = new TaskCardVo($val);
+                $val = new Ins_TaskCard($val);
                 if ($val->typeId == $itemId) {
                     $taskCard = $val;
                     break;
                 }
             }
             if (null == $taskCard) {                                            # 原来么有
-                $taskCard = new TaskCardVo($itemId);
+                $taskCard = new Ins_TaskCard($itemId);
                 $taskCard->uid = $cid;
                 $req->userInfo->game->store->taskcards->$cid = $taskCard;
             }
             $taskCard->count += 1;
         } else {
-            $taskCard = new TaskCardVo($itemId);
+            $taskCard = new Ins_TaskCard($itemId);
             $taskCard->uid = $cid;
             $req->userInfo->game->store->taskcards->$cid = $taskCard;
         }
@@ -730,7 +730,7 @@ class StoreProc {
         }
         $costCash = glc()->Item_Packet_NumCostCash;                             # 钻石花费
         my_Assert($costCash > 0, ErrCode::paras_err);
-        my_Assert(UserGameModel::Consume_Cash($user, $costCash), ErrCode::notenough_cash_msg); # 6.进行消耗
+        my_Assert(Data_UserGame::Consume_Cash($user, $costCash), ErrCode::notenough_cash_msg); # 6.进行消耗
 
         $user->privateState->maxItemNum += 10;                                  # 扩容
         UserProc::updateUserInfo();                                             # 保存玩家数据

Gameserver/Amfphp/process/SystemProc.php

@@ -143,7 +143,7 @@ class SystemProc {
     /**
      * 玩家通过xx副本消息
      * @param type $zoneid
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $carbonID
      *      */
     static function Carbon_Win($zoneid, $user, $carbonID, $hardLevel) {
@@ -157,7 +157,7 @@ class SystemProc {
     /**
      * 玩家pvp段位消息
      * @param type $zoneid
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $leagueID
      *      */
     static function PVP_league($zoneid, $user, $leagueID) {
@@ -205,7 +205,7 @@ class SystemProc {
             case 1:                                                             # 钻石
                 $cost = glc()->SystemMessage_UserSendToMyZone_Cost;
                 my_Assert($cost, ErrCode::err_msg_usersnedmsg_errorcost);
-                my_Assert(UserGameModel::Consume_Cash($user, $cost), ErrCode::notenough_cash_msg);
+                my_Assert(Data_UserGame::Consume_Cash($user, $cost), ErrCode::notenough_cash_msg);
                 break;
             default :
                 Err(ErrCode::paras_err);                                        // 其他类型:参数非法
@@ -223,7 +223,7 @@ class SystemProc {
     /**
      * 玩家升级消息
      * @param type $zoneid
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $newLevel
      *      */
     static function UserLevelUp($zoneid, $user, $newLevel) {
@@ -253,7 +253,7 @@ class SystemProc {
     /**
      * 添加购买公会钻石礼包消息
      * @param type $zoneid
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * */
     static function BuyGuildCashPack($zoneid, $user) {
         self::pushSysMessage($zoneid, SysMessageType::BuyGuild_CashPack, array(
@@ -264,7 +264,7 @@ class SystemProc {
     /**
      * 添加获得装备消息
      * @param type $zoneid
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $equipModelId
      * @deprecated since version 0 待维修 --王刚2020年1月2日21:07:04
      *      */
@@ -299,7 +299,7 @@ class SystemProc {
     /**
      * 添加获得英雄消息
      * @param type $zoneid
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $heroId
      * @return int $err
      *      */
@@ -315,7 +315,7 @@ class SystemProc {
     /**
      * 添加英雄血脉提纯消息
      * @param type $zoneid
-     * @param UserGameModel $user
+     * @param Data_UserGame $user
      * @param int $heroId
      * @return int $err
      *      */

Gameserver/Amfphp/process/TaskProc.php

@@ -80,7 +80,7 @@ class TaskProc {
         // 销毁任务卡, 发放奖励
         list($taskCardUID) = $req->paras;
         my_Assert(StlUtil::dictHasProperty($req->userInfo->game->store->taskcards, $taskCardUID), ErrCode::taskCard_no); # 防御
-        $taskCard = new TaskCardVo($req->userInfo->game->store->taskcards->$taskCardUID); # 任务卡对象
+        $taskCard = new Ins_TaskCard($req->userInfo->game->store->taskcards->$taskCardUID); # 任务卡对象
         if (strlen($taskCard->mo()->reward) > 0) {                              # 防御奖励串为空
             StoreProc::AddMultiItemInStore($req, $taskCard->mo()->reward);      # 发放奖励
         }
@@ -141,7 +141,7 @@ class TaskProc {
         $userTask = $req->userInfo->game->task;
 
         my_Assert(StlUtil::dictHasProperty($userTask->taskListPlot, $taskId), ErrCode::task_no); # 任务存在
-        $taskItem = new TaskInfo($userTask->taskListPlot->$taskId);
+        $taskItem = new Ins_TaskInfo($userTask->taskListPlot->$taskId);
         my_Assert($taskItem->rewardGeted < 1, ErrCode::task_reward_geted);      # 任务奖励尚未领取
         $userTask->curTaskId = $taskId;
 //        var_dump($userTask);
@@ -155,13 +155,13 @@ class TaskProc {
      */
     static function GetTaskReward($req) {
         list($taskId) = $req->paras;                                            # 提取参数: 任务id
-        $userTask = new UserTaskInfo($req->userInfo->game->task);
+        $userTask = new Info_UserTask($req->userInfo->game->task);
         $mask = 100000;                                                         # 根据id段来区分任务和每日任务.
         $type = intval($taskId / $mask);                                        # 取出taskId第一位判断任务类型
         switch ($type) {                                                        # 
             case 4:                                                             # 剧情任务
                 my_Assert(StlUtil::dictHasProperty($userTask->taskListPlot, $taskId), ErrCode::task_no); #判断是否存在指定任务
-                $task = new TaskInfo($userTask->taskListPlot->$taskId);
+                $task = new Ins_TaskInfo($userTask->taskListPlot->$taskId);
                 my_Assert($task->progress >= 1, ErrCode::task_progress_not_complete);   # 判断任务进度是否已完成>=1f
                 my_Assert($task->rewardGeted < 1, ErrCode::task_reward_geted);          # 奖励不可重复领取
                 $taskCfg = GameConfig::task_getItem($taskId);                           # 任务配置数据
@@ -178,12 +178,12 @@ class TaskProc {
                 break;
             case 5:                                                             # 每日任务
                 my_Assert(StlUtil::dictHasProperty($userTask->taskListDaily, $taskId), ErrCode::task_no);
-                $task = new TaskInfo($userTask->taskListDaily->$taskId);
+                $task = new Ins_TaskInfo($userTask->taskListDaily->$taskId);
                 my_Assert($task->progress >= 1, ErrCode::task_progress_not_complete);   # 判断任务进度是否已完成>=1f
                 my_Assert($task->rewardGeted < 1, ErrCode::task_reward_geted);          # 奖励不可重复领取
                 $taskCfg = GameConfig::task_daily_getItem($taskId);                     # 任务配置数据
                 my_Assert($taskCfg != null, ErrCode::err_const_no);
-                UserGameModel::Add_Exp($req->userInfo->game->baseInfo, $taskCfg->exp);  # 发放任务奖励 
+                Data_UserGame::Add_Exp($req->userInfo->game->baseInfo, $taskCfg->exp);  # 发放任务奖励 
                 $userTask->dailyActivePoint += $taskCfg->activePoint;
                 $task->rewardGeted = 1;
                 $userTask->taskListDaily->$taskId = $task;                      # 回存下
@@ -218,7 +218,7 @@ class TaskProc {
      * @param Req $req
      */
     static function ResetDailyTask($req) {
-        $userTask = new UserTaskInfo($req->userInfo->game->task);
+        $userTask = new Info_UserTask($req->userInfo->game->task);
         $userTask->resetDailyTask();
         $req->userInfo->game->task = $userTask;
     }
@@ -228,7 +228,7 @@ class TaskProc {
 
     /**
      * 检查任务条件是否达成
-     * @param TaskParams $taskParam Description
+     * @param Ins_TaskParams $taskParam Description
      */
     static function CheckTaskConditions($taskParam) {
 //        var_dump($taskParam);
@@ -239,7 +239,7 @@ class TaskProc {
             if ($taskCfg->tasktype != $taskParam->taskType) {                   # 任务类型必须匹配
                 continue;
             }
-            isEditor() and $task = new TaskInfo(-1);
+            isEditor() and $task = new Ins_TaskInfo(-1);
             if ($task->progress == 1) {                                         # 已完成的不再更新处理
                 continue;
             }
@@ -280,7 +280,7 @@ class TaskProc {
 
     /**
      * 检查任务条件是否达成
-     * @param TaskParams $taskParam Description
+     * @param Ins_TaskParams $taskParam Description
      */
     static function CheckDailyTaskConditions($taskParam) {
         $bUpdate = false;
@@ -291,7 +291,7 @@ class TaskProc {
             if ($taskCfg->tasktype != $taskParam->taskType) {                   # 任务类型必须匹配
                 continue;
             }
-            $task = new TaskInfo($task);
+            $task = new Ins_TaskInfo($task);
             if ($task->progress >= 1) {                                         # 已完成的不再更新处理
                 continue;
             }
@@ -323,7 +323,7 @@ class TaskProc {
      * 例如当指挥官等级提升的时候需要检查是否有任务达成
      */
     static function OnUserLevelUp($newLvl) {
-        $taskParam = new TaskParams(EnumTaskType::CommanderLevelUpTo, $newLvl);
+        $taskParam = new Ins_TaskParams(EnumTaskType::CommanderLevelUpTo, $newLvl);
         self::CheckTaskConditions($taskParam);
     }
 
@@ -333,7 +333,7 @@ class TaskProc {
      * @param type $newLvl
      */
     static function OnHeroLevelUp($heroMoId, $newLvl) {
-        $taskParam = new TaskParams(EnumTaskType::HeroLevelUpTo, $heroMoId, $newLvl);
+        $taskParam = new Ins_TaskParams(EnumTaskType::HeroLevelUpTo, $heroMoId, $newLvl);
         self::CheckTaskConditions($taskParam);
     }
 
@@ -343,7 +343,7 @@ class TaskProc {
      * @param type $newGrade
      */
     static function OnHeroGradeUp($heroMoId, $newGrade) {
-        $taskParam = new TaskParams(EnumTaskType::HeroGradeUpTo, $heroMoId, $newGrade);
+        $taskParam = new Ins_TaskParams(EnumTaskType::HeroGradeUpTo, $heroMoId, $newGrade);
         self::CheckTaskConditions($taskParam);
         self::OnHeroImprove();
     }
@@ -354,7 +354,7 @@ class TaskProc {
      * @param type $num
      */
     static function OnHeroSegmengNum($heroMoId, $num) {
-        $taskParam = new TaskParams(EnumTaskType::HeroSegmentNumberTo, $heroMoId, $num);
+        $taskParam = new Ins_TaskParams(EnumTaskType::HeroSegmentNumberTo, $heroMoId, $num);
         self::CheckTaskConditions($taskParam);
     }
 
@@ -364,7 +364,7 @@ class TaskProc {
      * @param type $skillId
      */
     static function OnHeroUnlocSkill($heroMoId, $skillId) {
-        $taskParam = new TaskParams(EnumTaskType::HeroSkillUnlock, $heroMoId, $skillId);
+        $taskParam = new Ins_TaskParams(EnumTaskType::HeroSkillUnlock, $heroMoId, $skillId);
         self::CheckTaskConditions($taskParam);
     }
 
@@ -374,7 +374,7 @@ class TaskProc {
      * @param type $difficulty
      */
     static function OnPassGateN($gateId, $difficulty) {
-        $taskParam = new TaskParams(EnumTaskType::PassGateN, $gateId, $difficulty);
+        $taskParam = new Ins_TaskParams(EnumTaskType::PassGateN, $gateId, $difficulty);
         self::CheckTaskConditions($taskParam);
         self::OnPassGate();
     }
@@ -385,7 +385,7 @@ class TaskProc {
      * @param type $difficulty
      */
     static function OnPassCarboN($gateId, $difficulty) {
-        $taskParam = new TaskParams(EnumTaskType::passCarbonN, $gateId, $difficulty);
+        $taskParam = new Ins_TaskParams(EnumTaskType::passCarbonN, $gateId, $difficulty);
         self::CheckTaskConditions($taskParam);
     }
 
@@ -394,7 +394,7 @@ class TaskProc {
      * @param type $num
      */
     static function OnPvPWinN($num) {
-        $taskParam = new TaskParams(EnumTaskType::PvPWinNumberTo, $num);
+        $taskParam = new Ins_TaskParams(EnumTaskType::PvPWinNumberTo, $num);
         self::CheckTaskConditions($taskParam);
     }
 
@@ -403,7 +403,7 @@ class TaskProc {
      * @param type $score
      */
     static function OnPvPScoreN($score) {
-        $taskParam = new TaskParams(EnumTaskType::PvPScoreTo, $score);
+        $taskParam = new Ins_TaskParams(EnumTaskType::PvPScoreTo, $score);
         self::CheckTaskConditions($taskParam);
     }
 
@@ -412,7 +412,7 @@ class TaskProc {
      * @param type $num
      */
     static function OnUserFightPowerN($num) {
-        $taskParam = new TaskParams(EnumTaskType::UserPowerTo, $num);
+        $taskParam = new Ins_TaskParams(EnumTaskType::UserPowerTo, $num);
         self::CheckTaskConditions($taskParam);
     }
 
@@ -421,7 +421,7 @@ class TaskProc {
      * @param type $num
      */
     static function OnUserCollectScoreN($num) {
-        $taskParam = new TaskParams(EnumTaskType::UserCollectScoreTo, $num);
+        $taskParam = new Ins_TaskParams(EnumTaskType::UserCollectScoreTo, $num);
         self::CheckTaskConditions($taskParam);
     }
 
@@ -435,7 +435,7 @@ class TaskProc {
      * 每日登陆
      */
     static function OnUserLogin() {
-        $taskParam = new TaskParams(EnumTaskType::DailyLogin);
+        $taskParam = new Ins_TaskParams(EnumTaskType::DailyLogin);
         self::CheckDailyTaskConditions($taskParam);
     }
 
@@ -443,7 +443,7 @@ class TaskProc {
      * 每日:英雄强化(升级或升阶)n次
      */
     static function OnHeroImprove() {
-        $taskParam = new TaskParams(EnumTaskType::DailyHeroImprove);
+        $taskParam = new Ins_TaskParams(EnumTaskType::DailyHeroImprove);
         self::CheckDailyTaskConditions($taskParam);
     }
 
@@ -451,7 +451,7 @@ class TaskProc {
      * 每日:剧情关卡,胜利n次
      */
     static function OnPassGate() {
-        $taskParam = new TaskParams(EnumTaskType::DailyGatesWin);
+        $taskParam = new Ins_TaskParams(EnumTaskType::DailyGatesWin);
         self::CheckDailyTaskConditions($taskParam);
     }
 
@@ -459,7 +459,7 @@ class TaskProc {
      * 竞技场每日挑战,胜负均可
      */
     static function OnPvp() {
-        $taskParam = new TaskParams(EnumTaskType::DailyPVP);
+        $taskParam = new Ins_TaskParams(EnumTaskType::DailyPVP);
         self::CheckDailyTaskConditions($taskParam);
     }
 
@@ -467,7 +467,7 @@ class TaskProc {
      * 每日挑战,胜负均可
      */
     static function OnRankChalenge() {
-        $taskParam = new TaskParams(EnumTaskType::DailyRankChalenge);
+        $taskParam = new Ins_TaskParams(EnumTaskType::DailyRankChalenge);
         self::CheckDailyTaskConditions($taskParam);
     }
 
@@ -475,7 +475,7 @@ class TaskProc {
      * 每日购买商品
      */
     static function OnShopping() {
-        $taskParam = new TaskParams(EnumTaskType::DailyShopping);
+        $taskParam = new Ins_TaskParams(EnumTaskType::DailyShopping);
         self::CheckDailyTaskConditions($taskParam);
     }
 
@@ -487,20 +487,20 @@ class TaskProc {
 
     /**
      * 检查任务卡条件是否达成
-     * @param TaskParams $taskParam Description
+     * @param Ins_TaskParams $taskParam Description
      */
     static function CheckTaskCardConditions($taskParam) {
         $bUpdate = false;
         $tasks = req()->userInfo->game->store->taskcards;
 
         foreach ($tasks as $tid => &$task) {
-            $task = new TaskCardVo($task);
+            $task = new Ins_TaskCard($task);
             $taskCfg = $task->mo();                                             # 获取任务卡配置数据
             // 根据steptype类型区分下, 然后取任务步骤数据, 比对任务步骤的进度
             if ($taskCfg->stepType == 1) {                                      # 1串,2并
                 $taskSteps = $task->curSteps;                                   # 任务步骤
                 $n = $task->curStepIndex;
-                $taskStep = new TaskStepVo($taskSteps[$n]);
+                $taskStep = new Ins_TaskStep($taskSteps[$n]);
                 $bUpdate = $taskStep->check($taskParam);
                 if ($bUpdate) {
                     NormalEventProc::OnTaskCardStep_Complete($task->typeId, $taskStep->typeId);
@@ -516,7 +516,7 @@ class TaskProc {
                 }
             } else {                                                            # 并
                 foreach ($task->curSteps as $stp) {
-                    $tsp = new TaskStepVo($stp);
+                    $tsp = new Ins_TaskStep($stp);
                     $bUpdate = $tsp->check($taskParam);
                 }
             }
@@ -529,7 +529,7 @@ class TaskProc {
     }
 
     static function OnKillMonster($monsterID, $num) {
-        $taskParam = new TaskParams(EnumTaskType::KillMonster, $monsterID, $num);
+        $taskParam = new Ins_TaskParams(EnumTaskType::KillMonster, $monsterID, $num);
         return self::CheckTaskCardConditions($taskParam);
     }
 
@@ -537,13 +537,13 @@ class TaskProc {
      * 获得道具
      */
     static function OnGainItem($itemId, $num) {
-        $taskParam = new TaskParams(EnumTaskType::GainItem, $itemId, $num);
+        $taskParam = new Ins_TaskParams(EnumTaskType::GainItem, $itemId, $num);
         self::CheckTaskCardConditions($taskParam);
         NormalEventProc::OnBag_new_Item($itemId, $num);
     }
 
     static function OnPlotOver($gate_or_npc_id, $stage) {
-        $taskParam = new TaskParams(EnumTaskType::PlotOver, $gate_or_npc_id, "$stage");
+        $taskParam = new Ins_TaskParams(EnumTaskType::PlotOver, $gate_or_npc_id, "$stage");
         return self::CheckTaskCardConditions($taskParam);
     }
 

Gameserver/Amfphp/process/UserProc.php

@@ -91,7 +91,7 @@ class UserProc {
         list($newname) = $req->paras;                                           # 参数: 新昵称, 头像
         my_Assert(isset(glc()->User_SetNickname_Cost), "全局变量中未找到改名消耗钻石数量的配置字段");
         $amt = glc()->User_SetNickname_Cost;                                    # 改名需要消耗钻石
-        $ok = UserGameModel::Consume_Cash($req->userInfo->game->baseInfo, $amt); # 扣除钻石
+        $ok = Data_UserGame::Consume_Cash($req->userInfo->game->baseInfo, $amt); # 扣除钻石
         my_Assert($ok, ErrCode::notenough_cash_msg);
         my_Assert(self::checkRoleNameNotExist($newname), ErrCode::user_nicknameexist); # 昵称已存在
         $req->userInfo->game->baseInfo->name = $newname;
@@ -143,7 +143,7 @@ class UserProc {
      * @param type $req
      */
     public static function setNewbieGuideOver($req) {
-        $user = new UserGameModel($req->userInfo->game);                        # user
+        $user = new Data_UserGame($req->userInfo->game);                        # user
         if (!CommUtil::isPropertyExists($user, "NewbieGuideOver")) {            # 防御: 变量未初始化
             $user->NewbieGuideOver = 1;
         }
@@ -162,7 +162,7 @@ class UserProc {
      */
     public static function completeNewbieGuide($req) {
         $guideIndex = $req->paras[0];                                           # 参数: 新手引导步骤
-        $user = new UserGameModel($req->userInfo->game);                        # user
+        $user = new Data_UserGame($req->userInfo->game);                        # user
         if (!CommUtil::isPropertyExists($user, "NewbieGuide")) {                # 防御: 变量未初始化
             $user->NewbieGuide = ObjectInit();
         }
@@ -220,7 +220,7 @@ class UserProc {
      * @param Req $req
      */
     public static function GetZoneList($req) {
-        $defaultZone = new ZoneInfoModel(1, 0, "");                             # 新用户默认分区
+        $defaultZone = new Ins_ZoneInfo(1, 0, "");                             # 新用户默认分区
         $bGetRecommended = false;
         if (count($req->paras) > 0) {                                           # 是否只拉取推荐分区
             $bGetRecommended = $req->paras[0];
@@ -250,7 +250,7 @@ class UserProc {
         $userZoneInfo = self::getUserZoneInfo($req);                            # 玩家分区记录
         $isNewUser = false;
         if ($userZoneInfo == null) {           // 这里使用推荐分区的数据，推荐分区信息，在后台编辑，编辑器可用
-            $userZoneInfo = new UserZoneInfoModel();
+            $userZoneInfo = new Data_UserZoneInfo();
             $userZoneInfo->lastZone = $defaultZone;                             # 新用户导向默认分区
             $isNewUser = true;
 
@@ -419,7 +419,7 @@ class UserProc {
         $req->userInfo = $userInfo;                                             # 更新Req的userinfo,
         $userInfo->uid = $req->uid;
         $userInfo->zoneid = $req->zoneid;
-        $userInfo->game = new UserGameModel();
+        $userInfo->game = new Data_UserGame();
         $userInfo->game->initialize();                                          # 初始化玩家数据
         $userInfo->game->baseInfo->name = $rolename;
         $userInfo->game->baseInfo->gender = $gender;
@@ -480,14 +480,14 @@ class UserProc {
      */
     public static function getUserInfo($mem, $zoneid, $uid) {
         $key = MemKey_User::Info_hash($zoneid, $uid);
-        $a = new UserGameModel();
+        $a = new Data_UserGame();
         if (null == $a->readDataFromMem($key)) {
             return null;
         }
         $usrInfo = new UserInfoMo();
         $usrInfo->zoneid = $zoneid;
         $usrInfo->uid = $uid;
-        $g = new UserGameModel($a);
+        $g = new Data_UserGame($a);
         $usrInfo->game = $g;
         return $usrInfo;
     }
@@ -523,7 +523,7 @@ class UserProc {
     /**
      * 读取玩家的分区记录
      * @param Req $req
-     * @return UserZoneInfoModel Description
+     * @return Data_UserZoneInfo Description
      */
     public static function getUserZoneInfo($req) {
         $ret = $req->mem->get(MemKey_User::Union_PlayedZoneInfo_normal($req->uid));
@@ -537,7 +537,7 @@ class UserProc {
     public static function updtateUserZoneInfo($req) {
         $userZoneInfo = self::getUserZoneInfo($req);                            # 取玩家分区记录
         if (!$userZoneInfo) {
-            $userZoneInfo = new UserZoneInfoModel;
+            $userZoneInfo = new Data_UserZoneInfo;
         }
         $level = 0;
         $zoneid = $req->zoneid;
@@ -553,7 +553,7 @@ class UserProc {
         if (is_null($level)) {
             $level = 0;
         }
-        $userZoneInfo->lastZone = new ZoneInfoModel($zoneid, $level, $playerName, $headImg); # 更新玩家分区记录
+        $userZoneInfo->lastZone = new Ins_ZoneInfo($zoneid, $level, $playerName, $headImg); # 更新玩家分区记录
         $userZoneInfo->playedZones->$zoneid = $userZoneInfo->lastZone;          # 玩过的分区集合
         $req->mem->set(MemKey_User::Union_PlayedZoneInfo_normal($req->uid), $userZoneInfo); # 回写数据
     }

Gameserver/Amfphp/test.php

@@ -13,7 +13,12 @@ echoLine("phpver: " . PHP_VERSION . PHP_EOL);
 //header('X-Accel-Buffering: no');                                              # nginx 控制头, 关闭buffer
 //$tableName = "test-20201123";
 //var_dump(daoInst()->tableExist($tableName));
+//var_dump(GameConfig::primordial_data());
 
 
-
-var_dump(GameConfig::primordial_data());
+test(function() {
+    $key = "test";
+    $v = gMem()->get($key);
+//    var_dump($v);
+    gMem()->set($key, \loyalsoft\TimeUtil::dtCurrent());
+}, 100);

Gameserver/nbproject/private/private.properties

@@ -2,6 +2,6 @@ copy.src.files=false
 copy.src.on.open=false
 copy.src.target=
 index.file=index.php
-interpreter=D:\\Program-Files\\wnmp\\php\\php-7.4.9-nts-Win32-vc15-x64\\php.exe
+interpreter=D:\\Program-Files\\wnmp\\php\\php-7.4.13-nts-Win32-vc15-x64\\php.exe
 run.as=SCRIPT
 url=http://localhost/Gameserver/

Gameserver/nbproject/private/private.xml

@@ -12,15 +12,11 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/util/Event.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/AutoLoad.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/ErrCode.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/util/UtilInclude.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/index.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/Resp.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/CmdCode.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/StoreProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/Services/AppServer.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskParams.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskCard.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Info_UserGameHero.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskStep.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskInfo.php</file>
         </group>
     </open-files>
 </project-private>