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

update

Browse Source
This commit is contained in:
zhuguoqing 2022-05-24 18:41:10 +08:00
parent 8ee5c7a5a3
commit 074b0262e6
6 changed files with 80 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/LoginScene.fire
View File

@ -47,8 +47,8 @@
},
"_scale": {
"__type__": "cc.Vec3",
"x": 0.5703125,
"y": 0.5703125,
"x": 0.607421875,
"y": 0.607421875,
"z": 1
},
"_quat": {

6
assets/resources/prefabs/tips/pb_whitelist.prefab
View File

@ -389,7 +389,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 504.64,
"width": 613.68,
"height": 80
},
"_anchorPoint": {
@ -432,8 +432,8 @@
},
"_enabled": true,
"_useOriginalSize": false,
"_string": "UNABLE TO PLAY",
"_N$string": "UNABLE TO PLAY",
"_string": "The Battleground is full",
"_N$string": "The Battleground is full",
"_fontSize": 60,
"_lineHeight": 80,
"_enableWrapText": true,

140
assets/scripts/BaseNet.js
View File

@ -24,18 +24,18 @@ export var allBaseNet = {
turkey: '-z4-test.cebg.games',
};
const netIdHash = function () {
const result = {};
for (let key in allBaseNet) {
const url = allBaseNet[key];
const zid = extractZid(url);
result[zid] = {
'name': key,
'url': url
};
}
return result;
}();
const netIdHash = (function () {
const result = {};
for (let key in allBaseNet) {
const url = allBaseNet[key];
const zid = extractZid(url);
result[zid] = {
name: key,
url: url,
};
}
return result;
})();
const functionNet = {
login: 'https://login', // ok
@ -52,16 +52,20 @@ const functionNet = {
};
function getCommonParam() {
let os = '';
if (cc.sys.os == cc.sys.OS_ANDROID) {
os = 'android';
} else if (cc.sys.os == cc.sys.OS_IOS) {
os = 'ios';
} else {
os = cc.sys.os;
}
return '_net=' + encodeURIComponent(localStorage.getItem('currentNet')) +
'&_os=' + encodeURIComponent(os);
let os = '';
if (cc.sys.os == cc.sys.OS_ANDROID) {
os = 'android';
} else if (cc.sys.os == cc.sys.OS_IOS) {
os = 'ios';
} else {
os = cc.sys.os;
}
return (
'_net=' +
encodeURIComponent(localStorage.getItem('currentNet')) +
'&_os=' +
encodeURIComponent(os)
);
}
export function getNormalApiUrl(name) {
@ -83,11 +87,9 @@ export function getExaminingUrl() {
}
export function getRelationUrl() {
return (
functionNet['relation'] +
'-z3-test.cebg.games' +
'/friend/websocket'
);
return (
functionNet['relation'] + '-z3-test.cebg.games' + '/friend/websocket'
);
}
export function getNodeUrl() {
@ -100,62 +102,64 @@ export function getNodeUrl() {
}
export function extractZid(url) {
return Number(url[2]);
return Number(url[2]);
}
export function getZViewName(zid) {
switch (zid) {
case 1:
{
return 'USA';
}
break;
case 2:
{
return 'Japan';
}
break;
case 3:
{
return 'Singapore';
}
break;
case 4:
{
return 'Turkey';
}
break;
default:
{
return '';
}
break;
}
switch (zid) {
case 1:
{
return 'USA';
}
break;
case 2:
{
return 'Japan';
}
break;
case 3:
{
return 'Singapore';
}
break;
case 4:
{
return 'Turkey';
}
break;
default:
{
return '';
}
break;
}
}
export function getCurrentZid() {
try {
return extractZid(localStorage.getItem('currentNet'));
} catch (err) {
return 0;
}
try {
return extractZid(localStorage.getItem('currentNet'));
} catch (err) {
return 0;
}
}
function getZUrl(zid) {
return netIdHash[zid]['url'];
return netIdHash[zid]['url'];
}
function getZName(zid) {
return netIdHash[zid]['name'];
return netIdHash[zid]['name'];
}
export function getGameServer(teamUuid) {
const nodeId = teamUuid ? teamUuid.split('_')[0] : cc.SDKManage.NodeId;
const zid = teamUuid ? teamUuid.split('_')[1] : extractZid(localStorage.getItem('currentNet'));
let urls = teamUuid ? getZUrl(zid) : localStorage.getItem('currentNet');
urls = urls.split('.');
urls[0] += '-n' + nodeId;
return functionNet['game'] + urls.join('.') + '/websocket';
const nodeId = teamUuid ? teamUuid.split('_')[0] : cc.SDKManage.NodeId;
const zid = teamUuid
? teamUuid.split('_')[1]
: extractZid(localStorage.getItem('currentNet'));
let urls = teamUuid ? getZUrl(zid) : localStorage.getItem('currentNet');
urls = urls.split('.');
urls[0] += '-n' + nodeId;
return functionNet['game'] + urls.join('.') + '/websocket';
}
// game2006 -z1-test-n1 .cebg.games

2
hotupdate/project.manifest
View File

File diff suppressed because one or more lines are too long

2
hotupdate/version.manifest
View File

@ -1 +1 @@
{"packageUrl":"https://test.kingsome.cn/game2006/test/slim/","remoteManifestUrl":"https://test.kingsome.cn/game2006/test/slim/project.manifest","remoteVersionUrl":"https://test.kingsome.cn/game2006/test/slim/version.manifest","version":"0.1.0"}
{"packageUrl":"https://test.kingsome.cn/game2006/test/slim/","remoteManifestUrl":"https://test.kingsome.cn/game2006/test/slim/project.manifest","remoteVersionUrl":"https://test.kingsome.cn/game2006/test/slim/version.manifest","version":"0.2.0"}

2
settings/builder.json
View File

@ -14,7 +14,7 @@
"orientation": "portrait",
"subContext": ""
},
"encryptJs": true,
"encryptJs": false,
"excludeScenes": [
"91f1147b-d337-4f4f-a5bd-0db14510fd88"
],