Compare commits

...

1 Commits

Author SHA1 Message Date
zhuguoqing
786d387ef9 tmp 2022-06-09 13:27:11 +08:00
4 changed files with 32 additions and 39 deletions

View File

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

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
import { isTest, mainConfig } from "./Config";
import { isTest, mainConfig } from './Config';
export var allBaseNet = {
usa: '-z1-test.cebg.games',
@ -7,42 +7,38 @@ export var allBaseNet = {
turkey: '-z4-test.cebg.games',
};
isDevEnv()
isExamining()
isDevEnv();
isExamining();
function isDevEnv() {
return false;
}
function isExamining() {
if(!isDevEnv() && isTest && mainConfig.packageid!=0 ){
return true
}else{
return false
if (!isDevEnv() && isTest && mainConfig.packageid != 0) {
return true;
} else {
return false;
}
}
function getDevEnvUrlSuffix() {
//'-test.kingsome.cn'
return atob('LXRlc3Qua2luZ3NvbWUuY24=');
//'-test.kingsome.cn'
return atob('LXRlc3Qua2luZ3NvbWUuY24=');
}
function getExaminingUrlSuffix() {
return '-test.cebg.games';
return '-test.cebg.games';
}
function getUrlSuffix() {
let urlSuffix = '-z3-test.cebg.games';
if (isDevEnv()) {
urlSuffix = getDevEnvUrlSuffix();
} else if (isExamining()) {
urlSuffix = getExaminingUrlSuffix();
}
return urlSuffix;
let urlSuffix = '-z3-test.cebg.games';
if (isDevEnv()) {
urlSuffix = getDevEnvUrlSuffix();
} else if (isExamining()) {
urlSuffix = getExaminingUrlSuffix();
}
return urlSuffix;
}
const netIdHash = (function () {
@ -85,11 +81,11 @@ function getCommonParam() {
'_net=' +
encodeURIComponent(localStorage.getItem('currentNet')) +
'&_os=' +
encodeURIComponent(os) +
encodeURIComponent(os) +
'&_version=' +
encodeURIComponent(mainConfig.version) +
'&_hotfixversion=' +
encodeURIComponent(mainConfig.hotfixVersion)+
encodeURIComponent(mainConfig.hotfixVersion) +
'&_packageid=' +
encodeURIComponent(mainConfig.packageid)
);
@ -98,7 +94,7 @@ function getCommonParam() {
export function getNormalApiUrl(name) {
return (
functionNet[name] +
getUrlSuffix() +
getUrlSuffix() +
'/webapp/index.php?' +
getCommonParam()
);
@ -114,11 +110,7 @@ export function getExaminingUrl() {
}
export function getRelationUrl() {
return (
functionNet['relation'] +
getUrlSuffix() +
'/friend/websocket'
);
return functionNet['relation'] + getUrlSuffix() + '/friend/websocket';
}
export function getNodeUrl() {
@ -185,12 +177,12 @@ function getZName(zid) {
}
export function getGameServer(teamUuid) {
if (isDevEnv()) {
return 'wss://game2006' + getDevEnvUrlSuffix() + '/websocket';
}
if (isExamining()) {
return 'wss://game2006' + getExaminingUrlSuffix() + '/websocket';
}
if (isDevEnv()) {
return 'wss://game2006' + getDevEnvUrlSuffix() + '/websocket';
}
if (isExamining()) {
return 'wss://game2006' + getExaminingUrlSuffix() + '/websocket';
}
const nodeId = teamUuid ? teamUuid.split('_')[0] : cc.SDKManage.NodeId;
const zid = teamUuid
? teamUuid.split('_')[1]

View File

@ -30,12 +30,13 @@
"group-list": [
"default"
],
"last-module-event-record-time": 1653628500757,
"last-module-event-record-time": 1654750705784,
"simulator-orientation": false,
"simulator-resolution": {
"height": 640,
"width": 960
},
"start-scene": "current",
"use-customize-simulator": true,
"use-project-simulator-setting": false
}