2 Commits

Author SHA1 Message Date
panFD
6c6efb640e refactor(guide prefab): 重构新手引导预制体结构
统一将guide1-4预制体改为使用预制件实例嵌套方式,替换原有的硬编码节点组件结构,补充完整嵌套预制体根节点信息,调整部分弹窗位置参数
2026-06-17 23:06:34 +08:00
panFD
c35d14b5b5 fix(map): 修复任务卡片池等级UI显示逻辑
1. 移除了旧的卡池升级按钮UI注释代码
2. 新增卡池等级升级倒计时显示逻辑
3. 修复updateCoinAndCostUI调用updatePoolLvUI的逻辑
4. 从MissionComp获取卡池升级所需波次配置
2026-06-17 23:06:16 +08:00
9 changed files with 5656 additions and 3728 deletions

View File

@@ -28,17 +28,17 @@
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 60
},
{
"__id__": 53
"__id__": 62
},
{
"__id__": 55
"__id__": 64
}
],
"_prefab": {
"__id__": 57
"__id__": 66
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -385,23 +385,23 @@
"__id__": 17
},
{
"__id__": 25
"__id__": 34
},
{
"__id__": 31
"__id__": 40
}
],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 55
},
{
"__id__": 48
"__id__": 57
}
],
"_prefab": {
"__id__": 50
"__id__": 59
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -434,178 +434,218 @@
},
{
"__type__": "cc.Node",
"_name": "popupb",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 18
},
"_prefab": {
"__id__": 18
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 17
},
"asset": {
"__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a",
"__expectedType__": "cc.Prefab"
},
"fileId": "d3jYvT7whFS5scQFZeO5AK",
"instance": {
"__id__": 19
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "14YFVIWXtFxKTjZkEPn9Vm",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 20
},
{
"__id__": 22
},
{
"__id__": 23
},
{
"__id__": 24
},
{
"__id__": 25
},
{
"__id__": 26
},
{
"__id__": 28
},
{
"__id__": 30
},
{
"__id__": 32
}
],
"_prefab": {
"__id__": 24
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lpos": {
"propertyPath": [
"_name"
],
"value": "smalltip"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"d3jYvT7whFS5scQFZeO5AK"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lrot": {
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 1073741824,
"_euler": {
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
}
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
},
"_enabled": true,
"__prefab": {
"__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
"width": 670,
"height": 200
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "7fwZ1GVRVCnq9wVyxvQDkj"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
},
"_enabled": true,
"__prefab": {
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
"propertyPath": [
"_active"
],
"value": true
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 27
},
"_spriteFrame": {
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@ec552",
"__expectedType__": "cc.SpriteFrame"
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.TargetInfo",
"localID": [
"a3o8h0yV1IRpWNvk7tyKLF"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 29
},
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
"width": 600,
"height": 150
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"3aTUQpkypKh5v6YnH99gAD"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 31
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
"y": -75.679,
"z": 0
}
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2dDVBrpM5HWZzeeWVlLvsd"
"__type__": "cc.TargetInfo",
"localID": [
"ceD+T7pqtNKrlNgs4enPQc"
]
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 33
},
"_enabled": true,
"__prefab": {
"__id__": 23
},
"_alignFlags": 40,
"_target": null,
"_left": 25,
"_right": 25,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 480,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": -0.557,
"z": 0
}
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d1/xSKIHBPGImeKy2z8ABs"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "43t47xyhJOxrZNbgyVjchG",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
"__type__": "cc.TargetInfo",
"localID": [
"06aFK/VuNKJJkB5vy5eTap"
]
},
{
"__type__": "cc.Node",
@@ -619,14 +659,14 @@
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 35
},
{
"__id__": 28
"__id__": 37
}
],
"_prefab": {
"__id__": 30
"__id__": 39
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -663,11 +703,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 25
"__id__": 34
},
"_enabled": true,
"__prefab": {
"__id__": 27
"__id__": 36
},
"_contentSize": {
"__type__": "cc.Size",
@@ -691,11 +731,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 25
"__id__": 34
},
"_enabled": true,
"__prefab": {
"__id__": 29
"__id__": 38
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -776,23 +816,23 @@
},
"_children": [
{
"__id__": 32
"__id__": 41
}
],
"_active": false,
"_components": [
{
"__id__": 38
"__id__": 47
},
{
"__id__": 40
"__id__": 49
},
{
"__id__": 42
"__id__": 51
}
],
"_prefab": {
"__id__": 45
"__id__": 54
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -829,20 +869,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 31
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 42
},
{
"__id__": 35
"__id__": 44
}
],
"_prefab": {
"__id__": 37
"__id__": 46
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -879,11 +919,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 34
"__id__": 43
},
"_contentSize": {
"__type__": "cc.Size",
@@ -907,11 +947,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 36
"__id__": 45
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -988,11 +1028,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 39
"__id__": 48
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1016,11 +1056,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 41
"__id__": 50
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1061,15 +1101,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 43
"__id__": 52
},
"clickEvents": [
{
"__id__": 44
"__id__": 53
}
],
"_interactable": true,
@@ -1148,7 +1188,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 47
"__id__": 56
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1176,7 +1216,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 49
"__id__": 58
},
"_alignFlags": 40,
"_target": null,
@@ -1225,7 +1265,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 61
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1253,7 +1293,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 54
"__id__": 63
},
"_alignFlags": 45,
"_target": null,
@@ -1289,7 +1329,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 56
"__id__": 65
},
"guide_id": 1,
"_id": ""
@@ -1308,6 +1348,11 @@
},
"fileId": "6dh4o/8p1Cy5An1p6o4Bc3",
"instance": null,
"targetOverrides": null
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
"__id__": 17
}
]
}
]

