mushroom
/
squidGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

多语言，登录完善

This commit is contained in:
xukuan 2025-02-18 09:45:06 +08:00
parent 933a83d2f6
commit fff6e28ac1
9 changed files with 5616 additions and 5426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
tgx-games-client/assets/module_arean/lobby_arean.scene
View File

@ -32,7 +32,7 @@
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 812 "__id__": 816
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -63,7 +63,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 813 "__id__": 817
}, },
"_id": "7422f764-9016-4c05-8d7f-114d7b8ce093" "_id": "7422f764-9016-4c05-8d7f-114d7b8ce093"
}, },
@ -7042,16 +7042,16 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 808 "__id__": 812
}, },
{ {
"__id__": 809 "__id__": 813
}, },
{ {
"__id__": 810 "__id__": 814
}, },
{ {
"__id__": 811 "__id__": 815
} }
], ],
"_prefab": null, "_prefab": null,
@ -7100,16 +7100,16 @@
"__id__": 663 "__id__": 663
}, },
{ {
"__id__": 795 "__id__": 799
}, },
{ {
"__id__": 800 "__id__": 804
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 807 "__id__": 811
} }
], ],
"_prefab": null, "_prefab": null,
@ -7252,10 +7252,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 793 "__id__": 797
}, },
{ {
"__id__": 794 "__id__": 798
} }
], ],
"_prefab": null, "_prefab": null,
@ -7618,8 +7618,8 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 168, "width": 167.9832793445122,
"height": 52.92 "height": 52.92000000000001
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -7651,7 +7651,7 @@
"_string": "开始游戏", "_string": "开始游戏",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 42, "_actualFontSize": 50.225,
"_fontSize": 42, "_fontSize": 42,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 42, "_lineHeight": 42,
@ -8966,22 +8966,22 @@
"__id__": 738 "__id__": 738
}, },
{ {
"__id__": 770 "__id__": 774
}, },
{ {
"__id__": 780 "__id__": 784
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 790 "__id__": 794
}, },
{ {
"__id__": 791 "__id__": 795
}, },
{ {
"__id__": 792 "__id__": 796
} }
], ],
"_prefab": null, "_prefab": null,
@ -9603,7 +9603,7 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 153.6015625, "width": 153.59349309941203,
"height": 36.76 "height": 36.76
}, },
"_anchorPoint": { "_anchorPoint": {
@ -9636,7 +9636,7 @@
"_string": "player9527", "_string": "player9527",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 26, "_actualFontSize": 31.091666666666665,
"_fontSize": 26, "_fontSize": 26,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 26, "_lineHeight": 26,
@ -10308,6 +10308,12 @@
}, },
{ {
"__id__": 768 "__id__": 768
},
{
"__id__": 770
},
{
"__id__": 772
} }
], ],
"removedComponents": [] "removedComponents": []
@ -10562,6 +10568,46 @@
"3cfhI2tDpKPI4CDE6SuCAa" "3cfhI2tDpKPI4CDE6SuCAa"
] ]
}, },
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 771
},
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
"width": 15.741341089122388,
"height": 32.76
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"0aVey8bvNN37L9ZCcg4tdP"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 773
},
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
"width": 15.741341089122388,
"height": 32.76
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"bcYQmP705NcpLKJr+mPORI"
]
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "BtnSetting", "_name": "BtnSetting",
@ -10572,19 +10618,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 771 "__id__": 775
}, },
{ {
"__id__": 774 "__id__": 778
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 777 "__id__": 781
}, },
{ {
"__id__": 778 "__id__": 782
} }
], ],
"_prefab": null, "_prefab": null,
@ -10623,16 +10669,16 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 770 "__id__": 774
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 772 "__id__": 776
}, },
{ {
"__id__": 773 "__id__": 777
} }
], ],
"_prefab": null, "_prefab": null,
@ -10671,7 +10717,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 771 "__id__": 775
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -10693,7 +10739,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 771 "__id__": 775
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -10732,16 +10778,16 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 770 "__id__": 774
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 775 "__id__": 779
}, },
{ {
"__id__": 776 "__id__": 780
} }
], ],
"_prefab": null, "_prefab": null,
@ -10780,7 +10826,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 774 "__id__": 778
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -10802,7 +10848,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 774 "__id__": 778
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -10867,7 +10913,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 770 "__id__": 774
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -10889,13 +10935,13 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 770 "__id__": 774
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 779 "__id__": 783
} }
], ],
"_interactable": true, "_interactable": true,
@ -10947,7 +10993,7 @@
"_duration": 0.3, "_duration": 0.3,
"_zoomScale": 0.95, "_zoomScale": 0.95,
"_target": { "_target": {
"__id__": 770 "__id__": 774
}, },
"_id": "1fDwzZlRRL+L1mioVLYh2y" "_id": "1fDwzZlRRL+L1mioVLYh2y"
}, },
@ -10971,19 +11017,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 781 "__id__": 785
}, },
{ {
"__id__": 784 "__id__": 788
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 787 "__id__": 791
}, },
{ {
"__id__": 788 "__id__": 792
} }
], ],
"_prefab": null, "_prefab": null,
@ -11022,16 +11068,16 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 780 "__id__": 784
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 782 "__id__": 786
}, },
{ {
"__id__": 783 "__id__": 787
} }
], ],
"_prefab": null, "_prefab": null,
@ -11070,7 +11116,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 781 "__id__": 785
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11092,7 +11138,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 781 "__id__": 785
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11131,16 +11177,16 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 780 "__id__": 784
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 785 "__id__": 789
}, },
{ {
"__id__": 786 "__id__": 790
} }
], ],
"_prefab": null, "_prefab": null,
@ -11179,7 +11225,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 784 "__id__": 788
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11201,7 +11247,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 784 "__id__": 788
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11266,7 +11312,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 780 "__id__": 784
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11288,13 +11334,13 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 780 "__id__": 784
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 789 "__id__": 793
} }
], ],
"_interactable": true, "_interactable": true,
@ -11346,7 +11392,7 @@
"_duration": 0.3, "_duration": 0.3,
"_zoomScale": 0.95, "_zoomScale": 0.95,
"_target": { "_target": {
"__id__": 780 "__id__": 784
}, },
"_id": "5eL/0/AUtGIJHtCqKLbkUc" "_id": "5eL/0/AUtGIJHtCqKLbkUc"
}, },
@ -11510,13 +11556,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 796 "__id__": 800
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 799 "__id__": 803
} }
], ],
"_prefab": null, "_prefab": null,
@ -11555,16 +11601,16 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 795 "__id__": 799
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 797 "__id__": 801
}, },
{ {
"__id__": 798 "__id__": 802
} }
], ],
"_prefab": null, "_prefab": null,
@ -11603,7 +11649,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 796 "__id__": 800
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11625,7 +11671,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 796 "__id__": 800
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11675,7 +11721,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 795 "__id__": 799
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11701,16 +11747,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 801 "__id__": 805
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 805 "__id__": 809
}, },
{ {
"__id__": 806 "__id__": 810
} }
], ],
"_prefab": null, "_prefab": null,
@ -11749,19 +11795,19 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 800 "__id__": 804
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 802 "__id__": 806
}, },
{ {
"__id__": 803 "__id__": 807
}, },
{ {
"__id__": 804 "__id__": 808
} }
], ],
"_prefab": null, "_prefab": null,
@ -11800,7 +11846,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 801 "__id__": 805
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11822,7 +11868,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 801 "__id__": 805
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11861,7 +11907,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 801 "__id__": 805
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11891,7 +11937,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 800 "__id__": 804
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -11913,7 +11959,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 800 "__id__": 804
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@ -12038,7 +12084,7 @@
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"loadingNode": { "loadingNode": {
"__id__": 800 "__id__": 804
}, },
"heroSpineNode": null, "heroSpineNode": null,
"fightModel": { "fightModel": {
@ -12092,29 +12138,29 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 814
},
"shadows": {
"__id__": 815
},
"_skybox": {
"__id__": 816
},
"fog": {
"__id__": 817
},
"octree": {
"__id__": 818 "__id__": 818
}, },
"skin": { "shadows": {
"__id__": 819 "__id__": 819
}, },
"lightProbeInfo": { "_skybox": {
"__id__": 820 "__id__": 820
}, },
"postSettings": { "fog": {
"__id__": 821 "__id__": 821
}, },
"octree": {
"__id__": 822
},
"skin": {
"__id__": 823
},
"lightProbeInfo": {
"__id__": 824
},
"postSettings": {
"__id__": 825
},
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false
}, },

