仙树

Gameserver/App/configs/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-11-28 09:12:24
+ // 日期: 2024-12-17 10:12:28
 ////////////////////
 
 namespace loyalsoft;
@@ -1039,6 +1039,15 @@ class GameConfig {
         return self::get_hash_item('activity_day7sign_newplayer', $itemid);
     }
     /**
+    * 全局参数2
+    * @return \sm_glc2
+    */
+    public static function glc2()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'glc2');
+    }
+    /**
     * 当前版本(时间戳)
     * @return \ver
     */

Gameserver/App/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-12-17 10:06:26
+ // 日期: 2024-12-17 10:12:28
 ////////////////////
 
 /**

Gameserver/App/model/Const/sm_glc2.php

@@ -8,7 +8,7 @@
 
 
 /**
- * Static Model glc2 全局参数2
+ * Static Model sm_glc2 全局参数2
  */
 class sm_glc2
 {

Gameserver/App/model/Const/sm_item.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-12-17 09:44:23
+ // 日期: 2024-12-17 10:10:19
 ////////////////////
 
 

Gameserver/App/process/ActiveProc.php

@@ -121,7 +121,7 @@ class ActiveProc {
         my_Assert(ctx()->privateState->lotteryNum + $num <= glc()->activity_lottery_allNum, ErrCode::active_lotteryNumLimit);
 
         $costTag = true;
-        if ($num == 1 && ctx()->privateState->lotteryNum_free < glc()->activity_lottery_FreeNum + glc()->activity_lottery_GuanggaoNum) {
+        if ($num == 1 && ctx()->privateState->lotteryNum_free < GameConfig::glc2()->activity_lottery_FreeNum + GameConfig::glc2()->activity_lottery_GuanggaoNum) {
             $costTag = false;            
         }
 
@@ -145,8 +145,8 @@ class ActiveProc {
             ctx()->store->removeItem($costId, $costNum);
         }
 
-        if (ctx()->privateState->lotteryNum_free > glc()->activity_lottery_FreeNum && ctx()->privateState->lotteryNum_free <= glc()->activity_lottery_FreeNum + glc()->activity_lottery_FreeNum) {
-            my_Assert(now() - ctx()->privateData(true)->activity_lottery_guanggaoTs >= glc()->activity_lottery_GuanggaoDownTs, ErrCode::user_shop_DownTsLimit);
+        if (ctx()->privateState->lotteryNum_free > GameConfig::glc2()->activity_lottery_FreeNum && ctx()->privateState->lotteryNum_free <= GameConfig::glc2()->activity_lottery_FreeNum + GameConfig::glc2()->activity_lottery_GuanggaoNum) {
+            my_Assert(now() - ctx()->privateData(true)->activity_lottery_guanggaoTs >= GameConfig::glc2()->activity_lottery_GuanggaoDownTs, ErrCode::user_shop_DownTsLimit);
             ctx()->privateData(true)->activity_lottery_guanggaoTs = now();                
         }
 
@@ -630,8 +630,5 @@ class ActiveProc {
                     'reward_equip' => StoreProc::$reward_equip,
         ));
     }
-<<<<<<< HEAD
 
-=======
->>>>>>> caa35eee68e8fea73ac7f5e4afb0d2cf1557982d
 }