1

egret/resource/TextureMerger/Delay_3.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Delay_3","version":5,"files":["../assets/pk/pkwinlogo.png","../assets/pk/pkwinlight.png","../assets/pk/pkwinBtn.png","../assets/pk/pkwinbg.png","../assets/pk/pkscorebg2.png","../assets/pk/pkscorebg.png","../assets/pk/pkrulebtn.png","../assets/pk/pkrulebg.png","../assets/pk/pkprizeBtn.png","../assets/pk/pkprizebg.png","../assets/pk/pkpeacelogo.png","../assets/pk/pkpeacelight.png","../assets/pk/pkotherline2.png","../assets/pk/pknoton.png","../assets/pk/pkmyline2.png","../assets/pk/pkloselogo.png","../assets/pk/pkloselight.png","../assets/pk/pkfinishbg.png","../assets/pk/pkendbg.png","../assets/pk/pkcirle.png","../assets/pk/pkBtn.png","../assets/pk/pkaskBtn.png","../assets/pk/pkagainBtn.png","../assets/pk/pkadd.png","../assets/pk/head1.png","../assets/pk/box.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Delay_3","version":5,"files":["..\\assets\\pk\\pkwinlogo.png","..\\assets\\pk\\pkwinlight.png","..\\assets\\pk\\pkwinBtn.png","..\\assets\\pk\\pkwinbg.png","..\\assets\\pk\\pkscorebg2.png","..\\assets\\pk\\pkscorebg.png","..\\assets\\pk\\pkrulebtn.png","..\\assets\\pk\\pkrulebg.png","..\\assets\\pk\\pkprizeBtn.png","..\\assets\\pk\\pkprizebg.png","..\\assets\\pk\\pkpeacelogo.png","..\\assets\\pk\\pkpeacelight.png","..\\assets\\pk\\pkotherline2.png","..\\assets\\pk\\pknoton.png","..\\assets\\pk\\pkmyline2.png","..\\assets\\pk\\pkloselogo.png","..\\assets\\pk\\pkloselight.png","..\\assets\\pk\\pkfinishbg.png","..\\assets\\pk\\pkendbg.png","..\\assets\\pk\\pkcirle.png","..\\assets\\pk\\pkBtn.png","..\\assets\\pk\\pkaskBtn.png","..\\assets\\pk\\pkagainBtn.png","..\\assets\\pk\\pkadd.png","..\\assets\\pk\\head1.png","..\\assets\\pk\\box.png"]}

egret/resource/TextureMerger/Garbage_2.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbage_2","version":5,"files":["../assets/xuanshi/xuanshiBtn.png","../assets/xuanshi/xsbg.png","../assets/xuanshi/backstartBtn.png","../assets/waiting/bg.png","../assets/waiting/progress.png","../assets/slogan/slogan_btn.png","../assets/slogan/slogan_bg.png","../assets/pop/rulebg.png","../assets/pop/rankmybg.png","../assets/pop/rankline.png","../assets/pop/ranklight.png","../assets/pop/rankbg2.png","../assets/pop/rankbg.png","../assets/pop/lessscoreBtn.png","../assets/pop/lessscorebg.png","../assets/pop/finishlogo.png","../assets/pop/finishlight.png","../assets/pop/finishBtn.png","../assets/pop/finishbg.png","../assets/guide/ydline.png","../assets/guide/ydlight2.png","../assets/guide/ydlight.png","../assets/guide/hand2.png","../assets/guide/hand.png"]}
\ No newline at end of file
+<<<<<<< HEAD
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbage_2","version":5,"files":["../assets/xuanshi/xuanshiBtn.png","../assets/xuanshi/xsbg.png","../assets/xuanshi/backstartBtn.png","../assets/waiting/bg.png","../assets/waiting/progress.png","../assets/slogan/slogan_btn.png","../assets/slogan/slogan_bg.png","../assets/pop/rulebg.png","../assets/pop/rankmybg.png","../assets/pop/rankline.png","../assets/pop/ranklight.png","../assets/pop/rankbg2.png","../assets/pop/rankbg.png","../assets/pop/lessscoreBtn.png","../assets/pop/lessscorebg.png","../assets/pop/finishlogo.png","../assets/pop/finishlight.png","../assets/pop/finishBtn.png","../assets/pop/finishbg.png","../assets/guide/ydline.png","../assets/guide/ydlight2.png","../assets/guide/ydlight.png","../assets/guide/hand2.png","../assets/guide/hand.png"]}
+=======
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbage_2","version":5,"files":["..\\assets\\xuanshi\\xuanshiBtn.png","..\\assets\\xuanshi\\xsbg.png","..\\assets\\xuanshi\\backstartBtn.png","..\\assets\\waiting\\bg.png","..\\assets\\waiting\\progress.png","..\\assets\\slogan\\slogan_btn.png","..\\assets\\slogan\\slogan_bg.png","..\\assets\\pop\\rulebg.png","..\\assets\\pop\\rankmybg.png","..\\assets\\pop\\rankline.png","..\\assets\\pop\\ranklight.png","..\\assets\\pop\\rankbg2.png","..\\assets\\pop\\rankbg.png","..\\assets\\pop\\lessscoreBtn.png","..\\assets\\pop\\lessscorebg.png","..\\assets\\pop\\finishlogo.png","..\\assets\\pop\\finishlight.png","..\\assets\\pop\\finishBtn.png","..\\assets\\pop\\finishbg.png","..\\assets\\guide\\ydline.png","..\\assets\\guide\\ydlight2.png","..\\assets\\guide\\ydlight.png","..\\assets\\guide\\hand2.png","..\\assets\\guide\\hand.png"]}
+>>>>>>> 6c339c0e9165b371cae53b254e6f861724111c6f

