diff --git a/assets/Scripts/chat18x/ui/panels/PopupGirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/PopupGirlListPanel.ts index 78530a54..cc382a9e 100644 --- a/assets/Scripts/chat18x/ui/panels/PopupGirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PopupGirlListPanel.ts @@ -15,9 +15,14 @@ export class PopupGirlListPanel extends li_BaseView { } onLoadCT() { Utils.parseNode(this.node, this._nodeTab); + this.registerListener(); } registerListener() { GButton.BandClick(this._nodeTab.BuyBtn, this.buyCharacter, this); + GButton.BandClick(this._nodeTab.CloseBtn, this.Close, this); + } + Close() { + this.close(); } buyCharacter() { // 购买id为girlId的女生 diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts index 50b9fc27..00bfdf34 100644 --- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts @@ -142,9 +142,12 @@ export class GirlListItem extends Component { } onClickDetail() { - NavigationManager.Instance.navigateToGirlDetail(this.id); - ViewManager.I.closeView(this.baseNode); + if (false) { + NavigationManager.Instance.navigateToGirlDetail(this.id); + ViewManager.I.closeView(this.baseNode); + } else { + //未解锁 + ViewManager.I.openBundlesView("PopupGirlListPanel", this.id); + } } - - update(deltaTime: number) {} } diff --git a/assets/Scripts/chat18x/uiitems/ThemeItem.ts b/assets/Scripts/chat18x/uiitems/ThemeItem.ts index d9a212bc..97cbfac2 100644 --- a/assets/Scripts/chat18x/uiitems/ThemeItem.ts +++ b/assets/Scripts/chat18x/uiitems/ThemeItem.ts @@ -7,6 +7,7 @@ import LanguageUtils from "../../Main/Common/LanguageUtils"; import { InnerMsgCode } from "../../Main/Config/InnerMsgCode"; import { DataManager, DataId } from "../data/DataManager"; import { ThemeData } from "../data/ThemeData"; +import { ViewManager } from "../../Main/Manager/ViewManager"; const { ccclass, property } = _decorator; @ccclass("ThemeItem") diff --git a/assets/bundles/Chat18x/PopupGIrlListPanel.prefab b/assets/bundles/Chat18x/PopupGIrlListPanel.prefab index 030bfc18..a874b776 100644 --- a/assets/bundles/Chat18x/PopupGIrlListPanel.prefab +++ b/assets/bundles/Chat18x/PopupGIrlListPanel.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "PopupGIrlListPanel", + "_name": "PopupGirlListPanel", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "PopupGIrlListPanel", + "_name": "PopupGirlListPanel", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, diff --git a/assets/bundles/Chat18x/PopupGIrlListPanel.prefab.meta b/assets/bundles/Chat18x/PopupGIrlListPanel.prefab.meta index cc762606..205da901 100644 --- a/assets/bundles/Chat18x/PopupGIrlListPanel.prefab.meta +++ b/assets/bundles/Chat18x/PopupGIrlListPanel.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "PopupGIrlListPanel" + "syncNodeName": "PopupGirlListPanel" } } diff --git a/settings/v2/packages/cocos-service.json b/settings/v2/packages/cocos-service.json index c65b54dd..f7dec085 100644 --- a/settings/v2/packages/cocos-service.json +++ b/settings/v2/packages/cocos-service.json @@ -1,7 +1,7 @@ { "__version__": "3.0.7", "game": { - "name": "未知游戏", + "name": "UNKNOW GAME", "app_id": "UNKNOW", "c_id": "0" }, diff --git a/settings/v2/packages/information.json b/settings/v2/packages/information.json index b76ead73..94848dec 100644 --- a/settings/v2/packages/information.json +++ b/settings/v2/packages/information.json @@ -4,19 +4,19 @@ "customSplash": { "id": "customSplash", "label": "customSplash", - "enable": true, + "enable": false, "customSplash": { - "complete": true, - "form": "https://creator-api.cocos.com/api/form/show?sid=800ccf353f6eb54dc483510ce462e944" + "complete": false, + "form": "https://creator-api.cocos.com/api/form/show?" } }, "removeSplash": { "id": "removeSplash", "label": "removeSplash", - "enable": true, + "enable": false, "removeSplash": { - "complete": true, - "form": "https://creator-api.cocos.com/api/form/show?sid=800ccf353f6eb54dc483510ce462e944" + "complete": false, + "form": "https://creator-api.cocos.com/api/form/show?" } } }