diff --git a/assets/bundles/popCommon/buyPower/prefab/buyPower.prefab b/assets/bundles/popCommon/buyPower/prefab/buyPower.prefab index df64597..0970199 100644 --- a/assets/bundles/popCommon/buyPower/prefab/buyPower.prefab +++ b/assets/bundles/popCommon/buyPower/prefab/buyPower.prefab @@ -28,20 +28,20 @@ "_active": true, "_components": [ { - "__id__": 132 + "__id__": 120 }, { - "__id__": 134 + "__id__": 122 }, { - "__id__": 136 + "__id__": 124 }, { - "__id__": 138 + "__id__": 126 } ], "_prefab": { - "__id__": 140 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", @@ -365,38 +365,32 @@ "__id__": 23 }, { - "__id__": 29 + "__id__": 33 }, { - "__id__": 35 + "__id__": 39 }, { "__id__": 45 }, { - "__id__": 51 - }, - { - "__id__": 57 - }, - { - "__id__": 87 + "__id__": 75 }, { - "__id__": 109 + "__id__": 97 } ], "_active": true, "_components": [ { - "__id__": 127 + "__id__": 115 }, { - "__id__": 129 + "__id__": 117 } ], "_prefab": { - "__id__": 131 + "__id__": 119 }, "_lpos": { "__type__": "cc.Vec3", @@ -492,7 +486,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 582, - "height": 565 + "height": 563 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -528,7 +522,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d7c2cb35-ecb8-47c3-906e-3b9da168423b@f9941", + "__uuid__": "ad15e354-d8ed-4a05-b879-17638977656e@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -565,7 +559,7 @@ }, { "__type__": "cc.Node", - "_name": "标题", + "_name": "btnClose", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -579,288 +573,16 @@ }, { "__id__": 26 - } - ], - "_prefab": { - "__id__": 28 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 1.322, - "y": 311.357, - "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": 249, - "height": 71 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "48N1On2ktOg6hkIX/fj3dw" - }, - { - "__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": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6d78d3da-6ef1-4d89-a3d5-070846931221@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": "844NSM4O5IXIebDVkShfc5" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "4aOSDSjClKiZJSqKnMIYcI", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "补充体力", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 16 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 30 }, { - "__id__": 32 - } - ], - "_prefab": { - "__id__": 34 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 316, - "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": 145, - "height": 30 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "604eIaYRJJ/IhpigCiITW0" - }, - { - "__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": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6a658e08-1406-4477-ac39-8aa38d8c4bc2@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": "95BmCXbcJEUKrffV+D8AiU" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c8Y9V49fxJ9ZmMPWomExl3", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "btnClose", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 16 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 36 - }, - { - "__id__": 38 + "__id__": 28 }, { - "__id__": 40 - }, - { - "__id__": 42 + "__id__": 30 } ], "_prefab": { - "__id__": 44 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -897,11 +619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 23 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", @@ -925,11 +647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 23 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 27 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -970,11 +692,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 23 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 29 }, "clickEvents": [], "_interactable": true, @@ -1026,11 +748,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 23 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 31 }, "_id": "" }, @@ -1063,14 +785,14 @@ "_active": true, "_components": [ { - "__id__": 46 + "__id__": 34 }, { - "__id__": 48 + "__id__": 36 } ], "_prefab": { - "__id__": 50 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -1107,11 +829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -1135,11 +857,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1199,14 +921,14 @@ "_active": true, "_components": [ { - "__id__": 52 + "__id__": 40 }, { - "__id__": 54 + "__id__": 42 } ], "_prefab": { - "__id__": 56 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -1243,11 +965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 41 }, "_contentSize": { "__type__": "cc.Size", @@ -1271,11 +993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 43 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1333,32 +1055,32 @@ }, "_children": [ { - "__id__": 58 + "__id__": 46 }, { - "__id__": 64 + "__id__": 52 }, { - "__id__": 70 + "__id__": 58 } ], "_active": true, "_components": [ { - "__id__": 78 + "__id__": 66 }, { - "__id__": 80 + "__id__": 68 }, { - "__id__": 82 + "__id__": 70 }, { - "__id__": 84 + "__id__": 72 } ], "_prefab": { - "__id__": 86 + "__id__": 74 }, "_lpos": { "__type__": "cc.Vec3", @@ -1395,20 +1117,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 57 + "__id__": 45 }, "_children": [], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 47 }, { - "__id__": 61 + "__id__": 49 } ], "_prefab": { - "__id__": 63 + "__id__": 51 }, "_lpos": { "__type__": "cc.Vec3", @@ -1445,11 +1167,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 46 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1473,11 +1195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 46 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 50 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1531,20 +1253,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 57 + "__id__": 45 }, "_children": [], "_active": true, "_components": [ { - "__id__": 65 + "__id__": 53 }, { - "__id__": 67 + "__id__": 55 } ], "_prefab": { - "__id__": 69 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -1581,11 +1303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 54 }, "_contentSize": { "__type__": "cc.Size", @@ -1609,11 +1331,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 56 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1667,23 +1389,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 57 + "__id__": 45 }, "_children": [], "_active": false, "_components": [ { - "__id__": 71 + "__id__": 59 }, { - "__id__": 73 + "__id__": 61 }, { - "__id__": 75 + "__id__": 63 } ], "_prefab": { - "__id__": 77 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -1720,11 +1442,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 60 }, "_contentSize": { "__type__": "cc.Size", @@ -1748,11 +1470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 62 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1793,11 +1515,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 64 }, "speed": 0.5, "useScale": true, @@ -1849,16 +1571,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", - "width": 168, - "height": 72 + "width": 166, + "height": 68 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1877,11 +1599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 69 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1894,7 +1616,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "a73ab136-7e10-43e5-9598-803e01979682@f9941", + "__uuid__": "a528f4f1-b9c8-4167-b839-2ebbffbc47f6@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1922,11 +1644,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 71 }, "clickEvents": [], "_interactable": true, @@ -1978,11 +1700,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 73 }, "_id": "" }, @@ -2013,29 +1735,29 @@ }, "_children": [ { - "__id__": 88 + "__id__": 76 }, { - "__id__": 94 + "__id__": 82 } ], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 88 }, { - "__id__": 102 + "__id__": 90 }, { - "__id__": 104 + "__id__": 92 }, { - "__id__": 106 + "__id__": 94 } ], "_prefab": { - "__id__": 108 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -2072,20 +1794,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 87 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 89 + "__id__": 77 }, { - "__id__": 91 + "__id__": 79 } ], "_prefab": { - "__id__": 93 + "__id__": 81 }, "_lpos": { "__type__": "cc.Vec3", @@ -2122,11 +1844,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 78 }, "_contentSize": { "__type__": "cc.Size", @@ -2150,11 +1872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 80 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2208,20 +1930,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 87 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 95 + "__id__": 83 }, { - "__id__": 97 + "__id__": 85 } ], "_prefab": { - "__id__": 99 + "__id__": 87 }, "_lpos": { "__type__": "cc.Vec3", @@ -2258,11 +1980,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 82 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -2286,11 +2008,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 82 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 86 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2344,16 +2066,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 89 }, "_contentSize": { "__type__": "cc.Size", - "width": 168, - "height": 72 + "width": 166, + "height": 68 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2372,11 +2094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 91 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2389,7 +2111,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "54e555ee-68c9-4de5-ba69-01d67090af96@f9941", + "__uuid__": "db8b8937-bb3c-46bd-a858-59b6d4b3c7e0@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -2417,11 +2139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 93 }, "clickEvents": [], "_interactable": true, @@ -2473,11 +2195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 95 }, "_id": "" }, @@ -2508,23 +2230,23 @@ }, "_children": [ { - "__id__": 110 + "__id__": 98 }, { - "__id__": 116 + "__id__": 104 } ], "_active": false, "_components": [ { - "__id__": 122 + "__id__": 110 }, { - "__id__": 124 + "__id__": 112 } ], "_prefab": { - "__id__": 126 + "__id__": 114 }, "_lpos": { "__type__": "cc.Vec3", @@ -2561,20 +2283,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 109 + "__id__": 97 }, "_children": [], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 99 }, { - "__id__": 113 + "__id__": 101 } ], "_prefab": { - "__id__": 115 + "__id__": 103 }, "_lpos": { "__type__": "cc.Vec3", @@ -2611,11 +2333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 100 }, "_contentSize": { "__type__": "cc.Size", @@ -2639,11 +2361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 102 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2720,20 +2442,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 109 + "__id__": 97 }, "_children": [], "_active": true, "_components": [ { - "__id__": 117 + "__id__": 105 }, { - "__id__": 119 + "__id__": 107 } ], "_prefab": { - "__id__": 121 + "__id__": 109 }, "_lpos": { "__type__": "cc.Vec3", @@ -2770,11 +2492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 106 }, "_contentSize": { "__type__": "cc.Size", @@ -2798,11 +2520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 108 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2856,11 +2578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 111 }, "_contentSize": { "__type__": "cc.Size", @@ -2884,11 +2606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 113 }, "_resizeMode": 1, "_layoutType": 1, @@ -2939,7 +2661,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 116 }, "_contentSize": { "__type__": "cc.Size", @@ -2967,7 +2689,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 118 }, "_id": "" }, @@ -2998,7 +2720,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -3026,7 +2748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 123 }, "_alignFlags": 45, "_target": null, @@ -3062,7 +2784,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 125 }, "_id": "" }, @@ -3080,7 +2802,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 127 }, "_id": "" }, diff --git a/assets/bundles/popCommon/popNotice/prefab/PopNotice.prefab b/assets/bundles/popCommon/popNotice/prefab/PopNotice.prefab index cc922b0..66612e8 100644 --- a/assets/bundles/popCommon/popNotice/prefab/PopNotice.prefab +++ b/assets/bundles/popCommon/popNotice/prefab/PopNotice.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 98 + "__id__": 86 }, { - "__id__": 100 + "__id__": 88 }, { - "__id__": 102 + "__id__": 90 } ], "_prefab": { - "__id__": 104 + "__id__": 92 }, "_lpos": { "__type__": "cc.Vec3", @@ -287,26 +287,20 @@ "__id__": 33 }, { - "__id__": 39 - }, - { - "__id__": 45 - }, - { - "__id__": 83 + "__id__": 71 } ], "_active": true, "_components": [ { - "__id__": 93 + "__id__": 81 }, { - "__id__": 95 + "__id__": 83 } ], "_prefab": { - "__id__": 97 + "__id__": 85 }, "_lpos": { "__type__": "cc.Vec3", @@ -404,8 +398,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 643, - "height": 682 + "width": 582, + "height": 563 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -441,7 +435,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "e1fda8f6-df78-42ff-af61-c17c2cbcb818@f9941", + "__uuid__": "1f71bfd2-c692-43e8-a20e-e84f30a8e44c@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -496,7 +490,7 @@ }, { "__type__": "cc.Node", - "_name": "游戏公告1", + "_name": "矩形 2040", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -517,8 +511,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -111.828, - "y": 301, + "x": 0, + "y": -60.996, "z": 0 }, "_lrot": { @@ -558,8 +552,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 184, - "height": 45 + "width": 487, + "height": 350 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -570,7 +564,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "734tbq4ZRB35E1IYjQ7HGS" + "fileId": "2fRe4WmS9CKYpPpyNY6Qq4" }, { "__type__": "cc.Sprite", @@ -595,12 +589,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d202a616-b0b2-4f48-b138-e0dd96f59783@f9941", + "__uuid__": "dc3a0c25-4a84-4067-8c22-e29205601fc2@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -615,7 +609,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c4FGyRFBJCtb5DjDg5ZOhp" + "fileId": "eaAyzJ9ghJO45gKXLFFOM1" }, { "__type__": "cc.PrefabInfo", @@ -625,14 +619,14 @@ "asset": { "__id__": 0 }, - "fileId": "3dtRBYT9xBIpfKnNUeVD+/", + "fileId": "56kYBqUqVIaIRDTQNrd3b1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "标题框", + "_name": "lb_title", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -653,8 +647,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 18, - "y": 14, + "x": -220.676, + "y": 156.586, "z": 0 }, "_lrot": { @@ -692,278 +686,6 @@ "__prefab": { "__id__": 29 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 543, - "height": 450 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c6L7LS3V1Oyb+6lstZRAGJ" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 27 - }, - "_enabled": true, - "__prefab": { - "__id__": 31 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "0200c28b-fecf-45e9-887b-4614f2e14745@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": "32xF5qxHpOSbhDzx59f6Wb" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "85bQS/tDdF+6ak8ZWpZ4cV", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "展开内容框", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 12 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 34 - }, - { - "__id__": 36 - } - ], - "_prefab": { - "__id__": 38 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 18, - "y": -2, - "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__": 33 - }, - "_enabled": true, - "__prefab": { - "__id__": 35 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 509, - "height": 331 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4aKu1k9DlA1K11ufF/tN91" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 33 - }, - "_enabled": true, - "__prefab": { - "__id__": 37 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "297d4288-0a4d-44a5-a801-bf31291a6625@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": "f4bSy2D1pHipAyi20M7FAH" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "7btgbZJHNGxpveyM9aeXIe", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "lb_title", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 12 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 40 - }, - { - "__id__": 42 - } - ], - "_prefab": { - "__id__": 44 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -220.676, - "y": 204.027, - "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__": 39 - }, - "_enabled": true, - "__prefab": { - "__id__": 41 - }, "_contentSize": { "__type__": "cc.Size", "width": 253.10032965509671, @@ -986,11 +708,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 31 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1071,28 +793,28 @@ }, "_children": [ { - "__id__": 46 + "__id__": 34 }, { - "__id__": 64 + "__id__": 52 } ], "_active": true, "_components": [ { - "__id__": 80 + "__id__": 68 }, { - "__id__": 61 + "__id__": 49 } ], "_prefab": { - "__id__": 82 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", - "x": 22.171, - "y": -4.888, + "x": 0, + "y": -61.818, "z": 0 }, "_lrot": { @@ -1124,30 +846,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 45 + "__id__": 33 }, "_children": [ { - "__id__": 47 + "__id__": 35 } ], "_active": true, "_components": [ { - "__id__": 53 + "__id__": 41 }, { - "__id__": 55 + "__id__": 43 }, { - "__id__": 57 + "__id__": 45 }, { - "__id__": 59 + "__id__": 47 } ], "_prefab": { - "__id__": 79 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -1184,20 +906,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 46 + "__id__": 34 }, "_children": [], "_active": true, "_components": [ { - "__id__": 48 + "__id__": 36 }, { - "__id__": 50 + "__id__": 38 } ], "_prefab": { - "__id__": 52 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -1234,11 +956,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -1262,11 +984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 39 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1320,16 +1042,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", "width": 12, - "height": 310 + "height": 340 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1348,11 +1070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 44 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1393,11 +1115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 46 }, "_alignFlags": 37, "_target": null, @@ -1429,17 +1151,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 48 }, "_scrollView": { - "__id__": 61 + "__id__": 49 }, "_handle": { - "__id__": 50 + "__id__": 38 }, "_direction": 1, "_enableAutoHide": false, @@ -1456,11 +1178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 50 }, "bounceDuration": 0.23, "brake": 0.75, @@ -1471,11 +1193,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 63 + "__id__": 51 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 59 + "__id__": 47 }, "_id": "" }, @@ -1489,20 +1211,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 64 + "__id__": 52 }, "_children": [], "_active": true, "_components": [ { - "__id__": 74 + "__id__": 62 }, { - "__id__": 76 + "__id__": 64 } ], "_prefab": { - "__id__": 78 + "__id__": 66 }, "_lpos": { "__type__": "cc.Vec3", @@ -1539,30 +1261,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 45 + "__id__": 33 }, "_children": [ { - "__id__": 63 + "__id__": 51 } ], "_active": true, "_components": [ { - "__id__": 65 + "__id__": 53 }, { - "__id__": 67 + "__id__": 55 }, { - "__id__": 69 + "__id__": 57 }, { - "__id__": 71 + "__id__": 59 } ], "_prefab": { - "__id__": 73 + "__id__": 61 }, "_lpos": { "__type__": "cc.Vec3", @@ -1599,16 +1321,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 54 }, "_contentSize": { "__type__": "cc.Size", "width": 480, - "height": 310 + "height": 340 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1627,11 +1349,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 56 }, "_type": 0, "_inverted": false, @@ -1649,11 +1371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 58 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1695,11 +1417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 60 }, "_alignFlags": 45, "_target": null, @@ -1744,11 +1466,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", @@ -1772,11 +1494,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 65 }, "_lineHeight": 35, "_string": "", @@ -1836,16 +1558,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", "width": 480, - "height": 310 + "height": 340 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1883,25 +1605,25 @@ "_active": true, "_components": [ { - "__id__": 84 + "__id__": 72 }, { - "__id__": 86 + "__id__": 74 }, { - "__id__": 88 + "__id__": 76 }, { - "__id__": 90 + "__id__": 78 } ], "_prefab": { - "__id__": 92 + "__id__": 80 }, "_lpos": { "__type__": "cc.Vec3", - "x": 277.2370000000001, - "y": 301.59799999999996, + "x": 231.151, + "y": 243.313, "z": 0 }, "_lrot": { @@ -1933,11 +1655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 73 }, "_contentSize": { "__type__": "cc.Size", @@ -1961,11 +1683,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 75 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2006,11 +1728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 77 }, "clickEvents": [], "_interactable": true, @@ -2062,11 +1784,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 79 }, "_id": "" }, @@ -2097,7 +1819,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 82 }, "_contentSize": { "__type__": "cc.Size", @@ -2125,7 +1847,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 84 }, "_alignFlags": 45, "_target": null, @@ -2174,7 +1896,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -2202,7 +1924,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 89 }, "_alignFlags": 45, "_target": null, @@ -2238,7 +1960,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 91 }, "_id": "" }, diff --git a/assets/res/comm/texture/bg/通用小弹窗.png b/assets/res/comm/texture/bg/通用小弹窗.png new file mode 100644 index 0000000..031bb60 Binary files /dev/null and b/assets/res/comm/texture/bg/通用小弹窗.png differ diff --git a/assets/res/comm/texture/bg/通用小弹窗.png.meta b/assets/res/comm/texture/bg/通用小弹窗.png.meta new file mode 100644 index 0000000..30e6044 --- /dev/null +++ b/assets/res/comm/texture/bg/通用小弹窗.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "5592f520-f3c0-4003-8646-e07a8d2ec0c9", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "5592f520-f3c0-4003-8646-e07a8d2ec0c9@6c48a", + "displayName": "通用小弹窗", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "5592f520-f3c0-4003-8646-e07a8d2ec0c9", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "5592f520-f3c0-4003-8646-e07a8d2ec0c9@f9941", + "displayName": "通用小弹窗", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 582, + "height": 434, + "rawWidth": 582, + "rawHeight": 434, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -291, + -217, + 0, + 291, + -217, + 0, + -291, + 217, + 0, + 291, + 217, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 434, + 582, + 434, + 0, + 0, + 582, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -291, + -217, + 0 + ], + "maxPos": [ + 291, + 217, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "5592f520-f3c0-4003-8646-e07a8d2ec0c9@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "5592f520-f3c0-4003-8646-e07a8d2ec0c9@6c48a" + } +} diff --git a/assets/res/comm/texture/com/取消.png b/assets/res/comm/texture/com/取消.png index 278255e..641ca52 100644 Binary files a/assets/res/comm/texture/com/取消.png and b/assets/res/comm/texture/com/取消.png differ diff --git a/assets/res/comm/texture/com/取消.png.meta b/assets/res/comm/texture/com/取消.png.meta index 798b0b9..69e7361 100644 --- a/assets/res/comm/texture/com/取消.png.meta +++ b/assets/res/comm/texture/com/取消.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 80, - "height": 39, - "rawWidth": 80, - "rawHeight": 39, + "width": 61, + "height": 31, + "rawWidth": 61, + "rawHeight": 31, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -40, - -19.5, + -30.5, + -15.5, 0, - 40, - -19.5, + 30.5, + -15.5, 0, - -40, - 19.5, + -30.5, + 15.5, 0, - 40, - 19.5, + 30.5, + 15.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 39, - 80, - 39, + 31, + 61, + 31, 0, 0, - 80, + 61, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -40, - -19.5, + -30.5, + -15.5, 0 ], "maxPos": [ - 40, - 19.5, + 30.5, + 15.5, 0 ] }, diff --git a/assets/res/comm/texture/com/确定.png b/assets/res/comm/texture/com/确定.png index 85f67ae..e0d8c33 100644 Binary files a/assets/res/comm/texture/com/确定.png and b/assets/res/comm/texture/com/确定.png differ diff --git a/assets/res/comm/texture/com/确定.png.meta b/assets/res/comm/texture/com/确定.png.meta index 6aa4e61..a7018c9 100644 --- a/assets/res/comm/texture/com/确定.png.meta +++ b/assets/res/comm/texture/com/确定.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 74, - "height": 37, - "rawWidth": 74, - "rawHeight": 37, + "width": 62, + "height": 31, + "rawWidth": 62, + "rawHeight": 31, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -37, - -18.5, + -31, + -15.5, 0, - 37, - -18.5, + 31, + -15.5, 0, - -37, - 18.5, + -31, + 15.5, 0, - 37, - 18.5, + 31, + 15.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 37, - 74, - 37, + 31, + 62, + 31, 0, 0, - 74, + 62, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -37, - -18.5, + -31, + -15.5, 0 ], "maxPos": [ - 37, - 18.5, + 31, + 15.5, 0 ] }, diff --git a/assets/res/comm/texture/com/蓝色按钮.png b/assets/res/comm/texture/com/蓝色按钮.png index cd43af2..54892ca 100644 Binary files a/assets/res/comm/texture/com/蓝色按钮.png and b/assets/res/comm/texture/com/蓝色按钮.png differ diff --git a/assets/res/comm/texture/com/蓝色按钮.png.meta b/assets/res/comm/texture/com/蓝色按钮.png.meta index a605894..0c6143a 100644 --- a/assets/res/comm/texture/com/蓝色按钮.png.meta +++ b/assets/res/comm/texture/com/蓝色按钮.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 168, - "height": 72, - "rawWidth": 168, - "rawHeight": 72, + "width": 166, + "height": 68, + "rawWidth": 166, + "rawHeight": 68, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -84, - -36, + -83, + -34, 0, - 84, - -36, + 83, + -34, 0, - -84, - 36, + -83, + 34, 0, - 84, - 36, + 83, + 34, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 72, - 168, - 72, + 68, + 166, + 68, 0, 0, - 168, + 166, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -84, - -36, + -83, + -34, 0 ], "maxPos": [ - 84, - 36, + 83, + 34, 0 ] }, diff --git a/assets/res/comm/texture/com/黄色按钮.png b/assets/res/comm/texture/com/黄色按钮.png index c08dee8..c423253 100644 Binary files a/assets/res/comm/texture/com/黄色按钮.png and b/assets/res/comm/texture/com/黄色按钮.png differ diff --git a/assets/res/comm/texture/com/黄色按钮.png.meta b/assets/res/comm/texture/com/黄色按钮.png.meta index 20466a3..1cf8a9a 100644 --- a/assets/res/comm/texture/com/黄色按钮.png.meta +++ b/assets/res/comm/texture/com/黄色按钮.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 168, - "height": 72, - "rawWidth": 168, - "rawHeight": 72, + "width": 166, + "height": 68, + "rawWidth": 166, + "rawHeight": 68, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -84, - -36, + -83, + -34, 0, - 84, - -36, + 83, + -34, 0, - -84, - 36, + -83, + 34, 0, - 84, - 36, + 83, + 34, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 72, - 168, - 72, + 68, + 166, + 68, 0, 0, - 168, + 166, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -84, - -36, + -83, + -34, 0 ], "maxPos": [ - 84, - 36, + 83, + 34, 0 ] }, diff --git a/assets/res/popCommon/texture/popbg/游戏公告.png b/assets/res/popCommon/texture/popbg/游戏公告.png new file mode 100644 index 0000000..5a38fe1 Binary files /dev/null and b/assets/res/popCommon/texture/popbg/游戏公告.png differ diff --git a/assets/res/popCommon/texture/popbg/游戏公告.png.meta b/assets/res/popCommon/texture/popbg/游戏公告.png.meta new file mode 100644 index 0000000..c5b4613 --- /dev/null +++ b/assets/res/popCommon/texture/popbg/游戏公告.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "1f71bfd2-c692-43e8-a20e-e84f30a8e44c", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "1f71bfd2-c692-43e8-a20e-e84f30a8e44c@6c48a", + "displayName": "游戏公告", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "1f71bfd2-c692-43e8-a20e-e84f30a8e44c", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "1f71bfd2-c692-43e8-a20e-e84f30a8e44c@f9941", + "displayName": "游戏公告", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 582, + "height": 563, + "rawWidth": 582, + "rawHeight": 563, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -291, + -281.5, + 0, + 291, + -281.5, + 0, + -291, + 281.5, + 0, + 291, + 281.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 563, + 582, + 563, + 0, + 0, + 582, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -291, + -281.5, + 0 + ], + "maxPos": [ + 291, + 281.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "1f71bfd2-c692-43e8-a20e-e84f30a8e44c@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "1f71bfd2-c692-43e8-a20e-e84f30a8e44c@6c48a" + } +} diff --git a/assets/res/popCommon/texture/popbg/矩形 2040.png b/assets/res/popCommon/texture/popbg/矩形 2040.png new file mode 100644 index 0000000..d7e2afe Binary files /dev/null and b/assets/res/popCommon/texture/popbg/矩形 2040.png differ diff --git a/assets/res/popCommon/texture/popbg/矩形 2040.png.meta b/assets/res/popCommon/texture/popbg/矩形 2040.png.meta new file mode 100644 index 0000000..e817aea --- /dev/null +++ b/assets/res/popCommon/texture/popbg/矩形 2040.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "dc3a0c25-4a84-4067-8c22-e29205601fc2", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "dc3a0c25-4a84-4067-8c22-e29205601fc2@6c48a", + "displayName": "矩形 2040", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "dc3a0c25-4a84-4067-8c22-e29205601fc2", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "dc3a0c25-4a84-4067-8c22-e29205601fc2@f9941", + "displayName": "矩形 2040", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 487, + "height": 291, + "rawWidth": 487, + "rawHeight": 291, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -243.5, + -145.5, + 0, + 243.5, + -145.5, + 0, + -243.5, + 145.5, + 0, + 243.5, + 145.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 291, + 487, + 291, + 0, + 0, + 487, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -243.5, + -145.5, + 0 + ], + "maxPos": [ + 243.5, + 145.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "dc3a0c25-4a84-4067-8c22-e29205601fc2@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "dc3a0c25-4a84-4067-8c22-e29205601fc2@6c48a" + } +} diff --git a/assets/res/popCommon/texture/popbg/补充体力.png b/assets/res/popCommon/texture/popbg/补充体力.png new file mode 100644 index 0000000..cca41b8 Binary files /dev/null and b/assets/res/popCommon/texture/popbg/补充体力.png differ diff --git a/assets/res/popCommon/texture/popbg/补充体力.png.meta b/assets/res/popCommon/texture/popbg/补充体力.png.meta new file mode 100644 index 0000000..a65d03e --- /dev/null +++ b/assets/res/popCommon/texture/popbg/补充体力.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "ad15e354-d8ed-4a05-b879-17638977656e", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "ad15e354-d8ed-4a05-b879-17638977656e@6c48a", + "displayName": "补充体力", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "ad15e354-d8ed-4a05-b879-17638977656e", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "ad15e354-d8ed-4a05-b879-17638977656e@f9941", + "displayName": "补充体力", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 582, + "height": 563, + "rawWidth": 582, + "rawHeight": 563, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -291, + -281.5, + 0, + 291, + -281.5, + 0, + -291, + 281.5, + 0, + 291, + 281.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 563, + 582, + 563, + 0, + 0, + 582, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -291, + -281.5, + 0 + ], + "maxPos": [ + 291, + 281.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ad15e354-d8ed-4a05-b879-17638977656e@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "ad15e354-d8ed-4a05-b879-17638977656e@6c48a" + } +}