Explorar o código

Merge branch 'dev' into TTT

cyzhao %!s(int64=2) %!d(string=hai) anos
pai
achega
a800a080bc

+ 1 - 1
Gameserver/Amfphp/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2022-06-28 16:43:14
+ // 日期: 2022-06-29 17:28:19
 ////////////////////
 
 /**

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_item_base.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2022-06-28 16:27:19
+ // 日期: 2022-06-29 15:42:52
 ////////////////////
 
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_item_stones.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2022-05-16 09:29:50
+ // 日期: 2022-06-29 15:44:53
 ////////////////////
 
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_item_stones_type.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2022-05-16 09:29:50
+ // 日期: 2022-06-29 15:44:53
 ////////////////////
 
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_item_yanling.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2022-06-28 16:14:36
+ // 日期: 2022-06-29 15:05:16
 ////////////////////
 
 

+ 11 - 1
Gameserver/Amfphp/model/Const/sm_yanling_compose.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2022-06-22 17:36:45
+ // 日期: 2022-06-29 17:20:23
 ////////////////////
 
 
@@ -33,11 +33,21 @@ class sm_yanling_compose
     */
     public $two_compose;
 
+    /**
+    * @var String 2套系属性描述  
+    */
+    public $two_desc;
+
     /**
     * @var String 用途未知!!请到数据库中添加字段注释。  
     */
     public $three_compose;
 
+    /**
+    * @var String 3套系属性描述  
+    */
+    public $three_desc;
+
     /**
     * @var String 用途未知!!请到数据库中添加字段注释。  
     */

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_yanlingextra_level.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2022-06-21 15:09:02
+ // 日期: 2022-06-29 15:03:59
 ////////////////////
 
 

+ 16 - 10
Gameserver/Amfphp/process/AuctionProc.php

