Explorar o código

fixed: 方法名与关键字冲突

gwang %!s(int64=4) %!d(string=hai) anos
pai
achega
c63084716c

+ 1 - 1
Gameserver/Amfphp/model/User/Data_UserGame.php

@@ -232,7 +232,7 @@ class Data_UserGame extends HashSaver {
      * @param bool $save 是否需要回存
      * @return Info_PrivateState
      */
-    public function private($save = true) {
+    public function privateData($save = true) {
         $this->privateState = new Info_PrivateState($this->privateState);
         if ($save) {
             self::save_tag("privateState");

+ 2 - 2
Gameserver/Amfphp/process/ActiveProc.php

@@ -60,7 +60,7 @@ class ActiveProc {
      */
     static function drawTiliGift() {
         $user = ctx();
-        $privateState = ctx()->private();
+        $privateState = ctx()->privateData();
         $base = $user->base();
         $hour = date('G');
         my_Assert(!in_array($hour, $privateState->dailyDrawedTiliGift), ErrCode::active_hasgetted); # 判断是否已领取
@@ -142,7 +142,7 @@ class ActiveProc {
     static function drawOnlineGift() {
         $giftid = req()->paras[0];                                               # 提取参数: 礼包的编号
         $user = ctx();
-        $privateState = ctx()->private();
+        $privateState = ctx()->privateData();
         $giftData = GameConfig::activity_onlinegift_getItem($giftid);           # 在线礼包常量数据
         my_Assert(null != $giftData, ErrCode::onlinegift_constno_err);          # 防御找不到配置数据
         my_Assert($privateState->onlineGiftts >= $giftData->onlineSec, #        # 时间未到,不可以领取

+ 1 - 1
Gameserver/Amfphp/process/SystemProc.php

@@ -106,7 +106,7 @@ class SystemProc {
             if ($timespan < 30) {                                               # 心跳包固定30秒1次
                 $timespan = 30;
             }
-            ctx()->private()->onlineGiftts += $timespan;
+            ctx()->privateData()->onlineGiftts += $timespan;
             UserProc::updateUserInfo();
         }
         return Resp::ok();