View File

@@ -28,17 +28,17 @@
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 60
},
{
"__id__": 53
"__id__": 62
},
{
"__id__": 55
"__id__": 64
}
],
"_prefab": {
"__id__": 57
"__id__": 66
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -385,23 +385,23 @@
"__id__": 17
},
{
"__id__": 25
"__id__": 34
},
{
"__id__": 31
"__id__": 40
}
],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 55
},
{
"__id__": 48
"__id__": 57
}
],
"_prefab": {
"__id__": 50
"__id__": 59
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -434,178 +434,218 @@
},
{
"__type__": "cc.Node",
"_name": "popupb",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 18
},
"_prefab": {
"__id__": 18
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 17
},
"asset": {
"__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a",
"__expectedType__": "cc.Prefab"
},
"fileId": "d3jYvT7whFS5scQFZeO5AK",
"instance": {
"__id__": 19
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "26atbF+JFPsKsIxnYa2ikH",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 20
},
{
"__id__": 22
},
{
"__id__": 23
},
{
"__id__": 24
},
{
"__id__": 25
},
{
"__id__": 26
},
{
"__id__": 28
},
{
"__id__": 30
},
{
"__id__": 32
}
],
"_prefab": {
"__id__": 24
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lpos": {
"propertyPath": [
"_name"
],
"value": "smalltip"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"d3jYvT7whFS5scQFZeO5AK"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lrot": {
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 1073741824,
"_euler": {
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
}
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
},
"_enabled": true,
"__prefab": {
"__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
"width": 670,
"height": 200
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "7fwZ1GVRVCnq9wVyxvQDkj"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
},
"_enabled": true,
"__prefab": {
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
"propertyPath": [
"_active"
],
"value": true
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 27
},
"_spriteFrame": {
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@ec552",
"__expectedType__": "cc.SpriteFrame"
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.TargetInfo",
"localID": [
"a3o8h0yV1IRpWNvk7tyKLF"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 29
},
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
"width": 600,
"height": 150
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"3aTUQpkypKh5v6YnH99gAD"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 31
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
"y": -75.679,
"z": 0
}
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2dDVBrpM5HWZzeeWVlLvsd"
"__type__": "cc.TargetInfo",
"localID": [
"ceD+T7pqtNKrlNgs4enPQc"
]
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 33
},
"_enabled": true,
"__prefab": {
"__id__": 23
},
"_alignFlags": 40,
"_target": null,
"_left": 25,
"_right": 25,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 480,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": -0.557,
"z": 0
}
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d1/xSKIHBPGImeKy2z8ABs"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "43t47xyhJOxrZNbgyVjchG",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
"__type__": "cc.TargetInfo",
"localID": [
"06aFK/VuNKJJkB5vy5eTap"
]
},
{
"__type__": "cc.Node",
@@ -619,14 +659,14 @@
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 35
},
{
"__id__": 28
"__id__": 37
}
],
"_prefab": {
"__id__": 30
"__id__": 39
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -663,11 +703,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 25
"__id__": 34
},
"_enabled": true,
"__prefab": {
"__id__": 27
"__id__": 36
},
"_contentSize": {
"__type__": "cc.Size",
@@ -691,11 +731,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 25
"__id__": 34
},
"_enabled": true,
"__prefab": {
"__id__": 29
"__id__": 38
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -776,23 +816,23 @@
},
"_children": [
{
"__id__": 32
"__id__": 41
}
],
"_active": false,
"_components": [
{
"__id__": 38
"__id__": 47
},
{
"__id__": 40
"__id__": 49
},
{
"__id__": 42
"__id__": 51
}
],
"_prefab": {
"__id__": 45
"__id__": 54
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -829,20 +869,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 31
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 42
},
{
"__id__": 35
"__id__": 44
}
],
"_prefab": {
"__id__": 37
"__id__": 46
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -879,11 +919,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 34
"__id__": 43
},
"_contentSize": {
"__type__": "cc.Size",
@@ -907,11 +947,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 36
"__id__": 45
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -988,11 +1028,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 39
"__id__": 48
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1016,11 +1056,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 41
"__id__": 50
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1061,15 +1101,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 43
"__id__": 52
},
"clickEvents": [
{
"__id__": 44
"__id__": 53
}
],
"_interactable": true,
@@ -1148,7 +1188,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 47
"__id__": 56
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1176,7 +1216,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 49
"__id__": 58
},
"_alignFlags": 42,
"_target": null,
@@ -1225,7 +1265,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 61
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1253,7 +1293,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 54
"__id__": 63
},
"_alignFlags": 45,
"_target": null,
@@ -1289,7 +1329,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 56
"__id__": 65
},
"guide_id": 2,
"_id": ""
@@ -1308,6 +1348,11 @@
},
"fileId": "6dh4o/8p1Cy5An1p6o4Bc3",
"instance": null,
"targetOverrides": null
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
"__id__": 17
}
]
}
]

