Commit 92719a2e authored by liujiaxin's avatar liujiaxin

123

parent f4053fd2
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1200,
"height": 750 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -294,8 +294,8 @@ ...@@ -294,8 +294,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1200,
"height": 720 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2426,7 +2426,7 @@ ...@@ -2426,7 +2426,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-519.51, -520,
30, 30,
0, 0,
0, 0,
...@@ -2679,7 +2679,7 @@ ...@@ -2679,7 +2679,7 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 12, "_alignFlags": 12,
"_left": 14.490000000000009, "_left": 14,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 215, "_bottom": 215,
...@@ -5163,7 +5163,7 @@ ...@@ -5163,7 +5163,7 @@
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0.5,
"y": 0.5 "y": 0.6
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
...@@ -6522,8 +6522,8 @@ ...@@ -6522,8 +6522,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-520, -540,
319.081, 321,
0, 0,
0, 0,
0, 0,
...@@ -9538,7 +9538,7 @@ ...@@ -9538,7 +9538,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1200,
"height": 750 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -9607,7 +9607,7 @@ ...@@ -9607,7 +9607,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1200,
"height": 750 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -9672,7 +9672,7 @@ ...@@ -9672,7 +9672,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1200,
"height": 124 "height": 124
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -9787,7 +9787,7 @@ ...@@ -9787,7 +9787,7 @@
"__uuid__": "d88668a8-d2ac-416a-97df-5f5fd170805c" "__uuid__": "d88668a8-d2ac-416a-97df-5f5fd170805c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -9871,7 +9871,7 @@ ...@@ -9871,7 +9871,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
511.83799999999997, 444.83799999999997,
325.792, 325.792,
0, 0,
0, 0,
...@@ -10090,7 +10090,7 @@ ...@@ -10090,7 +10090,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-419.49000000000007, -352.49000000000007,
327.692, 327.692,
0, 0,
0, 0,
...@@ -10218,7 +10218,7 @@ ...@@ -10218,7 +10218,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-606.89, -539.89,
319.993, 319.993,
0, 0,
0, 0,
...@@ -10393,7 +10393,7 @@ ...@@ -10393,7 +10393,7 @@
"__id__": 301 "__id__": 301
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 318 "__id__": 318
...@@ -10410,7 +10410,7 @@ ...@@ -10410,7 +10410,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1200, "width": 1100,
"height": 260 "height": 260
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -10474,7 +10474,7 @@ ...@@ -10474,7 +10474,7 @@
"__id__": 263 "__id__": 263
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 265 "__id__": 265
...@@ -10506,7 +10506,7 @@ ...@@ -10506,7 +10506,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-453, -433,
-10, -10,
0, 0,
0, 0,
...@@ -11203,7 +11203,7 @@ ...@@ -11203,7 +11203,7 @@
"__uuid__": "770c908b-f439-437b-9bd7-0a01a7eb3977" "__uuid__": "770c908b-f439-437b-9bd7-0a01a7eb3977"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -11313,7 +11313,7 @@ ...@@ -11313,7 +11313,7 @@
"__id__": 280 "__id__": 280
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 282 "__id__": 282
...@@ -11345,7 +11345,7 @@ ...@@ -11345,7 +11345,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-149, -139,
-10, -10,
0, 0,
0, 0,
...@@ -12152,7 +12152,7 @@ ...@@ -12152,7 +12152,7 @@
"__id__": 297 "__id__": 297
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 299 "__id__": 299
...@@ -12991,7 +12991,7 @@ ...@@ -12991,7 +12991,7 @@
"__id__": 314 "__id__": 314
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 316 "__id__": 316
...@@ -13023,7 +13023,7 @@ ...@@ -13023,7 +13023,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
459, 449,
-10, -10,
0, 0,
0, 0,
...@@ -13813,7 +13813,7 @@ ...@@ -13813,7 +13813,7 @@
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1200, "width": 1100,
"height": 260 "height": 260
}, },
"_resize": 0, "_resize": 0,
...@@ -13824,11 +13824,11 @@ ...@@ -13824,11 +13824,11 @@
"height": 40 "height": 40
}, },
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 40, "_N$paddingLeft": 10,
"_N$paddingRight": 0, "_N$paddingRight": 0,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 90, "_N$spacingX": 80,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
...@@ -14216,7 +14216,7 @@ ...@@ -14216,7 +14216,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1200,
"height": 750 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14297,7 +14297,7 @@ ...@@ -14297,7 +14297,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1200,
"height": 750 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14362,7 +14362,7 @@ ...@@ -14362,7 +14362,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1066,
"height": 86 "height": 86
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14442,8 +14442,8 @@ ...@@ -14442,8 +14442,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 40, "_alignFlags": 40,
"_left": 0, "_left": 67,
"_right": 0, "_right": 67,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -14486,7 +14486,7 @@ ...@@ -14486,7 +14486,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1066,
"height": 86 "height": 86
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14566,8 +14566,8 @@ ...@@ -14566,8 +14566,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 40, "_alignFlags": 40,
"_left": 0, "_left": 67,
"_right": 0, "_right": 67,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -14622,7 +14622,7 @@ ...@@ -14622,7 +14622,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-580.727, -513.727,
0, 0,
0, 0,
0, 0,
...@@ -14734,7 +14734,7 @@ ...@@ -14734,7 +14734,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1200,
"height": 86 "height": 86
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14790,7 +14790,7 @@ ...@@ -14790,7 +14790,7 @@
"__uuid__": "b60c2e7c-21d7-4557-8e41-0b58f7867ea7" "__uuid__": "b60c2e7c-21d7-4557-8e41-0b58f7867ea7"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -14849,7 +14849,7 @@ ...@@ -14849,7 +14849,7 @@
"__uuid__": "a85dd4c8-0b1e-497f-a5dd-9a5422f291da" "__uuid__": "a85dd4c8-0b1e-497f-a5dd-9a5422f291da"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -14946,7 +14946,7 @@ ...@@ -14946,7 +14946,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1335, "width": 1200,
"height": 750 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -15026,7 +15026,7 @@ ...@@ -15026,7 +15026,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-584.638, -517.138,
176.679, 176.679,
0, 0,
0, 0,
...@@ -15221,7 +15221,7 @@ ...@@ -15221,7 +15221,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-585.638, -518.138,
-76.121, -76.121,
0, 0,
0, 0,
...@@ -15416,7 +15416,7 @@ ...@@ -15416,7 +15416,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-588.094, -520.594,
55.249, 55.249,
0, 0,
0, 0,
...@@ -15608,7 +15608,7 @@ ...@@ -15608,7 +15608,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-521.054, -453.554,
0, 0,
0, 0,
0, 0,
...@@ -15735,7 +15735,7 @@ ...@@ -15735,7 +15735,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-573.133, -505.63300000000004,
177.025, 177.025,
0, 0,
0, 0,
...@@ -15930,7 +15930,7 @@ ...@@ -15930,7 +15930,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-575.816, -508.31600000000003,
54.021, 54.021,
0, 0,
0, 0,
...@@ -16125,7 +16125,7 @@ ...@@ -16125,7 +16125,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-585.639, -518.139,
-74.893, -74.893,
0, 0,
0, 0,
...@@ -16288,8 +16288,8 @@ ...@@ -16288,8 +16288,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": -0.5, "_left": 0,
"_right": -0.5, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -16347,7 +16347,7 @@ ...@@ -16347,7 +16347,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-607.539, -540.539,
321.671, 321.671,
0, 0,
0, 0,
...@@ -16543,7 +16543,7 @@ ...@@ -16543,7 +16543,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
511.83799999999997, 444.83799999999997,
325.792, 325.792,
0, 0,
0, 0,
...@@ -16762,7 +16762,7 @@ ...@@ -16762,7 +16762,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-471.65, -404.65,
325.355, 325.355,
0, 0,
0, 0,
...@@ -16885,7 +16885,7 @@ ...@@ -16885,7 +16885,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1093, "width": 997,
"height": 320 "height": 320
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -16959,7 +16959,7 @@ ...@@ -16959,7 +16959,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-420.5, -372.5,
0, 0,
0, 0,
0, 0,
...@@ -18081,7 +18081,7 @@ ...@@ -18081,7 +18081,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-133.5, -117.5,
0, 0,
0, 0,
0, 0,
...@@ -19203,7 +19203,7 @@ ...@@ -19203,7 +19203,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
153.5, 137.5,
0, 0,
0, 0,
0, 0,
...@@ -20325,7 +20325,7 @@ ...@@ -20325,7 +20325,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
440.5, 392.5,
0, 0,
0, 0,
0, 0,
...@@ -21420,10 +21420,10 @@ ...@@ -21420,10 +21420,10 @@
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1093, "width": 997,
"height": 320 "height": 320
}, },
"_resize": 0, "_resize": 1,
"_N$layoutType": 1, "_N$layoutType": 1,
"_N$cellSize": { "_N$cellSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -21435,7 +21435,7 @@ ...@@ -21435,7 +21435,7 @@
"_N$paddingRight": 0, "_N$paddingRight": 0,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 75, "_N$spacingX": 43,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
...@@ -21474,7 +21474,7 @@ ...@@ -21474,7 +21474,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1100, "width": 1000,
"height": 650 "height": 650
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -21540,7 +21540,7 @@ ...@@ -21540,7 +21540,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1100, "width": 1000,
"height": 650 "height": 650
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -21602,7 +21602,7 @@ ...@@ -21602,7 +21602,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1100, "width": 1000,
"height": 320 "height": 320
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -21649,7 +21649,7 @@ ...@@ -21649,7 +21649,7 @@
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1100, "width": 1000,
"height": 320 "height": 320
}, },
"_resize": 1, "_resize": 1,
...@@ -21878,8 +21878,8 @@ ...@@ -21878,8 +21878,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 5000, "width": 1200,
"height": 5000 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -21941,7 +21941,7 @@ ...@@ -21941,7 +21941,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9bbda31e-ad49-43c9-aaf2-f7d9896bac69" "__uuid__": "e58ceeac-13e1-4a70-ada2-51b11ef3d40b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -22761,7 +22761,7 @@ ...@@ -22761,7 +22761,7 @@
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 100, "_opacity": 101,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 0, "r": 0,
...@@ -22771,8 +22771,8 @@ ...@@ -22771,8 +22771,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 5000, "width": 1200,
"height": 5000 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -22824,7 +22824,7 @@ ...@@ -22824,7 +22824,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9bbda31e-ad49-43c9-aaf2-f7d9896bac69" "__uuid__": "e58ceeac-13e1-4a70-ada2-51b11ef3d40b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -23753,8 +23753,8 @@ ...@@ -23753,8 +23753,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 5000, "width": 1200,
"height": 5000 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -23806,7 +23806,7 @@ ...@@ -23806,7 +23806,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9bbda31e-ad49-43c9-aaf2-f7d9896bac69" "__uuid__": "e58ceeac-13e1-4a70-ada2-51b11ef3d40b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -24342,8 +24342,8 @@ ...@@ -24342,8 +24342,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 5000, "width": 1200,
"height": 5000 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -24395,7 +24395,7 @@ ...@@ -24395,7 +24395,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9bbda31e-ad49-43c9-aaf2-f7d9896bac69" "__uuid__": "e58ceeac-13e1-4a70-ada2-51b11ef3d40b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -24765,8 +24765,8 @@ ...@@ -24765,8 +24765,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 5000, "width": 1200,
"height": 5000 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -24818,7 +24818,7 @@ ...@@ -24818,7 +24818,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9bbda31e-ad49-43c9-aaf2-f7d9896bac69" "__uuid__": "e58ceeac-13e1-4a70-ada2-51b11ef3d40b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -25413,7 +25413,7 @@ ...@@ -25413,7 +25413,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1200,
"height": 750 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -25478,7 +25478,7 @@ ...@@ -25478,7 +25478,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 1200,
"height": 750 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -25531,7 +25531,7 @@ ...@@ -25531,7 +25531,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" "__uuid__": "e58ceeac-13e1-4a70-ada2-51b11ef3d40b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
......
{
"ver": "2.3.5",
"uuid": "0bca6776-58eb-4874-973b-9cb4c6679290",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 20,
"height": 20,
"platformSettings": {},
"subMetas": {
"white": {
"ver": "1.0.4",
"uuid": "e58ceeac-13e1-4a70-ada2-51b11ef3d40b",
"rawTextureUuid": "0bca6776-58eb-4874-973b-9cb4c6679290",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 20,
"height": 20,
"rawWidth": 20,
"rawHeight": 20,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{ {
"title": "play", "title": "play",
"packageName": "org.cocos2d.demo", "packageName": "org.cocos2d.demo",
"startScene": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3", "startScene": "0549dbe2-6b62-4185-9f54-d1ff0c7e63cb",
"excludeScenes": [], "excludeScenes": [],
"includeSDKBox": false, "includeSDKBox": false,
"orientation": { "orientation": {
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
}, },
"ios": { "ios": {
"REMOTE_SERVER_ROOT": "", "REMOTE_SERVER_ROOT": "",
"packageName": "org.cocos2d.demo" "packageName": "org.cocos2d.demo",
"ios_enable_jit": true
}, },
"mac": { "mac": {
"REMOTE_SERVER_ROOT": "", "REMOTE_SERVER_ROOT": "",
...@@ -50,5 +51,6 @@ ...@@ -50,5 +51,6 @@
"scheme": "https", "scheme": "https",
"skipRecord": false "skipRecord": false
}, },
"appBundle": false "appBundle": false,
"agreements": {}
} }
...@@ -2,5 +2,39 @@ ...@@ -2,5 +2,39 @@
"last-module-event-record-time": 1600677246969, "last-module-event-record-time": 1600677246969,
"migrate-history": [ "migrate-history": [
"cloud-function" "cloud-function"
] ],
"group-list": [
"default"
],
"collision-matrix": [
[
true
]
],
"excluded-modules": [
"3D Physics/Builtin"
],
"preview-port": 7456,
"design-resolution-width": 1200,
"design-resolution-height": 750,
"fit-width": true,
"fit-height": true,
"use-project-simulator-setting": false,
"simulator-orientation": false,
"use-customize-simulator": true,
"simulator-resolution": {
"width": 960,
"height": 640
},
"clear-simulator-cache": true,
"facebook": {
"enable": false,
"appID": "",
"live": {
"enable": false
},
"audience": {
"enable": false
}
}
} }
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