Quellcode durchsuchen

add Registed colum

Tree vor 2 Monaten
Ursprung
Commit
66aeeb4e6c
2 geänderte Dateien mit 37 neuen und 7 gelöschten Zeilen
  1. 27 3
      app/Game/GlobalUserInfo.php
  2. 10 4
      app/Http/Controllers/Game/WebRouteController.php

+ 27 - 3
app/Game/GlobalUserInfo.php

@@ -76,7 +76,7 @@ class GlobalUserInfo extends Model
         'InsurePass', 'Gender', 'RegisterDate', 'RegisterIP',
         'RegisterLocation', 'DefaultLanguage', 'ServerRegion',
         'ThemeColor', 'Level', 'Exp', 'UserRight',
-        'SpreaderID', 'LastLogonIP', 'LastLogonDate', 'ReferrType','Channel','GpsAdid','FavoriteGames','PwaInstalled'
+        'SpreaderID', 'LastLogonIP', 'LastLogonDate', 'ReferrType','Channel','GpsAdid','FavoriteGames','PwaInstalled','Registed'
     ];
 
     // Attributes that should be cast to native types
@@ -131,7 +131,7 @@ class GlobalUserInfo extends Model
         $data = false;
         if ($user) {
             $u = $user->toArray();
-            $existKey = ['UserID', 'GameID', 'GlobalUID','Email', 'Phone','DefaultLanguage', 'NickName', 'FaceID', 'Gender', 'RegisterDate', 'RegisterLocation', 'InsurePass', 'Level', 'Exp', 'UserRight','Channel'];
+            $existKey = ['UserID', 'GameID', 'GlobalUID','Email', 'Phone','DefaultLanguage', 'NickName', 'FaceID', 'Gender', 'RegisterDate', 'RegisterLocation', 'InsurePass', 'Level', 'Exp', 'UserRight','Channel','Registed'];
             $data = [];
             foreach ($existKey as $key) {
                 $data[$key] = $u[$key];
@@ -144,7 +144,11 @@ class GlobalUserInfo extends Model
                 $user->GameID = $data['GameID'];
                 $user->update(['GameID' => $data['GameID']]);
             }
-            $data['Score'] = self::getScoreByUserID($data['UserID']);
+
+            $scoreData = self::getScoreDataByUserID($data['UserID']);
+
+            $data['Score'] = $scoreData($data['Score']);
+            $data['Score'] = $scoreData($data['Score']);
             if($makeBB){
                 $data['bb']=['token'=>(new BetbyService())->getDefaultJWT($u)];
             }
@@ -153,6 +157,9 @@ class GlobalUserInfo extends Model
         return $data;
     }
     private static $userToScores=[];
+
+    private static $userToScoresData=[];
+
     public static function getScoreByUserID($userID)
     {
         if(!isset(self::$userToScores[$userID])) {
@@ -163,6 +170,23 @@ class GlobalUserInfo extends Model
         return self::$userToScores[$userID];
     }
 
+
+    public static function getScoreDataByUserID($userID)
+    {
+        if(!isset(self::$userToScoresData[$userID])) {
+            $scoreObj=GameScoreInfo::query()->select(['Score','InsureScore'])->where('UserID', $userID)->first();
+            if($scoreObj){
+                self::$userToScoresData[$userID]['Score'] = intval($scoreObj->Score) / NumConfig::NUM_VALUE;
+                self::$userToScoresData[$userID]['InsureScore'] = intval($scoreObj->InsureScore) / NumConfig::NUM_VALUE;
+            }else{
+                self::$userToScoresData[$userID]['Score'] = 0;
+                self::$userToScoresData[$userID]['InsureScore'] = 0;
+            }
+        }
+        return self::$userToScoresData[$userID];
+    }
+
+
     public static function GlobalToUserID($GlobalUID)
     {
         return intval(explode('-', $GlobalUID)[3]);

+ 10 - 4
app/Http/Controllers/Game/WebRouteController.php

@@ -56,7 +56,7 @@ class WebRouteController extends Controller
         $guestOpen=$config->isGuestOpen();
         $disablePromote=$config->isDisablePromote();
         //在fb内,节省时间,不快速注册
-        if($inApp)$guestOpen=false;
+        //if($inApp)$guestOpen=false;
 
         $upgradeBonus=intval($config->BONUS_VERIFY_PHONE());
         if($guestOpen&&!$upgradeBonus) {
@@ -105,7 +105,7 @@ class WebRouteController extends Controller
 
         if($user){
             $user=GlobalUserInfo::toWebData($user);
-            $user['reg']=$isreg;
+//            $user['reg']=$isreg;
         }else if($guestOpen){
             //游客模式打开,随时可以登录
             $guestUser=GlobalUserInfo::getGameUserInfo('FPID',$FPID);
@@ -117,7 +117,7 @@ class WebRouteController extends Controller
                         //出现错误
                     }else{
                         $user=GlobalUserInfo::toWebData($guestUser);
-                        $user['reg'] = 1;
+//                        $user['Registed'] = 0;
                     }
 //                }
             }else{
@@ -125,7 +125,7 @@ class WebRouteController extends Controller
             }
 
         }
-        LoginController::CheckTimeBonus($user);
+        //LoginController::CheckTimeBonus($user);
 
         $data=['code'=>0,'data'=>$routes,'blocks'=>$blocks,'styles'=>$styles,'user'=>$user];
 
@@ -177,6 +177,12 @@ class WebRouteController extends Controller
         return response()->json($data);
     }
 
+
+    public function getRegisterGold(Request $request)
+    {
+
+    }
+
     public function checkApkInstall(Request $request)
     {
         $user=$request->user();