View File

@@ -28,17 +28,17 @@
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 60
},
{
"__id__": 53
"__id__": 62
},
{
"__id__": 55
"__id__": 64
}
],
"_prefab": {
"__id__": 57
"__id__": 66
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -381,23 +381,23 @@
"__id__": 17
},
{
"__id__": 25
"__id__": 34
},
{
"__id__": 31
"__id__": 40
}
],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 55
},
{
"__id__": 48
"__id__": 57
}
],
"_prefab": {
"__id__": 50
"__id__": 59
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -430,178 +430,218 @@
},
{
"__type__": "cc.Node",
"_name": "popupb",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 18
},
"_prefab": {
"__id__": 18
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 17
},
"asset": {
"__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a",
"__expectedType__": "cc.Prefab"
},
"fileId": "d3jYvT7whFS5scQFZeO5AK",
"instance": {
"__id__": 19
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "10lq435ItJs7YGjSiwNDfo",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 20
},
{
"__id__": 22
},
{
"__id__": 23
},
{
"__id__": 24
},
{
"__id__": 25
},
{
"__id__": 26
},
{
"__id__": 28
},
{
"__id__": 30
},
{
"__id__": 32
}
],
"_prefab": {
"__id__": 24
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lpos": {
"propertyPath": [
"_name"
],
"value": "smalltip"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"d3jYvT7whFS5scQFZeO5AK"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"y": -2.664,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lrot": {
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 1073741824,
"_euler": {
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
}
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
},
"_enabled": true,
"__prefab": {
"__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
"width": 670,
"height": 200
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "7fwZ1GVRVCnq9wVyxvQDkj"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
},
"_enabled": true,
"__prefab": {
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
"propertyPath": [
"_active"
],
"value": true
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 27
},
"_spriteFrame": {
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@ec552",
"__expectedType__": "cc.SpriteFrame"
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.TargetInfo",
"localID": [
"a3o8h0yV1IRpWNvk7tyKLF"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 29
},
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
"width": 600,
"height": 150
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"3aTUQpkypKh5v6YnH99gAD"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 31
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
"y": -75.679,
"z": 0
}
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2dDVBrpM5HWZzeeWVlLvsd"
"__type__": "cc.TargetInfo",
"localID": [
"ceD+T7pqtNKrlNgs4enPQc"
]
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 33
},
"_enabled": true,
"__prefab": {
"__id__": 23
},
"_alignFlags": 40,
"_target": null,
"_left": 25,
"_right": 25,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 480,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": -0.557,
"z": 0
}
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d1/xSKIHBPGImeKy2z8ABs"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "43t47xyhJOxrZNbgyVjchG",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
"__type__": "cc.TargetInfo",
"localID": [
"06aFK/VuNKJJkB5vy5eTap"
]
},
{
"__type__": "cc.Node",
@@ -615,14 +655,14 @@
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 35
},
{
"__id__": 28
"__id__": 37
}
],
"_prefab": {
"__id__": 30
"__id__": 39
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -659,11 +699,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 25
"__id__": 34
},
"_enabled": true,
"__prefab": {
"__id__": 27
"__id__": 36
},
"_contentSize": {
"__type__": "cc.Size",
@@ -687,11 +727,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 25
"__id__": 34
},
"_enabled": true,
"__prefab": {
"__id__": 29
"__id__": 38
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -772,23 +812,23 @@
},
"_children": [
{
"__id__": 32
"__id__": 41
}
],
"_active": false,
"_components": [
{
"__id__": 38
"__id__": 47
},
{
"__id__": 40
"__id__": 49
},
{
"__id__": 42
"__id__": 51
}
],
"_prefab": {
"__id__": 45
"__id__": 54
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -825,20 +865,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 31
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 42
},
{
"__id__": 35
"__id__": 44
}
],
"_prefab": {
"__id__": 37
"__id__": 46
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -875,11 +915,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 34
"__id__": 43
},
"_contentSize": {
"__type__": "cc.Size",
@@ -903,11 +943,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 36
"__id__": 45
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -984,11 +1024,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 39
"__id__": 48
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1012,11 +1052,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 41
"__id__": 50
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1057,15 +1097,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 43
"__id__": 52
},
"clickEvents": [
{
"__id__": 44
"__id__": 53
}
],
"_interactable": true,
@@ -1144,7 +1184,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 47
"__id__": 56
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1172,7 +1212,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 49
"__id__": 58
},
"_alignFlags": 44,
"_target": null,
@@ -1221,7 +1261,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 61
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1249,7 +1289,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 54
"__id__": 63
},
"_alignFlags": 45,
"_target": null,
@@ -1285,7 +1325,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 56
"__id__": 65
},
"guide_id": 3,
"_id": ""
@@ -1304,6 +1344,11 @@
},
"fileId": "6dh4o/8p1Cy5An1p6o4Bc3",
"instance": null,
"targetOverrides": null
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
"__id__": 17
}
]
}
]

