diff --git a/assets/Scripts/Sub/UI/PreloadUI.ts b/assets/Scripts/Sub/UI/PreloadUI.ts index e8cec25c..21dc7ff4 100644 --- a/assets/Scripts/Sub/UI/PreloadUI.ts +++ b/assets/Scripts/Sub/UI/PreloadUI.ts @@ -277,20 +277,7 @@ export class PreloadUI extends Component { loginData.expire = resData.expire; const playerData = DataManager.I.getDataById(DataId.Player); playerData.name = resData.name; - - - // const accountData = DataManager.I.getDataById(DataId.Account); - // accountData.identifier = resData.Identifier; - // accountData.identityType = resData.IdentityType; - // accountData.uid = resData.Uid; - // accountData.isNewGuide = resData.IsNewGuide; - // accountData.isNewRegist = resData.IsNewRegist; - // const metaData = DataManager.I.getDataById(DataId.Meta); - // metaData.gameName = resData.GameName; - // const netTimeData = DataManager.I.getDataById(DataId.NetTime); - // netTimeData.serverTime = resData.ServerTime; - // netTimeData.timezoneOffset = resData.TimezoneOffset; - + this.loginFinish = true; // this.reqMyInfo(); diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index 0e5e8092..8ca261b9 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -22,6 +22,7 @@ import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlSe import { DataManager, DataId } from "../../data/DataManager"; import { ThemeData } from "../../data/ThemeData"; import { GirlData } from "../../data/GirlData"; +import proto from 'db://assets/Scripts/proto/proto.pb.js'; const { ccclass, property } = _decorator; @@ -69,18 +70,20 @@ export class ThemePanel extends li_BaseView { }; let res = await ThemeService.I.reqHallTheme(reqData); - // 保存数据 - const themeData = DataManager.I.getDataById(DataId.Theme); - themeData.themes = res.data; - // 根据数据,构建界面显示 - const themeIds = themeData.themeIds; - for (let id of themeIds) { - let newNode = instantiate(this.itemInst.node); - let item = newNode.getComponent(ThemeItem); - item.refresh(id); - newNode.active = true; - this.cache.push(item); - this.content.addChild(newNode); + if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { + // 保存数据 + const themeData = DataManager.I.getDataById(DataId.Theme); + themeData.themes = res.data; + // 根据数据,构建界面显示 + const themeIds = themeData.themeIds; + for (let id of themeIds) { + let newNode = instantiate(this.itemInst.node); + let item = newNode.getComponent(ThemeItem); + item.refresh(id); + newNode.active = true; + this.cache.push(item); + this.content.addChild(newNode); + } } // 请求每日推荐 @@ -88,27 +91,28 @@ export class ThemePanel extends li_BaseView { }; let res2 = await GirlService.I.reqDailyRecommend(reqData2); - const girlData = DataManager.I.getDataById(DataId.Girl); - girlData.setDailyRecommend(res2.data); - // 根据数据,构建界面显示 - this.recId = girlData.getRecommendGrilId(0); - this.rectNameKey = girlData.getRecommendGrilName(0); - let avatarPath = girlData.getRecommendGrilAvatar(0); - - //this.recName.string = LanguageUtils.getText(this.rectNameKey); - ResManager.I.changeBundleSpriteFrame( - this.recSprite, - avatarPath, - "Chat18x", - () => { - let sizeTran = this.recSprite.node.parent.getComponent(UITransform); - Utils.adjustBgPixelRatioToSize( - sizeTran.contentSize, - this.recSprite.node, - 1 - ); - } - ); + if (res2 && res2.code === proto.cs.EnmRetCode.SUCCESS) { + const girlData = DataManager.I.getDataById(DataId.Girl); + girlData.setDailyRecommend(res2.data); + // 根据数据,构建界面显示 + this.recId = girlData.getRecommendGrilId(0); + this.rectNameKey = girlData.getRecommendGrilName(0); + let avatarPath = girlData.getRecommendGrilAvatar(0); + //this.recName.string = LanguageUtils.getText(this.rectNameKey); + ResManager.I.changeBundleSpriteFrame( + this.recSprite, + avatarPath, + "Chat18x", + () => { + let sizeTran = this.recSprite.node.parent.getComponent(UITransform); + Utils.adjustBgPixelRatioToSize( + sizeTran.contentSize, + this.recSprite.node, + 1 + ); + } + ); + } } private registerListener() {