diff --git a/assets/PageLoading.prefab b/assets/PageLoading.prefab index 0de861e..8749d73 100644 --- a/assets/PageLoading.prefab +++ b/assets/PageLoading.prefab @@ -176,7 +176,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d532045e-55f8-47c2-9493-b918e18364b0@f9941", + "__uuid__": "10047f2e-bf2c-46f0-ba98-6fc23cf7ea87@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -597,8 +597,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 50.4 + "width": 88, + "height": 58.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -646,19 +646,19 @@ "_isSystemFontUsed": true, "_spacingX": 0, "_isItalic": false, - "_isBold": false, + "_isBold": true, "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, - "_enableOutline": false, + "_enableOutline": true, "_outlineColor": { "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, + "r": 72, + "g": 158, + "b": 35, "a": 255 }, - "_outlineWidth": 2, + "_outlineWidth": 4, "_enableShadow": false, "_shadowColor": { "__type__": "cc.Color", diff --git a/assets/prefabs/PageHome.prefab b/assets/prefabs/PageHome.prefab index d06d051..a381ef2 100644 --- a/assets/prefabs/PageHome.prefab +++ b/assets/prefabs/PageHome.prefab @@ -25,23 +25,23 @@ "__id__": 10 }, { - "__id__": 20 + "__id__": 50 } ], "_active": true, "_components": [ { - "__id__": 34 + "__id__": 98 }, { - "__id__": 36 + "__id__": 100 }, { - "__id__": 38 + "__id__": 102 } ], "_prefab": { - "__id__": 40 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -176,7 +176,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d532045e-55f8-47c2-9493-b918e18364b0@f9941", + "__uuid__": "10047f2e-bf2c-46f0-ba98-6fc23cf7ea87@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -231,35 +231,36 @@ }, { "__type__": "cc.Node", - "_name": "startGame", + "_name": "TopLayout", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 11 }, - { - "__id__": 13 - }, - { - "__id__": 15 - }, { "__id__": 17 } ], + "_active": true, + "_components": [ + { + "__id__": 45 + }, + { + "__id__": 47 + } + ], "_prefab": { - "__id__": 19 + "__id__": 49 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -800.532, + "x": -385.125, + "y": 779.698, "z": 0 }, "_lrot": { @@ -271,9 +272,59 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.583, - "y": 1.583, - "z": 1.583 + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "ButtonSetting", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + } + ], + "_prefab": { + "__id__": 16 + }, + "_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": 1073741824, @@ -285,6 +336,763 @@ }, "_id": "" }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 115, + "height": 123 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "60IGmULatJkp1m3kqOQvqi" + }, + { + "__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": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7a8edfce-b0ad-41b3-8dc9-ec1c1ee22153@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": "ca/1+BpG5GEpPLPxdogMHi" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2aAsSPw45EPZZ4iMKf38JH", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Live", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [ + { + "__id__": 18 + }, + { + "__id__": 24 + }, + { + "__id__": 30 + }, + { + "__id__": 36 + } + ], + "_active": true, + "_components": [ + { + "__id__": 42 + } + ], + "_prefab": { + "__id__": 44 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 138.399, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Bar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 21 + } + ], + "_prefab": { + "__id__": 23 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 104.266, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 250, + "height": 81 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35imhEXT9N4rtkP5ChNmTp" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "85f4694c-9bb3-4a86-b961-6dbe12154989@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": "e52ruw4gxMJYKYTg6IRzj7" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c7oszG0nNL1rH0WCBT1CfN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "IconStam2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_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": 0.3, + "y": 0.3, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 24 + }, + "_enabled": true, + "__prefab": { + "__id__": 26 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 228, + "height": 309 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a5dXGIHHdAZ5+8bST6owtb" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 24 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "d18c3099-87cb-4ee0-9778-b3b27468f7b7@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": "b3Is4peDhNr40xKOwUG8oi" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "34WxmiuXZG8oXu4FuU5Kv8", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Value", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 31 + }, + { + "__id__": 33 + } + ], + "_prefab": { + "__id__": 35 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 97.181, + "y": 2.942, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 30 + }, + "_enabled": true, + "__prefab": { + "__id__": 32 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 101.875, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2evvB/JEdO56iVCITGQ9oE" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 30 + }, + "_enabled": true, + "__prefab": { + "__id__": 34 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 53, + "g": 53, + "b": 53, + "a": 255 + }, + "_string": "30/50", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 40, + "_fontSize": 40, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": { + "__uuid__": "fb4acba6-6bc7-4eb3-be34-8f2ac9823a80", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7cIruV0OhPVLFyHDNsSdLG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "52ZF7iOG1NwJquGzxR9Rca", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Plus", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 37 + }, + { + "__id__": 39 + } + ], + "_prefab": { + "__id__": 41 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 177.496, + "y": 1.961, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 36 + }, + "_enabled": true, + "__prefab": { + "__id__": 38 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 26, + "height": 26 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a5HsVGYrdNr6xSx9JxJqfK" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 36 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "a2cba4c9-ed0a-46c4-9184-362cfd0d878d@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": "dfUI/hZhhFRZFhIB3I+w4C" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "27pQNGPiZG26gLwxeAK3Sv", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 43 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "71cD7hnOZIuLg4nfD+rQIQ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d99BokOXZIpLwIR+Sfms1p", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -295,12 +1103,1023 @@ }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", - "width": 216, - "height": 107 + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e27TI6f25D/Jq8PdgO4Be2" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 48 + }, + "_resizeMode": 0, + "_layoutType": 0, + "_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": "66uSSkvPZGOauxBpMDn4Ci" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "698LfCyohFW42Uw2U8LHAs", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "EnterLayout", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 51 + }, + { + "__id__": 71 + } + ], + "_active": true, + "_components": [ + { + "__id__": 91 + }, + { + "__id__": 93 + }, + { + "__id__": 95 + } + ], + "_prefab": { + "__id__": 97 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -523.122, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "StarGame", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 50 + }, + "_children": [ + { + "__id__": 52 + }, + { + "__id__": 58 + } + ], + "_active": true, + "_components": [ + { + "__id__": 64 + }, + { + "__id__": 66 + }, + { + "__id__": 68 + } + ], + "_prefab": { + "__id__": 70 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -48.5, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 2.942 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "IconStam2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 51 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 53 + }, + { + "__id__": 55 + } + ], + "_prefab": { + "__id__": 57 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -139.947, + "y": 9.761, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.35, + "y": 0.35, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 52 + }, + "_enabled": true, + "__prefab": { + "__id__": 54 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 228, + "height": 309 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "37Tr8ILUlCHISPD3USJzSG" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 52 + }, + "_enabled": true, + "__prefab": { + "__id__": 56 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "d18c3099-87cb-4ee0-9778-b3b27468f7b7@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": "713pPJJVFH1ppry18yzTh2" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "93MCuOkgBKcIbKVZXGFs2e", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 51 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 59 + }, + { + "__id__": 61 + } + ], + "_prefab": { + "__id__": 63 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 51.84, + "y": 8.91, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 58 + }, + "_enabled": true, + "__prefab": { + "__id__": 60 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 250, + "height": 136 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "090bEiOaRHhb2BFj6qtlz9" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 58 + }, + "_enabled": true, + "__prefab": { + "__id__": 62 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "闯关模式", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 100, + "_overflow": 0, + "_enableWrapText": false, + "_font": { + "__uuid__": "fb4acba6-6bc7-4eb3-be34-8f2ac9823a80", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 165, + "g": 112, + "b": 52, + "a": 255 + }, + "_outlineWidth": 5, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8f0IK/uwJMEKmX0y3dlIk3" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c9WpfO3dZLZqSGYZTjjBzX", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 65 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 488, + "height": 197 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ecyXRuWtFMa5tvFcIIyTw5" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 67 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "2270362e-66d7-4d0f-ab51-b5cbca25a768@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": "35NgLucXJO6ZNpSM+3vGcI" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 69 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": { + "__uuid__": "2270362e-66d7-4d0f-ab51-b5cbca25a768@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_pressedSprite": { + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_disabledSprite": { + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 51 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4bd2QEn9FKO6dHoXyJYD9c" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ffcHy29O9MbLMT7Vn1/hrH", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "PkButton", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 50 + }, + "_children": [ + { + "__id__": 72 + }, + { + "__id__": 78 + } + ], + "_active": true, + "_components": [ + { + "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 + } + ], + "_prefab": { + "__id__": 90 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -265.5, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1.583 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "friendChallenge", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 71 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 73 + }, + { + "__id__": 75 + } + ], + "_prefab": { + "__id__": 77 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -135.012, + "y": 9.311, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.15, + "y": 0.15, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 72 + }, + "_enabled": true, + "__prefab": { + "__id__": 74 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 684, + "height": 555 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "85XFKcbHpLx6O6gL6SDOXt" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 72 + }, + "_enabled": true, + "__prefab": { + "__id__": 76 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "12eb7a16-3f31-40d8-a9cd-30e18900a3a3@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": "acGg+ITyhA4ruMX71tIuwH" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "75h7idY/VNOpShLfKMsMsb", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 71 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 79 + }, + { + "__id__": 81 + } + ], + "_prefab": { + "__id__": 83 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 68.282, + "y": 7.759, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 78 + }, + "_enabled": true, + "__prefab": { + "__id__": 80 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 250, + "height": 136 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "49YJhWkT9LS5ESrLUUP2EI" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 78 + }, + "_enabled": true, + "__prefab": { + "__id__": 82 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "好友挑战", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 100, + "_overflow": 0, + "_enableWrapText": true, + "_font": { + "__uuid__": "fb4acba6-6bc7-4eb3-be34-8f2ac9823a80", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 72, + "g": 158, + "b": 35, + "a": 255 + }, + "_outlineWidth": 5, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c1ElNpo2RLA6RMu+jLlSBX" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "97qtoBnHpAe5Z8EkQsCIL2", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 71 + }, + "_enabled": true, + "__prefab": { + "__id__": 85 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 488, + "height": 197 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -319,11 +2138,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 87 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -336,7 +2155,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "010e6809-3636-4c23-8403-1424c771f0f8@f9941", + "__uuid__": "02047ea3-2a13-4f17-b4dd-5aefa0e182dc@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -358,53 +2177,17 @@ "__type__": "cc.CompPrefabInfo", "fileId": "bbY0DIwZZE564mJcuIqyL2" }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 10 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_alignFlags": 4, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 194.77749999999992, - "_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": "daRisiwm1PEKRk63d1ICPO" - }, { "__type__": "cc.Button", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 89 }, "clickEvents": [], "_interactable": true, @@ -463,129 +2246,22 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "PkButton", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 21 - } - ], - "_active": true, - "_components": [ - { - "__id__": 27 - }, - { - "__id__": 29 - }, - { - "__id__": 31 - } - ], - "_prefab": { - "__id__": 33 - }, - "_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": 2.942, - "y": 2.942, - "z": 2.942 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 512, - "__editorExtras__": {}, - "_parent": { - "__id__": 20 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 22 - }, - { - "__id__": 24 - } - ], - "_prefab": { - "__id__": 26 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 40 + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -596,75 +2272,81 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "090bEiOaRHhb2BFj6qtlz9" + "fileId": "447uhUr55NKapzqTDCcL8q" }, { - "__type__": "cc.Label", + "__type__": "cc.Layout", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 94 }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "_resizeMode": 0, + "_layoutType": 2, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 }, - "_string": "好友挑战", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 1, - "_enableWrapText": false, - "_font": null, - "_isSystemFontUsed": true, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": false, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, + "_spacingY": 20, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": true, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8f0IK/uwJMEKmX0y3dlIk3" + "fileId": "3f1WkNVFJGA4+nsg+lNy0f" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 96 + }, + "_alignFlags": 4, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 506.87800000000004, + "_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": "dfJRK/QRRLGJ8RwA/Vg1FE" }, { "__type__": "cc.PrefabInfo", @@ -674,163 +2356,7 @@ "asset": { "__id__": 0 }, - "fileId": "c9WpfO3dZLZqSGYZTjjBzX", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 20 - }, - "_enabled": true, - "__prefab": { - "__id__": 28 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ecyXRuWtFMa5tvFcIIyTw5" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 20 - }, - "_enabled": true, - "__prefab": { - "__id__": 30 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@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": "35NgLucXJO6ZNpSM+3vGcI" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 20 - }, - "_enabled": true, - "__prefab": { - "__id__": 32 - }, - "clickEvents": [], - "_interactable": true, - "_transition": 2, - "_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__": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_duration": 0.1, - "_zoomScale": 1.2, - "_target": { - "__id__": 20 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4bd2QEn9FKO6dHoXyJYD9c" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "ffcHy29O9MbLMT7Vn1/hrH", + "fileId": "9a6DtmuSlGZYXgVGVvzr02", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -845,7 +2371,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -873,7 +2399,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 101 }, "_alignFlags": 45, "_target": null, @@ -909,13 +2435,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 103 }, "startGameBtn": { - "__id__": 10 + "__id__": 51 }, "pkBtn": { - "__id__": 20 + "__id__": 71 + }, + "liveLabel": { + "__id__": 33 }, "_id": "" }, diff --git a/assets/prefabs/PageHome.ts b/assets/prefabs/PageHome.ts index 5480cd7..558c3ca 100644 --- a/assets/prefabs/PageHome.ts +++ b/assets/prefabs/PageHome.ts @@ -1,7 +1,10 @@ -import { _decorator, Node, Button } from 'cc'; +import { _decorator, Node, Button, Label } from 'cc'; import { BaseView } from 'db://assets/scripts/core/BaseView'; import { ViewManager } from 'db://assets/scripts/core/ViewManager'; import { WxSDK, checkPrivacySetting, requirePrivacyAuthorize } from 'db://assets/scripts/utils/WxSDK'; +import { StaminaManager } from 'db://assets/scripts/utils/StaminaManager'; +import { ToastManager } from 'db://assets/scripts/utils/ToastManager'; +import { StaminaInfo } from 'db://assets/scripts/types/ApiTypes'; const { ccclass, property } = _decorator; /** @@ -10,12 +13,19 @@ const { ccclass, property } = _decorator; */ @ccclass('PageHome') export class PageHome extends BaseView { + /** 默认体力上限 */ + private static readonly DEFAULT_STAMINA_MAX = 50; + @property({ type: Node, tooltip: '开始游戏按钮' }) startGameBtn: Node | null = null; @property({ type: Node, tooltip: 'PK按钮' }) pkBtn: Node | null = null; + /** 体力值显示标签 */ + @property(Label) + liveLabel: Label | null = null; + /** * 页面首次加载时调用 */ @@ -85,7 +95,7 @@ export class PageHome extends BaseView { */ private _onPkClick(): void { console.log('[PageHome] PK按钮点击'); - ViewManager.instance.open('PageWriteLevels'); + ToastManager.show('功能正在开发中,敬请期待吧!'); } /** @@ -93,6 +103,25 @@ export class PageHome extends BaseView { */ onViewShow(): void { console.log('[PageHome] onViewShow'); + this.updateStaminaLabel(); + } + + /** + * 获取体力上限 + */ + private _getStaminaMax(stamina: StaminaInfo): number { + return typeof stamina.max === 'number' ? stamina.max : PageHome.DEFAULT_STAMINA_MAX; + } + + /** + * 更新体力值显示 + */ + private updateStaminaLabel(): void { + if (this.liveLabel) { + const stamina = StaminaManager.instance.getStamina(); + const maxStamina = this._getStaminaMax(stamina); + this.liveLabel.string = `${stamina.current}/${maxStamina}`; + } } /** diff --git a/assets/prefabs/PageLevel.ts b/assets/prefabs/PageLevel.ts index 8f019bb..738fd66 100644 --- a/assets/prefabs/PageLevel.ts +++ b/assets/prefabs/PageLevel.ts @@ -301,8 +301,6 @@ export class PageLevel extends BaseView { return; } - // 提示用户消耗体力 - ToastManager.show(`消耗1点体力,剩余 ${enterData.stamina.current}/${this._getStaminaMax(enterData.stamina)}`); // 用 enter 接口返回的数据更新关卡配置(填充答案和线索) LevelDataManager.instance.updateLevelDetails( diff --git a/assets/prefabs/PassModal.prefab b/assets/prefabs/PassModal.prefab index 92d3927..d977424 100644 --- a/assets/prefabs/PassModal.prefab +++ b/assets/prefabs/PassModal.prefab @@ -1376,7 +1376,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 92.5, + "width": 185, "height": 121 }, "_anchorPoint": { @@ -1538,7 +1538,7 @@ }, "_mode": 0, "_totalLength": 925, - "_progress": 0.1, + "_progress": 0.2, "_reverse": false, "_id": "" }, diff --git a/assets/resources/images/pageLevel/BarStam.png b/assets/resources/images/BarStam.png similarity index 100% rename from assets/resources/images/pageLevel/BarStam.png rename to assets/resources/images/BarStam.png diff --git a/assets/resources/images/pageLevel/BarStam.png.meta b/assets/resources/images/BarStam.png.meta similarity index 100% rename from assets/resources/images/pageLevel/BarStam.png.meta rename to assets/resources/images/BarStam.png.meta diff --git a/assets/resources/images/Bg.png b/assets/resources/images/Bg.png deleted file mode 100644 index c3caeb8..0000000 Binary files a/assets/resources/images/Bg.png and /dev/null differ diff --git a/assets/resources/images/Plus.png b/assets/resources/images/Plus.png new file mode 100644 index 0000000..94a9e37 Binary files /dev/null and b/assets/resources/images/Plus.png differ diff --git a/assets/resources/images/Bg.png.meta b/assets/resources/images/Plus.png.meta similarity index 70% rename from assets/resources/images/Bg.png.meta rename to assets/resources/images/Plus.png.meta index 55cab52..42e424b 100644 --- a/assets/resources/images/Bg.png.meta +++ b/assets/resources/images/Plus.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "d532045e-55f8-47c2-9493-b918e18364b0", + "uuid": "a2cba4c9-ed0a-46c4-9184-362cfd0d878d", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "d532045e-55f8-47c2-9493-b918e18364b0@6c48a", - "displayName": "Bg", + "uuid": "a2cba4c9-ed0a-46c4-9184-362cfd0d878d@6c48a", + "displayName": "Plus", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "d532045e-55f8-47c2-9493-b918e18364b0", + "imageUuidOrDatabaseUri": "a2cba4c9-ed0a-46c4-9184-362cfd0d878d", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "d532045e-55f8-47c2-9493-b918e18364b0@f9941", - "displayName": "Bg", + "uuid": "a2cba4c9-ed0a-46c4-9184-362cfd0d878d@f9941", + "displayName": "Plus", "id": "f9941", "name": "spriteFrame", "userData": { @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 750, - "height": 1626, - "rawWidth": 750, - "rawHeight": 1626, + "width": 26, + "height": 26, + "rawWidth": 26, + "rawHeight": 26, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -375, - -813, + -13, + -13, 0, - 375, - -813, + 13, + -13, 0, - -375, - 813, + -13, + 13, 0, - 375, - 813, + 13, + 13, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 1626, - 750, - 1626, + 26, + 26, + 26, 0, 0, - 750, + 26, 0 ], "nuv": [ @@ -102,18 +102,18 @@ 1 ], "minPos": [ - -375, - -813, + -13, + -13, 0 ], "maxPos": [ - 375, - 813, + 13, + 13, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "d532045e-55f8-47c2-9493-b918e18364b0@6c48a", + "imageUuidOrDatabaseUri": "a2cba4c9-ed0a-46c4-9184-362cfd0d878d@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "d532045e-55f8-47c2-9493-b918e18364b0@6c48a" + "redirect": "a2cba4c9-ed0a-46c4-9184-362cfd0d878d@6c48a" } } diff --git a/assets/resources/images/pageHome/HomeButtonGreen.png b/assets/resources/images/pageHome/HomeButtonGreen.png new file mode 100644 index 0000000..6aef2ac Binary files /dev/null and b/assets/resources/images/pageHome/HomeButtonGreen.png differ diff --git a/assets/resources/images/pageHome/startGame.png.meta b/assets/resources/images/pageHome/HomeButtonGreen.png.meta similarity index 70% rename from assets/resources/images/pageHome/startGame.png.meta rename to assets/resources/images/pageHome/HomeButtonGreen.png.meta index ef27e2a..edf72cf 100644 --- a/assets/resources/images/pageHome/startGame.png.meta +++ b/assets/resources/images/pageHome/HomeButtonGreen.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "010e6809-3636-4c23-8403-1424c771f0f8", + "uuid": "02047ea3-2a13-4f17-b4dd-5aefa0e182dc", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "010e6809-3636-4c23-8403-1424c771f0f8@6c48a", - "displayName": "startGame", + "uuid": "02047ea3-2a13-4f17-b4dd-5aefa0e182dc@6c48a", + "displayName": "HomeButtonGreen", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "010e6809-3636-4c23-8403-1424c771f0f8", + "imageUuidOrDatabaseUri": "02047ea3-2a13-4f17-b4dd-5aefa0e182dc", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "010e6809-3636-4c23-8403-1424c771f0f8@f9941", - "displayName": "startGame", + "uuid": "02047ea3-2a13-4f17-b4dd-5aefa0e182dc@f9941", + "displayName": "HomeButtonGreen", "id": "f9941", "name": "spriteFrame", "userData": { @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 216, - "height": 107, - "rawWidth": 216, - "rawHeight": 107, + "width": 488, + "height": 197, + "rawWidth": 488, + "rawHeight": 197, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -108, - -53.5, + -244, + -98.5, 0, - 108, - -53.5, + 244, + -98.5, 0, - -108, - 53.5, + -244, + 98.5, 0, - 108, - 53.5, + 244, + 98.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 107, - 216, - 107, + 197, + 488, + 197, 0, 0, - 216, + 488, 0 ], "nuv": [ @@ -102,18 +102,18 @@ 1 ], "minPos": [ - -108, - -53.5, + -244, + -98.5, 0 ], "maxPos": [ - 108, - 53.5, + 244, + 98.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "010e6809-3636-4c23-8403-1424c771f0f8@6c48a", + "imageUuidOrDatabaseUri": "02047ea3-2a13-4f17-b4dd-5aefa0e182dc@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "010e6809-3636-4c23-8403-1424c771f0f8@6c48a" + "redirect": "02047ea3-2a13-4f17-b4dd-5aefa0e182dc@6c48a" } } diff --git a/assets/resources/images/pageHome/HomeButtonOrange.png b/assets/resources/images/pageHome/HomeButtonOrange.png new file mode 100644 index 0000000..6c71770 Binary files /dev/null and b/assets/resources/images/pageHome/HomeButtonOrange.png differ diff --git a/assets/resources/images/pageLevel/ButtonBg.png.meta b/assets/resources/images/pageHome/HomeButtonOrange.png.meta similarity index 62% rename from assets/resources/images/pageLevel/ButtonBg.png.meta rename to assets/resources/images/pageHome/HomeButtonOrange.png.meta index 039241a..c575674 100644 --- a/assets/resources/images/pageLevel/ButtonBg.png.meta +++ b/assets/resources/images/pageHome/HomeButtonOrange.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26", + "uuid": "2270362e-66d7-4d0f-ab51-b5cbca25a768", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@6c48a", - "displayName": "ButtonBg", + "uuid": "2270362e-66d7-4d0f-ab51-b5cbca25a768@6c48a", + "displayName": "HomeButtonOrange", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26", + "imageUuidOrDatabaseUri": "2270362e-66d7-4d0f-ab51-b5cbca25a768", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,21 +34,21 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@f9941", - "displayName": "ButtonBg", + "uuid": "2270362e-66d7-4d0f-ab51-b5cbca25a768@f9941", + "displayName": "HomeButtonOrange", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, - "trimX": 1, + "offsetY": 0, + "trimX": 0, "trimY": 0, - "width": 306, - "height": 77, - "rawWidth": 308, - "rawHeight": 78, + "width": 488, + "height": 197, + "rawWidth": 488, + "rawHeight": 197, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -153, - -38.5, + -244, + -98.5, 0, - 153, - -38.5, + 244, + -98.5, 0, - -153, - 38.5, + -244, + 98.5, 0, - 153, - 38.5, + 244, + 98.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 1, - 78, - 307, - 78, - 1, - 1, - 307, - 1 + 0, + 197, + 488, + 197, + 0, + 0, + 488, + 0 ], "nuv": [ - 0.003246753246753247, - 0.01282051282051282, - 0.9967532467532467, - 0.01282051282051282, - 0.003246753246753247, + 0, + 0, + 1, + 0, + 0, + 1, 1, - 0.9967532467532467, 1 ], "minPos": [ - -153, - -38.5, + -244, + -98.5, 0 ], "maxPos": [ - 153, - 38.5, + 244, + 98.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@6c48a", + "imageUuidOrDatabaseUri": "2270362e-66d7-4d0f-ab51-b5cbca25a768@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@6c48a" + "redirect": "2270362e-66d7-4d0f-ab51-b5cbca25a768@6c48a" } } diff --git a/assets/resources/images/pageHome/friendChallenge.png b/assets/resources/images/pageHome/friendChallenge.png new file mode 100644 index 0000000..48f5538 Binary files /dev/null and b/assets/resources/images/pageHome/friendChallenge.png differ diff --git a/assets/resources/images/pageHome/friendChallenge.png.meta b/assets/resources/images/pageHome/friendChallenge.png.meta new file mode 100644 index 0000000..1b778b5 --- /dev/null +++ b/assets/resources/images/pageHome/friendChallenge.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "12eb7a16-3f31-40d8-a9cd-30e18900a3a3", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "12eb7a16-3f31-40d8-a9cd-30e18900a3a3@6c48a", + "displayName": "friendChallenge", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "12eb7a16-3f31-40d8-a9cd-30e18900a3a3", + "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": "12eb7a16-3f31-40d8-a9cd-30e18900a3a3@f9941", + "displayName": "friendChallenge", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -8.5, + "trimX": 170, + "trimY": 243, + "width": 684, + "height": 555, + "rawWidth": 1024, + "rawHeight": 1024, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -342, + -277.5, + 0, + 342, + -277.5, + 0, + -342, + 277.5, + 0, + 342, + 277.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 170, + 781, + 854, + 781, + 170, + 226, + 854, + 226 + ], + "nuv": [ + 0.166015625, + 0.220703125, + 0.833984375, + 0.220703125, + 0.166015625, + 0.7626953125, + 0.833984375, + 0.7626953125 + ], + "minPos": [ + -342, + -277.5, + 0 + ], + "maxPos": [ + 342, + 277.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "12eb7a16-3f31-40d8-a9cd-30e18900a3a3@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "12eb7a16-3f31-40d8-a9cd-30e18900a3a3@6c48a" + } +} diff --git a/assets/resources/images/pageHome/startGame.png b/assets/resources/images/pageHome/startGame.png deleted file mode 100644 index cb47767..0000000 Binary files a/assets/resources/images/pageHome/startGame.png and /dev/null differ diff --git a/assets/resources/images/pageLevel/ButtonBg.png b/assets/resources/images/pageLevel/ButtonBg.png deleted file mode 100644 index c4d9ac5..0000000 Binary files a/assets/resources/images/pageLevel/ButtonBg.png and /dev/null differ diff --git a/assets/resources/images/pageLevel/progressBar.png.meta b/assets/resources/images/pageLevel/progressBar.png.meta index 88a44dd..0539773 100644 --- a/assets/resources/images/pageLevel/progressBar.png.meta +++ b/assets/resources/images/pageLevel/progressBar.png.meta @@ -115,7 +115,7 @@ "isUuid": true, "imageUuidOrDatabaseUri": "929dfe4e-9eab-48f1-a87d-344d51f07402@6c48a", "atlasUuid": "", - "trimType": "auto" + "trimType": "none" }, "ver": "1.0.12", "imported": true, diff --git a/assets/resources/images/pageLevel/progressBarBg.png.meta b/assets/resources/images/pageLevel/progressBarBg.png.meta index 1926e25..b107ce5 100644 --- a/assets/resources/images/pageLevel/progressBarBg.png.meta +++ b/assets/resources/images/pageLevel/progressBarBg.png.meta @@ -51,8 +51,8 @@ "rawHeight": 164, "borderTop": 0, "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderLeft": 120, + "borderRight": 120, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/settings/v2/packages/builder.json b/settings/v2/packages/builder.json index 9c1ae80..9ebe585 100644 --- a/settings/v2/packages/builder.json +++ b/settings/v2/packages/builder.json @@ -35,5 +35,10 @@ } } } + }, + "splash-setting": { + "logo": { + "type": "none" + } } } diff --git a/settings/v2/packages/information.json b/settings/v2/packages/information.json index b05147f..2f6d74d 100644 --- a/settings/v2/packages/information.json +++ b/settings/v2/packages/information.json @@ -6,7 +6,7 @@ "label": "customSplash", "enable": true, "customSplash": { - "complete": false, + "complete": true, "form": "https://creator-api.cocos.com/api/form/show?sid=51d0aa399094bb683b7737f0a16a459b" } },