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

View File

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