diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/HomeView.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/HomeView.prefab index 93105730..1399fd63 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/HomeView.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/HomeView.prefab @@ -348,7 +348,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 720 + "height": 1280 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4423,6 +4423,7 @@ }, "mask": false, "maskOpcity": 80, + "isClickMaskeClose": false, "frameText": { "__id__": 19 }, diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab index add71919..17d93ef5 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab @@ -28,29 +28,29 @@ "__id__": 38 }, { - "__id__": 46 + "__id__": 98 }, { - "__id__": 65 + "__id__": 117 }, { - "__id__": 80 + "__id__": 132 } ], "_active": true, "_components": [ { - "__id__": 95 + "__id__": 147 }, { - "__id__": 97 + "__id__": 149 }, { - "__id__": 99 + "__id__": 151 } ], "_prefab": { - "__id__": 101 + "__id__": 153 }, "_lpos": { "__type__": "cc.Vec3", @@ -878,21 +878,28 @@ "_parent": { "__id__": 1 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 39 }, { - "__id__": 41 + "__id__": 53 + } + ], + "_active": true, + "_components": [ + { + "__id__": 91 }, { - "__id__": 43 + "__id__": 93 + }, + { + "__id__": 95 } ], "_prefab": { - "__id__": 45 + "__id__": 97 }, "_lpos": { "__type__": "cc.Vec3", @@ -923,6 +930,1150 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "阵法", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 38 + }, + "_children": [ + { + "__id__": 40 + } + ], + "_active": true, + "_components": [ + { + "__id__": 48 + }, + { + "__id__": 50 + } + ], + "_prefab": { + "__id__": 52 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 64.845, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 39 + }, + "_prefab": { + "__id__": 41 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 40 + }, + "asset": { + "__uuid__": "9d7eeadb-58f6-4c42-aaed-bc402f272c84", + "__expectedType__": "cc.Prefab" + }, + "fileId": "a8T0NC/KpNY7MMbRkPRuwY", + "instance": { + "__id__": 42 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "b5oOS+qEhH3IdM0aj6XS+/", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 43 + }, + { + "__id__": 45 + }, + { + "__id__": 46 + }, + { + "__id__": 47 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 44 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "a8T0NC/KpNY7MMbRkPRuwY" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 44 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 44 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 44 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 39 + }, + "_enabled": true, + "__prefab": { + "__id__": 49 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 550, + "height": 400 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f38ZdtRVhFn4IrIzERMCcn" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 39 + }, + "_enabled": true, + "__prefab": { + "__id__": 51 + }, + "_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": "09z6IhKCZOJ4hWP69rWURe" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ccC3h/uypP1JlxpUTEX8xP", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "按钮列表", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 38 + }, + "_children": [ + { + "__id__": 54 + }, + { + "__id__": 70 + } + ], + "_active": true, + "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + } + ], + "_prefab": { + "__id__": 90 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -216.02, + "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": "Button", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 53 + }, + "_children": [ + { + "__id__": 55 + } + ], + "_active": true, + "_components": [ + { + "__id__": 63 + }, + { + "__id__": 65 + }, + { + "__id__": 67 + } + ], + "_prefab": { + "__id__": 69 + }, + "_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.Node", + "_name": "Label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 54 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 56 + }, + { + "__id__": 58 + }, + { + "__id__": 60 + } + ], + "_prefab": { + "__id__": 62 + }, + "_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__": 55 + }, + "_enabled": true, + "__prefab": { + "__id__": 57 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 56.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2bJelfNNVF7L2tnm/gUcvw" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 55 + }, + "_enabled": true, + "__prefab": { + "__id__": 59 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "挂机", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 36, + "_fontSize": 36, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ce9VteLtJ0r6c9R0M1lvI" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 55 + }, + "_enabled": true, + "__prefab": { + "__id__": 61 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 3, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a2eUFYIbFHras3sGgvs40R" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1eAxRRWPxHXoMaudMc/8fz", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 54 + }, + "_enabled": true, + "__prefab": { + "__id__": 64 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 150, + "height": 130 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cbInxYzzJAuJJWzwazENT5" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 54 + }, + "_enabled": true, + "__prefab": { + "__id__": 66 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 235, + "g": 235, + "b": 235, + "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": "5a1GW5k0RCqYlHEokgda4I" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 54 + }, + "_enabled": true, + "__prefab": { + "__id__": 68 + }, + "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__": 54 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4fEzfFuwpJA5y8tCAlhH7K" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8fbPD9UCZLfa09RiHWZKx7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Button-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 53 + }, + "_children": [ + { + "__id__": 71 + } + ], + "_active": true, + "_components": [ + { + "__id__": 79 + }, + { + "__id__": 81 + }, + { + "__id__": 83 + } + ], + "_prefab": { + "__id__": 85 + }, + "_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.Node", + "_name": "Label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 70 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 72 + }, + { + "__id__": 74 + }, + { + "__id__": 76 + } + ], + "_prefab": { + "__id__": 78 + }, + "_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__": 71 + }, + "_enabled": true, + "__prefab": { + "__id__": 73 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 56.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93BXhB6UBLtIACZ3ATBEBD" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 71 + }, + "_enabled": true, + "__prefab": { + "__id__": 75 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "地图", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 36, + "_fontSize": 36, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "11PlyEvh1Md444c8BTAfi0" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 71 + }, + "_enabled": true, + "__prefab": { + "__id__": 77 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 3, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a8faO0x2ZLdKjer1OaKGLk" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "85+AZLUnVJuKaWjuhFpsB9", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": { + "__id__": 80 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 150, + "height": 130 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "22xAwxqfpJRZyNxwTX+JGd" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": { + "__id__": 82 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 235, + "g": 235, + "b": 235, + "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": "c1ozMiI/dLcZaNkv4HNqRa" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": { + "__id__": 84 + }, + "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__": 70 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "691d24ldNIzrFp+X5irgGN" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "37SPlAjtJMpoLl1DmX+o28", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 87 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 450, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7eY8+eNupGvaYUO3m7tc0f" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 89 + }, + "_resizeMode": 1, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 150, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6fGpo4oqZPE4N+jK5Q4P/r" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a7k4jJN+9E4o9tingaVO93", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -933,7 +2084,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", @@ -961,7 +2112,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 94 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1006,7 +2157,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 96 }, "_alignFlags": 44, "_target": null, @@ -1055,26 +2206,26 @@ }, "_children": [ { - "__id__": 47 + "__id__": 99 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 107 }, { - "__id__": 57 + "__id__": 109 }, { - "__id__": 59 + "__id__": 111 }, { - "__id__": 61 + "__id__": 113 } ], "_prefab": { - "__id__": 64 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", @@ -1111,23 +2262,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 46 + "__id__": 98 }, "_children": [], "_active": true, "_components": [ { - "__id__": 48 + "__id__": 100 }, { - "__id__": 50 + "__id__": 102 }, { - "__id__": 52 + "__id__": 104 } ], "_prefab": { - "__id__": 54 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -1164,11 +2315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 101 }, "_contentSize": { "__type__": "cc.Size", @@ -1192,11 +2343,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 103 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1237,11 +2388,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 105 }, "_color": { "__type__": "cc.Color", @@ -1276,11 +2427,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 108 }, "_contentSize": { "__type__": "cc.Size", @@ -1304,11 +2455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 110 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1349,11 +2500,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 112 }, "_alignFlags": 44, "_target": null, @@ -1385,15 +2536,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 114 }, "clickEvents": [ { - "__id__": 63 + "__id__": 115 } ], "_interactable": true, @@ -1472,23 +2623,23 @@ }, "_children": [ { - "__id__": 66 + "__id__": 118 } ], "_active": true, "_components": [ { - "__id__": 72 + "__id__": 124 }, { - "__id__": 74 + "__id__": 126 }, { - "__id__": 76 + "__id__": 128 } ], "_prefab": { - "__id__": 79 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", @@ -1525,20 +2676,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 117 }, "_children": [], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 119 }, { - "__id__": 69 + "__id__": 121 } ], "_prefab": { - "__id__": 71 + "__id__": 123 }, "_lpos": { "__type__": "cc.Vec3", @@ -1575,11 +2726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 120 }, "_contentSize": { "__type__": "cc.Size", @@ -1603,11 +2754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 122 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1661,11 +2812,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -1689,11 +2840,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 127 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1734,15 +2885,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 129 }, "clickEvents": [ { - "__id__": 78 + "__id__": 130 } ], "_interactable": true, @@ -1794,7 +2945,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 65 + "__id__": 117 }, "_id": "" }, @@ -1835,23 +2986,23 @@ }, "_children": [ { - "__id__": 81 + "__id__": 133 } ], "_active": true, "_components": [ { - "__id__": 87 + "__id__": 139 }, { - "__id__": 89 + "__id__": 141 }, { - "__id__": 91 + "__id__": 143 } ], "_prefab": { - "__id__": 94 + "__id__": 146 }, "_lpos": { "__type__": "cc.Vec3", @@ -1888,20 +3039,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 132 }, "_children": [], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 134 }, { - "__id__": 84 + "__id__": 136 } ], "_prefab": { - "__id__": 86 + "__id__": 138 }, "_lpos": { "__type__": "cc.Vec3", @@ -1938,11 +3089,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 135 }, "_contentSize": { "__type__": "cc.Size", @@ -1966,11 +3117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 137 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2024,11 +3175,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 140 }, "_contentSize": { "__type__": "cc.Size", @@ -2052,11 +3203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 142 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2097,15 +3248,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 144 }, "clickEvents": [ { - "__id__": 93 + "__id__": 145 } ], "_interactable": true, @@ -2157,7 +3308,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 80 + "__id__": 132 }, "_id": "" }, @@ -2198,7 +3349,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 148 }, "_contentSize": { "__type__": "cc.Size", @@ -2226,7 +3377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 150 }, "_alignFlags": 45, "_target": null, @@ -2262,7 +3413,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 152 }, "mask": false, "maskOpcity": 80, @@ -2286,6 +3437,11 @@ }, "fileId": "08xLpDDa9NlK3pgR7XiOqb", "instance": null, - "targetOverrides": null + "targetOverrides": null, + "nestedPrefabInstanceRoots": [ + { + "__id__": 40 + } + ] } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/聊天/MainChatItem.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/聊天/MainChatItem.prefab index 9db4b443..4e91657b 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/聊天/MainChatItem.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/聊天/MainChatItem.prefab @@ -25,10 +25,13 @@ }, { "__id__": 4 + }, + { + "__id__": 6 } ], "_prefab": { - "__id__": 6 + "__id__": 8 }, "_lpos": { "__type__": "cc.Vec3", @@ -73,7 +76,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 335.53125, + "width": 720, "height": 50.4 }, "_anchorPoint": { @@ -110,13 +113,13 @@ "a": 255 }, "_string": "ScrollView content01", - "_horizontalAlign": 0, + "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 36, "_fontSize": 36, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 3, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -132,6 +135,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "7ahEvd3z5N4ruHsPPLIdmV" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 7 + }, + "_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": 335.53125, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "61ikNaw6BJr7IaFbNvdfj8" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -141,6 +180,7 @@ "__id__": 0 }, "fileId": "b4aPDEneNHC4OYnY3k7ypP", + "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体.meta new file mode 100644 index 00000000..c267dfbb --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "35bdeb55-51fc-4cf0-8352-90aa9422da8d", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法.meta new file mode 100644 index 00000000..eab37362 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "002acba0-daff-4ba2-a1cc-0bd6b522b819", + "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..792c5d9e --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法.prefab @@ -0,0 +1,1253 @@ +[ + { + "__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 + }, + { + "__id__": 10 + }, + { + "__id__": 18 + }, + { + "__id__": 26 + }, + { + "__id__": 34 + }, + { + "__id__": 42 + }, + { + "__id__": 50 + }, + { + "__id__": 58 + }, + { + "__id__": 66 + } + ], + "_active": true, + "_components": [ + { + "__id__": 74 + }, + { + "__id__": 76 + }, + { + "__id__": 78 + } + ], + "_prefab": { + "__id__": 80 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "instance": { + "__id__": 4 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "d7hLqfWDtDspikDq41mSFX", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法节点" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f15AW5eMVEKKgrwPWb2eZo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 110, + "y": 110, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 11 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 10 + }, + "asset": { + "__uuid__": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "instance": { + "__id__": 12 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "6ewBrcFrJFBYYugJZafNy7", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 16 + }, + { + "__id__": 17 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 14 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法节点-001" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f15AW5eMVEKKgrwPWb2eZo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 14 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 110, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 14 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 14 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 19 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 18 + }, + "asset": { + "__uuid__": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "instance": { + "__id__": 20 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "61tQUJqx5Klr6pxCqCQSls", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 21 + }, + { + "__id__": 23 + }, + { + "__id__": 24 + }, + { + "__id__": 25 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 22 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法节点-002" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f15AW5eMVEKKgrwPWb2eZo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 22 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 110, + "y": -110, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 22 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 22 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 27 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 26 + }, + "asset": { + "__uuid__": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "instance": { + "__id__": 28 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "f2kp/z/dhMj5o+JmHop9ZN", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 29 + }, + { + "__id__": 31 + }, + { + "__id__": 32 + }, + { + "__id__": 33 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 30 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法节点-003" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f15AW5eMVEKKgrwPWb2eZo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 30 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 110, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 30 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 30 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 35 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 34 + }, + "asset": { + "__uuid__": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "instance": { + "__id__": 36 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "66JvfNPelJuY7AeQ9wjNKV", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 37 + }, + { + "__id__": 39 + }, + { + "__id__": 40 + }, + { + "__id__": 41 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 38 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法节点-004" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f15AW5eMVEKKgrwPWb2eZo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 38 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 38 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 38 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 43 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 42 + }, + "asset": { + "__uuid__": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "instance": { + "__id__": 44 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "6511WgRLVGprt0S7ZtYfPt", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 45 + }, + { + "__id__": 47 + }, + { + "__id__": 48 + }, + { + "__id__": 49 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 46 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法节点-005" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f15AW5eMVEKKgrwPWb2eZo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 46 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -110, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 46 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 46 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 51 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 50 + }, + "asset": { + "__uuid__": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "instance": { + "__id__": 52 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "a9fCbWcVVGGY8wvdmcURSW", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 53 + }, + { + "__id__": 55 + }, + { + "__id__": 56 + }, + { + "__id__": 57 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 54 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法节点-006" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f15AW5eMVEKKgrwPWb2eZo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 54 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -110, + "y": 110, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 54 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 54 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 59 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 58 + }, + "asset": { + "__uuid__": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "instance": { + "__id__": 60 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "4bab5DEsRBt5bJm03UpFl/", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 61 + }, + { + "__id__": 63 + }, + { + "__id__": 64 + }, + { + "__id__": 65 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 62 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法节点-007" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f15AW5eMVEKKgrwPWb2eZo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 62 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -110, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 62 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 62 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 67 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 66 + }, + "asset": { + "__uuid__": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "__expectedType__": "cc.Prefab" + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "instance": { + "__id__": 68 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "36LFYxwwlC6K/oB3DXKe/M", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 69 + }, + { + "__id__": 71 + }, + { + "__id__": 72 + }, + { + "__id__": 73 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 70 + }, + "propertyPath": [ + "_name" + ], + "value": "阵法节点-008" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f15AW5eMVEKKgrwPWb2eZo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 70 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -110, + "y": -110, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 70 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 70 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 75 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 360, + "height": 360 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "81ZDu24OxF3bUTmGJ/CxwB" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 77 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 219, + "g": 219, + "b": 219, + "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": "50yojl3gJK2IeywYBvtcyb" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 79 + }, + "_resizeMode": 1, + "_layoutType": 3, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 1, + "_paddingLeft": 20, + "_paddingRight": 20, + "_paddingTop": 20, + "_paddingBottom": 20, + "_spacingX": 10, + "_spacingY": 10, + "_verticalDirection": 1, + "_horizontalDirection": 1, + "_constraint": 1, + "_constraintNum": 3, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "eeTkntCrtDnqlmLBI6ArzH" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a8T0NC/KpNY7MMbRkPRuwY", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": [ + { + "__id__": 66 + }, + { + "__id__": 58 + }, + { + "__id__": 50 + }, + { + "__id__": 42 + }, + { + "__id__": 34 + }, + { + "__id__": 26 + }, + { + "__id__": 18 + }, + { + "__id__": 10 + }, + { + "__id__": 2 + } + ] + } +] \ 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..eecd1e97 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "9d7eeadb-58f6-4c42-aaed-bc402f272c84", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "阵法" + } +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法节点.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法节点.prefab new file mode 100644 index 00000000..1102871a --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法节点.prefab @@ -0,0 +1,593 @@ +[ + { + "__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 + }, + { + "__id__": 14 + } + ], + "_active": true, + "_components": [ + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 + } + ], + "_prefab": { + "__id__": 27 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -110, + "y": 110, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "没有宠物", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 3 + } + ], + "_active": true, + "_components": [ + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 4 + }, + { + "__id__": 6 + }, + { + "__id__": 8 + } + ], + "_prefab": { + "__id__": 10 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 5 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 64.3984375, + "height": 69 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "57tohbvq5DfqSeazSpahc7" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 7 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "+", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 100, + "_fontSize": 100, + "_fontFamily": "Arial", + "_lineHeight": 50, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b69Hawp/VJAJJTIr+OiBc7" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 3, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d4gS8Lw1tFHa81PtPHRzaf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "129GFUemtBFbVZkRJYzyID", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d4QFkSAFNDcI3m+mF1hDoB" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "89H2Y6T4BDHrwQMQSD6Rep", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "有宠物", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 15 + } + ], + "_prefab": { + "__id__": 17 + }, + "_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__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7f4JKo3WJKJa/8S/rSd4ph" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8dQqbrevlD0JCENds1sMve", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "64UUiPhsBGyYO5QK/i4llF" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_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": "23CcuxwSVD5rTkFLTkzmPx" + }, + { + "__type__": "78c308a0dBCEJ/E9wZzZPJq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "06AIrIH75LL7sccNjNaqQj" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "clickEvents": [ + { + "__id__": 26 + } + ], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "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": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "efw+0GxCpOZ5ROxDkIQkn1" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "78c308a0dBCEJ/E9wZzZPJq", + "handler": "onClick", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f15AW5eMVEKKgrwPWb2eZo", + "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..e87c2ea6 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法节点.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "11623136-ce7c-4aaf-9be6-c298c14d1e0d", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "阵法节点" + } +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法.meta b/JisolGameCocos/assets/resources/prefab/ui/阵法.meta new file mode 100644 index 00000000..f9ec19f2 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/阵法.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "e95d820d-01f5-40da-a6f0-a3eb7903c624", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/IntoBattleView.prefab b/JisolGameCocos/assets/resources/prefab/ui/阵法/IntoBattleView.prefab new file mode 100644 index 00000000..52815465 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/阵法/IntoBattleView.prefab @@ -0,0 +1,302 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "IntoBattleView", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "IntoBattleView", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 8 + }, + { + "__id__": 10 + }, + { + "__id__": 12 + } + ], + "_prefab": { + "__id__": 14 + }, + "_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": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_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__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 550, + "height": 800 + }, + "_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__": 6 + }, + "_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.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__": 9 + }, + "_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__": 11 + }, + "_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__": "00e5fiwk55OFq7ZIZmksXGJ", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "mask": true, + "maskOpcity": 80, + "isClickMaskeClose": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c64zkOp1tOEoCQ9P8CBNYJ" + }, + { + "__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/阵法/IntoBattleView.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/阵法/IntoBattleView.prefab.meta new file mode 100644 index 00000000..0ad2d0ff --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/阵法/IntoBattleView.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "eb53cac5-aaa5-4b5f-8a22-38bccee261dc", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "IntoBattleView" + } +} diff --git a/JisolGameCocos/assets/script/AppData.ts b/JisolGameCocos/assets/script/AppData.ts index 4ac7f951..9a7eaa6b 100644 --- a/JisolGameCocos/assets/script/AppData.ts +++ b/JisolGameCocos/assets/script/AppData.ts @@ -4,6 +4,7 @@ import BaseData from "./data/BaseData"; import ChatData from "./data/ChatData"; import PlayerData from "./data/PlayerData"; import PlayerPetData from "./data/PlayerPetData"; +import PlayerTacticalData from "./data/PlayerTacticalData"; //数据类 (用于初始化游戏信息) export class AppData extends SystemBase{ @@ -14,6 +15,7 @@ export class AppData extends SystemBase{ PlayerData.getIns(), //玩家信息 PlayerPetData.getIns(), //玩家宠物信息 ChatData.getIns(), //聊天 + PlayerTacticalData.getIns(), //阵法 ]; async onInit(): Promise { diff --git a/JisolGameCocos/assets/script/battle/GBattleModeManager.ts b/JisolGameCocos/assets/script/battle/GBattleModeManager.ts index 17cb1f65..17244c34 100644 --- a/JisolGameCocos/assets/script/battle/GBattleModeManager.ts +++ b/JisolGameCocos/assets/script/battle/GBattleModeManager.ts @@ -6,6 +6,7 @@ import { Node } from "cc"; import { instantiate } from "cc"; import { app } from "../App"; import { JNFrameInfo, JNSyncFrameEvent } from "../../../extensions/ngame/assets/ngame/sync/frame/JNSyncFrame"; +import { CCObject } from "cc"; export enum BattleMode{ //无尽模式 @@ -60,8 +61,6 @@ export default class GBattleModeManager extends Singleton { //打开指定模式 async Open(mode:BattleMode,isAuto:boolean = false){ - await this.Close(); - this.current = mode; this.setAuto(isAuto); @@ -75,7 +74,6 @@ export default class GBattleModeManager extends Singleton { //主动调用场景销毁 app.sync.onReset(); - this.clear(); this.current = null; } @@ -94,6 +92,7 @@ export default class GBattleModeManager extends Singleton { //创建当前模式 private create(){ + if(!this.isInit || this.current == null) return; let mode = instantiate(this.modes[this.current]); mode.getComponent(GBaseMode).camera = this.camera; diff --git a/JisolGameCocos/assets/script/battle/entity/GTactical.ts b/JisolGameCocos/assets/script/battle/entity/GTactical.ts index 55d77ada..d59899e6 100644 --- a/JisolGameCocos/assets/script/battle/entity/GTactical.ts +++ b/JisolGameCocos/assets/script/battle/entity/GTactical.ts @@ -34,9 +34,9 @@ export class GTactical{ //获取阵法 static getTactical(isReversed:boolean = false): GTactical{ let tactical = [ - [0,4,3], - [6,0,1], - [0,5,2], + [7,4,1], + [8,5,2], + [9,6,3], ]; if(isReversed){ tactical = this.getTacticalFlipX(tactical); diff --git a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts index 182f6d1c..f1919982 100644 --- a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts +++ b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts @@ -40,7 +40,7 @@ export interface GOnHookInfo{ } /** - * 挂机模式 无限出现小怪 + * 挂机模式 无限出现小怪 (不是联机模式 该模式支持使用本地数据) */ @ccclass('GOnHookMode') export default class GOnHookMode extends GBaseMode<{}>{ diff --git a/JisolGameCocos/assets/script/consts/API.ts b/JisolGameCocos/assets/script/consts/API.ts index f8cc3505..ed613405 100644 --- a/JisolGameCocos/assets/script/consts/API.ts +++ b/JisolGameCocos/assets/script/consts/API.ts @@ -13,20 +13,29 @@ const RData = (data:any,isTips:boolean = true) => { } } +/************** 请求类 *******************/ export interface NewsContext{ state:number, msg:string, data:any, } +//玩家登录返回 +export interface UserLoginVO{ + token:string, //token + user:UserVO, //玩家信息 +} + + + +/************** 实体类 **************************/ + +//玩家信息 export interface UserVO{ userId:number, //玩家Id userName:string, //玩家名称 userPass:string, //玩家密码 } -export interface UserLoginVO{ - token:string, //token - user:UserVO, //玩家信息 -} +//游戏玩家信息 export interface PlayerInfoOV{ playerId:number, //玩家Id userId: number, //用户Id @@ -34,12 +43,18 @@ export interface PlayerInfoOV{ playerCreateTime:number, //玩家创建时间 novice: false, //是否过引导 } +//玩家宠物信息 export interface PlayerPetOV{ petId:number, //宠物唯一Id petPlayerId:number; //宠物的玩家Id petTbId:number; //宠物配置表Id petGrade:number; //宠物等级 } +//玩家阵法信息 +export interface PlayerTacticalOV{ + playerId:number, //玩家Id + tacticalData:string, //阵法数据 +} export const API = { @@ -54,5 +69,9 @@ export const API = { /********** 宠物接口 ******************/ GetPlayerPets: async () => RData(await app.api.get(`/game/pet/list`),false) as PlayerPetOV[], //获取玩家全部宠物 + + /********** 阵法接口 ******************/ + GetPlayerTactical: async () => RData(await app.api.get(`/game/tactical/get`),false) as PlayerTacticalOV, //获取玩家阵法 + SetPlayerTactical: async (data:PlayerTacticalOV) => RData(await app.api.post(`/game/tactical/set`,data),false) as PlayerTacticalOV, //更新玩家阵法 } diff --git a/JisolGameCocos/assets/script/data/ChatData.ts b/JisolGameCocos/assets/script/data/ChatData.ts index 9e52a76a..a8aaf070 100644 --- a/JisolGameCocos/assets/script/data/ChatData.ts +++ b/JisolGameCocos/assets/script/data/ChatData.ts @@ -7,12 +7,11 @@ import BaseData from "./BaseData"; //聊天数据 export default class ChatData extends BaseData{ + static Event = "ChatData_Event_Message"; + //世界消息列表 datas:string[] = []; - //接受消息事件 - receives:Function[] = []; - onInit() { //监听聊天消息 app.socket.on(GAction.CHAT_RECEIVE_MESSAGE,this.onChatReceiveMessage,this,GActionType.GUIChatMessage); @@ -23,7 +22,7 @@ export default class ChatData extends BaseData{ onChatReceiveMessage(info:GUIChatMessage){ console.log(`ChatData - onChatReceiveMessage`,info.message); this.datas.push(info.message); - this.receives.forEach(fun => fun(info)) + app.event.emit(ChatData.Event,info); } //发送消息 @@ -32,14 +31,12 @@ export default class ChatData extends BaseData{ } //监听接受消息 - on(receive:Function){ - this.receives.push(receive); + on(receive:Function,target?: any){ + app.event.on(ChatData.Event,receive,target) } //取消 - off(receive:Function){ - let index = this.receives.indexOf(receive); - if(index != -1) - this.receives.splice(index,1); + off(receive:Function,target?: any){ + app.event.off(ChatData.Event,receive,target) } } diff --git a/JisolGameCocos/assets/script/data/PlayerTacticalData.ts b/JisolGameCocos/assets/script/data/PlayerTacticalData.ts new file mode 100644 index 00000000..c46f2a2d --- /dev/null +++ b/JisolGameCocos/assets/script/data/PlayerTacticalData.ts @@ -0,0 +1,50 @@ +import { API, PlayerTacticalOV } from "../consts/API"; +import BaseData from "./BaseData"; + +interface PlayerTacticalInfo extends PlayerTacticalOV{ + roles:number[], //上阵的宠物顺序 +} + +//玩家阵法数据 (玩家最多上阵 9 个宠物) +export default class PlayerTacticalData extends BaseData{ + + //阵法信息 + info:PlayerTacticalInfo; + + async onInit() { + + await this.onUpdateInfo(); + + } + + //更新阵法信息 + async onUpdateInfo(){ + let ov = await API.GetPlayerTactical(); + if(!ov.tacticalData){ + ov.tacticalData = JSON.stringify(this.getTacticalInfo()); + } + this.info = { + ...ov, + roles: JSON.parse(ov.tacticalData), + } + } + + //更新上阵 + async UpdateTactical(roles:number[]){ + this.info.roles = roles; + this.info.tacticalData = JSON.stringify(this.info.roles); + //上传到服务器 + await API.SetPlayerTactical(this.info); + } + + //获取指定位置 + getItem(index:number){ + return this.info.roles[index]; + } + + //获取初始化上阵信息 + getTacticalInfo():number[]{ + return [0,0,0,0,0,0,0,0,0] + } + +} \ No newline at end of file diff --git a/JisolGameCocos/assets/script/data/PlayerTacticalData.ts.meta b/JisolGameCocos/assets/script/data/PlayerTacticalData.ts.meta new file mode 100644 index 00000000..cbfff3dc --- /dev/null +++ b/JisolGameCocos/assets/script/data/PlayerTacticalData.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "d2425352-add6-461a-ab20-32515cf9eb1e", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Consts.meta b/JisolGameCocos/assets/script/ui/Consts.meta new file mode 100644 index 00000000..2216c9f3 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "0c3951ab-4554-4998-ad31-2acc45233dbd", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Consts/Tactical.meta b/JisolGameCocos/assets/script/ui/Consts/Tactical.meta new file mode 100644 index 00000000..bed6431b --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Tactical.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "231e3614-8fc2-4590-bc9f-57ff63343f85", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts new file mode 100644 index 00000000..5318ff01 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts @@ -0,0 +1,30 @@ +import { _decorator, Component, Node } from 'cc'; +import PlayerTacticalData from '../../../data/PlayerTacticalData'; +import { app } from '../../../App'; +import { GUI } from '../../UIConfig'; +const { ccclass, property } = _decorator; + +@ccclass('PlayerTacticalItem') +export class PlayerTacticalItem extends Component { + + //阵法的Index; + index:number; + + //初始化阵法 + onInit(index:number){ + this.index = index; + } + + //更新信息 + onUpdateView(){ + PlayerTacticalData.getIns().getItem(this.index); + } + + //点击 + onClick(){ + app.layer.Open(GUI.IntoBattleView); + } + +} + + diff --git a/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts.meta new file mode 100644 index 00000000..1cd2b5d1 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "78c30f1a-d1d0-4210-9fc4-f7067364f26a", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalView.ts b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalView.ts new file mode 100644 index 00000000..bc3fb77a --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalView.ts @@ -0,0 +1,35 @@ +import { _decorator, Component, Node } from 'cc'; +import { PlayerTacticalItem } from './PlayerTacticalItem'; +const { ccclass, property } = _decorator; + +/** + * 玩家阵法 + */ +@ccclass('PlayerTacticalView') +export class PlayerTacticalView extends Component { + + + //阵法子节点列表 + items:PlayerTacticalItem[] = []; + + // onLoad(){ + + // //阵法 + // this.items = this.node.getComponentsInChildren(PlayerTacticalItem); + // this.items.forEach((item,index) => item.onInit(index)); + + // this.onUpdateView(); + + // } + + // //更新阵法显示 + // onUpdateView(){ + // this.items.forEach(item => { + // item.onUpdateView(); + // }) + // } + + +} + + diff --git a/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalView.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalView.ts.meta new file mode 100644 index 00000000..b0e0f691 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalView.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "a9372de8-9c71-492e-af72-cee66fd5e045", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Home/Chat/MainChatView.ts b/JisolGameCocos/assets/script/ui/Home/Chat/MainChatView.ts index 66fa38e6..ed930c2a 100644 --- a/JisolGameCocos/assets/script/ui/Home/Chat/MainChatView.ts +++ b/JisolGameCocos/assets/script/ui/Home/Chat/MainChatView.ts @@ -30,13 +30,13 @@ export class MainChatView extends JNGLayerBase { this.onInitUpdate(); //监听消息 - ChatData.getIns().on(this.onMessage.bind(this)); + ChatData.getIns().on(this.onMessage.bind(this),this); } onJNClose(): void { super.onJNClose(); - ChatData.getIns().off(this.onMessage.bind(this)); + ChatData.getIns().off(this.onMessage.bind(this),this); } //初始化聊天显示 diff --git a/JisolGameCocos/assets/script/ui/Tactical.meta b/JisolGameCocos/assets/script/ui/Tactical.meta new file mode 100644 index 00000000..f73c70d7 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Tactical.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "01b33bd2-2568-49ba-a042-ba4178c96227", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts new file mode 100644 index 00000000..bd1c132a --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts @@ -0,0 +1,14 @@ +import { _decorator, Component, Node } from 'cc'; +import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLayerBase'; +const { ccclass, property } = _decorator; + +//上阵页面 +@ccclass('IntoBattleView') +export class IntoBattleView extends JNLayerBase { + + + + +} + + diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts.meta b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts.meta new file mode 100644 index 00000000..d7aae598 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "00e5f8b0-939e-4e16-aed9-2199a4b17189", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/UIConfig.ts b/JisolGameCocos/assets/script/ui/UIConfig.ts index b38fa960..a4eb659a 100644 --- a/JisolGameCocos/assets/script/ui/UIConfig.ts +++ b/JisolGameCocos/assets/script/ui/UIConfig.ts @@ -13,13 +13,15 @@ export enum GUI{ Loading = "Loading", //加载页面 Tips = "Tips", //提示 - /** 主页页面 */ - MainChat = "MainChat", //主页聊天页面 - /** 新手引导 */ NoviceNamingView = "NoviceNamingView", //新手引导页面 - 取名 NoviceSelectPetView = "NoviceSelectPetView", //新手引导页面 - 选择宠物 + /** 主页页面 */ + MainChat = "MainChat", //主页聊天页面 + + IntoBattleView = "IntoBattleView", //上阵页面 + Home = "Home", //主页面 Main = "Main", //主页面2 } @@ -110,6 +112,14 @@ export const UIConfig:{ [key: string]: JNLayerInfo; } = { backInfo:{key:"position",start:v3(0,0,0),end:v3(-720,0,0)} }, }, + [GUI.IntoBattleView]:{ + layer:GLayer.View, + uri: "prefab/ui/阵法/IntoBattleView", + anims:{ + front:JNLayerAnim.BackOutOpen, + back:JNLayerAnim.BackInClose + }, + }, ...UISystemConfig, //系统页面 ...UINoviceConfig, //新手引导页面 ...UIMainConfig, //主页面 diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame index c5432ebb..ccb2f088 160000 --- a/JisolGameCocos/extensions/ngame +++ b/JisolGameCocos/extensions/ngame @@ -1 +1 @@ -Subproject commit c5432ebb220d354a6790fa96348c70620cb16dcc +Subproject commit ccb2f088bd74f0d011f38bcc21f6faf80e4ded4d 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 a9f4a41b..8d2afde1 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 @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * 玩家 + * 玩家宠物 */ @Api(value = "JNGameDemo - API", tags = {"PET - API"}) @RestController diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerTacticalController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerTacticalController.java new file mode 100644 index 00000000..e753efd3 --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerTacticalController.java @@ -0,0 +1,68 @@ +package cn.jisol.game.controller.game; + +import cn.jisol.game.controller.argsresolver.CurrentPlayer; +import cn.jisol.game.entity.game.Player; +import cn.jisol.game.entity.game.PlayerPet; +import cn.jisol.game.entity.game.PlayerTactical; +import cn.jisol.game.service.PlayerPetService; +import cn.jisol.game.service.PlayerTacticalService; +import cn.jisol.ngame.util.NewsContext; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 玩家阵法 + */ +@Api(value = "JNGameDemo - API", tags = {"PET - API"}) +@RestController +@RequestMapping("/game/tactical") +@ResponseBody +public class GPlayerTacticalController { + + @Autowired + PlayerTacticalService playerTacticalService; + + //获取玩家阵法 + @ApiImplicitParams({}) + @ApiOperation(value = "获取玩家阵法") + @GetMapping("/get") + public NewsContext getInfo(@CurrentPlayer Player player){ + + PlayerTactical info = playerTacticalService.getById(player.getPlayerId()); + + //如果没有阵法则创建一个 + if(Objects.isNull(info)){ + try{ + info = PlayerTactical.builder().playerId(player.getPlayerId()).build(); + playerTacticalService.saveOrUpdate(info); + }catch (Exception ignored){} + assert playerTacticalService != null; + info = playerTacticalService.getById(player.getPlayerId()); + } + + return NewsContext.onSuccess("获取成功",info); + + } + + //设置玩家上阵 + @ApiImplicitParams({}) + @ApiOperation(value = "设置玩家上阵") + @GetMapping("/set") + public NewsContext setInfo(@CurrentPlayer Player player, @RequestBody PlayerTactical tactical){ + + tactical.setPlayerId(player.getPlayerId()); + if(Objects.isNull(tactical.getTacticalData())) return NewsContext.onFail("上阵失败 没有上阵信息"); + playerTacticalService.saveOrUpdate(tactical); + + return NewsContext.onSuccess("上阵成功",tactical); + + } + +} diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/game/PlayerTactical.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/game/PlayerTactical.java new file mode 100644 index 00000000..ca0c55ed --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/game/PlayerTactical.java @@ -0,0 +1,21 @@ +package cn.jisol.game.entity.game; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; +import lombok.Data; + +/** + * 玩家阵法 + */ +@Builder +@Data +@TableName("`player_tactical`") +public class PlayerTactical { + + @TableId(type = IdType.INPUT) + private Long playerId; //玩家Id + private String tacticalData; //阵法数据 + +} diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/mapper/PlayerTacticalMapper.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/mapper/PlayerTacticalMapper.java new file mode 100644 index 00000000..fd07496c --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/mapper/PlayerTacticalMapper.java @@ -0,0 +1,11 @@ +package cn.jisol.game.mapper; + +import cn.jisol.game.entity.game.PlayerPet; +import cn.jisol.game.entity.game.PlayerTactical; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Component; + +@Component +public interface PlayerTacticalMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerTacticalService.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerTacticalService.java new file mode 100644 index 00000000..a1ef47d5 --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerTacticalService.java @@ -0,0 +1,9 @@ +package cn.jisol.game.service; + +import cn.jisol.game.entity.game.PlayerPet; +import cn.jisol.game.entity.game.PlayerTactical; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface PlayerTacticalService extends IService { + +} diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerTacticalServiceImpl.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerTacticalServiceImpl.java new file mode 100644 index 00000000..8777c3e3 --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerTacticalServiceImpl.java @@ -0,0 +1,15 @@ +package cn.jisol.game.service.impl; + +import cn.jisol.game.entity.game.PlayerPet; +import cn.jisol.game.entity.game.PlayerTactical; +import cn.jisol.game.mapper.PlayerPetMapper; +import cn.jisol.game.mapper.PlayerTacticalMapper; +import cn.jisol.game.service.PlayerPetService; +import cn.jisol.game.service.PlayerTacticalService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class PlayerTacticalServiceImpl extends ServiceImpl implements PlayerTacticalService { + +}