egret/resource/TextureMerger/Normal_1.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Normal_1","version":5,"files":["../assets/certificate/certificate_btn.png","../assets/certificate/certificate_cover.png","../assets/joinshare/joinshare_btn.png","../assets/sharestarter/sharestarter_btn.png","../assets/sharestarter/sharestarter_sharebtn.png","../assets/share2/share2mask.png","../assets/share2/share2btn.png","../assets/confirm/confirm_btn.png","../assets/confirm/confirm_bg.png","../assets/transfer/transfer _toast3.png","../assets/transfer/transfer _toast2.png","../assets/transfer/transfer _toast1.png","../assets/transfer/transfer _title.png","../assets/transfer/transfer _btn.png","../assets/teamshare/teamshare_btn.png","../assets/transferrecord/transferrecord_bg.png","../assets/transferrecord/transferrecord_item_bg.png"]}
\ No newline at end of file
+<<<<<<< HEAD
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Normal_1","version":5,"files":["../assets/certificate/certificate_btn.png","../assets/certificate/certificate_cover.png","../assets/joinshare/joinshare_btn.png","../assets/sharestarter/sharestarter_btn.png","../assets/sharestarter/sharestarter_sharebtn.png","../assets/share2/share2mask.png","../assets/share2/share2btn.png","../assets/confirm/confirm_btn.png","../assets/confirm/confirm_bg.png","../assets/transfer/transfer _toast3.png","../assets/transfer/transfer _toast2.png","../assets/transfer/transfer _toast1.png","../assets/transfer/transfer _title.png","../assets/transfer/transfer _btn.png","../assets/teamshare/teamshare_btn.png","../assets/transferrecord/transferrecord_bg.png","../assets/transferrecord/transferrecord_item_bg.png"]}
+=======
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Normal_1","version":5,"files":["..\\assets\\certificate\\certificate_btn.png","..\\assets\\certificate\\certificate_cover.png","..\\assets\\joinshare\\joinshare_btn.png","..\\assets\\sharestarter\\sharestarter_btn.png","..\\assets\\sharestarter\\sharestarter_sharebtn.png","..\\assets\\share2\\share2mask.png","..\\assets\\share2\\share2btn.png","..\\assets\\confirm\\confirm_btn.png","..\\assets\\confirm\\confirm_bg.png","..\\assets\\transfer\\transfer _toast3.png","..\\assets\\transfer\\transfer _toast2.png","..\\assets\\transfer\\transfer _toast1.png","..\\assets\\transfer\\transfer _title.png","..\\assets\\transfer\\transfer _btn.png","..\\assets\\teamshare\\teamshare_btn.png","..\\assets\\transferrecord\\transferrecord_bg.png","..\\assets\\transferrecord\\transferrecord_item_bg.png"]}
+>>>>>>> 6c339c0e9165b371cae53b254e6f861724111c6f

