Commit 5add77ce by Mike Zhu

Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop

parents 9d0cb31e f75ffbeb
{
"groups": [
{
"keys": "bg_jpg,egret_icon_png,description_json,control_jpg,grid_jpg,logo_jpg,mask_jpg,grid_select_jpg,lighting_jpg,prop_heart_jpg,prop_light_jpg,catched_0_mp3,catched_1_mp3,catched_2_mp3,flirt_mp3,avatar_bg_jpg,bgm_mp3,transition_catcher_jpg,transition_runner_jpg,blood_jpg,moke_jpg",
"keys": "bg_jpg,egret_icon_png,description_json,control_jpg,grid_jpg,logo_jpg,mask_jpg,grid_select_jpg,lighting_jpg,prop_heart_jpg,prop_light_jpg,catched_0_mp3,catched_1_mp3,catched_2_mp3,flirt_mp3,avatar_bg_jpg,bgm_mp3,transition_catcher_jpg,transition_runner_jpg,blood_jpg,moke_jpg,catched_jpg",
"name": "preload"
}
],
......@@ -110,6 +110,11 @@
"name": "moke_jpg",
"type": "image",
"url": "assets/moke.jpg"
},
{
"name": "catched_jpg",
"type": "image",
"url": "assets/catched.jpg"
}
]
}
\ No newline at end of file
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