7
tgx-games-client/assets/module_arean/scripts/AreanLobbyScene.ts
View File

@ -83,6 +83,7 @@ export class AreanLobbyScene extends Component {
if (AreanLobbyScene.isLoaded) { if (AreanLobbyScene.isLoaded) {
AreanNetMgr.inst.initNetMsgHandlers(); AreanNetMgr.inst.initNetMsgHandlers();
await AreanNetMgr.inst.sendMsg_GetUserData(); await AreanNetMgr.inst.sendMsg_GetUserData();
console.log("this == ",this,this.loadingNode);
this.loadingNode.active = true; this.loadingNode.active = true;
await this.loadData(); await this.loadData();
} else { } else {
@ -241,9 +242,9 @@ export class AreanLobbyScene extends Component {
// 刷新战斗模式名字 // 刷新战斗模式名字
private _updateFightModelName() : void{ private _updateFightModelName() : void{
let curModel = UserLocalCache.inst.fightModel; // let curModel = UserLocalCache.inst.fightModel;
this.fightModel.string = curModel === EFightModel.Match ? "匹配" : "排位"; // this.fightModel.string = curModel === EFightModel.Match ? "匹配" : "排位";
this.fightModel2.string = curModel === EFightModel.Match ? EFightModel.Match : EFightModel.Ranking; // this.fightModel2.string = curModel === EFightModel.Match ? EFightModel.Match : EFightModel.Ranking;
} }

2
tgx-games-client/assets/module_arean/scripts/DataConfig/Managers/LanguageDataManager.ts
View File

@ -29,6 +29,6 @@ export default class LanguageDataManager {
}else{ }else{
console.log("没有找到对应的key:" + key) console.log("没有找到对应的key:" + key)
} }
return str; return str || key;
} }
} }

