|
|
@@ -110,7 +110,7 @@
|
|
|
"_prefab": null,
|
|
|
"_lpos": {
|
|
|
"__type__": "cc.Vec3",
|
|
|
- "x": 959.9999999999999,
|
|
|
+ "x": 960,
|
|
|
"y": 540,
|
|
|
"z": 0
|
|
|
},
|
|
|
@@ -196,7 +196,11 @@
|
|
|
"_priority": 0,
|
|
|
"_fov": 45,
|
|
|
"_fovAxis": 0,
|
|
|
+<<<<<<< HEAD
|
|
|
"_orthoHeight": 672.9142857142857,
|
|
|
+=======
|
|
|
+ "_orthoHeight": 540,
|
|
|
+>>>>>>> 7179fe9d3a3cec36b3c09fb21f38ba5e222a8b1d
|
|
|
"_near": 0,
|
|
|
"_far": 1000,
|
|
|
"_color": {
|
|
|
@@ -19201,8 +19205,13 @@
|
|
|
"__prefab": null,
|
|
|
"_contentSize": {
|
|
|
"__type__": "cc.Size",
|
|
|
+<<<<<<< HEAD
|
|
|
"width": 345,
|
|
|
"height": 230
|
|
|
+=======
|
|
|
+ "width": 375,
|
|
|
+ "height": 240
|
|
|
+>>>>>>> 7179fe9d3a3cec36b3c09fb21f38ba5e222a8b1d
|
|
|
},
|
|
|
"_anchorPoint": {
|
|
|
"__type__": "cc.Vec2",
|
|
|
@@ -19310,8 +19319,13 @@
|
|
|
"__prefab": null,
|
|
|
"_contentSize": {
|
|
|
"__type__": "cc.Size",
|
|
|
+<<<<<<< HEAD
|
|
|
"width": 345,
|
|
|
"height": 230
|
|
|
+=======
|
|
|
+ "width": 375,
|
|
|
+ "height": 240
|
|
|
+>>>>>>> 7179fe9d3a3cec36b3c09fb21f38ba5e222a8b1d
|
|
|
},
|
|
|
"_anchorPoint": {
|
|
|
"__type__": "cc.Vec2",
|
