xionglijia/18xchat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chen wei bo
2025-09-26 17:34:17 +08:00
parent 361afaacf2 4a39621551
commit 2a8a02a6f9
23 changed files with 388 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Scripts/chat18x/ui/panels/ChatPanel.ts
+1 -6
View File
@@ -18,19 +18,14 @@ import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView";
import Utils from "db://assets/Scripts/Main/Common/Utils";
import { InnerMsgCode } from "db://assets/Scripts/Main/Config/InnerMsgCode";
import { ChatContentsLayout } from "../components/ChatContentsLayout";
import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager";
import GameRootUI from "db://assets/Scripts/Main/Common/GameRootUI";
import { ImagePopup } from "../components/ImagePopup";
import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
import LanguageUtils from "../../../Main/Common/LanguageUtils";
import { UITransitionHelper } from "../../utils/UITransitionHelper";
import { PriceType, VideoEmotion, purchase } from "../../../schema/schema";
import { PayToTalkSubpanel } from "./PayToTalkSubpanel";
import { DataId, DataManager } from "../../data/DataManager";
import { GirlData } from "../../data/GirlData";
import { SceneBgVideoLayer } from "../../../Sub/UI/SceneBgVideoLayer";
import { NavigationManager, PanelType } from "../../manager/NavigationManager";
import { NavigationManager } from "../../manager/NavigationManager";
import { GirlService } from "../../network/services/GirlService";
import proto from "db://assets/Scripts/proto/proto.pb.js";
import { TipsPanel } from "./TipsPanel";
assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts
-1
View File
@@ -20,7 +20,6 @@ import {
PanelType,
} from "../../manager/NavigationManager";
import { DetailImageItemPool } from "../../manager/DetailImageItemPool";
import { ConfigManager } from "../../manager/ConfigManager";
import LanguageUtils from "../../../Main/Common/LanguageUtils";
import Utils from "../../../Main/Common/Utils";
import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode";
assets/Scripts/chat18x/ui/panels/GirlListPanel.ts
-1
View File
@@ -8,7 +8,6 @@ import { DataManager, DataId } from "../../data/DataManager";
import { GirlData } from "../../data/GirlData";
import proto from "db://assets/Scripts/proto/proto.pb.js";
import { NavigationManager, PanelType } from "../../manager/NavigationManager";
import { UITransitionHelper } from "../../utils/UITransitionHelper";
const { ccclass, property } = _decorator;
assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts
-3
View File
@@ -13,8 +13,6 @@ import {
import li_BaseView from "../../../Main/Common/li_BaseView";
import Utils from "../../../Main/Common/Utils";
import { GButton } from "../../../Main/Common/GButton";
import { PopupGirlDetailPanel } from "./PopupGirlDetailPanel";
import { GirlListItem } from "../../uiitems/GirlListItem";
import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService";
import { DataManager, DataId } from "../../data/DataManager";
import { GirlData } from "../../data/GirlData";
@@ -22,7 +20,6 @@ import { WalletData } from "../../data/WalletData";
import { EnvData } from "../../data/EnvData";
import proto from "db://assets/Scripts/proto/proto.pb.js";
import LanguageUtils from "../../../Main/Common/LanguageUtils";
import { ViewManager } from "../../../Main/Manager/ViewManager";
import { TipsPanel } from "./TipsPanel";
import ResManager from "../../../Main/Manager/ResManager";
import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode";
assets/Scripts/chat18x/ui/panels/NavigationPanel.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { _decorator, Component, Label, Node } from "cc";
import { _decorator, Node } from "cc";
import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView";
import Utils from "db://assets/Scripts/Main/Common/Utils";
import { GButton } from "db://assets/Scripts/Main/Common/GButton";
assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts
-1
View File
@@ -5,7 +5,6 @@ import { GButton } from "db://assets/Scripts/Main/Common/GButton";
import { PastGirlListItem } from "../../uiitems/PastGirlListItem";
import { DataManager, DataId } from "../../data/DataManager";
import { GirlData } from "../../data/GirlData";
import { ChatHistoryManager } from "../../manager/ChatHistoryManager";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService";
import proto from "db://assets/Scripts/proto/proto.pb.js";
assets/Scripts/chat18x/ui/panels/PayToTalkSubpanel.ts
-1
View File
@@ -7,7 +7,6 @@ import {
tween,
UIOpacity,
} from "cc";
import { ChatController } from "../../core/ChatController";
import { ShopService } from "db://assets/Scripts/chat18x/network/services/ShopService";
import { DataManager, DataId } from "../../data/DataManager";
import { WalletData } from "../../data/WalletData";
assets/Scripts/chat18x/ui/panels/PurchasePanel.ts
+10 -3
View File
@@ -1,4 +1,4 @@
import { _decorator, Component, Label, Node, ScrollView } from "cc";
import { _decorator, Label, Node, ScrollView } from "cc";
import li_BaseView from "../../../Main/Common/li_BaseView";
import Utils from "../../../Main/Common/Utils";
import { GButton } from "../../../Main/Common/GButton";
@@ -12,7 +12,7 @@ import { GirlData } from "../../data/GirlData";
import { ShopService } from "db://assets/Scripts/chat18x/network/services/ShopService";
import { PaymentService } from "db://assets/Scripts/chat18x/payment/PaymentService";
import proto from "db://assets/Scripts/proto/proto.pb.js";
import { NavigationManager, PanelType } from "../../manager/NavigationManager";
import { NavigationManager } from "../../manager/NavigationManager";
import { Web3PopPanel } from "./Web3PopPanel";
import { TipsPanel } from "./TipsPanel";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
@@ -87,6 +87,10 @@ export class PurchasePanel extends li_BaseView {
this.createOrRefreshWeb3PayPanel
);
Utils.addInnerEL(InnerMsgCode.LanguageChange, this, () => {
this.onVipExpireChange();
});
for (let index = 0; index < this.items.length; index++) {
const element = this.items[index];
element.init(this);
@@ -333,9 +337,12 @@ export class PurchasePanel extends li_BaseView {
Utils.removeInnerEL(InnerMsgCode.VipExpireChange, this, () => {
this.onVipExpireChange();
});
Utils.addInnerEL(InnerMsgCode.PayOrderCreateSucc, this, () => {
Utils.removeInnerEL(InnerMsgCode.PayOrderCreateSucc, this, () => {
this.createOrRefreshWeb3PayPanel;
});
Utils.removeInnerEL(InnerMsgCode.LanguageChange, this, () => {
this.onVipExpireChange();
});
super.onDestroy();
}
}
assets/Scripts/chat18x/ui/panels/SettingPanel.ts
-2
View File
@@ -15,10 +15,8 @@ import { GButton } from "../../../Main/Common/GButton";
import LanguageUtils, {
LanguageType,
} from "../../../Main/Common/LanguageUtils";
import AudioManager from "../../../Main/Manager/AudioManager";
import PlayerDataManager from "../../../Main/Manager/PlayerDataManager";
import { NavigationManager } from "../../manager/NavigationManager";
import { Config18x } from "../../../Main/Config/Config18x";
const { ccclass, property } = _decorator;
interface LanguageButton {
assets/Scripts/chat18x/ui/panels/ThemePanel.ts
-4
View File
@@ -17,9 +17,7 @@ import {
PageTransitionType,
PanelType,
} from "../../manager/NavigationManager";
import { GirlListItem } from "../../uiitems/GirlListItem";
import LanguageUtils from "../../../Main/Common/LanguageUtils";
import { ViewManager } from "../../../Main/Manager/ViewManager";
import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode";
import { ThemeService } from "db://assets/Scripts/chat18x/network/services/ThemeService";
import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService";
@@ -32,9 +30,7 @@ import { AccountData } from "../../data/AccountData";
import { ShopData } from "../../data/ShopData";
import { EnvData } from "../../data/EnvData";
import proto from "db://assets/Scripts/proto/proto.pb.js";
import GameRootUI from "../../../Main/Common/GameRootUI";
import { MainController } from "../../core/MainController";
import { GirlListPanel } from "./GirlListPanel";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
const { ccclass, property } = _decorator;
assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts
+2 -2
View File
@@ -234,9 +234,9 @@ export class Web3PopPanel extends li_BaseView {
SDKManager.I.copyToClipboard(stringToCopy, (success: boolean) => {
if (success) {
TipsPanel.show("地址已复制到剪贴板");
TipsPanel.show(LanguageUtils.getText("web3panel.copyed"));
} else {
TipsPanel.show("复制失败，请手动复制地址");
TipsPanel.show(LanguageUtils.getText("web3panel.copyfail"));
}
});
}