14
tgx-games-client/assets/module_arean/scripts/UserHead.ts
View File

@ -23,12 +23,6 @@ export class UserHead extends Component {
@property(Label) @property(Label)
lblCoin: Label; lblCoin: Label;
@property(Sprite)
danImg: Sprite;
@property(Label)
danName: Label;
start() { start() {
director.on(RoomEvent.DanUpdate, this.updateDanImg.bind(this), this); director.on(RoomEvent.DanUpdate, this.updateDanImg.bind(this), this);
director.on("AreanEvent.UpdateHeadOrFrame", this.updateHeadOrFrame.bind(this), this); director.on("AreanEvent.UpdateHeadOrFrame", this.updateHeadOrFrame.bind(this), this);
@ -41,7 +35,7 @@ export class UserHead extends Component {
async onHeadImgClicked() { async onHeadImgClicked() {
// let info = await UserMgr.inst.rpc_GetUserInfo(UserMgr.inst.userId); // let info = await UserMgr.inst.rpc_GetUserInfo(UserMgr.inst.userId);
// tgxUIMgr.inst.showUI(UIUserInfo, null, null, info); // tgxUIMgr.inst.showUI(UIUserInfo, null, null, info);
tgxUIMgr.inst.showUI(UIChooseHeadLayer); // tgxUIMgr.inst.showUI(UIChooseHeadLayer);
} }
onDestroy(){ onDestroy(){
@ -59,12 +53,6 @@ export class UserHead extends Component {
} }
public updateDanImg() { public updateDanImg() {
// let danInfo = CommonFun.getInstance().calDanData(UserMgr.inst.userInfo.danGrading);
// let sp : SpriteFrame = resLoader.getSpriteFrame('danIcon/dan_' + danInfo.curDan,ModuleDef.BASIC);
// if(sp) this.danImg.spriteFrame = sp;
//
// let data = areanMgr.cfgMgr.DanData.getData(danInfo.curDan);
// if(data) this.danName.string = data.danName;
} }
} }

688
tgx-games-client/assets/module_arean/ui_mail/ui_mail.prefab
View File

File diff suppressed because it is too large Load Diff

546
tgx-games-client/assets/module_arean/ui_settings/ui_settings.prefab
View File

File diff suppressed because it is too large Load Diff

7
tgx-games-client/assets/module_basic/scripts/LobbyScene.ts
View File

@ -94,8 +94,8 @@ export class LobbyScene extends Component {
tgxUIAlert.show('用户名已被使用！'); tgxUIAlert.show('用户名已被使用！');
} }
let account = CommonFun.getInstance().generateAccount(); let account = CommonFun.getInstance().generateAccount();
let pass = "123456"; let pass = password || "123456";
await this.doRegister(account,password) await this.doRegister(account,pass);
return; return;
} }
await this.doLogin(account,password); await this.doLogin(account,password);
@ -113,13 +113,14 @@ export class LobbyScene extends Component {
} }
private async _checkAccount(): Promise<void> { private async _checkAccount(): Promise<void> {
localStorage.clear(); // localStorage.clear();
let account = UserLocalCache.inst.account; let account = UserLocalCache.inst.account;
let password = UserLocalCache.inst.password; let password = UserLocalCache.inst.password;
if (account && password) { if (account && password) {
await this.doLogin(account,password) await this.doLogin(account,password)
} else { } else {
account = CommonFun.getInstance().generateAccount(); account = CommonFun.getInstance().generateAccount();
password = "123456";
console.log("随机生成的账号 === ", account); console.log("随机生成的账号 === ", account);
await this.doRegister(account,password); await this.doRegister(account,password);
} }

2
tgx-games-client/assets/module_basic/scripts/UserMgr.ts
View File

@ -196,7 +196,7 @@ export class UserMgr {
if (ret.isSucc) { if (ret.isSucc) {
this._userInfo.name = ret.res.name; this._userInfo.name = ret.res.name;
this._userInfo.visualId = ret.res.visualId; this._userInfo.visualId = ret.res.visualId;
await tgxSceneUtil.loadScene(SceneDef.LOBBY_AREAN); tgxSceneUtil.loadScene(SceneDef.LOBBY_AREAN);
} }
return ret; return ret;
} }

BIN
tgx-games-client/settings/logo-diy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 130 KiB