Skip to content

M
MingSnake_241120
Commit 74b8e1f0 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

init

parent 1b87129c
Hide whitespace changes
Inline Side-by-side
Showing with 314 additions and 362 deletions
assets/Bundles/MyBagPanel/MyBagItem.prefab
View file @ 74b8e1f0
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 52 "__id__": 54
}, },
{ {
"__id__": 64 "__id__": 64
...@@ -1027,7 +1027,7 @@ ...@@ -1027,7 +1027,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "goBuy", "_name": "goDress",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
...@@ -1047,10 +1047,13 @@ ...@@ -1047,10 +1047,13 @@
}, },
{ {
"__id__": 49 "__id__": 49
},
{
"__id__": 51
} }
], ],
"_prefab": { "_prefab": {
"__id__": 51 "__id__": 53
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1107,7 +1110,7 @@ ...@@ -1107,7 +1110,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e7y42+PUJJ/IhcaB4TrN4E" "fileId": "56z3zcs6lCkJcg+aERDCzx"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1132,7 +1135,7 @@ ...@@ -1132,7 +1135,7 @@
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "2c350a45-e5e6-49a9-830a-0386c65cd1b2@f9941", "__uuid__": "7b116923-fcdd-40cd-9900-dd4a4ef20290@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"_type": 0, "_type": 0,
...@@ -1152,7 +1155,7 @@ ...@@ -1152,7 +1155,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e63Ukc38RNHoqWCB9VolX1" "fileId": "0eFWhA+RdGibyxijhB5y9p"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
...@@ -1188,10 +1191,10 @@ ...@@ -1188,10 +1191,10 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "c8ZpXn4IpPb48xFw3GyPpJ" "fileId": "dezkaLjB5IoY4Ma72sIc3x"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
...@@ -1202,6 +1205,42 @@ ...@@ -1202,6 +1205,42 @@
"__prefab": { "__prefab": {
"__id__": 50 "__id__": 50
}, },
"_alignFlags": 0,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "078spIlsVKEZt41vYhXAqu"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 42
},
"_enabled": true,
"__prefab": {
"__id__": 52
},
"clickEvents": [], "clickEvents": [],
"_interactable": true, "_interactable": true,
"_transition": 3, "_transition": 3,
...@@ -1244,7 +1283,7 @@ ...@@ -1244,7 +1283,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "4eWKWHDLxE4qTlEWaZ1Skp" "fileId": "45sDkyWWhOip/VJ/lHrQHP"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -1254,14 +1293,14 @@ ...@@ -1254,14 +1293,14 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "ecVvn68FpFsq+J+g6BlPar", "fileId": "63AO0HoqtJx5lqi/tpLkwI",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "goDress", "_name": "Derssed",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
...@@ -1270,9 +1309,6 @@ ...@@ -1270,9 +1309,6 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
...@@ -1324,11 +1360,11 @@ ...@@ -1324,11 +1360,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 52 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -1344,7 +1380,7 @@ ...@@ -1344,7 +1380,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "56z3zcs6lCkJcg+aERDCzx" "fileId": "50BByHlFhAYqfwwsWGEJiJ"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1352,11 +1388,11 @@ ...@@ -1352,11 +1388,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 52 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -1369,7 +1405,7 @@ ...@@ -1369,7 +1405,7 @@
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "7b116923-fcdd-40cd-9900-dd4a4ef20290@f9941", "__uuid__": "c5adb6d5-172c-4a84-9d2f-79a79f87414a@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"_type": 0, "_type": 0,
...@@ -1389,7 +1425,7 @@ ...@@ -1389,7 +1425,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "0eFWhA+RdGibyxijhB5y9p" "fileId": "e167c/SxRLKZerqSTD0Ly0"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
...@@ -1397,11 +1433,11 @@ ...@@ -1397,11 +1433,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 52 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_alignFlags": 34, "_alignFlags": 34,
"_target": null, "_target": null,
...@@ -1425,43 +1461,7 @@ ...@@ -1425,43 +1461,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "dezkaLjB5IoY4Ma72sIc3x" "fileId": "e4KLGq3fFJlIYTBUUy0sLu"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 52
},
"_enabled": true,
"__prefab": {
"__id__": 60
},
"_alignFlags": 0,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "078spIlsVKEZt41vYhXAqu"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
...@@ -1469,7 +1469,7 @@ ...@@ -1469,7 +1469,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 52 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
...@@ -1517,7 +1517,7 @@ ...@@ -1517,7 +1517,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "45sDkyWWhOip/VJ/lHrQHP" "fileId": "eciQvv6OtBZrvtYZSfijMy"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -1527,14 +1527,14 @@ ...@@ -1527,14 +1527,14 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "63AO0HoqtJx5lqi/tpLkwI", "fileId": "73UVCtipJDB7Sq4XaCRLcY",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Derssed", "_name": "goBuy",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
...@@ -1614,7 +1614,7 @@ ...@@ -1614,7 +1614,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "50BByHlFhAYqfwwsWGEJiJ" "fileId": "e7y42+PUJJ/IhcaB4TrN4E"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1639,7 +1639,7 @@ ...@@ -1639,7 +1639,7 @@
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c5adb6d5-172c-4a84-9d2f-79a79f87414a@f9941", "__uuid__": "2c350a45-e5e6-49a9-830a-0386c65cd1b2@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"_type": 0, "_type": 0,
...@@ -1659,7 +1659,7 @@ ...@@ -1659,7 +1659,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e167c/SxRLKZerqSTD0Ly0" "fileId": "e63Ukc38RNHoqWCB9VolX1"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
...@@ -1695,7 +1695,7 @@ ...@@ -1695,7 +1695,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e4KLGq3fFJlIYTBUUy0sLu" "fileId": "c8ZpXn4IpPb48xFw3GyPpJ"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
...@@ -1751,7 +1751,7 @@ ...@@ -1751,7 +1751,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "eciQvv6OtBZrvtYZSfijMy" "fileId": "4eWKWHDLxE4qTlEWaZ1Skp"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -1761,7 +1761,7 @@ ...@@ -1761,7 +1761,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "73UVCtipJDB7Sq4XaCRLcY", "fileId": "ecVvn68FpFsq+J+g6BlPar",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
...@@ -1858,7 +1858,7 @@ ...@@ -1858,7 +1858,7 @@
{ {
"__type__": "SkinNode", "__type__": "SkinNode",
"node": { "node": {
"__id__": 42 "__id__": 64
}, },
"type": 0, "type": 0,
"color1": { "color1": {
...@@ -1880,7 +1880,7 @@ ...@@ -1880,7 +1880,7 @@
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"skin2": { "skin2": {
"__uuid__": "3802228e-9e2f-4e1a-98a3-c0146817751a@f9941", "__uuid__": "13efdb8b-16ac-4686-855e-10f39455ff2f@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"node1": null, "node1": null,
...@@ -1889,7 +1889,7 @@ ...@@ -1889,7 +1889,7 @@
{ {
"__type__": "SkinNode", "__type__": "SkinNode",
"node": { "node": {
"__id__": 52 "__id__": 42
}, },
"type": 0, "type": 0,
"color1": { "color1": {
......
assets/Bundles/MyBagPanel/png/黄色皮肤/继续购买.png.meta → assets/Bundles/MyBagPanel/png/黄色皮肤/黄前往兑换.png.meta
View file @ 74b8e1f0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"ver": "1.0.27", "ver": "1.0.27",
"importer": "image", "importer": "image",
"imported": true, "imported": true,
"uuid": "3802228e-9e2f-4e1a-98a3-c0146817751a", "uuid": "13efdb8b-16ac-4686-855e-10f39455ff2f",
"files": [ "files": [
".json", ".json",
".png" ".png"
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
"subMetas": { "subMetas": {
"6c48a": { "6c48a": {
"importer": "texture", "importer": "texture",
"uuid": "3802228e-9e2f-4e1a-98a3-c0146817751a@6c48a", "uuid": "13efdb8b-16ac-4686-855e-10f39455ff2f@6c48a",
"displayName": "继续购买", "displayName": "黄前往兑换",
"id": "6c48a", "id": "6c48a",
"name": "texture", "name": "texture",
"userData": { "userData": {
"wrapModeS": "clamp-to-edge", "wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge", "wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "3802228e-9e2f-4e1a-98a3-c0146817751a", "imageUuidOrDatabaseUri": "13efdb8b-16ac-4686-855e-10f39455ff2f",
"isUuid": true, "isUuid": true,
"visible": false, "visible": false,
"minfilter": "linear", "minfilter": "linear",
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
}, },
"f9941": { "f9941": {
"importer": "sprite-frame", "importer": "sprite-frame",
"uuid": "3802228e-9e2f-4e1a-98a3-c0146817751a@f9941", "uuid": "13efdb8b-16ac-4686-855e-10f39455ff2f@f9941",
"displayName": "继续购买", "displayName": "黄前往兑换",
"id": "f9941", "id": "f9941",
"name": "spriteFrame", "name": "spriteFrame",
"userData": { "userData": {
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
] ]
}, },
"isUuid": true, "isUuid": true,
"imageUuidOrDatabaseUri": "3802228e-9e2f-4e1a-98a3-c0146817751a@6c48a", "imageUuidOrDatabaseUri": "13efdb8b-16ac-4686-855e-10f39455ff2f@6c48a",
"atlasUuid": "" "atlasUuid": ""
}, },
"ver": "1.0.12", "ver": "1.0.12",
...@@ -129,6 +129,6 @@ ...@@ -129,6 +129,6 @@
"type": "sprite-frame", "type": "sprite-frame",
"hasAlpha": true, "hasAlpha": true,
"fixAlphaTransparencyArtifacts": false, "fixAlphaTransparencyArtifacts": false,
"redirect": "3802228e-9e2f-4e1a-98a3-c0146817751a@6c48a" "redirect": "13efdb8b-16ac-4686-855e-10f39455ff2f@6c48a"
} }
} }
assets/Bundles/PropPop/PropPop.prefab
View file @ 74b8e1f0
...@@ -20,27 +20,6 @@ ...@@ -20,27 +20,6 @@
"_children": [ "_children": [
{ {
"__id__": 2 "__id__": 2
},
{
"__id__": 14
},
{
"__id__": 28
},
{
"__id__": 36
},
{
"__id__": 42
},
{
"__id__": 48
},
{
"__id__": 56
},
{
"__id__": 64
} }
], ],
"_active": true, "_active": true,
...@@ -59,7 +38,7 @@ ...@@ -59,7 +38,7 @@
} }
], ],
"_prefab": { "_prefab": {
"__id__": 83 "__id__": 79
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -101,19 +80,40 @@ ...@@ -101,19 +80,40 @@
"_children": [ "_children": [
{ {
"__id__": 3 "__id__": 3
},
{
"__id__": 9
},
{
"__id__": 23
},
{
"__id__": 31
},
{
"__id__": 37
},
{
"__id__": 43
},
{
"__id__": 51
},
{
"__id__": 59
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 9 "__id__": 65
}, },
{ {
"__id__": 11 "__id__": 67
} }
], ],
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 69
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -130,8 +130,8 @@ ...@@ -130,8 +130,8 @@
}, },
"_lscale": { "_lscale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 1, "x": 1.4,
"y": 1, "y": 1.4,
"z": 1 "z": 1
}, },
"_mobility": 0, "_mobility": 0,
...@@ -280,119 +280,33 @@ ...@@ -280,119 +280,33 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 10
},
"_contentSize": {
"__type__": "cc.Size",
"width": 640,
"height": 280
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "ceAMn+CSRMPqFxbTU1Disa"
},
{
"__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__": "bfa0572c-c9f1-4c14-9bcf-122221f05735@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": "1av7xdnWNOy7sFYuFdZaOX"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "2dbF4OJ3hFepCMlET8WaON",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 1 "__id__": 2
}, },
"_children": [ "_children": [
{ {
"__id__": 15 "__id__": 10
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 21 "__id__": 16
}, },
{ {
"__id__": 23 "__id__": 18
}, },
{ {
"__id__": 25 "__id__": 20
} }
], ],
"_prefab": { "_prefab": {
"__id__": 27 "__id__": 22
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -429,20 +343,20 @@ ...@@ -429,20 +343,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 14 "__id__": 9
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 16 "__id__": 11
}, },
{ {
"__id__": 18 "__id__": 13
} }
], ],
"_prefab": { "_prefab": {
"__id__": 20 "__id__": 15
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -479,11 +393,11 @@ ...@@ -479,11 +393,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 15 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 17 "__id__": 12
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -507,11 +421,11 @@ ...@@ -507,11 +421,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 15 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 19 "__id__": 14
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -588,11 +502,11 @@ ...@@ -588,11 +502,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 14 "__id__": 9
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 22 "__id__": 17
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -616,11 +530,11 @@ ...@@ -616,11 +530,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 14 "__id__": 9
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 24 "__id__": 19
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -661,11 +575,11 @@ ...@@ -661,11 +575,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 14 "__id__": 9
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 26 "__id__": 21
}, },
"clickEvents": [], "clickEvents": [],
"_interactable": true, "_interactable": true,
...@@ -730,27 +644,27 @@ ...@@ -730,27 +644,27 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 1 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 29 "__id__": 24
}, },
{ {
"__id__": 31 "__id__": 26
}, },
{ {
"__id__": 33 "__id__": 28
} }
], ],
"_prefab": { "_prefab": {
"__id__": 35 "__id__": 30
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 317.28700000000003, "x": 317.2869999999999,
"y": 136.37599999999998, "y": 136.37599999999998,
"z": 0 "z": 0
}, },
...@@ -783,11 +697,11 @@ ...@@ -783,11 +697,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 28 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 30 "__id__": 25
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -811,11 +725,11 @@ ...@@ -811,11 +725,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 28 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 32 "__id__": 27
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -856,11 +770,11 @@ ...@@ -856,11 +770,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 28 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 34 "__id__": 29
}, },
"clickEvents": [], "clickEvents": [],
"_interactable": true, "_interactable": true,
...@@ -925,20 +839,20 @@ ...@@ -925,20 +839,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 1 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 32
}, },
{ {
"__id__": 39 "__id__": 34
} }
], ],
"_prefab": { "_prefab": {
"__id__": 41 "__id__": 36
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -975,11 +889,11 @@ ...@@ -975,11 +889,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 36 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 38 "__id__": 33
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -1003,11 +917,11 @@ ...@@ -1003,11 +917,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 36 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 40 "__id__": 35
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -1084,20 +998,20 @@ ...@@ -1084,20 +998,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 1 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 38
}, },
{ {
"__id__": 45 "__id__": 40
} }
], ],
"_prefab": { "_prefab": {
"__id__": 47 "__id__": 42
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1134,11 +1048,11 @@ ...@@ -1134,11 +1048,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 44 "__id__": 39
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -1162,11 +1076,11 @@ ...@@ -1162,11 +1076,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 46 "__id__": 41
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -1243,23 +1157,23 @@ ...@@ -1243,23 +1157,23 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 1 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 44
}, },
{ {
"__id__": 51 "__id__": 46
}, },
{ {
"__id__": 53 "__id__": 48
} }
], ],
"_prefab": { "_prefab": {
"__id__": 55 "__id__": 50
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1296,11 +1210,11 @@ ...@@ -1296,11 +1210,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 48 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 50 "__id__": 45
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -1324,11 +1238,11 @@ ...@@ -1324,11 +1238,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 48 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 52 "__id__": 47
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -1369,11 +1283,11 @@ ...@@ -1369,11 +1283,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 48 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 49
}, },
"clickEvents": [], "clickEvents": [],
"_interactable": true, "_interactable": true,
...@@ -1413,7 +1327,7 @@ ...@@ -1413,7 +1327,7 @@
"_duration": 0.05, "_duration": 0.05,
"_zoomScale": 0.9, "_zoomScale": 0.9,
"_target": { "_target": {
"__id__": 48 "__id__": 43
}, },
"_id": "" "_id": ""
}, },
...@@ -1440,23 +1354,23 @@ ...@@ -1440,23 +1354,23 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 1 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 52
}, },
{ {
"__id__": 59 "__id__": 54
}, },
{ {
"__id__": 61 "__id__": 56
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 58
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1493,11 +1407,11 @@ ...@@ -1493,11 +1407,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 56 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 53
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -1521,11 +1435,11 @@ ...@@ -1521,11 +1435,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 56 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 55
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -1566,11 +1480,11 @@ ...@@ -1566,11 +1480,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 56 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 57
}, },
"clickEvents": [], "clickEvents": [],
"_interactable": true, "_interactable": true,
...@@ -1610,7 +1524,7 @@ ...@@ -1610,7 +1524,7 @@
"_duration": 0.05, "_duration": 0.05,
"_zoomScale": 0.9, "_zoomScale": 0.9,
"_target": { "_target": {
"__id__": 56 "__id__": 51
}, },
"_id": "" "_id": ""
}, },
...@@ -1637,20 +1551,20 @@ ...@@ -1637,20 +1551,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 1 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 60
}, },
{ {
"__id__": 67 "__id__": 62
} }
], ],
"_prefab": { "_prefab": {
"__id__": 69 "__id__": 64
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1687,11 +1601,11 @@ ...@@ -1687,11 +1601,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 64 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 66 "__id__": 61
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -1715,11 +1629,11 @@ ...@@ -1715,11 +1629,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 64 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 68 "__id__": 63
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
...@@ -1793,6 +1707,92 @@ ...@@ -1793,6 +1707,92 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 66
},
"_contentSize": {
"__type__": "cc.Size",
"width": 640,
"height": 280
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "ceAMn+CSRMPqFxbTU1Disa"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 68
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "bfa0572c-c9f1-4c14-9bcf-122221f05735@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": "1av7xdnWNOy7sFYuFdZaOX"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "2dbF4OJ3hFepCMlET8WaON",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
"_name": "", "_name": "",
...@@ -1807,7 +1807,7 @@ ...@@ -1807,7 +1807,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1624, "width": 1623.9999999999998,
"height": 750 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -1870,31 +1870,31 @@ ...@@ -1870,31 +1870,31 @@
"__id__": 75 "__id__": 75
}, },
"prizeName": { "prizeName": {
"__id__": 39 "__id__": 34
}, },
"closeBtn": { "closeBtn": {
"__id__": 28 "__id__": 23
}, },
"btn": { "btn": {
"__id__": 14 "__id__": 9
}, },
"prize": { "prize": {
"__id__": 6 "__id__": 6
}, },
"explanation": { "explanation": {
"__id__": 45 "__id__": 40
}, },
"num": { "num": {
"__id__": 18 "__id__": 13
}, },
"add": { "add": {
"__id__": 48 "__id__": 43
}, },
"sub": { "sub": {
"__id__": 56 "__id__": 51
}, },
"numTxt": { "numTxt": {
"__id__": 67 "__id__": 62
}, },
"_id": "" "_id": ""
}, },
...@@ -1917,18 +1917,6 @@ ...@@ -1917,18 +1917,6 @@
"skinNodeArr": [ "skinNodeArr": [
{ {
"__id__": 78 "__id__": 78
},
{
"__id__": 79
},
{
"__id__": 80
},
{
"__id__": 81
},
{
"__id__": 82
} }
], ],
"_genSkinNode": true, "_genSkinNode": true,
...@@ -1941,7 +1929,7 @@ ...@@ -1941,7 +1929,7 @@
{ {
"__type__": "SkinNode", "__type__": "SkinNode",
"node": { "node": {
"__id__": 28 "__id__": 23
}, },
"type": 0, "type": 0,
"color1": { "color1": {
...@@ -1969,66 +1957,6 @@ ...@@ -1969,66 +1957,6 @@
"node1": null, "node1": null,
"node2": null "node2": null
}, },
{
"__type__": "SkinNode",
"node": {
"__id__": 2
},
"type": 0,
"skin1": {
"__uuid__": "bfa0572c-c9f1-4c14-9bcf-122221f05735@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"skin2": null,
"node1": null,
"node2": null
},
{
"__type__": "SkinNode",
"node": {
"__id__": 3
},
"type": 0,
"skin1": {
"__uuid__": "cdd6083a-9c8e-42ee-bf6f-1cb644b72109@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"skin2": null,
"node1": null,
"node2": null
},
{
"__type__": "SkinNode",
"node": {
"__id__": 14
},
"type": 0,
"skin1": {
"__uuid__": "920d5605-e706-4595-b898-7e68fb4a54f0@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"skin2": null,
"node1": null,
"node2": null
},
{
"__type__": "SkinNode",
"node": {
"__id__": 15
},
"type": 1,
"color1": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"skin1": null,
"skin2": null,
"node1": null,
"node2": null
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
......
assets/Scripts/Panels/ProPop.ts
View file @ 74b8e1f0
...@@ -33,7 +33,8 @@ export default class ProPop extends Panel { ...@@ -33,7 +33,8 @@ export default class ProPop extends Panel {
} }
set buyNum(val) { set buyNum(val) {
val = math.clamp(1, 99, val); const max = Math.min(~~(store.exchangeInfo.remainCredits / +this.data.consumeCreditsNum), 99);
val = math.clamp(1, max, val);
this._buyNum = val; this._buyNum = val;
this.numTxt.string = `${val}`; this.numTxt.string = `${val}`;
this.num.string = `${(+this.data.consumeCreditsNum) * val}`; this.num.string = `${(+this.data.consumeCreditsNum) * val}`;
...@@ -42,8 +43,13 @@ export default class ProPop extends Panel { ...@@ -42,8 +43,13 @@ export default class ProPop extends Panel {
onLoad() { onLoad() {
this.closeBtn.on(Button.EventType.CLICK, this.clickClose); this.closeBtn.on(Button.EventType.CLICK, this.clickClose);
this.btn.on(Button.EventType.CLICK, this.clickExchange); this.btn.on(Button.EventType.CLICK, this.clickExchange);
this.add.on(Button.EventType.CLICK, this.clickAdd); this.add.on(Node.EventType.TOUCH_START, this.startAdd);
this.sub.on(Button.EventType.CLICK, this.clickSub); this.add.on(Node.EventType.TOUCH_END, this.endAdd);
this.add.on(Node.EventType.TOUCH_CANCEL, this.endAdd);
this.sub.on(Node.EventType.TOUCH_START, this.startSub);
this.sub.on(Node.EventType.TOUCH_END, this.endSub);
this.sub.on(Node.EventType.TOUCH_CANCEL, this.endSub);
} }
start() { start() {
...@@ -68,14 +74,32 @@ export default class ProPop extends Panel { ...@@ -68,14 +74,32 @@ export default class ProPop extends Panel {
this.prizeName.string = optionName; this.prizeName.string = optionName;
} }
clickAdd = () => { startAdd = () => {
this.buyNum++;
this.schedule(this.scheduleAdd, 0.05, 100, 1);
};
scheduleAdd = () => {
this.buyNum++; this.buyNum++;
}
endAdd = () => {
this.unschedule(this.scheduleAdd);
}; };
clickSub = () => { startSub = () => {
this.buyNum--; this.buyNum--;
this.schedule(this.scheduleSub, 0.05, 100, 1);
}; };
scheduleSub = () => {
this.buyNum--;
}
endSub = () => {
this.unschedule(this.scheduleSub);
}
clickClose = () => { clickClose = () => {
this.hidePanel(); this.hidePanel();
}; };
......
preview-template/mock/exchange/queryExchangeList.do.json
View file @ 74b8e1f0
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"message": "eu in", "message": "eu in",
"code": "enim", "code": "enim",
"data": { "data": {
"remainCredits": 123, "remainCredits": 20000,
"exchangeShopList": [ "exchangeShopList": [
{ {
"id": "id1", "id": "id1",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment