Skip to content

X
xiaoxiaole
Commit ac0bc7ae authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent c2e3ef7a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
egret/resource/TextureMerger/eleDisNew.tmproject
View file @ ac0bc7ae
<<<<<<< HEAD
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"eleDisNew","version":5,"files":["..\\assets\\eleDisNew\\eleDisNew4_9.png","..\\assets\\eleDisNew\\eleDisNew4_8.png","..\\assets\\eleDisNew\\eleDisNew4_7.png","..\\assets\\eleDisNew\\eleDisNew4_6.png","..\\assets\\eleDisNew\\eleDisNew4_5.png","..\\assets\\eleDisNew\\eleDisNew4_4.png","..\\assets\\eleDisNew\\eleDisNew4_3.png","..\\assets\\eleDisNew\\eleDisNew4_2.png","..\\assets\\eleDisNew\\eleDisNew4_14.png","..\\assets\\eleDisNew\\eleDisNew4_13.png","..\\assets\\eleDisNew\\eleDisNew4_12.png","..\\assets\\eleDisNew\\eleDisNew4_11.png","..\\assets\\eleDisNew\\eleDisNew4_10.png","..\\assets\\eleDisNew\\eleDisNew4_1.png","..\\assets\\eleDisNew\\eleDisNew4_0.png","..\\assets\\eleDisNew\\eleDisNew3_9.png","..\\assets\\eleDisNew\\eleDisNew3_8.png","..\\assets\\eleDisNew\\eleDisNew3_7.png","..\\assets\\eleDisNew\\eleDisNew3_6.png","..\\assets\\eleDisNew\\eleDisNew3_5.png","..\\assets\\eleDisNew\\eleDisNew3_4.png","..\\assets\\eleDisNew\\eleDisNew3_3.png","..\\assets\\eleDisNew\\eleDisNew3_2.png","..\\assets\\eleDisNew\\eleDisNew3_14.png","..\\assets\\eleDisNew\\eleDisNew3_13.png","..\\assets\\eleDisNew\\eleDisNew3_12.png","..\\assets\\eleDisNew\\eleDisNew3_11.png","..\\assets\\eleDisNew\\eleDisNew3_10.png","..\\assets\\eleDisNew\\eleDisNew3_1.png","..\\assets\\eleDisNew\\eleDisNew3_0.png","..\\assets\\eleDisNew\\eleDisNew2_9.png","..\\assets\\eleDisNew\\eleDisNew2_8.png","..\\assets\\eleDisNew\\eleDisNew2_7.png","..\\assets\\eleDisNew\\eleDisNew2_6.png","..\\assets\\eleDisNew\\eleDisNew2_5.png","..\\assets\\eleDisNew\\eleDisNew2_4.png","..\\assets\\eleDisNew\\eleDisNew2_3.png","..\\assets\\eleDisNew\\eleDisNew2_2.png","..\\assets\\eleDisNew\\eleDisNew2_14.png","..\\assets\\eleDisNew\\eleDisNew2_13.png","..\\assets\\eleDisNew\\eleDisNew2_12.png","..\\assets\\eleDisNew\\eleDisNew2_11.png","..\\assets\\eleDisNew\\eleDisNew2_10.png","..\\assets\\eleDisNew\\eleDisNew2_1.png","..\\assets\\eleDisNew\\eleDisNew2_0.png","..\\assets\\eleDisNew\\eleDisNew1_9.png","..\\assets\\eleDisNew\\eleDisNew1_8.png","..\\assets\\eleDisNew\\eleDisNew1_7.png","..\\assets\\eleDisNew\\eleDisNew1_6.png","..\\assets\\eleDisNew\\eleDisNew1_5.png","..\\assets\\eleDisNew\\eleDisNew1_4.png","..\\assets\\eleDisNew\\eleDisNew1_3.png","..\\assets\\eleDisNew\\eleDisNew1_2.png","..\\assets\\eleDisNew\\eleDisNew1_14.png","..\\assets\\eleDisNew\\eleDisNew1_13.png","..\\assets\\eleDisNew\\eleDisNew1_12.png","..\\assets\\eleDisNew\\eleDisNew1_11.png","..\\assets\\eleDisNew\\eleDisNew1_10.png","..\\assets\\eleDisNew\\eleDisNew1_1.png","..\\assets\\eleDisNew\\eleDisNew1_0.png","..\\assets\\eleDisNew\\eleDisNew0_9.png","..\\assets\\eleDisNew\\eleDisNew0_8.png","..\\assets\\eleDisNew\\eleDisNew0_7.png","..\\assets\\eleDisNew\\eleDisNew0_6.png","..\\assets\\eleDisNew\\eleDisNew0_5.png","..\\assets\\eleDisNew\\eleDisNew0_4.png","..\\assets\\eleDisNew\\eleDisNew0_3.png","..\\assets\\eleDisNew\\eleDisNew0_2.png","..\\assets\\eleDisNew\\eleDisNew0_14.png","..\\assets\\eleDisNew\\eleDisNew0_13.png","..\\assets\\eleDisNew\\eleDisNew0_12.png","..\\assets\\eleDisNew\\eleDisNew0_11.png","..\\assets\\eleDisNew\\eleDisNew0_10.png","..\\assets\\eleDisNew\\eleDisNew0_1.png","..\\assets\\eleDisNew\\eleDisNew0_0.png"]}
=======
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"eleDisNew","version":5,"files":["../assets/eleDisNew/eleDisNew4_9.png","../assets/eleDisNew/eleDisNew4_8.png","../assets/eleDisNew/eleDisNew4_7.png","../assets/eleDisNew/eleDisNew4_6.png","../assets/eleDisNew/eleDisNew4_5.png","../assets/eleDisNew/eleDisNew4_4.png","../assets/eleDisNew/eleDisNew4_3.png","../assets/eleDisNew/eleDisNew4_2.png","../assets/eleDisNew/eleDisNew4_14.png","../assets/eleDisNew/eleDisNew4_13.png","../assets/eleDisNew/eleDisNew4_12.png","../assets/eleDisNew/eleDisNew4_11.png","../assets/eleDisNew/eleDisNew4_10.png","../assets/eleDisNew/eleDisNew4_1.png","../assets/eleDisNew/eleDisNew4_0.png","../assets/eleDisNew/eleDisNew3_9.png","../assets/eleDisNew/eleDisNew3_8.png","../assets/eleDisNew/eleDisNew3_7.png","../assets/eleDisNew/eleDisNew3_6.png","../assets/eleDisNew/eleDisNew3_5.png","../assets/eleDisNew/eleDisNew3_4.png","../assets/eleDisNew/eleDisNew3_3.png","../assets/eleDisNew/eleDisNew3_2.png","../assets/eleDisNew/eleDisNew3_14.png","../assets/eleDisNew/eleDisNew3_13.png","../assets/eleDisNew/eleDisNew3_12.png","../assets/eleDisNew/eleDisNew3_11.png","../assets/eleDisNew/eleDisNew3_10.png","../assets/eleDisNew/eleDisNew3_1.png","../assets/eleDisNew/eleDisNew3_0.png","../assets/eleDisNew/eleDisNew2_9.png","../assets/eleDisNew/eleDisNew2_8.png","../assets/eleDisNew/eleDisNew2_7.png","../assets/eleDisNew/eleDisNew2_6.png","../assets/eleDisNew/eleDisNew2_5.png","../assets/eleDisNew/eleDisNew2_4.png","../assets/eleDisNew/eleDisNew2_3.png","../assets/eleDisNew/eleDisNew2_2.png","../assets/eleDisNew/eleDisNew2_14.png","../assets/eleDisNew/eleDisNew2_13.png","../assets/eleDisNew/eleDisNew2_12.png","../assets/eleDisNew/eleDisNew2_11.png","../assets/eleDisNew/eleDisNew2_10.png","../assets/eleDisNew/eleDisNew2_1.png","../assets/eleDisNew/eleDisNew2_0.png","../assets/eleDisNew/eleDisNew1_9.png","../assets/eleDisNew/eleDisNew1_8.png","../assets/eleDisNew/eleDisNew1_7.png","../assets/eleDisNew/eleDisNew1_6.png","../assets/eleDisNew/eleDisNew1_5.png","../assets/eleDisNew/eleDisNew1_4.png","../assets/eleDisNew/eleDisNew1_3.png","../assets/eleDisNew/eleDisNew1_2.png","../assets/eleDisNew/eleDisNew1_14.png","../assets/eleDisNew/eleDisNew1_13.png","../assets/eleDisNew/eleDisNew1_12.png","../assets/eleDisNew/eleDisNew1_11.png","../assets/eleDisNew/eleDisNew1_10.png","../assets/eleDisNew/eleDisNew1_1.png","../assets/eleDisNew/eleDisNew1_0.png","../assets/eleDisNew/eleDisNew0_9.png","../assets/eleDisNew/eleDisNew0_8.png","../assets/eleDisNew/eleDisNew0_7.png","../assets/eleDisNew/eleDisNew0_6.png","../assets/eleDisNew/eleDisNew0_5.png","../assets/eleDisNew/eleDisNew0_4.png","../assets/eleDisNew/eleDisNew0_3.png","../assets/eleDisNew/eleDisNew0_2.png","../assets/eleDisNew/eleDisNew0_14.png","../assets/eleDisNew/eleDisNew0_13.png","../assets/eleDisNew/eleDisNew0_12.png","../assets/eleDisNew/eleDisNew0_11.png","../assets/eleDisNew/eleDisNew0_10.png","../assets/eleDisNew/eleDisNew0_1.png","../assets/eleDisNew/eleDisNew0_0.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"eleDisNew","version":5,"files":["../assets/eleDisNew/eleDisNew4_9.png","../assets/eleDisNew/eleDisNew4_8.png","../assets/eleDisNew/eleDisNew4_7.png","../assets/eleDisNew/eleDisNew4_6.png","../assets/eleDisNew/eleDisNew4_5.png","../assets/eleDisNew/eleDisNew4_4.png","../assets/eleDisNew/eleDisNew4_3.png","../assets/eleDisNew/eleDisNew4_2.png","../assets/eleDisNew/eleDisNew4_14.png","../assets/eleDisNew/eleDisNew4_13.png","../assets/eleDisNew/eleDisNew4_12.png","../assets/eleDisNew/eleDisNew4_11.png","../assets/eleDisNew/eleDisNew4_10.png","../assets/eleDisNew/eleDisNew4_1.png","../assets/eleDisNew/eleDisNew4_0.png","../assets/eleDisNew/eleDisNew3_9.png","../assets/eleDisNew/eleDisNew3_8.png","../assets/eleDisNew/eleDisNew3_7.png","../assets/eleDisNew/eleDisNew3_6.png","../assets/eleDisNew/eleDisNew3_5.png","../assets/eleDisNew/eleDisNew3_4.png","../assets/eleDisNew/eleDisNew3_3.png","../assets/eleDisNew/eleDisNew3_2.png","../assets/eleDisNew/eleDisNew3_14.png","../assets/eleDisNew/eleDisNew3_13.png","../assets/eleDisNew/eleDisNew3_12.png","../assets/eleDisNew/eleDisNew3_11.png","../assets/eleDisNew/eleDisNew3_10.png","../assets/eleDisNew/eleDisNew3_1.png","../assets/eleDisNew/eleDisNew3_0.png","../assets/eleDisNew/eleDisNew2_9.png","../assets/eleDisNew/eleDisNew2_8.png","../assets/eleDisNew/eleDisNew2_7.png","../assets/eleDisNew/eleDisNew2_6.png","../assets/eleDisNew/eleDisNew2_5.png","../assets/eleDisNew/eleDisNew2_4.png","../assets/eleDisNew/eleDisNew2_3.png","../assets/eleDisNew/eleDisNew2_2.png","../assets/eleDisNew/eleDisNew2_14.png","../assets/eleDisNew/eleDisNew2_13.png","../assets/eleDisNew/eleDisNew2_12.png","../assets/eleDisNew/eleDisNew2_11.png","../assets/eleDisNew/eleDisNew2_10.png","../assets/eleDisNew/eleDisNew2_1.png","../assets/eleDisNew/eleDisNew2_0.png","../assets/eleDisNew/eleDisNew1_9.png","../assets/eleDisNew/eleDisNew1_8.png","../assets/eleDisNew/eleDisNew1_7.png","../assets/eleDisNew/eleDisNew1_6.png","../assets/eleDisNew/eleDisNew1_5.png","../assets/eleDisNew/eleDisNew1_4.png","../assets/eleDisNew/eleDisNew1_3.png","../assets/eleDisNew/eleDisNew1_2.png","../assets/eleDisNew/eleDisNew1_14.png","../assets/eleDisNew/eleDisNew1_13.png","../assets/eleDisNew/eleDisNew1_12.png","../assets/eleDisNew/eleDisNew1_11.png","../assets/eleDisNew/eleDisNew1_10.png","../assets/eleDisNew/eleDisNew1_1.png","../assets/eleDisNew/eleDisNew1_0.png","../assets/eleDisNew/eleDisNew0_9.png","../assets/eleDisNew/eleDisNew0_8.png","../assets/eleDisNew/eleDisNew0_7.png","../assets/eleDisNew/eleDisNew0_6.png","../assets/eleDisNew/eleDisNew0_5.png","../assets/eleDisNew/eleDisNew0_4.png","../assets/eleDisNew/eleDisNew0_3.png","../assets/eleDisNew/eleDisNew0_2.png","../assets/eleDisNew/eleDisNew0_14.png","../assets/eleDisNew/eleDisNew0_13.png","../assets/eleDisNew/eleDisNew0_12.png","../assets/eleDisNew/eleDisNew0_11.png","../assets/eleDisNew/eleDisNew0_10.png","../assets/eleDisNew/eleDisNew0_1.png","../assets/eleDisNew/eleDisNew0_0.png"]}
\ No newline at end of file
>>>>>>> 983cec50939c488338313e43fe735ceff98b9d29
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