Merge branch 'package_530' of git.kingsome.cn:client/pubgv3 into package_530
This commit is contained in:
commit
2695aeaf24
@ -47,8 +47,8 @@
|
||||
},
|
||||
"_scale": {
|
||||
"__type__": "cc.Vec3",
|
||||
"x": 0.805834949016571,
|
||||
"y": 0.805834949016571,
|
||||
"x": 0.531652795002319,
|
||||
"y": 0.531652795002319,
|
||||
"z": 1
|
||||
},
|
||||
"_quat": {
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -19,7 +19,7 @@ var MainConfig = {
|
||||
version: "0.1.0",
|
||||
isoffical: false,
|
||||
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"
|
||||
};
|
||||
|
||||
|
@ -239,7 +239,6 @@ cc.Class({
|
||||
},
|
||||
|
||||
multipointout(){
|
||||
console.log("多点登录,显示推出")
|
||||
jcgamelog.addOperation(OperationType.LOGIN, 'multipointout');
|
||||
uimanger.showUI(MulitLoginTip.prefabPath)
|
||||
},
|
||||
|
@ -84,7 +84,7 @@ export default class guns_info extends UIBase {
|
||||
var limit = data.ceg_uplimit
|
||||
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}`
|
||||
}
|
||||
|
||||
|
@ -29,7 +29,7 @@ export class guns_single extends cc.Component {
|
||||
var limit = data.ceg_uplimit
|
||||
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.node.active = true;
|
||||
|
@ -106,7 +106,7 @@ export class UIHeroinfo extends UIBase {
|
||||
var limit = data.ceg_uplimit
|
||||
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.hero_id = data.hero_id;
|
||||
|
@ -50,7 +50,7 @@ cc.Class({
|
||||
var limit = v.ceg_uplimit
|
||||
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}`
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user