diff --git a/assets/res/prefabs/NUI/UIGuninfo.prefab b/assets/res/prefabs/NUI/UIGuninfo.prefab index 2001447e..c3271663 100644 --- a/assets/res/prefabs/NUI/UIGuninfo.prefab +++ b/assets/res/prefabs/NUI/UIGuninfo.prefab @@ -6870,7 +6870,7 @@ "_position": { "__type__": "cc.Vec3", "x": 0, - "y": 71, + "y": 65, "z": 0 }, "_scale": { diff --git a/assets/scripts/BaseNet.js b/assets/scripts/BaseNet.js index b16f239b..a433d86e 100644 --- a/assets/scripts/BaseNet.js +++ b/assets/scripts/BaseNet.js @@ -1,3 +1,5 @@ +import { isTest, mainConfig } from "./Config"; + export var allBaseNet = { usa: '-z1-test.cebg.games', japan: '-z2-test.cebg.games', @@ -5,21 +7,23 @@ export var allBaseNet = { turkey: '-z4-test.cebg.games', }; + +isDevEnv() +isExamining() + function isDevEnv() { - return true; - // var toreturn = false - // if(cc.debug){ - // return true; - // } - // return false + return false; } function isExamining() { - //!isDevEnv() and (ios or aabb) and (serverSwitch.examining) - if (isDevEnv()){ - return false; - } - return true; + console.log("currentpackage:"+mainConfig.packageid) + if(!isDevEnv() && isTest && mainConfig.packageid!=0 ){ + console.log("test") + return true + }else{ + console.log("no test") + return false + } } function getDevEnvUrlSuffix() { diff --git a/assets/scripts/Config.js b/assets/scripts/Config.js index e907d48a..7d15405f 100644 --- a/assets/scripts/Config.js +++ b/assets/scripts/Config.js @@ -16,10 +16,10 @@ var EmoteConfig = { var HairColor = {}; var MainConfig = { - version: "0.1.0", + version: "0.2.0", isoffical: false, viewscale: 0.5, - packageid: 1, //0 apk 1 googleplay aab 2 ios + packageid: 0, //0 apk 1 googleplay aab 2 ios hotfixVersion:"0.5.0" }; @@ -31,3 +31,4 @@ var Config = { }; module.exports = Config; +export var mainConfig = MainConfig \ No newline at end of file diff --git a/assets/scripts/UI/guns/guns_single.ts b/assets/scripts/UI/guns/guns_single.ts index 5c81c13e..961e24f8 100644 --- a/assets/scripts/UI/guns/guns_single.ts +++ b/assets/scripts/UI/guns/guns_single.ts @@ -22,10 +22,6 @@ export class guns_single extends cc.Component { this.node.active = false; return; } - - // console.log(data) - - // var limit = data.ceg_uplimit var get = data.today_get_gold