1

egret/resource/default.res.json

@@ -241,17 +241,11 @@
 		},
 		{
 			"keys": "help_invite2_png,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_png,help_invite_success_txt_png,help_invite_success_btn_png,help_invite_fail_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_png,help_blood_success_text2_png,help_blood_success_text_png,help_blood_fail_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,help_blood_1_bg_png",
-			"name": "helpGroup" <<
-				<<
-				<< < HEAD
+			"name": "helpGroup"
 		},
 		{
 			"name": "preload",
-			"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_invite2_text3_png,help_invite2_text4_png,commom_prop_bg2_png,turnprize_icon12_png,turnprize_icon22_png,turnprize_icon32_png,help_blood_1_bg2_png,help_blood_1_btn2_png,help_blood_1_text2_png,help_blood_fail2_png,help_blood_fail_btn2_png,help_blood_fail_text5_png,help_blood_fail_text22_png,help_blood_fail_text32_png,help_blood_fail_text42_png,help_blood_success2_png,help_blood_success_text3_png,help_blood_success_text22_png,help_closebtn_png,help_invite22_png,help_invite2_btn3_png,help_invite2_btn22_png,help_invite2_text5_png,help_invite2_text22_png,help_invite_bg2_png,help_invite_btn_png,help_invite_fail2_png,help_invite_fail_btn2_png,help_invite_fail_text12_png,help_invite_fail_text22_png,help_invite_fail_text32_png,help_invite_fail_text42_png,help_invite_success2_png,help_invite_success_btn2_png,recharge_icon2_png,help_invite2_text32_png,help_invite2_text42_png,turntabletit_png,turntable_paneldi_png,turntable_paneldi2_png,turntabletit2_png" ===
-				===
-				= >>>
-				>>>
-				> e0d2dd1bdc0533aacefeb112fc457065d5428dc9
+			"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_invite2_text3_png,help_invite2_text4_png,commom_prop_bg2_png,turnprize_icon12_png,turnprize_icon22_png,turnprize_icon32_png,help_blood_1_bg2_png,help_blood_1_btn2_png,help_blood_1_text2_png,help_blood_fail2_png,help_blood_fail_btn2_png,help_blood_fail_text5_png,help_blood_fail_text22_png,help_blood_fail_text32_png,help_blood_fail_text42_png,help_blood_success2_png,help_blood_success_text3_png,help_blood_success_text22_png,help_closebtn_png,help_invite22_png,help_invite2_btn3_png,help_invite2_btn22_png,help_invite2_text5_png,help_invite2_text22_png,help_invite_bg2_png,help_invite_btn_png,help_invite_fail2_png,help_invite_fail_btn2_png,help_invite_fail_text12_png,help_invite_fail_text22_png,help_invite_fail_text32_png,help_invite_fail_text42_png,help_invite_success2_png,help_invite_success_btn2_png,recharge_icon2_png,help_invite2_text32_png,help_invite2_text42_png,turntabletit_png,turntable_paneldi_png,turntable_paneldi2_png,turntabletit2_png"
 		}
 	],
 	"resources": [{