View File

@@ -28,17 +28,17 @@
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 60
},
{
"__id__": 53
"__id__": 62
},
{
"__id__": 55
"__id__": 64
}
],
"_prefab": {
"__id__": 57
"__id__": 66
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -385,23 +385,23 @@
"__id__": 17
},
{
"__id__": 25
"__id__": 34
},
{
"__id__": 31
"__id__": 40
}
],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 55
},
{
"__id__": 48
"__id__": 57
}
],
"_prefab": {
"__id__": 50
"__id__": 59
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -434,178 +434,218 @@
},
{
"__type__": "cc.Node",
"_name": "popupb",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 18
},
"_prefab": {
"__id__": 18
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 17
},
"asset": {
"__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a",
"__expectedType__": "cc.Prefab"
},
"fileId": "d3jYvT7whFS5scQFZeO5AK",
"instance": {
"__id__": 19
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "94hfqwQnBNSJgHYVjgX7oO",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 20
},
{
"__id__": 22
},
{
"__id__": 23
},
{
"__id__": 24
},
{
"__id__": 25
},
{
"__id__": 26
},
{
"__id__": 28
},
{
"__id__": 30
},
{
"__id__": 32
}
],
"_prefab": {
"__id__": 24
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lpos": {
"propertyPath": [
"_name"
],
"value": "smalltip"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"d3jYvT7whFS5scQFZeO5AK"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lrot": {
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 1073741824,
"_euler": {
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
}
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
},
"_enabled": true,
"__prefab": {
"__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
"width": 670,
"height": 200
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "7fwZ1GVRVCnq9wVyxvQDkj"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
},
"_enabled": true,
"__prefab": {
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
"propertyPath": [
"_active"
],
"value": true
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 27
},
"_spriteFrame": {
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@ec552",
"__expectedType__": "cc.SpriteFrame"
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.TargetInfo",
"localID": [
"a3o8h0yV1IRpWNvk7tyKLF"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 29
},
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
"width": 600,
"height": 150
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"3aTUQpkypKh5v6YnH99gAD"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 31
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
"y": -75.679,
"z": 0
}
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2dDVBrpM5HWZzeeWVlLvsd"
"__type__": "cc.TargetInfo",
"localID": [
"ceD+T7pqtNKrlNgs4enPQc"
]
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 33
},
"_enabled": true,
"__prefab": {
"__id__": 23
},
"_alignFlags": 40,
"_target": null,
"_left": 25,
"_right": 25,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 480,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": -0.557,
"z": 0
}
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d1/xSKIHBPGImeKy2z8ABs"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "43t47xyhJOxrZNbgyVjchG",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
"__type__": "cc.TargetInfo",
"localID": [
"06aFK/VuNKJJkB5vy5eTap"
]
},
{
"__type__": "cc.Node",
@@ -619,14 +659,14 @@
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 35
},
{
"__id__": 28
"__id__": 37
}
],
"_prefab": {
"__id__": 30
"__id__": 39
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -663,11 +703,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 25
"__id__": 34
},
"_enabled": true,
"__prefab": {
"__id__": 27
"__id__": 36
},
"_contentSize": {
"__type__": "cc.Size",
@@ -691,11 +731,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 25
"__id__": 34
},
"_enabled": true,
"__prefab": {
"__id__": 29
"__id__": 38
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -776,23 +816,23 @@
},
"_children": [
{
"__id__": 32
"__id__": 41
}
],
"_active": false,
"_components": [
{
"__id__": 38
"__id__": 47
},
{
"__id__": 40
"__id__": 49
},
{
"__id__": 42
"__id__": 51
}
],
"_prefab": {
"__id__": 45
"__id__": 54
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -829,20 +869,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 31
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 42
},
{
"__id__": 35
"__id__": 44
}
],
"_prefab": {
"__id__": 37
"__id__": 46
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -879,11 +919,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 34
"__id__": 43
},
"_contentSize": {
"__type__": "cc.Size",
@@ -907,11 +947,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 36
"__id__": 45
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -988,11 +1028,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 39
"__id__": 48
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1016,11 +1056,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 41
"__id__": 50
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1061,15 +1101,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 31
"__id__": 40
},
"_enabled": true,
"__prefab": {
"__id__": 43
"__id__": 52
},
"clickEvents": [
{
"__id__": 44
"__id__": 53
}
],
"_interactable": true,
@@ -1148,7 +1188,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 47
"__id__": 56
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1176,7 +1216,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 49
"__id__": 58
},
"_alignFlags": 40,
"_target": null,
@@ -1225,7 +1265,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 61
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1253,7 +1293,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 54
"__id__": 63
},
"_alignFlags": 45,
"_target": null,
@@ -1289,7 +1329,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 56
"__id__": 65
},
"guide_id": 4,
"_id": ""
@@ -1308,6 +1348,11 @@
},
"fileId": "6dh4o/8p1Cy5An1p6o4Bc3",
"instance": null,
"targetOverrides": null
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
"__id__": 17
}
]
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