egret/resource/TextureMerger/Preload_0.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Preload_0","version":5,"files":["../assets/startScene/yylogo.png","../assets/startScene/yyhpklogo.png","../assets/startScene/yyhlogo.png","../assets/startScene/waitBtn.png","../assets/startScene/unriben.png","../assets/startScene/unmenggu.png","../assets/startScene/unhanguo.png","../assets/startScene/unCHNxianggang.png","../assets/startScene/unCHNtaiwan.png","../assets/startScene/unCHNhangzhou.png","../assets/startScene/unCHNaomen.png","../assets/startScene/unchaoxian.png","../assets/startScene/teamBtn.png","../assets/startScene/starttitle.png","../assets/startScene/startBtn.png","../assets/startScene/ruleBtn.png","../assets/startScene/riben.png","../assets/startScene/recordBtn.png","../assets/startScene/rankBtn.png","../assets/startScene/prizeBtn.png","../assets/startScene/menggu.png","../assets/startScene/lockBtn.png","../assets/startScene/littletitle.png","../assets/startScene/horn.png","../assets/startScene/hanguo.png","../assets/startScene/getBtn.png","../assets/startScene/fireBtn.png","../assets/startScene/closeBtn.png","../assets/startScene/CHNxianggang.png","../assets/startScene/CHNtaiwan.png","../assets/startScene/CHNhangzhou.png","../assets/startScene/CHNaomen.png","../assets/startScene/chaoxian.png"]}
\ No newline at end of file
+<<<<<<< HEAD
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Preload_0","version":5,"files":["../assets/startScene/yylogo.png","../assets/startScene/yyhpklogo.png","../assets/startScene/yyhlogo.png","../assets/startScene/waitBtn.png","../assets/startScene/unriben.png","../assets/startScene/unmenggu.png","../assets/startScene/unhanguo.png","../assets/startScene/unCHNxianggang.png","../assets/startScene/unCHNtaiwan.png","../assets/startScene/unCHNhangzhou.png","../assets/startScene/unCHNaomen.png","../assets/startScene/unchaoxian.png","../assets/startScene/teamBtn.png","../assets/startScene/starttitle.png","../assets/startScene/startBtn.png","../assets/startScene/ruleBtn.png","../assets/startScene/riben.png","../assets/startScene/recordBtn.png","../assets/startScene/rankBtn.png","../assets/startScene/prizeBtn.png","../assets/startScene/menggu.png","../assets/startScene/lockBtn.png","../assets/startScene/littletitle.png","../assets/startScene/horn.png","../assets/startScene/hanguo.png","../assets/startScene/getBtn.png","../assets/startScene/fireBtn.png","../assets/startScene/closeBtn.png","../assets/startScene/CHNxianggang.png","../assets/startScene/CHNtaiwan.png","../assets/startScene/CHNhangzhou.png","../assets/startScene/CHNaomen.png","../assets/startScene/chaoxian.png"]}
+=======
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Preload_0","version":5,"files":["..\\assets\\startScene\\yylogo.png","..\\assets\\startScene\\yyhpklogo.png","..\\assets\\startScene\\yyhlogo.png","..\\assets\\startScene\\waitBtn.png","..\\assets\\startScene\\unriben.png","..\\assets\\startScene\\unmenggu.png","..\\assets\\startScene\\unhanguo.png","..\\assets\\startScene\\unCHNxianggang.png","..\\assets\\startScene\\unCHNtaiwan.png","..\\assets\\startScene\\unCHNhangzhou.png","..\\assets\\startScene\\unCHNaomen.png","..\\assets\\startScene\\unchaoxian.png","..\\assets\\startScene\\teamBtn.png","..\\assets\\startScene\\starttitle.png","..\\assets\\startScene\\startBtn.png","..\\assets\\startScene\\ruleBtn.png","..\\assets\\startScene\\riben.png","..\\assets\\startScene\\recordBtn.png","..\\assets\\startScene\\rankBtn.png","..\\assets\\startScene\\prizeBtn.png","..\\assets\\startScene\\menggu.png","..\\assets\\startScene\\lockBtn.png","..\\assets\\startScene\\littletitle.png","..\\assets\\startScene\\horn.png","..\\assets\\startScene\\hanguo.png","..\\assets\\startScene\\getBtn.png","..\\assets\\startScene\\fireBtn.png","..\\assets\\startScene\\closeBtn.png","..\\assets\\startScene\\CHNxianggang.png","..\\assets\\startScene\\CHNtaiwan.png","..\\assets\\startScene\\CHNhangzhou.png","..\\assets\\startScene\\CHNaomen.png","..\\assets\\startScene\\chaoxian.png"]}
+>>>>>>> 6c339c0e9165b371cae53b254e6f861724111c6f

egret/resource/default.res.json

@@ -5,7 +5,7 @@
 			"name": "Preload"
 		},
 		{
-			"keys": "certificate_btn_png,certificate_cover_png,certificate_jpg,joinshare_btn_png,joinshare_bg_jpg,sharestarter_bg_jpg,sharestarter_btn_png,sharestarter_sharebtn_png,share2mask_png,share2btn_png,share2bg_jpg,confirm_btn_png,confirm_bg_png,transfer _toast3_png,transfer _toast2_png,transfer _toast1_png,transfer _title_png,transfer _btn_png,trans_bg_jpg,teamshare_bg_jpg,teamshare_btn_png,transferrecord_bg_png,transferrecord_item_bg_png",
+			"keys": "certificate_btn_png,certificate_cover_png,certificate_jpg,joinshare_btn_png,joinshare_bg_jpg,sharestarter_bg_jpg,sharestarter_btn_png,sharestarter_sharebtn_png,share2mask_png,share2btn_png,share2bg_jpg,confirm_btn_png,confirm_bg_png,transfer _toast3_png,transfer _toast2_png,transfer _toast1_png,transfer _title_png,transfer _btn_png,trans_bg_jpg,teamshare_bg_jpg,teamshare_btn_png,transferrecord_bg_png,transferrecord_item_bg_png,关闭按钮 _png",
 			"name": "Normal"
 		},
 		{

egret/resource/skins/ConfirmSkin.exml

@@ -3,5 +3,5 @@
 	<e:Image source="confirm_bg_png" y="163" horizontalCenter="0"/>
 	<e:Label id="tips" text="是否确认加入“对应手机号”的战队\n参与队伍PK" y="300" horizontalCenter="0" textAlign="center" lineSpacing="20"/>
 	<e:Image id="btn" source="confirm_btn_png" y="455" horizontalCenter="0"/>
-	<e:Image id="closeBtn" source="关闭按钮 _png" x="652" y="84"/>
+	<e:Image id="closeBtn" x="652" y="84" source="closeBtn_png"/>
 </e:Skin>
\ No newline at end of file