配置

Gameserver/Amfphp/configs/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-27 10:21:39
+ // 日期: 2022-01-04 13:32:35
 ////////////////////
 namespace loyalsoft;
 /**

Gameserver/Amfphp/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-27 10:21:39
+ // 日期: 2022-01-04 13:32:35
 ////////////////////
 
 /**

Gameserver/Amfphp/model/Const/sm_drop.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-24 14:59:15
+ // 日期: 2021-12-31 14:31:02
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_item_base.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-27 10:10:37
+ // 日期: 2021-12-27 17:57:15
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_item_yanling.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-24 14:55:19
+ // 日期: 2021-12-28 17:14:43
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_shenmiao.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-21 14:38:00
+ // 日期: 2021-12-28 14:41:45
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_shenmiaoTypeList.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-21 14:38:00
+ // 日期: 2021-12-28 14:41:45
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_shop_limit.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-27 10:09:36
+ // 日期: 2022-01-04 11:18:23
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_shop_limit_type.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-27 10:09:36
+ // 日期: 2022-01-04 11:18:23
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_yanlingextra_level.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-12-24 18:05:36
+ // 日期: 2021-12-27 18:00:31
 ////////////////////
 
 

Gameserver/Amfphp/process/PayProc.php

@@ -226,20 +226,14 @@ class PayProc {
             }
             $user->base()->Add_Cash($cash);    
             self::$retArr[] = "2,".$cash;
-        } 
+        }
         elseif ($order->product_id >= 801001 && $order->product_id <= 801999) {//限购
             self::checklimitBuyRecharge($order->product_id);
-        } 
+        }
         elseif ($order->product_id >= 804001 && $order->product_id <= 804999) {//每日特惠
             $mo = GameConfig::shop_limit_getItem($order->product_id);
-            if($mo == null){//校验看看是不是60元特惠礼包
-                $list = GameConfig::shop_limit_type_getItemArray(Enum_Recharge::DaliySpecialPackages);
-                $cur = 0;
-                foreach ($list as $item) {
-                    $cur += $item->price;
-                }
-                //这临时先注释为了测试正式的应该解开注释
-                //my_Assert($cur == $order->amount, ErrCode::err_const_no);
+            my_Assert($mo!=null, ErrCode::err_const_no);
+            if($mo->price == 60){
                 $user->shopdata->daliySpecial_ts = now();
             } else {
                 $itemid = explode(',', $mo->reward)[0];
@@ -248,7 +242,7 @@ class PayProc {
                 StoreProc::AddMultiItemInStore($itemMO->contents);                             
                 $user->shopdata->daliySpecialPackages[] = $mo->typeId;
                 self::$retArr[] = $itemMO->contents;
-            }                     
+            }                    
         }
         elseif ($order->product_id >= 805001 && $order->product_id <= 805999) {//限时
             $mo = GameConfig::shop_limit_getItem($order->product_id);
@@ -259,8 +253,7 @@ class PayProc {
             $itemid = explode(',', $mo->reward)[0];
             $itemMO = GameConfig::item_package_getItem($itemid);
             my_Assert(null != $itemMO, ErrCode::err_const_no);
-            StoreProc::AddMultiItemInStore($itemMO->contents); //领取奖励
-            //StoreProc::AddMultiItemInStore($mo->reward);
+            StoreProc::AddMultiItemInStore($itemMO->contents); //领取奖励           
             self::$retArr[] = $itemMO->contents;
         } 
         elseif ($order->product_id >= 901001 && $order->product_id <= 999999) {//月卡
@@ -305,19 +298,8 @@ class PayProc {
             //该功能暂时没有开发
         } 
         elseif ($order->product_id >= 804001 && $order->product_id <= 804999) {//每日特惠
-            $mo = GameConfig::shop_limit_getItem($order->product_id);
-            $num = 0;
-            if($mo == null){//校验看看是不是60元特惠礼包
-                $list = GameConfig::shop_limit_type_getItemArray(Enum_Recharge::DaliySpecialPackages);
-                $cur = 0;
-                foreach ($list as $item) {
-                    $cur += $item->price;
-                }   
-                $num = $cur;                         
-            } else {
-                $num = $mo->price;       
-            }                
-            my_Assert($num == $order->amount, ErrCode::pay_price_err); 
+            $mo = GameConfig::shop_limit_getItem($order->product_id);                           
+            my_Assert($mo->price == $order->amount, ErrCode::pay_price_err); 
         }
         elseif ($order->product_id >= 805001 && $order->product_id <= 805999) {//限时
             //该功能暂时没有开发

Gameserver/Amfphp/process/ShopProc.php

@@ -96,18 +96,18 @@ class ShopProc {
         $curDay = TimeUtil::totalDays();
         $lastDay = TimeUtil::totalDays(req()->userInfo->game->shopdata->daliySpecialClear_ts);
 
-        if ($curDay - $lastDay == 1 && TimeUtil::Hour(req()->userInfo->game->shopdata->daliySpecialClear_ts) < 5 && TimeUtil::Hour(now()) > 5) {
+        if ($curDay - $lastDay == 1 && TimeUtil::Hour(now()) > 5) {//TimeUtil::Hour(req()->userInfo->game->shopdata->daliySpecialClear_ts) < 5
             req()->userInfo->game->shopdata->daliySpecialClear_ts = now();
             req()->userInfo->game->shopdata->daliySpecialPackages = array();
         } else if ($curDay - $lastDay > 1) {
             req()->userInfo->game->shopdata->daliySpecialClear_ts = now();
-            req()->userInfo->game->shopdata->daliySpecialPackages = array();
+            req()->userInfo->game->shopdata->daliySpecialPackages = array();          
         }
 
         if (TimeUtil::totalDays(req()->userInfo->game->shopdata->daliySpecialClear_ts) == TimeUtil::totalDays() #
                 && TimeUtil::Hour(req()->userInfo->game->shopdata->daliySpecialClear_ts) < 5 && TimeUtil::Hour(now()) > 5) {
             req()->userInfo->game->shopdata->daliySpecialClear_ts = now();
-            req()->userInfo->game->shopdata->daliySpecialPackages = array();
+            req()->userInfo->game->shopdata->daliySpecialPackages = array();        
         }
     }
 

Gameserver/Amfphp/service_call/pay/Mo/OrderNotice.php

@@ -89,10 +89,10 @@ class OrderNotice extends \loyalsoft\Object_ext {
 //            \loyalsoft\CLog::pay('UID校验不匹配! ' . $pureUID($this->uid) . " (" . $pureUID($dbOrder->uid) . ")");
 //            return false;
 //        }
-        if ($dbOrder->amount != $this->amount) {
-            \loyalsoft\CLog::pay('金额校验不匹配! ' . $this->amount . " (" . $dbOrder->amount . ")");
-            return false;
-        }
+        //if ($dbOrder->amount != $this->amount) {
+        //    \loyalsoft\CLog::pay('金额校验不匹配! ' . $this->amount . " (" . $dbOrder->amount . ")");
+        //    return false;
+        //}
         return true;
     }
 

Gameserver/Amfphp/service_call/pay/official/pay_op.php

@@ -73,7 +73,7 @@ class pay_op {
             CLog::pay('发货回调函数不是可执行对象!' . $cpOrderId);
             return resp::err(6, "发货函数不可调用!");
         }
-        PayProc::checkAmount($order);
+        //PayProc::checkAmount($order);
         
         $bOk = call_user_func($deliverFunc, $order);                            # 调用游戏发货逻辑, 要求游戏逻辑返回true/false      
         if (!$bOk) {