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

Compare commits

base: client:0.8.0
Branches Tags
client:master
client:2.4.6
client:release-p3-h0.8.0
client:release-p3-h0.7.0
client:zhuguoqing/dev-v4
client:liuyun
client:JIJI-0.4.0
client:maybe0.6.0
client:test0.6.0
client:zhuguoqing/dev-v3
client:release_6.1_0.6.0
client:package_530
client:release_520_0.1.0
client:gujiji
client:0.8.0
client:package-0.3.0-hotfix-0.7.0
client:6.8-0.7.0
client:package_0.2.0_hotfix_0.6.0
client:6.1-0.6.0
client:5.27-0.5.0
client:5.27-0.4.0
client:5.26-0.2.0
client:5.26-0.3.0
client:new-version-0.1.0
client:0.1.0
client:0.3.0
client:0.2.0
...
compare: client:master
Branches Tags
client:2.4.6
client:master
client:release-p3-h0.8.0
client:release-p3-h0.7.0
client:zhuguoqing/dev-v4
client:liuyun
client:JIJI-0.4.0
client:maybe0.6.0
client:test0.6.0
client:zhuguoqing/dev-v3
client:release_6.1_0.6.0
client:package_530
client:release_520_0.1.0
client:gujiji
client:0.8.0
client:package-0.3.0-hotfix-0.7.0
client:6.8-0.7.0
client:package_0.2.0_hotfix_0.6.0
client:6.1-0.6.0
client:5.27-0.5.0
client:5.27-0.4.0
client:5.26-0.2.0
client:5.26-0.3.0
client:new-version-0.1.0
client:0.1.0
client:0.3.0
client:0.2.0

4 Commits
0.8.0 ... master

Author SHA1 Message Date
zhuguoqing
bc2c1a9b5f Merge branch 'release-p3-h0.8.0' 2022-06-16 19:14:19 +08:00
guoqing.zhu
d1234216f3 update 2022-06-16 16:47:59 +08:00
guoqing.zhu
e15774ba3b add lock 2022-06-16 16:10:45 +08:00
zhuguoqing
14785fa079 update buildteamplate 2022-05-28 23:17:36 +08:00
3 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
assets/scripts/Config.js
View File

@ -20,7 +20,7 @@ var MainConfig = {
isoffical: false, isoffical: false,
viewscale: 0.5, viewscale: 0.5,
packageid: 0, //0 apk 1 googleplay aab 2 ios packageid: 0, //0 apk 1 googleplay aab 2 ios
hotfixVersion: '0.8.0', hotfixVersion: '0.9.0',
}; };
export var isTest = true; export var isTest = true;

2
assets/scripts/UI/battlematch/UIChoseHero.js
View File

@ -273,7 +273,7 @@ cc.Class({
herolist = data.hero_list; herolist = data.hero_list;
for (var i = 0; i < herolist.length; i++) { for (var i = 0; i < herolist.length; i++) {
var element = herolist[i]; var element = herolist[i];
if (element.lock_type != 3) { if (element.lock_type == 0) {
this.allHeroUUID.push(element.hero_uniid); this.allHeroUUID.push(element.hero_uniid);
this.allHeroID.push(parseInt(element.hero_id)); this.allHeroID.push(parseInt(element.hero_id));
this.heroDetails.push(herolist[i]); this.heroDetails.push(herolist[i]);

2
assets/scripts/UI/task/mission_chooseDetail.js
View File

@ -112,7 +112,7 @@ cc.Class({
this.allHasGotHero.includes( this.allHasGotHero.includes(
element.hero_uniid.toString() element.hero_uniid.toString()
) || ) ||
element.lock_type == 3 element.lock_type != 0
) { ) {
node.getComponent('wantedHero').showCover(); node.getComponent('wantedHero').showCover();
} }