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

update

Browse Source
This commit is contained in:
guoqing.zhu 2022-06-14 20:30:09 +08:00
parent 182d1a2d17
commit 4c3bc991e2
12 changed files with 8760 additions and 4135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
assets/res/prefabs/NUI/JIJIJI.fire
View File

@ -68,8 +68,8 @@
},
"_scale": {
"__type__": "cc.Vec3",
"x": 0.5050207566484387,
"y": 0.5050207566484387,
"x": 0.9824218749999979,
"y": 0.9824218749999979,
"z": 1
},
"_quat": {
@ -256,7 +256,7 @@
"__id__": 14
}
],
"_active": true,
"_active": false,
"_level": 2,
"_components": [
{
@ -4995,6 +4995,8 @@
"pveget": {
"__id__": 87
},
"qualityStar": null,
"lb_lv": null,
"_id": "fcsTA+XXVPsYegEGiIDFLE"
},
{
@ -9552,6 +9554,8 @@
"pveget": {
"__id__": 185
},
"qualityStar": null,
"lb_lv": null,
"_id": "b4oSs+At9Pib2iL+qD+aXz"
},
{
@ -17325,6 +17329,8 @@
"pveget": {
"__id__": 351
},
"qualityStar": null,
"lb_lv": null,
"_id": "b6TTcshZtMhIvWZAr70FyO"
},
{
@ -21882,6 +21888,8 @@
"pveget": {
"__id__": 449
},
"qualityStar": null,
"lb_lv": null,
"_id": "01LyGWFv9EZ6n8LX7C8OZF"
},
{
@ -43174,7 +43182,7 @@
"__id__": 1221
}
],
"_active": false,
"_active": true,
"_level": 1,
"_components": [
{
@ -69085,6 +69093,8 @@
"pveget": {
"__id__": 1603
},
"qualityStar": null,
"lb_lv": null,
"_id": "030IpUBd1JS7cp9CabMQ0f"
},
{
@ -75218,6 +75228,8 @@
"pveget": {
"__id__": 1733
},
"qualityStar": null,
"lb_lv": null,
"_id": "6bOjPQR19Oq4jcZX79OxF9"
},
{
@ -79333,6 +79345,8 @@
"pveget": {
"__id__": 1821
},
"qualityStar": null,
"lb_lv": null,
"_id": "21GTthTz9Lwas6R9Jk6Jqk"
},
{
@ -83448,6 +83462,8 @@
"pveget": {
"__id__": 1909
},
"qualityStar": null,
"lb_lv": null,
"_id": "15+MRLosVLXpwAnKkHJEVC"
},
{
@ -92524,6 +92540,8 @@
"pveget": {
"__id__": 2111
},
"qualityStar": null,
"lb_lv": null,
"_id": "cetNI0PspGjYi5N5u83dB8"
},
{

6602
assets/res/prefabs/NUI/UIrankinglist.prefab
View File

File diff suppressed because it is too large Load Diff

2259
assets/res/prefabs/NUI/rankWorldItem - 001.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
assets/res/prefabs/NUI/rankWorldItem - 001.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
{
"ver": "1.0.1",
"uuid": "d0b6d5ce-fc91-4803-9b43-bf9f0be5b67e",
"optimizationPolicy": "AUTO",
"asyncLoadAssets": false,
"subMetas": {}
}

30
assets/res/prefabs/NUI/rankWorldItem.prefab
View File

@ -174,6 +174,9 @@
"_isTrimmedMode": false,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{
@ -355,6 +358,9 @@
"_isTrimmedMode": false,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{
@ -642,6 +648,9 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{
@ -741,6 +750,9 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{
@ -842,6 +854,9 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{
@ -1304,6 +1319,9 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{
@ -1616,6 +1634,9 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{
@ -1938,6 +1959,9 @@
"_isTrimmedMode": false,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{
@ -2039,6 +2063,9 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{
@ -2140,6 +2167,9 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": ""
},
{

3810
assets/resources/prefabs/UIPrefab/pb_advenced.prefab
View File

File diff suppressed because it is too large Load Diff

1
assets/scripts/UI/Academy/Academy_block.ts
View File

@ -147,6 +147,7 @@ export default class Academy_block extends cc.Component {
type,
this.currentData.info.hero_uniid,
(res) => {
// wait...
uimanger.showUI(UpSuccess.prefabPath, res);
var node = cc
.find('Canvas')

38
assets/scripts/UI/Academy/ChooseHeroUpQuality.ts
View File

@ -38,6 +38,9 @@ export class ChooseHeroUpQuality extends UIBase {
private boxIndex = 0;
// private mainHeroID = 0;
// private secHeroID = 0;
init(data: any) {
this.boxIndex = data.boxIndex;
}
@ -60,6 +63,7 @@ export class ChooseHeroUpQuality extends UIBase {
this.finalHero.getComponent('herochoseone').initdata(data.heroInfo);
this.mainHero.active = true;
this.mainHeroData = data.heroInfo.hero_uniid;
// this.mainHeroID = data.heroInfo.hero_id;
let cfg =
gameConfig.heroQuality[
@ -69,19 +73,35 @@ export class ChooseHeroUpQuality extends UIBase {
this.costLabel.string = cfg.gold;
this.timeLabel.string = cfg.time;
this.rateLabel.string = cfg.success_rate + '%';
window.qualityMainData = {
heroid: data.heroInfo.hero_id,
herouuid: data.heroInfo.hero_uniid,
};
} else if (data.index == 1) {
this.secHeroChoose.active = false;
this.secHero.getComponent('herochoseone').initdata(data.heroInfo);
this.secHero.active = true;
this.secHeroData = data.heroInfo.hero_uniid;
console.log(JSON.stringify(data));
// this.secHeroID = data.heroInfo.hero_id;
window.qualitySecData = {
heroid: data.heroInfo.hero_id,
herouuid: data.heroInfo.hero_uniid,
};
}
if (this.mainHeroData && this.secHeroData) {
if (this.mainHeroData == this.secHeroData) {
cc.uiHelper.showTips('Must Choose two different hero');
cc.uiHelper.showTips('Must Choose two hero');
return;
}
// if (this.mainHeroID != this.secHeroID) {
// cc.uiHelper.showTips('Must Choose same hero');
// return;
// }
NetManage.upgradeQualityPreview(
this.mainHeroData,
this.secHeroData,
@ -113,16 +133,23 @@ export class ChooseHeroUpQuality extends UIBase {
}
onClose() {
window.qualityMainData = null;
window.qualitySecData = null;
this.node.destroy();
}
onOk() {
if (this.mainHeroData && this.secHeroData) {
if (this.mainHeroData == this.secHeroData) {
cc.uiHelper.showTips('Must Choose two different hero');
cc.uiHelper.showTips('Must Choose two hero');
return;
}
// if (this.mainHeroID != this.secHeroID) {
// cc.uiHelper.showTips('Must Choose same hero');
// return;
// }
NetManage.heroUpgradeQuality(
this.mainHeroData,
this.secHeroData,
@ -132,7 +159,10 @@ export class ChooseHeroUpQuality extends UIBase {
.find('Canvas')
.getComponentInChildren(UIUpdateHero).node;
node.emit('refreshUI');
this.node.destroy();
window.qualityMainData = null;
window.qualitySecData = null;
this.node.destroy();
}
);

17
assets/scripts/UI/Academy/updatechoose.ts
View File

@ -21,6 +21,23 @@ export class UpdateChoose extends UIBase {
var sc = node.getComponent('herochoseone');
sc.initdata(element);
if (window.qualityMainData) {
if (element.hero_id != window.qualityMainData.heroid) {
node.getComponent('wantedHero').showCover();
}
if (element.hero_uniid == window.qualityMainData.herouuid) {
node.getComponent('wantedHero').showCover();
}
}
if (window.qualitySecData) {
if (element.hero_id != window.qualitySecData.heroid) {
node.getComponent('wantedHero').showCover();
}
if (element.hero_uniid == window.qualitySecData.herouuid) {
node.getComponent('wantedHero').showCover();
}
}
//
if (
this.qualityIndex &&

57
assets/scripts/UI/UIRank/UIRank.js
View File

@ -19,23 +19,30 @@ cc.Class({
type: sp.Skeleton,
},
nd_btn1:{
nd_btn1: {
default: null,
type: cc.Node,
},
nd_btn2:{
nd_btn2: {
default: null,
type: cc.Node,
},
tableContent:{
default:null,
type:cc.Node
}
tableContent: {
default: null,
type: cc.Node,
},
title_time: {
default: null,
type: cc.Node,
},
title_score: {
default: null,
type: cc.Label,
},
},
// LIFE-CYCLE CALLBACKS:
@ -46,28 +53,54 @@ cc.Class({
onLoad() {
// set can open
NetManage.getRankOpenList((res)=>{
NetManage.getRankOpenList((res) => {
var rankList = res.list;
if(rankList.includes(2) && this.nd_btn2) this.nd_btn2.active = true;
if (rankList.includes(2) && this.nd_btn2)
this.nd_btn2.active = true;
});
this.title_time.active = false;
this.title_score.stirng = 'Score';
jcgamelog.addOperation(OperationType.BUTTON, 'get into rank');
cc.Notifier.on('clickrankhero', this, this.clickrankhero.bind(this));
},
onClickFirstRank(){
onClickFirstRank() {
this.title_time.active = false;
this.title_score.stirng = 'Score';
NetManage.getactivityRankingList(1, (data) => {
this.initTable(JSON.stringify(data));
});
},
onClickSecondRank(){
onClickSecondRank() {
this.title_time.active = false;
this.title_score.stirng = 'Score';
NetManage.getactivityRankingList(2, (data) => {
this.initTable(JSON.stringify(data));
});
},
initTable(rankData){
onClickThirdRank() {
this.title_time.active = true;
this.title_score.stirng = 'Level';
NetManage.getactivityRankingList(3, (data) => {
this.initTable(JSON.stringify(data));
});
},
onClickFourthRank() {
this.title_time.active = true;
this.title_score.stirng = 'Level';
NetManage.getactivityRankingList(4, (data) => {
this.initTable(JSON.stringify(data));
});
},
initTable(rankData) {
console.log(`rank data---${JSON.stringify(rankData)}`);
this.tableContent.destroyAllChildren();
var data = JSON.parse(rankData);
this.nd_my.getComponent('cellRank').initdata(data.my_ranked);

8
assets/scripts/UI/UIRank/cellRank.js
View File

@ -47,6 +47,11 @@ cc.Class({
default: [],
type: cc.Node,
},
lb_time: {
default: null,
type: cc.Label,
},
},
// LIFE-CYCLE CALLBACKS:
@ -55,7 +60,6 @@ cc.Class({
init: function (index, data, reload, group) {
if (index >= data.array.length) {
this.node.active = false;
return;
}
@ -121,7 +125,7 @@ cc.Class({
account_id: this.account_id,
hero_id: this.hero_id,
});
uimanger.showUI(playerInfoUI,this.account_id);
uimanger.showUI(playerInfoUI, this.account_id);
},
onDisable() {

2
assets/scripts/UI/UIShop/ShopItem.ts
View File

@ -19,7 +19,7 @@ export class ShopItem extends cc.Component {
this.lb_cost.string = data.price_info.cost_list[0][0].item_num;
//
var cfg = gameConfig.playerConfig[data.item_id];
this.lb_name.string = cfg.name;
if (this.lb_name) this.lb_name.string = cfg.name;
var skinres = cc.playerData.getheroSkinbyId(data.item_id, 0);
cc.loader.loadRes(
'spine/heropic/pic_hero' + skinres,