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

qubapikashu-weixin/v1.0.6/res/import/00/008aad8d-bf69-4b36-8446-972915e14ccf.json

+{"__type__":"cc.SpriteFrame","content":{"name":"b029","texture":"86pR1BHIxJnLkEzbZhXK4p","rect":[3,3,296,299],"offset":[-1.5,0],"originalSize":[305,305]}}
\ No newline at end of file

qubapikashu-weixin/v1.0.6/res/import/01/016ba7c4b.json

+[[{"__type__":"cc.SceneAsset","_name":"Loading","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__":11}],"_components":[{"__type__":"cc.Canvas","node":{"__id__":2},"_designResolution":{"__type__":"cc.Size","width":750,"height":1334}}],"_id":"1cgXERmAtM4bNVTUvyC8ws","_contentSize":{"__type__":"cc.Size","width":750,"height":1334},"_position":{"__type__":"cc.Vec2","x":375,"y":667}},{"__type__":"cc.Node","_name":"Loading","_parent":{"__id__":2},"_children":[{"__id__":4},{"__id__":5},{"__id__":8},{"__id__":10}],"_components":[{"__type__":"7b361Sc/YVEaqkPa/qs+M/J","node":{"__id__":3},"progresBar":{"__id__":9},"loadIcon":{"__id__":7}}]},{"__type__":"cc.Node","_name":"bg","_parent":{"__id__":3},"_components":[{"__type__":"cc.Sprite","node":{"__id__":4},"_spriteFrame":{"__uuid__":"a2MjXRFdtLlYQ5ouAFv/+R"},"_sizeMode":0},{"__type__":"cc.Widget","node":{"__id__":4},"_target":{"__id__":2},"_alignFlags":45,"_originalWidth":100,"_originalHeight":100}],"_color":{"__type__":"cc.Color","r":208,"g":211,"b":144},"_contentSize":{"__type__":"cc.Size","width":750,"height":1334}},{"__type__":"cc.Node","_name":"expBar2","_parent":{"__id__":3},"_children":[{"__id__":6}],"_components":[{"__type__":"cc.Sprite","node":{"__id__":5},"_spriteFrame":{"__uuid__":"50aBdlIQ9Mw7HSENl+5JF/"}}],"_contentSize":{"__type__":"cc.Size","width":328,"height":31}},{"__type__":"cc.Node","_name":"loadIcon","_parent":{"__id__":5},"_components":[{"__id__":7}],"_contentSize":{"__type__":"cc.Size","width":320,"height":21}},{"__type__":"cc.Sprite","node":{"__id__":6},"_spriteFrame":{"__uuid__":"abzqHaQs5EU5OllWrDA715"},"_type":3},{"__type__":"cc.Node","_name":"progresBar","_parent":{"__id__":3},"_components":[{"__id__":9}],"_color":{"__type__":"cc.Color"},"_contentSize":{"__type__":"cc.Size","width":58,"height":40},"_position":{"__type__":"cc.Vec2","y":50}},{"__type__":"cc.Label","node":{"__id__":8},"_useOriginalSize":false,"_N$string":"0%","_N$horizontalAlign":1,"_N$verticalAlign":1},{"__type__":"cc.Node","_name":"tip","_parent":{"__id__":3},"_components":[{"__type__":"cc.Label","node":{"__id__":10},"_useOriginalSize":false,"_lineHeight":50,"_N$string":"Loading.....","_N$horizontalAlign":1,"_N$verticalAlign":1}],"_color":{"__type__":"cc.Color"},"_contentSize":{"__type__":"cc.Size","width":198,"height":50},"_position":{"__type__":"cc.Vec2","x":9,"y":-54}},{"__type__":"cc.Node","_name":"dataInit","_parent":{"__id__":2},"_components":[{"__type__":"09ed8xhv0lOfIDUHajhsKsH","node":{"__id__":11}},{"__type__":"cc.Widget","node":{"__id__":11},"_target":{"__id__":2},"_alignFlags":45}],"_contentSize":{"__type__":"cc.Size","width":750,"height":1334}}],{"__type__":"cc.SpriteFrame","content":{"name":"jindutiao_xikuang","texture":"054+G9t7RLILC9QwIW5/uB","rect":[146,372,328,31],"offset":[0,0],"originalSize":[328,31],"rotated":1}},{"__type__":"cc.SpriteFrame","content":{"name":"default_sprite_splash","texture":"02delMVqdBD70a/HSD99FK","rect":[0,0,2,2],"offset":[0,0],"originalSize":[2,2]}},{"__type__":"cc.SpriteFrame","content":{"name":"jindutiao","texture":"054+G9t7RLILC9QwIW5/uB","rect":[980,1,320,21],"offset":[1,0],"originalSize":[328,31],"rotated":1}}]
\ No newline at end of file

qubapikashu-weixin/v1.0.6/res/import/02/02ba2d6e-2434-40aa-b072-270722d687ce.json

+{"__type__":"cc.SpriteFrame","content":{"name":"b019","texture":"f2bavR0mFIzpt4TUhRJZvL","rect":[4,3,452,469],"offset":[-8,0.5],"originalSize":[476,476]}}
\ No newline at end of file

qubapikashu-weixin/v1.0.6/res/import/05/0533b4c7-9c66-4369-bb78-cfc5a22a3357.json

+{"__type__":"cc.SpriteFrame","content":{"name":"bg9","texture":"4a5v0fqHZDkpOpTCXtrkDh","rect":[0,0,750,1334],"offset":[0,0],"originalSize":[750,1334]}}
\ No newline at end of file

qubapikashu-weixin/v1.0.6/res/import/06/06847cd1-ed9a-4273-bd18-1e683dacbd17.json

+{"__type__":"cc.SpriteFrame","content":{"name":"b028","texture":"b33ea9L4RDbrckvw8Vk79R","rect":[4,8,449,444],"offset":[0,-2.5],"originalSize":[457,455]}}
\ No newline at end of file

qubapikashu-weixin/v1.0.6/res/import/0a/0a2db3cf9.json

+[{"__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}],"_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}}]]
\ No newline at end of file