From a153d98cf1972bfc6b2ebd6b689d44422a337739 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5RP3AKU\\Jisol" <2858626794@qq.com> Date: Tue, 9 Jan 2024 04:33:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prefab/ui/主页/锻造台/锻造台.prefab | 551 ++-- .../prefab/ui/宠物/宠物升星页面.prefab | 4 +- .../prefab/ui/宠物/宠物单选页面.prefab | 2531 +---------------- .../ui/宠物装备/弹出锻造装备页面.prefab | 6 +- .../宠物/icon/列表选择宠物ICON.prefab.meta | 2 +- .../{选择宠物ICON.prefab => 选中宠物ICON.prefab} | 4 +- ...宠物ICON.prefab.meta => 选中宠物ICON.prefab.meta} | 2 +- .../宠物/icon/选择宠物展示ICON.prefab | 687 +++++ .../宠物/icon/选择宠物展示ICON.prefab.meta | 13 + .../prefab/ui/模式/PVP/PVP匹配页面.prefab | 6 +- .../prefab/ui/阵法/阵法选择页面.prefab | 2 +- JisolGameCocos/assets/script/App.ts | 8 +- .../assets/script/action/PVPAction.ts | 5 +- .../base/attack/GAttackParabolicBangRemote.ts | 2 - JisolGameCocos/assets/script/consts/API.ts | 2 +- .../assets/script/data/PetEquipData.ts | 17 +- .../script/ui/Consts/Pet/PetIconSelectShow.ts | 34 + .../Pet/PetIconSelectShow.ts.meta} | 2 +- .../ui/Home/ForgingBench/MainForgingBench.ts | 44 +- .../{PVPMatchView.ts => PVPModeMatchView.ts} | 5 +- .../ui/Mode/PVP/PVPModeMatchView.ts.meta | 9 + .../assets/script/ui/Pet/PetRadioView.ts | 78 + .../ui/PetEquip/PetEquipForgingPopupView.ts | 19 +- JisolGameCocos/extensions/ngame | 2 +- .../java/cn/jisol/game/JGameApplication.java | 1 + .../exception/ResourceInitException.java | 9 + .../game/GPlayerEquipController.java | 1 + .../controller/game/GPlayerPetController.java | 1 + .../service/impl/ResourceServiceImpl.java | 16 +- 29 files changed, 1337 insertions(+), 2726 deletions(-) rename JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/{选择宠物ICON.prefab => 选中宠物ICON.prefab} (99%) rename JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/{选择宠物ICON.prefab.meta => 选中宠物ICON.prefab.meta} (82%) create mode 100644 JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab create mode 100644 JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab.meta create mode 100644 JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectShow.ts rename JisolGameCocos/assets/script/ui/{Mode/PVP/PVPMatchView.ts.meta => Consts/Pet/PetIconSelectShow.ts.meta} (70%) rename JisolGameCocos/assets/script/ui/Mode/PVP/{PVPMatchView.ts => PVPModeMatchView.ts} (90%) create mode 100644 JisolGameCocos/assets/script/ui/Mode/PVP/PVPModeMatchView.ts.meta create mode 100644 JisolGameServer/Main/src/main/java/cn/jisol/game/controller/exception/ResourceInitException.java diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab index 2b320d5f..bd6e1921 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab @@ -25,26 +25,26 @@ "__id__": 68 }, { - "__id__": 85 + "__id__": 89 }, { - "__id__": 102 + "__id__": 106 } ], "_active": true, "_components": [ - { - "__id__": 119 - }, - { - "__id__": 121 - }, { "__id__": 123 + }, + { + "__id__": 125 + }, + { + "__id__": 127 } ], "_prefab": { - "__id__": 125 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -1597,7 +1597,7 @@ }, { "__type__": "cc.Node", - "_name": "宠物", + "_name": "锻造宠", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -1611,22 +1611,19 @@ "_active": true, "_components": [ { - "__id__": 77 + "__id__": 83 }, { - "__id__": 79 - }, - { - "__id__": 81 + "__id__": 85 } ], "_prefab": { - "__id__": 84 + "__id__": 88 }, "_lpos": { "__type__": "cc.Vec3", - "x": 251.589, - "y": -110.305, + "x": 256.96, + "y": -111.324, "z": 0 }, "_lrot": { @@ -1654,56 +1651,161 @@ }, { "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 512, - "__editorExtras__": {}, + "_objFlags": 0, "_parent": { "__id__": 68 }, - "_children": [], - "_active": true, - "_components": [ + "_prefab": { + "__id__": 70 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 69 + }, + "asset": { + "__uuid__": "c7577a1e-d03c-4b53-8670-089ccbfeb272", + "__expectedType__": "cc.Prefab" + }, + "fileId": "13NgoTXGpMRapTmp+uDndV", + "instance": { + "__id__": 71 + }, + "targetOverrides": [ { - "__id__": 70 - }, + "__id__": 80 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "8e0mByIjhCL4XIPZB0LFHf", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ { "__id__": 72 }, { "__id__": 74 + }, + { + "__id__": 76 + }, + { + "__id__": 78 } ], - "_prefab": { - "__id__": 76 + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 73 }, - "_lpos": { + "propertyPath": [ + "_name" + ], + "value": "选择宠物展示ICON" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "13NgoTXGpMRapTmp+uDndV" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_lpos" + ], + "value": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "13NgoTXGpMRapTmp+uDndV" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 77 }, - "_lrot": { + "propertyPath": [ + "_lrot" + ], + "value": { "__type__": "cc.Quat", "x": 0, "y": 0, "z": 0, "w": 1 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "13NgoTXGpMRapTmp+uDndV" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 79 }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { + "propertyPath": [ + "_euler" + ], + "value": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "13NgoTXGpMRapTmp+uDndV" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "petIcon" + ], + "target": { + "__id__": 81 }, - "_id": "" + "targetInfo": { + "__id__": 82 + } + }, + { + "__type__": "cc.Node", + "__editorExtras__": {} + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "a8v6Wyt6FBsbms2ouS3gEa" + ] }, { "__type__": "cc.UITransform", @@ -1711,11 +1813,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1731,164 +1833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "95T/gOHudIuYgzZX23mI9T" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 69 - }, - "_enabled": true, - "__prefab": { - "__id__": 73 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "+", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 110, - "_fontSize": 110, - "_fontFamily": "Arial", - "_lineHeight": 120, - "_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": "25QELCF/FD8qMBYhU8/Z1s" - }, - { - "__type__": "cc.LabelOutline", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 69 - }, - "_enabled": true, - "__prefab": { - "__id__": 75 - }, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_width": 4, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8aUomAsWxGGaxW3abAwyUb" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c4sQZI43VJk4G7lCYdQyx2", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 68 - }, - "_enabled": true, - "__prefab": { - "__id__": 78 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4fnyc7PKBKuIy7GIcCsux6" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 68 - }, - "_enabled": true, - "__prefab": { - "__id__": 80 - }, - "_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": "d0AUv0uTJIVaVL7fywKL0N" + "fileId": "725c4U2oFKm4YRU1ig4k1e" }, { "__type__": "cc.Button", @@ -1900,20 +1845,20 @@ }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 86 }, "clickEvents": [ { - "__id__": 83 + "__id__": 87 } ], "_interactable": true, "_transition": 3, "_normalColor": { "__type__": "cc.Color", - "r": 214, - "g": 214, - "b": 214, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_hoverColor": { @@ -1937,39 +1882,27 @@ "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" - }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, - "_target": { - "__id__": 68 - }, + "_target": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2aCkgqRIxAUIIAeP9dHfxD" + "fileId": "93KjTr2HxMo5mJZU3c9imz" }, { "__type__": "cc.ClickEvent", - "target": null, + "target": { + "__id__": 1 + }, "component": "", - "_componentId": "", - "handler": "", + "_componentId": "9b2f1EJsLxM/JeOdoryoJsl", + "handler": "onClickForgingPet", "customEventData": "" }, { @@ -1980,7 +1913,7 @@ "asset": { "__id__": 0 }, - "fileId": "13NgoTXGpMRapTmp+uDndV", + "fileId": "4fSSyCTt9J47fFrJZFAXZS", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1995,23 +1928,23 @@ }, "_children": [ { - "__id__": 86 + "__id__": 90 } ], "_active": true, "_components": [ - { - "__id__": 94 - }, - { - "__id__": 96 - }, { "__id__": 98 + }, + { + "__id__": 100 + }, + { + "__id__": 102 } ], "_prefab": { - "__id__": 101 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -2048,23 +1981,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 85 + "__id__": 89 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 87 - }, - { - "__id__": 89 - }, { "__id__": 91 + }, + { + "__id__": 93 + }, + { + "__id__": 95 } ], "_prefab": { - "__id__": 93 + "__id__": 97 }, "_lpos": { "__type__": "cc.Vec3", @@ -2101,11 +2034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", @@ -2129,11 +2062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 94 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2174,11 +2107,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 96 }, "_color": { "__type__": "cc.Color", @@ -2213,11 +2146,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -2241,11 +2174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 101 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2286,15 +2219,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 103 }, "clickEvents": [ { - "__id__": 100 + "__id__": 104 } ], "_interactable": true, @@ -2346,7 +2279,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 85 + "__id__": 89 }, "_id": "" }, @@ -2387,23 +2320,23 @@ }, "_children": [ { - "__id__": 103 + "__id__": 107 } ], "_active": true, "_components": [ - { - "__id__": 111 - }, - { - "__id__": 113 - }, { "__id__": 115 + }, + { + "__id__": 117 + }, + { + "__id__": 119 } ], "_prefab": { - "__id__": 118 + "__id__": 122 }, "_lpos": { "__type__": "cc.Vec3", @@ -2440,23 +2373,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 102 + "__id__": 106 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 104 - }, - { - "__id__": 106 - }, { "__id__": 108 + }, + { + "__id__": 110 + }, + { + "__id__": 112 } ], "_prefab": { - "__id__": 110 + "__id__": 114 }, "_lpos": { "__type__": "cc.Vec3", @@ -2493,11 +2426,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 109 }, "_contentSize": { "__type__": "cc.Size", @@ -2521,11 +2454,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 111 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2566,11 +2499,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 113 }, "_color": { "__type__": "cc.Color", @@ -2605,11 +2538,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 106 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 116 }, "_contentSize": { "__type__": "cc.Size", @@ -2633,11 +2566,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 106 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 118 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2678,15 +2611,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 106 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 120 }, "clickEvents": [ { - "__id__": 117 + "__id__": 121 } ], "_interactable": true, @@ -2738,7 +2671,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 102 + "__id__": 106 }, "_id": "" }, @@ -2777,7 +2710,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 124 }, "_contentSize": { "__type__": "cc.Size", @@ -2805,7 +2738,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 126 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2850,8 +2783,9 @@ }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 128 }, + "petView": null, "_id": "" }, { @@ -2868,6 +2802,37 @@ }, "fileId": "bdtesuqqNGPpKG+sSNpvIP", "instance": null, - "targetOverrides": null + "targetOverrides": [ + { + "__id__": 130 + } + ], + "nestedPrefabInstanceRoots": [ + { + "__id__": 69 + } + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 127 + }, + "sourceInfo": null, + "propertyPath": [ + "petView" + ], + "target": { + "__id__": 69 + }, + "targetInfo": { + "__id__": 131 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "85ruk0B3NFoqyJzn5uu35A" + ] } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab index 87f2ffa7..0dc39b34 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab @@ -1854,7 +1854,7 @@ "__id__": 77 }, "itemPrefab": { - "__uuid__": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae", + "__uuid__": "b4e0f464-dc9f-463d-a392-7cc192779285", "__expectedType__": "cc.Prefab" }, "_id": "" @@ -2367,8 +2367,6 @@ "__id__": 0 }, "fileId": "55goghBf5GPogIe1/0pw20", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物单选页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物单选页面.prefab index a7114018..f5433b06 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__": 71 }, { - "__id__": 175 + "__id__": 73 }, { - "__id__": 177 + "__id__": 75 } ], "_prefab": { - "__id__": 179 + "__id__": 77 }, "_lpos": { "__type__": "cc.Vec3", @@ -79,32 +79,23 @@ "__id__": 3 }, { - "__id__": 63 - }, - { - "__id__": 107 - }, - { - "__id__": 124 - }, - { - "__id__": 143 + "__id__": 47 } ], "_active": true, "_components": [ { - "__id__": 166 + "__id__": 64 }, { - "__id__": 168 + "__id__": 66 }, { - "__id__": 170 + "__id__": 68 } ], "_prefab": { - "__id__": 172 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -135,1302 +126,6 @@ }, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "宠物信息", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [ - { - "__id__": 4 - }, - { - "__id__": 12 - }, - { - "__id__": 20 - }, - { - "__id__": 34 - }, - { - "__id__": 48 - } - ], - "_active": true, - "_components": [ - { - "__id__": 56 - }, - { - "__id__": 58 - }, - { - "__id__": 60 - } - ], - "_prefab": { - "__id__": 62 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 300, - "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__": 3 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - } - ], - "_prefab": { - "__id__": 11 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -119.162, - "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__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 107.9921875, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 1, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "80NvSmIJhI1oppWGM4TMNj" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "_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": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "3fZlyISnBFRobyOuYI6dAM" - }, - { - "__type__": "cc.LabelOutline", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 10 - }, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_width": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "2adZhYHPhOzaNgzxQNNzFn" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "7cum5U/zJCIbHN01vcrhh+", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "经验进度", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 13 - }, - { - "__id__": 15 - }, - { - "__id__": 17 - } - ], - "_prefab": { - "__id__": 19 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 68.52, - "y": 22.31, - "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__": 12 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 220.669921875, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f2CYvG0jFPHJQoo2wb8oXT" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 12 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "升级所需经验 / 当前经验", - "_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": "a7lp1lNQRMl7RebAeLqmZA" - }, - { - "__type__": "cc.LabelOutline", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 12 - }, - "_enabled": true, - "__prefab": { - "__id__": 18 - }, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_width": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "32XiHbR4dJUZ+H0C7GrQHP" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "98m9uxahdOF7sZs241zZ0K", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "预览经验条", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, - "_children": [ - { - "__id__": 21 - } - ], - "_active": true, - "_components": [ - { - "__id__": 27 - }, - { - "__id__": 29 - }, - { - "__id__": 31 - } - ], - "_prefab": { - "__id__": 33 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 68.52, - "y": -2.96, - "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__": 20 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 22 - }, - { - "__id__": 24 - } - ], - "_prefab": { - "__id__": 26 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -150, - "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__": 21 - }, - "_enabled": true, - "__prefab": { - "__id__": 23 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 0, - "height": 15 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "04yn5gdT9H6prns8f4vtwT" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 21 - }, - "_enabled": true, - "__prefab": { - "__id__": 25 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 155, - "g": 155, - "b": 155, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "24a704da-2867-446d-8d1a-5e920c75e09d@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": "15K5on3ZtM2I259jz/+Jfk" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d2XY0P79pJm4Lb7uwM7V48", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 20 - }, - "_enabled": true, - "__prefab": { - "__id__": 28 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 300, - "height": 15 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8emMnBU4BNTKGMmkrl1j68" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 20 - }, - "_enabled": true, - "__prefab": { - "__id__": 30 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "9fd900dd-221b-4f89-8f2c-fba34243c835@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": "37deaMph1MKbayEDbE7t2P" - }, - { - "__type__": "54eabRpC7dM+4sLiGfqzWWw", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 20 - }, - "_enabled": true, - "__prefab": { - "__id__": 32 - }, - "_barSprite": { - "__id__": 24 - }, - "_mode": 0, - "_totalLength": 300, - "_progress": 0, - "_reverse": false, - "scaleTime": 4, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "5cKp3l3TpL0r+Ic0Q2WfsL" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "52IYN/Qg9Ee4V7+NOQ2KLP", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "经验条", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, - "_children": [ - { - "__id__": 35 - } - ], - "_active": true, - "_components": [ - { - "__id__": 41 - }, - { - "__id__": 43 - }, - { - "__id__": 45 - } - ], - "_prefab": { - "__id__": 47 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 68.52, - "y": -2.96, - "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__": 34 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 36 - }, - { - "__id__": 38 - } - ], - "_prefab": { - "__id__": 40 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -150, - "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__": 35 - }, - "_enabled": true, - "__prefab": { - "__id__": 37 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 0, - "height": 15 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0aV7NG3HFG7I+bEVh8ldRn" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 35 - }, - "_enabled": true, - "__prefab": { - "__id__": 39 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "24a704da-2867-446d-8d1a-5e920c75e09d@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": "0bCaQ0gsdCKJRmGjkNgen8" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b2LcN8XtlPdaUUkLcbxJEi", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 34 - }, - "_enabled": true, - "__prefab": { - "__id__": 42 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 300, - "height": 15 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6e/kp4FqhDyah2H0qUL85d" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 34 - }, - "_enabled": false, - "__prefab": { - "__id__": 44 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "9fd900dd-221b-4f89-8f2c-fba34243c835@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": "31S5WlPTZLfZ1l6g1cuWzA" - }, - { - "__type__": "54eabRpC7dM+4sLiGfqzWWw", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 34 - }, - "_enabled": true, - "__prefab": { - "__id__": 46 - }, - "_barSprite": { - "__id__": 38 - }, - "_mode": 0, - "_totalLength": 300, - "_progress": 0, - "_reverse": false, - "scaleTime": 4, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "bdjL6Ut35JS6lQS7QzcUJp" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "93rpBfoq1Llr+4wTPNTUV0", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "星级数量", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 53 - } - ], - "_prefab": { - "__id__": 55 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 68.52, - "y": -26.717, - "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__": 48 - }, - "_enabled": true, - "__prefab": { - "__id__": 50 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 132.896484375, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c4RIZCv/NDpKEczfHx+tyL" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 48 - }, - "_enabled": true, - "__prefab": { - "__id__": 52 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "当前星级: 1 星", - "_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": "b2GRov5ExAYrlFJXoCHLs2" - }, - { - "__type__": "cc.LabelOutline", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 48 - }, - "_enabled": true, - "__prefab": { - "__id__": 54 - }, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_width": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9cDFQk2NdPrL7vh+HSbpeu" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "decxnQN7FLG4g7mTTTZnmi", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 57 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 550, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8cCyBCbNREtY0z2YGzUsHl" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 59 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 221, - "g": 221, - "b": 221, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@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": "88aRBx4wRGUqxiiy+vS+Mb" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 61 - }, - "_alignFlags": 41, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 300.5, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 100, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d4AWC2i1FEfKrBsfiv5eZw" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "10f7CtDxhFTbdj0OJpx8xr", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "宠物列表", @@ -1441,34 +136,34 @@ }, "_children": [ { - "__id__": 64 + "__id__": 4 }, { - "__id__": 82 + "__id__": 22 } ], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 40 }, { - "__id__": 102 + "__id__": 42 }, { - "__id__": 104 + "__id__": 44 }, { - "__id__": 79 + "__id__": 19 } ], "_prefab": { - "__id__": 106 + "__id__": 46 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -10, + "y": 40, "z": 0 }, "_lrot": { @@ -1500,30 +195,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 63 + "__id__": 3 }, "_children": [ { - "__id__": 65 + "__id__": 5 } ], "_active": true, "_components": [ { - "__id__": 71 + "__id__": 11 }, { - "__id__": 73 + "__id__": 13 }, { - "__id__": 75 + "__id__": 15 }, { - "__id__": 77 + "__id__": 17 } ], "_prefab": { - "__id__": 99 + "__id__": 39 }, "_lpos": { "__type__": "cc.Vec3", @@ -1560,20 +255,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 64 + "__id__": 4 }, "_children": [], "_active": true, "_components": [ { - "__id__": 66 + "__id__": 6 }, { - "__id__": 68 + "__id__": 8 } ], "_prefab": { - "__id__": 70 + "__id__": 10 }, "_lpos": { "__type__": "cc.Vec3", @@ -1610,11 +305,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 5 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 7 }, "_contentSize": { "__type__": "cc.Size", @@ -1638,11 +333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 5 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 9 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1696,16 +391,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 4 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", "width": 12, - "height": 520 + "height": 620 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1724,11 +419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 4 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 14 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1769,11 +464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 4 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 16 }, "_alignFlags": 37, "_target": null, @@ -1805,17 +500,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 4 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 18 }, "_scrollView": { - "__id__": 79 + "__id__": 19 }, "_handle": { - "__id__": 68 + "__id__": 8 }, "_direction": 1, "_enableAutoHide": false, @@ -1832,11 +527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 20 }, "bounceDuration": 0.23, "brake": 0.75, @@ -1847,14 +542,14 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 81 + "__id__": 21 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 77 + "__id__": 17 }, "itemPrefab": { - "__uuid__": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae", + "__uuid__": "b4e0f464-dc9f-463d-a392-7cc192779285", "__expectedType__": "cc.Prefab" }, "_id": "" @@ -1869,23 +564,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 82 + "__id__": 22 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 32 }, { - "__id__": 94 + "__id__": 34 }, { - "__id__": 96 + "__id__": 36 } ], "_prefab": { - "__id__": 98 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -1922,35 +617,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 63 + "__id__": 3 }, "_children": [ { - "__id__": 81 + "__id__": 21 } ], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 23 }, { - "__id__": 85 + "__id__": 25 }, { - "__id__": 87 + "__id__": 27 }, { - "__id__": 89 + "__id__": 29 } ], "_prefab": { - "__id__": 91 + "__id__": 31 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 260, + "y": 310, "z": 0 }, "_lrot": { @@ -1982,16 +677,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 22 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 24 }, "_contentSize": { "__type__": "cc.Size", "width": 550, - "height": 520 + "height": 620 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2010,11 +705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 22 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 26 }, "_type": 0, "_inverted": false, @@ -2032,11 +727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 22 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 28 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2078,11 +773,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 22 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 30 }, "_alignFlags": 45, "_target": null, @@ -2127,11 +822,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 33 }, "_contentSize": { "__type__": "cc.Size", @@ -2155,11 +850,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 35 }, "_resizeMode": 1, "_layoutType": 3, @@ -2193,11 +888,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 37 }, "_alignFlags": 40, "_target": null, @@ -2255,16 +950,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 41 }, "_contentSize": { "__type__": "cc.Size", "width": 550, - "height": 520 + "height": 620 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2283,11 +978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 43 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2328,17 +1023,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 45 }, "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": 100, + "_top": 0, "_bottom": 80, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -2373,7 +1068,7 @@ }, { "__type__": "cc.Node", - "_name": "升星", + "_name": "确定", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2381,28 +1076,28 @@ }, "_children": [ { - "__id__": 108 + "__id__": 48 } ], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 56 }, { - "__id__": 118 + "__id__": 58 }, { - "__id__": 120 + "__id__": 60 } ], "_prefab": { - "__id__": 123 + "__id__": 63 }, "_lpos": { "__type__": "cc.Vec3", - "x": 95.5, - "y": -309.485, + "x": 0, + "y": -310.837, "z": 0 }, "_lrot": { @@ -2434,23 +1129,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 107 + "__id__": 47 }, "_children": [], "_active": true, "_components": [ { - "__id__": 109 + "__id__": 49 }, { - "__id__": 111 + "__id__": 51 }, { - "__id__": 113 + "__id__": 53 } ], "_prefab": { - "__id__": 115 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -2487,11 +1182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 50 }, "_contentSize": { "__type__": "cc.Size", @@ -2507,7 +1202,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a7nJD7ijRJ65bS6jbzXCXa" + "fileId": "9dB6pLmPZAMIcAJRElVOq1" }, { "__type__": "cc.Label", @@ -2515,11 +1210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 52 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2531,11 +1226,11 @@ "b": 255, "a": 255 }, - "_string": "合成", + "_string": "确定", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 24, - "_fontSize": 24, + "_actualFontSize": 26, + "_fontSize": 26, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 1, @@ -2552,7 +1247,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4dUvRSVqROyYnEbHL8zCJ3" + "fileId": "a7BdyoiJ1Gu7mUW/6toE/0" }, { "__type__": "cc.LabelOutline", @@ -2560,11 +1255,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 54 }, "_color": { "__type__": "cc.Color", @@ -2573,12 +1268,12 @@ "b": 0, "a": 255 }, - "_width": 2, + "_width": 3, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3fZRgVW1VCa6VHpoBX5aoL" + "fileId": "599EwJMPNG/45QuJL5eXgv" }, { "__type__": "cc.PrefabInfo", @@ -2588,7 +1283,7 @@ "asset": { "__id__": 0 }, - "fileId": "e9sJGfZJpMvpgtzoEf6Hvm", + "fileId": "bfDNP39MNO5Yc6tsvOmCJn", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2599,11 +1294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 47 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -2619,7 +1314,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c9YH0WlxpOdrXstA65D9+l" + "fileId": "25le3JhlZE0IrfNENTMQnp" }, { "__type__": "cc.Sprite", @@ -2627,11 +1322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 47 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 59 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2664,7 +1359,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e06v5IY2dCTbzMXjfGeP4K" + "fileId": "efBUpnW7ZDv4smVfwRA3pJ" }, { "__type__": "cc.Button", @@ -2672,15 +1367,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 47 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 61 }, "clickEvents": [ { - "__id__": 122 + "__id__": 62 } ], "_interactable": true, @@ -2732,13 +1427,13 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 107 + "__id__": 47 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "966p1LYUNNAJ6+9d6PAH5U" + "fileId": "8cblipWTpJoq20uMX4FWPw" }, { "__type__": "cc.ClickEvent", @@ -2746,8 +1441,8 @@ "__id__": 1 }, "component": "", - "_componentId": "f8ba4N+bqdD84IUK5j+GSAq", - "handler": "onClickUp", + "_componentId": "54ddfUJrQdMqokxzmq/17vF", + "handler": "onClickSelect", "customEventData": "" }, { @@ -2758,965 +1453,7 @@ "asset": { "__id__": 0 }, - "fileId": "86pnZI0AlEwYtsGyVIUbMD", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "升星-001", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [ - { - "__id__": 125 - } - ], - "_active": true, - "_components": [ - { - "__id__": 133 - }, - { - "__id__": 135 - }, - { - "__id__": 137 - }, - { - "__id__": 140 - } - ], - "_prefab": { - "__id__": 142 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 225, - "y": -309.485, - "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__": 124 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 126 - }, - { - "__id__": 128 - }, - { - "__id__": 130 - } - ], - "_prefab": { - "__id__": 132 - }, - "_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__": 125 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_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, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0cS5AJcMVIVbsJLnEVKKcb" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 150 - }, - "_enabled": true, - "__prefab": { - "__id__": 154 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "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": "58bYyo8BVJl66rlOOQA5Fg" - }, - { - "__type__": "cc.LabelOutline", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 150 - }, - "_enabled": true, - "__prefab": { - "__id__": 156 - }, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_width": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f4IkouWdRAPqxACtqQi5Sm" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "fb76U7zyBMu77r84nqvnfK", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 143 - }, - "_enabled": true, - "__prefab": { - "__id__": 159 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 28, - "height": 28 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c0gJrrqNRHg4XdhNrMJyNN" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 143 - }, - "_enabled": true, - "__prefab": { - "__id__": 161 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "dboDNzKTZDhbFasr2/lowH" - }, - { - "__type__": "cc.Toggle", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 143 - }, - "_enabled": true, - "__prefab": { - "__id__": 163 - }, - "clickEvents": [], - "_interactable": true, - "_transition": 0, - "_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__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": null, - "_pressedSprite": null, - "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 1.2, - "_target": { - "__id__": 143 - }, - "checkEvents": [ - { - "__id__": 164 - } - ], - "_isChecked": false, - "_checkMark": { - "__id__": 147 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "08CaQ9IvFL9640k2qkUBoQ" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1 - }, - "component": "", - "_componentId": "f8ba4N+bqdD84IUK5j+GSAq", - "handler": "onClickEngulfToggle", - "customEventData": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d0DZ2qqchC74h/KCryK3cD", + "fileId": "7ax0ZoTjxK8bCh8jsmjnig", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3731,7 +1468,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 65 }, "_contentSize": { "__type__": "cc.Size", @@ -3759,7 +1496,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 67 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3804,7 +1541,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 69 }, "_id": "" }, @@ -3835,7 +1572,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 174 + "__id__": 72 }, "_contentSize": { "__type__": "cc.Size", @@ -3863,7 +1600,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 74 }, "_alignFlags": 45, "_target": null, @@ -3899,7 +1636,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 76 + }, + "mask": true, + "maskOpcity": 80, + "isClickMaskeClose": false, + "views": { + "__id__": 19 }, "_id": "" }, diff --git a/JisolGameCocos/assets/resources/prefab/ui/宠物装备/弹出锻造装备页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/宠物装备/弹出锻造装备页面.prefab index b35bc552..33c647bd 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/宠物装备/弹出锻造装备页面.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/宠物装备/弹出锻造装备页面.prefab @@ -215,9 +215,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 85, - "g": 85, - "b": 85, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/列表选择宠物ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/列表选择宠物ICON.prefab.meta index 4c671053..9e660765 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/列表选择宠物ICON.prefab.meta +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/列表选择宠物ICON.prefab.meta @@ -2,7 +2,7 @@ "ver": "1.1.49", "importer": "prefab", "imported": true, - "uuid": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae", + "uuid": "b4e0f464-dc9f-463d-a392-7cc192779285", "files": [ ".json" ], diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选中宠物ICON.prefab similarity index 99% rename from JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物ICON.prefab rename to JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选中宠物ICON.prefab index 2e3b70d6..58f6fc14 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物ICON.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选中宠物ICON.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "选择宠物ICON", + "_name": "选中宠物ICON", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "选择宠物ICON", + "_name": "选中宠物ICON", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选中宠物ICON.prefab.meta similarity index 82% rename from JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物ICON.prefab.meta rename to JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选中宠物ICON.prefab.meta index 94b80e95..59686990 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物ICON.prefab.meta +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选中宠物ICON.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "选择宠物ICON" + "syncNodeName": "选中宠物ICON" } } diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab new file mode 100644 index 00000000..1f344ae6 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab @@ -0,0 +1,687 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "选择宠物展示ICON", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "选择宠物展示ICON", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 14 + } + ], + "_active": true, + "_components": [ + { + "__id__": 27 + }, + { + "__id__": 29 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 33 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 251.589, + "y": -110.305, + "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__": 1 + }, + "_children": [ + { + "__id__": 3 + } + ], + "_active": true, + "_components": [ + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_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": "label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 4 + }, + { + "__id__": 6 + }, + { + "__id__": 8 + } + ], + "_prefab": { + "__id__": 10 + }, + "_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__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 5 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "95T/gOHudIuYgzZX23mI9T" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 7 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "+", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 110, + "_fontSize": 110, + "_fontFamily": "Arial", + "_lineHeight": 120, + "_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": "25QELCF/FD8qMBYhU8/Z1s" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 4, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8aUomAsWxGGaxW3abAwyUb" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c4sQZI43VJk4G7lCYdQyx2", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "51q/WpkgVKwICdmnLPZukc" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4e9NnHbvBHj4+BDffpZS3a", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "有宠物", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 15 + } + ], + "_active": true, + "_components": [ + { + "__id__": 24 + } + ], + "_prefab": { + "__id__": 26 + }, + "_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", + "_objFlags": 0, + "_parent": { + "__id__": 14 + }, + "_prefab": { + "__id__": 16 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 15 + }, + "asset": { + "__uuid__": "ef1f320e-328a-41c9-bfdc-ad17d402e14f", + "__expectedType__": "cc.Prefab" + }, + "fileId": "02c3tqHwFAbp7zhkA22zq9", + "instance": { + "__id__": 17 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "464jxOMcNH2KEj3sfjyeZC", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 21 + }, + { + "__id__": 22 + }, + { + "__id__": 23 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_name" + ], + "value": "宠物ICON" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02c3tqHwFAbp7zhkA22zq9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fbKN2dZNVBELD9SmfQOfTl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c1Zn5wu3JJOautOuf3eCzN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4fnyc7PKBKuIy7GIcCsux6" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, + "_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": "d0AUv0uTJIVaVL7fywKL0N" + }, + { + "__type__": "ad2c14Q5uZDoJlTgsqnp2Ty", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 32 + }, + "noPet": { + "__id__": 2 + }, + "havePet": { + "__id__": 14 + }, + "petIcon": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "85ruk0B3NFoqyJzn5uu35A" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "13NgoTXGpMRapTmp+uDndV", + "instance": null, + "targetOverrides": [ + { + "__id__": 34 + } + ], + "nestedPrefabInstanceRoots": [ + { + "__id__": 15 + } + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 31 + }, + "sourceInfo": null, + "propertyPath": [ + "petIcon" + ], + "target": { + "__id__": 15 + }, + "targetInfo": { + "__id__": 35 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "a8v6Wyt6FBsbms2ouS3gEa" + ] + } +] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab.meta new file mode 100644 index 00000000..44878e27 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "c7577a1e-d03c-4b53-8670-089ccbfeb272", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "选择宠物展示ICON" + } +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/模式/PVP/PVP匹配页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/模式/PVP/PVP匹配页面.prefab index 17867d4a..e332016f 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/模式/PVP/PVP匹配页面.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/模式/PVP/PVP匹配页面.prefab @@ -914,7 +914,7 @@ "__id__": 1 }, "component": "", - "_componentId": "9979dVt91REw44px2Tq6wqv", + "_componentId": "d8c6c8BHmpMQ7nX1S4gqOwW", "handler": "onClickCancel", "customEventData": "" }, @@ -996,7 +996,7 @@ "fileId": "582zBz6m5DKqmkTkiS/LE0" }, { - "__type__": "9979dVt91REw44px2Tq6wqv", + "__type__": "d8c6c8BHmpMQ7nX1S4gqOwW", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -1017,7 +1017,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0cGxVTaIRJGYvyxR3n0dcU" + "fileId": "fdR16QBsBCWKrYOQqkElcD" }, { "__type__": "cc.PrefabInfo", diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab index e41a7317..0c975b30 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab @@ -1958,7 +1958,7 @@ "__id__": 83 }, "itemPrefab": { - "__uuid__": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae", + "__uuid__": "b4e0f464-dc9f-463d-a392-7cc192779285", "__expectedType__": "cc.Prefab" }, "_id": "" diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts index 5571cd59..81ff23ea 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.119:8080` -let WsPath = `ws://192.168.0.119:8080/websocket` +// let APIPath = `http://192.168.0.119:8080` +// let WsPath = `ws://192.168.0.119:8080/websocket` // let APIPath = `https://api.pet.jisol.cn` // let WsPath = `wss://api.pet.jisol.cn/websocket` diff --git a/JisolGameCocos/assets/script/action/PVPAction.ts b/JisolGameCocos/assets/script/action/PVPAction.ts index 5e3d7d9a..6b052546 100644 --- a/JisolGameCocos/assets/script/action/PVPAction.ts +++ b/JisolGameCocos/assets/script/action/PVPAction.ts @@ -38,13 +38,14 @@ export default class PVPAction extends BaseAction { //PVP开始等待 onModePVPStartWait(){ + console.log("onModePVPStartWait"); //PVP 匹配页面 - if(GBattleModeManager.getIns().current != BattleMode.PVP) - app.layer.Open(GUI.PVPModeMatchView); + app.layer.Open(GUI.PVPModeMatchView); } //PVP结束等待 onModePVPEndWait(){ + console.log("onModePVPEndWait"); //PVP 匹配页面 app.layer.Close(GUI.PVPModeMatchView); } diff --git a/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts b/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts index 5a70093c..beae4f77 100644 --- a/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts +++ b/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts @@ -40,8 +40,6 @@ export default class GAttackParabolicBangRemote implements GAttackBase{ return; } - - console.log(role.spine,bone); let bullet = GAttackBullet.create(GButtleDefault,{ image:image, scale:scale, diff --git a/JisolGameCocos/assets/script/consts/API.ts b/JisolGameCocos/assets/script/consts/API.ts index 8c0b4c95..f5806c48 100644 --- a/JisolGameCocos/assets/script/consts/API.ts +++ b/JisolGameCocos/assets/script/consts/API.ts @@ -157,7 +157,7 @@ export const API = { PetEquipAll: async () => RData(await app.api.get(`/game/equip/all`),false) as PetEquip[], //获取全部装备 PetEquipForging: async () => RData(await app.api.get(`/game/equip/forging`),true) as PetEquip, //锻造装备 PetEquipForgingInfo: async () => RData(await app.api.get(`/game/equip/forging/info`),true) as EquipForgingBench, //锻造台 - PetEquipForgingPetId: async (petId) => RData(await app.api.get(`/game/equip/forging/petId/${petId}`),true) as EquipForgingBench, //设置锻造宠 + PetEquipForgingPetId: async (petId) => RData(await app.api.post(`/game/equip/forging/petId/${petId}`),true) as EquipForgingBench, //设置锻造宠 } diff --git a/JisolGameCocos/assets/script/data/PetEquipData.ts b/JisolGameCocos/assets/script/data/PetEquipData.ts index a4cf1e51..94c2bea3 100644 --- a/JisolGameCocos/assets/script/data/PetEquipData.ts +++ b/JisolGameCocos/assets/script/data/PetEquipData.ts @@ -1,7 +1,13 @@ +import { app } from "../App"; import { API, EquipForgingBench, PetEquip } from "../consts/API"; import BaseData from "./BaseData"; import PlayerPetData from "./PlayerPetData"; +export enum PetEquipDataEnum{ + //更新锻造数据 + UPDATE_FORGING_INFO = "PetEquipDataEnum_UPDATE_FORGING_INFO" +} + //宠物装备数据类 export default class PetEquipData extends BaseData{ @@ -20,14 +26,21 @@ export default class PetEquipData extends BaseData{ this.info = await API.PetEquipForgingInfo(); } + //更新锻造数据 + onUpdateInfo(info:EquipForgingBench){ + this.info = info; + app.event.emit(PetEquipDataEnum.UPDATE_FORGING_INFO); + } + //锻造 async forging(){ - await API.PetEquipForging(); + return await API.PetEquipForging(); } //设置锻造宠 async setForgingPetId(petId:number){ - await API.PetEquipForgingPetId(petId); + this.onUpdateInfo(await API.PetEquipForgingPetId(petId)); } + } \ No newline at end of file diff --git a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectShow.ts b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectShow.ts new file mode 100644 index 00000000..e6b1f163 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectShow.ts @@ -0,0 +1,34 @@ +import { _decorator, Component, Node } from 'cc'; +import { PetIcon } from './PetIcon'; +import { PlayerPetOV } from '../../../consts/API'; +const { ccclass, property } = _decorator; + +@ccclass('PetIconSelectShow') +export class PetIconSelectShow extends Component { + + //没有宠物的节点 + @property(Node) + noPet:Node; + + //有宠物的节点 + @property(Node) + havePet:Node; + + //宠物节点 + @property(PetIcon) + petIcon:PetIcon; + + set(info:PlayerPetOV){ + if(info){ + this.noPet.active = false; + this.havePet.active = true; + this.petIcon.set(info); + }else{ + this.noPet.active = true; + this.havePet.active = false; + } + } + +} + + diff --git a/JisolGameCocos/assets/script/ui/Mode/PVP/PVPMatchView.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectShow.ts.meta similarity index 70% rename from JisolGameCocos/assets/script/ui/Mode/PVP/PVPMatchView.ts.meta rename to JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectShow.ts.meta index 63a6d6c3..64c55bf8 100644 --- a/JisolGameCocos/assets/script/ui/Mode/PVP/PVPMatchView.ts.meta +++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectShow.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "9979d56d-f754-44c3-8e29-c764eaeb0aaf", + "uuid": "ad2c1e10-e6e6-43a0-9953-82caa7a764f2", "files": [], "subMetas": {}, "userData": {} diff --git a/JisolGameCocos/assets/script/ui/Home/ForgingBench/MainForgingBench.ts b/JisolGameCocos/assets/script/ui/Home/ForgingBench/MainForgingBench.ts index 660d29cf..affe44d0 100644 --- a/JisolGameCocos/assets/script/ui/Home/ForgingBench/MainForgingBench.ts +++ b/JisolGameCocos/assets/script/ui/Home/ForgingBench/MainForgingBench.ts @@ -1,7 +1,10 @@ import { _decorator, Component, Node } from 'cc'; -import PetEquipData from '../../../data/PetEquipData'; +import PetEquipData, { PetEquipDataEnum } from '../../../data/PetEquipData'; import { app } from '../../../App'; import { GUI } from '../../UIConfig'; +import { API, PlayerPetOV } from '../../../consts/API'; +import { PetIconSelectShow } from '../../Consts/Pet/PetIconSelectShow'; +import PlayerPetData from '../../../data/PlayerPetData'; const { ccclass, property } = _decorator; @@ -9,19 +12,52 @@ const { ccclass, property } = _decorator; @ccclass('MainForgingBench') export class MainForgingBench extends Component { + //锻造宠 + @property(PetIconSelectShow) + petView:PetIconSelectShow; + + onLoad(){ + this.onUpdateView(); + + //监听锻造数据 + app.event.on(PetEquipDataEnum.UPDATE_FORGING_INFO,this.onUpdateForging,this); + + } + + protected onDestroy(): void { + + app.event.off(PetEquipDataEnum.UPDATE_FORGING_INFO,this.onUpdateForging,this); + } + + onUpdateView(){ + this.onUpdateForging(); + } + + //刷新锻造数据 + onUpdateForging(){ + this.petView.set(PlayerPetData.getIns().petIdQueryPetInfo(PetEquipData.getIns().info.forgingPetId)); + } + //点击锻造 async onClickForging(){ if(!PetEquipData.getIns().isForgingBenchPet){ app.layer.Open(GUI.Tips,{text:"请选择锻造宠"}); return; } - PetEquipData.getIns().forging(); - app.layer.Open(GUI.PetEquipForgingPopupView); + let equip = await PetEquipData.getIns().forging(); + equip && app.layer.Open(GUI.PetEquipForgingPopupView,equip); } //点击锻造宠 async onClickForgingPet(){ - app.layer.Open(GUI.PetRadioView); + let info:PlayerPetOV = await (new Promise(resolve => { + app.layer.Open(GUI.PetRadioView,{resolve}); + })) + if(!info) return; + + //设置锻造宠 + await PetEquipData.getIns().setForgingPetId(info.petId); + } } diff --git a/JisolGameCocos/assets/script/ui/Mode/PVP/PVPMatchView.ts b/JisolGameCocos/assets/script/ui/Mode/PVP/PVPModeMatchView.ts similarity index 90% rename from JisolGameCocos/assets/script/ui/Mode/PVP/PVPMatchView.ts rename to JisolGameCocos/assets/script/ui/Mode/PVP/PVPModeMatchView.ts index 22db7903..c4de90b3 100644 --- a/JisolGameCocos/assets/script/ui/Mode/PVP/PVPMatchView.ts +++ b/JisolGameCocos/assets/script/ui/Mode/PVP/PVPModeMatchView.ts @@ -9,8 +9,8 @@ const { ccclass, property } = _decorator; /** * 游戏匹配页面 */ -@ccclass('PVPMatchView') -export class PVPMatchView extends JNGLayerBase { +@ccclass('PVPModeMatchView') +export class PVPModeMatchView extends JNGLayerBase { @property(Node) content:Node; @@ -24,7 +24,6 @@ export class PVPMatchView extends JNGLayerBase { .to(.5,{scale:v3(1,1,1)}) ) .start(); - } //取消匹配 diff --git a/JisolGameCocos/assets/script/ui/Mode/PVP/PVPModeMatchView.ts.meta b/JisolGameCocos/assets/script/ui/Mode/PVP/PVPModeMatchView.ts.meta new file mode 100644 index 00000000..cd6b313e --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Mode/PVP/PVPModeMatchView.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "d8c6cf01-1e6a-4c43-b9d7-d52e20a8ec16", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Pet/PetRadioView.ts b/JisolGameCocos/assets/script/ui/Pet/PetRadioView.ts index a3e45da6..2b2e3b8e 100644 --- a/JisolGameCocos/assets/script/ui/Pet/PetRadioView.ts +++ b/JisolGameCocos/assets/script/ui/Pet/PetRadioView.ts @@ -1,11 +1,89 @@ import { _decorator, Component, Node } from 'cc'; import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLayerBase'; +import JNScrollView from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollView'; +import { PetOV, PlayerPetOVSelect } from '../VO/PetOV'; +import PlayerPetData from '../../data/PlayerPetData'; +import { NodeEventType } from 'cc'; +import { PetIconSelectScroll } from '../Consts/Pet/PetIconSelectScroll'; +import { PlayerPetOV } from '../../consts/API'; +import { app } from '../../App'; +import { GUI } from '../UIConfig'; const { ccclass, property } = _decorator; +export interface PetRadioViewArgs{ + isHaveSelect:boolean, //是否必须选择 + resolve?:(value:PlayerPetOV) => {}, +} + //宠物单选页面 @ccclass('PetRadioView') export class PetRadioView extends JNLayerBase { + data:PetRadioViewArgs; + + @property(JNScrollView) + views:JNScrollView; //宠物列表 + + index:number = -1; + + onJNLoad(data?: PetRadioViewArgs): void { + + data = data || {isHaveSelect:false}; + this.isClickMaskeClose = !data.isHaveSelect; + this.data = data; + + super.onJNLoad(); + + this.onUpdateView(); + + } + + onUpdateView(){ + + //当前需要升星的宠物并且未上阵 并且排除自己 + let pets = PetOV.PlayerPetOVSelects( PlayerPetData.getIns().getData() ); + this.views.refreshData(pets); + + //向子节点添加点击事件 + this.views.addItemEvent(NodeEventType.TOUCH_START,this.onClickItem.bind(this)); + + } + + //刷新选择 + onUpdateSelect(){ + + //刷新 + this.views.getItems().forEach((item) => { + let data = item.data as PlayerPetOVSelect; + item.select.isSelect = data.isSelect; + }) + + } + + //点击Item + onClickItem(index:number){ + this.index = index; + let pets = this.views.getData(); + pets.forEach(item => item.isSelect = false); + pets[index].isSelect = !pets[index].isSelect; + this.onUpdateSelect(); + } + + //选择宠物 + onClickSelect(){ + let pets = this.views.getData(); + if(!(pets[this.index])){ + this.data.resolve && this.data.resolve(null) + if(this.data.isHaveSelect) { + app.layer.Open(GUI.Tips,{text:"请选择宠物"}); + return; + } + }else{ + this.data.resolve && this.data.resolve(pets[this.index]); + } + app.layer.CloseNode(this.node); + } + } diff --git a/JisolGameCocos/assets/script/ui/PetEquip/PetEquipForgingPopupView.ts b/JisolGameCocos/assets/script/ui/PetEquip/PetEquipForgingPopupView.ts index cb54c014..30af7151 100644 --- a/JisolGameCocos/assets/script/ui/PetEquip/PetEquipForgingPopupView.ts +++ b/JisolGameCocos/assets/script/ui/PetEquip/PetEquipForgingPopupView.ts @@ -1,10 +1,27 @@ import { _decorator, Component, Node } from 'cc'; import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLayerBase'; +import { Sprite } from 'cc'; +import { PetEquip } from '../../consts/API'; +import { resources } from 'cc'; +import { SpriteFrame } from 'cc'; const { ccclass, property } = _decorator; -//锻造宠物装备页面 +//弹出锻造装备页面 @ccclass('PetEquipForgingPopupView') export class PetEquipForgingPopupView extends JNLayerBase { + + //装备展示 + @property(Sprite) + icon:Sprite; + + onJNLoad(info:PetEquip){ + + resources.load(`icon/宠物装备/${info.equipCfgId}`,SpriteFrame,(error,data) => { + this.icon.spriteFrame = data; + }) + + } + } diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame index 4f23e1e1..e16595d1 160000 --- a/JisolGameCocos/extensions/ngame +++ b/JisolGameCocos/extensions/ngame @@ -1 +1 @@ -Subproject commit 4f23e1e1b8301a2a1cc65fb45cbc50dcb3225c92 +Subproject commit e16595d14ead88524bf2b5bce49cd74d82b5decb diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/JGameApplication.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/JGameApplication.java index 8dc54016..b63f8cc4 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/JGameApplication.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/JGameApplication.java @@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.retry.annotation.EnableRetry; @EnableRetry diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/exception/ResourceInitException.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/exception/ResourceInitException.java new file mode 100644 index 00000000..8acca3d0 --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/exception/ResourceInitException.java @@ -0,0 +1,9 @@ +package cn.jisol.game.controller.exception; + +public class ResourceInitException extends RuntimeException{ + public ResourceInitException() { + } + public ResourceInitException(String message) { + super(message); + } +} diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerEquipController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerEquipController.java index 4c265993..98772774 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerEquipController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerEquipController.java @@ -6,6 +6,7 @@ import cfg.TB.TbGRoleEquipType; import cfg.TbGEntity.TAttributeValue; import cn.hutool.core.util.RandomUtil; import cn.jisol.game.controller.argsresolver.CurrentPlayer; +import cn.jisol.game.controller.exception.ResourceNotException; import cn.jisol.game.data.ResourceId; import cn.jisol.game.data.TD; import cn.jisol.game.entity.data.GAttribute; 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 0e4c9fa9..48dfcd5c 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 @@ -3,6 +3,7 @@ package cn.jisol.game.controller.game; import cfg.TB.TbGRoleUpLevel; import cfg.TbGEntity.TResource; import cn.jisol.game.controller.argsresolver.CurrentPlayer; +import cn.jisol.game.controller.exception.ResourceNotException; import cn.jisol.game.data.TD; import cn.jisol.game.entity.table.Player; import cn.jisol.game.entity.table.PlayerPet; diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java index 3b93c0a7..e6b742d5 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java @@ -1,15 +1,20 @@ package cn.jisol.game.service.impl; +import cn.jisol.game.controller.exception.ResourceInitException; import cn.jisol.game.controller.exception.ResourceNotException; import cn.jisol.game.entity.table.Resource; import cn.jisol.game.mapper.ResourceMapper; import cn.jisol.game.service.ResourceService; +import cn.jisol.ngame.util.spring.SpringBeanUtils; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.aop.framework.AopContext; import org.springframework.retry.RetryException; import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import java.util.Objects; @@ -23,7 +28,6 @@ public class ResourceServiceImpl extends ServiceImpl i * @return */ @Override - @Retryable(RetryException.class) public Resource addResourceValue(Long playerId, int type, Long value) { @@ -49,10 +53,14 @@ public class ResourceServiceImpl extends ServiceImpl i if(!update){ if(Objects.isNull(res)){ - //没有资源信息 创建初始资源 - res = this.initResource(playerId,type); //并且重试 - throw new RetryException(""); + if(value > 0){ + //没有资源信息 创建初始资源 + res = this.initResource(playerId,type); + this.addResourceValue(playerId,type,value); + }else{ + throw new ResourceNotException("资源不够"); + } }else{ //更新失败 材料不够 throw new ResourceNotException("资源不够");