From b33fede03eee454fa4505ff3e013d27268d48c39 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5RP3AKU\\Jisol" <2858626794@qq.com> Date: Sun, 26 Nov 2023 03:06:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8D=95=E7=9A=84=E5=8D=87=E6=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .../assets/resources/prefab/ui/宠物.meta | 9 + .../prefab/ui/宠物/宠物升星页面.prefab | 3098 +++++++++++++++++ .../prefab/ui/宠物/宠物升星页面.prefab.meta | 13 + .../宠物/列表选择宠物ICON.prefab} | 6 +- .../宠物/列表选择宠物ICON.prefab.meta} | 2 +- .../prefab/ui/阵法/阵法选择页面.prefab | 1028 +++++- JisolGameCocos/assets/script/consts/API.ts | 6 +- .../ui/Consts/Pet/PetIconSelectScroll.ts | 19 + .../Pet/PetIconSelectScroll.ts.meta} | 0 JisolGameCocos/assets/script/ui/Pet.meta | 9 + .../assets/script/ui/Pet/PetUpStarView.ts | 114 + .../script/ui/Pet/PetUpStarView.ts.meta | 9 + .../script/ui/Tactical/IntoBattlePetIcon.ts | 19 - .../script/ui/Tactical/IntoBattleView.ts | 29 +- JisolGameCocos/assets/script/ui/UIConfig.ts | 15 +- JisolGameCocos/assets/script/ui/VO.meta | 9 + JisolGameCocos/assets/script/ui/VO/PetOV.ts | 18 + .../assets/script/ui/VO/PetOV.ts.meta | 9 + .../controller/game/GPlayerPetController.java | 61 +- .../cn/jisol/game/entity/game/PlayerPet.java | 2 + .../cn/jisol/game/vo/pet/PetUpStarOV.java | 21 + 22 files changed, 4330 insertions(+), 169 deletions(-) create mode 100644 JisolGameCocos/assets/resources/prefab/ui/宠物.meta create mode 100644 JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab create mode 100644 JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab.meta rename JisolGameCocos/assets/resources/prefab/ui/{阵法/阵法宠物ICON.prefab => 常用预制体/宠物/列表选择宠物ICON.prefab} (97%) rename JisolGameCocos/assets/resources/prefab/ui/{阵法/阵法宠物ICON.prefab.meta => 常用预制体/宠物/列表选择宠物ICON.prefab.meta} (80%) create mode 100644 JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectScroll.ts rename JisolGameCocos/assets/script/ui/{Tactical/IntoBattlePetIcon.ts.meta => Consts/Pet/PetIconSelectScroll.ts.meta} (100%) create mode 100644 JisolGameCocos/assets/script/ui/Pet.meta create mode 100644 JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts create mode 100644 JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts.meta delete mode 100644 JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts create mode 100644 JisolGameCocos/assets/script/ui/VO.meta create mode 100644 JisolGameCocos/assets/script/ui/VO/PetOV.ts create mode 100644 JisolGameCocos/assets/script/ui/VO/PetOV.ts.meta create mode 100644 JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java diff --git a/.gitignore b/.gitignore index 09299c0d..2057d1fc 100644 --- a/.gitignore +++ b/.gitignore @@ -61,4 +61,5 @@ out/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store +headless/logger/ diff --git a/JisolGameCocos/assets/resources/prefab/ui/宠物.meta b/JisolGameCocos/assets/resources/prefab/ui/宠物.meta new file mode 100644 index 00000000..5897ed89 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/宠物.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "3cb5a3f3-8841-4b00-8fcd-44395da74514", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab new file mode 100644 index 00000000..74659482 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab @@ -0,0 +1,3098 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "宠物升星页面", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "宠物升星页面", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 136 + }, + { + "__id__": 138 + }, + { + "__id__": 140 + } + ], + "_prefab": { + "__id__": 142 + }, + "_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": "content", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 3 + }, + { + "__id__": 49 + }, + { + "__id__": 93 + }, + { + "__id__": 110 + } + ], + "_active": true, + "_components": [ + { + "__id__": 129 + }, + { + "__id__": 131 + }, + { + "__id__": 133 + } + ], + "_prefab": { + "__id__": 135 + }, + "_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": "宠物信息", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 4 + }, + { + "__id__": 12 + }, + { + "__id__": 20 + }, + { + "__id__": 34 + } + ], + "_active": true, + "_components": [ + { + "__id__": 42 + }, + { + "__id__": 44 + }, + { + "__id__": 46 + } + ], + "_prefab": { + "__id__": 48 + }, + "_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": "ProgressBar", + "_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": 150, + "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__": 21 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "_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__": 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": "6e/kp4FqhDyah2H0qUL85d" + }, + { + "__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": "31S5WlPTZLfZ1l6g1cuWzA" + }, + { + "__type__": "cc.ProgressBar", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 32 + }, + "_barSprite": { + "__id__": 24 + }, + "_mode": 0, + "_totalLength": 300, + "_progress": 0.5, + "_reverse": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bcRbGiZW5D/KadPYIUhJVb" + }, + { + "__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__": 35 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + } + ], + "_prefab": { + "__id__": 41 + }, + "_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__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_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__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 38 + }, + "_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__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_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__": 43 + }, + "_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__": 45 + }, + "_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__": 47 + }, + "_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": "宠物列表", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 50 + }, + { + "__id__": 68 + } + ], + "_active": true, + "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 65 + } + ], + "_prefab": { + "__id__": 92 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -10, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "scrollBar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 49 + }, + "_children": [ + { + "__id__": 51 + } + ], + "_active": true, + "_components": [ + { + "__id__": 57 + }, + { + "__id__": 59 + }, + { + "__id__": 61 + }, + { + "__id__": 63 + } + ], + "_prefab": { + "__id__": 85 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 275, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "bar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 50 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 52 + }, + { + "__id__": 54 + } + ], + "_prefab": { + "__id__": 56 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -11, + "y": -31.25, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 53 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 10, + "height": 156.25 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0d0tXbkEZNX4aEx25Ed4Ai" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 55 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 + }, + "_spriteFrame": { + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "05WBEjdNZAqqve8eQV0oaM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1bA6K4kt5LwIzW53L7WFPh", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 58 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 12, + "height": 520 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 1, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "73oxplRxJDr7eaD2ZCltrZ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 60 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 + }, + "_spriteFrame": { + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c5lJVtzjJG9qumy3VIbxwv" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 62 + }, + "_alignFlags": 37, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 250, + "_alignMode": 1, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9aFjGMwbBExKjKmBppFw7+" + }, + { + "__type__": "cc.ScrollBar", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 64 + }, + "_scrollView": { + "__id__": 65 + }, + "_handle": { + "__id__": 54 + }, + "_direction": 1, + "_enableAutoHide": false, + "_autoHideTime": 1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6eVZbRN8ZAA6kr3q3T6lxa" + }, + { + "__type__": "563f2c1JcVKmrpHhC0vl3PI", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 49 + }, + "_enabled": true, + "__prefab": { + "__id__": 66 + }, + "bounceDuration": 0.23, + "brake": 0.75, + "elastic": true, + "inertia": true, + "horizontal": false, + "vertical": true, + "cancelInnerEvents": true, + "scrollEvents": [], + "_content": { + "__id__": 67 + }, + "_horizontalScrollBar": null, + "_verticalScrollBar": { + "__id__": 63 + }, + "itemPrefab": { + "__uuid__": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae", + "__expectedType__": "cc.Prefab" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2cePl0zuxKKYTI0gsgjE1u" + }, + { + "__type__": "cc.Node", + "_name": "content", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 68 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 78 + }, + { + "__id__": 80 + }, + { + "__id__": 82 + } + ], + "_prefab": { + "__id__": 84 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "view", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 49 + }, + "_children": [ + { + "__id__": 67 + } + ], + "_active": true, + "_components": [ + { + "__id__": 69 + }, + { + "__id__": 71 + }, + { + "__id__": 73 + }, + { + "__id__": 75 + } + ], + "_prefab": { + "__id__": 77 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 260, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 68 + }, + "_enabled": true, + "__prefab": { + "__id__": 70 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 550, + "height": 520 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4bFlnijRpAKoyePmrqfa+s" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 68 + }, + "_enabled": true, + "__prefab": { + "__id__": 72 + }, + "_type": 0, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "518ATKhO9Gw7N8exX5W+TC" + }, + { + "__type__": "cc.Graphics", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 68 + }, + "_enabled": true, + "__prefab": { + "__id__": 74 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_lineWidth": 1, + "_strokeColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_lineJoin": 2, + "_lineCap": 0, + "_fillColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 + }, + "_miterLimit": 10, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "82Ll2f1PJB4ZrEkNZyzh+0" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 68 + }, + "_enabled": true, + "__prefab": { + "__id__": 76 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 240, + "_originalHeight": 250, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "899DSiZmFN95I6lKN+zzfy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c9j4sTv9ZBy4YGIbMmIRr5", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 67 + }, + "_enabled": true, + "__prefab": { + "__id__": 79 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 550, + "height": 10 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "03ccYJ76tPc5sCIWHX1MEY" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 67 + }, + "_enabled": true, + "__prefab": { + "__id__": 81 + }, + "_resizeMode": 1, + "_layoutType": 3, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 10, + "_paddingRight": 0, + "_paddingTop": 10, + "_paddingBottom": 0, + "_spacingX": 8, + "_spacingY": 8, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ddShn5DuZB5IN8qwyvr1Nl" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 67 + }, + "_enabled": true, + "__prefab": { + "__id__": 83 + }, + "_alignFlags": 40, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 220, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "62SP9FQ6NOEZi8VB92ZPaI" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "30C+BYnslERpnpzQ3bqNiW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d9nYFuaGpFBZORlOeBddBu", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 49 + }, + "_enabled": true, + "__prefab": { + "__id__": 87 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 550, + "height": 520 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ea586EUItLw75LP4FG6Nuv" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 49 + }, + "_enabled": true, + "__prefab": { + "__id__": 89 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "96XQF/8DFF2prJbfE7k/tp" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 49 + }, + "_enabled": true, + "__prefab": { + "__id__": 91 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 100, + "_bottom": 80, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 240, + "_originalHeight": 250, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "56Nhwq50xBDqPYfa9cqYjO" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "55goghBf5GPogIe1/0pw20", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "升星", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 94 + } + ], + "_active": true, + "_components": [ + { + "__id__": 102 + }, + { + "__id__": 104 + }, + { + "__id__": 106 + } + ], + "_prefab": { + "__id__": 109 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "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__": 93 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 95 + }, + { + "__id__": 97 + }, + { + "__id__": 99 + } + ], + "_prefab": { + "__id__": 101 + }, + "_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__": 94 + }, + "_enabled": true, + "__prefab": { + "__id__": 96 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a7nJD7ijRJ65bS6jbzXCXa" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 94 + }, + "_enabled": true, + "__prefab": { + "__id__": 98 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "合成", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 24, + "_fontSize": 24, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 1, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4dUvRSVqROyYnEbHL8zCJ3" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 94 + }, + "_enabled": true, + "__prefab": { + "__id__": 100 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3fZRgVW1VCa6VHpoBX5aoL" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e9sJGfZJpMvpgtzoEf6Hvm", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 93 + }, + "_enabled": true, + "__prefab": { + "__id__": 103 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c9YH0WlxpOdrXstA65D9+l" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 93 + }, + "_enabled": true, + "__prefab": { + "__id__": 105 + }, + "_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": "e06v5IY2dCTbzMXjfGeP4K" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 93 + }, + "_enabled": true, + "__prefab": { + "__id__": 107 + }, + "clickEvents": [ + { + "__id__": 108 + } + ], + "_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__": 93 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "966p1LYUNNAJ6+9d6PAH5U" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "f8ba4N+bqdD84IUK5j+GSAq", + "handler": "onClickUp", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "86pnZI0AlEwYtsGyVIUbMD", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "升星-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 111 + } + ], + "_active": true, + "_components": [ + { + "__id__": 119 + }, + { + "__id__": 121 + }, + { + "__id__": 123 + }, + { + "__id__": 126 + } + ], + "_prefab": { + "__id__": 128 + }, + "_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__": 110 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 112 + }, + { + "__id__": 114 + }, + { + "__id__": 116 + } + ], + "_prefab": { + "__id__": 118 + }, + "_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__": 111 + }, + "_enabled": true, + "__prefab": { + "__id__": 113 + }, + "_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__": 111 + }, + "_enabled": true, + "__prefab": { + "__id__": 115 + }, + "_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__": 111 + }, + "_enabled": true, + "__prefab": { + "__id__": 117 + }, + "_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__": 110 + }, + "_enabled": true, + "__prefab": { + "__id__": 120 + }, + "_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__": 110 + }, + "_enabled": true, + "__prefab": { + "__id__": 122 + }, + "_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__": 110 + }, + "_enabled": true, + "__prefab": { + "__id__": 124 + }, + "clickEvents": [ + { + "__id__": 125 + } + ], + "_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__": 110 + }, + "_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__": 110 + }, + "_enabled": true, + "__prefab": { + "__id__": 127 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 130 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 550, + "height": 700 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "68UQQu1bBAQrAtTHy1yB8t" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 132 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "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": "b3/zsRycZIh7r2rjWWtX8P" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 134 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "415sfQkxFOvIr61TWj3cl/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8eQw+AA5xI/oCYsJa9dIvN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 137 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 720, + "height": 1280 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1dgJxmIH5HIpXD6y0/xMwI" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 139 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "582zBz6m5DKqmkTkiS/LE0" + }, + { + "__type__": "f8ba4N+bqdD84IUK5j+GSAq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 141 + }, + "mask": true, + "maskOpcity": 80, + "isClickMaskeClose": true, + "views": { + "__id__": 65 + }, + "petNameLabel": { + "__id__": 7 + }, + "petStar": { + "__id__": 37 + }, + "petStarExp": { + "__id__": 15 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "400mpHxO1GPrngoQJnfyNU" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "08xLpDDa9NlK3pgR7XiOqb", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab.meta new file mode 100644 index 00000000..54bdfbe7 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "2d60896c-8804-4c99-aedf-fc88ac297c21", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "宠物升星页面" + } +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/列表选择宠物ICON.prefab similarity index 97% rename from JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab rename to JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/列表选择宠物ICON.prefab index 7fc8c6b9..50a191c8 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/列表选择宠物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, @@ -248,7 +248,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6etm75eOVF37vJbMmq4O6z" + "fileId": "00FKoQn91HGIewgv1t1dOE" }, { "__type__": "cc.PrefabInfo", diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/列表选择宠物ICON.prefab.meta similarity index 80% rename from JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab.meta rename to JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/列表选择宠物ICON.prefab.meta index a29a4b9b..4c671053 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab.meta +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/列表选择宠物ICON.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "阵法宠物ICON" + "syncNodeName": "列表选择宠物ICON" } } diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab index 5e33efc9..3b98dc88 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 91 + "__id__": 124 }, { - "__id__": 93 + "__id__": 126 }, { - "__id__": 95 + "__id__": 128 } ], "_prefab": { - "__id__": 97 + "__id__": 130 }, "_lpos": { "__type__": "cc.Vec3", @@ -79,26 +79,26 @@ "__id__": 3 }, { - "__id__": 21 + "__id__": 54 }, { - "__id__": 65 + "__id__": 98 } ], "_active": true, "_components": [ { - "__id__": 84 + "__id__": 117 }, { - "__id__": 86 + "__id__": 119 }, { - "__id__": 88 + "__id__": 121 } ], "_prefab": { - "__id__": 90 + "__id__": 123 }, "_lpos": { "__type__": "cc.Vec3", @@ -140,19 +140,25 @@ "_children": [ { "__id__": 4 + }, + { + "__id__": 16 + }, + { + "__id__": 33 } ], "_active": true, "_components": [ { - "__id__": 16 + "__id__": 49 }, { - "__id__": 18 + "__id__": 51 } ], "_prefab": { - "__id__": 20 + "__id__": 53 }, "_lpos": { "__type__": "cc.Vec3", @@ -313,7 +319,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9cFGX9wKNG5adKnyjwUUBl" + "fileId": "5eaQjItvlAsrp/s4neGckz" }, { "__type__": "sp.Skeleton", @@ -356,7 +362,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "afvwQMWpJEN4ad9XqUn/Os" + "fileId": "3fo+IzfNJI24xTt+l2NFlf" }, { "__type__": "cc.PrefabInfo", @@ -366,7 +372,7 @@ "asset": { "__id__": 0 }, - "fileId": "59AnT4EMRNep0FQy8UNq+B", + "fileId": "e2V1sMadtGB4Y4Z6L/J3A0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -397,7 +403,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0wONnRwVDvYB8KjS9ScIl" + "fileId": "edT/qBxmdNWLuZFmLuO3EP" }, { "__type__": "cc.Sprite", @@ -442,7 +448,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3c2+0HA1FAKoafcrnIHJUy" + "fileId": "cdYxPWhL5JjaGfk+yEamDT" }, { "__type__": "cc.PrefabInfo", @@ -452,7 +458,777 @@ "asset": { "__id__": 0 }, - "fileId": "1dYaPkTqtK2oInTXYBpXfM", + "fileId": "89WDKPsx9CX5sG3Mkwo+WZ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "升星", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 3 + }, + "_children": [ + { + "__id__": 17 + } + ], + "_active": true, + "_components": [ + { + "__id__": 25 + }, + { + "__id__": 27 + }, + { + "__id__": 29 + } + ], + "_prefab": { + "__id__": 32 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 55.335, + "y": -250, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 16 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + } + ], + "_prefab": { + "__id__": 24 + }, + "_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__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "20kNE29L9JZavt92WE5PJ1" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "升星", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 24, + "_fontSize": 24, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 1, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bfG10BiA1CuKtvI81kd/PT" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6byHPsZFtOwowjAuOi2zqU" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "82JXSRbA9E56kc6O0cU6/q", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 16 + }, + "_enabled": true, + "__prefab": { + "__id__": 26 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "40bsBbPfxC1YKs2lfvRQSl" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 16 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "_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": "0a+zbIb/FA+LW9fANZnhPU" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 16 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, + "clickEvents": [ + { + "__id__": 31 + } + ], + "_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__": 16 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8dwGvynBpN1o/srOnoIAeJ" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "00e5fiwk55OFq7ZIZmksXGJ", + "handler": "onClickUpStar", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "08ohUSWGFLEJJ0g2GQX85s", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "升级", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 3 + }, + "_children": [ + { + "__id__": 34 + } + ], + "_active": true, + "_components": [ + { + "__id__": 42 + }, + { + "__id__": 44 + }, + { + "__id__": 46 + } + ], + "_prefab": { + "__id__": 48 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 185.335, + "y": -250, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 33 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 35 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + } + ], + "_prefab": { + "__id__": 41 + }, + "_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__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "17cEJcA/RL34duWdqZTKpA" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 38 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "升级", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 24, + "_fontSize": 24, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 1, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "00FWHQq+VAr54r5EOahUvg" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "25cEjjThFN9I+wCFe0XNg/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "13t7VoUf9DFKfa/JKDLMfc", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 33 + }, + "_enabled": true, + "__prefab": { + "__id__": 43 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "41HcT5BDRE7aYf/wbXKdMw" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 33 + }, + "_enabled": true, + "__prefab": { + "__id__": 45 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3fiav4BuhNxaAaG+oIySYE" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 33 + }, + "_enabled": true, + "__prefab": { + "__id__": 47 + }, + "clickEvents": [], + "_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__": 33 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fa5nC7a5pDGqdZj5V01Y4g" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b4o2Km/8BEz6xYUVBCwUVg", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -467,7 +1243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 50 }, "_contentSize": { "__type__": "cc.Size", @@ -483,7 +1259,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a7v95Jt2lNL5TFuID+B3lu" + "fileId": "01KFQ2ONdPt6ZaSjrHwP4Y" }, { "__type__": "cc.Widget", @@ -495,7 +1271,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 52 }, "_alignFlags": 41, "_target": null, @@ -519,7 +1295,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cbY7aqHhtEV62KdALkj9oK" + "fileId": "0aKHdk6ktNmbFh3umFKXZ7" }, { "__type__": "cc.PrefabInfo", @@ -529,7 +1305,7 @@ "asset": { "__id__": 0 }, - "fileId": "40hBb/khZF6IQU3obPp/Pq", + "fileId": "e6pvdzTb9IUIdi34Z79LXy", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -544,29 +1320,29 @@ }, "_children": [ { - "__id__": 22 + "__id__": 55 }, { - "__id__": 40 + "__id__": 73 } ], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 91 }, { - "__id__": 60 + "__id__": 93 }, { - "__id__": 62 + "__id__": 95 }, { - "__id__": 37 + "__id__": 70 } ], "_prefab": { - "__id__": 64 + "__id__": 97 }, "_lpos": { "__type__": "cc.Vec3", @@ -603,30 +1379,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 21 + "__id__": 54 }, "_children": [ { - "__id__": 23 + "__id__": 56 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 62 }, { - "__id__": 31 + "__id__": 64 }, { - "__id__": 33 + "__id__": 66 }, { - "__id__": 35 + "__id__": 68 } ], "_prefab": { - "__id__": 57 + "__id__": 90 }, "_lpos": { "__type__": "cc.Vec3", @@ -663,20 +1439,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 55 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 57 }, { - "__id__": 26 + "__id__": 59 } ], "_prefab": { - "__id__": 28 + "__id__": 61 }, "_lpos": { "__type__": "cc.Vec3", @@ -713,11 +1489,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 58 }, "_contentSize": { "__type__": "cc.Size", @@ -741,11 +1517,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 60 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -799,11 +1575,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", @@ -827,11 +1603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 65 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -872,11 +1648,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 67 }, "_alignFlags": 37, "_target": null, @@ -908,17 +1684,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 69 }, "_scrollView": { - "__id__": 37 + "__id__": 70 }, "_handle": { - "__id__": 26 + "__id__": 59 }, "_direction": 1, "_enableAutoHide": false, @@ -935,11 +1711,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 71 }, "bounceDuration": 0.23, "brake": 0.75, @@ -950,11 +1726,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 39 + "__id__": 72 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 35 + "__id__": 68 }, "itemPrefab": { "__uuid__": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae", @@ -972,23 +1748,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 40 + "__id__": 73 }, "_children": [], "_active": true, "_components": [ { - "__id__": 50 + "__id__": 83 }, { - "__id__": 52 + "__id__": 85 }, { - "__id__": 54 + "__id__": 87 } ], "_prefab": { - "__id__": 56 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", @@ -1025,30 +1801,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 21 + "__id__": 54 }, "_children": [ { - "__id__": 39 + "__id__": 72 } ], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 74 }, { - "__id__": 43 + "__id__": 76 }, { - "__id__": 45 + "__id__": 78 }, { - "__id__": 47 + "__id__": 80 } ], "_prefab": { - "__id__": 49 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -1085,11 +1861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 75 }, "_contentSize": { "__type__": "cc.Size", @@ -1113,11 +1889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 77 }, "_type": 0, "_inverted": false, @@ -1135,11 +1911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1181,11 +1957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 81 }, "_alignFlags": 45, "_target": null, @@ -1230,11 +2006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1258,11 +2034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 86 }, "_resizeMode": 1, "_layoutType": 3, @@ -1296,11 +2072,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 88 }, "_alignFlags": 40, "_target": null, @@ -1358,11 +2134,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", @@ -1386,11 +2162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 94 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1431,11 +2207,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 96 }, "_alignFlags": 45, "_target": null, @@ -1484,26 +2260,26 @@ }, "_children": [ { - "__id__": 66 + "__id__": 99 } ], "_active": true, "_components": [ { - "__id__": 74 + "__id__": 107 }, { - "__id__": 76 + "__id__": 109 }, { - "__id__": 78 + "__id__": 111 }, { - "__id__": 81 + "__id__": 114 } ], "_prefab": { - "__id__": 83 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", @@ -1540,23 +2316,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 98 }, "_children": [], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 100 }, { - "__id__": 69 + "__id__": 102 }, { - "__id__": 71 + "__id__": 104 } ], "_prefab": { - "__id__": 73 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -1593,11 +2369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 101 }, "_contentSize": { "__type__": "cc.Size", @@ -1621,11 +2397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 103 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1666,11 +2442,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 105 }, "_color": { "__type__": "cc.Color", @@ -1705,11 +2481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 108 }, "_contentSize": { "__type__": "cc.Size", @@ -1733,11 +2509,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 110 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1778,15 +2554,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 112 }, "clickEvents": [ { - "__id__": 80 + "__id__": 113 } ], "_interactable": true, @@ -1838,7 +2614,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 65 + "__id__": 98 }, "_id": "" }, @@ -1862,11 +2638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 115 }, "_alignFlags": 4, "_target": null, @@ -1915,7 +2691,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 118 }, "_contentSize": { "__type__": "cc.Size", @@ -1943,7 +2719,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 120 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1988,7 +2764,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 122 }, "_id": "" }, @@ -2019,7 +2795,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -2047,7 +2823,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 127 }, "_alignFlags": 45, "_target": null, @@ -2083,13 +2859,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 129 }, "mask": true, "maskOpcity": 80, "isClickMaskeClose": true, "views": { - "__id__": 37 + "__id__": 70 }, "spine": { "__id__": 8 diff --git a/JisolGameCocos/assets/script/consts/API.ts b/JisolGameCocos/assets/script/consts/API.ts index 34b515db..34eefc6f 100644 --- a/JisolGameCocos/assets/script/consts/API.ts +++ b/JisolGameCocos/assets/script/consts/API.ts @@ -70,6 +70,8 @@ export interface PlayerPetOV{ petPlayerId:number; //宠物的玩家Id petTbId:number; //宠物配置表Id petGrade:number; //宠物等级 + petStar:number; //宠物星级 + petStarExp:number; //宠物星级经验 } //玩家阵法信息 export interface PlayerTacticalOV{ @@ -96,7 +98,9 @@ export const API = { /********** 宠物接口 ******************/ - GetPlayerPets: async () => RData(await app.api.get(`/game/pet/list`),false) as PlayerPetOV[], //获取玩家全部宠物 + GetPlayerPets: async () => RData(await app.api.get(`/game/pet/list`),false) as PlayerPetOV[], //获取玩家全部宠物 + //petId 需合成的Id pets 被合成的Id列表 + PetUpStar: async (petId:number,pets:number[]) => RData(await app.api.post(`/game/pet/up/star`,{petId,pets}),true) as PlayerPetOV, //提升宠物星 /********** 阵法接口 ******************/ GetPlayerTactical: async () => RData(await app.api.get(`/game/tactical/get`),false) as PlayerTacticalOV, //获取玩家阵法 diff --git a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectScroll.ts b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectScroll.ts new file mode 100644 index 00000000..f09a349b --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectScroll.ts @@ -0,0 +1,19 @@ +import { _decorator, Component, Node } from 'cc'; +import JNScrollViewItem from '../../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollViewItem'; +import { PlayerPetOV } from '../../../consts/API'; +import { PetIconSelect } from './PetIconSelect'; +const { ccclass, property } = _decorator; + +@ccclass('PetIconSelectScroll') +export class PetIconSelectScroll extends JNScrollViewItem { + + @property(PetIconSelect) + select:PetIconSelect; + + protected start(): void { + this.select.setIcon(this.data.petTbId); + } + +} + + diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectScroll.ts.meta similarity index 100% rename from JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts.meta rename to JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectScroll.ts.meta diff --git a/JisolGameCocos/assets/script/ui/Pet.meta b/JisolGameCocos/assets/script/ui/Pet.meta new file mode 100644 index 00000000..4a2024af --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Pet.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "4150c714-fb58-4291-a255-deead542da48", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts new file mode 100644 index 00000000..5379850a --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts @@ -0,0 +1,114 @@ +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 PlayerPetData from '../../data/PlayerPetData'; +import { API, PlayerPetOV } from '../../consts/API'; +import { PetOV, PlayerPetOVSelect } from '../VO/PetOV'; +import { PetIconSelectScroll } from '../Consts/Pet/PetIconSelectScroll'; +import { NodeEventType } from 'cc'; +import { Label } from 'cc'; +import { app, TD } from '../../App'; +import { GUI } from '../UIConfig'; +const { ccclass, property } = _decorator; + +@ccclass('PetUpStarView') +export class PetUpStarView extends JNLayerBase { + + @property(JNScrollView) + views:JNScrollView; //宠物列表 + + @property(Label) + petNameLabel:Label; //宠物名称 + @property(Label) + petStar:Label; //宠物星级 + @property(Label) + petStarExp:Label; //宠物星级经验 + + //宠物数据 + pets:PlayerPetOVSelect[] = []; + + data:PlayerPetOV; + + onJNLoad(data: PlayerPetOV): void { + + super.onJNLoad(data); + this.data = data; + this.onUpdateView(); + + } + + + //刷新页面 + onUpdateView(){ + + this.onUpdateInfo(); + + //获取所有玩家宠物 + this.pets = PetOV.PlayerPetOVSelects(PlayerPetData.getIns().getData()); + this.views.refreshData(this.pets); + + //向子节点添加点击事件 + this.views.addItemEvent(NodeEventType.TOUCH_START,this.onClickItem.bind(this)); + + this.onUpdateSelect(); + + } + + //刷新信息 + onUpdateInfo(){ + + //显示宠物名称 + this.petNameLabel.string = TD.TbGRole.get(this.data.petTbId).roleName; + this.petStar.string = `当前星级: ${this.data.petStar} 星`; + this.petStarExp.string = `升级所需经验 / ${this.data.petStarExp}`; + + } + + //刷新选择 + onUpdateSelect(){ + + //刷新 + this.views.getItems().forEach((item) => { + let data = item.data as PlayerPetOVSelect; + item.select.isSelect = data.isSelect; + }) + + } + + //选择全部 + onClickAll(){ + //如果全部选择则全部取消 + if(this.pets.filter(pet => pet.isSelect).length == this.pets.length){ + this.pets.forEach(pet => pet.isSelect = false); + }else{ + this.pets.forEach(pet => pet.isSelect = true); + } + this.onUpdateSelect(); + } + + //点击Item + onClickItem(index:number){ + + this.pets[index].isSelect = !this.pets[index].isSelect; + this.onUpdateSelect(); + + } + + //点击合成 + async onClickUp(){ + //获取被合成的Id + let pets = this.pets.filter(pet => pet.isSelect).map(pet => pet.petId); + + if(pets.length <= 0){ + app.layer.Open(GUI.Tips,{text:"请选择需要被合成的宠物"}); + return; + } + + await API.PetUpStar(this.data.petId,pets); + app.layer.Open(GUI.Tips,{text:"合成成功"}); + + } + +} + + diff --git a/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts.meta b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts.meta new file mode 100644 index 00000000..eeaade36 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "f8ba437e-6ea7-43f3-8214-2b98fe19202a", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts b/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts deleted file mode 100644 index d5eeb104..00000000 --- a/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { _decorator, Component, Node } from 'cc'; -import { PlayerPetOV } from '../../consts/API'; -import JNScrollViewItem from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollViewItem'; -import { PetIconSelect } from '../Consts/Pet/PetIconSelect'; -const { ccclass, property } = _decorator; - -@ccclass('IntoBattlePetIcon') -export class IntoBattlePetIcon extends JNScrollViewItem { - - @property(PetIconSelect) - select:PetIconSelect; - - protected start(): void { - this.select.setIcon(this.data.petTbId); - } - -} - - diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts index 7d680c2e..ad4969e4 100644 --- a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts +++ b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts @@ -10,7 +10,7 @@ import { PlayerPetOV } from '../../consts/API'; import { UIPetAnim } from '../../consts/GData'; import { GUI } from '../UIConfig'; import PlayerTacticalData from '../../data/PlayerTacticalData'; -import { IntoBattlePetIcon } from './IntoBattlePetIcon'; +import { PetIconSelectScroll } from '../Consts/Pet/PetIconSelectScroll'; const { ccclass, property } = _decorator; //上阵页面 @@ -53,7 +53,7 @@ export class IntoBattleView extends JNLayerBase { this.views.refreshData(this.pets); //设置不可选中 - this.views.getItems().forEach(item => { + this.views.getItems().forEach(item => { if(PlayerTacticalData.getIns().getTacticalInfo().indexOf(item.data.petId) != -1) item.select.isNoSelect = true; //如果在阵法里则不可选中 }) @@ -69,13 +69,13 @@ export class IntoBattleView extends JNLayerBase { onUpdateSelect(){ //默认都不选中 - this.views.getItems().forEach(item => { + this.views.getItems().forEach(item => { item.select.isSelect = false; }) //设置选中 if(this.index != -1){ - let current = this.views.getItems()[this.index] + let current = this.views.getItems()[this.index] current.select.isSelect = true; //显示选中宠物 @@ -87,12 +87,6 @@ export class IntoBattleView extends JNLayerBase { //点击Item onClickItem(index:number){ - - //判断是否不可选中 - if(this.views.getItems()[index].select.isNoSelect) { - app.layer.Open(GUI.Tips,{text:"当前宠物已上阵"}) - return; - } //设置当前选中 this.index = index; @@ -108,6 +102,10 @@ export class IntoBattleView extends JNLayerBase { app.layer.Open(GUI.Tips,{text:"请选择要上阵的宠物."}) return; } + if(this.views.getItems()[this.index].select.isNoSelect) { + app.layer.Open(GUI.Tips,{text:"当前宠物已上阵"}) + return; + } //修改上阵信息 await PlayerTacticalData.getIns().UpdateIndexTactical(this.tIndex,this.pets[this.index].petId); @@ -117,6 +115,17 @@ export class IntoBattleView extends JNLayerBase { } + //点击升星页面 + async onClickUpStar(){ + + if(this.index < 0){ + app.layer.Open(GUI.Tips,{text:"请选择宠物."}) + return; + } + app.layer.Open(GUI.PetUpStarView,this.pets[this.index]); + + } + } diff --git a/JisolGameCocos/assets/script/ui/UIConfig.ts b/JisolGameCocos/assets/script/ui/UIConfig.ts index d16ada28..231264c0 100644 --- a/JisolGameCocos/assets/script/ui/UIConfig.ts +++ b/JisolGameCocos/assets/script/ui/UIConfig.ts @@ -20,9 +20,11 @@ export enum GUI{ /** 主页页面 */ MainChat = "MainChat", //主页聊天页面 - + IntoBattleView = "IntoBattleView", //上阵页面 + PetUpStarView = "PetUpStarView", //宠物升星页面 + /**游戏模式页面 */ PVPModeMatchView = "PVPModeMatchView", //PVP模式匹配页面 @@ -85,6 +87,16 @@ const UIMainConfig:{ [key: string]: JNLayerInfo; } = { }, } +//宠物页面 +const UIPetConfig:{ [key: string]: JNLayerInfo; } = { + [GUI.PetUpStarView]:{ + layer:GLayer.Popup, + uri: "prefab/ui/宠物/宠物升星页面", + anims:BackOutScale, + }, +} + + //新手引导页面 const UINoviceConfig:{ [key: string]: JNLayerInfo; } = { @@ -146,6 +158,7 @@ export const UIConfig:{ [key: string]: JNLayerInfo; } = { ...UISystemConfig, //系统页面 ...UINoviceConfig, //新手引导页面 ...UIMainConfig, //主页面 + ...UIPetConfig, //宠物页面 ...UIGModeConfig, //游戏模式页面 } diff --git a/JisolGameCocos/assets/script/ui/VO.meta b/JisolGameCocos/assets/script/ui/VO.meta new file mode 100644 index 00000000..3f9bd7fe --- /dev/null +++ b/JisolGameCocos/assets/script/ui/VO.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "3eff9bce-ded3-4764-b79e-a86c9fd30e8e", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/VO/PetOV.ts b/JisolGameCocos/assets/script/ui/VO/PetOV.ts new file mode 100644 index 00000000..f524d9c0 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/VO/PetOV.ts @@ -0,0 +1,18 @@ +import { PlayerPetOV } from "../../consts/API"; + +//宠物选择 +export interface PlayerPetOVSelect extends PlayerPetOV{ + + //是否选择 + isSelect:boolean; + +} + +export class PetOV{ + + static PlayerPetOVSelects(pets:PlayerPetOV[]):PlayerPetOVSelect[]{ + return pets.map(pet => ({...pet,isSelect:false})) + } + +} + diff --git a/JisolGameCocos/assets/script/ui/VO/PetOV.ts.meta b/JisolGameCocos/assets/script/ui/VO/PetOV.ts.meta new file mode 100644 index 00000000..4042b159 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/VO/PetOV.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "b4cea2c3-cb9a-43b7-9b23-a0e2d5dfe9e5", + "files": [], + "subMetas": {}, + "userData": {} +} 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 8d2afde1..6e5b3761 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java @@ -1,24 +1,21 @@ package cn.jisol.game.controller.game; import cn.jisol.game.controller.argsresolver.CurrentPlayer; -import cn.jisol.game.controller.argsresolver.CurrentUser; -import cn.jisol.game.entity.User; import cn.jisol.game.entity.game.Player; import cn.jisol.game.entity.game.PlayerPet; import cn.jisol.game.service.PlayerPetService; -import cn.jisol.game.service.impl.PlayerServiceImpl; +import cn.jisol.game.vo.pet.PetUpStarOV; import cn.jisol.ngame.util.NewsContext; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Objects; /** * 玩家宠物 @@ -46,4 +43,54 @@ public class GPlayerPetController { } + //提升宠物星 + @ApiImplicitParams({}) + @ApiOperation(value = "提升宠物星") + @PostMapping("/up/star") + public NewsContext onUpStar(@RequestBody PetUpStarOV info,@CurrentPlayer Player player){ + + //判断参数 + if(info.getPets().size() <= 0 || Objects.isNull(info.getPetId())){ + return NewsContext.onFail("参数错误"); + } + + //查询被合成的宠物列表 + //合成数量 + long petCount = playerPetService.count( + Wrappers.lambdaQuery(PlayerPet.class) + .eq(PlayerPet::getPetPlayerId, player.getPlayerId()) + .and(qr -> { + //遍历被合成的宠物 + info.getPets().forEach(petId -> { + qr.eq(PlayerPet::getPetId, petId); + qr.or(); + }); + }) + ); + + if(info.getPets().size() != petCount){ + return NewsContext.onFail("合成宠物信息错误"); + } + + //查询被升级的宠物 + PlayerPet pet = playerPetService.getById(info.getPetId()); + + //判断宠物是否是自己的 + if(!Objects.equals(pet.getPetPlayerId(), player.getPlayerId())){ + return NewsContext.onFail("宠物不是自己的"); + } + + //升级星 + pet.setPetStarExp(pet.getPetStarExp() + info.getPets().size()); + + //保存宠物信息 + playerPetService.updateById(pet); + + //删除被合成的宠物 + playerPetService.removeByIds(info.getPets()); + + return NewsContext.onSuccess("升星成功",pet); + + } + } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/game/PlayerPet.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/game/PlayerPet.java index 68a199d9..bc21c12c 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/game/PlayerPet.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/game/PlayerPet.java @@ -18,4 +18,6 @@ public class PlayerPet { private Long petPlayerId; //宠物的玩家Id private Integer petTbId; //宠物配置表Id private Integer petGrade; //宠物等级 + private Integer petStar; //宠物星级 + private Integer petStarExp; //宠物星级经验 } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java new file mode 100644 index 00000000..aa6896c6 --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java @@ -0,0 +1,21 @@ +package cn.jisol.game.vo.pet; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +import java.util.ArrayList; + +@ApiModel(value = "升星请求体") +@Builder +@Data +public class PetUpStarOV { + + @ApiModelProperty(value = "需要升级的宠物Id", required = true) + private Integer petId; + + @ApiModelProperty(value = "被吸收的宠物列表", required = true) + ArrayList pets; + +}