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

Merge branch 'package_530' of git.kingsome.cn:client/pubgv3 into package_530

Browse Source
This commit is contained in:
guyuanji 2022-05-31 14:30:22 +08:00
commit 2695aeaf24
8 changed files with 1787 additions and 1641 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": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.805834949016571, "x": 0.531652795002319,
"y": 0.805834949016571, "y": 0.531652795002319,
"z": 1 "z": 1
}, },
"_quat": { "_quat": {

3413
assets/res/prefabs/NUI/UINTeam.prefab
View File

File diff suppressed because it is too large Load Diff

2
assets/scripts/Config.js
View File

@ -19,7 +19,7 @@ var MainConfig = {
version: "0.1.0", version: "0.1.0",
isoffical: false, isoffical: false,
viewscale: 0.5, viewscale: 0.5,
packageid: 1, //0 官网apk 1 googleplay aab 2 ios packageid: 1, //0 apk 1 googleplay aab 2 ios
hotfixVersion:"0.5.0" hotfixVersion:"0.5.0"
}; };

1
assets/scripts/UI/UIMain.js
View File

@ -239,7 +239,6 @@ cc.Class({
}, },
multipointout(){ multipointout(){
console.log("多点登录，显示推出")
jcgamelog.addOperation(OperationType.LOGIN, 'multipointout'); jcgamelog.addOperation(OperationType.LOGIN, 'multipointout');
uimanger.showUI(MulitLoginTip.prefabPath) uimanger.showUI(MulitLoginTip.prefabPath)
}, },

2
assets/scripts/UI/guns/guns_info.ts
View File

@ -84,7 +84,7 @@ export default class guns_info extends UIBase {
var limit = data.ceg_uplimit var limit = data.ceg_uplimit
var get = data.today_get_gold var get = data.today_get_gold
this.limitBar.progress =1-(limit-get)/limit this.limitBar.progress =(limit-get)/limit
this.cegget.string = `${data.today_get_gold}/${data.ceg_uplimit}` this.cegget.string = `${data.today_get_gold}/${data.ceg_uplimit}`
} }

2
assets/scripts/UI/guns/guns_single.ts
View File

@ -29,7 +29,7 @@ export class guns_single extends cc.Component {
var limit = data.ceg_uplimit var limit = data.ceg_uplimit
var get = data.today_get_gold var get = data.today_get_gold
this.limitBar.progress =1-(limit-get)/limit this.limitBar.progress =(limit-get)/limit
this.cegget.string = `${data.today_get_gold}/${data.ceg_uplimit}` this.cegget.string = `${data.today_get_gold}/${data.ceg_uplimit}`
this.node.active = true; this.node.active = true;

2
assets/scripts/UI/hero/UIHeroinfo.ts
View File

@ -106,7 +106,7 @@ export class UIHeroinfo extends UIBase {
var limit = data.ceg_uplimit var limit = data.ceg_uplimit
var get = data.today_get_gold var get = data.today_get_gold
this.limitBar.progress =1-(limit-get)/limit this.limitBar.progress =(limit-get)/limit
this.cegget.string = `${data.today_get_gold}/${data.ceg_uplimit}` this.cegget.string = `${data.today_get_gold}/${data.ceg_uplimit}`
this.hero_id = data.hero_id; this.hero_id = data.hero_id;

2
assets/scripts/UI/hero/herochoseone.js
View File

@ -50,7 +50,7 @@ cc.Class({
var limit = v.ceg_uplimit var limit = v.ceg_uplimit
var get = v.today_get_gold var get = v.today_get_gold
this.limitBar.progress =1-(limit-get)/limit this.limitBar.progress =(limit-get)/limit
this.cegget.string = `${v.today_get_gold}/${v.ceg_uplimit}` this.cegget.string = `${v.today_get_gold}/${v.ceg_uplimit}`