fixed: 1. 竞技场排名从0开始, 2. 竞技场战斗结束窗体未显示排名变化, 3. 竞技商店已售罄状态显示不正常, 4. 竞技商店玩家手动刷新不影响自动刷新时间.

Gameserver/Amfphp/model/Const/GM_uids.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model GM_uids 
+ * Static Model GM_uids GM号的UID
  */
 class GM_uids
 {

Gameserver/Amfphp/model/Const/globalsettings.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model globalsettings 
+ * Static Model globalsettings 全局参数
  */
 class globalsettings
 {

Gameserver/Amfphp/model/Const/primordial_data.php

@@ -4,12 +4,12 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-04-27 11:19:57
+ // 日期: 2020-05-14 17:05:07
 ////////////////////
 
 
 /**
- * Static Model primordial_data 
+ * Static Model primordial_data 玩家初始化数据
  */
 class primordial_data
 {

Gameserver/Amfphp/model/Const/sm_activity.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model activity 
+ * Static Model activity 活动配置
  */
 class sm_activity
 {

Gameserver/Amfphp/model/Const/sm_activity_onlinegift.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model activity_onlinegift 
+ * Static Model activity_onlinegift 活动: 在线礼包
  */
 class sm_activity_onlinegift
 {

Gameserver/Amfphp/model/Const/sm_activity_reggift.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model activity_reggift 
+ * Static Model activity_reggift 活动, 全服注册礼包
  */
 class sm_activity_reggift
 {

Gameserver/Amfphp/model/Const/sm_attack_relation.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model attack_relation 
+ * Static Model attack_relation 元素相克关系表
  */
 class sm_attack_relation
 {

Gameserver/Amfphp/model/Const/sm_box.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model box 
+ * Static Model box 宝箱
  */
 class sm_box
 {

Gameserver/Amfphp/model/Const/sm_boxJingYanCards.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model boxJingYanCards 
+ * Static Model boxJingYanCards 宝箱经验卡掉落数据
  */
 class sm_boxJingYanCards
 {

Gameserver/Amfphp/model/Const/sm_boxpool.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model boxpool 
+ * Static Model boxpool 宝箱的奖池
  */
 class sm_boxpool
 {

Gameserver/Amfphp/model/Const/sm_choujiang.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model choujiang 
+ * Static Model choujiang 抽奖数据
  */
 class sm_choujiang
 {

Gameserver/Amfphp/model/Const/sm_choujiang_baodi.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model choujiang_baodi 
+ * Static Model choujiang_baodi 抽奖保底数据
  */
 class sm_choujiang_baodi
 {

Gameserver/Amfphp/model/Const/sm_choujiang_settings.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model choujiang_settings 
+ * Static Model choujiang_settings 抽奖设置数据
  */
 class sm_choujiang_settings
 {

Gameserver/Amfphp/model/Const/sm_clientVersionHistory.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model clientVersionHistory 
+ * Static Model clientVersionHistory 客户端版本信息
  */
 class sm_clientVersionHistory
 {

Gameserver/Amfphp/model/Const/sm_day7.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model day7 
+ * Static Model day7 开服七天活动
  */
 class sm_day7
 {

Gameserver/Amfphp/model/Const/sm_gate.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model gate 
+ * Static Model gate 关卡
  */
 class sm_gate
 {

Gameserver/Amfphp/model/Const/sm_gate_carbon.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model gate_carbon 
+ * Static Model gate_carbon 关卡【副本】
  */
 class sm_gate_carbon
 {

Gameserver/Amfphp/model/Const/sm_gate_combat.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model gate_combat 
+ * Static Model gate_combat 配置的关卡相关的战斗数据
  */
 class sm_gate_combat
 {

Gameserver/Amfphp/model/Const/sm_gate_forever.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model gate_forever 
+ * Static Model gate_forever 无穷无尽关卡模式
  */
 class sm_gate_forever
 {

Gameserver/Amfphp/model/Const/sm_gate_passCondition.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model gate_passCondition 
+ * Static Model gate_passCondition 关卡-通关条件
  */
 class sm_gate_passCondition
 {

Gameserver/Amfphp/model/Const/sm_gate_starreward.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model gate_starreward 
+ * Static Model gate_starreward 关卡—— 星级奖励
  */
 class sm_gate_starreward
 {

Gameserver/Amfphp/model/Const/sm_gatelevel.php

@@ -4,12 +4,12 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-04-30 13:38:13
+ // 日期: 2020-05-15 09:03:34
 ////////////////////
 
 
 /**
- * Static Model gatelevel 
+ * Static Model gatelevel 关卡波茨数据
  */
 class sm_gatelevel
 {

Gameserver/Amfphp/model/Const/sm_guide_step.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model guide_step 
+ * Static Model guide_step 引导步骤
  */
 class sm_guide_step
 {

Gameserver/Amfphp/model/Const/sm_guide_trigger.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model guide_trigger 
+ * Static Model guide_trigger 引导触发
  */
 class sm_guide_trigger
 {

Gameserver/Amfphp/model/Const/sm_guilddonatereward.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model guilddonatereward 
+ * Static Model guilddonatereward 公会捐献卡牌奖励
  */
 class sm_guilddonatereward
 {

Gameserver/Amfphp/model/Const/sm_guildlevel.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model guildlevel 
+ * Static Model guildlevel 公会等级相关数据
  */
 class sm_guildlevel
 {

Gameserver/Amfphp/model/Const/sm_guildlibao.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model guildlibao 
+ * Static Model guildlibao 公会礼包
  */
 class sm_guildlibao
 {

Gameserver/Amfphp/model/Const/sm_hero.php

@@ -4,12 +4,12 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-03-06 17:43:32
+ // 日期: 2020-05-15 09:02:59
 ////////////////////
 
 
 /**
- * Static Model hero 
+ * Static Model hero 英雄模块
  */
 class sm_hero
 {

Gameserver/Amfphp/model/Const/sm_hero_levelexp.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model hero_levelexp 
+ * Static Model hero_levelexp 英雄的升级——每级成长消耗经验需求表
  */
 class sm_hero_levelexp
 {

Gameserver/Amfphp/model/Const/sm_hero_levelexp_costitem.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model hero_levelexp_costitem 
+ * Static Model hero_levelexp_costitem 英雄的升级——成长可消耗的道具表
  */
 class sm_hero_levelexp_costitem
 {

Gameserver/Amfphp/model/Const/sm_heroextra_dengjie.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model heroextra_dengjie 
+ * Static Model heroextra_dengjie 英雄的升阶（消耗金币+ 属性加成）
  */
 class sm_heroextra_dengjie
 {

Gameserver/Amfphp/model/Const/sm_heroextra_favor.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model heroextra_favor 
+ * Static Model heroextra_favor 英雄的好感度提升（消耗金币）
  */
 class sm_heroextra_favor
 {

Gameserver/Amfphp/model/Const/sm_heroextra_godblood.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model heroextra_godblood 
+ * Static Model heroextra_godblood 英雄————神血系统
  */
 class sm_heroextra_godblood
 {

Gameserver/Amfphp/model/Const/sm_heroextra_level.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model heroextra_level 
+ * Static Model heroextra_level 英雄的升级（属性加成）
  */
 class sm_heroextra_level
 {

Gameserver/Amfphp/model/Const/sm_heroextra_skill_lv_limit.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model heroextra_skill_lv_limit 
+ * Static Model heroextra_skill_lv_limit 英雄技能升级的限定
  */
 class sm_heroextra_skill_lv_limit
 {

Gameserver/Amfphp/model/Const/sm_heroextra_star.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model heroextra_star 
+ * Static Model heroextra_star 英雄的升星（消耗金币+ 属性加成）
  */
 class sm_heroextra_star
 {

Gameserver/Amfphp/model/Const/sm_item_base.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model item_base 
+ * Static Model item_base 道具通用字段表
  */
 class sm_item_base
 {

Gameserver/Amfphp/model/Const/sm_item_box.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model item_box 
+ * Static Model item_box 宝箱类道具
  */
 class sm_item_box
 {

Gameserver/Amfphp/model/Const/sm_item_buffcard.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model item_buffcard 
+ * Static Model item_buffcard buff类道具
  */
 class sm_item_buffcard
 {

Gameserver/Amfphp/model/Const/sm_item_package.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model item_package 
+ * Static Model item_package 礼包类道具
  */
 class sm_item_package
 {

Gameserver/Amfphp/model/Const/sm_item_pills.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model item_pills 
+ * Static Model item_pills 药水类道具
  */
 class sm_item_pills
 {

Gameserver/Amfphp/model/Const/sm_item_segment.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model item_segment 
+ * Static Model item_segment 碎片类道具
  */
 class sm_item_segment
 {

Gameserver/Amfphp/model/Const/sm_item_stones.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model item_stones 
+ * Static Model item_stones 强化类道具
  */
 class sm_item_stones
 {

Gameserver/Amfphp/model/Const/sm_item_weapon.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model item_weapon 
+ * Static Model item_weapon 武器类道具
  */
 class sm_item_weapon
 {

Gameserver/Amfphp/model/Const/sm_item_yanling.php

@@ -4,12 +4,12 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-04-24 18:01:06
+ // 日期: 2020-05-15 08:59:05
 ////////////////////
 
 
 /**
- * Static Model item_yanling 
+ * Static Model item_yanling 言灵类道具
  */
 class sm_item_yanling
 {

Gameserver/Amfphp/model/Const/sm_pvp_rankreward.php

@@ -4,12 +4,12 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-05-09 15:02:24
+ // 日期: 2020-05-13 10:08:11
 ////////////////////
 
 
 /**
- * Static Model pvp_rankreward 
+ * Static Model pvp_rankreward 竞技场 上榜单奖励
  */
 class sm_pvp_rankreward
 {

Gameserver/Amfphp/model/Const/sm_pvp_shop.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model pvp_shop 
+ * Static Model pvp_shop 竞技 商店
  */
 class sm_pvp_shop
 {
@@ -54,15 +54,10 @@ class sm_pvp_shop
     */
     public $goods;
 
-    /**
-    * @var DateTime 上次修改 default(CURRENT_TIMESTAMP) 
-    */
-    public $lastupdate;
-
     /**
     * @var Int32 售罄:0 false, 1 true, 这个策划不用改, 程序用的 default(0) 
     */
-    public $sealed;
+    public $sold;
 
 }
 

Gameserver/Amfphp/model/Const/sm_rankreward_fpower.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model rankreward_fpower 
+ * Static Model rankreward_fpower 战斗力榜全服突破奖励
  */
 class sm_rankreward_fpower
 {

Gameserver/Amfphp/model/Const/sm_rankreward_passgate.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model rankreward_passgate 
+ * Static Model rankreward_passgate 通关榜突破奖励
  */
 class sm_rankreward_passgate
 {

Gameserver/Amfphp/model/Const/sm_secretshop_goodsType.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model secretshop_goodsType 
+ * Static Model secretshop_goodsType 神秘商城道具表-by goodstype
  */
 class sm_secretshop_goodsType
 {

Gameserver/Amfphp/model/Const/sm_secretshop_refresh.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model secretshop_refresh 
+ * Static Model secretshop_refresh 神秘商城刷新价格表
  */
 class sm_secretshop_refresh
 {

Gameserver/Amfphp/model/Const/sm_secretshop_typeId.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model secretshop_typeId 
+ * Static Model secretshop_typeId 神秘商城道具表-by typeId
  */
 class sm_secretshop_typeId
 {

Gameserver/Amfphp/model/Const/sm_segment.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model segment 
+ * Static Model segment 碎片
  */
 class sm_segment
 {

Gameserver/Amfphp/model/Const/sm_segment_byPinzhi.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model segment_byPinzhi 
+ * Static Model segment_byPinzhi 碎片_按品质索引
  */
 class sm_segment_byPinzhi
 {

Gameserver/Amfphp/model/Const/sm_segment_ronghe.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model segment_ronghe 
+ * Static Model segment_ronghe 碎片融合的概率表
  */
 class sm_segment_ronghe
 {

Gameserver/Amfphp/model/Const/sm_service_schedule.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model service_schedule 
+ * Static Model service_schedule 停服计划
  */
 class sm_service_schedule
 {

Gameserver/Amfphp/model/Const/sm_shop.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model shop 
+ * Static Model shop 商城
  */
 class sm_shop
 {

Gameserver/Amfphp/model/Const/sm_skill_cross.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model skill_cross 
+ * Static Model skill_cross 合体技能
  */
 class sm_skill_cross
 {

Gameserver/Amfphp/model/Const/sm_skill_upgrade_cost.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model skill_upgrade_cost 
+ * Static Model skill_upgrade_cost 技能升级消耗金币
  */
 class sm_skill_upgrade_cost
 {

Gameserver/Amfphp/model/Const/sm_smelting.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model smelting 
+ * Static Model smelting 熔炼实验室
  */
 class sm_smelting
 {

Gameserver/Amfphp/model/Const/sm_subSkill.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model subSkill 
+ * Static Model subSkill 子技能表
  */
 class sm_subSkill
 {

Gameserver/Amfphp/model/Const/sm_sysmail.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model sysmail 
+ * Static Model sysmail 系统邮件
  */
 class sm_sysmail
 {

Gameserver/Amfphp/model/Const/sm_task.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model task 
+ * Static Model task 任务
  */
 class sm_task
 {

Gameserver/Amfphp/model/Const/sm_task_achi.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model task_achi 
+ * Static Model task_achi 成就任务
  */
 class sm_task_achi
 {

Gameserver/Amfphp/model/Const/sm_tokenGift.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model tokenGift 
+ * Static Model tokenGift 兑换码礼包
  */
 class sm_tokenGift
 {

Gameserver/Amfphp/model/Const/sm_zonelist.php

@@ -9,7 +9,7 @@
 
 
 /**
- * Static Model zonelist 
+ * Static Model zonelist 分区列表
  */
 class sm_zonelist
 {

Gameserver/Amfphp/process/EmailProc.php

@@ -166,7 +166,7 @@ class EmailProc {
             $t_mail->drawedts = now();
             self::updateMail($zoneid, $uid, $t_mail);
         }
-        self::logMailDrawed($rewardEmailIds);                                   # 更新数据库中邮件的领取记录
+        self::logMailDrawed($rewardEmailIds, $uid);                             # 更新数据库中邮件的领取记录
         $reward = implode(';', $arr);                                           # 拼接下奖励字符串
         return Resp::ok(array('err' => 0,
                     'store' => $req->userInfo->game->store,
@@ -450,10 +450,11 @@ class EmailProc {
      * 更新邮件的领取记录
      * @param type $ids
      */
-    static function logMailDrawed($ids) {
+    static function logMailDrawed($ids, $uid) {
+        Err("这里邮件id不是唯一, 需要联合uid一起改.--晨叶反馈于2020.5.21");
         daoInst()->update(self::MailLog_TableName)->data(array(
             'drawedts' => now()
-        ))->where('mailId')->in($ids)->exec();
+        ))->where('mailId')->in($ids)->andWhere('uid')->eq($uid)->exec();
     }
 
     /**

Gameserver/Amfphp/process/FightProc/PVPProc.php

@@ -185,11 +185,11 @@ class PVPProc {
         my_Assert(CommUtil::isPropertyExists($pvp->curShopItems, $index), ErrCode::err_innerfault); # 没有找到改商品
 //        isEditor() && $citem = new \sm_pvp_shop();
         $citem = $pvp->curShopItems->$index;                                    # 查询物品数据
-        my_Assert($citem->sealed == 0, ErrCode::pvp_item_soldout);              # 防御道具已售罄
+        my_Assert($citem->sold == 0, ErrCode::pvp_item_soldout);              # 防御道具已售罄
 //        var_dump($citem);
         my_Assert($citem->priceType == 5, ErrCode::pay_price_err);              # 防御定价异常
         my_Assert($pvp->pvpCoins > $citem->price, ErrCode::pvp_coinnotenough);  # pvp币不足 
-        $citem->sealed += 1;                                                    # 设置已售罄/已购买标志
+        $citem->sold += 1;                                                      # 设置已售罄/已购买标志
         $pvp->pvpCoins -= $citem->price;                                        # 扣除竞技币 
         StoreProc::AddMultiItemInStore($req, $citem->goods);                    // 发放道具
         $req->userInfo->game->pvp = $pvp;                                       // 回写数据
@@ -206,7 +206,7 @@ class PVPProc {
         $pvp = new UserPVPModel($req->userInfo->game->pvp);
         $costCash = glc()->PVP_shop_refresh_cash;
         my_Assert(UserGameModel::Consume_Cash($req->userInfo->game, $costCash), ErrCode::notenough_cash_msg);
-        $pvp->shopRefreshTs = now() + glc()->PVP_shop_refresh_interval;         # 更新刷新时间
+//        $pvp->shopRefreshTs = now() + glc()->PVP_shop_refresh_interval;         # 更新刷新时间
         $pvp->curShopItems = GameConfig::pvp_shop();                            # 重刷道具
         $req->userInfo->game->pvp = $pvp;                                       # 回写
         UserProc::updateUserInfo();                                             # 回写玩家数据
@@ -316,7 +316,7 @@ class PVPProc {
         $req->userInfo->game->pvp = $pvp;
         UserProc::updateUserInfo();                                             # 回写数据 
         $ret = array(
-            'curMatches' => $pvp->curMatches  #                                 # 当前对手清单
+            'curMatches' => my_null_default($pvp->curMatches, array()), #       # 当前对手清单
         );
         return Resp::ok($ret);
     }
@@ -351,11 +351,13 @@ class PVPProc {
         $R_A = intval($RA + $K * ($SA - $EA ));                                 # 我的最终积分
         $R_B = intval($RB + $K * ($SB - $EB));                                  # 对手的最终积分
         #
+        $myOldRank = self::_getRank_by_uid($uid, $key);                         # 记录下战前排名
         self::_addScore_by_uid($zoneid, $uid, $R_A - $RA);                      # 更新A的积分
         $B_Change = $result ? $R_B - $RB : 0;                                   # 计算对方的积分变化:对方输了的情况下扣分,我输了的情况下,不加分
         if ($B_Change != 0) {                                                          # 
             self::_addScore_by_uid($zoneid, $target_uid, $B_Change);            # 更新B的积分 
         }
+        $myNewRank = self::_getRank_by_uid($uid, $key);                         # 查询战后排名
         $req->userInfo->game->pvp = $pvp;
         UserProc::updateUserInfo();                                             # 回写数据
         // 写挑战记录
@@ -371,6 +373,7 @@ class PVPProc {
             'RB' => $RB, #                                                      # 对手挑战之前积分
             'R_A' => $R_A, #                                                    # 自己最新积分
             'R_B' => $R_B, #                                                    # 对手最新积分
+            'rank_diff' => $myOldRank - $myOldRank, #                           # 自己的排名变化
         );
         return Resp::ok($ret);                                                  # 返回
     }
@@ -556,7 +559,7 @@ class PVPProc {
         $mem = gMem();
         $r = $mem->zrevrank($key, $uid);
         if (!is_null($r)) {
-            $rank = $r;                                                         # 有名次,更新
+            $rank = $r + 1;                                                     # 有名次,更新(zset从0开始排序)
         }
         return $rank;                                                           # 返回
     }