diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab index ef31097e..1c08b1a9 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab @@ -8948,7 +8948,7 @@ }, "component": "", "_componentId": "b51bfKvsidNPKBbFirAFgQI", - "handler": "onClickNotOpen", + "handler": "onClickPacksack", "customEventData": "" }, { diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/挂机/主页挂机页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/挂机/主页挂机页面.prefab index 79e5799e..98df7805 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/挂机/主页挂机页面.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/挂机/主页挂机页面.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 79 + "__id__": 101 }, { - "__id__": 81 + "__id__": 103 }, { - "__id__": 83 + "__id__": 105 } ], "_prefab": { - "__id__": 85 + "__id__": 107 }, "_lpos": { "__type__": "cc.Vec3", @@ -83,22 +83,25 @@ }, { "__id__": 55 + }, + { + "__id__": 72 } ], "_active": true, "_components": [ { - "__id__": 72 + "__id__": 94 }, { - "__id__": 74 + "__id__": 96 }, { - "__id__": 76 + "__id__": 98 } ], "_prefab": { - "__id__": 78 + "__id__": 100 }, "_lpos": { "__type__": "cc.Vec3", @@ -331,7 +334,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 25, "z": 0 }, "_lrot": { @@ -391,7 +394,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 250, + "y": 225, "z": 0 }, "_lrot": { @@ -600,7 +603,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 500, - "height": 500 + "height": 450 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -941,7 +944,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 12, - "height": 500 + "height": 450 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1127,7 +1130,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 500, - "height": 500 + "height": 450 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1202,7 +1205,7 @@ "_left": 0, "_right": 0, "_top": 100, - "_bottom": 100, + "_bottom": 150, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -1626,6 +1629,519 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "是否自动下一关", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 73 + }, + { + "__id__": 79 + } + ], + "_active": true, + "_components": [ + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + } + ], + "_prefab": { + "__id__": 93 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -93.24, + "y": -234.764, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Checkmark", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 72 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__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__": 73 + }, + "_enabled": true, + "__prefab": { + "__id__": 75 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 26, + "height": 26 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "37+OA+7dxOPYyZa25l9TYs" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 73 + }, + "_enabled": true, + "__prefab": { + "__id__": 77 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "adZ7p51vVIzILmLrLrWpuO" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fcPAOQ/QREHp1KtVhPSFI2", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 72 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 80 + }, + { + "__id__": 82 + }, + { + "__id__": 84 + } + ], + "_prefab": { + "__id__": 86 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 21.645, + "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__": 79 + }, + "_enabled": true, + "__prefab": { + "__id__": 81 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 172, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1fqzokJ0RF97J2kdUrFHSz" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 79 + }, + "_enabled": true, + "__prefab": { + "__id__": 83 + }, + "_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": "97Y34YEiZNToUXLX7NdoAM" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 79 + }, + "_enabled": true, + "__prefab": { + "__id__": 85 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c1YZRmNaFHqaDChD8rrtvj" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4bKw9wZmRMA7XfiWhKmHxo", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 72 + }, + "_enabled": true, + "__prefab": { + "__id__": 88 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 28, + "height": 28 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "65DUoPvL5LTZZE8Dg8Ju+i" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 72 + }, + "_enabled": true, + "__prefab": { + "__id__": 90 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a0CH/P0fpPZr+UPZ0cn0wR" + }, + { + "__type__": "cc.Toggle", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 72 + }, + "_enabled": true, + "__prefab": { + "__id__": 92 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 0, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": { + "__uuid__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 72 + }, + "checkEvents": [], + "_isChecked": false, + "_checkMark": { + "__id__": 76 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "be1QNElEdHAoYAqIbxaGtI" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2037BOHYpLGJF4yvFIAMkF", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1636,7 +2152,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -1664,7 +2180,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 97 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1709,7 +2225,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 99 }, "_id": "" }, @@ -1740,7 +2256,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 102 }, "_contentSize": { "__type__": "cc.Size", @@ -1768,7 +2284,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 104 }, "_alignFlags": 45, "_target": null, @@ -1804,7 +2320,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 106 }, "mask": true, "maskOpcity": 80, @@ -1815,6 +2331,9 @@ "onHookLabel": { "__id__": 59 }, + "toggle": { + "__id__": 91 + }, "_id": "" }, { diff --git a/JisolGameCocos/assets/resources/prefab/ui/副本页面/副本展示节点.prefab b/JisolGameCocos/assets/resources/prefab/ui/副本页面/副本展示节点.prefab index f359040a..8ffd0259 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/副本页面/副本展示节点.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/副本页面/副本展示节点.prefab @@ -23,22 +23,25 @@ }, { "__id__": 10 + }, + { + "__id__": 44 } ], "_active": true, "_components": [ { - "__id__": 27 + "__id__": 61 }, { - "__id__": 29 + "__id__": 63 }, { - "__id__": 31 + "__id__": 65 } ], "_prefab": { - "__id__": 33 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -96,7 +99,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 41.647, + "y": 15.525, "z": 0 }, "_lrot": { @@ -136,8 +139,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 84, - "height": 54.4 + "width": 110, + "height": 56.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -175,8 +178,8 @@ "_string": "副本名称", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 26, + "_fontSize": 26, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, @@ -214,7 +217,7 @@ "b": 0, "a": 255 }, - "_width": 2, + "_width": 3, "_id": "" }, { @@ -236,7 +239,7 @@ }, { "__type__": "cc.Node", - "_name": "进入副本", + "_name": "钥匙", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -250,22 +253,736 @@ "_active": true, "_components": [ { - "__id__": 19 + "__id__": 35 }, + { + "__id__": 37 + }, + { + "__id__": 39 + }, + { + "__id__": 41 + } + ], + "_prefab": { + "__id__": 43 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 89.34700000000001, + "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__": 10 + }, + "_children": [ + { + "__id__": 12 + }, + { + "__id__": 20 + } + ], + "_active": true, + "_components": [ + { + "__id__": 28 + }, + { + "__id__": 30 + }, + { + "__id__": 32 + } + ], + "_prefab": { + "__id__": 34 + }, + "_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__": 11 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 17 + } + ], + "_prefab": { + "__id__": 19 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -10.0615234375, + "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__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 14 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50.66015625, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "98V5ERApZO1Kg34t3DzrqB" + }, + { + "__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": "54fI6CSh1LIZS5dqa3XasE" + }, + { + "__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": "7f9EDAgwNM0qGUZjuRxCwb" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cbpktTcnVOq5wIwJGiefw/", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 11 + }, + "_children": [], + "_active": true, + "_components": [ { "__id__": 21 }, { "__id__": 23 + }, + { + "__id__": 25 } ], "_prefab": { + "__id__": 27 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 27.830078125, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 15.123046875, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8em1TQVMFGU7m5b0ZXmkGv" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "0", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "15fxNXBi5AtqJUuWPxH+hC" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { "__id__": 26 }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f5p76zPidOsKrowG6smL9m" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c9jWO1bMFIeI8KzLH4QVkC", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 29 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 70.783203125, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "31gA5bmNBG/Kn4VJCv7kxH" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 31 + }, + "_resizeMode": 1, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 5, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "12Qqwi4ApJb4+4zhP7jflD" + }, + { + "__type__": "dd6ff3gNGFAzKeTlGPK1jnx", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 33 + }, + "type": 90001, + "tig": { + "__id__": 15 + }, + "show": { + "__id__": 23 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9bb/lV+E9EnIDtTmXTNqjB" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3af3+QKgdCbZW98WjQK32x", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 110.783203125, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a3/iz9+RlFzKe8xK7lJ4O0" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 38 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 160, + "g": 160, + "b": 160, + "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": "1eeT9dKZFJPqX4dxGeUSTQ" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_alignFlags": 1, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 15.652999999999999, + "_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": "32iZhdEe1B94BRZj0vSxxe" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 42 + }, + "_resizeMode": 1, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 20, + "_paddingRight": 20, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 0, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bycXrAOhNe48ziEX3wnZA" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8d2p1c8MxIzZQA2LPOY3pI", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "进入副本", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 45 + } + ], + "_active": true, + "_components": [ + { + "__id__": 53 + }, + { + "__id__": 55 + }, + { + "__id__": 57 + } + ], + "_prefab": { + "__id__": 60 + }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -29.519, + "y": -66.443, "z": 0 }, "_lrot": { @@ -297,23 +1014,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 10 + "__id__": 44 }, "_children": [], "_active": true, "_components": [ { - "__id__": 12 + "__id__": 46 }, { - "__id__": 14 + "__id__": 48 }, { - "__id__": 16 + "__id__": 50 } ], "_prefab": { - "__id__": 18 + "__id__": 52 }, "_lpos": { "__type__": "cc.Vec3", @@ -350,11 +1067,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -378,11 +1095,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 49 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -423,11 +1140,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 51 }, "_color": { "__type__": "cc.Color", @@ -462,11 +1179,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 54 }, "_contentSize": { "__type__": "cc.Size", @@ -490,11 +1207,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 56 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -535,15 +1252,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 58 }, "clickEvents": [ { - "__id__": 25 + "__id__": 59 } ], "_interactable": true, @@ -583,7 +1300,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 10 + "__id__": 44 }, "_id": "" }, @@ -624,7 +1341,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", @@ -652,7 +1369,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 64 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -697,11 +1414,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 66 }, "title": { "__id__": 5 }, + "resource": { + "__id__": 32 + }, "_id": "" }, { diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab index aa33dd65..4f4d608d 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab @@ -20,25 +20,28 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 10 } ], "_active": true, "_components": [ { - "__id__": 10 + "__id__": 44 }, { - "__id__": 12 + "__id__": 46 }, { - "__id__": 14 + "__id__": 48 }, { - "__id__": 16 + "__id__": 50 } ], "_prefab": { - "__id__": 18 + "__id__": 52 }, "_lpos": { "__type__": "cc.Vec3", @@ -234,6 +237,779 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "进度", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 11 + }, + { + "__id__": 17 + }, + { + "__id__": 23 + }, + { + "__id__": 29 + } + ], + "_active": true, + "_components": [ + { + "__id__": 35 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + }, + { + "__id__": 41 + } + ], + "_prefab": { + "__id__": 43 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -24, + "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": "进度1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + } + ], + "_prefab": { + "__id__": 16 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -75, + "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__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50, + "height": 6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "873XbD+nJE5pFV/8Og/8S/" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "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": "37kT1ZgWJG57gjMR8JWX7H" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c4vmBYXGpA+KeuL2cUW4VN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "进度2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 18 + }, + { + "__id__": 20 + } + ], + "_prefab": { + "__id__": 22 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -25, + "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": 50, + "height": 6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9d9TmNeO5AE5VDvG8qTBYM" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "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": "097U9JH+RPkpCqtlraeF9H" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "adBVX1IVlC6r4BgNvlBieE", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "进度3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 24 + }, + { + "__id__": 26 + } + ], + "_prefab": { + "__id__": 28 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 25, + "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__": 23 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50, + "height": 6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ff3qPKAk1EZrP6HSGQUKAs" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 23 + }, + "_enabled": true, + "__prefab": { + "__id__": 27 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "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": "7eOndDis9KJq0OpllcNkHS" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9cmYqVmHtIS7EUhSc1Cr+7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "进度4", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 32 + } + ], + "_prefab": { + "__id__": 34 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 75, + "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__": 29 + }, + "_enabled": true, + "__prefab": { + "__id__": 31 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50, + "height": 6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3d3TiUVZdBEpwALtCQROaC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 29 + }, + "_enabled": true, + "__prefab": { + "__id__": 33 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "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": "eaOjFq9etOboFzewO9+vsy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0cJzwvYjhOmJSDMnak8wbn", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dcSnBObyJPwYIQw+zvlxve" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 38 + }, + "_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": "ae+F62sh5GBaXXBktuDbzt" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_alignFlags": 4, + "_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": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ae+9ktKLBPCa9UbOJdRZ9g" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 42 + }, + "_resizeMode": 0, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 0, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "59uCGmzZFLNopvFIEGnzDh" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a0FQ4tz8lCFY9qDfoCjB8M", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -244,7 +1020,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -272,16 +1048,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 47 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 235, - "g": 235, - "b": 235, + "r": 231, + "g": 231, + "b": 231, "a": 255 }, "_spriteFrame": { @@ -317,7 +1093,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 49 }, "_alignFlags": 1, "_target": null, @@ -353,11 +1129,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 51 }, "title": { "__id__": 5 }, + "progress": { + "__id__": 10 + }, "_id": "" }, { diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表玩家资源ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表玩家资源ICON.prefab new file mode 100644 index 00000000..cbb8965c --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表玩家资源ICON.prefab @@ -0,0 +1,296 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "列表玩家资源ICON", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "列表玩家资源ICON", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 13 + }, + { + "__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.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "1bc9536b-8271-482d-8330-5bd3ab212cab", + "__expectedType__": "cc.Prefab" + }, + "fileId": "02c3tqHwFAbp7zhkA22zq9", + "instance": { + "__id__": 4 + }, + "targetOverrides": [ + { + "__id__": 10 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "05FQkEFudIppeII3QGHlOF", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "玩家资源ICON" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02c3tqHwFAbp7zhkA22zq9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "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.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "icon" + ], + "target": { + "__id__": 11 + }, + "targetInfo": { + "__id__": 12 + } + }, + { + "__type__": "cc.Node", + "__editorExtras__": {} + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "92PDN+paRDnawowS6zMYgn" + ] + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 14 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "60HDOce21EU4mT/teH3tKt" + }, + { + "__type__": "fd240UfYDtEE73C+I6ozTo+", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "icon": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8aQofd9stIFJ5ZbNJ/i06O" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "02c3tqHwFAbp7zhkA22zq9", + "instance": null, + "targetOverrides": [ + { + "__id__": 18 + } + ], + "nestedPrefabInstanceRoots": [ + { + "__id__": 2 + } + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 15 + }, + "sourceInfo": null, + "propertyPath": [ + "icon" + ], + "target": { + "__id__": 2 + }, + "targetInfo": { + "__id__": 19 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "268KVlguhFv5OIouxO8TjA" + ] + } +] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表玩家资源ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表玩家资源ICON.prefab.meta new file mode 100644 index 00000000..2cd213cd --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表玩家资源ICON.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "d8bd167b-9e6d-4bcd-8715-f68a4a3f04ef", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "列表玩家资源ICON" + } +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表选中玩家资源ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表选中玩家资源ICON.prefab new file mode 100644 index 00000000..445ac2f0 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表选中玩家资源ICON.prefab @@ -0,0 +1,296 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "列表选中玩家资源ICON", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "列表选中玩家资源ICON", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 13 + }, + { + "__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.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "e0b2be64-e3d9-4d28-a124-a50b6d57057f", + "__expectedType__": "cc.Prefab" + }, + "fileId": "02c3tqHwFAbp7zhkA22zq9", + "instance": { + "__id__": 4 + }, + "targetOverrides": [ + { + "__id__": 10 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "6aFoU0iZFKrrnk0B/Mw7GZ", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "选中玩家资源ICON" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02c3tqHwFAbp7zhkA22zq9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "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.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "icon" + ], + "target": { + "__id__": 11 + }, + "targetInfo": { + "__id__": 12 + } + }, + { + "__type__": "cc.Node", + "__editorExtras__": {} + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "268KVlguhFv5OIouxO8TjA" + ] + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 14 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "60HDOce21EU4mT/teH3tKt" + }, + { + "__type__": "6ac19Gyf2pJkIDecRFWToxP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "icon": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7f/WMryvBKFZyylSdM0435" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "02c3tqHwFAbp7zhkA22zq9", + "instance": null, + "targetOverrides": [ + { + "__id__": 18 + } + ], + "nestedPrefabInstanceRoots": [ + { + "__id__": 2 + } + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 15 + }, + "sourceInfo": null, + "propertyPath": [ + "icon" + ], + "target": { + "__id__": 2 + }, + "targetInfo": { + "__id__": 19 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e4oGae4oVBu6FPNiRNeAlJ" + ] + } +] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表选中玩家资源ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表选中玩家资源ICON.prefab.meta new file mode 100644 index 00000000..33835c4a --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/列表选中玩家资源ICON.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "cf78908d-ce17-4c47-92d3-a5f7e7cc2b37", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "列表选中玩家资源ICON" + } +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/玩家资源ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/玩家资源ICON.prefab index f1001862..912fa0cf 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/玩家资源ICON.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/玩家资源ICON.prefab @@ -25,14 +25,14 @@ "_active": true, "_components": [ { - "__id__": 10 + "__id__": 20 }, { - "__id__": 12 + "__id__": 22 } ], "_prefab": { - "__id__": 14 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -109,6 +109,24 @@ }, { "__id__": 9 + }, + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 15 + }, + { + "__id__": 16 + }, + { + "__id__": 18 } ], "removedComponents": [] @@ -175,6 +193,103 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 11 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 70, + "height": 70 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "25alLvKOtKF50Ax8vwjjXJ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 13 + }, + "propertyPath": [ + "_fontSize" + ], + "value": 24 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "62+4SzXqFA8qi5LTvf4hNx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 13 + }, + "propertyPath": [ + "_actualFontSize" + ], + "value": 24 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 13 + }, + "propertyPath": [ + "_string" + ], + "value": "" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 17 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 4, + "height": 54.4 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4c5h6T0flJt5JRab2+oYMO" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -31.496, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "21MjGY6ndKiZ3M6O5l/pbL" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -185,7 +300,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -213,8 +328,9 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 23 }, + "icon": null, "_id": "" }, { @@ -231,11 +347,37 @@ }, "fileId": "02c3tqHwFAbp7zhkA22zq9", "instance": null, - "targetOverrides": null, + "targetOverrides": [ + { + "__id__": 25 + } + ], "nestedPrefabInstanceRoots": [ { "__id__": 2 } ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 22 + }, + "sourceInfo": null, + "propertyPath": [ + "icon" + ], + "target": { + "__id__": 2 + }, + "targetInfo": { + "__id__": 26 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "92PDN+paRDnawowS6zMYgn" + ] } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/选中玩家资源ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/选中玩家资源ICON.prefab new file mode 100644 index 00000000..bcce7dad --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/选中玩家资源ICON.prefab @@ -0,0 +1,580 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "选中玩家资源ICON", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "选中玩家资源ICON", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 8 + }, + { + "__id__": 14 + } + ], + "_active": true, + "_components": [ + { + "__id__": 25 + }, + { + "__id__": 27 + } + ], + "_prefab": { + "__id__": 29 + }, + "_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__": 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": 110, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "22ciZJ76dCR56z+ZgwTWAp" + }, + { + "__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": 82, + "b": 82, + "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": "18o13h+FdF8YHN77OmMTn5" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "270aRvNo1E9IdEahcHKCON", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "选中", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 110, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a6BD/nt/FLuY4C/YASZ83H" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "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": "98iQupl+BI1qdgJ70oXRtd" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "93k5yniepJpZdbodE6r+IX", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 15 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 14 + }, + "asset": { + "__uuid__": "1bc9536b-8271-482d-8330-5bd3ab212cab", + "__expectedType__": "cc.Prefab" + }, + "fileId": "02c3tqHwFAbp7zhkA22zq9", + "instance": { + "__id__": 16 + }, + "targetOverrides": [ + { + "__id__": 22 + } + ] + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "05FQkEFudIppeII3QGHlOF", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 17 + }, + { + "__id__": 19 + }, + { + "__id__": 20 + }, + { + "__id__": 21 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 18 + }, + "propertyPath": [ + "_name" + ], + "value": "玩家资源ICON" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02c3tqHwFAbp7zhkA22zq9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 18 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 18 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 18 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "icon" + ], + "target": { + "__id__": 23 + }, + "targetInfo": { + "__id__": 24 + } + }, + { + "__type__": "cc.Node", + "__editorExtras__": {} + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "92PDN+paRDnawowS6zMYgn" + ] + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 26 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "60HDOce21EU4mT/teH3tKt" + }, + { + "__type__": "c1ae1BWA8BCkbNOf53NBOje", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "icon": null, + "select": { + "__id__": 8 + }, + "noselect": { + "__id__": 2 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e4oGae4oVBu6FPNiRNeAlJ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "02c3tqHwFAbp7zhkA22zq9", + "instance": null, + "targetOverrides": [ + { + "__id__": 30 + } + ], + "nestedPrefabInstanceRoots": [ + { + "__id__": 14 + } + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 27 + }, + "sourceInfo": null, + "propertyPath": [ + "icon" + ], + "target": { + "__id__": 14 + }, + "targetInfo": { + "__id__": 31 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "268KVlguhFv5OIouxO8TjA" + ] + } +] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/选中玩家资源ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/选中玩家资源ICON.prefab.meta new file mode 100644 index 00000000..7d32e0c6 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/icon/选中玩家资源ICON.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "e0b2be64-e3d9-4d28-a124-a50b6d57057f", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "选中玩家资源ICON" + } +} diff --git a/JisolGameCocos/assets/resources/prefab/ui/资源/资源背包页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/资源/资源背包页面.prefab index 118a37bb..536b187a 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/资源/资源背包页面.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/资源/资源背包页面.prefab @@ -128,7 +128,7 @@ }, { "__type__": "cc.Node", - "_name": "资源列表", + "_name": "背包资源列表", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -350,12 +350,12 @@ "height": 40 }, "_startAxis": 0, - "_paddingLeft": 10, + "_paddingLeft": 20, "_paddingRight": 0, "_paddingTop": 20, "_paddingBottom": 20, - "_spacingX": 8, - "_spacingY": 8, + "_spacingX": 15, + "_spacingY": 10, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 0, @@ -922,7 +922,7 @@ "__id__": 35 }, "itemPrefab": { - "__uuid__": "fb89fccc-c24a-4c03-913d-fe23d9d8d5ae", + "__uuid__": "cf78908d-ce17-4c47-92d3-a5f7e7cc2b37", "__expectedType__": "cc.Prefab" }, "_id": "" @@ -4138,6 +4138,9 @@ "mask": true, "maskOpcity": 80, "isClickMaskeClose": true, + "views": { + "__id__": 37 + }, "_id": "" }, { diff --git a/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts b/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts index 12291154..a37d4312 100644 --- a/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts +++ b/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts @@ -9,13 +9,20 @@ import { GUI } from "../../ui/UIConfig"; import GBattleData from "../../data/GBattleData"; import GAttributeData from "../base/values/GAttributeData"; import JNFrameTime from "../../../../extensions/ngame/assets/ngame/sync/frame/game/time/JNFrameTime"; +import { GAPI } from "../../consts/GAPI"; const { ccclass, property } = _decorator; +export interface GDungeonModeData{ + dungeonId:number, //副本Id + dungeonItemId:number, //副本关卡Id + data:TbGEntity.TDungeon //副本信息 +} + /** * 副本(默认) 模式 */ @ccclass('GDungeonMode') -export default class GDungeonMode extends GNormalModeBase<{},TbGEntity.TDungeon>{ +export default class GDungeonMode extends GNormalModeBase<{},GDungeonModeData>{ onSyncInitSuccess(){ if(!this.data) return; @@ -59,14 +66,15 @@ export default class GDungeonMode extends GNormalModeBase<{},TbGEntity.TDungeon> } onGenBoss(){ - let enemy = this.onGenRole(GNormalModePlayerEnum.ENEMY,5,TD.TbGRole.get(this.data.boss)); - enemy.onEffectiveValue(GAttributeData.TAttributeValue(this.data.attributes)) + let enemy = this.onGenRole(GNormalModePlayerEnum.ENEMY,5,TD.TbGRole.get(this.data.data.boss)); + enemy.onEffectiveValue(GAttributeData.TAttributeValue(this.data.data.attributes)) } //战斗结束 onBattleEnd(win:GNormalModePlayerEnum){ //结束游戏 - JNFrameTime.getInstance().setTimeout(() => { + JNFrameTime.getInstance().setTimeout(async () => { + await GAPI.GDungeonChallenge(this.data.dungeonId,this.data.dungeonItemId); this.Close(); },3000) } diff --git a/JisolGameCocos/assets/script/consts/GAPI.ts b/JisolGameCocos/assets/script/consts/GAPI.ts index 7624b35a..64cb7c14 100644 --- a/JisolGameCocos/assets/script/consts/GAPI.ts +++ b/JisolGameCocos/assets/script/consts/GAPI.ts @@ -5,7 +5,7 @@ import { GActionType } from "./GActionType"; export interface ModeHookInfo{ maps:{[key:number]:number}; //地图关卡信息 {地图Id: 地图关卡Id} - mapStates:{[key:number]:number}; //地图关卡状态 {地图Id: 状态(0:战斗中, 1:胜利)} + mapStates:{[key:number]:number}; //地图关卡状态 {地图Id: 战胜次数} } export interface ModeOnHookOV{ @@ -21,8 +21,8 @@ export const GAPI = { /************** 无限模式接口 ********************/ //获取模式信息 GOnHookInfo : async () => RData(await app.api.get(`/game/mode/onHook/info`)) as ModeOnHookOV, - //切换游戏 - GOnHookSetMap : async (mapId) => RData(await app.api.post(`/game/mode/onHook/setMapId/${mapId}`)) as ModeOnHookOV, + //切换地图 + GOnHookSetMap : async (mapId,saves:string[]) => RData(await app.api.post(`/game/mode/onHook/setMapId/${mapId}`,saves)) as ModeOnHookOV, //生成野怪 GOnHookSpawnCreeps : async () => RProto(await app.api.get(`/game/mode/onHook/onSpawnCreeps`,{responseType:'arraybuffer'},false),GActionType.GOnHookPets) as GOnHookPets, //捕捉野怪 @@ -30,8 +30,12 @@ export const GAPI = { //出售野怪 GOnHookSellCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onSellCreeps/${creepId}`),true) as boolean, //下一关 - GOnHookNextLevel : async () => RData(await app.api.post(`/game/mode/onHook/nextLevel`),true) as ModeOnHookOV, + GOnHookNextLevel : async (saves:string[]) => RData(await app.api.post(`/game/mode/onHook/nextLevel`,saves),true) as ModeOnHookOV, //战胜当前关卡 - GOnHookWinLevel : async () => RData(await app.api.post(`/game/mode/onHook/winLevel`),true) as ModeOnHookOV, + GOnHookWinLevel : async () => RData(await app.api.post(`/game/mode/onHook/winLevel`),false) as ModeOnHookOV, + + /*************** 副本接口 ***********************/ + //消耗钥匙挑战副本 + GDungeonChallenge : async (dungeonId,dungeonItemId) => RData(await app.api.post(`/game/mode/dungeon/challenge/dungeon/${dungeonId}/${dungeonItemId}`),false) as void, } \ No newline at end of file diff --git a/JisolGameCocos/assets/script/data/GOnHookData.ts b/JisolGameCocos/assets/script/data/GOnHookData.ts index 3883709a..3613289f 100644 --- a/JisolGameCocos/assets/script/data/GOnHookData.ts +++ b/JisolGameCocos/assets/script/data/GOnHookData.ts @@ -2,6 +2,7 @@ import { app } from "../App"; import GBattleData, { GBattleDataInfo } from "../battle/base/values/GAttributeData"; import { API } from "../consts/API"; import { GAPI, ModeOnHookOV } from "../consts/GAPI"; +import GOnHookManager from "../manager/battle/mode/GOnHookManager"; import { GUI } from "../ui/UIConfig"; import BaseData from "./BaseData"; @@ -17,7 +18,7 @@ export default class GOnHookData extends BaseData{ //是否允许下一关 get isNextLevel(){ if(!this.info) return false; - return this.info.hookInfo.mapStates[this.info.onHookMap] == 1; + return this.info.hookInfo.mapStates[this.info.onHookMap] >= 4; } async onInit() { @@ -35,21 +36,25 @@ export default class GOnHookData extends BaseData{ //切换地图 async setMap(mapId:number){ - this.info = await GAPI.GOnHookSetMap(mapId); + this.info = await GAPI.GOnHookSetMap(mapId,GOnHookManager.getIns().getKillSreepsIds()); app.layer.Open(GUI.Tips,{text:"切换地图成功"}); } //下一关 async onNextLevel(){ - let info = await GAPI.GOnHookNextLevel(); - if(info) this.onUpdateInfo(info); - return !!info; + let info = await GAPI.GOnHookNextLevel(GOnHookManager.getIns().getKillSreepsIds()); + this.onUpdateInfo(info); } //战胜当前关卡 async onWinLevel(){ - this.onUpdateInfo(await GAPI.GOnHookWinLevel()); + this.onUpdateInfo(await GAPI.GOnHookWinLevel()) + } + + //返回当前进度 + getProgress(){ + return this.info.hookInfo.mapStates[this.info.onHookMap] || 0 } } diff --git a/JisolGameCocos/assets/script/data/ResourceData.ts b/JisolGameCocos/assets/script/data/ResourceData.ts index 2cb72fb9..91b38b3e 100644 --- a/JisolGameCocos/assets/script/data/ResourceData.ts +++ b/JisolGameCocos/assets/script/data/ResourceData.ts @@ -52,6 +52,11 @@ export default class ResourceData extends BaseData{ } + //获取所有资源Id + getIds():number[]{ + return Object.keys(this.data).map(id => parseInt(id)); + } + //获取指定资源的数量 getValue(type:ResourceType){ return this.data[type] || 0; diff --git a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts index f4787f9c..9e6219d2 100644 --- a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts +++ b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts @@ -52,6 +52,8 @@ export default class GOnHookManager extends Singleton{ //需要捕捉的宠物 onHookCatchPets:TB.TbGRole[] = []; + //是否自动下一关 + isAutoNext:boolean = false; //是否挂机 _isOnHook:boolean = false; @@ -98,8 +100,12 @@ export default class GOnHookManager extends Singleton{ onSpawnSreeps = NGameUtil.ThrottleASync((async () => { let data = await GAPI.GOnHookSpawnCreeps(); if(!data) return; + this._sreeps = new Map(); + let ids = this.getKillSreepsIds(); data.pets.forEach(pet => { - this._sreeps.set(pet.key,pet as GOnHookPet); + if(ids.indexOf(pet.key) < 0){ + this._sreeps.set(pet.key,pet as GOnHookPet); + } }) }).bind(this)) @@ -111,6 +117,11 @@ export default class GOnHookManager extends Singleton{ return creeps; } + //获取已经死亡待处理的野怪Id列表 + getKillSreepsIds(){ + return this.killSreeps.map(item => item.key); + } + //野怪死亡 onKillSreeps(creeps:GOnHookPet){ @@ -176,6 +187,11 @@ export default class GOnHookManager extends Singleton{ app.event.emit(GOnHookManagerEvent.RESET_DATA); } + //重置Sreeps + onResetSreeps(){ + this._sreeps = new Map(); + } + //下一关 async onNextLevel(){ await GOnHookData.getIns().onNextLevel(); @@ -185,6 +201,8 @@ export default class GOnHookManager extends Singleton{ //战胜当前关卡 async onWinLevel(){ await GOnHookData.getIns().onWinLevel(); + //如果在自动挂机并且勾选上了自动下一关 则 自动下一关 + if(this.isOnHook && this.isAutoNext && GOnHookData.getIns().isNextLevel) this.onNextLevel(); } //切换场景 @@ -199,8 +217,8 @@ export default class GOnHookManager extends Singleton{ onResetMap(){ //通知地图已切换 app.event.emit(GOnHookManagerEvent.UPDATE_MAP); - //重置数据 - this.onResetData(); + //重置Sreeps数据 + this.onResetSreeps(); //重置场景 GBattleModeManager.getIns().Open(BattleMode.OnHook,true); } diff --git a/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts b/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts index b86403b8..63be8012 100644 --- a/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts +++ b/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts @@ -1,6 +1,6 @@ import { _decorator, Component, Node } from 'cc'; -import GOnHookData from '../../../data/GOnHookData'; -import { TD } from '../../../App'; +import GOnHookData, { GOnHookDataEnum } from '../../../data/GOnHookData'; +import { app, TD } from '../../../App'; import { Label } from 'cc'; import { TbGEntity } from '../../../config/data/schema'; const { ccclass, property } = _decorator; @@ -9,9 +9,20 @@ const { ccclass, property } = _decorator; export class GameDifficultyTitle extends Component { @property(Label) - title:Label; + title:Label; //标题 + @property(Node) + progress:Node; //进度 - protected update(dt: number): void { + onLoad(){ + app.event.on(GOnHookDataEnum.UPDATE,this.onUpdateView,this); + this.onUpdateView(); + } + + protected onDestroy(): void { + app.event.off(GOnHookDataEnum.UPDATE,this.onUpdateView,this); + } + + onUpdateView(): void { let info = GOnHookData.getIns().info; let sign = null; @@ -25,6 +36,12 @@ export class GameDifficultyTitle extends Component { //显示难度 this.title.string = `难度 : ${table.data.level}-${table.data.childLevel}`; + //显示进度 + this.progress.children.forEach((item,index) => { + if(index < GOnHookData.getIns().getProgress()) + item.active = true; + else item.active = false; + }); } diff --git a/JisolGameCocos/assets/script/ui/Consts/Resource/PlayerResourceShow.ts b/JisolGameCocos/assets/script/ui/Consts/Resource/PlayerResourceShow.ts index c7098ed7..ab954c76 100644 --- a/JisolGameCocos/assets/script/ui/Consts/Resource/PlayerResourceShow.ts +++ b/JisolGameCocos/assets/script/ui/Consts/Resource/PlayerResourceShow.ts @@ -2,7 +2,7 @@ import { Label } from 'cc'; import { _decorator, Component, Node } from 'cc'; import ResourceData, { ResourceEvent, ResourceType } from '../../../data/ResourceData'; import { Enum } from 'cc'; -import { app } from '../../../App'; +import { app, TD } from '../../../App'; import NumberTools from '../../../tools/NumberTools'; const { ccclass, property } = _decorator; @@ -14,6 +14,10 @@ export class PlayerResourceShow extends Component { @property({type:Enum(ResourceType)}) type:ResourceType = ResourceType.Gold; + //显示名称 + @property(Label) + tig:Label; + //显示文本 @property(Label) show:Label; @@ -34,6 +38,8 @@ export class PlayerResourceShow extends Component { //刷新 onUpdateView(){ + //更新名称 + this.tig && (this.tig.string = `${TD.TbGResource.get(this.type).name}:`); //更新资源数量 this.show.string = `${NumberTools.NumberStr(ResourceData.getIns().getValue(this.type))}`; diff --git a/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIcon.ts b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIcon.ts index 92538fc8..8a7a5636 100644 --- a/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIcon.ts +++ b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIcon.ts @@ -1,5 +1,6 @@ import { _decorator, Component, Node } from 'cc'; import { ResourceIcon } from '../ResourceIcon'; +import ResourceData from '../../../../data/ResourceData'; const { ccclass, property } = _decorator; @ccclass('PlayerResourceIcon') @@ -10,7 +11,7 @@ export class PlayerResourceIcon extends Component { //设置 ( 资源Id ) set(id:number){ - + this.icon.set(id,ResourceData.getIns().getValue(id)) } } diff --git a/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconScroll.ts b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconScroll.ts new file mode 100644 index 00000000..665fe53b --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconScroll.ts @@ -0,0 +1,20 @@ +import { _decorator } from 'cc'; +import JNScrollViewItem from '../../../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollViewItem'; +import { PlayerResourceIcon } from './PlayerResourceIcon'; +const { ccclass, property } = _decorator; + +@ccclass('PlayerResourceIconScroll') +export class PlayerResourceIconScroll extends JNScrollViewItem { + + @property(PlayerResourceIcon) + icon:PlayerResourceIcon; + + onInit(data:number){ + + this.icon.set(data); + + } + +} + + diff --git a/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconScroll.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconScroll.ts.meta new file mode 100644 index 00000000..41c290f1 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconScroll.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "fd24051f-603b-4413-bdc2-f88ea8cd3a3e", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelect.ts b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelect.ts new file mode 100644 index 00000000..a8e97d6f --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelect.ts @@ -0,0 +1,62 @@ +import { _decorator, Component, Node } from 'cc'; +import { PlayerResourceIcon } from './PlayerResourceIcon'; +const { ccclass, property } = _decorator; + +@ccclass('PlayerResourceIconSelect') +export class PlayerResourceIconSelect extends Component { + + @property(PlayerResourceIcon) + icon:PlayerResourceIcon; + + //选中节点 + @property(Node) + select:Node; + + //不可选中节点 + @property(Node) + noselect:Node; + + //是否被选中 + _isSelect:boolean = false; + get isSelect(){ + return this._isSelect; + } + set isSelect(data:boolean){ + this._isSelect = data; + this.onUpdateSelect(); + } + + //是否不可选中 + _isNoSelect:boolean = false; + get isNoSelect(){ + return this._isNoSelect; + } + set isNoSelect(data:boolean){ + this._isNoSelect = data; + this.onUpdateSelect(); + } + + onLoad(){ + this.onUpdateSelect(); + this.noselect.active = false; + this.select.active = false; + } + + + //设置 + set(id:number){ + + this.icon.set(id); + + } + + onUpdateSelect(){ + + this.select.active = this.isSelect; + this.noselect.active = this.isNoSelect; + + } + +} + + diff --git a/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelect.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelect.ts.meta new file mode 100644 index 00000000..4203e9a7 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelect.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "c1ae1056-03c0-4291-b34e-7f9dcd04e8de", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelectScroll.ts b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelectScroll.ts new file mode 100644 index 00000000..4da5888b --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelectScroll.ts @@ -0,0 +1,19 @@ +import { _decorator, Component, Node } from 'cc'; +import JNScrollViewItem from '../../../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollViewItem'; +import { PlayerResourceIconSelect } from './PlayerResourceIconSelect'; +const { ccclass, property } = _decorator; + +@ccclass('PlayerResourceIconSelectScroll') +export class PlayerResourceIconSelectScroll extends JNScrollViewItem { + + @property(PlayerResourceIconSelect) + icon:PlayerResourceIconSelect; + + onInit(data:number){ + + this.icon.set(data); + + } + +} + diff --git a/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelectScroll.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelectScroll.ts.meta new file mode 100644 index 00000000..3226c997 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Resource/icon/PlayerResourceIconSelectScroll.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "6ac191b2-7f6a-4990-80de-7111564e8c4f", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Dungeon/DungeonShowItem.ts b/JisolGameCocos/assets/script/ui/Dungeon/DungeonShowItem.ts index bdd8c75e..9f779aeb 100644 --- a/JisolGameCocos/assets/script/ui/Dungeon/DungeonShowItem.ts +++ b/JisolGameCocos/assets/script/ui/Dungeon/DungeonShowItem.ts @@ -5,6 +5,8 @@ import { Label } from 'cc'; import GBattleModeManager, { BattleMode } from '../../battle/GBattleModeManager'; import { app, TD } from '../../App'; import { GUI } from '../UIConfig'; +import { PlayerResourceShow } from '../Consts/Resource/PlayerResourceShow'; +import ResourceData from '../../data/ResourceData'; const { ccclass, property } = _decorator; @ccclass('DungeonShowItem') @@ -14,8 +16,14 @@ export class DungeonShowItem extends JNScrollViewItem { @property(Label) title:Label; + //资源 + @property(PlayerResourceShow) + resource:PlayerResourceShow; + onInit(){ + this.resource.type = this.data.consume.id; + this.resource.onUpdateView(); this.onUpdateView(); } @@ -29,8 +37,17 @@ export class DungeonShowItem extends JNScrollViewItem { //点击副本 onClickDungeon(){ - GBattleModeManager.getIns().Open(BattleMode[`${this.data.type}`],true,TD[`${this.data.tigs}`].getDataList()[0].data); - app.layer.Close(GUI.DungeonView); + if(ResourceData.getIns().getValue(this.data.consume.id) >= this.data.consume.value){ + //打开副本 + GBattleModeManager.getIns().Open(BattleMode[`${this.data.type}`],true,{ + dungeonId:this.data.id, + dungeonItemId:TD[`${this.data.tigs}`].getDataList()[0].id, + data:TD[`${this.data.tigs}`].getDataList()[0].data + }); + app.layer.Close(GUI.DungeonView); + }else{ + app.layer.Open(GUI.Tips,{text:"没有钥匙了.."}); + } } diff --git a/JisolGameCocos/assets/script/ui/Home/MainView.ts b/JisolGameCocos/assets/script/ui/Home/MainView.ts index 45fb8c85..6313c822 100644 --- a/JisolGameCocos/assets/script/ui/Home/MainView.ts +++ b/JisolGameCocos/assets/script/ui/Home/MainView.ts @@ -83,6 +83,8 @@ export class MainView extends JNGLayerBase { //点击挂机按钮 onOpenOnHookView(){ + //取消挂机 + GOnHookManager.getIns().isOnHook = false; app.layer.Open(GUI.MainOnHookView); } @@ -121,6 +123,11 @@ export class MainView extends JNGLayerBase { app.layer.Open(GUI.DungeonView); } + //点击打开背包 + onClickPacksack(){ + app.layer.Open(GUI.PacksackView); + } + } diff --git a/JisolGameCocos/assets/script/ui/Home/OnHook/MainOnHookView.ts b/JisolGameCocos/assets/script/ui/Home/OnHook/MainOnHookView.ts index 97ed56c1..311df090 100644 --- a/JisolGameCocos/assets/script/ui/Home/OnHook/MainOnHookView.ts +++ b/JisolGameCocos/assets/script/ui/Home/OnHook/MainOnHookView.ts @@ -8,6 +8,7 @@ import { TablePetIconSelectScroll } from '../../Consts/Pet/table/TablePetIconSel import { Label } from 'cc'; import GOnHookManager from '../../../manager/battle/mode/GOnHookManager'; import { GUI } from '../../UIConfig'; +import { Toggle } from 'cc'; const { ccclass, property } = _decorator; @ccclass('MainOnHookView') @@ -20,6 +21,10 @@ export class MainOnHookView extends JNGLayerBase { //挂机按钮 @property(Label) onHookLabel:Label; + + //是否自动下一关 + @property(Toggle) + toggle:Toggle; onJNLoad(){ @@ -55,6 +60,7 @@ export class MainOnHookView extends JNGLayerBase { onClickOnHook(){ GOnHookManager.getIns().onHookCatchPets = this.views.getItems().filter(item => item.select.isSelect).map(item => item.data) GOnHookManager.getIns().isOnHook = !GOnHookManager.getIns().isOnHook; + GOnHookManager.getIns().isAutoNext = this.toggle.isChecked; app.layer.Open(GUI.Tips,{text:`${(GOnHookManager.getIns().isOnHook) ? "挂机" : "取消挂机"} 设置成功`}) this.close(); } diff --git a/JisolGameCocos/assets/script/ui/Resource/PacksackView.ts b/JisolGameCocos/assets/script/ui/Resource/PacksackView.ts index a772b4d4..c9d555a3 100644 --- a/JisolGameCocos/assets/script/ui/Resource/PacksackView.ts +++ b/JisolGameCocos/assets/script/ui/Resource/PacksackView.ts @@ -1,17 +1,26 @@ 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 ResourceData from '../../data/ResourceData'; const { ccclass, property } = _decorator; //背包页面 @ccclass('PacksackView') export class PacksackView extends JNLayerBase { + //背包 + @property(JNScrollView) + views:JNScrollView; + onJNLoad(data?: any): void { - super.onJNLoad(data) + super.onJNLoad(data); + this.onUpdateView(); } //更新页面 onUpdateView(){ + + this.views.refreshData(ResourceData.getIns().getIds()); } diff --git a/JisolGameCocos/assets/script/ui/UIConfig.ts b/JisolGameCocos/assets/script/ui/UIConfig.ts index cccb95e1..e4dd36fd 100644 --- a/JisolGameCocos/assets/script/ui/UIConfig.ts +++ b/JisolGameCocos/assets/script/ui/UIConfig.ts @@ -24,6 +24,7 @@ export enum GUI{ IntoBattleView = "IntoBattleView", //上阵页面 MainOnHookView = "MainOnHookView", //挂机弹窗 MapSelectView = "MapSelectView", //地图选择页面 + PacksackView = "PacksackView", //背包页面 /** 副本 */ DungeonView = "DungeonView", //副本页面 @@ -118,6 +119,11 @@ const UIMainConfig:{ [key: string]: JNLayerInfo; } = { uri: "prefab/ui/地图/地图选择页面", anims:BackOutScale, }, + [GUI.PacksackView]:{ + layer:GLayer.Popup, + uri: "prefab/ui/资源/资源背包页面", + anims:BackOutScale, + }, } //宠物页面 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 7b88cc3b..cefe666b 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 @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import static java.awt.SystemColor.info; - /** * 玩家宠物 */ diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GDungeonController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GDungeonController.java index 5407574a..343dc924 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GDungeonController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GDungeonController.java @@ -98,8 +98,15 @@ public class GDungeonController { //获取等级数据 TDungeon dungeon = Objects.requireNonNull((TDungeon) tableData.get(dungeonItemId).getData()); + //扣除消耗 - resourceService.addResourceValue(player.getPlayerId(), tbGSysDungeon.consume.id, (long) -tbGSysDungeon.consume.value); + List ovs = new ArrayList(){ + { + add(ResourceUpdateOV.onUpdate(resourceService.addResourceValue(player.getPlayerId(), tbGSysDungeon.consume.id, (long) -tbGSysDungeon.consume.value))); + } + }; + + ovs.addAll(resourceService.rewards(player.getPlayerId(), dungeon.rewards)); //更新等级 if(infos.get(dungeonId).getDungeonCfgItemId().equals(dungeonItemId)){ @@ -110,7 +117,7 @@ public class GDungeonController { } //发放奖励 - return NewsResource.onSuccess("挑战成功",infos,resourceService.rewards(player.getPlayerId(), dungeon.rewards)); + return NewsResource.onSuccess("挑战成功",infos,ovs); } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java index 3d29b5b8..1488494c 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java @@ -55,6 +55,16 @@ public class GOnHookController { //生成的野怪列表 public static Map> CREEPS = new HashMap<>(); + //清除指定玩家的野怪列表 + public void onClearCreeps(Long playerId,List saves){ + Map creeps = CREEPS.get(playerId); + if(Objects.isNull(creeps)){ + CREEPS.put(playerId,new HashMap<>()); + } + Map collect = creeps.entrySet().stream().filter(item -> saves.contains(item.getKey())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + CREEPS.put(playerId,collect); + } + //获取玩家模式信息 @ApiImplicitParams({}) @ApiOperation(value = "生成野怪") @@ -87,7 +97,10 @@ public class GOnHookController { @ApiImplicitParams({}) @ApiOperation(value = "切换地图") @PostMapping("/setMapId/{mapId}") - public NewsContext setMapId(@CurrentPlayer Player player,@PathVariable Integer mapId){ + public NewsContext setMapId(@CurrentPlayer Player player,@PathVariable Integer mapId,@RequestBody List saves){ + + if(Objects.isNull(saves)) saves = new ArrayList<>(); + //判断是否有这个地图 TbGOnHookMaps map = TD.DATA.getTbGOnHookMaps().get(mapId); if (Objects.isNull(map)) NewsContext.onFail("切换地图失败 没有这个地图哦"); @@ -95,7 +108,7 @@ public class GOnHookController { data.setOnHookMap(mapId); modeOnHookService.saveOrUpdate(data); //切换地图 清理历史野怪 - CREEPS.put(player.getPlayerId(),new HashMap<>()); + this.onClearCreeps(player.getPlayerId(),saves); return NewsContext.onSuccess("成功",data); } @@ -103,7 +116,9 @@ public class GOnHookController { @ApiImplicitParams({}) @ApiOperation(value = "下一关") @PostMapping("/nextLevel") - public NewsContext nextLevel(@CurrentPlayer Player player){ + public NewsContext nextLevel(@CurrentPlayer Player player,@RequestBody List saves){ + if(Objects.isNull(saves)) saves = new ArrayList<>(); + ModeOnHook data = this.getInfo(player).data; //判断是否战胜当前关卡 @@ -117,12 +132,12 @@ public class GOnHookController { data.getHookInfo().getMaps().put(data.getOnHookMap(),nextLevel.getId()); //并且重置当前关卡状态 - data.getHookInfo().getMapStates().put(data.getOnHookMap(),ModeOnHookInfo.MapState.Fight); + data.getHookInfo().getMapStates().put(data.getOnHookMap(),0); //保存地图 modeOnHookService.saveOrUpdate(data); //下一关 清理历史野怪 - CREEPS.put(player.getPlayerId(),new HashMap<>()); + this.onClearCreeps(player.getPlayerId(),saves); return NewsContext.onSuccess("下一关",data); } @@ -133,7 +148,9 @@ public class GOnHookController { public NewsContext winLevel(@CurrentPlayer Player player){ ModeOnHook data = this.getInfo(player).data; - data.getHookInfo().getMapStates().put(data.getOnHookMap(), ModeOnHookInfo.MapState.Win); + Integer count = data.getHookInfo().getMapStates().get(data.getOnHookMap()); + if(Objects.isNull(count)) count = 0; + data.getHookInfo().getMapStates().put(data.getOnHookMap(),count+1); //保存地图 modeOnHookService.saveOrUpdate(data); diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHook.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHook.java index 82c47ffc..ec17c8ac 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHook.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHook.java @@ -73,7 +73,8 @@ public class ModeOnHook { //是否战胜当前关卡 public boolean isWinLevel(){ - return ModeOnHookInfo.MapState.Win.equals(getHookInfo().getMapStates().get(getOnHookMap())); + if(Objects.isNull(getHookInfo().getMapStates().get(getOnHookMap()))) return false; + return getHookInfo().getMapStates().get(getOnHookMap()) >= 4; } } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHookInfo.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHookInfo.java index 5d0a5bca..0aef8c64 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHookInfo.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHookInfo.java @@ -13,7 +13,7 @@ public class ModeOnHookInfo { //地图关卡信息 {地图Id: 地图关卡Id} private Map maps; - //地图关卡状态 {地图Id: 状态(0:战斗中, 1:胜利)} + //地图关卡状态 {地图Id: 战胜次数} private Map mapStates; public ModeOnHookInfo(){ @@ -21,9 +21,4 @@ public class ModeOnHookInfo { mapStates = new HashMap<>(); } - public interface MapState{ - Integer Fight = 0; - Integer Win = 1; - } - }