diff --git a/assets/Game/Prefab/BigWin.prefab b/assets/Game/Prefab/BigWin.prefab index d2da53a..5776b9c 100644 --- a/assets/Game/Prefab/BigWin.prefab +++ b/assets/Game/Prefab/BigWin.prefab @@ -452,8 +452,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 552, - "height": 473 + "width": 726, + "height": 333 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -489,7 +489,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d1bb039c-06f7-4fa1-8e22-79d86022512c@f9941", + "__uuid__": "4833c004-dbe4-49ba-a05b-031b2e02cc1b@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -523,7 +523,7 @@ "__prefab": { "__id__": 20 }, - "spriteName": "17", + "spriteName": "Win1", "_id": "" }, { @@ -579,7 +579,7 @@ "node": { "__id__": 13 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 25 }, @@ -772,8 +772,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 705, - "height": 442 + "width": 923, + "height": 333 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -809,7 +809,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b7fceab1-b708-46fe-a694-f56260070a86@f9941", + "__uuid__": "a1dd9a9c-4708-4587-9a86-bc97954ccd56@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -843,7 +843,7 @@ "__prefab": { "__id__": 36 }, - "spriteName": "20", + "spriteName": "Win2", "_id": "" }, { @@ -899,7 +899,7 @@ "node": { "__id__": 29 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 41 }, @@ -1092,8 +1092,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 806, - "height": 408 + "width": 811, + "height": 521 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1129,7 +1129,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "1d28f402-e425-4a15-bb43-e23ea0193b5f@f9941", + "__uuid__": "1beb18b1-ddba-4c4e-9eba-60e89dbc057b@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1163,7 +1163,7 @@ "__prefab": { "__id__": 52 }, - "spriteName": "18", + "spriteName": "Win3", "_id": "" }, { @@ -1219,7 +1219,7 @@ "node": { "__id__": 45 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 57 }, @@ -1394,18 +1394,18 @@ "_string": "1920,222,300.00", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 139, + "_actualFontSize": 109, "_fontSize": 170, "_fontFamily": "Arial", "_lineHeight": 300, "_overflow": 2, "_enableWrapText": true, "_font": { - "__uuid__": "9bec16c5-3466-4622-bbf1-23bf512c7970", + "__uuid__": "440b0efb-6a4a-4c11-9cfb-bf746b908efd", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": -30, + "_spacingX": 0, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -1487,7 +1487,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1564,7 +1564,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Game/Prefab/FeatureBuyPopUp.prefab b/assets/Game/Prefab/FeatureBuyPopUp.prefab index 1a25469..dafc350 100644 --- a/assets/Game/Prefab/FeatureBuyPopUp.prefab +++ b/assets/Game/Prefab/FeatureBuyPopUp.prefab @@ -1876,7 +1876,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Game/Prefab/FreeSpinAgain.prefab b/assets/Game/Prefab/FreeSpinAgain.prefab index 84e7f3c..35d93ca 100644 --- a/assets/Game/Prefab/FreeSpinAgain.prefab +++ b/assets/Game/Prefab/FreeSpinAgain.prefab @@ -411,7 +411,7 @@ "node": { "__id__": 13 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 17 }, @@ -528,8 +528,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 892, - "height": 178 + "width": 591, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -565,7 +565,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b49684e2-0e67-4e98-a708-70f92b698c48@f9941", + "__uuid__": "2765ba70-54ed-4a78-81fe-79589ce4d63b@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -599,7 +599,7 @@ "__prefab": { "__id__": 25 }, - "spriteName": "14", + "spriteName": "FSFS", "_id": "" }, { @@ -683,7 +683,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 394.29, + "width": 403.92, "height": 200 }, "_anchorPoint": { @@ -729,11 +729,11 @@ "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "9bec16c5-3466-4622-bbf1-23bf512c7970", + "__uuid__": "440b0efb-6a4a-4c11-9cfb-bf746b908efd", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": -35, + "_spacingX": 0, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -856,7 +856,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Game/Prefab/FreeSpinEnter.prefab b/assets/Game/Prefab/FreeSpinEnter.prefab index 7cc1bbd..ca43485 100644 --- a/assets/Game/Prefab/FreeSpinEnter.prefab +++ b/assets/Game/Prefab/FreeSpinEnter.prefab @@ -411,7 +411,7 @@ "node": { "__id__": 13 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 17 }, @@ -660,7 +660,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 75, + "y": -223.345, "z": 0 }, "_lrot": { @@ -700,7 +700,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 461.97, + "width": 425.49, "height": 300 }, "_anchorPoint": { @@ -746,11 +746,11 @@ "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "f33ecdbe-f644-4db9-aa12-8c8d98de7514", + "__uuid__": "440b0efb-6a4a-4c11-9cfb-bf746b908efd", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": -40, + "_spacingX": 0, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -825,7 +825,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 628, + "y": 426.791, "z": 0 }, "_lrot": { @@ -865,8 +865,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 890, - "height": 167 + "width": 985, + "height": 322 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -902,7 +902,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "13b5b510-5a88-43a5-8bb0-b88c23312474@f9941", + "__uuid__": "fce6a081-2d88-44fc-8679-c7b10ec97e08@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -983,7 +983,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -230, + "y": 263.804, "z": 0 }, "_lrot": { @@ -1023,8 +1023,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 844, - "height": 112 + "width": 956, + "height": 130 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1060,7 +1060,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "9d4522de-7706-4f40-afe3-307962170a17@f9941", + "__uuid__": "fd18b420-d470-4bb3-b928-2bac9754c850@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1215,7 +1215,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3565031a-b19d-4718-b40d-09e09e39fedb@f9941", + "__uuid__": "b66cb4a9-c294-46a2-8750-eacd091ec465@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1314,7 +1314,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 148.08, + "width": 132.43, "height": 100 }, "_anchorPoint": { @@ -1360,11 +1360,11 @@ "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "95c85113-ef63-450b-9c61-f45a4d55baf5", + "__uuid__": "028037fd-62a9-4b67-a9a4-97d9889ef0b5", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": -15, + "_spacingX": 0, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -1425,7 +1425,7 @@ "__id__": 62 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 70 @@ -1533,8 +1533,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 208, - "height": 67 + "width": 214, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1570,7 +1570,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "75ec0393-b4bf-4110-a29e-896366916ae8@f9941", + "__uuid__": "3f3d067b-5808-44bb-bc3f-b914d1464692@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1638,8 +1638,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 462, - "height": 176 + "width": 569, + "height": 227 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1675,7 +1675,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "4144290b-78d2-4ba0-9f78-8b903c9f6589@f9941", + "__uuid__": "46de9563-d62d-4828-a40b-b7a0afabab65@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, diff --git a/assets/Game/Prefab/Icons/0.prefab b/assets/Game/Prefab/Icons/0.prefab index adef399..b22dc1d 100644 --- a/assets/Game/Prefab/Icons/0.prefab +++ b/assets/Game/Prefab/Icons/0.prefab @@ -22,23 +22,23 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 22 + "__id__": 26 } ], "_active": true, "_components": [ { - "__id__": 32 + "__id__": 36 }, { - "__id__": 34 + "__id__": 38 } ], "_prefab": { - "__id__": 36 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -86,10 +86,13 @@ "_components": [ { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -184,8 +187,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 164 + "width": 190, + "height": 203 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +224,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "86564f14-2141-473e-a30a-95764acd225b@f9941", + "__uuid__": "db494bbb-d5be-4ccc-90df-ca0287d09c0e@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -270,8 +273,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -284,6 +287,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "98NN9wdYtMOqDWwyb+XpUq" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "747964ea-ea17-4327-8452-a0409a291c0c@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": "74jcl4GvxDYLuxQYGitKeT" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -307,17 +355,20 @@ }, "_children": [ { - "__id__": 13 + "__id__": 15 } ], "_active": false, "_components": [ { - "__id__": 19 + "__id__": 21 + }, + { + "__id__": 23 } ], "_prefab": { - "__id__": 21 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", @@ -354,20 +405,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 14 }, "_children": [], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 16 }, { - "__id__": 16 + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -404,16 +455,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", - "width": 172, - "height": 179 + "width": 185, + "height": 218 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -432,11 +483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -449,7 +500,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "11b28e2b-4fbc-4df7-abac-6b3196a0b834@f9941", + "__uuid__": "73decdaa-3b31-46b6-b11b-d88c53c74f79@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -490,16 +541,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -512,6 +563,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "1d3TT5XOZIg63zqZp3fPYe" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "78f944ec-f2e0-4f56-8eff-9a623ce26df3@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": "6f9albqhVGNJhCX0TgbfZH" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -535,17 +631,17 @@ }, "_children": [ { - "__id__": 23 + "__id__": 27 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 31 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -582,20 +678,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 28 }, { - "__id__": 26 + "__id__": 30 } ], "_prefab": { - "__id__": 28 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -632,11 +728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -660,12 +756,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { "__id__": 27 }, + "_enabled": false, + "__prefab": { + "__id__": 31 + }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -718,11 +814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -763,7 +859,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -791,16 +887,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 39 }, "normalNode": { "__id__": 2 }, "fastNode": { - "__id__": 12 + "__id__": 14 }, "spineNode": { - "__id__": 22 + "__id__": 26 }, "_id": "" }, diff --git a/assets/Game/Prefab/Icons/1.prefab b/assets/Game/Prefab/Icons/1.prefab index 9b29b0e..2c3f55f 100644 --- a/assets/Game/Prefab/Icons/1.prefab +++ b/assets/Game/Prefab/Icons/1.prefab @@ -22,23 +22,23 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 22 + "__id__": 26 } ], "_active": true, "_components": [ { - "__id__": 32 + "__id__": 36 }, { - "__id__": 34 + "__id__": 38 } ], "_prefab": { - "__id__": 36 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -86,10 +86,13 @@ "_components": [ { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -184,8 +187,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 132, - "height": 170 + "width": 174, + "height": 153 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +224,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "78c79826-58cb-4f14-b886-52f8b35794b6@f9941", + "__uuid__": "4b16e9a8-7c77-4f25-8326-055da9a79a3b@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -270,8 +273,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -284,6 +287,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "98NN9wdYtMOqDWwyb+XpUq" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "5f660918-50a7-4fb5-8702-ccf40c4dd250@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": "d6wMed7StPCaxq9GdclQ9P" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -307,17 +355,20 @@ }, "_children": [ { - "__id__": 13 + "__id__": 15 } ], "_active": false, "_components": [ { - "__id__": 19 + "__id__": 21 + }, + { + "__id__": 23 } ], "_prefab": { - "__id__": 21 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", @@ -354,20 +405,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 14 }, "_children": [], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 16 }, { - "__id__": 16 + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -404,11 +455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -432,11 +483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -449,7 +500,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "1572cce3-4243-4b00-9ed6-aeeb86a0e9a3@f9941", + "__uuid__": "99c67838-f5e7-414f-ad83-5c6777f44770@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -490,16 +541,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -512,6 +563,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "25I/FEWO5MPIIZdMMJNhaF" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "1ed9ba49-82e5-4a42-95c5-58bd506abab0@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": "86R/1TGvlD9rD41nmQb5oB" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -535,17 +631,17 @@ }, "_children": [ { - "__id__": 23 + "__id__": 27 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 31 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -582,20 +678,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 28 }, { - "__id__": 26 + "__id__": 30 } ], "_prefab": { - "__id__": 28 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -632,11 +728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -660,12 +756,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { "__id__": 27 }, + "_enabled": false, + "__prefab": { + "__id__": 31 + }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -718,11 +814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -763,7 +859,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -791,16 +887,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 39 }, "normalNode": { "__id__": 2 }, "fastNode": { - "__id__": 12 + "__id__": 14 }, "spineNode": { - "__id__": 22 + "__id__": 26 }, "_id": "" }, diff --git a/assets/Game/Prefab/Icons/10.prefab b/assets/Game/Prefab/Icons/10.prefab index ca7870c..88483b2 100644 --- a/assets/Game/Prefab/Icons/10.prefab +++ b/assets/Game/Prefab/Icons/10.prefab @@ -22,23 +22,23 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 22 + "__id__": 26 } ], "_active": true, "_components": [ { - "__id__": 32 + "__id__": 36 }, { - "__id__": 34 + "__id__": 38 } ], "_prefab": { - "__id__": 36 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -86,10 +86,13 @@ "_components": [ { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -184,8 +187,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1080, - "height": 1920 + "width": 148, + "height": 140 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -199,7 +202,7 @@ "fileId": "63OhA3vBpDKbznC3B7Lb53" }, { - "__type__": "sp.Skeleton", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -220,28 +223,28 @@ "b": 255, "a": 255 }, - "_skeletonData": { - "__uuid__": "8ad4927f-0241-492c-b02c-d27cce6be7dd", - "__expectedType__": "sp.SkeletonData" + "_spriteFrame": { + "__uuid__": "41856c4f-db7d-41ef-bd58-cd9c9987baee@f9941", + "__expectedType__": "cc.SpriteFrame" }, - "defaultSkin": "default", - "defaultAnimation": "", - "_premultipliedAlpha": false, - "_timeScale": 1, - "_preCacheMode": 0, - "_cacheMode": 0, - "_sockets": [], - "_useTint": false, - "_debugMesh": false, - "_debugBones": false, - "_debugSlots": false, - "_enableBatch": false, - "loop": false, + "_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": "c5Ad096ytAcZWtCcQcEda2" + "fileId": "b1b16CCFNJIan5BIp0jzAn" }, { "__type__": "cc.PrefabInfo", @@ -270,8 +273,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 194 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -284,6 +287,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "36n0izZe1KUYQwEAHmHt9G" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "e9d0d723-ecd0-4251-97a6-7dd441a04ae6@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": "94Cv/7955E3oPS76B6sre0" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -307,17 +355,20 @@ }, "_children": [ { - "__id__": 13 + "__id__": 15 } ], "_active": false, "_components": [ { - "__id__": 19 + "__id__": 21 + }, + { + "__id__": 23 } ], "_prefab": { - "__id__": 21 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", @@ -354,20 +405,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 14 }, "_children": [], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 16 }, { - "__id__": 16 + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -404,16 +455,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", - "width": 1080, - "height": 1920 + "width": 147, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -427,16 +478,16 @@ "fileId": "eaE9cn1ptBW4SH5UAmDUSS" }, { - "__type__": "sp.Skeleton", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -448,28 +499,28 @@ "b": 255, "a": 255 }, - "_skeletonData": { - "__uuid__": "8ad4927f-0241-492c-b02c-d27cce6be7dd", - "__expectedType__": "sp.SkeletonData" + "_spriteFrame": { + "__uuid__": "20c7b8b7-03c3-46c3-a36e-c6c9e6ae413b@f9941", + "__expectedType__": "cc.SpriteFrame" }, - "defaultSkin": "default", - "defaultAnimation": "", - "_premultipliedAlpha": false, - "_timeScale": 1, - "_preCacheMode": 0, - "_cacheMode": 0, - "_sockets": [], - "_useTint": false, - "_debugMesh": false, - "_debugBones": false, - "_debugSlots": false, - "_enableBatch": false, - "loop": false, + "_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": "4eLnY1ZVhBjqsygR779pMW" + "fileId": "52Oez5HaFNdrtl5KL/RvFH" }, { "__type__": "cc.PrefabInfo", @@ -490,16 +541,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 214 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -512,6 +563,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "e8oLnK9opHyoQ6XK65fve6" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "4e0e135a-de20-41a0-ab6e-c6dc7384d982@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": "b6T/TFnsNIia9OYECFS8vS" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -535,17 +631,17 @@ }, "_children": [ { - "__id__": 23 + "__id__": 27 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 31 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -582,20 +678,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 28 }, { - "__id__": 26 + "__id__": 30 } ], "_prefab": { - "__id__": 28 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -632,11 +728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -660,12 +756,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { "__id__": 27 }, + "_enabled": false, + "__prefab": { + "__id__": 31 + }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -718,11 +814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -763,7 +859,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -791,16 +887,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 39 }, "normalNode": { "__id__": 2 }, "fastNode": { - "__id__": 12 + "__id__": 14 }, "spineNode": { - "__id__": 22 + "__id__": 26 }, "_id": "" }, diff --git a/assets/Game/Prefab/Icons/2.prefab b/assets/Game/Prefab/Icons/2.prefab index 6ea1b69..313c085 100644 --- a/assets/Game/Prefab/Icons/2.prefab +++ b/assets/Game/Prefab/Icons/2.prefab @@ -22,23 +22,23 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 22 + "__id__": 26 } ], "_active": true, "_components": [ { - "__id__": 32 + "__id__": 36 }, { - "__id__": 34 + "__id__": 38 } ], "_prefab": { - "__id__": 36 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -86,10 +86,13 @@ "_components": [ { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -184,8 +187,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 140, - "height": 146 + "width": 171, + "height": 153 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +224,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "9637eb41-fd3a-41cf-a8a7-d4c69c117e92@f9941", + "__uuid__": "d75c5679-5ca1-4028-938a-b2e7d952050b@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -270,8 +273,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -284,6 +287,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "bbIdNvNXRMkLUNiF2WVbZB" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "36e61961-bced-4336-b51d-9d673ff17e8e@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": "a8zqLzW4ZCV4k0dgp+ZZ59" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -307,17 +355,20 @@ }, "_children": [ { - "__id__": 13 + "__id__": 15 } ], "_active": false, "_components": [ { - "__id__": 19 + "__id__": 21 + }, + { + "__id__": 23 } ], "_prefab": { - "__id__": 21 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", @@ -354,20 +405,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 14 }, "_children": [], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 16 }, { - "__id__": 16 + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -404,16 +455,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", - "width": 138, - "height": 164 + "width": 161, + "height": 156 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -432,11 +483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -449,7 +500,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ac2556dc-83d2-4f49-a82f-8196d2cf9f49@f9941", + "__uuid__": "f1507487-3dda-4b01-859d-33289f71c826@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -490,16 +541,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -512,6 +563,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "d5VK3IHuhNUpGK1LcwUv++" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "8e9ecf99-fe8f-43fc-90ef-f2cf1375f81e@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": "e0CLJUxWVNZ4o80k6QmBmw" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -535,17 +631,17 @@ }, "_children": [ { - "__id__": 23 + "__id__": 27 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 31 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -582,20 +678,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 28 }, { - "__id__": 26 + "__id__": 30 } ], "_prefab": { - "__id__": 28 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -632,11 +728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -660,12 +756,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { "__id__": 27 }, + "_enabled": false, + "__prefab": { + "__id__": 31 + }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -718,11 +814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -763,7 +859,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -791,16 +887,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 39 }, "normalNode": { "__id__": 2 }, "fastNode": { - "__id__": 12 + "__id__": 14 }, "spineNode": { - "__id__": 22 + "__id__": 26 }, "_id": "" }, diff --git a/assets/Game/Prefab/Icons/3.prefab b/assets/Game/Prefab/Icons/3.prefab index 422d1b3..97b55f3 100644 --- a/assets/Game/Prefab/Icons/3.prefab +++ b/assets/Game/Prefab/Icons/3.prefab @@ -22,23 +22,23 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 22 + "__id__": 26 } ], "_active": true, "_components": [ { - "__id__": 32 + "__id__": 36 }, { - "__id__": 34 + "__id__": 38 } ], "_prefab": { - "__id__": 36 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -86,10 +86,13 @@ "_components": [ { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -184,8 +187,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 145, - "height": 144 + "width": 169, + "height": 142 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +224,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "88ce72d3-76c8-4667-991f-bfb38afee26c@f9941", + "__uuid__": "9a0155f4-a16a-4b71-8afd-afb9f9e0152f@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -252,8 +255,6 @@ "__id__": 0 }, "fileId": "f1iSEyLv1PrbtFeiuJKKlA", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -270,8 +271,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -284,6 +285,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "84WPnmw61NXrchR8n/yKHV" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "3488a20a-9102-4f25-8b6b-f887a032456f@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": "1eWz9hnpJD17jLQTTz6YyO" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -307,17 +353,20 @@ }, "_children": [ { - "__id__": 13 + "__id__": 15 } ], "_active": false, "_components": [ { - "__id__": 19 + "__id__": 21 + }, + { + "__id__": 23 } ], "_prefab": { - "__id__": 21 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", @@ -354,20 +403,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 14 }, "_children": [], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 16 }, { - "__id__": 16 + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -404,16 +453,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", - "width": 138, - "height": 164 + "width": 168, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -432,11 +481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -449,7 +498,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ac2556dc-83d2-4f49-a82f-8196d2cf9f49@f9941", + "__uuid__": "a1459334-b6df-4fac-a852-83b2709b2ded@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -480,8 +529,6 @@ "__id__": 0 }, "fileId": "58NpX4CXRKopv6z2y55UqH", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -490,16 +537,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -512,6 +559,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "05THPbdQZI+pnE7iEDMNJK" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "67e8a615-9b02-44a2-bcbb-ff97329b9922@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": "ferzmf+qJHZ7UU+ykc5foP" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -535,17 +627,17 @@ }, "_children": [ { - "__id__": 23 + "__id__": 27 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 31 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -582,20 +674,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 28 }, { - "__id__": 26 + "__id__": 30 } ], "_prefab": { - "__id__": 28 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -632,11 +724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -660,12 +752,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { "__id__": 27 }, + "_enabled": false, + "__prefab": { + "__id__": 31 + }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -708,8 +800,6 @@ "__id__": 0 }, "fileId": "65eqkvwJxGKLqtRDMxECzA", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -718,11 +808,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -763,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -791,16 +881,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 39 }, "normalNode": { "__id__": 2 }, "fastNode": { - "__id__": 12 + "__id__": 14 }, "spineNode": { - "__id__": 22 + "__id__": 26 }, "_id": "" }, diff --git a/assets/Game/Prefab/Icons/4.prefab b/assets/Game/Prefab/Icons/4.prefab index 8d9ffcb..86704a4 100644 --- a/assets/Game/Prefab/Icons/4.prefab +++ b/assets/Game/Prefab/Icons/4.prefab @@ -22,23 +22,23 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 22 + "__id__": 26 } ], "_active": true, "_components": [ { - "__id__": 32 + "__id__": 36 }, { - "__id__": 34 + "__id__": 38 } ], "_prefab": { - "__id__": 36 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -86,14 +86,17 @@ "_components": [ { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -20, "y": 0, "z": 0 }, @@ -184,8 +187,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 145, - "height": 138 + "width": 107, + "height": 118 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +224,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "c2c2b989-00c4-491e-b1b0-c5ecbaa6a436@f9941", + "__uuid__": "622e8176-cfbf-4d68-be76-3af63e8aa5cf@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -270,8 +273,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -284,6 +287,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8cCoS8nwZB2avgphT+qtho" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f18f8f31-7d1a-4f47-a177-cbf2a8820a29@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": "fbR4J2KVFNw4Yg9kPX9BrY" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -307,21 +355,24 @@ }, "_children": [ { - "__id__": 13 + "__id__": 15 } ], "_active": false, "_components": [ { - "__id__": 19 + "__id__": 21 + }, + { + "__id__": 23 } ], "_prefab": { - "__id__": 21 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -20, "y": 0, "z": 0 }, @@ -354,20 +405,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 14 }, "_children": [], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 16 }, { - "__id__": 16 + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -404,16 +455,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", - "width": 144, - "height": 156 + "width": 107, + "height": 138 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -432,11 +483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -449,7 +500,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d9b57f71-caec-4e2e-804d-3fbb0226fb3f@f9941", + "__uuid__": "851a229f-f1c8-4aff-b3eb-fad270355844@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -490,16 +541,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -512,6 +563,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "adsu9hL4BLjZijN2umHAHC" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "69b5e1cf-9d5d-464e-beb8-7e2d0e384b51@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": "590HJzsGlMKYVAnOkozJlb" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -535,17 +631,17 @@ }, "_children": [ { - "__id__": 23 + "__id__": 27 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 31 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -582,20 +678,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 28 }, { - "__id__": 26 + "__id__": 30 } ], "_prefab": { - "__id__": 28 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -632,11 +728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -660,12 +756,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { "__id__": 27 }, + "_enabled": false, + "__prefab": { + "__id__": 31 + }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -718,11 +814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -763,7 +859,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -791,16 +887,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 39 }, "normalNode": { "__id__": 2 }, "fastNode": { - "__id__": 12 + "__id__": 14 }, "spineNode": { - "__id__": 22 + "__id__": 26 }, "_id": "" }, diff --git a/assets/Game/Prefab/Icons/5.prefab b/assets/Game/Prefab/Icons/5.prefab index 00dd97e..c872e5c 100644 --- a/assets/Game/Prefab/Icons/5.prefab +++ b/assets/Game/Prefab/Icons/5.prefab @@ -22,23 +22,23 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 22 + "__id__": 26 } ], "_active": true, "_components": [ { - "__id__": 32 + "__id__": 36 }, { - "__id__": 34 + "__id__": 38 } ], "_prefab": { - "__id__": 36 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -86,10 +86,13 @@ "_components": [ { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -184,8 +187,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 149, - "height": 149 + "width": 126, + "height": 124 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +224,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "0db27033-aac1-4b55-a19f-c9e9ef28b548@f9941", + "__uuid__": "0c5abf78-eab3-4840-8fa0-3cd9678a11ed@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -270,8 +273,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -284,6 +287,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "7eawxbv9BMv7eh8PqOWGaL" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "a927789e-07b4-4faf-99c4-8e700e989cdc@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": "6dg4PNaD5BRa2teun4SEnI" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -307,17 +355,20 @@ }, "_children": [ { - "__id__": 13 + "__id__": 15 } ], "_active": false, "_components": [ { - "__id__": 19 + "__id__": 21 + }, + { + "__id__": 23 } ], "_prefab": { - "__id__": 21 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", @@ -354,20 +405,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 14 }, "_children": [], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 16 }, { - "__id__": 16 + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -404,16 +455,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", - "width": 149, - "height": 167 + "width": 125, + "height": 142 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -432,11 +483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -449,7 +500,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "9d44a0a8-70d1-4582-b5ee-19aa9a9727be@f9941", + "__uuid__": "68a461b9-3f30-4a68-80a7-4b804881372a@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -490,16 +541,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", - "width": 176, - "height": 178 + "width": 174, + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -512,6 +563,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "f2QXVEx9dLK5wLMjZiG1Dg" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "57829fd2-91a7-4186-825e-36553da1a623@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": "56CWQBOWVEMprvkZwPFBAg" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -535,17 +631,17 @@ }, "_children": [ { - "__id__": 23 + "__id__": 27 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 31 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -582,20 +678,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 28 }, { - "__id__": 26 + "__id__": 30 } ], "_prefab": { - "__id__": 28 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -632,11 +728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -660,12 +756,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { "__id__": 27 }, + "_enabled": false, + "__prefab": { + "__id__": 31 + }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -718,11 +814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -763,7 +859,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -791,16 +887,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 39 }, "normalNode": { "__id__": 2 }, "fastNode": { - "__id__": 12 + "__id__": 14 }, "spineNode": { - "__id__": 22 + "__id__": 26 }, "_id": "" }, diff --git a/assets/Game/Prefab/Icons/6.prefab b/assets/Game/Prefab/Icons/6.prefab index 05111b9..a0a349e 100644 --- a/assets/Game/Prefab/Icons/6.prefab +++ b/assets/Game/Prefab/Icons/6.prefab @@ -184,8 +184,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 137, - "height": 130 + "width": 113, + "height": 132 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +221,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "e75d96d5-64a4-4894-a143-31d2be080bdd@f9941", + "__uuid__": "efccbee0-20f0-4bb3-8be8-ee38c4814d83@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -412,8 +412,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 137, - "height": 148 + "width": 112, + "height": 151 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -449,7 +449,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "4f8e1a1e-5645-40aa-b1f2-11b6f26148dd@f9941", + "__uuid__": "93b20499-4365-45a5-90aa-d0f7f688be2e@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -662,7 +662,7 @@ "node": { "__id__": 23 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 27 }, diff --git a/assets/Game/Prefab/Icons/7.prefab b/assets/Game/Prefab/Icons/7.prefab index a8461cb..bc19a2d 100644 --- a/assets/Game/Prefab/Icons/7.prefab +++ b/assets/Game/Prefab/Icons/7.prefab @@ -184,8 +184,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 140, - "height": 138 + "width": 138, + "height": 133 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +221,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "eef144cd-e67b-4414-a1ff-66ac339c12c4@f9941", + "__uuid__": "2485f486-d8aa-474d-b5dd-3718d904c84a@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -413,7 +413,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 138, - "height": 155 + "height": 151 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -449,7 +449,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "33a40300-9819-410e-9082-f9782606f62d@f9941", + "__uuid__": "248a17bf-4d25-4641-ba20-aba313175245@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -662,7 +662,7 @@ "node": { "__id__": 23 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 27 }, diff --git a/assets/Game/Prefab/Icons/8.prefab b/assets/Game/Prefab/Icons/8.prefab index 016b3e2..7ce85f8 100644 --- a/assets/Game/Prefab/Icons/8.prefab +++ b/assets/Game/Prefab/Icons/8.prefab @@ -184,8 +184,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 153, - "height": 132 + "width": 138, + "height": 133 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +221,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3eeb71a9-598c-44d6-b865-8984ab986f13@f9941", + "__uuid__": "e5db4329-438f-4995-a0c4-cc66ccfac66f@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -412,8 +412,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 151, - "height": 149 + "width": 138, + "height": 150 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -449,7 +449,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "40bdcfa1-9c15-4f75-a914-64cedf3ce2fc@f9941", + "__uuid__": "6f761a26-1db6-4512-9cf9-a6bf865668fd@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -662,7 +662,7 @@ "node": { "__id__": 23 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 27 }, diff --git a/assets/Game/Prefab/Icons/9.prefab b/assets/Game/Prefab/Icons/9.prefab index 48c28c6..9fe34dc 100644 --- a/assets/Game/Prefab/Icons/9.prefab +++ b/assets/Game/Prefab/Icons/9.prefab @@ -184,8 +184,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 146, - "height": 137 + "width": 135, + "height": 134 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -221,7 +221,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ae29128a-6a38-45bf-b575-4f0d1f6b53f3@f9941", + "__uuid__": "99254b5a-6a18-40f8-8961-38925b7fd721@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -412,8 +412,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 144, - "height": 155 + "width": 135, + "height": 151 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -449,7 +449,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "578a67cc-aaa9-4b51-bc22-1185b4f85832@f9941", + "__uuid__": "3123530f-7434-4e6e-8bfb-a4bfed754256@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -662,7 +662,7 @@ "node": { "__id__": 23 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 27 }, diff --git a/assets/Game/Prefab/Others/IconMsg.prefab b/assets/Game/Prefab/Others/IconMsg.prefab index 063bb37..aa5e186 100644 --- a/assets/Game/Prefab/Others/IconMsg.prefab +++ b/assets/Game/Prefab/Others/IconMsg.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 240 + "__id__": 230 }, { - "__id__": 242 + "__id__": 232 }, { - "__id__": 244 + "__id__": 234 } ], "_prefab": { - "__id__": 246 + "__id__": 236 }, "_lpos": { "__type__": "cc.Vec3", @@ -278,17 +278,17 @@ "__id__": 13 }, { - "__id__": 125 + "__id__": 121 } ], "_active": true, "_components": [ { - "__id__": 237 + "__id__": 227 } ], "_prefab": { - "__id__": 239 + "__id__": 229 }, "_lpos": { "__type__": "cc.Vec3", @@ -335,23 +335,20 @@ "__id__": 24 }, { - "__id__": 36 + "__id__": 38 }, { - "__id__": 106 - }, - { - "__id__": 114 + "__id__": 110 } ], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 118 } ], "_prefab": { - "__id__": 124 + "__id__": 120 }, "_lpos": { "__type__": "cc.Vec3", @@ -456,7 +453,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 106, + "x": 135, "y": 0, "z": 0 }, @@ -497,8 +494,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 492, - "height": 242 + "width": 480, + "height": 229 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -534,10 +531,10 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "1d67af9f-c6de-4e87-a379-2cb3ddbc4607@f9941", + "__uuid__": "87287064-98e8-453c-9944-042618e39249@f9941", "__expectedType__": "cc.SpriteFrame" }, - "_type": 1, + "_type": 0, "_fillType": 0, "_sizeMode": 1, "_fillCenter": { @@ -626,11 +623,11 @@ "_active": true, "_components": [ { - "__id__": 33 + "__id__": 35 } ], "_prefab": { - "__id__": 35 + "__id__": 37 }, "_lpos": { "__type__": "cc.Vec3", @@ -707,6 +704,9 @@ }, { "__id__": 32 + }, + { + "__id__": 33 } ], "removedComponents": [] @@ -773,6 +773,22 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 34 + }, + "propertyPath": [ + "_type" + ], + "value": 0 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbR4J2KVFNw4Yg9kPX9BrY" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -783,7 +799,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 36 }, "_contentSize": { "__type__": "cc.Size", @@ -824,33 +840,30 @@ }, "_children": [ { - "__id__": 37 + "__id__": 39 }, { - "__id__": 53 + "__id__": 61 }, { - "__id__": 69 - }, - { - "__id__": 85 + "__id__": 83 } ], "_active": true, "_components": [ { - "__id__": 101 + "__id__": 105 }, { - "__id__": 103 + "__id__": 107 } ], "_prefab": { - "__id__": 105 + "__id__": 109 }, "_lpos": { "__type__": "cc.Vec3", - "x": 200, + "x": 180, "y": 0, "z": 0 }, @@ -883,29 +896,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 36 + "__id__": 38 }, "_children": [ { - "__id__": 38 + "__id__": 40 }, { - "__id__": 44 + "__id__": 46 + }, + { + "__id__": 52 } ], "_active": true, "_components": [ { - "__id__": 50 + "__id__": 58 } ], "_prefab": { - "__id__": 52 + "__id__": 60 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 82.5, + "y": 50, "z": 0 }, "_lrot": { @@ -933,24 +949,24 @@ }, { "__type__": "cc.Node", - "_name": "num", + "_name": "num1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 37 + "__id__": 39 }, "_children": [], "_active": true, "_components": [ { - "__id__": 39 + "__id__": 41 }, { - "__id__": 41 + "__id__": 43 } ], "_prefab": { - "__id__": 43 + "__id__": 45 }, "_lpos": { "__type__": "cc.Vec3", @@ -987,15 +1003,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 36, "height": 40 }, "_anchorPoint": { @@ -1015,11 +1031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 44 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1034,14 +1050,14 @@ "_string": "20", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 27, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "3e638f84-054c-4c7e-af7a-e3ad5f860ecf", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, @@ -1095,28 +1111,28 @@ }, { "__type__": "cc.Node", - "_name": "multi", + "_name": "num2", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 37 + "__id__": 39 }, "_children": [], "_active": true, "_components": [ { - "__id__": 45 + "__id__": 47 }, { - "__id__": 47 + "__id__": 49 } ], "_prefab": { - "__id__": 49 + "__id__": 51 }, "_lpos": { "__type__": "cc.Vec3", - "x": 35, + "x": 1.138, "y": 0, "z": 0 }, @@ -1149,15 +1165,177 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 46 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 36, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7eu9bg+llEn576YK4Q8FYm" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 46 + }, + "_enabled": true, + "__prefab": { + "__id__": 50 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "20", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 27, + "_fontSize": 27, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": false, + "_font": { + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": -5, + "_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, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "75aBe8rlREEagj7w0VrYhl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "98voDkJuNBqaCtN1RSG/8O", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "multi", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 39 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 53 + }, + { + "__id__": 55 + } + ], + "_prefab": { + "__id__": 57 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 109.506, + "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__": 52 + }, + "_enabled": true, + "__prefab": { + "__id__": 54 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 88.33, "height": 40 }, "_anchorPoint": { @@ -1177,11 +1355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 56 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1193,21 +1371,21 @@ "b": 255, "a": 255 }, - "_string": "20", + "_string": "750.00", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 23, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": false, "_font": { - "__uuid__": "eaa01bf4-09a6-4853-a117-149c5157f96c", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": -5, + "_spacingX": 0, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -1261,16 +1439,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 59 }, "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 55 + "height": 50 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1302,29 +1480,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 36 + "__id__": 38 }, "_children": [ { - "__id__": 54 + "__id__": 62 }, { - "__id__": 60 + "__id__": 68 + }, + { + "__id__": 74 } ], "_active": true, "_components": [ { - "__id__": 66 + "__id__": 80 } ], "_prefab": { - "__id__": 68 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 27.5, + "y": 0, "z": 0 }, "_lrot": { @@ -1352,24 +1533,24 @@ }, { "__type__": "cc.Node", - "_name": "num", + "_name": "num1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 53 + "__id__": 61 }, "_children": [], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 63 }, { - "__id__": 57 + "__id__": 65 } ], "_prefab": { - "__id__": 59 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -1406,15 +1587,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 64 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 36, "height": 40 }, "_anchorPoint": { @@ -1426,7 +1607,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "07dIBi7EJLbZcmxhXQKEqm" + "fileId": "4ebirb8w5Ijo/6+JsJnmQb" }, { "__type__": "cc.Label", @@ -1434,11 +1615,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 66 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1453,14 +1634,14 @@ "_string": "20", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 27, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "3e638f84-054c-4c7e-af7a-e3ad5f860ecf", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, @@ -1497,7 +1678,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03/5VOdlhCMoDPsEEw8kLq" + "fileId": "52jZXAu9lElZ8NVoSyWkK4" }, { "__type__": "cc.PrefabInfo", @@ -1507,35 +1688,35 @@ "asset": { "__id__": 0 }, - "fileId": "e5JKZlbYdJNKC9C6f5LYra", + "fileId": "6ba0bfdCdISKIC40B2QLLO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "multi", + "_name": "num2", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 53 + "__id__": 61 }, "_children": [], "_active": true, "_components": [ { - "__id__": 61 + "__id__": 69 }, { - "__id__": 63 + "__id__": 71 } ], "_prefab": { - "__id__": 65 + "__id__": 73 }, "_lpos": { "__type__": "cc.Vec3", - "x": 35, + "x": 1.138, "y": 0, "z": 0 }, @@ -1568,15 +1749,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 70 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 36, "height": 40 }, "_anchorPoint": { @@ -1588,7 +1769,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "10/ol//+ZJJ4edo5muYvxY" + "fileId": "e9v2xDRGNAaIue4HCGD/Jr" }, { "__type__": "cc.Label", @@ -1596,11 +1777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 72 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1615,14 +1796,14 @@ "_string": "20", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 27, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "eaa01bf4-09a6-4853-a117-149c5157f96c", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, @@ -1659,7 +1840,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "62mXg8BQdKYaaTvH+7Hpxm" + "fileId": "b5CDH4BlRF66T6+wq4qbKV" }, { "__type__": "cc.PrefabInfo", @@ -1669,27 +1850,77 @@ "asset": { "__id__": 0 }, - "fileId": "cfHou7Bz1MnZ2k+3nrUJ17", + "fileId": "d3/Km3SmJM26Db7qk9Y7KE", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "multi", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 61 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 75 + }, + { + "__id__": 77 + } + ], + "_prefab": { + "__id__": 79 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 109.506, + "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__": 53 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 76 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 55 + "width": 88.33, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1700,7 +1931,78 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e43OtWR+FKeY/5SkJSk0VQ" + "fileId": "95R4w/97JNsasepSypaI00" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 74 + }, + "_enabled": true, + "__prefab": { + "__id__": 78 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "750.00", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 23, + "_fontSize": 27, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 2, + "_enableWrapText": false, + "_font": { + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_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, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e7vVayOcJCpLuHMtE1k7sn" }, { "__type__": "cc.PrefabInfo", @@ -1710,7 +2012,48 @@ "asset": { "__id__": 0 }, - "fileId": "e5gEEYmM5FjJnasDVNlBpA", + "fileId": "5132GMVgBIdqpvl0xAL4d3", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 61 + }, + "_enabled": true, + "__prefab": { + "__id__": 81 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0a69MbgWBCM7evhkwIlZKR" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4ff2rtmVpOBK9FZzuxM5fH", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1721,29 +2064,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 36 + "__id__": 38 }, "_children": [ { - "__id__": 70 + "__id__": 84 }, { - "__id__": 76 + "__id__": 90 + }, + { + "__id__": 96 } ], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 102 } ], "_prefab": { - "__id__": 84 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -27.5, + "y": -50, "z": 0 }, "_lrot": { @@ -1771,443 +2117,24 @@ }, { "__type__": "cc.Node", - "_name": "num", + "_name": "num1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 69 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 71 - }, - { - "__id__": 73 - } - ], - "_prefab": { - "__id__": 75 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -45, - "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__": 70 - }, - "_enabled": true, - "__prefab": { - "__id__": 72 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 53.18, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "46VTOntzJFH4o/ss/aepIN" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": { - "__id__": 74 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "20", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": false, - "_font": { - "__uuid__": "3e638f84-054c-4c7e-af7a-e3ad5f860ecf", - "__expectedType__": "cc.BitmapFont" - }, - "_isSystemFontUsed": false, - "_spacingX": -5, - "_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, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "39BQpjAzxKw4oRo5cuxUdc" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "4bQdn4CEpDEbtvODrbdsOg", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "multi", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 69 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 77 - }, - { - "__id__": 79 - } - ], - "_prefab": { - "__id__": 81 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 35, - "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__": 76 - }, - "_enabled": true, - "__prefab": { - "__id__": 78 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 53.18, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ba+OPlpw1JsZjfN9CxaY4n" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": { - "__id__": 80 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "20", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": false, - "_font": { - "__uuid__": "eaa01bf4-09a6-4853-a117-149c5157f96c", - "__expectedType__": "cc.BitmapFont" - }, - "_isSystemFontUsed": false, - "_spacingX": -5, - "_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, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "29C6kpoudOyYEL3syXSbw6" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "637osQs0xLgKO3V5nh4Qk+", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 69 - }, - "_enabled": true, - "__prefab": { "__id__": 83 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 55 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8adMg2TAVPuK68t25Z3vLJ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "52JHBlmjhLEKpaAhttTOOo", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "3", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 36 - }, - "_children": [ - { - "__id__": 86 - }, - { - "__id__": 92 - } - ], - "_active": true, - "_components": [ - { - "__id__": 98 - } - ], - "_prefab": { - "__id__": 100 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -82.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 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "num", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 85 - }, "_children": [], "_active": true, "_components": [ { - "__id__": 87 + "__id__": 85 }, { - "__id__": 89 + "__id__": 87 } ], "_prefab": { - "__id__": 91 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", @@ -2244,40 +2171,40 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { + "__id__": 84 + }, + "_enabled": true, + "__prefab": { "__id__": 86 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 36, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d24eEi9mZGzq2PMHX64Xpm" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 84 + }, "_enabled": true, "__prefab": { "__id__": 88 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 53.18, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "17qL6o1u1IPK1985UfybG3" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 86 - }, - "_enabled": true, - "__prefab": { - "__id__": 90 - }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -2291,14 +2218,14 @@ "_string": "20", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 27, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "3e638f84-054c-4c7e-af7a-e3ad5f860ecf", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, @@ -2335,7 +2262,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "29Ff0+AThA/4lar4h8rsKX" + "fileId": "60A9hqOG1HeLbGvr1bSWwA" }, { "__type__": "cc.PrefabInfo", @@ -2345,35 +2272,35 @@ "asset": { "__id__": 0 }, - "fileId": "d6cy78HfxOR7BCxOjni+j6", + "fileId": "6dUMpLzg1P540fycb/6Y6/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "multi", + "_name": "num2", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 85 + "__id__": 83 }, "_children": [], "_active": true, "_components": [ { - "__id__": 93 + "__id__": 91 }, { - "__id__": 95 + "__id__": 93 } ], "_prefab": { - "__id__": 97 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", - "x": 35, + "x": 1.138, "y": 0, "z": 0 }, @@ -2406,15 +2333,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 36, "height": 40 }, "_anchorPoint": { @@ -2426,7 +2353,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b04Soj5bVLK53XHlKuyG/7" + "fileId": "f93ULycA5LXaaDmKGTjG2H" }, { "__type__": "cc.Label", @@ -2434,11 +2361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 94 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2453,14 +2380,14 @@ "_string": "20", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 27, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "eaa01bf4-09a6-4853-a117-149c5157f96c", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, @@ -2497,7 +2424,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "771nqh5P1Es6os8aQq4rSl" + "fileId": "04rwBIVvBGe6NveeoKv6GL" }, { "__type__": "cc.PrefabInfo", @@ -2507,27 +2434,77 @@ "asset": { "__id__": 0 }, - "fileId": "betA0XZY5AppYdUvcnbnMz", + "fileId": "84plRI6jRIfrU0pUz9qM72", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "multi", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 83 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 97 + }, + { + "__id__": 99 + } + ], + "_prefab": { + "__id__": 101 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 109.506, + "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__": 85 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 55 + "width": 88.33, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2538,7 +2515,78 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fcYaC8xwdOSIdv6MabZ2LO" + "fileId": "266m+XXg5NJ6knRPgt4+0R" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 96 + }, + "_enabled": true, + "__prefab": { + "__id__": 100 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "750.00", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 23, + "_fontSize": 27, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 2, + "_enableWrapText": false, + "_font": { + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_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, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bJVLfrGlBqqrRiFtDPmhe" }, { "__type__": "cc.PrefabInfo", @@ -2548,7 +2596,7 @@ "asset": { "__id__": 0 }, - "fileId": "f7/ZXFgMBDsb+SCgPz5FK4", + "fileId": "d8gYPenU5K2qcoDcxEMXRe", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2559,16 +2607,57 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 103 }, "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 220 + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ce4He0w+FCMYq2drcDG7rk" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "353gwAaMhJgYJGAFRUJl6F", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 38 + }, + "_enabled": true, + "__prefab": { + "__id__": 106 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 150 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2587,11 +2676,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 38 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 108 }, "_resizeMode": 1, "_layoutType": 2, @@ -2632,164 +2721,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "wild", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 13 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 107 - }, - { - "__id__": 109 - }, - { - "__id__": 111 - } - ], - "_prefab": { - "__id__": 113 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 200, - "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__": 106 - }, - "_enabled": true, - "__prefab": { - "__id__": 108 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 193, - "height": 170 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "58OCxhXiFDErgGrBtvyWdb" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 106 - }, - "_enabled": true, - "__prefab": { - "__id__": 110 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "dd3ca1ef-845e-452d-a6e5-30680cfb64d5@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": "abnchpSABKg67SEgcNNg3z" - }, - { - "__type__": "e6c8d4szahIuLbtf6yx+hH6", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 106 - }, - "_enabled": true, - "__prefab": { - "__id__": 112 - }, - "spriteName": "wild", - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "43G4m7+ihPZpbuIPvMztbS" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "61OlyegnVD4ZU4s2hjhol4", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "scatter", @@ -2801,18 +2732,18 @@ "_children": [], "_active": false, "_components": [ + { + "__id__": 111 + }, + { + "__id__": 113 + }, { "__id__": 115 - }, - { - "__id__": 117 - }, - { - "__id__": 119 } ], "_prefab": { - "__id__": 121 + "__id__": 117 }, "_lpos": { "__type__": "cc.Vec3", @@ -2849,16 +2780,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 112 }, "_contentSize": { "__type__": "cc.Size", - "width": 179, - "height": 146 + "width": 251, + "height": 92 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2877,11 +2808,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 114 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2894,7 +2825,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "92010390-f429-4274-a33b-d236e53c1288@f9941", + "__uuid__": "8bb453f6-c0f7-46d6-934f-212b7742560c@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -2922,13 +2853,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 116 }, - "spriteName": "Scatter", + "spriteName": "zxksctter", "_id": "" }, { @@ -2958,7 +2889,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -2999,29 +2930,26 @@ }, "_children": [ { - "__id__": 126 + "__id__": 122 }, { - "__id__": 136 + "__id__": 132 }, { - "__id__": 148 + "__id__": 144 }, { - "__id__": 218 - }, - { - "__id__": 226 + "__id__": 216 } ], - "_active": true, + "_active": false, "_components": [ { - "__id__": 234 + "__id__": 224 } ], "_prefab": { - "__id__": 236 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -3058,21 +2986,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 121 }, "_children": [ { - "__id__": 127 + "__id__": 123 } ], "_active": true, "_components": [ { - "__id__": 133 + "__id__": 129 } ], "_prefab": { - "__id__": 135 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", @@ -3109,24 +3037,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 122 }, "_children": [], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 124 }, { - "__id__": 130 + "__id__": 126 } ], "_prefab": { - "__id__": 132 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", - "x": -106, + "x": -130, "y": 0, "z": 0 }, @@ -3159,16 +3087,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", - "width": 492, - "height": 242 + "width": 480, + "height": 229 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3187,11 +3115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 127 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3204,10 +3132,10 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "1d67af9f-c6de-4e87-a379-2cb3ddbc4607@f9941", + "__uuid__": "87287064-98e8-453c-9944-042618e39249@f9941", "__expectedType__": "cc.SpriteFrame" }, - "_type": 1, + "_type": 0, "_fillType": 0, "_sizeMode": 1, "_fillCenter": { @@ -3245,11 +3173,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 130 }, "_contentSize": { "__type__": "cc.Size", @@ -3286,21 +3214,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 121 }, "_children": [ { - "__id__": 137 + "__id__": 133 } ], "_active": true, "_components": [ { - "__id__": 145 + "__id__": 141 } ], "_prefab": { - "__id__": 147 + "__id__": 143 }, "_lpos": { "__type__": "cc.Vec3", @@ -3335,17 +3263,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 136 + "__id__": 132 }, "_prefab": { - "__id__": 138 + "__id__": 134 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 137 + "__id__": 133 }, "asset": { "__uuid__": "e0928cff-6e84-4aa5-a100-826094cfbce6", @@ -3353,7 +3281,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 139 + "__id__": 135 }, "targetOverrides": null }, @@ -3366,17 +3294,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 136 + }, + { + "__id__": 138 + }, + { + "__id__": 139 + }, { "__id__": 140 - }, - { - "__id__": 142 - }, - { - "__id__": 143 - }, - { - "__id__": 144 } ], "removedComponents": [] @@ -3384,7 +3312,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 137 }, "propertyPath": [ "_name" @@ -3400,7 +3328,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 137 }, "propertyPath": [ "_lpos" @@ -3415,7 +3343,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 137 }, "propertyPath": [ "_lrot" @@ -3431,7 +3359,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 137 }, "propertyPath": [ "_euler" @@ -3449,11 +3377,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 142 }, "_contentSize": { "__type__": "cc.Size", @@ -3490,33 +3418,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 121 }, "_children": [ { - "__id__": 149 + "__id__": 145 }, { - "__id__": 165 + "__id__": 167 }, { - "__id__": 181 - }, - { - "__id__": 197 + "__id__": 189 } ], "_active": true, "_components": [ { - "__id__": 213 + "__id__": 211 }, { - "__id__": 215 + "__id__": 213 } ], "_prefab": { - "__id__": 217 + "__id__": 215 }, "_lpos": { "__type__": "cc.Vec3", @@ -3553,29 +3478,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 148 + "__id__": 144 }, "_children": [ { - "__id__": 150 + "__id__": 146 }, { - "__id__": 156 + "__id__": 152 + }, + { + "__id__": 158 } ], "_active": true, "_components": [ { - "__id__": 162 + "__id__": 164 } ], "_prefab": { - "__id__": 164 + "__id__": 166 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 82.5, + "y": 50, "z": 0 }, "_lrot": { @@ -3603,28 +3531,28 @@ }, { "__type__": "cc.Node", - "_name": "num", + "_name": "num1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 149 + "__id__": 145 }, "_children": [], "_active": true, "_components": [ { - "__id__": 151 + "__id__": 147 }, { - "__id__": 153 + "__id__": 149 } ], "_prefab": { - "__id__": 155 + "__id__": 151 }, "_lpos": { "__type__": "cc.Vec3", - "x": -35, + "x": 16.141, "y": 0, "z": 0 }, @@ -3657,15 +3585,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 148 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 36, "height": 40 }, "_anchorPoint": { @@ -3677,7 +3605,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "78rMXJwztGM70Tlsuq0xak" + "fileId": "16S7xs/8VB1YKpYUYkiKUA" }, { "__type__": "cc.Label", @@ -3685,11 +3613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 150 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3704,14 +3632,14 @@ "_string": "20", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 27, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "3e638f84-054c-4c7e-af7a-e3ad5f860ecf", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, @@ -3748,7 +3676,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c8FcFFIwZC86Bg8EJrRd/s" + "fileId": "ccFmf0e6FKL55tje4HEHLG" }, { "__type__": "cc.PrefabInfo", @@ -3758,7 +3686,169 @@ "asset": { "__id__": 0 }, - "fileId": "89qCXo7cZG44lH3CxSTpGk", + "fileId": "86GSr2VuZM2qk35wnovB1Q", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 145 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 153 + }, + { + "__id__": 155 + } + ], + "_prefab": { + "__id__": 157 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 62.279, + "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__": 152 + }, + "_enabled": true, + "__prefab": { + "__id__": 154 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 36, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b2cMhdBmVIwo0u7y55w8DV" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 152 + }, + "_enabled": true, + "__prefab": { + "__id__": 156 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "20", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 27, + "_fontSize": 27, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": false, + "_font": { + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": -5, + "_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, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0c9eh2KFJJr6HCkGfm9Qem" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6fzjFL4S5H1pu+QNn05d7r", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3769,24 +3859,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 149 + "__id__": 145 }, "_children": [], "_active": true, "_components": [ { - "__id__": 157 + "__id__": 159 }, { - "__id__": 159 + "__id__": 161 } ], "_prefab": { - "__id__": 161 + "__id__": 163 }, "_lpos": { "__type__": "cc.Vec3", - "x": 45, + "x": -69.259, "y": 0, "z": 0 }, @@ -3819,15 +3909,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 160 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 88.33, "height": 40 }, "_anchorPoint": { @@ -3839,7 +3929,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "83j64B/n9FGI5/56F5w7xQ" + "fileId": "81IphSTCBP3JQPN6epXkb3" }, { "__type__": "cc.Label", @@ -3847,11 +3937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 162 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3863,21 +3953,21 @@ "b": 255, "a": 255 }, - "_string": "20", + "_string": "750.00", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 23, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": false, "_font": { - "__uuid__": "eaa01bf4-09a6-4853-a117-149c5157f96c", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": -5, + "_spacingX": 0, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -3910,7 +4000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "14E3cGirZMdrCu/wv7+Mzi" + "fileId": "5ccA9ZoNNJTJ4sEWgU/k4B" }, { "__type__": "cc.PrefabInfo", @@ -3920,7 +4010,7 @@ "asset": { "__id__": 0 }, - "fileId": "8bNOQfYvhEM6eZ/qH/BbRa", + "fileId": "ceSZiCpsxNFLrBKzNtfc/d", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3931,16 +4021,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 165 }, "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 55 + "height": 50 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3951,7 +4041,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ba5IlXPDpB5rvY6M04shch" + "fileId": "baCgkZL2NJCIsQ59mYgOB/" }, { "__type__": "cc.PrefabInfo", @@ -3961,7 +4051,7 @@ "asset": { "__id__": 0 }, - "fileId": "3coy0eSzdK2Knhh0NXtnJE", + "fileId": "75aylLfOlKj6cVXS3i02Kw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3972,29 +4062,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 148 + "__id__": 144 }, "_children": [ { - "__id__": 166 + "__id__": 168 }, { - "__id__": 172 + "__id__": 174 + }, + { + "__id__": 180 } ], "_active": true, "_components": [ { - "__id__": 178 + "__id__": 186 } ], "_prefab": { - "__id__": 180 + "__id__": 188 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 27.5, + "y": 0, "z": 0 }, "_lrot": { @@ -4022,28 +4115,28 @@ }, { "__type__": "cc.Node", - "_name": "num", + "_name": "num1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 167 }, "_children": [], "_active": true, "_components": [ { - "__id__": 167 + "__id__": 169 }, { - "__id__": 169 + "__id__": 171 } ], "_prefab": { - "__id__": 171 + "__id__": 173 }, "_lpos": { "__type__": "cc.Vec3", - "x": -35, + "x": 16.141, "y": 0, "z": 0 }, @@ -4076,15 +4169,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 170 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 36, "height": 40 }, "_anchorPoint": { @@ -4096,7 +4189,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "697WgFe7dBnb1w0tgi5WMr" + "fileId": "0alhhXpvxC4bEGRetn+yit" }, { "__type__": "cc.Label", @@ -4104,11 +4197,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 172 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4123,14 +4216,14 @@ "_string": "20", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 27, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "3e638f84-054c-4c7e-af7a-e3ad5f860ecf", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, @@ -4167,7 +4260,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e2VpsC5GZIaaUGkx0rsamZ" + "fileId": "8cXL5Jf5xG5YFab6/4aymV" }, { "__type__": "cc.PrefabInfo", @@ -4177,7 +4270,169 @@ "asset": { "__id__": 0 }, - "fileId": "f4ZzXb4nNNk4uv+W8OabHV", + "fileId": "e7kERCxElBfbimj264cFGp", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 167 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 175 + }, + { + "__id__": 177 + } + ], + "_prefab": { + "__id__": 179 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 62.279, + "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__": 174 + }, + "_enabled": true, + "__prefab": { + "__id__": 176 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 36, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3bwf4Rg3pCGYF5ENSYfjlP" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 174 + }, + "_enabled": true, + "__prefab": { + "__id__": 178 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "20", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 27, + "_fontSize": 27, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": false, + "_font": { + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": -5, + "_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, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bcNeC7QZ5PL7hfoiEflalN" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f7dJlHFdtIE6ALUNZIQsF/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4188,24 +4443,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 167 }, "_children": [], "_active": true, "_components": [ { - "__id__": 173 + "__id__": 181 }, { - "__id__": 175 + "__id__": 183 } ], "_prefab": { - "__id__": 177 + "__id__": 185 }, "_lpos": { "__type__": "cc.Vec3", - "x": 45, + "x": -69.259, "y": 0, "z": 0 }, @@ -4238,15 +4493,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 172 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 174 + "__id__": 182 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 88.33, "height": 40 }, "_anchorPoint": { @@ -4258,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e05fSu2hNFzoEnf6S35BlI" + "fileId": "8cfVms4XpFxroSatI7o2lg" }, { "__type__": "cc.Label", @@ -4266,11 +4521,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 172 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 184 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4282,21 +4537,21 @@ "b": 255, "a": 255 }, - "_string": "20", + "_string": "750.00", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 23, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": false, "_font": { - "__uuid__": "eaa01bf4-09a6-4853-a117-149c5157f96c", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": -5, + "_spacingX": 0, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -4329,7 +4584,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "28jbZAxN9JubnnEDedJerT" + "fileId": "79IGdVv0JIcI9SLJaGbCUT" }, { "__type__": "cc.PrefabInfo", @@ -4339,7 +4594,7 @@ "asset": { "__id__": 0 }, - "fileId": "8dwtas40lI2aNjBBwjN20X", + "fileId": "c1Emlg3tBN16g3mBLoXUgb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4350,16 +4605,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 187 }, "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 55 + "height": 50 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4370,7 +4625,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c9QRUAJvJDUoFY8uPJ8Gup" + "fileId": "3fZ6l2yyRB9akAquwrZQ4h" }, { "__type__": "cc.PrefabInfo", @@ -4380,7 +4635,7 @@ "asset": { "__id__": 0 }, - "fileId": "27QBpzZkJDN4EBm1KSJiN2", + "fileId": "b4YHK9RyxJq5eKbpxC2FiB", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4391,29 +4646,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 148 + "__id__": 144 }, "_children": [ { - "__id__": 182 + "__id__": 190 }, { - "__id__": 188 + "__id__": 196 + }, + { + "__id__": 202 } ], "_active": true, "_components": [ { - "__id__": 194 + "__id__": 208 } ], "_prefab": { - "__id__": 196 + "__id__": 210 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -27.5, + "y": -50, "z": 0 }, "_lrot": { @@ -4441,190 +4699,28 @@ }, { "__type__": "cc.Node", - "_name": "num", + "_name": "num1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 181 + "__id__": 189 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 183 - }, - { - "__id__": 185 - } - ], - "_prefab": { - "__id__": 187 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -35, - "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__": 182 - }, - "_enabled": true, - "__prefab": { - "__id__": 184 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 53.18, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b0RUuiCiVI5aDs/igLtwv7" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 182 - }, - "_enabled": true, - "__prefab": { - "__id__": 186 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "20", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": false, - "_font": { - "__uuid__": "3e638f84-054c-4c7e-af7a-e3ad5f860ecf", - "__expectedType__": "cc.BitmapFont" - }, - "_isSystemFontUsed": false, - "_spacingX": -5, - "_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, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "abWFevh65Kq7mXYk+D/9Cx" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "07ZMo+DEhIbae0QrR1MhC+", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "multi", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 181 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 189 - }, { "__id__": 191 + }, + { + "__id__": 193 } ], "_prefab": { - "__id__": 193 + "__id__": 195 }, "_lpos": { "__type__": "cc.Vec3", - "x": 45, + "x": 16.141, "y": 0, "z": 0 }, @@ -4657,272 +4753,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 - }, - "_enabled": true, - "__prefab": { "__id__": 190 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 53.18, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "eew4Kjb+BNcqpLJHCqNB1k" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 188 - }, "_enabled": true, "__prefab": { "__id__": 192 }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "20", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": false, - "_font": { - "__uuid__": "eaa01bf4-09a6-4853-a117-149c5157f96c", - "__expectedType__": "cc.BitmapFont" - }, - "_isSystemFontUsed": false, - "_spacingX": -5, - "_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, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4d1nFNjTtEp7YlSCpmi9eX" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d8YTtlrkZHUqtBa3HyApdm", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 181 - }, - "_enabled": true, - "__prefab": { - "__id__": 195 - }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 55 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1aUGGPnVNIqLVNuxdgjmt1" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "764YHEzuxAibnNnsWD4ZUj", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "3", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 148 - }, - "_children": [ - { - "__id__": 198 - }, - { - "__id__": 204 - } - ], - "_active": true, - "_components": [ - { - "__id__": 210 - } - ], - "_prefab": { - "__id__": 212 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -82.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 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "num", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 197 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 199 - }, - { - "__id__": 201 - } - ], - "_prefab": { - "__id__": 203 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -35, - "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__": 198 - }, - "_enabled": true, - "__prefab": { - "__id__": 200 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 53.18, + "width": 36, "height": 40 }, "_anchorPoint": { @@ -4934,7 +4773,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "25GXImHKFEMZe+pnPTEthA" + "fileId": "b5vxxoCFVMJrZPJylpxgW3" }, { "__type__": "cc.Label", @@ -4942,11 +4781,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 194 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4961,14 +4800,14 @@ "_string": "20", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 27, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "3e638f84-054c-4c7e-af7a-e3ad5f860ecf", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, @@ -5005,7 +4844,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2cKKHGEfhOuJYYqMwlbS1M" + "fileId": "7eYIjX2kBKrLBlATfPgn0X" }, { "__type__": "cc.PrefabInfo", @@ -5015,7 +4854,169 @@ "asset": { "__id__": 0 }, - "fileId": "adOQXk3f1Ji7lGqjYVWUBN", + "fileId": "c8z3KimtlN1LyvFy95WZ0+", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 189 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 197 + }, + { + "__id__": 199 + } + ], + "_prefab": { + "__id__": 201 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 62.279, + "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__": 196 + }, + "_enabled": true, + "__prefab": { + "__id__": 198 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 36, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fcvOL9EWhMWbg/3dpEdX+5" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 196 + }, + "_enabled": true, + "__prefab": { + "__id__": 200 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "20", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 27, + "_fontSize": 27, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": false, + "_font": { + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": -5, + "_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, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e7W3T1Fz9A8YTYBqzov5Zo" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bb+SqlyHlGhZjb14v1wStj", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5026,24 +5027,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 197 + "__id__": 189 }, "_children": [], "_active": true, "_components": [ { - "__id__": 205 + "__id__": 203 }, { - "__id__": 207 + "__id__": 205 } ], "_prefab": { - "__id__": 209 + "__id__": 207 }, "_lpos": { "__type__": "cc.Vec3", - "x": 45, + "x": -69.259, "y": 0, "z": 0 }, @@ -5076,15 +5077,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 204 }, "_contentSize": { "__type__": "cc.Size", - "width": 53.18, + "width": 88.33, "height": 40 }, "_anchorPoint": { @@ -5096,7 +5097,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f3i+9iYxlEYqMErReIqtD9" + "fileId": "91CwIlmSVH24UmYy+oUYVQ" }, { "__type__": "cc.Label", @@ -5104,11 +5105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 206 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5120,21 +5121,21 @@ "b": 255, "a": 255 }, - "_string": "20", + "_string": "750.00", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 23, + "_fontSize": 27, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": false, "_font": { - "__uuid__": "eaa01bf4-09a6-4853-a117-149c5157f96c", + "__uuid__": "9043f421-8f6c-4bf1-92f2-a46b0f65d2fb", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": -5, + "_spacingX": 0, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -5167,7 +5168,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "13ab4DOP5Cf4ivtrZm98Lo" + "fileId": "e5HRpgOC5KO5KP7VR5s5X0" }, { "__type__": "cc.PrefabInfo", @@ -5177,7 +5178,7 @@ "asset": { "__id__": 0 }, - "fileId": "04JGH/+R1PU43toWpn4quY", + "fileId": "5agw3aZZRNfrj9EzDkf3Kl", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5188,16 +5189,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 55 + "height": 50 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5208,7 +5209,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "99UFG0XI5NKL08dcE9K1rj" + "fileId": "adlWAdHJRPWqyTxV9DJZAR" }, { "__type__": "cc.PrefabInfo", @@ -5218,7 +5219,7 @@ "asset": { "__id__": 0 }, - "fileId": "51ZxALxGtKZqqbVdAdaGkS", + "fileId": "74zHwDzqtA3bmru3WTru1e", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5229,16 +5230,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 212 }, "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 220 + "height": 150 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5257,11 +5258,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 214 }, "_resizeMode": 1, "_layoutType": 2, @@ -5304,27 +5305,27 @@ }, { "__type__": "cc.Node", - "_name": "wild", + "_name": "scatter", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 121 }, "_children": [], "_active": false, "_components": [ + { + "__id__": 217 + }, { "__id__": 219 }, { "__id__": 221 - }, - { - "__id__": 223 } ], "_prefab": { - "__id__": 225 + "__id__": 223 }, "_lpos": { "__type__": "cc.Vec3", @@ -5361,174 +5362,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", - "width": 193, - "height": 170 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "2cAfgso4dN95wz6Wfv3KAd" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 218 - }, - "_enabled": true, - "__prefab": { - "__id__": 222 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "dd3ca1ef-845e-452d-a6e5-30680cfb64d5@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": "3aOX+ENrZBD645rw5G3fRX" - }, - { - "__type__": "e6c8d4szahIuLbtf6yx+hH6", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 218 - }, - "_enabled": true, - "__prefab": { - "__id__": 224 - }, - "spriteName": "wild", - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "90OVGWtxxEk5Pq5RgdG+lU" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "8eHb+DYj5MzKH1pDGYcsR6", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "scatter", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 125 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 227 - }, - { - "__id__": 229 - }, - { - "__id__": 231 - } - ], - "_prefab": { - "__id__": 233 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -200, - "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__": 226 - }, - "_enabled": true, - "__prefab": { - "__id__": 228 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 179, - "height": 146 + "width": 251, + "height": 92 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5547,11 +5390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 220 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5564,7 +5407,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "92010390-f429-4274-a33b-d236e53c1288@f9941", + "__uuid__": "8bb453f6-c0f7-46d6-934f-212b7742560c@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -5592,13 +5435,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 222 }, - "spriteName": "Scatter", + "spriteName": "zxksctter", "_id": "" }, { @@ -5624,11 +5467,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -5669,7 +5512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", @@ -5710,7 +5553,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 231 }, "_contentSize": { "__type__": "cc.Size", @@ -5738,7 +5581,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 233 }, "grayBg": { "__id__": 2 @@ -5750,7 +5593,7 @@ "__id__": 13 }, "rightNode": { - "__id__": 125 + "__id__": 121 }, "_id": "" }, @@ -5768,7 +5611,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 235 }, "_alignFlags": 45, "_target": null, @@ -5807,7 +5650,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 137 + "__id__": 133 }, { "__id__": 25 diff --git a/assets/Game/Prefab/TotalWinSpine.prefab b/assets/Game/Prefab/TotalWinSpine.prefab index 938cb1b..77d091c 100644 --- a/assets/Game/Prefab/TotalWinSpine.prefab +++ b/assets/Game/Prefab/TotalWinSpine.prefab @@ -411,7 +411,7 @@ "node": { "__id__": 13 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 17 }, @@ -654,7 +654,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 136.281, + "y": 537.425, "z": 0 }, "_lrot": { @@ -694,8 +694,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 897, - "height": 172 + "width": 1019, + "height": 318 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -731,7 +731,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "96787992-72bf-4087-947d-8c3ae9523df9@f9941", + "__uuid__": "f2ec709f-ee98-4a1c-a2e0-3499d55ba09d@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -765,7 +765,7 @@ "__prefab": { "__id__": 33 }, - "spriteName": "19", + "spriteName": "FREESPIN5", "_id": "" }, { @@ -809,7 +809,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -110.719, + "y": 158.85, "z": 0 }, "_lrot": { @@ -885,17 +885,17 @@ "b": 255, "a": 255 }, - "_string": "12.18", + "_string": "9", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 300, "_fontSize": 300, "_fontFamily": "Arial", - "_lineHeight": 300, + "_lineHeight": 100, "_overflow": 2, "_enableWrapText": false, "_font": { - "__uuid__": "f33ecdbe-f644-4db9-aa12-8c8d98de7514", + "__uuid__": "440b0efb-6a4a-4c11-9cfb-bf746b908efd", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, @@ -1031,7 +1031,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 15, "z": 0 }, "_lrot": { @@ -1071,8 +1071,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 305, - "height": 61 + "width": 291, + "height": 68 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1108,7 +1108,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "712dc057-5255-4037-adc3-01431479bbf3@f9941", + "__uuid__": "b23049d7-23dd-4365-bf40-075c1c68d22d@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1142,7 +1142,7 @@ "__prefab": { "__id__": 48 }, - "spriteName": "11", + "spriteName": "FREESPIN$", "_id": "" }, { @@ -1176,8 +1176,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 462, - "height": 176 + "width": 569, + "height": 227 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1213,7 +1213,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "4144290b-78d2-4ba0-9f78-8b903c9f6589@f9941", + "__uuid__": "46de9563-d62d-4828-a40b-b7a0afabab65@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1316,6 +1316,8 @@ "__id__": 0 }, "fileId": "a2gWcf7aRGA4Exbd7VpvLX", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/Game/Scripts/BigWin.ts b/assets/Game/Scripts/BigWin.ts index 9e12c92..583a93c 100644 --- a/assets/Game/Scripts/BigWin.ts +++ b/assets/Game/Scripts/BigWin.ts @@ -119,10 +119,10 @@ export class BigWin extends Component { .start(); this.startBubbleAnimation(actionNode); - this.playSpineAnimation(actionNode, 'ruchang', false, () => { - this.playSpineAnimation(actionNode, 'chixu', true); + // this.playSpineAnimation(actionNode, 'ruchang', false, () => { + // this.playSpineAnimation(actionNode, 'chixu', true); - }); + // }); } startScrolling(isFirst: boolean, curType: WIN_TYPE, startValue: number, targetValue: number, callBack: () => void) { @@ -262,7 +262,10 @@ export class BigWin extends Component { } if (activeNode) { - this.playSpineAnimation(activeNode, 'xiaoshi', false, onComplete); + // this.playSpineAnimation(activeNode, 'xiaoshi', false, onComplete); + this.scheduleOnce(() => { + onComplete() + }, 0.5) } else { onComplete(); } @@ -281,9 +284,12 @@ export class BigWin extends Component { } if (activeNode) { - this.playSpineAnimation(activeNode, 'xiaoshi', false, () => { + // this.playSpineAnimation(activeNode, 'xiaoshi', false, () => { + // this.closeAndDestroy(callBack); + // }); + this.scheduleOnce(() => { this.closeAndDestroy(callBack); - }); + }, 0.5) } else { this.closeAndDestroy(callBack); } @@ -291,7 +297,7 @@ export class BigWin extends Component { private closeAndDestroy(callBack?: () => void) { if (callBack) callBack(); - this.unscheduleAllCallbacks(); + this.unscheduleAllCallbacks(); this.isFreeSpin ? AudioManager.instance.playBGM('Free_Bg_Bgm') : AudioManager.instance.playBGM('Normal_Bg_Bgm'); diff --git a/assets/Game/Scripts/Define.ts b/assets/Game/Scripts/Define.ts index 615a1eb..7276ad0 100644 --- a/assets/Game/Scripts/Define.ts +++ b/assets/Game/Scripts/Define.ts @@ -29,7 +29,7 @@ export let GAME_STATE = { } export let ICON_WIDTH = 132; -export let ICON_HEIGHT = 170; +export let ICON_HEIGHT = 160; export let DELETE_TIME = 2.1; export interface ISpecialIcon { @@ -45,7 +45,7 @@ export interface IParsedGameData { NewIconTop: number[][]; HasScatterExpect: boolean; ScatterPos: number[]; - BombPos: number[]; + BombPos: number[]; hasSmallGame: boolean; hasFreeSpinAgain: boolean; } @@ -78,20 +78,21 @@ export let ICON_MAP = { 10: "倍率炸弹", } -export let ICON_RATE_NUM = [6, 5, 4, 3]; +export let ICON_RATE_NUM1 = [12, 10, 8]; +export let ICON_RATE_NUM2 = [30, 11, 9]; // 图标赔率 export let ICON_RATE = { - 0: [0, 0, 0, 0], // Wild - 1: [0, 0, 0, 0], // Scatter - 2: [50, 30, 20, 10], // 炭治郎 - 3: [30, 20, 15, 8], // 祢豆子 - 4: [20, 15, 10, 5], // 我妻善逸 - 5: [20, 15, 10, 5], // 伊之助 - 6: [10, 6, 4, 2], // A - 7: [10, 6, 4, 2], // K - 8: [5, 3, 2, 1], // Q - 9: [5, 4, 3, 1], // J + 0: [0, 0, 0], // scatter + 1: [10, 25, 50], // 神灯 + 2: [2.5, 10, 25], // 魔毯 + 3: [2, 5, 15], // 刀 + 4: [1.5, 2, 12], // 戒指 + 5: [1, 1.5, 10], // 项链 + 6: [0.8, 1.2, 8], // 瓶子 + 7: [0.5, 1, 5], // 金币 + 8: [0.4, 0.9, 4], // 银币 + 9: [0.2, 0.75, 2], // 铜币 } export let ROLLER_RULE = [ diff --git a/assets/Game/Scripts/Icon.ts b/assets/Game/Scripts/Icon.ts index 7bcbdce..9c5f60c 100644 --- a/assets/Game/Scripts/Icon.ts +++ b/assets/Game/Scripts/Icon.ts @@ -92,16 +92,16 @@ export class Icon extends Component { playIdleSpine(bol: boolean) { let spine = this.spineNode.getChildByName('spine').getComponent(sp.Skeleton); - if (spine && this.checkHasAnimation(spine, 'chixu')) { - if (bol) { - this.normalNode.active = false; - this.spineNode.active = true; - spine.setAnimation(0, 'chixu', true); - } else { - this.normalNode.active = true; - this.spineNode.active = false; - } - } + // if (spine && this.checkHasAnimation(spine, 'chixu')) { + // if (bol) { + // this.normalNode.active = false; + // this.spineNode.active = true; + // spine.setAnimation(0, 'chixu', true); + // } else { + this.normalNode.active = true; + this.spineNode.active = false; + // } + // } } playBounceSpine(isLoop: boolean = false) { @@ -198,7 +198,7 @@ export class Icon extends Component { let gameNode = find('Canvas/main/game'); if (!gameNode) return; gameNode.addChild(iconMsg); - let isLeft = this.rollerId < 4; + let isLeft = this.rollerId < 3; iconMsg.getComponent(IconMsg).showIconMsg(this, isLeft); } } diff --git a/assets/Game/Scripts/IconMsg.ts b/assets/Game/Scripts/IconMsg.ts index b8e8033..4cb8201 100644 --- a/assets/Game/Scripts/IconMsg.ts +++ b/assets/Game/Scripts/IconMsg.ts @@ -1,7 +1,7 @@ import { _decorator, Component, instantiate, Label, Node, UITransform } from 'cc'; import { Icon } from './Icon'; import { I18nManager } from '../../Main/Scripts/managers/I18nManager'; -import { ICON_RATE, ICON_RATE_NUM } from './Define'; +import { ICON_RATE, ICON_RATE_NUM1, ICON_RATE_NUM2 } from './Define'; const { ccclass, property } = _decorator; @ccclass('IconMsg') @@ -31,9 +31,8 @@ export class IconMsg extends Component { this.onHideSelf(); }) - let isWild = iconComp.index === 0; - let isScatter = iconComp.index === 1; - let node = isLeft ? this.leftNode : this.rightNode; + let isScatter = iconComp.index === 0; + let node = isLeft ? this.leftNode : this.rightNode; let iconParent = node.getChildByName('icon'); iconParent.children.forEach(child => child.destroy()); @@ -44,16 +43,15 @@ export class IconMsg extends Component { insIconNode.getComponent(Icon).playIdleSpine(true); let msg = node.getChildByName('msg'); - msg.active = isWild || isScatter ? false : true; + msg.active = isScatter ? false : true; msg.children.forEach((child, index) => { let iconRate = ICON_RATE[iconComp.index]; - child.getChildByName('num').getComponent(Label).string = ICON_RATE_NUM[index].toString(); - child.getChildByName('multi').getComponent(Label).string = iconRate[index].toString(); + child.getChildByName('num1').getComponent(Label).string = ICON_RATE_NUM1[index].toString(); + child.getChildByName('num2').getComponent(Label).string = ICON_RATE_NUM2[index].toString(); + child.getChildByName('multi').getComponent(Label).string = iconRate[2 - index].toString(); }) - let wildMsg = node.getChildByName('wild'); let scatterMsg = node.getChildByName('scatter'); - wildMsg.active = isWild ? true : false; scatterMsg.active = isScatter ? true : false; } diff --git a/assets/Game/Scripts/SlotGame.ts b/assets/Game/Scripts/SlotGame.ts index b3e6c99..c2143f9 100644 --- a/assets/Game/Scripts/SlotGame.ts +++ b/assets/Game/Scripts/SlotGame.ts @@ -539,7 +539,7 @@ export class SlotGame extends Component { scp = prefab.getComponent(FeatureBuyPopup); scp.show(); let freeNeedCount = main.getChildByName('needCount'); - freeNeedCount.getComponent(Label).string = `$${gold2cash(GameDataManager.instance.curBet * 100)}`; + freeNeedCount.getComponent(Label).string = `${gold2cash(GameDataManager.instance.curBet * 100)}`; }, (prefab) => { }, () => { diff --git a/assets/Game/SlotScene.prefab b/assets/Game/SlotScene.prefab index da82bb9..ee01b54 100644 --- a/assets/Game/SlotScene.prefab +++ b/assets/Game/SlotScene.prefab @@ -2074,7 +2074,7 @@ "__id__": 80 }, "asset": { - "__uuid__": "c9f3dd9e-da32-4d66-800c-ac6ebc8385fe", + "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2085,7 +2085,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "9a5csJNwRHHrTVLjkzim3G", + "fileId": "7ckZPBgPRK7bvnpkLz39hK", "prefabRootNode": { "__id__": 1 }, @@ -2109,7 +2109,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 340, + "y": 320, "z": 0 } }, @@ -2136,7 +2136,7 @@ "__id__": 85 }, "asset": { - "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", + "__uuid__": "c2ff920f-4cea-4f5d-9ebc-f3d4c4aab3af", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2147,7 +2147,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3cHEw8sNZGCZ8lxHiCbYBI", + "fileId": "75FDbDEJRBTI+exv2kDqUO", "prefabRootNode": { "__id__": 1 }, @@ -2171,7 +2171,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 170, + "y": 160, "z": 0 } }, @@ -2198,7 +2198,7 @@ "__id__": 90 }, "asset": { - "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", + "__uuid__": "4e3beddd-2d76-4352-9a2a-843c0ea26164", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2209,7 +2209,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e9/jC95/1FHZM7PcYXFMEs", + "fileId": "2byP82l5pBVr0OGyOc0YgV", "prefabRootNode": { "__id__": 1 }, @@ -2235,7 +2235,7 @@ "__id__": 93 }, "asset": { - "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", + "__uuid__": "d83c2d3b-8b26-4845-b957-cfc7eb3a38c5", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2246,7 +2246,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "9e0BiN32ROV6Ehh7JnRHtX", + "fileId": "58pYqsVy5Jv5w49lGnDMWb", "prefabRootNode": { "__id__": 1 }, @@ -2270,7 +2270,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -170, + "y": -160, "z": 0 } }, @@ -2297,7 +2297,7 @@ "__id__": 98 }, "asset": { - "__uuid__": "4e3beddd-2d76-4352-9a2a-843c0ea26164", + "__uuid__": "c9f3dd9e-da32-4d66-800c-ac6ebc8385fe", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2308,7 +2308,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "26p87tabJAgrFXoVzIJZ09", + "fileId": "8ezUfsBGNJhrPyocIwg0mv", "prefabRootNode": { "__id__": 1 }, @@ -2332,7 +2332,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -340, + "y": -320, "z": 0 } }, @@ -2357,7 +2357,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 170, - "height": 850 + "height": 800 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2368,7 +2368,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d9n8Vr5MFNtbE2ix3dhXef" + "fileId": "8fvI/5AZRNoakswrPS58JM" }, { "__type__": "3791duwVi5PIrPdrc2iiV9u", @@ -2383,17 +2383,17 @@ "__id__": 106 }, "iconWidth": 170, - "iconHeight": 170, + "iconHeight": 160, "iconFactory": { "__id__": 107 }, "row": 5, - "_format": true, + "_format": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "45wTKCyEhEjog1LCuSqiEO" + "fileId": "17vLsqF+1ECYo//6IXFf2E" }, { "__type__": "55ab54w/qJEdZrYLLZsMP1L", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "adDzr3GBlH9pop253FUGhv", + "fileId": "202LJrGQhAXrNI6nN/VwST", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2646,7 +2646,7 @@ "__id__": 115 }, "asset": { - "__uuid__": "4e3beddd-2d76-4352-9a2a-843c0ea26164", + "__uuid__": "f71a5e7a-0230-4ec6-8614-02c14675ad2b", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2657,7 +2657,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e435StnRpIap0VWXK0HhFF", + "fileId": "b0zIZP3TxPEaCUZGkUuLDW", "prefabRootNode": { "__id__": 1 }, @@ -2681,7 +2681,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 340, + "y": 320, "z": 0 } }, @@ -2708,7 +2708,7 @@ "__id__": 120 }, "asset": { - "__uuid__": "c2ff920f-4cea-4f5d-9ebc-f3d4c4aab3af", + "__uuid__": "c0f436e9-b870-4064-8135-2b15c16c8a08", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2719,7 +2719,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "93Ay+jDO1EOJCI3JDQTDC9", + "fileId": "9c/xWJ2bVEbZ/1PUknXI5c", "prefabRootNode": { "__id__": 1 }, @@ -2743,7 +2743,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 170, + "y": 160, "z": 0 } }, @@ -2770,7 +2770,7 @@ "__id__": 125 }, "asset": { - "__uuid__": "4ab9580f-7d0c-4a5e-adb5-f15811b676b3", + "__uuid__": "c9f3dd9e-da32-4d66-800c-ac6ebc8385fe", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2781,7 +2781,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "762oaJRjZD7bBwtUFDwRzj", + "fileId": "7d9cT/srVFRLErCa3rFn5U", "prefabRootNode": { "__id__": 1 }, @@ -2807,7 +2807,7 @@ "__id__": 128 }, "asset": { - "__uuid__": "4ab9580f-7d0c-4a5e-adb5-f15811b676b3", + "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2818,7 +2818,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "10rMTgwWxHV5Qoc0RdTYaU", + "fileId": "1fIsyfDe5DbJJeuLE8nuyH", "prefabRootNode": { "__id__": 1 }, @@ -2842,7 +2842,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -170, + "y": -160, "z": 0 } }, @@ -2869,7 +2869,7 @@ "__id__": 133 }, "asset": { - "__uuid__": "4e3beddd-2d76-4352-9a2a-843c0ea26164", + "__uuid__": "c2ff920f-4cea-4f5d-9ebc-f3d4c4aab3af", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -2880,7 +2880,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "33vaC+7pVEPo0MdImg5eG5", + "fileId": "aelKpyA6BIULHfFePZH/rb", "prefabRootNode": { "__id__": 1 }, @@ -2904,7 +2904,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -340, + "y": -320, "z": 0 } }, @@ -2929,7 +2929,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 170, - "height": 850 + "height": 800 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2940,7 +2940,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "887AiWPoRJPLkUyIz5NWw/" + "fileId": "17V6hKMy5JiZjpJnSXAyQb" }, { "__type__": "3791duwVi5PIrPdrc2iiV9u", @@ -2955,17 +2955,17 @@ "__id__": 141 }, "iconWidth": 170, - "iconHeight": 170, + "iconHeight": 160, "iconFactory": { "__id__": 107 }, "row": 5, - "_format": true, + "_format": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "adtLOrTfJAgLtZ/0bfma/7" + "fileId": "93mC8If0lJV7QdPcH2+BNT" }, { "__type__": "cc.PrefabInfo", @@ -2975,7 +2975,7 @@ "asset": { "__id__": 0 }, - "fileId": "28LV2aAR1GAI8DBi3MBcYt", + "fileId": "4dU4psuzpM9pbvxq5USilK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3063,7 +3063,7 @@ "__id__": 144 }, "asset": { - "__uuid__": "e0928cff-6e84-4aa5-a100-826094cfbce6", + "__uuid__": "3d6ede65-0026-4281-8572-569e42eea9a0", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3074,7 +3074,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "beMd2SbmlOLqezAd+FpEPT", + "fileId": "c70DTxrmJEn57L4YjpyiOS", "prefabRootNode": { "__id__": 1 }, @@ -3098,7 +3098,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 340, + "y": 320, "z": 0 } }, @@ -3136,7 +3136,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fcHntR/N9KloLr/WcDTw+w", + "fileId": "2bt99U24FLkIStCVABIrYL", "prefabRootNode": { "__id__": 1 }, @@ -3160,7 +3160,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 170, + "y": 160, "z": 0 } }, @@ -3187,7 +3187,7 @@ "__id__": 154 }, "asset": { - "__uuid__": "c0f436e9-b870-4064-8135-2b15c16c8a08", + "__uuid__": "c9f3dd9e-da32-4d66-800c-ac6ebc8385fe", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3198,7 +3198,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "77BlX8W5pN2qv8yJUVPoXC", + "fileId": "673XNX7ZFOW4oKaYcKfnxO", "prefabRootNode": { "__id__": 1 }, @@ -3224,7 +3224,7 @@ "__id__": 157 }, "asset": { - "__uuid__": "4e3beddd-2d76-4352-9a2a-843c0ea26164", + "__uuid__": "c2ff920f-4cea-4f5d-9ebc-f3d4c4aab3af", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "b3HhZnzldF8Zod07Zprq7o", + "fileId": "85lTOyXUVBa451kgHiLJy8", "prefabRootNode": { "__id__": 1 }, @@ -3259,7 +3259,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -170, + "y": -160, "z": 0 } }, @@ -3286,7 +3286,7 @@ "__id__": 162 }, "asset": { - "__uuid__": "c9f3dd9e-da32-4d66-800c-ac6ebc8385fe", + "__uuid__": "c2ff920f-4cea-4f5d-9ebc-f3d4c4aab3af", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3297,7 +3297,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "d5eJOyUKJNEJluy/zPs5So", + "fileId": "2dzoZrgyRAaJ19yeGywk5i", "prefabRootNode": { "__id__": 1 }, @@ -3321,7 +3321,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -340, + "y": -320, "z": 0 } }, @@ -3346,7 +3346,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 170, - "height": 850 + "height": 800 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3357,7 +3357,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7aeaWV05dLpIxsQ6P9X/da" + "fileId": "9ahxeAdmJNyploRqUjZFtl" }, { "__type__": "3791duwVi5PIrPdrc2iiV9u", @@ -3372,17 +3372,17 @@ "__id__": 170 }, "iconWidth": 170, - "iconHeight": 170, + "iconHeight": 160, "iconFactory": { "__id__": 107 }, "row": 5, - "_format": true, + "_format": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cf9u3hLkNHxL12UVwGOIGp" + "fileId": "799kyqEddH2YziQEdF33c5" }, { "__type__": "cc.PrefabInfo", @@ -3392,7 +3392,7 @@ "asset": { "__id__": 0 }, - "fileId": "4f+s8M0X9N8rvziSPFT95W", + "fileId": "b1JBoKCCxOqrZWQL83ukVz", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3491,7 +3491,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "8fzZ4uIVVD559qlCHML55b", + "fileId": "7ec19jObhNUazHo/TJKOAS", "prefabRootNode": { "__id__": 1 }, @@ -3515,7 +3515,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 340, + "y": 320, "z": 0 } }, @@ -3542,7 +3542,7 @@ "__id__": 178 }, "asset": { - "__uuid__": "c0f436e9-b870-4064-8135-2b15c16c8a08", + "__uuid__": "3d6ede65-0026-4281-8572-569e42eea9a0", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3553,7 +3553,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "d4TCnoJDRE+69WNhRR19aU", + "fileId": "15Jf0265VM6Im/FnEVG8st", "prefabRootNode": { "__id__": 1 }, @@ -3577,7 +3577,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 170, + "y": 160, "z": 0 } }, @@ -3604,7 +3604,7 @@ "__id__": 183 }, "asset": { - "__uuid__": "c2ff920f-4cea-4f5d-9ebc-f3d4c4aab3af", + "__uuid__": "d83c2d3b-8b26-4845-b957-cfc7eb3a38c5", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3615,7 +3615,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c9KEhYr4FB7oSRExvW6EoV", + "fileId": "b5ZPFLtQxN25xon1I5F8ZC", "prefabRootNode": { "__id__": 1 }, @@ -3641,7 +3641,7 @@ "__id__": 186 }, "asset": { - "__uuid__": "c2ff920f-4cea-4f5d-9ebc-f3d4c4aab3af", + "__uuid__": "3a12b3d4-afbc-42ab-989d-77e8098f6c57", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3652,7 +3652,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "07VOmNkZxOf5diNe+tDnCg", + "fileId": "c7qvdUIDxA8by+MTeFJu9E", "prefabRootNode": { "__id__": 1 }, @@ -3676,7 +3676,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -170, + "y": -160, "z": 0 } }, @@ -3703,7 +3703,7 @@ "__id__": 191 }, "asset": { - "__uuid__": "3d6ede65-0026-4281-8572-569e42eea9a0", + "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3714,7 +3714,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "edP7EO8c5LsphOPekTeFNP", + "fileId": "b2IVkz2uJB14uoErjfgSoS", "prefabRootNode": { "__id__": 1 }, @@ -3738,7 +3738,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -340, + "y": -320, "z": 0 } }, @@ -3763,7 +3763,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 170, - "height": 850 + "height": 800 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3774,7 +3774,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "02z6fjlUlG9pIEgcRk+bPD" + "fileId": "63M9Wamv9L5aO8kzZVcVTJ" }, { "__type__": "3791duwVi5PIrPdrc2iiV9u", @@ -3789,7 +3789,7 @@ "__id__": 199 }, "iconWidth": 170, - "iconHeight": 170, + "iconHeight": 160, "iconFactory": { "__id__": 107 }, @@ -3799,7 +3799,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0f0BHm0t5JpbPrXKDantAR" + "fileId": "0fUdOzrTtNEqpy8bjx0swY" }, { "__type__": "cc.PrefabInfo", @@ -3809,7 +3809,7 @@ "asset": { "__id__": 0 }, - "fileId": "36SjiiI31HDZ9NeQjLnW5z", + "fileId": "49/3JVvj5HeIdeZXWgw3LE", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3897,7 +3897,7 @@ "__id__": 202 }, "asset": { - "__uuid__": "4e3beddd-2d76-4352-9a2a-843c0ea26164", + "__uuid__": "4ab9580f-7d0c-4a5e-adb5-f15811b676b3", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3908,7 +3908,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "b8Liv6QZBFyLnVa5UR5nbc", + "fileId": "a1EE9FgwlD+aHjjz2yuQG4", "prefabRootNode": { "__id__": 1 }, @@ -3932,7 +3932,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 340, + "y": 320, "z": 0 } }, @@ -3959,7 +3959,7 @@ "__id__": 207 }, "asset": { - "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", + "__uuid__": "3a12b3d4-afbc-42ab-989d-77e8098f6c57", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -3970,7 +3970,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "0dfOqlc9dKAYLHCNLJnTDt", + "fileId": "5cr3lZ6F9Bi4PtyrNZ9Xti", "prefabRootNode": { "__id__": 1 }, @@ -3994,7 +3994,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 170, + "y": 160, "z": 0 } }, @@ -4021,7 +4021,7 @@ "__id__": 212 }, "asset": { - "__uuid__": "c0f436e9-b870-4064-8135-2b15c16c8a08", + "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -4032,7 +4032,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "d4FuxqXB5Nxr4PpsX+OZ1V", + "fileId": "4eIbmIXLlEcZNNGMZQm9hd", "prefabRootNode": { "__id__": 1 }, @@ -4058,7 +4058,7 @@ "__id__": 215 }, "asset": { - "__uuid__": "f71a5e7a-0230-4ec6-8614-02c14675ad2b", + "__uuid__": "4ab9580f-7d0c-4a5e-adb5-f15811b676b3", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -4069,7 +4069,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e6FtNqwCdBU6vbuofT5hZ2", + "fileId": "aftp5lsk1APrjb7d+dHkdU", "prefabRootNode": { "__id__": 1 }, @@ -4093,7 +4093,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -170, + "y": -160, "z": 0 } }, @@ -4120,7 +4120,7 @@ "__id__": 220 }, "asset": { - "__uuid__": "d83c2d3b-8b26-4845-b957-cfc7eb3a38c5", + "__uuid__": "c0f436e9-b870-4064-8135-2b15c16c8a08", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -4131,7 +4131,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "6fxOR8H7tBXJrxdmj3akZU", + "fileId": "d6GV9yHPdEH7LS3s08cg8V", "prefabRootNode": { "__id__": 1 }, @@ -4155,7 +4155,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -340, + "y": -320, "z": 0 } }, @@ -4180,7 +4180,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 170, - "height": 850 + "height": 800 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4191,7 +4191,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b0VNfTx1NGN76e9luymnNS" + "fileId": "ccwr83RB9GCIe3NrUuWc8z" }, { "__type__": "3791duwVi5PIrPdrc2iiV9u", @@ -4206,7 +4206,7 @@ "__id__": 228 }, "iconWidth": 170, - "iconHeight": 170, + "iconHeight": 160, "iconFactory": { "__id__": 107 }, @@ -4216,7 +4216,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7aQCBkfKJOkZMHmKe56s4B" + "fileId": "740uFCDUlPoaUNn/wRXL7m" }, { "__type__": "cc.PrefabInfo", @@ -4226,7 +4226,7 @@ "asset": { "__id__": 0 }, - "fileId": "c6Fu5khCpK1oC8t7ocLPFC", + "fileId": "63BSPsGwBIbbTnhk4hKLPu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4325,7 +4325,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "0cCEsYR9VDD4qV21Fxga2Y", + "fileId": "41p4g9+R1EYL411Ipe9P8q", "prefabRootNode": { "__id__": 1 }, @@ -4349,7 +4349,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 340, + "y": 320, "z": 0 } }, @@ -4376,7 +4376,7 @@ "__id__": 236 }, "asset": { - "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", + "__uuid__": "4ab9580f-7d0c-4a5e-adb5-f15811b676b3", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -4387,7 +4387,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c7asS1Nr5O55V2UFHHZcA6", + "fileId": "eb11R9+UBGi4l74dxzYKVo", "prefabRootNode": { "__id__": 1 }, @@ -4411,7 +4411,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 170, + "y": 160, "z": 0 } }, @@ -4438,7 +4438,7 @@ "__id__": 241 }, "asset": { - "__uuid__": "4ab9580f-7d0c-4a5e-adb5-f15811b676b3", + "__uuid__": "c2ff920f-4cea-4f5d-9ebc-f3d4c4aab3af", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -4449,7 +4449,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "06psHHqHtA0Z48enNf9/Ao", + "fileId": "765Vk8HgxGHo2xdSCL1TBQ", "prefabRootNode": { "__id__": 1 }, @@ -4475,7 +4475,7 @@ "__id__": 244 }, "asset": { - "__uuid__": "c2ff920f-4cea-4f5d-9ebc-f3d4c4aab3af", + "__uuid__": "5e3c6a81-0213-4db7-8682-237dab87b17b", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -4486,7 +4486,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "00nsuBjSxF4Zp55s8lsEwP", + "fileId": "46ZwFDTwpNKpmo4xXsrTMA", "prefabRootNode": { "__id__": 1 }, @@ -4510,7 +4510,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -170, + "y": -160, "z": 0 } }, @@ -4537,7 +4537,7 @@ "__id__": 249 }, "asset": { - "__uuid__": "4ab9580f-7d0c-4a5e-adb5-f15811b676b3", + "__uuid__": "3a12b3d4-afbc-42ab-989d-77e8098f6c57", "__expectedType__": "cc.Prefab" }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", @@ -4548,7 +4548,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c6OXrXso1K+at5pkXGednB", + "fileId": "ecQsfaFT1Gq6QQRDcJy1KI", "prefabRootNode": { "__id__": 1 }, @@ -4572,7 +4572,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -340, + "y": -320, "z": 0 } }, @@ -4597,7 +4597,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 170, - "height": 850 + "height": 800 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4608,7 +4608,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3buAV5K9RCtrP7w3cuqqMP" + "fileId": "adG60YEp9KuKORBW5XfWBN" }, { "__type__": "3791duwVi5PIrPdrc2iiV9u", @@ -4623,7 +4623,7 @@ "__id__": 257 }, "iconWidth": 170, - "iconHeight": 170, + "iconHeight": 160, "iconFactory": { "__id__": 107 }, @@ -4633,7 +4633,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "11U+op8SRGbrGzskuVDtm3" + "fileId": "eb4PnSESBJCI7FdVaA5tZU" }, { "__type__": "cc.PrefabInfo", @@ -4643,7 +4643,7 @@ "asset": { "__id__": 0 }, - "fileId": "ecjHGVYoJEiL3n6j/gQclf", + "fileId": "60f8LEW1BDmIqLXKepsRhh", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4797,7 +4797,7 @@ "__id__": 269 }, "iconWidth": 170, - "iconHeight": 170, + "iconHeight": 160, "iconHMerge": 0, "iconFactory": { "__id__": 107 @@ -8819,7 +8819,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 131.34399999999994, + "y": 131.34400000000005, "z": 0 }, "_lrot": { @@ -11555,7 +11555,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -13890,7 +13890,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -24358,7 +24358,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 286.54400000000004, + "y": 286.5440000000001, "z": 0 }, "_lrot": { @@ -24399,7 +24399,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 926.372 + "height": 926.3720000000003 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -24560,7 +24560,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -25178,7 +25178,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Game/阿拉丁神灯-资源/大厅/thumb-xinxilan.png b/assets/Game/阿拉丁神灯-资源/大厅/thumb-xinxilan.png new file mode 100644 index 0000000..f1430d6 Binary files /dev/null and b/assets/Game/阿拉丁神灯-资源/大厅/thumb-xinxilan.png differ diff --git a/assets/Game/阿拉丁神灯-资源/大厅/thumb-xinxilan.png.meta b/assets/Game/阿拉丁神灯-资源/大厅/thumb-xinxilan.png.meta new file mode 100644 index 0000000..e3495bd --- /dev/null +++ b/assets/Game/阿拉丁神灯-资源/大厅/thumb-xinxilan.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "87287064-98e8-453c-9944-042618e39249", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "87287064-98e8-453c-9944-042618e39249@6c48a", + "displayName": "thumb-xinxilan", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "87287064-98e8-453c-9944-042618e39249", + "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": "87287064-98e8-453c-9944-042618e39249@f9941", + "displayName": "thumb-xinxilan", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 480, + "height": 229, + "rawWidth": 480, + "rawHeight": 229, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -240, + -114.5, + 0, + 240, + -114.5, + 0, + -240, + 114.5, + 0, + 240, + 114.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 229, + 480, + 229, + 0, + 0, + 480, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -240, + -114.5, + 0 + ], + "maxPos": [ + 240, + 114.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "87287064-98e8-453c-9944-042618e39249@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "87287064-98e8-453c-9944-042618e39249@6c48a" + } +} diff --git a/assets/Main/main.scene b/assets/Main/main.scene index 291186b..6e0d249 100644 --- a/assets/Main/main.scene +++ b/assets/Main/main.scene @@ -105,7 +105,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 540, - "y": 960, + "y": 959.9999999999999, "z": 0 }, "_lrot": { @@ -190,7 +190,7 @@ "_priority": 0, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 623.7150127226464, + "_orthoHeight": 959.9999999999999, "_near": 0, "_far": 2000, "_color": { @@ -2361,7 +2361,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2694,7 +2694,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2746,7 +2746,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4897,7 +4897,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 1919.9999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/settings/v2/packages/information.json b/settings/v2/packages/information.json index 051c22a..66d0cb9 100644 --- a/settings/v2/packages/information.json +++ b/settings/v2/packages/information.json @@ -15,7 +15,7 @@ "label": "removeSplash", "enable": true, "removeSplash": { - "complete": false, + "complete": true, "form": "https://creator-api.cocos.com/api/form/show?sid=0ec06da7277f8cd92c7de60e497f8ded" } }