Skip to content

X
xiaoxiaole
Commit 2c9388be authored by zjz1994's avatar zjz1994
Browse files
Options

Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

parents e868c5ea 9ababadc
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 131 deletions
egret/resource/default.res.json
View file @ 2c9388be
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
"name": "eleDisNew" "name": "eleDisNew"
}, },
{ {
"keys": "help_invite2_text4_png,help_invite2_text3_png,help_invite2_text2_png,help_invite2_text_png,help_invite2_btn2_png,help_invite2_btn_png,help_invite_text_png,help_invite_success_txt_png,help_invite_success_btn_png,help_invite_fail_text4_png,help_invite_fail_text3_png,help_invite_fail_text2_png,help_invite_fail_text1_png,help_invite_fail_btn_png,help_invite_btn1_png,help_invite_bg_png,help_closebtn1_png,help_blood_success_text2_png,help_blood_success_text_png,help_blood_fail_text4_png,help_blood_fail_text3_png,help_blood_fail_text2_png,help_blood_fail_text_png,help_blood_fail_btn_png,help_blood_1_text_png,help_blood_1_btn_png", "keys": "help_blood_1_btn_png,help_blood_1_text_png,help_blood_fail_btn_png,help_blood_fail_text_png,help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_blood_success_text_png,help_blood_success_text2_png,help_card_bg_png,help_card_prize_png,help_closebtn1_png,help_invite2_btn_png,help_invite2_btn2_png,help_invite2_text_png,help_invite2_text2_png,help_invite2_text3_png,help_invite2_text4_png,help_invite_bg_png,help_invite_btn1_png,help_invite_fail_btn_png,help_invite_fail_text1_png,help_invite_fail_text2_png,help_invite_fail_text3_png,help_invite_fail_text4_png,help_invite_success_btn_png,help_invite_success_txt_png,help_invite_text_png,help_light_png",
"name": "helpGroup" "name": "helpGroup"
} }
], ],
...@@ -4983,136 +4983,6 @@ ...@@ -4983,136 +4983,6 @@
"type": "image", "type": "image",
"name": "turntable_paneldi_png" "name": "turntable_paneldi_png"
}, },
{
"url": "assets/help/help_blood_1_btn.png",
"type": "image",
"name": "help_blood_1_btn_png"
},
{
"url": "assets/help/help_blood_1_text.png",
"type": "image",
"name": "help_blood_1_text_png"
},
{
"url": "assets/help/help_blood_fail_btn.png",
"type": "image",
"name": "help_blood_fail_btn_png"
},
{
"url": "assets/help/help_blood_fail_text.png",
"type": "image",
"name": "help_blood_fail_text_png"
},
{
"url": "assets/help/help_blood_fail_text2.png",
"type": "image",
"name": "help_blood_fail_text2_png"
},
{
"url": "assets/help/help_blood_fail_text3.png",
"type": "image",
"name": "help_blood_fail_text3_png"
},
{
"url": "assets/help/help_blood_fail_text4.png",
"type": "image",
"name": "help_blood_fail_text4_png"
},
{
"url": "assets/help/help_blood_success_text.png",
"type": "image",
"name": "help_blood_success_text_png"
},
{
"url": "assets/help/help_blood_success_text2.png",
"type": "image",
"name": "help_blood_success_text2_png"
},
{
"url": "assets/help/help_closebtn1.png",
"type": "image",
"name": "help_closebtn1_png"
},
{
"url": "assets/help/help_invite2_btn.png",
"type": "image",
"name": "help_invite2_btn_png"
},
{
"url": "assets/help/help_invite2_btn2.png",
"type": "image",
"name": "help_invite2_btn2_png"
},
{
"url": "assets/help/help_invite2_text.png",
"type": "image",
"name": "help_invite2_text_png"
},
{
"url": "assets/help/help_invite2_text2.png",
"type": "image",
"name": "help_invite2_text2_png"
},
{
"url": "assets/help/help_invite2_text3.png",
"type": "image",
"name": "help_invite2_text3_png"
},
{
"url": "assets/help/help_invite2_text4.png",
"type": "image",
"name": "help_invite2_text4_png"
},
{
"url": "assets/help/help_invite_bg.png",
"type": "image",
"name": "help_invite_bg_png"
},
{
"url": "assets/help/help_invite_btn1.png",
"type": "image",
"name": "help_invite_btn1_png"
},
{
"url": "assets/help/help_invite_fail_btn.png",
"type": "image",
"name": "help_invite_fail_btn_png"
},
{
"url": "assets/help/help_invite_fail_text1.png",
"type": "image",
"name": "help_invite_fail_text1_png"
},
{
"url": "assets/help/help_invite_fail_text2.png",
"type": "image",
"name": "help_invite_fail_text2_png"
},
{
"url": "assets/help/help_invite_fail_text3.png",
"type": "image",
"name": "help_invite_fail_text3_png"
},
{
"url": "assets/help/help_invite_fail_text4.png",
"type": "image",
"name": "help_invite_fail_text4_png"
},
{
"url": "assets/help/help_invite_success_btn.png",
"type": "image",
"name": "help_invite_success_btn_png"
},
{
"url": "assets/help/help_invite_success_txt.png",
"type": "image",
"name": "help_invite_success_txt_png"
},
{
"url": "assets/help/help_invite_text.png",
"type": "image",
"name": "help_invite_text_png"
},
{ {
"url": "assets/sign/sign_mask.png", "url": "assets/sign/sign_mask.png",
"type": "image", "type": "image",
...@@ -5347,6 +5217,151 @@ ...@@ -5347,6 +5217,151 @@
"url": "assets/mainScene/ele39.png", "url": "assets/mainScene/ele39.png",
"type": "image", "type": "image",
"name": "ele39_png" "name": "ele39_png"
},
{
"url": "assets/help/help_blood_1_btn.png",
"type": "image",
"name": "help_blood_1_btn_png"
},
{
"url": "assets/help/help_blood_1_text.png",
"type": "image",
"name": "help_blood_1_text_png"
},
{
"url": "assets/help/help_blood_fail_btn.png",
"type": "image",
"name": "help_blood_fail_btn_png"
},
{
"url": "assets/help/help_blood_fail_text.png",
"type": "image",
"name": "help_blood_fail_text_png"
},
{
"url": "assets/help/help_blood_fail_text2.png",
"type": "image",
"name": "help_blood_fail_text2_png"
},
{
"url": "assets/help/help_blood_fail_text3.png",
"type": "image",
"name": "help_blood_fail_text3_png"
},
{
"url": "assets/help/help_blood_fail_text4.png",
"type": "image",
"name": "help_blood_fail_text4_png"
},
{
"url": "assets/help/help_blood_success_text.png",
"type": "image",
"name": "help_blood_success_text_png"
},
{
"url": "assets/help/help_blood_success_text2.png",
"type": "image",
"name": "help_blood_success_text2_png"
},
{
"url": "assets/help/help_card_bg.png",
"type": "image",
"name": "help_card_bg_png"
},
{
"url": "assets/help/help_card_prize.png",
"type": "image",
"name": "help_card_prize_png"
},
{
"url": "assets/help/help_closebtn1.png",
"type": "image",
"name": "help_closebtn1_png"
},
{
"url": "assets/help/help_invite2_btn.png",
"type": "image",
"name": "help_invite2_btn_png"
},
{
"url": "assets/help/help_invite2_btn2.png",
"type": "image",
"name": "help_invite2_btn2_png"
},
{
"url": "assets/help/help_invite2_text.png",
"type": "image",
"name": "help_invite2_text_png"
},
{
"url": "assets/help/help_invite2_text2.png",
"type": "image",
"name": "help_invite2_text2_png"
},
{
"url": "assets/help/help_invite2_text3.png",
"type": "image",
"name": "help_invite2_text3_png"
},
{
"url": "assets/help/help_invite2_text4.png",
"type": "image",
"name": "help_invite2_text4_png"
},
{
"url": "assets/help/help_invite_bg.png",
"type": "image",
"name": "help_invite_bg_png"
},
{
"url": "assets/help/help_invite_btn1.png",
"type": "image",
"name": "help_invite_btn1_png"
},
{
"url": "assets/help/help_invite_fail_btn.png",
"type": "image",
"name": "help_invite_fail_btn_png"
},
{
"url": "assets/help/help_invite_fail_text1.png",
"type": "image",
"name": "help_invite_fail_text1_png"
},
{
"url": "assets/help/help_invite_fail_text2.png",
"type": "image",
"name": "help_invite_fail_text2_png"
},
{
"url": "assets/help/help_invite_fail_text3.png",
"type": "image",
"name": "help_invite_fail_text3_png"
},
{
"url": "assets/help/help_invite_fail_text4.png",
"type": "image",
"name": "help_invite_fail_text4_png"
},
{
"url": "assets/help/help_invite_success_btn.png",
"type": "image",
"name": "help_invite_success_btn_png"
},
{
"url": "assets/help/help_invite_success_txt.png",
"type": "image",
"name": "help_invite_success_txt_png"
},
{
"url": "assets/help/help_invite_text.png",
"type": "image",
"name": "help_invite_text_png"
},
{
"url": "assets/help/help_light.png",
"type": "image",
"name": "help_light_png"
} }
] ]
} }
\ 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