Skip to content

Z
ZheShangBank_TaoQuan_20240612
Commit 51ad6333 authored by 俞嘉婷's avatar 俞嘉婷
Browse files
Options

feat: 切换圈圈页面 按钮和任务板块共存 圈圈按钮、任务按钮逻辑调整

parent 30683fac
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1237 additions and 75 deletions
assets/Scripts/Panels/ChangeEquipPanel/ChangeEquipPanel.ts
View file @ 51ad6333
......@@ -96,6 +96,12 @@ export class ChangeEquipPanel extends Panel {
/** 高亮按钮 */
@property(Node)
mainBtn: Node = null;
/** 未获得按钮 */
@property(Node)
MainBtnNotHave: Node = null;
/** 使用中按钮 */
@property(Node)
MainBtnUsing: Node = null;
/** 任务栏 */
@property(Node)
taskBox: Node = null;
......@@ -106,6 +112,9 @@ export class ChangeEquipPanel extends Panel {
/** 任务去完成 */
@property(Node)
taskBtn: Node = null;
/** 任务已完成 */
@property(Node)
taskBtnDone: Node = null;
/** 猫猫爪 */
@property(Node)
......@@ -312,24 +321,32 @@ export class ChangeEquipPanel extends Panel {
console.log(data);
if (!!isUsed) {
/** 已装备 */
this.mainBtnGrey.active = true;
/** 使用中 */
this.MainBtnUsing.active = true;
this.MainBtnNotHave.active = false;
this.mainBtnGrey.active = false;
this.mainBtn.active = false;
this.taskBox.active = false;
this.taskBox.active = loopType != '1';
} else if (!!!isUsed) {
// loopType 1 青铜没有taskCode 没有这俩字段 直接展示「更换装备」
if (loopType == '1' || completedSize >= intervalLimitSize) {
/** 已解锁未装备 */
this.MainBtnNotHave.active = false;
this.MainBtnUsing.active = false;
this.mainBtnGrey.active = false;
this.mainBtn.active = true;
this.taskBox.active = false;
this.taskBox.active = loopType != '1';
} else {
/** 未解锁 */
this.MainBtnNotHave.active = true;
this.MainBtnUsing.active = false;
this.mainBtnGrey.active = false;
this.mainBtn.active = false;
this.taskBox.active = true;
this.taskBox.getChildByName("Title").getComponent(Label).string = strFormat(title, 22);
this.taskBox.active = loopType != '1';
}
}
this.taskBox.getChildByName("Title").getComponent(Label).string = strFormat(title, 22);
if (taskCode == "bank_2201") {
const descObj = taskData.desc ? JSON.parse(taskData.desc) : {};
const t = descObj?.progressAmount || 0;
......@@ -337,7 +354,12 @@ export class ChangeEquipPanel extends Panel {
} else {
this.taskBox.getChildByName("Progress").getComponent(Label).string = `完成 ${completedSize}/${intervalLimitSize}`;
}
}
if (completedSize >= intervalLimitSize) {
this.taskBtnDone.active = true;
this.taskBtn.active = false;
} else {
this.taskBtnDone.active = false;
this.taskBtn.active = true;
}
}
......
assets/resources/ChangeEquipPanel/img/mainBtnNotHave.png.meta 0 → 100644
View file @ 51ad6333
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "5472c93d-0612-40d1-a97e-efb8e770a4e4",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "5472c93d-0612-40d1-a97e-efb8e770a4e4@6c48a",
"displayName": "mainBtnNotHave",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "5472c93d-0612-40d1-a97e-efb8e770a4e4",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "5472c93d-0612-40d1-a97e-efb8e770a4e4@f9941",
"displayName": "mainBtnNotHave",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 398,
"height": 155,
"rawWidth": 398,
"rawHeight": 155,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-199,
-77.5,
0,
199,
-77.5,
0,
-199,
77.5,
0,
199,
77.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
155,
398,
155,
0,
0,
398,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-199,
-77.5,
0
],
"maxPos": [
199,
77.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "5472c93d-0612-40d1-a97e-efb8e770a4e4@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "5472c93d-0612-40d1-a97e-efb8e770a4e4@6c48a"
}
}
assets/resources/ChangeEquipPanel/img/mainBtnUsing.png.meta 0 → 100644
View file @ 51ad6333
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "84841372-78b9-48ac-928f-2f4784b172bd",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "84841372-78b9-48ac-928f-2f4784b172bd@6c48a",
"displayName": "mainBtnUsing",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "84841372-78b9-48ac-928f-2f4784b172bd",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "84841372-78b9-48ac-928f-2f4784b172bd@f9941",
"displayName": "mainBtnUsing",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 398,
"height": 155,
"rawWidth": 398,
"rawHeight": 155,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-199,
-77.5,
0,
199,
-77.5,
0,
-199,
77.5,
0,
199,
77.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
155,
398,
155,
0,
0,
398,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-199,
-77.5,
0
],
"maxPos": [
199,
77.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "84841372-78b9-48ac-928f-2f4784b172bd@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "84841372-78b9-48ac-928f-2f4784b172bd@6c48a"
}
}
assets/resources/ChangeEquipPanel/img/task_btn_done.png.meta 0 → 100644
View file @ 51ad6333
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "2a0bcc98-5fcc-49da-8cae-8fd1ce9f3d98",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "2a0bcc98-5fcc-49da-8cae-8fd1ce9f3d98@6c48a",
"displayName": "task_btn_done",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "2a0bcc98-5fcc-49da-8cae-8fd1ce9f3d98",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "2a0bcc98-5fcc-49da-8cae-8fd1ce9f3d98@f9941",
"displayName": "task_btn_done",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 182,
"height": 67,
"rawWidth": 182,
"rawHeight": 67,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-91,
-33.5,
0,
91,
-33.5,
0,
-91,
33.5,
0,
91,
33.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
67,
182,
67,
0,
0,
182,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-91,
-33.5,
0
],
"maxPos": [
91,
33.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "2a0bcc98-5fcc-49da-8cae-8fd1ce9f3d98@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "2a0bcc98-5fcc-49da-8cae-8fd1ce9f3d98@6c48a"
}
}
assets/resources/ChangeEquipPanel/img/task_btn_not.png.meta 0 → 100644
View file @ 51ad6333
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "f0173f8e-78fa-439b-af37-e6c6a76b7ae7",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "f0173f8e-78fa-439b-af37-e6c6a76b7ae7@6c48a",
"displayName": "task_btn_not",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "f0173f8e-78fa-439b-af37-e6c6a76b7ae7",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "f0173f8e-78fa-439b-af37-e6c6a76b7ae7@f9941",
"displayName": "task_btn_not",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 182,
"height": 67,
"rawWidth": 182,
"rawHeight": 67,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-91,
-33.5,
0,
91,
-33.5,
0,
-91,
33.5,
0,
91,
33.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
67,
182,
67,
0,
0,
182,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-91,
-33.5,
0
],
"maxPos": [
91,
33.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "f0173f8e-78fa-439b-af37-e6c6a76b7ae7@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "f0173f8e-78fa-439b-af37-e6c6a76b7ae7@6c48a"
}
}
assets/resources/NoGetRankPrizePanel/img/Bg.png.meta
View file @ 51ad6333
......@@ -11,7 +11,7 @@
"6c48a": {
"importer": "texture",
"uuid": "2ff03921-0804-417d-849d-93bf9a90c21e@6c48a",
"displayName": "bg",
"displayName": "Bg",
"id": "6c48a",
"name": "texture",
"userData": {
......@@ -35,7 +35,7 @@
"f9941": {
"importer": "sprite-frame",
"uuid": "2ff03921-0804-417d-849d-93bf9a90c21e@f9941",
"displayName": "bg",
"displayName": "Bg",
"id": "f9941",
"name": "spriteFrame",
"userData": {
......
build/web-mobile-001/index.html
View file @ 51ad6333
......@@ -39,7 +39,7 @@
<script src="//yun.duiba.com.cn/polaris/SVGA.Lite.v2.1.1.d3a67cbc13c591c53c6f87ab34c57ce387010374.js" crossorigin="anonymous"></script>
<script src="//yun.duiba.com.cn/aurora/assets/2403d1edf2acd15b179306b6ddaa5f0967d78a8f.js"></script>
<link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1721979133810/style.css"/>
<link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722256860379/style.css"/>
<style>
.sui-captcha {
......@@ -95,19 +95,20 @@
<script>
window.voucherPackUrl = "https://mobapp.czbank.com/life/voucherPack.html";
window.creditsUrl = "https://mobapp.czbank.com/homeChanels/credits.html";
</script>
<!-- Polyfills bundle. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1721979133810/src/polyfills.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722256860379/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1721979133810/src/system.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722256860379/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1721979133810/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722256860379/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>
<script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1721979133810/index.js').catch(function (err) {
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1722256860379/index.js').catch(function (err) {
console.error(err);
})
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment