diff --git a/DataTables/Datas/宠物系统/宠物升级/角色升星消耗表.xlsx b/DataTables/Datas/宠物系统/宠物升级/角色升星消耗表.xlsx
index 409bf22f..90d1b832 100644
Binary files a/DataTables/Datas/宠物系统/宠物升级/角色升星消耗表.xlsx and b/DataTables/Datas/宠物系统/宠物升级/角色升星消耗表.xlsx differ
diff --git a/DataTables/Datas/常用/资源表.xlsx b/DataTables/Datas/常用/资源表.xlsx
index 28dbed8d..fab6a265 100644
Binary files a/DataTables/Datas/常用/资源表.xlsx and b/DataTables/Datas/常用/资源表.xlsx differ
diff --git a/JisolGameCocos/assets/resources/config/json/tbgresource.json b/JisolGameCocos/assets/resources/config/json/tbgresource.json
index efc4cb55..90315e3c 100644
--- a/JisolGameCocos/assets/resources/config/json/tbgresource.json
+++ b/JisolGameCocos/assets/resources/config/json/tbgresource.json
@@ -28,5 +28,11 @@
"name": "钥匙:锻造石副本",
"tig": "锻造石副本的钥匙",
"args": ""
+ },
+ {
+ "id": 90006,
+ "name": "魂:一品宠物魂",
+ "tig": "用于宠物升星",
+ "args": ""
}
]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/config/json/tbgroleupstar.json b/JisolGameCocos/assets/resources/config/json/tbgroleupstar.json
index 6edcb88e..12a6662d 100644
--- a/JisolGameCocos/assets/resources/config/json/tbgroleupstar.json
+++ b/JisolGameCocos/assets/resources/config/json/tbgroleupstar.json
@@ -38,5 +38,85 @@
{
"grade": 10,
"merge": 512
+ },
+ {
+ "grade": 11,
+ "merge": 1024
+ },
+ {
+ "grade": 12,
+ "merge": 2048
+ },
+ {
+ "grade": 13,
+ "merge": 4096
+ },
+ {
+ "grade": 14,
+ "merge": 8192
+ },
+ {
+ "grade": 15,
+ "merge": 16384
+ },
+ {
+ "grade": 16,
+ "merge": 32768
+ },
+ {
+ "grade": 17,
+ "merge": 65536
+ },
+ {
+ "grade": 18,
+ "merge": 131072
+ },
+ {
+ "grade": 19,
+ "merge": 262144
+ },
+ {
+ "grade": 20,
+ "merge": 524288
+ },
+ {
+ "grade": 21,
+ "merge": 1048576
+ },
+ {
+ "grade": 22,
+ "merge": 2097152
+ },
+ {
+ "grade": 23,
+ "merge": 4194304
+ },
+ {
+ "grade": 24,
+ "merge": 8388608
+ },
+ {
+ "grade": 25,
+ "merge": 16777216
+ },
+ {
+ "grade": 26,
+ "merge": 33554432
+ },
+ {
+ "grade": 27,
+ "merge": 67108864
+ },
+ {
+ "grade": 28,
+ "merge": 134217728
+ },
+ {
+ "grade": 29,
+ "merge": 268435456
+ },
+ {
+ "grade": 30,
+ "merge": 536870912
}
]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/Debugger/DebugItem.prefab b/JisolGameCocos/assets/resources/prefab/ui/Debugger/DebugItem.prefab
index 7c7e2a2c..69e780b1 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/Debugger/DebugItem.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/Debugger/DebugItem.prefab
@@ -32,10 +32,13 @@
},
{
"__id__": 12
+ },
+ {
+ "__id__": 14
}
],
"_prefab": {
- "__id__": 14
+ "__id__": 16
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -130,8 +133,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 100,
- "height": 40
+ "width": 55.60546875,
+ "height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -173,7 +176,7 @@
"_fontSize": 20,
"_fontFamily": "Arial",
"_lineHeight": 40,
- "_overflow": 1,
+ "_overflow": 0,
"_enableWrapText": false,
"_font": null,
"_isSystemFontUsed": true,
@@ -216,7 +219,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 100,
+ "width": 85.60546875,
"height": 40
},
"_anchorPoint": {
@@ -289,7 +292,7 @@
},
"clickEvents": [],
"_interactable": true,
- "_transition": 2,
+ "_transition": 3,
"_normalColor": {
"__type__": "cc.Color",
"r": 214,
@@ -345,6 +348,44 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "fdfZMrUD5LeJ3JUsm5gbF3"
},
+ {
+ "__type__": "cc.Layout",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 15
+ },
+ "_resizeMode": 1,
+ "_layoutType": 1,
+ "_cellSize": {
+ "__type__": "cc.Size",
+ "width": 40,
+ "height": 40
+ },
+ "_startAxis": 0,
+ "_paddingLeft": 15,
+ "_paddingRight": 15,
+ "_paddingTop": 0,
+ "_paddingBottom": 0,
+ "_spacingX": 0,
+ "_spacingY": 0,
+ "_verticalDirection": 1,
+ "_horizontalDirection": 0,
+ "_constraint": 0,
+ "_constraintNum": 2,
+ "_affectedByScale": false,
+ "_isAlign": false,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "baBTXQ6nBHCZceybmU4sDK"
+ },
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -354,6 +395,7 @@
"__id__": 0
},
"fileId": "82Bvk1koJK0rGlT67CNSun",
+ "instance": null,
"targetOverrides": null
}
]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/Debugger/Debugger.prefab b/JisolGameCocos/assets/resources/prefab/ui/Debugger/Debugger.prefab
index 925f3fa2..d4a9b0e5 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/Debugger/Debugger.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/Debugger/Debugger.prefab
@@ -942,8 +942,8 @@
"_paddingRight": 0,
"_paddingTop": 0,
"_paddingBottom": 0,
- "_spacingX": 0,
- "_spacingY": 0,
+ "_spacingX": 5,
+ "_spacingY": 5,
"_verticalDirection": 1,
"_horizontalDirection": 0,
"_constraint": 0,
diff --git a/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab
index 0dc39b34..c5be2bce 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab
@@ -25,17 +25,17 @@
"_active": true,
"_components": [
{
- "__id__": 173
+ "__id__": 143
},
{
- "__id__": 175
+ "__id__": 145
},
{
- "__id__": 177
+ "__id__": 147
}
],
"_prefab": {
- "__id__": 179
+ "__id__": 149
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -82,29 +82,29 @@
"__id__": 63
},
{
- "__id__": 107
+ "__id__": 74
},
{
- "__id__": 124
+ "__id__": 91
},
{
- "__id__": 143
+ "__id__": 119
}
],
"_active": true,
"_components": [
{
- "__id__": 166
+ "__id__": 136
},
{
- "__id__": 168
+ "__id__": 138
},
{
- "__id__": 170
+ "__id__": 140
}
],
"_prefab": {
- "__id__": 172
+ "__id__": 142
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -178,7 +178,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 300,
+ "y": 150,
"z": 0
},
"_lrot": {
@@ -1433,500 +1433,145 @@
},
{
"__type__": "cc.Node",
- "_name": "宠物列表",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 2
+ },
+ "_prefab": {
+ "__id__": 64
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 63
+ },
+ "asset": {
+ "__uuid__": "561f1c86-f948-432d-8250-f204ff864dbd",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "89WDKPsx9CX5sG3Mkwo+WZ",
+ "instance": {
+ "__id__": 65
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "96dxCpIfBLLZDe0eHER+6P",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 66
+ },
+ {
+ "__id__": 68
+ },
+ {
+ "__id__": 70
+ },
+ {
+ "__id__": 72
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 67
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "宠物预览窗口"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "89WDKPsx9CX5sG3Mkwo+WZ"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 69
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": -143.253,
+ "y": -43.287,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "89WDKPsx9CX5sG3Mkwo+WZ"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 71
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "89WDKPsx9CX5sG3Mkwo+WZ"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 73
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "89WDKPsx9CX5sG3Mkwo+WZ"
+ ]
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "升星",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 2
},
"_children": [
- {
- "__id__": 64
- },
- {
- "__id__": 82
- }
- ],
- "_active": true,
- "_components": [
- {
- "__id__": 100
- },
- {
- "__id__": 102
- },
- {
- "__id__": 104
- },
- {
- "__id__": 79
- }
- ],
- "_prefab": {
- "__id__": 106
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -10,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.Node",
- "_name": "scrollBar",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 63
- },
- "_children": [
- {
- "__id__": 65
- }
- ],
- "_active": true,
- "_components": [
- {
- "__id__": 71
- },
- {
- "__id__": 73
- },
{
"__id__": 75
- },
- {
- "__id__": 77
- }
- ],
- "_prefab": {
- "__id__": 99
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 275,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.Node",
- "_name": "bar",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 64
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 66
- },
- {
- "__id__": 68
- }
- ],
- "_prefab": {
- "__id__": 70
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": -11,
- "y": -31.25,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 65
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 67
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 10,
- "height": 156.25
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "0d0tXbkEZNX4aEx25Ed4Ai"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 65
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 69
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 0
- },
- "_spriteFrame": {
- "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 1,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "05WBEjdNZAqqve8eQV0oaM"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "1bA6K4kt5LwIzW53L7WFPh",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 64
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 72
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 12,
- "height": 520
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 1,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "73oxplRxJDr7eaD2ZCltrZ"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 64
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 74
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 0
- },
- "_spriteFrame": {
- "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 1,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "c5lJVtzjJG9qumy3VIbxwv"
- },
- {
- "__type__": "cc.Widget",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 64
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 76
- },
- "_alignFlags": 37,
- "_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
- "_horizontalCenter": 0,
- "_verticalCenter": 0,
- "_isAbsLeft": true,
- "_isAbsRight": true,
- "_isAbsTop": true,
- "_isAbsBottom": true,
- "_isAbsHorizontalCenter": true,
- "_isAbsVerticalCenter": true,
- "_originalWidth": 0,
- "_originalHeight": 250,
- "_alignMode": 1,
- "_lockFlags": 0,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "9aFjGMwbBExKjKmBppFw7+"
- },
- {
- "__type__": "cc.ScrollBar",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 64
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 78
- },
- "_scrollView": {
- "__id__": 79
- },
- "_handle": {
- "__id__": 68
- },
- "_direction": 1,
- "_enableAutoHide": false,
- "_autoHideTime": 1,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "6eVZbRN8ZAA6kr3q3T6lxa"
- },
- {
- "__type__": "563f2c1JcVKmrpHhC0vl3PI",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 63
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 80
- },
- "bounceDuration": 0.23,
- "brake": 0.75,
- "elastic": true,
- "inertia": true,
- "horizontal": false,
- "vertical": true,
- "cancelInnerEvents": true,
- "scrollEvents": [],
- "_content": {
- "__id__": 81
- },
- "_horizontalScrollBar": null,
- "_verticalScrollBar": {
- "__id__": 77
- },
- "itemPrefab": {
- "__uuid__": "b4e0f464-dc9f-463d-a392-7cc192779285",
- "__expectedType__": "cc.Prefab"
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "2cePl0zuxKKYTI0gsgjE1u"
- },
- {
- "__type__": "cc.Node",
- "_name": "content",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 82
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 92
- },
- {
- "__id__": 94
- },
- {
- "__id__": 96
- }
- ],
- "_prefab": {
- "__id__": 98
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.Node",
- "_name": "view",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 63
- },
- "_children": [
- {
- "__id__": 81
}
],
"_active": true,
@@ -1939,468 +1584,15 @@
},
{
"__id__": 87
- },
- {
- "__id__": 89
}
],
"_prefab": {
- "__id__": 91
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 260,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 82
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 84
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 550,
- "height": 520
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 1
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "4bFlnijRpAKoyePmrqfa+s"
- },
- {
- "__type__": "cc.Mask",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 82
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 86
- },
- "_type": 0,
- "_inverted": false,
- "_segments": 64,
- "_alphaThreshold": 0.1,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "518ATKhO9Gw7N8exX5W+TC"
- },
- {
- "__type__": "cc.Graphics",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 82
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 88
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_lineWidth": 1,
- "_strokeColor": {
- "__type__": "cc.Color",
- "r": 0,
- "g": 0,
- "b": 0,
- "a": 255
- },
- "_lineJoin": 2,
- "_lineCap": 0,
- "_fillColor": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 0
- },
- "_miterLimit": 10,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "82Ll2f1PJB4ZrEkNZyzh+0"
- },
- {
- "__type__": "cc.Widget",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 82
- },
- "_enabled": true,
- "__prefab": {
"__id__": 90
},
- "_alignFlags": 45,
- "_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
- "_horizontalCenter": 0,
- "_verticalCenter": 0,
- "_isAbsLeft": true,
- "_isAbsRight": true,
- "_isAbsTop": true,
- "_isAbsBottom": true,
- "_isAbsHorizontalCenter": true,
- "_isAbsVerticalCenter": true,
- "_originalWidth": 240,
- "_originalHeight": 250,
- "_alignMode": 2,
- "_lockFlags": 0,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "899DSiZmFN95I6lKN+zzfy"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "c9j4sTv9ZBy4YGIbMmIRr5",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 81
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 93
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 550,
- "height": 10
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 1
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "03ccYJ76tPc5sCIWHX1MEY"
- },
- {
- "__type__": "cc.Layout",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 81
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 95
- },
- "_resizeMode": 1,
- "_layoutType": 3,
- "_cellSize": {
- "__type__": "cc.Size",
- "width": 40,
- "height": 40
- },
- "_startAxis": 0,
- "_paddingLeft": 10,
- "_paddingRight": 0,
- "_paddingTop": 10,
- "_paddingBottom": 0,
- "_spacingX": 8,
- "_spacingY": 8,
- "_verticalDirection": 1,
- "_horizontalDirection": 0,
- "_constraint": 0,
- "_constraintNum": 2,
- "_affectedByScale": false,
- "_isAlign": false,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "ddShn5DuZB5IN8qwyvr1Nl"
- },
- {
- "__type__": "cc.Widget",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 81
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 97
- },
- "_alignFlags": 40,
- "_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
- "_horizontalCenter": 0,
- "_verticalCenter": 0,
- "_isAbsLeft": true,
- "_isAbsRight": true,
- "_isAbsTop": true,
- "_isAbsBottom": true,
- "_isAbsHorizontalCenter": true,
- "_isAbsVerticalCenter": true,
- "_originalWidth": 220,
- "_originalHeight": 0,
- "_alignMode": 2,
- "_lockFlags": 0,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "62SP9FQ6NOEZi8VB92ZPaI"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "30C+BYnslERpnpzQ3bqNiW",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "d9nYFuaGpFBZORlOeBddBu",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 63
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 101
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 550,
- "height": 520
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "ea586EUItLw75LP4FG6Nuv"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 63
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 103
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_spriteFrame": {
- "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 1,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "96XQF/8DFF2prJbfE7k/tp"
- },
- {
- "__type__": "cc.Widget",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 63
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 105
- },
- "_alignFlags": 45,
- "_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 100,
- "_bottom": 80,
- "_horizontalCenter": 0,
- "_verticalCenter": 0,
- "_isAbsLeft": true,
- "_isAbsRight": true,
- "_isAbsTop": true,
- "_isAbsBottom": true,
- "_isAbsHorizontalCenter": true,
- "_isAbsVerticalCenter": true,
- "_originalWidth": 240,
- "_originalHeight": 250,
- "_alignMode": 2,
- "_lockFlags": 0,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "56Nhwq50xBDqPYfa9cqYjO"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "55goghBf5GPogIe1/0pw20",
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "升星",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 2
- },
- "_children": [
- {
- "__id__": 108
- }
- ],
- "_active": true,
- "_components": [
- {
- "__id__": 116
- },
- {
- "__id__": 118
- },
- {
- "__id__": 120
- }
- ],
- "_prefab": {
- "__id__": 123
- },
"_lpos": {
"__type__": "cc.Vec3",
- "x": 95.5,
- "y": -309.485,
+ "x": 114.942,
+ "y": -135.293,
"z": 0
},
"_lrot": {
@@ -2432,23 +1624,23 @@
"_objFlags": 512,
"__editorExtras__": {},
"_parent": {
- "__id__": 107
+ "__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 109
+ "__id__": 76
},
{
- "__id__": 111
+ "__id__": 78
},
{
- "__id__": 113
+ "__id__": 80
}
],
"_prefab": {
- "__id__": 115
+ "__id__": 82
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -2485,11 +1677,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 108
+ "__id__": 75
},
"_enabled": true,
"__prefab": {
- "__id__": 110
+ "__id__": 77
},
"_contentSize": {
"__type__": "cc.Size",
@@ -2513,11 +1705,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 108
+ "__id__": 75
},
"_enabled": true,
"__prefab": {
- "__id__": 112
+ "__id__": 79
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -2558,11 +1750,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 108
+ "__id__": 75
},
"_enabled": true,
"__prefab": {
- "__id__": 114
+ "__id__": 81
},
"_color": {
"__type__": "cc.Color",
@@ -2597,15 +1789,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 107
+ "__id__": 74
},
"_enabled": true,
"__prefab": {
- "__id__": 117
+ "__id__": 84
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 120,
+ "width": 200,
"height": 60
},
"_anchorPoint": {
@@ -2625,11 +1817,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 107
+ "__id__": 74
},
"_enabled": true,
"__prefab": {
- "__id__": 119
+ "__id__": 86
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -2670,15 +1862,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 107
+ "__id__": 74
},
"_enabled": true,
"__prefab": {
- "__id__": 121
+ "__id__": 88
},
"clickEvents": [
{
- "__id__": 122
+ "__id__": 89
}
],
"_interactable": true,
@@ -2730,7 +1922,7 @@
"_duration": 0.1,
"_zoomScale": 1.2,
"_target": {
- "__id__": 107
+ "__id__": 74
},
"_id": ""
},
@@ -2763,7 +1955,7 @@
},
{
"__type__": "cc.Node",
- "_name": "升星-001",
+ "_name": "魂",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -2771,31 +1963,82 @@
},
"_children": [
{
- "__id__": 125
+ "__id__": 92
}
],
"_active": true,
"_components": [
{
- "__id__": 133
+ "__id__": 114
},
{
- "__id__": 135
- },
- {
- "__id__": 137
- },
- {
- "__id__": 140
+ "__id__": 116
}
],
"_prefab": {
- "__id__": 142
+ "__id__": 118
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 225,
- "y": -309.485,
+ "x": 114.942,
+ "y": 18.459,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 33554432,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "内容",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 91
+ },
+ "_children": [
+ {
+ "__id__": 93
+ },
+ {
+ "__id__": 101
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 109
+ },
+ {
+ "__id__": 111
+ }
+ ],
+ "_prefab": {
+ "__id__": 113
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
"z": 0
},
"_lrot": {
@@ -2824,30 +2067,30 @@
{
"__type__": "cc.Node",
"_name": "Label",
- "_objFlags": 512,
+ "_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 124
+ "__id__": 92
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 126
+ "__id__": 94
},
{
- "__id__": 128
+ "__id__": 96
},
{
- "__id__": 130
+ "__id__": 98
}
],
"_prefab": {
- "__id__": 132
+ "__id__": 100
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 0,
+ "x": -10.0615234375,
"y": 0,
"z": 0
},
@@ -2880,594 +2123,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 125
+ "__id__": 93
},
"_enabled": true,
"__prefab": {
- "__id__": 127
+ "__id__": 95
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 100,
- "height": 40
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "c6dzj7a/hK060jY0kgYhrv"
- },
- {
- "__type__": "cc.Label",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 125
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 129
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_string": "ALL",
- "_horizontalAlign": 1,
- "_verticalAlign": 1,
- "_actualFontSize": 20,
- "_fontSize": 20,
- "_fontFamily": "Arial",
- "_lineHeight": 40,
- "_overflow": 1,
- "_enableWrapText": false,
- "_font": null,
- "_isSystemFontUsed": true,
- "_spacingX": 0,
- "_isItalic": false,
- "_isBold": true,
- "_isUnderline": false,
- "_underlineHeight": 2,
- "_cacheMode": 0,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "0eILyMqrtIIbd6dBeZhjnR"
- },
- {
- "__type__": "cc.LabelOutline",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 125
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 131
- },
- "_color": {
- "__type__": "cc.Color",
- "r": 0,
- "g": 0,
- "b": 0,
- "a": 255
- },
- "_width": 2,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "0cYRdtJT5Ia5ZwI4a4gfOa"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "e6uWMFnopAbKPKYdwYzrSt",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 124
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 134
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 60,
- "height": 60
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "ecFw3k4kBMBLFJBJ/2hlAf"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 124
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 136
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_spriteFrame": {
- "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 1,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "f2rDoZX4dHC6gpxDG3ix0k"
- },
- {
- "__type__": "cc.Button",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 124
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 138
- },
- "clickEvents": [
- {
- "__id__": 139
- }
- ],
- "_interactable": true,
- "_transition": 3,
- "_normalColor": {
- "__type__": "cc.Color",
- "r": 214,
- "g": 214,
- "b": 214,
- "a": 255
- },
- "_hoverColor": {
- "__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
- "a": 255
- },
- "_pressedColor": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_disabledColor": {
- "__type__": "cc.Color",
- "r": 124,
- "g": 124,
- "b": 124,
- "a": 255
- },
- "_normalSprite": {
- "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_hoverSprite": {
- "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_pressedSprite": {
- "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_disabledSprite": {
- "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_duration": 0.1,
- "_zoomScale": 1.2,
- "_target": {
- "__id__": 124
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "f0emQR4/pI7pKScgtfkNbK"
- },
- {
- "__type__": "cc.ClickEvent",
- "target": {
- "__id__": 1
- },
- "component": "",
- "_componentId": "f8ba4N+bqdD84IUK5j+GSAq",
- "handler": "onClickAll",
- "customEventData": ""
- },
- {
- "__type__": "cc.Widget",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 124
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 141
- },
- "_alignFlags": 32,
- "_target": null,
- "_left": 0,
- "_right": 20,
- "_top": 0,
- "_bottom": 0,
- "_horizontalCenter": 0,
- "_verticalCenter": 0,
- "_isAbsLeft": true,
- "_isAbsRight": true,
- "_isAbsTop": true,
- "_isAbsBottom": true,
- "_isAbsHorizontalCenter": true,
- "_isAbsVerticalCenter": true,
- "_originalWidth": 0,
- "_originalHeight": 0,
- "_alignMode": 2,
- "_lockFlags": 0,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "15IyPJQr9C+rzy/v8RoDan"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "59hgxQA0tEpbYrqopODbWf",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "主动吞噬宠物",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 2
- },
- "_children": [
- {
- "__id__": 144
- },
- {
- "__id__": 150
- }
- ],
- "_active": true,
- "_components": [
- {
- "__id__": 158
- },
- {
- "__id__": 160
- },
- {
- "__id__": 162
- }
- ],
- "_prefab": {
- "__id__": 165
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": -228.169,
- "y": -310.378,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.Node",
- "_name": "Checkmark",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 143
- },
- "_children": [],
- "_active": false,
- "_components": [
- {
- "__id__": 145
- },
- {
- "__id__": 147
- }
- ],
- "_prefab": {
- "__id__": 149
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 144
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 146
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 26,
- "height": 26
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "edutU3mGxB1Kwg+z00tSXd"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 144
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 148
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_spriteFrame": {
- "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 0,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "2fIU3cXWxDQYiTDSu+3KyJ"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "cc89pkOEZFWYgpdUlcSPrF",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "Label",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 143
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 151
- },
- {
- "__id__": 153
- },
- {
- "__id__": 155
- }
- ],
- "_prefab": {
- "__id__": 157
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 23.875,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 150
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 152
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 211.79296875,
+ "width": 30.66015625,
"height": 54.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 0,
+ "x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "0cS5AJcMVIVbsJLnEVKKcb"
+ "fileId": "19Pa9ntnVLcqPAxV6xBBEm"
},
{
"__type__": "cc.Label",
@@ -3475,11 +2151,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 150
+ "__id__": 93
},
"_enabled": true,
"__prefab": {
- "__id__": 154
+ "__id__": 97
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -3491,7 +2167,7 @@
"b": 255,
"a": 255
},
- "_string": "是否主动吞噬 0 星 宠物",
+ "_string": "魂:",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 20,
@@ -3512,7 +2188,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "58bYyo8BVJl66rlOOQA5Fg"
+ "fileId": "6474f2qgNCxr9KWD/qbgkc"
},
{
"__type__": "cc.LabelOutline",
@@ -3520,11 +2196,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 150
+ "__id__": 93
},
"_enabled": true,
"__prefab": {
- "__id__": 156
+ "__id__": 99
},
"_color": {
"__type__": "cc.Color",
@@ -3538,7 +2214,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "f4IkouWdRAPqxACtqQi5Sm"
+ "fileId": "7dvxSj8wRIToQ1025nzKe5"
},
{
"__type__": "cc.PrefabInfo",
@@ -3548,27 +2224,80 @@
"asset": {
"__id__": 0
},
- "fileId": "fb76U7zyBMu77r84nqvnfK",
+ "fileId": "98e7S8UKFAk5YTj74jveDu",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_name": "Label-001",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 92
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 102
+ },
+ {
+ "__id__": 104
+ },
+ {
+ "__id__": 106
+ }
+ ],
+ "_prefab": {
+ "__id__": 108
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 17.830078125,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 33554432,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 143
+ "__id__": 101
},
"_enabled": true,
"__prefab": {
- "__id__": 159
+ "__id__": 103
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 28,
- "height": 28
+ "width": 15.123046875,
+ "height": 54.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -3579,19 +2308,19 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "c0gJrrqNRHg4XdhNrMJyNN"
+ "fileId": "af2+Z1PAhGKLuBsKSB6n3c"
},
{
- "__type__": "cc.Sprite",
+ "__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 143
+ "__id__": 101
},
"_enabled": true,
"__prefab": {
- "__id__": 161
+ "__id__": 105
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -3603,13 +2332,204 @@
"b": 255,
"a": 255
},
+ "_string": "0",
+ "_horizontalAlign": 1,
+ "_verticalAlign": 1,
+ "_actualFontSize": 20,
+ "_fontSize": 20,
+ "_fontFamily": "Arial",
+ "_lineHeight": 40,
+ "_overflow": 0,
+ "_enableWrapText": true,
+ "_font": null,
+ "_isSystemFontUsed": true,
+ "_spacingX": 0,
+ "_isItalic": false,
+ "_isBold": true,
+ "_isUnderline": false,
+ "_underlineHeight": 2,
+ "_cacheMode": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "4aSdu/MSxJVpHGPt7D2HMq"
+ },
+ {
+ "__type__": "cc.LabelOutline",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 101
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 107
+ },
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 0,
+ "g": 0,
+ "b": 0,
+ "a": 255
+ },
+ "_width": 2,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "74tsbMRT5HDL4XSXjlZHSe"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "b8Hk9ntpJHHb0cntuxc2zq",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 92
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 110
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 50.783203125,
+ "height": 40
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "cahqWPdGVGZ6zayY+yak15"
+ },
+ {
+ "__type__": "cc.Layout",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 92
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 112
+ },
+ "_resizeMode": 1,
+ "_layoutType": 1,
+ "_cellSize": {
+ "__type__": "cc.Size",
+ "width": 40,
+ "height": 40
+ },
+ "_startAxis": 0,
+ "_paddingLeft": 0,
+ "_paddingRight": 0,
+ "_paddingTop": 0,
+ "_paddingBottom": 0,
+ "_spacingX": 5,
+ "_spacingY": 0,
+ "_verticalDirection": 1,
+ "_horizontalDirection": 0,
+ "_constraint": 0,
+ "_constraintNum": 2,
+ "_affectedByScale": false,
+ "_isAlign": false,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "c9+HS8vwFFNpi1pNpIIpvT"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "627CUwJqJHUIwnHwigGbUL",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 91
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 115
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 150,
+ "height": 40
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "abg1ZL399HUIFoKPxXR1b4"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 91
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 117
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 211,
+ "g": 211,
+ "b": 211,
+ "a": 255
+ },
"_spriteFrame": {
- "__uuid__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941",
+ "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
- "_sizeMode": 1,
+ "_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
@@ -3624,19 +2544,215 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "dboDNzKTZDhbFasr2/lowH"
+ "fileId": "baotOwTGFMg6xHIU03bH5w"
},
{
- "__type__": "cc.Toggle",
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "4aCODO+yJNJqE3v9G6/ooc",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Slider",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 2
+ },
+ "_children": [
+ {
+ "__id__": 120
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 128
+ },
+ {
+ "__id__": 130
+ },
+ {
+ "__id__": 132
+ }
+ ],
+ "_prefab": {
+ "__id__": 135
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 114.942,
+ "y": -38.303,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 33554432,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Handle",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 119
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 121
+ },
+ {
+ "__id__": 123
+ },
+ {
+ "__id__": 125
+ }
+ ],
+ "_prefab": {
+ "__id__": 127
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -140,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 33554432,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 143
+ "__id__": 120
},
"_enabled": true,
"__prefab": {
- "__id__": 163
+ "__id__": 122
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 32,
+ "height": 32
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "5dpHw5sW1DDK0g8Lj2usQb"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 120
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 124
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "f12a23c4-b924-4322-a260-3d982428f1e8@f9941",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "c3VF4M0u5DSIrW8JP4fqIs"
+ },
+ {
+ "__type__": "cc.Button",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 120
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 126
},
"clickEvents": [],
"_interactable": true,
@@ -3670,7 +2786,7 @@
"a": 255
},
"_normalSprite": {
- "__uuid__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941",
+ "__uuid__": "f12a23c4-b924-4322-a260-3d982428f1e8@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_hoverSprite": null,
@@ -3679,22 +2795,127 @@
"_duration": 0.1,
"_zoomScale": 1.2,
"_target": {
- "__id__": 143
- },
- "checkEvents": [
- {
- "__id__": 164
- }
- ],
- "_isChecked": false,
- "_checkMark": {
- "__id__": 147
+ "__id__": 120
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "08CaQ9IvFL9640k2qkUBoQ"
+ "fileId": "137cdZbgBIko0LROhCFfop"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "57BIWzHztMwYk62eyDgUYZ",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 119
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 129
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 280,
+ "height": 20
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "61sYi4NtxL5baK0kMbX+My"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 119
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 131
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "28765e2f-040a-4c65-8e8c-f9d0bb79d863@f9941",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 1,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "93xqBEOQFKm4Q0ClKE7hdG"
+ },
+ {
+ "__type__": "cc.Slider",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 119
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 133
+ },
+ "slideEvents": [
+ {
+ "__id__": 134
+ }
+ ],
+ "_handle": {
+ "__id__": 123
+ },
+ "_direction": 0,
+ "_progress": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "17G7FnF3dC7ZeUEyMWd0lF"
},
{
"__type__": "cc.ClickEvent",
@@ -3703,7 +2924,7 @@
},
"component": "",
"_componentId": "f8ba4N+bqdD84IUK5j+GSAq",
- "handler": "onClickEngulfToggle",
+ "handler": "onSliderMove",
"customEventData": ""
},
{
@@ -3714,7 +2935,7 @@
"asset": {
"__id__": 0
},
- "fileId": "d0DZ2qqchC74h/KCryK3cD",
+ "fileId": "57San190RCpqFfHEhM0G2H",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -3729,12 +2950,12 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 167
+ "__id__": 137
},
"_contentSize": {
"__type__": "cc.Size",
"width": 550,
- "height": 700
+ "height": 400
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -3757,7 +2978,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 169
+ "__id__": 139
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -3802,7 +3023,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 171
+ "__id__": 141
},
"_id": ""
},
@@ -3833,7 +3054,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 174
+ "__id__": 144
},
"_contentSize": {
"__type__": "cc.Size",
@@ -3861,7 +3082,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 176
+ "__id__": 146
},
"_alignFlags": 45,
"_target": null,
@@ -3897,14 +3118,11 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 178
+ "__id__": 148
},
"mask": true,
"maskOpcity": 80,
"isClickMaskeClose": true,
- "views": {
- "__id__": 79
- },
"petNameLabel": {
"__id__": 7
},
@@ -3920,8 +3138,12 @@
"viewPetExpProgress": {
"__id__": 31
},
- "isEngulfToggle": {
- "__id__": 162
+ "petPreview": null,
+ "slider": {
+ "__id__": 132
+ },
+ "qsLabel": {
+ "__id__": 104
},
"_id": ""
},
@@ -3939,6 +3161,37 @@
},
"fileId": "08xLpDDa9NlK3pgR7XiOqb",
"instance": null,
- "targetOverrides": null
+ "targetOverrides": [
+ {
+ "__id__": 150
+ }
+ ],
+ "nestedPrefabInstanceRoots": [
+ {
+ "__id__": 63
+ }
+ ]
+ },
+ {
+ "__type__": "cc.TargetOverrideInfo",
+ "source": {
+ "__id__": 147
+ },
+ "sourceInfo": null,
+ "propertyPath": [
+ "petPreview"
+ ],
+ "target": {
+ "__id__": 63
+ },
+ "targetInfo": {
+ "__id__": 151
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "bc8qV/Jc9CToUMI6ap2Chd"
+ ]
}
]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
index 7c8274ce..fa04a6c1 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
@@ -25,17 +25,17 @@
"_active": true,
"_components": [
{
- "__id__": 121
+ "__id__": 104
},
{
- "__id__": 123
+ "__id__": 106
},
{
- "__id__": 125
+ "__id__": 108
}
],
"_prefab": {
- "__id__": 127
+ "__id__": 110
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -79,26 +79,26 @@
"__id__": 3
},
{
- "__id__": 51
+ "__id__": 34
},
{
- "__id__": 95
+ "__id__": 78
}
],
"_active": true,
"_components": [
{
- "__id__": 114
+ "__id__": 97
},
{
- "__id__": 116
+ "__id__": 99
},
{
- "__id__": 118
+ "__id__": 101
}
],
"_prefab": {
- "__id__": 120
+ "__id__": 103
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -143,22 +143,19 @@
},
{
"__id__": 12
- },
- {
- "__id__": 29
}
],
"_active": true,
"_components": [
{
- "__id__": 46
+ "__id__": 29
},
{
- "__id__": 48
+ "__id__": 31
}
],
"_prefab": {
- "__id__": 50
+ "__id__": 33
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -265,7 +262,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": -134.352,
+ "x": -146.352,
"y": -148.623,
"z": 0
}
@@ -331,8 +328,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 55.335,
- "y": -250,
+ "x": 108.301,
+ "y": -246.74,
"z": 0
},
"_lrot": {
@@ -693,398 +690,6 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
- {
- "__type__": "cc.Node",
- "_name": "升级",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 3
- },
- "_children": [
- {
- "__id__": 30
- }
- ],
- "_active": false,
- "_components": [
- {
- "__id__": 38
- },
- {
- "__id__": 40
- },
- {
- "__id__": 42
- }
- ],
- "_prefab": {
- "__id__": 45
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 185.335,
- "y": -250,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.Node",
- "_name": "Label",
- "_objFlags": 512,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 29
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 31
- },
- {
- "__id__": 33
- },
- {
- "__id__": 35
- }
- ],
- "_prefab": {
- "__id__": 37
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 30
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 32
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 120,
- "height": 50
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "17cEJcA/RL34duWdqZTKpA"
- },
- {
- "__type__": "cc.Label",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 30
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 34
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_string": "升级",
- "_horizontalAlign": 1,
- "_verticalAlign": 1,
- "_actualFontSize": 24,
- "_fontSize": 24,
- "_fontFamily": "Arial",
- "_lineHeight": 40,
- "_overflow": 1,
- "_enableWrapText": false,
- "_font": null,
- "_isSystemFontUsed": true,
- "_spacingX": 0,
- "_isItalic": false,
- "_isBold": true,
- "_isUnderline": false,
- "_underlineHeight": 2,
- "_cacheMode": 0,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "00FWHQq+VAr54r5EOahUvg"
- },
- {
- "__type__": "cc.LabelOutline",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 30
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 36
- },
- "_color": {
- "__type__": "cc.Color",
- "r": 0,
- "g": 0,
- "b": 0,
- "a": 255
- },
- "_width": 2,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "25cEjjThFN9I+wCFe0XNg/"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "13t7VoUf9DFKfa/JKDLMfc",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 29
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 39
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 120,
- "height": 50
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "41HcT5BDRE7aYf/wbXKdMw"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 29
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 41
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_spriteFrame": {
- "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 1,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "3fiav4BuhNxaAaG+oIySYE"
- },
- {
- "__type__": "cc.Button",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 29
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 43
- },
- "clickEvents": [
- {
- "__id__": 44
- }
- ],
- "_interactable": true,
- "_transition": 3,
- "_normalColor": {
- "__type__": "cc.Color",
- "r": 214,
- "g": 214,
- "b": 214,
- "a": 255
- },
- "_hoverColor": {
- "__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
- "a": 255
- },
- "_pressedColor": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_disabledColor": {
- "__type__": "cc.Color",
- "r": 124,
- "g": 124,
- "b": 124,
- "a": 255
- },
- "_normalSprite": {
- "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_hoverSprite": {
- "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_pressedSprite": {
- "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_disabledSprite": {
- "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_duration": 0.1,
- "_zoomScale": 1.2,
- "_target": {
- "__id__": 29
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "fa5nC7a5pDGqdZj5V01Y4g"
- },
- {
- "__type__": "cc.ClickEvent",
- "target": {
- "__id__": 1
- },
- "component": "",
- "_componentId": "00e5fiwk55OFq7ZIZmksXGJ",
- "handler": "onClickUpLevel",
- "customEventData": ""
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "b4o2Km/8BEz6xYUVBCwUVg",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1095,7 +700,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 47
+ "__id__": 30
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1123,7 +728,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 49
+ "__id__": 32
},
"_alignFlags": 41,
"_target": null,
@@ -1172,29 +777,29 @@
},
"_children": [
{
- "__id__": 52
+ "__id__": 35
},
{
- "__id__": 70
+ "__id__": 53
}
],
"_active": true,
"_components": [
{
- "__id__": 88
+ "__id__": 71
},
{
- "__id__": 90
+ "__id__": 73
},
{
- "__id__": 92
+ "__id__": 75
},
{
- "__id__": 85
+ "__id__": 68
}
],
"_prefab": {
- "__id__": 94
+ "__id__": 77
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1231,30 +836,30 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 51
+ "__id__": 34
},
"_children": [
{
- "__id__": 53
+ "__id__": 36
}
],
"_active": true,
"_components": [
{
- "__id__": 61
+ "__id__": 44
},
{
- "__id__": 63
+ "__id__": 46
},
{
- "__id__": 65
+ "__id__": 48
},
{
- "__id__": 67
+ "__id__": 50
}
],
"_prefab": {
- "__id__": 69
+ "__id__": 52
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1291,23 +896,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 52
+ "__id__": 35
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 54
+ "__id__": 37
},
{
- "__id__": 56
+ "__id__": 39
},
{
- "__id__": 58
+ "__id__": 41
}
],
"_prefab": {
- "__id__": 60
+ "__id__": 43
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1344,11 +949,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 53
+ "__id__": 36
},
"_enabled": true,
"__prefab": {
- "__id__": 55
+ "__id__": 38
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1372,11 +977,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 53
+ "__id__": 36
},
"_enabled": true,
"__prefab": {
- "__id__": 57
+ "__id__": 40
},
"_resizeMode": 1,
"_layoutType": 3,
@@ -1410,11 +1015,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 53
+ "__id__": 36
},
"_enabled": true,
"__prefab": {
- "__id__": 59
+ "__id__": 42
},
"_alignFlags": 40,
"_target": null,
@@ -1459,11 +1064,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 52
+ "__id__": 35
},
"_enabled": true,
"__prefab": {
- "__id__": 62
+ "__id__": 45
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1487,11 +1092,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 52
+ "__id__": 35
},
"_enabled": true,
"__prefab": {
- "__id__": 64
+ "__id__": 47
},
"_type": 0,
"_inverted": false,
@@ -1509,11 +1114,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 52
+ "__id__": 35
},
"_enabled": true,
"__prefab": {
- "__id__": 66
+ "__id__": 49
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1555,11 +1160,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 52
+ "__id__": 35
},
"_enabled": true,
"__prefab": {
- "__id__": 68
+ "__id__": 51
},
"_alignFlags": 45,
"_target": null,
@@ -1604,30 +1209,30 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 51
+ "__id__": 34
},
"_children": [
{
- "__id__": 71
+ "__id__": 54
}
],
"_active": true,
"_components": [
{
- "__id__": 77
+ "__id__": 60
},
{
- "__id__": 79
+ "__id__": 62
},
{
- "__id__": 81
+ "__id__": 64
},
{
- "__id__": 83
+ "__id__": 66
}
],
"_prefab": {
- "__id__": 87
+ "__id__": 70
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1664,20 +1269,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 70
+ "__id__": 53
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 72
+ "__id__": 55
},
{
- "__id__": 74
+ "__id__": 57
}
],
"_prefab": {
- "__id__": 76
+ "__id__": 59
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1714,11 +1319,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 71
+ "__id__": 54
},
"_enabled": true,
"__prefab": {
- "__id__": 73
+ "__id__": 56
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1742,11 +1347,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 71
+ "__id__": 54
},
"_enabled": true,
"__prefab": {
- "__id__": 75
+ "__id__": 58
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1800,11 +1405,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 70
+ "__id__": 53
},
"_enabled": true,
"__prefab": {
- "__id__": 78
+ "__id__": 61
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1828,11 +1433,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 70
+ "__id__": 53
},
"_enabled": true,
"__prefab": {
- "__id__": 80
+ "__id__": 63
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1873,11 +1478,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 70
+ "__id__": 53
},
"_enabled": true,
"__prefab": {
- "__id__": 82
+ "__id__": 65
},
"_alignFlags": 37,
"_target": null,
@@ -1909,17 +1514,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 70
+ "__id__": 53
},
"_enabled": true,
"__prefab": {
- "__id__": 84
+ "__id__": 67
},
"_scrollView": {
- "__id__": 85
+ "__id__": 68
},
"_handle": {
- "__id__": 74
+ "__id__": 57
},
"_direction": 1,
"_enableAutoHide": true,
@@ -1936,11 +1541,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 34
},
"_enabled": true,
"__prefab": {
- "__id__": 86
+ "__id__": 69
},
"bounceDuration": 0.23,
"brake": 0.75,
@@ -1951,11 +1556,11 @@
"cancelInnerEvents": true,
"scrollEvents": [],
"_content": {
- "__id__": 53
+ "__id__": 36
},
"_horizontalScrollBar": null,
"_verticalScrollBar": {
- "__id__": 83
+ "__id__": 66
},
"itemPrefab": {
"__uuid__": "b4e0f464-dc9f-463d-a392-7cc192779285",
@@ -1986,11 +1591,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 34
},
"_enabled": true,
"__prefab": {
- "__id__": 89
+ "__id__": 72
},
"_contentSize": {
"__type__": "cc.Size",
@@ -2014,11 +1619,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 34
},
"_enabled": true,
"__prefab": {
- "__id__": 91
+ "__id__": 74
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -2059,11 +1664,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 34
},
"_enabled": true,
"__prefab": {
- "__id__": 93
+ "__id__": 76
},
"_alignFlags": 45,
"_target": null,
@@ -2112,26 +1717,26 @@
},
"_children": [
{
- "__id__": 96
+ "__id__": 79
}
],
"_active": true,
"_components": [
{
- "__id__": 104
+ "__id__": 87
},
{
- "__id__": 106
+ "__id__": 89
},
{
- "__id__": 108
+ "__id__": 91
},
{
- "__id__": 111
+ "__id__": 94
}
],
"_prefab": {
- "__id__": 113
+ "__id__": 96
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -2168,23 +1773,23 @@
"_objFlags": 512,
"__editorExtras__": {},
"_parent": {
- "__id__": 95
+ "__id__": 78
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 97
+ "__id__": 80
},
{
- "__id__": 99
+ "__id__": 82
},
{
- "__id__": 101
+ "__id__": 84
}
],
"_prefab": {
- "__id__": 103
+ "__id__": 86
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -2221,11 +1826,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 96
+ "__id__": 79
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 81
},
"_contentSize": {
"__type__": "cc.Size",
@@ -2249,11 +1854,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 96
+ "__id__": 79
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 83
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -2294,11 +1899,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 96
+ "__id__": 79
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 85
},
"_color": {
"__type__": "cc.Color",
@@ -2333,11 +1938,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 95
+ "__id__": 78
},
"_enabled": true,
"__prefab": {
- "__id__": 105
+ "__id__": 88
},
"_contentSize": {
"__type__": "cc.Size",
@@ -2361,11 +1966,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 95
+ "__id__": 78
},
"_enabled": true,
"__prefab": {
- "__id__": 107
+ "__id__": 90
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -2406,15 +2011,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 95
+ "__id__": 78
},
"_enabled": true,
"__prefab": {
- "__id__": 109
+ "__id__": 92
},
"clickEvents": [
{
- "__id__": 110
+ "__id__": 93
}
],
"_interactable": true,
@@ -2466,7 +2071,7 @@
"_duration": 0.1,
"_zoomScale": 1.2,
"_target": {
- "__id__": 95
+ "__id__": 78
},
"_id": ""
},
@@ -2490,11 +2095,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 95
+ "__id__": 78
},
"_enabled": true,
"__prefab": {
- "__id__": 112
+ "__id__": 95
},
"_alignFlags": 4,
"_target": null,
@@ -2543,7 +2148,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 115
+ "__id__": 98
},
"_contentSize": {
"__type__": "cc.Size",
@@ -2571,7 +2176,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 117
+ "__id__": 100
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -2616,7 +2221,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 119
+ "__id__": 102
},
"_id": ""
},
@@ -2647,7 +2252,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 122
+ "__id__": 105
},
"_contentSize": {
"__type__": "cc.Size",
@@ -2675,7 +2280,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 124
+ "__id__": 107
},
"_alignFlags": 45,
"_target": null,
@@ -2711,17 +2316,17 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 126
+ "__id__": 109
},
"mask": true,
"maskOpcity": 80,
"isClickMaskeClose": true,
"views": {
- "__id__": 85
+ "__id__": 68
},
"petPreview": null,
"tacticalLabel": {
- "__id__": 99
+ "__id__": 82
},
"_id": ""
},
@@ -2741,7 +2346,7 @@
"instance": null,
"targetOverrides": [
{
- "__id__": 128
+ "__id__": 111
}
],
"nestedPrefabInstanceRoots": [
@@ -2753,7 +2358,7 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 125
+ "__id__": 108
},
"sourceInfo": null,
"propertyPath": [
@@ -2763,7 +2368,7 @@
"__id__": 4
},
"targetInfo": {
- "__id__": 129
+ "__id__": 112
}
},
{
diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts
index 5b024b25..54d03da9 100644
--- a/JisolGameCocos/assets/script/App.ts
+++ b/JisolGameCocos/assets/script/App.ts
@@ -28,12 +28,12 @@ import AppAction from "./AppAction";
import { Asset } from "cc";
import { Component } from "cc";
-// let APIPath = `http://localhost:8080`
-// let WsPath = `ws://localhost:8080/websocket`
+let APIPath = `http://localhost:8080`
+let WsPath = `ws://localhost:8080/websocket`
// let APIPath = `http://192.168.1.23:8080`
// let WsPath = `ws://192.168.1.23:8080/websocket`
-let APIPath = `http://192.168.0.118:8080`
-let WsPath = `ws://192.168.0.118:8080/websocket`
+// let APIPath = `http://192.168.0.118:8080`
+// let WsPath = `ws://192.168.0.118:8080/websocket`
// let APIPath = `https://api.pet.jisol.cn`
// let WsPath = `wss://api.pet.jisol.cn/websocket`
diff --git a/JisolGameCocos/assets/script/consts/API.ts b/JisolGameCocos/assets/script/consts/API.ts
index 2a1d2ebe..8c14ee7b 100644
--- a/JisolGameCocos/assets/script/consts/API.ts
+++ b/JisolGameCocos/assets/script/consts/API.ts
@@ -153,9 +153,7 @@ export const API = {
/********** 宠物接口 ******************/
GetPlayerPets: async () => RData(await app.api.get(`/game/pet/list`),false) as PlayerPetOV[], //获取玩家全部宠物
//petId 需合成的Id pets 被合成的Id列表
- PetUpStar: async (petId:number,pets:number[]) => RData(await app.api.post(`/game/pet/up/star`,{petId,pets}),true) as PlayerPetOV, //提升宠物星
- //petId 升级的宠物Id
- PetUpLevel: async (petId:number) => RData(await app.api.post(`/game/pet/up/level/${petId}`),true) as PlayerPetOV, //升级宠物
+ PetUpStar: async (petId:number,consume:number) => RData(await app.api.post(`/game/pet/up/star/${petId}/${consume}`),true) as PlayerPetOV, //提升宠物星
/********** 阵法接口 ******************/
GetPlayerTactical: async () => RData(await app.api.get(`/game/tactical/get`),false) as PlayerTacticalOV, //获取玩家阵法
diff --git a/JisolGameCocos/assets/script/consts/GAPI.ts b/JisolGameCocos/assets/script/consts/GAPI.ts
index ecf66be1..7624b35a 100644
--- a/JisolGameCocos/assets/script/consts/GAPI.ts
+++ b/JisolGameCocos/assets/script/consts/GAPI.ts
@@ -26,7 +26,7 @@ export const GAPI = {
//生成野怪
GOnHookSpawnCreeps : async () => RProto(await app.api.get(`/game/mode/onHook/onSpawnCreeps`,{responseType:'arraybuffer'},false),GActionType.GOnHookPets) as GOnHookPets,
//捕捉野怪
- GOnHookCatchCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onCatchCreeps/${creepId}`),true) as PlayerPetOV,
+ GOnHookCatchCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onCatchCreeps/${creepId}`),true) as boolean,
//出售野怪
GOnHookSellCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onSellCreeps/${creepId}`),true) as boolean,
//下一关
diff --git a/JisolGameCocos/assets/script/data/PlayerPetData.ts b/JisolGameCocos/assets/script/data/PlayerPetData.ts
index 2313ef02..1ad717db 100644
--- a/JisolGameCocos/assets/script/data/PlayerPetData.ts
+++ b/JisolGameCocos/assets/script/data/PlayerPetData.ts
@@ -98,23 +98,23 @@ export default class PlayerPetData extends BaseData{
if(operation == ResourceUpdateType.UPDATE){
//更新资源
//找到需要被刷新的宠物 然后刷新 找不到则添加
- let pet = this.datas.filter(pet => pet.petId == resource.petId)[0];
- if(pet){
+ let pet1 = this.datas.filter(pet => pet.petId == resource.petId)[0];
+ if(pet1){
//更新数据
- Object.assign(pet,resource);
- app.event.emit(PlayerPetEvent.UPDATE_INFO,pet)
+ Object.assign(pet1,resource);
+ app.event.emit(PlayerPetEvent.UPDATE_INFO,pet1)
}else{
operation = ResourceUpdateType.ADD;
this.onUpdateOV(operation,resource);
}
}else if(operation == ResourceUpdateType.ADD){
//查询如果没有这个宠物则添加 负责 刷新
- let pet = this.datas.filter(pet => pet.petId != resource.petId)[0];
- if(!pet){
+ let pet1 = this.datas.filter(pet => pet.petId == resource.petId)[0];
+ if(!pet1){
//没有则添加
this.datas.push(resource);
app.event.emit(PlayerPetEvent.UPDATE)
- app.event.emit(PlayerPetEvent.UPDATE_ADD,pet)
+ app.event.emit(PlayerPetEvent.UPDATE_ADD,resource)
}else{
operation = ResourceUpdateType.UPDATE;
this.onUpdateOV(operation,resource);
diff --git a/JisolGameCocos/assets/script/data/ResourceData.ts b/JisolGameCocos/assets/script/data/ResourceData.ts
index d80c8098..d40616a4 100644
--- a/JisolGameCocos/assets/script/data/ResourceData.ts
+++ b/JisolGameCocos/assets/script/data/ResourceData.ts
@@ -8,9 +8,12 @@ export enum ResourceEvent{
//资源类型
export enum ResourceType{
- Gold = 90001, //金币
- ForgedStones = 90002, //锻造石
- SpeedUp = 90003, //加速卷
+ Gold = 90001, //金币
+ ForgedStones = 90002, //锻造石
+ SpeedUp = 90003, //加速卷
+ DungeonGold = 90004, //钥匙:金币副本
+ DungeonForgedStones = 90005, //钥匙:锻造石副本
+ Q1S = 90006, //魂:一品宠物魂
}
//资源刷新类型
diff --git a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts
index 23fa63b4..f4787f9c 100644
--- a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts
+++ b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts
@@ -52,8 +52,6 @@ export default class GOnHookManager extends Singleton{
//需要捕捉的宠物
onHookCatchPets:TB.TbGRole[] = [];
- //需要主动吞噬的宠物 (主动吞噬其他 0星 宠物 升星)
- onHookEngulfPets:PlayerPetOV[] = [];
//是否挂机
_isOnHook:boolean = false;
@@ -93,21 +91,6 @@ export default class GOnHookManager extends Singleton{
await this.onSellCreeps(pet)
}
}
-
- //自动吞噬
- for (const item of this.onHookEngulfPets) {
-
- //获取可吞噬的宠物 ( 等级0, 同类宠物, 不是自己, 不在阵法中)
- let engulfs = PlayerPetData.getIns().getData()
- .filter(value => (value.petStar || 0) == 0 && item.petTbId == value.petTbId && item.petId != value.petId && PlayerTacticalData.getIns().getItemIndex(value.petId) != -1)
- .map(value => value.petId);
-
- //吞噬
- if(engulfs.length){
- await API.PetUpStar(item.petId,engulfs);
- }
-
- }
}).bind(this))
@@ -161,14 +144,7 @@ export default class GOnHookManager extends Singleton{
//通知添加野怪被删除
app.event.emit(GOnHookManagerEvent.DEL_KILL_SREEP,creeps);
- let pet:PlayerPetOV = await GAPI.GOnHookCatchCreeps(creeps.key);
-
- //保存宠物
- if(pet){
- PlayerPetData.getIns().addPet(pet);
- }
-
- return !!pet;
+ return !!await GAPI.GOnHookCatchCreeps(creeps.key);
}
diff --git a/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts
index d4240cce..099cc015 100644
--- a/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts
+++ b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts
@@ -4,23 +4,18 @@ import JNScrollView from '../../../../extensions/ngame/assets/ngame/util/compone
import PlayerPetData, { PlayerPetEvent } from '../../data/PlayerPetData';
import { API, PlayerPetOV } from '../../consts/API';
import { PetOV, PlayerPetOVSelect } from '../VO/PetOV';
-import { PetIconSelectScroll } from '../Consts/Pet/PetIconSelectScroll';
-import { NodeEventType } from 'cc';
import { Label } from 'cc';
import { app, TD } from '../../App';
-import { GUI } from '../UIConfig';
-import { ProgressBar } from 'cc';
import JProgressBar from '../../../../extensions/ngame/assets/ngame/util/components/Progress/JProgressBar';
-import { Toggle } from 'cc';
-import GOnHookManager from '../../manager/battle/mode/GOnHookManager';
+import { Slider } from 'cc';
+import ResourceData, { ResourceType } from '../../data/ResourceData';
+import { GUI } from '../UIConfig';
+import { PetPreviewWindow } from '../Consts/Pet/info/PetPreviewWindow';
const { ccclass, property } = _decorator;
@ccclass('PetUpStarView')
export class PetUpStarView extends JNLayerBase {
- @property(JNScrollView)
- views:JNScrollView; //宠物列表
-
@property(Label)
petNameLabel:Label; //宠物名称
@property(Label)
@@ -32,8 +27,27 @@ export class PetUpStarView extends JNLayerBase {
@property(JProgressBar)
viewPetExpProgress:JProgressBar; //预览宠物经验条
- @property(Toggle)
- isEngulfToggle:Toggle; //是否主动吞噬 0 星 宠物
+ @property(PetPreviewWindow)
+ petPreview:PetPreviewWindow; //宠物显示窗口
+
+ @property(Slider)
+ slider:Slider; //滑块
+
+ @property(Label)
+ qsLabel:Label; //魂数量
+
+ //消耗数量
+ _consume:number = 0;
+ get consume(){
+ return Math.min(ResourceData.getIns().getValue(ResourceType.Q1S),this._consume);
+ }
+ set consume(value:number){
+ let max = ResourceData.getIns().getValue(ResourceType.Q1S);
+ this._consume = value;
+ //修正
+ this.slider.progress = this.consume / max;
+ this.qsLabel.string = `${ResourceData.getIns().getValue(ResourceType.Q1S) - this.consume}`
+ }
data:PlayerPetOV;
@@ -45,39 +59,20 @@ export class PetUpStarView extends JNLayerBase {
//监听
app.event.on(PlayerPetEvent.UPDATE_INFO,this.onUpdateInfo,this); //刷新宠物信息
- app.event.on(PlayerPetEvent.UPDATE_MINUS,this.onPetMinus,this); //减少宠物
}
onJNClose(): void {
//取消监听
app.event.off(PlayerPetEvent.UPDATE_INFO,this.onUpdateInfo,this); //刷新宠物信息
- app.event.off(PlayerPetEvent.UPDATE_MINUS,this.onPetMinus,this); //减少宠物
}
//刷新页面
onUpdateView(){
-
+ //显示选中宠物
+ this.petPreview.bind(this.data);
this.onUpdateInfo();
-
- //当前需要升星的宠物并且未上阵 并且排除自己
- let pets = PetOV.PlayerPetOVSelects(
- PlayerPetData.getIns().getPetIdData(
- this.data.petTbId, //同一种宠物
- PlayerPetData.getIns().getNoTacticalData() //非上阵宠物
- ).filter(pet => pet.petId != this.data.petId) //排除自己
- );
- this.views.refreshData(pets);
-
- //向子节点添加点击事件
- this.views.addItemEvent(NodeEventType.TOUCH_START,this.onClickItem.bind(this));
-
- this.onUpdateSelect();
-
- //更新吞噬
- this.isEngulfToggle.isChecked = GOnHookManager.getIns().onHookEngulfPets.indexOf(this.data) >= 0;
-
}
//刷新信息
@@ -91,37 +86,15 @@ export class PetUpStarView extends JNLayerBase {
this.petStarExp.string = `升级进度: ${upStarExp} / ${this.data.petStarExp}`;
this.petExpProgress.value = this.data.petStar + (this.data.petStarExp / upStarExp);
- }
-
- //减少宠物
- onPetMinus(pet:PlayerPetOV){
- this.views.getItems<PetIconSelectScroll>().forEach(item => {
- if(item.data.petId == pet.petId)
- this.views.delData(item.data);
- });
- }
-
- //刷新选择
- onUpdateSelect(){
-
- //刷新
- this.views.getItems<PetIconSelectScroll>().forEach((item) => {
- let data = item.data as PlayerPetOVSelect;
- item.select.isSelect = data.isSelect;
- })
-
- this.onUpdatePreview();
+ this.qsLabel.string = `${ResourceData.getIns().getValue(ResourceType.Q1S) - this.consume}`
}
//更新预览进度条
onUpdatePreview(){
- //选择得到的经验
- let exp = this.views.getItems<PetIconSelectScroll>().filter(item => item.select.isSelect).length;
-
let upStarExp;
- let petStarExp = this.data.petStarExp + exp;
+ let petStarExp = this.data.petStarExp + this.consume;
let petStar = this.data.petStar;
while(petStarExp >= (upStarExp = TD.TbGRoleUpStar.get(petStar + 1).merge)){
@@ -133,50 +106,41 @@ export class PetUpStarView extends JNLayerBase {
this.petStarExp.string = `升级进度: ${upStarExp} / ${petStarExp}`;
//预览进度
this.viewPetExpProgress.value = petStar + (petStarExp / upStarExp);
+ this.qsLabel.string = `${ResourceData.getIns().getValue(ResourceType.Q1S) - this.consume}`
+
+ }
+
+ //滑动滑块
+ onSliderMove(slider: Slider){
+
+ let max = ResourceData.getIns().getValue(ResourceType.Q1S);
+ if(!max){
+ this.consume = 0;
+ return;
+ }
+ this.consume = Math.ceil(max * slider.progress);
+
+ this.onUpdatePreview();
}
//选择全部
onClickAll(){
- let pets = this.views.getData<PlayerPetOVSelect>();
- //如果全部选择则全部取消
- if(pets.filter(pet => pet.isSelect).length == pets.length){
- pets.forEach(pet => pet.isSelect = false);
- }else{
- pets.forEach(pet => pet.isSelect = true);
- }
- this.onUpdateSelect();
- }
- //点击Item
- onClickItem(index:number){
- let pets = this.views.getData<PlayerPetOVSelect>();
- pets[index].isSelect = !pets[index].isSelect;
- this.onUpdateSelect();
}
//点击合成
async onClickUp(){
- //获取被合成的Id
- let pets = this.views.getData<PlayerPetOVSelect>().filter(pet => pet.isSelect).map(pet => pet.petId);
-
- if(pets.length <= 0){
- app.layer.Open(GUI.Tips,{text:"请选择需要被合成的宠物"});
+ if(!this.consume){
+ app.layer.Open(GUI.Tips,{text:"拖拽进行升星吧~"})
return;
}
- await API.PetUpStar(this.data.petId,pets);
+ await API.PetUpStar(this.data.petId,this.consume);
+ this.consume = 0;
}
-
- //点击吞噬选择
- onClickEngulfToggle(){
- GOnHookManager.getIns().onHookEngulfPets.splice(GOnHookManager.getIns().onHookEngulfPets.indexOf(this.data),1);
- if(this.isEngulfToggle.isChecked){
- GOnHookManager.getIns().onHookEngulfPets.push(this.data);
- }
- }
}
diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts
index 0a1b7f8e..d3f44e24 100644
--- a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts
+++ b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts
@@ -193,17 +193,6 @@ export class IntoBattleView extends JNLayerBase {
}
- //点击升级
- async onClickUpLevel(){
- if(this.index < 0){
- app.layer.Open(GUI.Tips,{text:"请选择宠物."})
- return;
- }
- await API.PetUpLevel(this.pets[this.index].petId)
- }
-
-
-
}
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
index ad259817..7b88cc3b 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
@@ -1,6 +1,7 @@
package cn.jisol.game.controller.game;
import cn.jisol.game.controller.argsresolver.CurrentPlayer;
+import cn.jisol.game.data.ResourceId;
import cn.jisol.game.data.TD;
import cn.jisol.game.entity.table.Player;
import cn.jisol.game.entity.table.PlayerPet;
@@ -8,7 +9,6 @@ import cn.jisol.game.service.PlayerPetService;
import cn.jisol.game.service.ResourceService;
import cn.jisol.game.vo.news.NewsResource;
import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
-import cn.jisol.game.vo.pet.PetUpStarOV;
import cn.jisol.ngame.util.NewsContext;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api;
@@ -23,6 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import static java.awt.SystemColor.info;
+
/**
* 玩家宠物
*/
@@ -54,43 +56,30 @@ public class GPlayerPetController {
//提升宠物星
@ApiImplicitParams({})
@ApiOperation(value = "提升宠物星")
- @PostMapping("/up/star")
+ @PostMapping("/up/star/{petId}/{num}")
@Transactional
- public NewsResource<PlayerPet> onUpStar(@RequestBody PetUpStarOV info, @CurrentPlayer Player player){
+ public NewsResource<PlayerPet> onUpStar(@CurrentPlayer Player player, @PathVariable String petId, @PathVariable Integer num){
//判断参数
- if(info.getPets().size() <= 0 || Objects.isNull(info.getPetId())){
+ if(Objects.isNull(num) || num <= 0 || Objects.isNull(petId)){
return NewsResource.onFail("参数错误");
}
-
- //查询被合成的宠物列表
- //合成数量
- long petCount = playerPetService.count(
- Wrappers.lambdaQuery(PlayerPet.class)
- .eq(PlayerPet::getPetPlayerId, player.getPlayerId())
- .and(qr -> {
- //遍历被合成的宠物
- info.getPets().forEach(petId -> {
- qr.eq(PlayerPet::getPetId, petId);
- qr.or();
- });
- })
- );
-
- if(info.getPets().size() != petCount){
- return NewsResource.onFail("合成宠物信息错误");
- }
+ //整理刷新数据
+ ArrayList<ResourceUpdateOV> resources = new ArrayList<>();
//查询被升级的宠物
- PlayerPet pet = playerPetService.getById(info.getPetId());
+ PlayerPet pet = playerPetService.getById(petId);
//判断宠物是否是自己的
if(!Objects.equals(pet.getPetPlayerId(), player.getPlayerId())){
return NewsResource.onFail("宠物不是自己的");
}
+ //扣除魂
+ resources.add(ResourceUpdateOV.onUpdate(resourceService.addResourceValue(player.getPlayerId(), ResourceId.Q1S.id, (long) -num)));
+
//升级星
- pet.setPetStarExp(pet.getPetStarExp() + info.getPets().size());
+ pet.setPetStarExp(pet.getPetStarExp() + num);
//判断是否可以升下一星 如果可以则 升
int upStarExp;
@@ -104,56 +93,11 @@ public class GPlayerPetController {
//保存宠物信息 (保存失败则重试)
if(!playerPetService.updateById(pet)) throw new RetryException("");
- //删除被合成的宠物
- playerPetService.removeByIds(info.getPets());
-
- //整理刷新数据
- ArrayList<ResourceUpdateOV> resources = new ArrayList<>();
//刷新宠物
resources.add(ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.UPDATE,pet));
- //删除被合成的宠物
- info.getPets().forEach(item -> {
- resources.add(ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.MINUS,PlayerPet.builder().petId(new Long(item)).build()));
- });
return NewsResource.onSuccess("升星成功",null, resources.toArray(new ResourceUpdateOV[0]));
}
-// //提升宠物等级
-// @ApiImplicitParams({})
-// @ApiOperation(value = "提升宠物等级")
-// @PostMapping("/up/level/{petId}")
-// @Transactional
-// public NewsResource<PlayerPet> onUpLevel(@PathVariable Integer petId, @CurrentPlayer Player player){
-//
-//
-// //获取需要升级的宠物
-// PlayerPet pet = playerPetService.getById(petId);
-// if(Objects.isNull(pet) || !Objects.equals(pet.getPetPlayerId(), player.getPlayerId())){
-// return NewsResource.onFail("你未拥有这个宠物");
-// }
-//
-// TbGRoleUpLevel resource = TD.DATA.getTbGRoleUpLevel().get(pet.getPetLevel() + 1);
-//
-// if(Objects.isNull(resource)) return NewsResource.onFail("无法升级");
-//
-// //星级不够则 无法升级
-// if(pet.getPetStar() * 10 <= pet.getPetLevel()){
-// return NewsResource.onFail("突破星级 可升级");
-// }
-// //扣除玩家材料
-// ArrayList<ResourceUpdateOV> resources = new ArrayList<>(resourceService.deduct(player, resource.materials));
-//
-// //升级
-// pet.setPetLevel(pet.getPetLevel() + 1);
-//
-// //保存
-// if(!playerPetService.updateById(pet)) throw new RetryException("");
-// resources.add(ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.UPDATE,pet)); //刷新宠物
-//
-// return NewsResource.onSuccess("升级成功",pet,resources.toArray(new ResourceUpdateOV[0]));
-//
-// }
-
}
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java
index 27e0b780..3d29b5b8 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java
@@ -22,6 +22,7 @@ import cn.jisol.game.vo.mode.ModeOnHookRankingOV;
import cn.jisol.game.vo.news.NewsResource;
import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
import cn.jisol.ngame.util.NewsContext;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -228,7 +229,7 @@ public class GOnHookController {
@ApiImplicitParams({})
@ApiOperation(value = "捕捉野怪")
@PostMapping("/onCatchCreeps/{creepId}")
- public NewsContext<PlayerPet> onCatchCreeps(@PathVariable String creepId,@CurrentPlayer Player player){
+ public NewsResource<Boolean> onCatchCreeps(@PathVariable String creepId,@CurrentPlayer Player player){
//(目前测试阶段 捕捉概率 100%)
@@ -238,22 +239,22 @@ public class GOnHookController {
//如果没有则生成类
if(Objects.isNull(creeps)){
CREEPS.put(player.getPlayerId(),creeps = new HashMap<>());
- return NewsContext.onFail("捕捉失败");
+ return NewsResource.onFail("捕捉失败",false);
}
GOnHookMessage.GOnHookPet onHookPet;
if(Objects.isNull(onHookPet = creeps.remove(creepId))){
- return NewsContext.onFail("捕捉失败");
+ return NewsResource.onFail("捕捉失败",false);
}
//捕捉
PlayerPet pet = PlayerPet.builder().petPlayerId(player.getPlayerId()).petTbId(onHookPet.getPetTbId()).build();
- if(playerPetService.save(pet)){
- return NewsContext.onSuccess("捕捉成功",pet);
+ ResourceUpdateOV ov = playerPetService.addPlayerPet(player, pet);
+ if (Objects.nonNull(ov)){
+ return NewsResource.onSuccess("捕捉成功",true,ov);
}else{
- return NewsContext.onFail("捕捉失败");
+ return NewsResource.onSuccess("捕捉失败",false);
}
-
}
//排行榜
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/data/ResourceId.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/data/ResourceId.java
index a0865fef..bc05d0f0 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/data/ResourceId.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/data/ResourceId.java
@@ -8,6 +8,12 @@ public enum ResourceId {
ForgedStones(90002),
//加速卷
SpeedUp(90003),
+ //钥匙:金币副本
+ DungeonGold(90004),
+ //钥匙:锻造石副本
+ DungeonForgedStones(90005),
+ //魂:一品宠物魂
+ Q1S(90006),
;
public int id;
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerPetService.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerPetService.java
index 845a7886..050b89bf 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerPetService.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerPetService.java
@@ -1,8 +1,13 @@
package cn.jisol.game.service;
+import cn.jisol.game.entity.table.Player;
import cn.jisol.game.entity.table.PlayerPet;
+import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
import com.baomidou.mybatisplus.extension.service.IService;
public interface PlayerPetService extends IService<PlayerPet> {
+ //给指定的玩家添加宠物
+ ResourceUpdateOV addPlayerPet(Player player, PlayerPet pet);
+
}
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerPetServiceImpl.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerPetServiceImpl.java
index 96786822..2960f458 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerPetServiceImpl.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerPetServiceImpl.java
@@ -1,12 +1,40 @@
package cn.jisol.game.service.impl;
+import cn.jisol.game.data.ResourceId;
+import cn.jisol.game.entity.table.Player;
import cn.jisol.game.entity.table.PlayerPet;
+import cn.jisol.game.entity.table.Resource;
import cn.jisol.game.mapper.PlayerPetMapper;
import cn.jisol.game.service.PlayerPetService;
+import cn.jisol.game.service.ResourceService;
+import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class PlayerPetServiceImpl extends ServiceImpl<PlayerPetMapper, PlayerPet> implements PlayerPetService {
+ @Autowired
+ ResourceService resourceService;
+
+ @Override
+ public ResourceUpdateOV addPlayerPet(Player player, PlayerPet pet) {
+
+ //是否有这个宠物
+ long count = this.count(Wrappers.lambdaQuery(PlayerPet.class)
+ .eq(PlayerPet::getPetPlayerId,player.getPlayerId())
+ .eq(PlayerPet::getPetTbId,pet.getPetTbId()));
+
+ if(count > 0){
+ //如果有这个宠物则转换成材料
+ return ResourceUpdateOV.onUpdate(resourceService.addResourceValue(player.getPlayerId(),ResourceId.Q1S.id, 1L));
+ }else{
+ if (this.save(pet)){
+ return ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.ADD,pet);
+ }
+ return null;
+ }
+ }
}
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java
deleted file mode 100644
index aa6896c6..00000000
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.jisol.game.vo.pet;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
-import lombok.Data;
-
-import java.util.ArrayList;
-
-@ApiModel(value = "升星请求体")
-@Builder
-@Data
-public class PetUpStarOV {
-
- @ApiModelProperty(value = "需要升级的宠物Id", required = true)
- private Integer petId;
-
- @ApiModelProperty(value = "被吸收的宠物列表", required = true)
- ArrayList<Integer> pets;
-
-}
diff --git a/JisolGameServer/Main/src/main/resources/json/tbgresource.json b/JisolGameServer/Main/src/main/resources/json/tbgresource.json
index efc4cb55..90315e3c 100644
--- a/JisolGameServer/Main/src/main/resources/json/tbgresource.json
+++ b/JisolGameServer/Main/src/main/resources/json/tbgresource.json
@@ -28,5 +28,11 @@
"name": "钥匙:锻造石副本",
"tig": "锻造石副本的钥匙",
"args": ""
+ },
+ {
+ "id": 90006,
+ "name": "魂:一品宠物魂",
+ "tig": "用于宠物升星",
+ "args": ""
}
]
\ No newline at end of file
diff --git a/JisolGameServer/Main/src/main/resources/json/tbgroleupstar.json b/JisolGameServer/Main/src/main/resources/json/tbgroleupstar.json
index 6edcb88e..12a6662d 100644
--- a/JisolGameServer/Main/src/main/resources/json/tbgroleupstar.json
+++ b/JisolGameServer/Main/src/main/resources/json/tbgroleupstar.json
@@ -38,5 +38,85 @@
{
"grade": 10,
"merge": 512
+ },
+ {
+ "grade": 11,
+ "merge": 1024
+ },
+ {
+ "grade": 12,
+ "merge": 2048
+ },
+ {
+ "grade": 13,
+ "merge": 4096
+ },
+ {
+ "grade": 14,
+ "merge": 8192
+ },
+ {
+ "grade": 15,
+ "merge": 16384
+ },
+ {
+ "grade": 16,
+ "merge": 32768
+ },
+ {
+ "grade": 17,
+ "merge": 65536
+ },
+ {
+ "grade": 18,
+ "merge": 131072
+ },
+ {
+ "grade": 19,
+ "merge": 262144
+ },
+ {
+ "grade": 20,
+ "merge": 524288
+ },
+ {
+ "grade": 21,
+ "merge": 1048576
+ },
+ {
+ "grade": 22,
+ "merge": 2097152
+ },
+ {
+ "grade": 23,
+ "merge": 4194304
+ },
+ {
+ "grade": 24,
+ "merge": 8388608
+ },
+ {
+ "grade": 25,
+ "merge": 16777216
+ },
+ {
+ "grade": 26,
+ "merge": 33554432
+ },
+ {
+ "grade": 27,
+ "merge": 67108864
+ },
+ {
+ "grade": 28,
+ "merge": 134217728
+ },
+ {
+ "grade": 29,
+ "merge": 268435456
+ },
+ {
+ "grade": 30,
+ "merge": 536870912
}
]
\ No newline at end of file