1

assets/scripts/BaseNet.js

@@ -18,167 +18,169 @@
 // game2006-z1-test-n1.cebg.games
 // https://game2006ap-test.kingsome.cn
 export var allBaseNet = {
-	usa: '-z1-test.cebg.games',
+        usa: '-z1-test.cebg.games',
-	japan: '-z2-test.cebg.games',
+        japan: '-z2-test.cebg.games',
-	singapore: '-z3-test.cebg.games',
+        singapore: '-z3-test.cebg.games',
-	turkey: '-z4-test.cebg.games',
+        turkey: '-z4-test.cebg.games',
 };
 
 isDevEnv();
 
 function isDevEnv() {
-	return true;
+        return true;
 }
 
 if (isDevEnv()) {
-	console.log('测试服');
+        console.log('测试服');
-	allBaseNet = {
+        allBaseNet = {
-		usa: '-test.kingsome.cn',
+                usa: '-test.kingsome.cn',
-		japan: '-test.kingsome.cn',
+                japan: '-test.kingsome.cn',
-		singapore: '-test.kingsome.cn',
+                singapore: '-test.kingsome.cn',
-		turkey: '-test-kingsome.cn',
+                turkey: '-test-kingsome.cn',
-	};
+        };
 }
 
 const netIdHash = (function () {
-	const result = {};
+        const result = {};
-	for (let key in allBaseNet) {
+        for (let key in allBaseNet) {
-		const url = allBaseNet[key];
+                const url = allBaseNet[key];
-		const zid = extractZid(url);
+                const zid = extractZid(url);
-		result[zid] = {
+                result[zid] = {
-			name: key,
+                        name: key,
-			url: url,
+                        url: url,
-		};
+                };
-	}
+        }
-	return result;
+        return result;
 })();
 
 const functionNet = {
-	login: 'https://login', // ok
+        login: 'https://login', // ok
-	service: 'https://service', // ok
+        service: 'https://service', // ok
-	gamelog: 'https://gamelog', // ok
+        gamelog: 'https://gamelog', // ok
-	cloud: 'https://cloud', // ok
+        cloud: 'https://cloud', // ok
-	gamemail: 'https://gamemail',
+        gamemail: 'https://gamemail',
-	notify: 'https://notify',
+        notify: 'https://notify',
-	stat: 'https://stat', // ok
+        stat: 'https://stat', // ok
-	relation: 'wss://relation', //ok
+        relation: 'wss://relation', //ok
-	//game
+        //game
-	gameapi: 'https://game2006api',
+        gameapi: 'https://game2006api',
-	game: 'wss://game2006',
+        game: 'wss://game2006',
 };
 
 function getCommonParam() {
-	let os = '';
+        let os = '';
-	if (cc.sys.os == cc.sys.OS_ANDROID) {
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
-		os = 'android';
+                os = 'android';
-	} else if (cc.sys.os == cc.sys.OS_IOS) {
+        } else if (cc.sys.os == cc.sys.OS_IOS) {
-		os = 'ios';
+                os = 'ios';
-	} else {
+        } else {
-		os = cc.sys.os;
+                os = cc.sys.os;
-	}
+        }
-	return (
+        return (
-		'_net=' +
+                '_net=' +
-		encodeURIComponent(localStorage.getItem('currentNet')) +
+                encodeURIComponent(localStorage.getItem('currentNet')) +
-		'&_os=' +
+                '&_os=' +
-		encodeURIComponent(os)
+                encodeURIComponent(os)
-	);
+        );
 }
 
 export function getNormalApiUrl(name) {
-	return (
+        return (
-		functionNet[name] +
+                functionNet[name] +
-		'-z3-test.cebg.games' +
+            (isDevEnv() ? '-test.kingsome.cn' : '-z3-test.cebg.games') +
-		'/webapp/index.php?' +
+                '/webapp/index.php?' +
-		getCommonParam()
+                getCommonParam()
-	);
+        );
 }
 
 export function getExaminingUrl() {
-	return (
+        return (
-		functionNet['login'] +
+          functionNet['login'] +
-		'-z3-test.cebg.games' +
+            (isDevEnv() ? '-test.kingsome.cn' : '-z3-test.cebg.games') +
-		'/webapp/index.php?' +
+                '/webapp/index.php?' +
-		getCommonParam()
+                getCommonParam()
-	);
+        );
 }
 
 export function getRelationUrl() {
-	return (
+        return (
-		functionNet['relation'] + '-z3-test.cebg.games' + '/friend/websocket'
+          functionNet['relation'] +
-	);
+            (isDevEnv() ? '-test.kingsome.cn' : '-z3-test.cebg.games') +
+            '/friend/websocket'
+        );
 }
 
 export function getNodeUrl() {
-	return (
+        return (
-		functionNet['game'].replace('wss://', 'https://') +
+                functionNet['game'].replace('wss://', 'https://') +
-		localStorage.getItem('currentNet') +
+                localStorage.getItem('currentNet') +
-		'/webapp/index.php?' +
+                '/webapp/index.php?' +
-		getCommonParam()
+                getCommonParam()
-	);
+        );
 }
 
 export function extractZid(url) {
-	return Number(url[2]);
+        return Number(url[2]);
 }
 
 export function getZViewName(zid) {
-	switch (zid) {
+        switch (zid) {
-		case 1:
+                case 1:
-			{
+                        {
-				return 'USA';
+                                return 'USA';
-			}
+                        }
-			break;
+                        break;
-		case 2:
+                case 2:
-			{
+                        {
-				return 'Japan';
+                                return 'Japan';
-			}
+                        }
-			break;
+                        break;
-		case 3:
+                case 3:
-			{
+                        {
-				return 'Singapore';
+                                return 'Singapore';
-			}
+                        }
-			break;
+                        break;
-		case 4:
+                case 4:
-			{
+                        {
-				return 'Turkey';
+                                return 'Turkey';
-			}
+                        }
-			break;
+                        break;
-		default:
+                default:
-			{
+                        {
-				return '';
+                                return '';
-			}
+                        }
-			break;
+                        break;
-	}
+        }
 }
 
 export function getCurrentZid() {
-	try {
+        try {
-		return extractZid(localStorage.getItem('currentNet'));
+                return extractZid(localStorage.getItem('currentNet'));
-	} catch (err) {
+        } catch (err) {
-		return 0;
+                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) {
-	if (isDevEnv()) {
+        if (isDevEnv()) {
-		return 'wss://game2006-test.kingsome.cn/websocket';
+                return 'wss://game2006-test.kingsome.cn/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]
-		: extractZid(localStorage.getItem('currentNet'));
+                : extractZid(localStorage.getItem('currentNet'));
-	let urls = teamUuid ? getZUrl(zid) : localStorage.getItem('currentNet');
+        let urls = teamUuid ? getZUrl(zid) : localStorage.getItem('currentNet');
-	urls = urls.split('.');
+        urls = urls.split('.');
-	urls[0] += '-n' + nodeId;
+        urls[0] += '-n' + nodeId;
-	return functionNet['game'] + urls.join('.') + '/websocket';
+        return functionNet['game'] + urls.join('.') + '/websocket';
 }
 
 // game2006   -z1-test-n1   .cebg.games