1

egret/resource/TextureMerger/sharecodepanel.tmproject

-<<<<<<< HEAD
-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["..\\assets\\shareCodePanel\\lijiqianwang.png","..\\assets\\shareCodePanel\\copyCodeBg.png","..\\assets\\shareCodePanel\\shareWxpyqIcon.png","..\\assets\\shareCodePanel\\shareWxIcon.png","..\\assets\\shareCodePanel\\shareQqIcon.png","..\\assets\\shareCodePanel\\shareWeiboIcon.png","..\\assets\\shareCodePanel\\zhantiegeihaoyou.png"]}
-=======
 {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["../assets/shareCodePanel/lijiqianwang.png","../assets/shareCodePanel/copyCodeBg.png","../assets/shareCodePanel/shareWxpyqIcon.png","../assets/shareCodePanel/shareWxIcon.png","../assets/shareCodePanel/shareQqIcon.png","../assets/shareCodePanel/shareWeiboIcon.png","../assets/shareCodePanel/zhantiegeihaoyou.png"]}
\ No newline at end of file
->>>>>>> cc335fd429a254bc0a7d0e0a972062841c38abeb

egret/resource/TextureMerger/startpanel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ele9.png","../assets/startpanel2/startpanel_ele8.png","../assets/startpanel2/startpanel_ele7.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_ele5.png","../assets/startpanel2/startpanel_ele4.png","../assets/startpanel2/startpanel_ele3.png","../assets/startpanel2/startpanel_ele2.png","../assets/startpanel2/startpanel_ele1.png","../assets/startpanel2/startpanel_ele0.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png","../assets/startpanel2/startpanel_ele10.png","../assets/startpanel2/startpanel_numsbg.png","../assets/startpanel2/startpanel_ele27.png","../assets/startpanel2/startpanel_ele26.png","../assets/startpanel2/startpanel_ele25.png","../assets/startpanel2/startpanel_ele24.png","../assets/startpanel2/startpanel_ele23.png","../assets/startpanel2/startpanel_ele22.png","../assets/startpanel2/startpanel_ele34.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ele9.png","../assets/startpanel2/startpanel_ele8.png","../assets/startpanel2/startpanel_ele7.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_ele5.png","../assets/startpanel2/startpanel_ele4.png","../assets/startpanel2/startpanel_ele3.png","../assets/startpanel2/startpanel_ele2.png","../assets/startpanel2/startpanel_ele1.png","../assets/startpanel2/startpanel_ele0.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png","../assets/startpanel2/startpanel_ele10.png","../assets/startpanel2/startpanel_numsbg.png","../assets/startpanel2/startpanel_ele27.png","../assets/startpanel2/startpanel_ele26.png","../assets/startpanel2/startpanel_ele25.png","../assets/startpanel2/startpanel_ele24.png","../assets/startpanel2/startpanel_ele23.png","../assets/startpanel2/startpanel_ele22.png","../assets/startpanel2/startpanel_ele34.png","../assets/startpanel2/startpanel_ele36.png"]}
\ No newline at end of file