Merge branch 'main' of 47.107.44.202:xionglijia/18xchat

# Conflicts:
#	assets/Scripts/Sub/UI/PreloadUI.ts
#	assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts
#	assets/Scripts/chat18x/uiitems/DetailImageItem.ts

assets/Scripts/Sub/UI/PreloadUI.ts

@@ -28,7 +28,9 @@ import LanguageUtils, { LanguageType } from "../../Main/Common/LanguageUtils";
 import { DataManager, DataId } from "../../chat18x/data/DataManager";
 import { LoginData } from "../../chat18x/data/LoginData";
 import { PlayerData } from "../../chat18x/data/PlayerData";
+import { AccountData } from "../../chat18x/data/AccountData";
 import { WalletData } from "../../chat18x/data/WalletData";
+import { EnvData } from "../../chat18x/data/EnvData";
 import { ConfigManager } from "../../chat18x/manager/ConfigManager";
 import { AppConfig } from "db://assets/Scripts/chat18x/config/env/appConfig";
 import DeviceIdService from "db://assets/Scripts/chat18x/foundation/identity/DeviceIdService";
@@ -59,9 +61,7 @@ export class PreloadUI extends Component {
     this.jinduFilled = this.jinduBar
       .getChildByName("jinduFilled")
       .getComponent(Sprite);
-    // this.LabProgress = this.node
-    //   .getChildByName("LabProgress")
-    //   .getComponent(Label);
+
     this.loginNode = this.node.getChildByName("loginNode");
     this.btnLogin = this.loginNode.getChildByName("btnLogin");
 
@@ -258,12 +258,12 @@ export class PreloadUI extends Component {
 
     // 游客登录
     const deviceId = DeviceIdService.I.id;
-    const machineIdentifier = MachineInfoService.I.getMachineIdentifier();
+    const os = MachineInfoService.I.getMachineOs();
     const reqData = {
       platType: "guset",
       userId: deviceId,
       device: deviceId,
-      os: 3,
+      os,
     };
     console.log("登录请求数据：", reqData);
     let res = await AuthService.I.login(reqData);
@@ -274,28 +274,33 @@ export class PreloadUI extends Component {
       const loginData = DataManager.I.getDataById<LoginData>(DataId.Login);
       loginData.token = resData.token;
       loginData.refreshToken = resData.refreshToken;
-      loginData.expire = resData.expire;
+      loginData.expire = Number(resData.expire);
       const playerData = DataManager.I.getDataById<PlayerData>(DataId.Player);
       playerData.name = resData.name;
+      const accountData = DataManager.I.getDataById<AccountData>(
+        DataId.Account
+      );
+      accountData.accId = resData.accId;
+      const envData = DataManager.I.getDataById<EnvData>(DataId.Env);
+      envData.cdn = resData.cdn;
 
       this.loginFinish = true;
-
-      // this.reqMyInfo();
+      // 请求个人信息
+      this.reqMyInfo();
     }
   }
 
   // 请求个人信息
   private async reqMyInfo() {
     const reqData = {};
-    console.log("个人信息请求数据：", reqData);
     let res = await PlayerDataService.I.reqMyInfo(reqData);
     console.log("个人信息响应数据：", res);
     if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
       const resData = res.data;
       // 保存数据
       const walletData = DataManager.I.getDataById<WalletData>(DataId.Wallet);
-      walletData.diamond = resData.diamond;
-      walletData.vipExpire = resData.vipExpire;
+      walletData.balance = Number(resData.balance);
+      walletData.vipExpire = Number(resData.vipExpire);
     }
   }