@@ -87,7 +87,11 @@ class AuctionProc {
         my_Assert(ctx()->baseInfo->cash >= $buyoutPrice, ErrCode::notenough_cash_msg);
         //扣除钻石--交易费用 + 手续费
         ctx()->base()->Consume_Cash($buyoutPrice);
-        //ctx()->baseInfo->cash -= $buyoutPrice; 
+        $sList = explode(',', $aucItem->contents);
+        if($aucItem->currpeopleid != null){//竞拍玩家邮件返回钻石
+            EmailProc::SendAuctionItemsBidCashFallback(req()->zoneid, req()->uid, $sList[0], 2, $buyoutPrice);
+        }
+        
         //更新表里的交易状态
         $aucItem->result = "完成";
         $aucItem->currpeopleid = req()->uid;
@@ -97,12 +101,11 @@ class AuctionProc {
 //更新拍品缓存
 
         $obj = self::updateAuctionUserItemListCache();
-//发送邮件,给拍品
-        $sList = explode(',', $aucItem->contents);
+//发送邮件,给拍品       
         EmailProc::SendAuctionItemsMail(req()->zoneid, req()->uid, $sList[0], $sList[1]);
 
         EmailProc::SendAuctionCashMail(req()->zoneid, $aucItem->sellerid, $sList[0], 2, $buyoutPrice - intval($buyoutPrice * 0.05)); //上架玩家给钻石邮件  
-
+     
         UserProc::updateUserInfo();                                             # 回写玩家数据
         return Resp::ok(array(
                     "auction" => $obj->data,
@@ -136,7 +139,7 @@ class AuctionProc {
     }
 
     /**
-     * 上传拍品
+     * 上传拍品--7406
      * @return type
      */
     static function UploadAuctionItems() {
@@ -183,7 +186,7 @@ class AuctionProc {
     }
 
     /**
-     * 竞价
+     * 竞价--7407
      */
     static function UserAuctionBidItem() {       
         $uId = req()->paras[0];
@@ -211,6 +214,9 @@ class AuctionProc {
         $aucItem->currprice = $curPrice;
         
         $auchistory = json_decode($aucItem->auchistory);
+        if($auchistory == null){
+            $auchistory = new \stdClass();
+        }
         $auchistory->$ts = array("uid" => req()->uid, "name" => ctx()->baseInfo->name, "price" => $curPrice);
         $aucItem->auchistory = addslashes(json_encode($auchistory));
         self::updateAuctionItem($aucItem);
@@ -222,7 +228,7 @@ class AuctionProc {
                     "res"=>"ok",
                     "cash"=>ctx()->baseInfo->cash,
                     //"store" => ctx()->store,
-                    "auction" => $auctionDic, #拍品
+                    "auction" => $auctionDic->data, #拍品
         ));
     }
 
@@ -282,8 +288,8 @@ class AuctionProc {
      */
     static function insertNewUserAuctionItem($aucItem) {
         $paydb = daoInst();
-        $sql = "INSERT INTO `tab_auctionitems` (contents,startprice,buyoutPrice,startts,endts,sellerid,sellername,auchistory,zoneid) VALUES ('%s',%d,%d,%d,%d,'%s','%s','{}',%d)";
-        $query = sprintf($sql, $aucItem->contents, $aucItem->startprice, $aucItem->buyoutPrice, $aucItem->startts, #
+        $sql = "INSERT INTO `tab_auctionitems` (contents,startprice,addstep,buyoutPrice,currprice,startts,endts,sellerid,sellername,auchistory,zoneid) VALUES ('%s',%d,%d,%d,%d,%d,%d,'%s','%s','{}',%d)";
+        $query = sprintf($sql, $aucItem->contents, $aucItem->startprice, $aucItem->addstep, $aucItem->buyoutPrice,$aucItem->currprice, $aucItem->startts, #
                 $aucItem->endts, $aucItem->sellerid, $aucItem->sellername, $aucItem->zoneid);
         $result = $paydb->exec($query);
         return $result;
@@ -381,7 +387,7 @@ class AuctionProc {
         $oid = req()->uid;
 
         $db = daoInst();
-        $sql = "select * from tab_auctionitems where zoneid=$zoneid and currpeopleid = '$osid'";
+        $sql = "select * from tab_auctionitems where zoneid=$zoneid and currpeopleid = '$oid'";
         $result = $db->query($sql)->fetchAll();
 
         return $result;

+ 16 - 0
Gameserver/Amfphp/process/EmailProc.php

@@ -438,6 +438,22 @@ class EmailProc {
                 $name . "拍品取消出售,系统返还您的出价钻石", "$cash,$num");
         self::InsertMail($zoneid, $uid, $mail);
     }
+    
+    /**
+     * 一口价拍走拍品,竞拍者钻石回退
+     * @param type $zoneid
+     * @param type $uid
+     * @param type $itemid
+     * @param type $cash
+     * @param type $num
+     */
+    public static function SendAuctionItemsBidCashFallback($zoneid, $uid, $itemid,$cash, $num) {
+        $name = GameConfig::item_base_getItem($itemid)->name;
+
+        $mail = new Ins_Email(null, enum_Mail_Type::SysTemMail, "拍卖退款邮件", #
+                $name . "拍品已经被别人拍走,系统返还您的出价钻石", "$cash,$num");
+        self::InsertMail($zoneid, $uid, $mail);
+    }
 
 // </editor-fold>
 //

+ 6 - 2
Gameserver/Amfphp/process/RankProc.php

@@ -214,7 +214,8 @@ class RankProc {
      */
     static function RankGetAllTop1() {
         $key_fPower = MemKey_GameRun::Game_FightPowerRank_zset(req()->zoneid);   # redis key 战力榜
-        $key_passgate = MemKey_GameRun::Game_Rank_passgate_zset(req()->zoneid);  # redis key 通关榜
+        //$key_passgate = MemKey_GameRun::Game_Rank_passgate_zset(req()->zoneid);  # redis key 通关榜
+        $key_passgate = self::Game_Rank_playerLevel_zset(req()->zoneid);
 //        $key_yanling ="";
         $ret = array(
             "FightPower" => self::_RankGetTop1($key_fPower),
@@ -233,11 +234,14 @@ class RankProc {
      */
     static function GetPassgateBreachLog() {
         //$key = MemKey_GameRun::Game_Rank_passage_BreachLog_hash(req()->zoneid); # redis key 战力榜突破记录
-        $key = self::Game_Rank_playerlevel_BreachLog_hash(req()->zoneid);        
+        $key = self::Game_Rank_playerlevel_BreachLog_hash(req()->zoneid);  
+        $rankKey = self::Game_Rank_playerLevel_zset(req()->zoneid);
         $kv = gMem()->hgetall($key);
         $ret = array();
         foreach ($kv as $condition => $uid) {
             $game = UserProc::getUserGame(req()->zoneid, $uid);                 # 读取玩家信息
+            $score = gMem()->zscore($rankKey, $uid); 
+            
             $ret[$condition] = array(#                                          # 拼装玩家信息
                 'uid' => $uid,
                 'name' => my_null_default($game->baseInfo->name, ""),