Commit 962684fa authored by 覃遵洋's avatar 覃遵洋

Merge branch 'master' of http://gitlab.llewan.com/llewan/cdn

parents 5f732df1 e915bde0
This source diff could not be displayed because it is too large. You can view the blob instead.
[{"__type__":"cc.SpriteFrame","content":{"name":"back_underGround2","texture":"e3fjDlyEJKgI36bz+vH0VB","rect":[0,0,1920,874],"offset":[0,0.5],"originalSize":[1920,875]}},[{"__type__":"cc.SceneAsset","_name":"test","scene":{"__id__":1},"asyncLoadAssets":null},{"__type__":"cc.Scene","_name":"New Node","_children":[{"__id__":2}],"_anchorPoint":{"__type__":"cc.Vec2"},"autoReleaseAssets":false},{"__type__":"cc.Node","_name":"Canvas","_parent":{"__id__":1},"_children":[{"__id__":3},{"__id__":4},{"__id__":5}],"_components":[{"__type__":"cc.Canvas","node":{"__id__":2},"_designResolution":{"__type__":"cc.Size","width":720,"height":1280}}],"_id":"c1agjJyw1Ofax7qL93bIDR","_contentSize":{"__type__":"cc.Size","width":720,"height":1280},"_position":{"__type__":"cc.Vec2","x":360,"y":640}},{"__type__":"cc.Node","_name":"back_underGround2","_parent":{"__id__":2},"_components":[{"__type__":"cc.Sprite","node":{"__id__":3},"_spriteFrame":{"__uuid__":"1frMYVBHNLHozjeJXhJ2pu"}}],"_contentSize":{"__type__":"cc.Size","width":1920,"height":874}},{"__type__":"cc.Node","_name":"c013","_parent":{"__id__":2},"_components":[{"__type__":"sp.Skeleton","node":{"__id__":4},"defaultAnimation":"await1","loop":false,"_premultipliedAlpha":false,"_N$skeletonData":{"__uuid__":"a9CMnqfgFLE7glqF1jfiNv"}}]},{"__type__":"cc.Node","_name":"b001","_parent":{"__id__":2},"_components":[{"__type__":"sp.Skeleton","node":{"__id__":5},"defaultAnimation":"evolution","_premultipliedAlpha":false,"_N$skeletonData":{"__uuid__":"09VA5sxc9EX4MgkvNgI/2I"}}]}]]
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
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