client/pubgv3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: client:master
Branches Tags
client:master
client:2.4.6
client:release-p3-h0.8.0
client:release-p3-h0.7.0
client:zhuguoqing/dev-v4
client:liuyun
client:JIJI-0.4.0
client:maybe0.6.0
client:test0.6.0
client:zhuguoqing/dev-v3
client:release_6.1_0.6.0
client:package_530
client:release_520_0.1.0
client:gujiji
client:0.8.0
client:package-0.3.0-hotfix-0.7.0
client:6.8-0.7.0
client:package_0.2.0_hotfix_0.6.0
client:6.1-0.6.0
client:5.27-0.5.0
client:5.27-0.4.0
client:5.26-0.2.0
client:5.26-0.3.0
client:new-version-0.1.0
client:0.1.0
client:0.3.0
client:0.2.0
...
pull from: client:zhuguoqing/dev-v3
Branches Tags
client:2.4.6
client:master
client:release-p3-h0.8.0
client:release-p3-h0.7.0
client:zhuguoqing/dev-v4
client:liuyun
client:JIJI-0.4.0
client:maybe0.6.0
client:test0.6.0
client:zhuguoqing/dev-v3
client:release_6.1_0.6.0
client:package_530
client:release_520_0.1.0
client:gujiji
client:0.8.0
client:package-0.3.0-hotfix-0.7.0
client:6.8-0.7.0
client:package_0.2.0_hotfix_0.6.0
client:6.1-0.6.0
client:5.27-0.5.0
client:5.27-0.4.0
client:5.26-0.2.0
client:5.26-0.3.0
client:new-version-0.1.0
client:0.1.0
client:0.3.0
client:0.2.0

2 Commits
master ... zhuguoqing

Author SHA1 Message Date
zhuguoqing
adc55b3cc1 update 2022-06-09 03:07:15 +08:00
guoqing.zhu
0e6f3eb56e Update LoginScene.fire 2022-06-08 13:33:38 +08:00
3 changed files with 21 additions and 501 deletions
Show Stats Expand all files Collapse all files

6
assets/LoginScene.fire
View File

@ -47,8 +47,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.5279307895527016, "x": 0.5859375,
"y": 0.5279307895527016, "y": 0.5859375,
"z": 1 "z": 1
}, },
"_quat": { "_quat": {
@ -13997,7 +13997,7 @@
"__id__": 411 "__id__": 411
} }
], ],
"_active": false, "_active": true,
"_level": 2, "_level": 2,
"_components": [ "_components": [
{ {

504
assets/res/prefabs/NUI/UIMain.prefab
View File

File diff suppressed because it is too large Load Diff

12
assets/scripts/UI/UIMain.js
View File

@ -188,12 +188,12 @@ cc.Class({
onLoad() { onLoad() {
cc.audioEngine.stopAll(); cc.audioEngine.stopAll();
NetManage.getOptionSwitch((res) => { // NetManage.getOptionSwitch((res) => {
console.log('get switch' + JSON.stringify(res)); // console.log('get switch' + JSON.stringify(res));
if (res.open_list.includes(1)) { // if (res.open_list.includes(1)) {
this.btn_task.active = true; // this.btn_task.active = true;
} // }
}); // });
}, },
start() { start() {
//test //test