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-20 18:56:23 +08:00
parent 81959b1ec5 86282eec31
commit 058cf2beef
15 changed files with 2061 additions and 5056 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Scenes/LoginScene.scene
-1903
View File
File diff suppressed because it is too large Load Diff
assets/Scenes/LoginScene.scene.meta
-1
View File
@@ -1 +0,0 @@
{"ver":"1.1.50","importer":"scene","imported":true,"uuid":"dab4ae00-c26e-4176-9c7e-709d8899e525","files":[".json"],"subMetas":{},"userData":{}}
assets/Scenes/MainScene.scene
+1369 -283
View File
File diff suppressed because it is too large Load Diff
assets/Scenes/MainScene.scene.meta
+11 -1
View File
@@ -1 +1,11 @@
{"ver":"1.1.50","importer":"scene","imported":true,"uuid":"1a23cd3e-e487-4fd1-a415-346c2087464d","files":[".json"],"subMetas":{},"userData":{}}
{
"ver": "1.1.50",
"importer": "scene",
"imported": true,
"uuid": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4",
"files": [
".json"
],
"subMetas": {},
"userData": {}
}
assets/Scenes/PreloadScene.scene
-2160
View File
File diff suppressed because it is too large Load Diff
assets/Scenes/PreloadScene.scene.meta
-11
View File
@@ -1,11 +0,0 @@
{
"ver": "1.1.50",
"importer": "scene",
"imported": true,
"uuid": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4",
"files": [
".json"
],
"subMetas": {},
"userData": {}
}
assets/Scripts/Main/Manager/ResManager.ts
+553 -488
View File
File diff suppressed because it is too large Load Diff
assets/Scripts/Sub/GameScene.ts
-26
View File
@@ -1,26 +0,0 @@
import { _decorator, Camera, Component, Node } from "cc";
import GameRootUI from "../Main/Common/GameRootUI";
const { ccclass, property } = _decorator;
//游戏场景
@ccclass('GameScene')
export class GameScene extends Component {
@property(Node)
UIRoot: Node = null
@property(Node)
UILayerMod: Node = null
@property(Camera)
MainCamera: Camera = null
start() {
//每个场景必须添加的
let gameRootUI = this.node.getComponent(GameRootUI)
if (!gameRootUI){
gameRootUI = this.node.addComponent(GameRootUI)
gameRootUI.InitByCreate(this.UIRoot, this.UILayerMod, "UI/GameUI/Game_UI");
}
GameRootUI.MainCamera = this.MainCamera
}
}
assets/Scripts/Sub/GameScene.ts.meta
-9
View File
@@ -1,9 +0,0 @@
{
"ver": "4.0.24",
"importer": "typescript",
"imported": true,
"uuid": "d9d41102-bfd6-4256-8356-bfca87f844ec",
"files": [],
"subMetas": {},
"userData": {}
}
assets/Scripts/Sub/MainScene.ts
+4 -2
View File
@@ -14,7 +14,9 @@ export class MainScene extends Component {
@property(Camera)
MainCamera: Camera = null;
start() {
start() {}
init() {
//每个场景必须添加的
let gameRootUI = this.node.getComponent(GameRootUI);
if (!gameRootUI) {
@@ -22,7 +24,7 @@ export class MainScene extends Component {
gameRootUI.InitByCreate(this.UIRoot, this.UILayerMod, "NavigationPanel");
}
GameRootUI.MainCamera = this.MainCamera;
// 初始化MainController并预加载数据
this.initMainController();
}
assets/Scripts/Sub/UI/LoginUI.ts
-104
View File
@@ -1,104 +0,0 @@
import { _decorator, Button, Component, Node } from "cc";
import li_BaseView from "../../Main/Common/li_BaseView";
import Utils from "../../Main/Common/Utils";
import { GButton } from "../../Main/Common/GButton";
import ResManager from "../../Main/Manager/ResManager";
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 { GlobalData } from "../../chat18x/data/GlobalData";
import { EnvData } from "../../chat18x/data/EnvData";
import DeviceIdService from "db://assets/Scripts/chat18x/foundation/identity/DeviceIdService";
import MachineInfoService from "db://assets/Scripts/chat18x/foundation/identity/MachineInfoService";
import { AuthService } from "db://assets/Scripts/chat18x/network/services/AuthService";
import { PlayerDataService } from "db://assets/Scripts/chat18x/network/services/PlayerDataService";
import { CommonService } from "db://assets/Scripts/chat18x/network/services/CommonService";
import proto from "db://assets/Scripts/proto/proto.pb.js";
const { ccclass, property } = _decorator;
@ccclass("LoginUI")
export class LoginUI extends li_BaseView {
private _nodeTab: any = {};
private loginFinish = false;
loginBtn: Node;
protected start(): void {
Utils.parseNode(this.node, this._nodeTab);
this.loginBtn = this._nodeTab.btnLogin;
GButton.BandClick(this.loginBtn, this.onLogin, this);
}
update(deltaTime: number) {
if (this.loginFinish) {
this.loginFinish = false;
this.enterGame();
}
}
async onLogin() {
const deviceId = DeviceIdService.I.id;
const os = MachineInfoService.I.getMachineOs();
const reqData = {
platType: "guest",
userId: deviceId,
device: deviceId,
os,
};
console.log("登录请求数据：", reqData);
let res = await AuthService.I.login(reqData);
console.log("登录响应数据：", res);
if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
const resData = res.data;
const loginData = DataManager.I.getDataById<LoginData>(DataId.Login);
loginData.token = resData.token;
loginData.refreshToken = resData.refreshToken;
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.reqGlobalData();
}
}
// 请求个人数据
private async reqMyInfo() {
const 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.balance = Number(resData.balance);
walletData.vipExpire = Number(resData.vipExpire);
}
}
// 请求全局数据
private async reqGlobalData() {
const reqData = {
resName: "TbGlobalConfig",
};
let res = await CommonService.I.reqResConfig(reqData);
if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
// 保存数据
const globalData = DataManager.I.getDataById<GlobalData>(DataId.Global);
globalData.globals = res.data;
}
}
private enterGame() {
ResManager.I.goMainScene();
}
}
assets/Scripts/Sub/UI/LoginUI.ts.meta
-9
View File
@@ -1,9 +0,0 @@
{
"ver": "4.0.24",
"importer": "typescript",
"imported": true,
"uuid": "0fa6dc01-de0d-4847-ae6c-624111814d80",
"files": [],
"subMetas": {},
"userData": {}
}
assets/Scripts/Sub/UI/PreloadUI.ts
+113 -52
View File
@@ -6,6 +6,7 @@ import {
Button,
Component,
ImageAsset,
instantiate,
JsonAsset,
Label,
Material,
@@ -25,22 +26,48 @@ import Utils from "../../Main/Common/Utils";
import { InnerMsgCode } from "../../Main/Config/InnerMsgCode";
import { promptItem } from "../Item/promptItem";
import LanguageUtils, { LanguageType } from "../../Main/Common/LanguageUtils";
import { DataManager } from "../../chat18x/data/DataManager";
import { DataId, DataManager } from "../../chat18x/data/DataManager";
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";
import { AccountData } from "../../chat18x/data/AccountData";
import { EnvData } from "../../chat18x/data/EnvData";
import { GlobalData } from "../../chat18x/data/GlobalData";
import { LoginData } from "../../chat18x/data/LoginData";
import { PlayerData } from "../../chat18x/data/PlayerData";
import { WalletData } from "../../chat18x/data/WalletData";
import MachineInfoService from "../../chat18x/foundation/identity/MachineInfoService";
import { AuthService } from "../../chat18x/network/services/AuthService";
import { CommonService } from "../../chat18x/network/services/CommonService";
import { PlayerDataService } from "../../chat18x/network/services/PlayerDataService";
import proto from "db://assets/Scripts/proto/proto.pb.js";
import { ViewManager } from "../../Main/Manager/ViewManager";
import { MainScene } from "../MainScene";
const { ccclass, property } = _decorator;
@ccclass("PreloadUI")
export class PreloadUI extends Component {
private preloadFinish = false; //资源加载完成
@property(MainScene)
mainScene: MainScene = null;
private _nodeTab: any = {};
private preloadFinish = false; //资源加载完成
private loginFinish = false; //登录完成
loginBtn: Node;
private jinduBar: Node = null;
private jinduFilled: Sprite = null;
start() {
//Utils.addInnerEL(InnerMsgCode.UI_ShowPrompt, this, this.resiveShowPrompt)
Utils.parseNode(this.node, this._nodeTab);
this.loginBtn = this._nodeTab.btnLogin;
this.loginBtn.active = false;
GButton.BandClick(this.loginBtn, this.onLogin, this);
this.jinduBar = this.node.getChildByName("jinduBar");
this.jinduFilled = this.jinduBar
@@ -48,8 +75,8 @@ export class PreloadUI extends Component {
.getComponent(Sprite);
//适配背景图
let BG = this.node.getChildByName("BG");
Utils.adjustBgPixelRatio(BG, 1);
//let BG = this.node.getChildByName("BG");
//Utils.adjustBgPixelRatio(BG, 1);
this.jinduFilled.fillRange = 0;
@@ -77,9 +104,16 @@ export class PreloadUI extends Component {
}
update(deltaTime: number) {
if (this.preloadFinish) {
if (!this.preloadFinish) {
return;
//this.goToLoginScene();
}
if (this.loginFinish) {
this.loginFinish = false;
this.preloadFinish = false;
this.goToLoginScene();
this.enterGame();
}
}
@@ -100,25 +134,6 @@ export class PreloadUI extends Component {
{ path: "ChatPanel", bundleName: "Chat18x", ftype: Prefab },
{ path: "GirlDetailPanel", bundleName: "Chat18x", ftype: Prefab },
{ path: "GirlListPanel", bundleName: "Chat18x", ftype: Prefab },
// {path:"Music/music_interface", bundleName: "Audio", ftype: AudioClip},
// {path:"bg/mengli_stage_bg", bundleName: "Raw", ftype: ImageAsset},
// {path:"cg0/mengli_0_cg", bundleName: "Raw", ftype: ImageAsset},
// {path:"cg1/mengli_1_cg", bundleName: "Raw", ftype: ImageAsset},
// {path:"cg2/mengli_2_cg", bundleName: "Raw", ftype: ImageAsset},
// {path:"cg3/mengli_3_cg", bundleName: "Raw", ftype: ImageAsset},
// {path:"emo_1/mengli_shy", bundleName: "Raw", ftype: ImageAsset},
// {path:"emo_2/mengli_laugh", bundleName: "Raw", ftype: ImageAsset},
// {path:"emo_3/mengli_disgust", bundleName: "Raw", ftype: ImageAsset},
// {path:"role/mengli_default", bundleName: "Raw", ftype: ImageAsset},
// {path:"Zjm/raw1", bundleName: "Raw", ftype: ImageAsset},
// {path:"touming", bundleName: "common", ftype: ImageAsset},
// // {path:"chanpin_1_0", bundleName: "daoju", ftype: ImageAsset}, //有合图加载失败
// {path:"zjm_1", bundleName: "Zhujiemian", ftype: ImageAsset},
// {path:"zjm_19", bundleName: "Zhujiemian", ftype: ImageAsset},
// {path:"zjm_30", bundleName: "Zhujiemian", ftype: ImageAsset},
// {path:"mohu", bundleName: "Materials", ftype: Material},
// {path:"UI/Cross/Cross_UI", bundleName: "PB", ftype: Prefab},
// {path:"UI/StartUI/Start_UI", bundleName: "PB", ftype: Prefab},
{ path: "tblanguage", bundleName: "DataTable", ftype: BufferAsset },
];
let num_prefab = 0; //已加载数量
@@ -145,7 +160,7 @@ export class PreloadUI extends Component {
);
} else {
if (num_succeed >= num_prefab) {
this.loadDataTable();
this.startloginProcess();
}
}
};
@@ -153,29 +168,10 @@ export class PreloadUI extends Component {
}
//加载配置表
loadDataTable() {
let dataArr = [
//"commonGlobal",
// "levelHole",
//"Music",
//"Sound",
];
//配置表使用方法： let cfgs = Resource.getConfig("Sound")
let num_prefab = 0;
let preloadFunc = () => {
if (num_prefab < dataArr.length) {
let cfgname = dataArr[num_prefab];
ResManager.I.loadSubpackageDataTable(cfgname, (ret: JsonAsset) => {
num_prefab++;
Resource.addSubJsonConfig(cfgname, ret.json);
preloadFunc();
});
} else {
this.preloadFinish = true;
}
};
preloadFunc();
startloginProcess() {
this.jinduBar.active = false;
this.preloadFinish = true;
this.loginBtn.active = true;
}
//显示加载进度
@@ -184,8 +180,73 @@ export class PreloadUI extends Component {
}
// 跳转到登录场景
private goToLoginScene() {
this.jinduBar.active = false;
ResManager.I.goCustomScene("LoginScene");
// private goToLoginScene() {
// this.jinduBar.active = false;
// ResManager.I.goCustomScene("LoginScene");
// }
async onLogin() {
const deviceId = DeviceIdService.I.id;
const os = MachineInfoService.I.getMachineOs();
const reqData = {
platType: "guest",
userId: deviceId,
device: deviceId,
os,
};
console.log("登录请求数据：", reqData);
let res = await AuthService.I.login(reqData);
console.log("登录响应数据：", res);
if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
const resData = res.data;
const loginData = DataManager.I.getDataById<LoginData>(DataId.Login);
loginData.token = resData.token;
loginData.refreshToken = resData.refreshToken;
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.reqGlobalData();
}
}
// 请求个人数据
private async reqMyInfo() {
const 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.balance = Number(resData.balance);
walletData.vipExpire = Number(resData.vipExpire);
}
}
// 请求全局数据
private async reqGlobalData() {
const reqData = {
resName: "TbGlobalConfig",
};
let res = await CommonService.I.reqResConfig(reqData);
if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
// 保存数据
const globalData = DataManager.I.getDataById<GlobalData>(DataId.Global);
globalData.globals = res.data;
}
}
private enterGame() {
this.mainScene.init();
this.node.destroy();
//ResManager.I.goMainScene();
}
}
assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts
+5 -2
View File
@@ -70,10 +70,13 @@ export class GirlListPopupPanel extends li_BaseView {
this.girlName.string = LanguageUtils.getText(
girlData.getGrilName(this.category.toString(), this.girlId)
);
this.girlTag.string = LanguageUtils.getText(
girlData.getGrilTagKey(this.category.toString(), this.girlId)
const tagContent = girlData.getGrilTagKey(
this.category.toString(),
this.girlId
);
this.girlTag.string = LanguageUtils.getText(tagContent.replace("|", "\n"));
const path = girlData.getGrilAvatar(this.category.toString(), this.girlId);
this.refreshCoinNum();
//console.log(path);
assets/bundles/Chat18x/GirlListPopupPanel.prefab
+6 -5
View File
@@ -1624,8 +1624,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 188.31899999999996,
"y": 108.42700000000002,
"x": 200.56799999999996,
"y": 109.65699999999993,
"z": 0
},
"_lrot": {
@@ -1665,8 +1665,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 414.234375,
"height": 83.6
"width": 389.736375,
"height": 150.212
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1766,7 +1766,7 @@
"_target": null,
"_left": 553.9668125000001,
"_right": 37.06381250000004,
"_top": 60.272999999999996,
"_top": 25.737000000000087,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
@@ -3745,6 +3745,7 @@
"__id__": 0
},
"fileId": "a56vp8DEdDloy+JjDTTm7J",
"instance": null,
"targetOverrides": null
}
]