Commit 90c087c7 authored by 覃遵洋's avatar 覃遵洋

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

parents 0c375bf4 cc151e87
{"__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
{"__type__":"cc.SpriteFrame","content":{"name":"b019","texture":"f2bavR0mFIzpt4TUhRJZvL","rect":[3,3,453,470],"offset":[-8.5,0],"originalSize":[476,476]}}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
{"__type__":"cc.SpriteFrame","content":{"name":"b028","texture":"b33ea9L4RDbrckvw8Vk79R","rect":[3,6,451,446],"offset":[0,-1.5],"originalSize":[457,455]}}
\ No newline at end of file
[[{"__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}],"_components":[{"__type__":"cc.Canvas","node":{"__id__":2},"_designResolution":{"__type__":"cc.Size","width":720,"height":1280}}],"_id":"1cgXERmAtM4bNVTUvyC8ws","_contentSize":{"__type__":"cc.Size","width":720,"height":1280},"_position":{"__type__":"cc.Vec2","x":360,"y":640}},{"__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":720,"height":1280}},{"__type__":"cc.Node","_name":"expBar2","_parent":{"__id__":3},"_children":[{"__id__":6}],"_components":[{"__type__":"cc.Sprite","node":{"__id__":5}}],"_contentSize":{"__type__":"cc.Size","width":329,"height":31}},{"__type__":"cc.Node","_name":"loadIcon","_parent":{"__id__":5},"_components":[{"__id__":7}],"_contentSize":{"__type__":"cc.Size","width":318,"height":19}},{"__type__":"cc.Sprite","node":{"__id__":6},"_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.SpriteFrame","content":{"name":"default_sprite_splash","texture":"02delMVqdBD70a/HSD99FK","rect":[0,0,2,2],"offset":[0,0],"originalSize":[2,2]}}]
\ No newline at end of file
[{"__type__":"cc.SpriteFrame","content":{"name":"jindutiao","texture":"e6DaCa1vBNhLaRXuoENh50","rect":[6,6,318,19],"offset":[1,0],"originalSize":[328,31]}},[{"__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":720,"height":1280}}],"_id":"1cgXERmAtM4bNVTUvyC8ws","_contentSize":{"__type__":"cc.Size","width":720,"height":1280},"_position":{"__type__":"cc.Vec2","x":360,"y":640}},{"__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":720,"height":1280}},{"__type__":"cc.Node","_name":"expBar2","_parent":{"__id__":3},"_children":[{"__id__":6}],"_components":[{"__type__":"cc.Sprite","node":{"__id__":5},"_spriteFrame":{"__uuid__":"84Y6Eqp09MqbENqPIa1+c+"}}],"_contentSize":{"__type__":"cc.Size","width":328,"height":31}},{"__type__":"cc.Node","_name":"loadIcon","_parent":{"__id__":5},"_components":[{"__id__":7}],"_contentSize":{"__type__":"cc.Size","width":318,"height":19}},{"__type__":"cc.Sprite","node":{"__id__":6},"_spriteFrame":{"__uuid__":"244VkRoklEuZc6r3Nx2kZA"},"_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.SpriteFrame","content":{"name":"jindutiao_xikuang","texture":"d9WQhiprxC8Im4zqsc90UR","rect":[0,0,328,31],"offset":[0,0],"originalSize":[328,31]}},{"__type__":"cc.SpriteFrame","content":{"name":"default_sprite_splash","texture":"02delMVqdBD70a/HSD99FK","rect":[0,0,2,2],"offset":[0,0],"originalSize":[2,2]}}]
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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