Skip to content

X
xiaoxiaole
Commit 96b7688a authored by 邱旭's avatar 邱旭
Browse files
Options

1

parent 46fb343c
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 69 deletions
egret/resource/default.res.json
View file @ 96b7688a
...@@ -2052,76 +2052,7 @@ ...@@ -2052,76 +2052,7 @@
{ {
"url": "assets/invite/invite_prize_btn.png", "url": "assets/invite/invite_prize_btn.png",
"type": "image", "type": "image",
<<<<<<< HEAD
"name": "invite_prize_btn_png" "name": "invite_prize_btn_png"
=======
"url": "assets/testavatar.png"
},
{
"name": "friend按钮-炫耀_png",
"type": "image",
"url": "assets/friend/friend按钮-炫耀.png"
},
{
"name": "friend_icon1_png",
"type": "image",
"url": "assets/friend/friend_icon1.png"
},
{
"name": "friend_icon2_png",
"type": "image",
"url": "assets/friend/friend_icon2.png"
},
{
"name": "friend_icon3_png",
"type": "image",
"url": "assets/friend/friend_icon3.png"
},
{
"name": "friend_itembg_png",
"type": "image",
"url": "assets/friend/friend_itembg.png"
},
{
"name": "friendbg_png",
"type": "image",
"url": "assets/friend/friendbg.png"
},
{
"name": "ad_closebtn_png",
"type": "image",
"url": "assets/ad/ad_closebtn.png"
},
{
"name": "startpanel_icon1_png",
"type": "image",
"url": "assets/startpanel2/startpanel_icon1.png"
},
{
"name": "startpanel_icon2_png",
"type": "image",
"url": "assets/startpanel2/startpanel_icon2.png"
},
{
"name": "startpanel_icon3_png",
"type": "image",
"url": "assets/startpanel2/startpanel_icon3.png"
},
{
"name": "startpanel_icon_png",
"type": "image",
"url": "assets/startpanel2/startpanel_icon.png"
},
{
"name": "startpanel_avatar_png",
"type": "image",
"url": "assets/startpanel2/startpanel_avatar.png"
},
{
"name": "startpanel_bg2_png",
"type": "image",
"url": "assets/startpanel2/startpanel_bg2.png"
>>>>>>> e4972da2d589501b0f375aac75d85b8acfb74408
} }
] ]
} }
\ 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