View File

@@ -49,6 +49,7 @@ import { FacSet, FightSet } from "../common/config/GameSet";
import { MoveComp } from "../hero/MoveComp";
import { MissionHeroComp } from "./MissionHeroComp";
import { MissionEconomy } from "./MissionEconomy";
import { MissionComp } from "./MissionComp";
import { UIID } from "../common/config/GameUIConfig";
const { ccclass, property } = _decorator;
@@ -1022,23 +1023,6 @@ export class MissionCardComp extends CCComp {
}
/** 更新升级按钮上的等级文案,反馈当前卡池层级 */
private updatePoolLvUI() {
// if (this.cards_up) {
// const nobg = this.cards_up.getChildByName("nobg");
// if (nobg) {
// nobg.active = !this.canUpPool();
// }
// const coinNode = this.cards_up.getChildByName("coin");
// const label = coinNode?.getChildByName("num")?.getComponent(Label);
// if (this.poolLv >= CARD_POOL_MAX_LEVEL) {
// if (label) {
// label.string = `0`;
// }
// } else {
// if (label) {
// label.string = `${this.getUpgradeCost(this.poolLv)}`;
// }
// }
// }
if (this.pool_lv_node) {
this.pool_lv_node.active = true;
const lv = Math.max(CARD_POOL_INIT_LEVEL, Math.min(CARD_POOL_MAX_LEVEL, Math.floor(this.poolLv)));
@@ -1049,12 +1033,39 @@ export class MissionCardComp extends CCComp {
label.string = `lv.${lv}`;
}
}
// const widget = this.pool_lv_node.getComponent(Widget);
// if (widget) widget.updateAlignment();
// this.pool_lv_node.children.forEach(child => {
// const childWidget = child.getComponent(Widget);
// if (childWidget) childWidget.updateAlignment();
// });
const nextNode = this.pool_lv_node.getChildByName("next");
if (nextNode) {
const nextLabel = nextNode.getComponent(Label);
if (nextLabel) {
if (this.poolLv >= CARD_POOL_MAX_LEVEL) {
nextLabel.string = `已满级`;
} else {
let upgradeWaves: number[] = [5, 10];
ecs.query(ecs.allOf(MissionComp)).forEach((entity) => {
const mission = entity.get(MissionComp);
if (mission && mission.cardPoolUpgradeWaves) {
upgradeWaves = mission.cardPoolUpgradeWaves;
}
});
const currentWave = this.getCurrentWave();
let nextWave = -1;
for (let i = 0; i < upgradeWaves.length; i++) {
if (upgradeWaves[i] > currentWave) {
nextWave = upgradeWaves[i];
break;
}
}
if (nextWave !== -1) {
const remain = nextWave - currentWave;
nextLabel.string = `${remain} 回合后升级`;
} else {
nextLabel.string = `已满级`;
}
}
}
}
const peak = 1.2
this.playHeroNumNodePop(this.pool_lv_node, peak);
}
@@ -1091,7 +1102,7 @@ export class MissionCardComp extends CCComp {
}
private updateCoinAndCostUI() {
// this.updatePoolLvUI();
this.updatePoolLvUI();
this.updateDrawCostUI();
}