|
@@ -211,7 +211,7 @@
|
|
|
"_priority": 0,
|
|
"_priority": 0,
|
|
|
"_fov": 45,
|
|
"_fov": 45,
|
|
|
"_fovAxis": 0,
|
|
"_fovAxis": 0,
|
|
|
- "_orthoHeight": 540,
|
|
|
|
|
|
|
+ "_orthoHeight": 578.2588235294118,
|
|
|
"_near": 0,
|
|
"_near": 0,
|
|
|
"_far": 1000,
|
|
"_far": 1000,
|
|
|
"_color": {
|
|
"_color": {
|
|
@@ -18169,6 +18169,7 @@
|
|
|
"textPointsRank": {
|
|
"textPointsRank": {
|
|
|
"__id__": 494
|
|
"__id__": 494
|
|
|
},
|
|
},
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
"gameItem": {
|
|
"gameItem": {
|
|
|
"__uuid__": "350d1143-68c9-4fde-bd21-c7b260692534",
|
|
"__uuid__": "350d1143-68c9-4fde-bd21-c7b260692534",
|
|
|
"__expectedType__": "cc.Prefab"
|
|
"__expectedType__": "cc.Prefab"
|
|
@@ -18179,6 +18180,8 @@
|
|
|
"rankScroll": {
|
|
"rankScroll": {
|
|
|
"__id__": 511
|
|
"__id__": 511
|
|
|
},
|
|
},
|
|
|
|
|
+=======
|
|
|
|
|
+>>>>>>> parent of 8e36fff (.)
|
|
|
"_id": "3eZyP0k4ZOraWe3PmBfnL7"
|
|
"_id": "3eZyP0k4ZOraWe3PmBfnL7"
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
