Commit eb0d5e23 authored by yu's avatar yu

Merge branch 'master' of http://120.27.1.210:43210/root/mrbr04

parents c353b819 b8060c58
......@@ -8231,8 +8231,8 @@
0,
0,
1,
0.2,
0.2,
0.11,
0.11,
1
]
},
......@@ -8393,8 +8393,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
5454.443,
-2366.485,
4871.09,
-2441.756,
0,
0,
0,
......@@ -8865,13 +8865,13 @@
"_enabled": true,
"startPosition": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
"x": 8000,
"y": -2440.2
},
"targetPosition": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
"x": 4871.09,
"y": -2440.2
},
"moveInTime": 1,
"_id": "e8cKr7zhZHuYKHHxTDRZZj"
......
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