refactor(gui): 更新ubgs.plist中的纹理坐标和尺寸配置
调整多个UI元素的纹理坐标位置和旋转状态,优化资源布局
This commit is contained in:
@@ -34,7 +34,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{60,60}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{260,1497},{60,60}}</string>
|
||||
<string>{{508,1563},{60,60}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -51,7 +51,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{60,60}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{322,1497},{60,60}}</string>
|
||||
<string>{{570,1563},{60,60}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -68,7 +68,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{54,54}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{384,1497},{54,54}}</string>
|
||||
<string>{{404,1567},{54,54}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -85,7 +85,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{48,48}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{494,1497},{46,46}}</string>
|
||||
<string>{{460,1565},{46,46}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -102,7 +102,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{48,48}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{542,1497},{46,46}}</string>
|
||||
<string>{{632,1550},{46,46}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -119,7 +119,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{48,48}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{590,1497},{46,46}}</string>
|
||||
<string>{{648,1497},{46,46}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -136,7 +136,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{48,48}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{638,1497},{46,46}}</string>
|
||||
<string>{{680,1545},{46,46}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -153,7 +153,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{16,24}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{21,1596},{16,24}}</string>
|
||||
<string>{{485,1537},{16,24}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -170,7 +170,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{16,24}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{39,1596},{16,24}}</string>
|
||||
<string>{{503,1537},{16,24}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -187,7 +187,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{32,32}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{510,1545},{32,32}}</string>
|
||||
<string>{{370,1591},{32,32}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -204,7 +204,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{140,83}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{118,1497},{140,83}}</string>
|
||||
<string>{{1,1537},{140,83}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -221,7 +221,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{36,26}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{384,1553},{36,26}}</string>
|
||||
<string>{{447,1537},{36,26}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -238,7 +238,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{25,50}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{422,1553},{25,50}}</string>
|
||||
<string>{{266,1597},{25,50}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -255,9 +255,9 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{25,50}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{440,1497},{25,50}}</string>
|
||||
<string>{{295,1567},{25,50}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
<true/>
|
||||
</dict>
|
||||
<key>Slider_Border_Tapered_01_Fill_Sky.png</key>
|
||||
<dict>
|
||||
@@ -272,9 +272,9 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{25,50}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{467,1497},{25,50}}</string>
|
||||
<string>{{318,1594},{25,50}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
<true/>
|
||||
</dict>
|
||||
<key>Slider_Border_Tapered_02_Fill_Green.Png</key>
|
||||
<dict>
|
||||
@@ -289,7 +289,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{150,28}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{642,1545},{150,28}}</string>
|
||||
<string>{{143,1537},{150,28}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -306,7 +306,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{150,28}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{686,1497},{150,28}}</string>
|
||||
<string>{{143,1567},{150,28}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -323,9 +323,9 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{150,28}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{781,1113},{150,28}}</string>
|
||||
<string>{{295,1537},{150,28}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
<false/>
|
||||
</dict>
|
||||
<key>Slider_Border_Tapered_03_Border.png</key>
|
||||
<dict>
|
||||
@@ -340,9 +340,9 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{40,36}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{785,1575},{40,36}}</string>
|
||||
<string>{{514,1497},{40,36}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
<false/>
|
||||
</dict>
|
||||
<key>Slider_Border_Tapered_03_Fill.png</key>
|
||||
<dict>
|
||||
@@ -357,9 +357,9 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{12,22}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{86,1596},{12,22}}</string>
|
||||
<string>{{624,1516},{12,22}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
<true/>
|
||||
</dict>
|
||||
<key>Slider_Border_Tapered_03_FillArea.png</key>
|
||||
<dict>
|
||||
@@ -374,7 +374,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{27,22}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{57,1596},{27,22}}</string>
|
||||
<string>{{347,1567},{27,22}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -391,7 +391,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{34,30}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{474,1549},{34,30}}</string>
|
||||
<string>{{557,1531},{34,30}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -408,7 +408,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{17,16}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{260,1559},{17,16}}</string>
|
||||
<string>{{521,1535},{17,16}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -425,7 +425,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{17,16}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{278,1559},{17,16}}</string>
|
||||
<string>{{539,1535},{17,16}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -442,7 +442,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{4,18}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{100,1616},{4,18}}</string>
|
||||
<string>{{143,1617},{4,18}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -459,7 +459,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{4,18}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{120,1616},{4,18}}</string>
|
||||
<string>{{163,1617},{4,18}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -476,7 +476,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{17,16}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{296,1559},{17,16}}</string>
|
||||
<string>{{623,1531},{17,16}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -493,7 +493,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{17,16}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{314,1559},{17,16}}</string>
|
||||
<string>{{624,1497},{17,16}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -510,7 +510,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{41,44}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{699,1575},{41,44}}</string>
|
||||
<string>{{469,1113},{41,44}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -527,7 +527,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{41,44}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{742,1575},{41,44}}</string>
|
||||
<string>{{469,1159},{41,44}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -544,7 +544,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{28,29}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{612,1545},{28,29}}</string>
|
||||
<string>{{593,1531},{28,29}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -561,7 +561,24 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{32,32}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{544,1545},{32,32}}</string>
|
||||
<string>{{556,1497},{32,32}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
<key>Window.png</key>
|
||||
<dict>
|
||||
<key>aliases</key>
|
||||
<array/>
|
||||
<key>anchor</key>
|
||||
<string>{0.5,0.5}</string>
|
||||
<key>spriteOffset</key>
|
||||
<string>{0,0}</string>
|
||||
<key>spriteSize</key>
|
||||
<string>{40,40}</string>
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{48,48}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{469,1205},{40,40}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -578,7 +595,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{48,48}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{653,1575},{44,44}}</string>
|
||||
<string>{{696,1497},{44,44}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -595,7 +612,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{32,32}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{578,1545},{32,32}}</string>
|
||||
<string>{{590,1497},{32,32}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -612,9 +629,9 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{121,18}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{1,1497},{121,18}}</string>
|
||||
<string>{{143,1597},{121,18}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
<false/>
|
||||
</dict>
|
||||
<key>bar2.png</key>
|
||||
<dict>
|
||||
@@ -629,7 +646,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{26,18}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{100,1596},{26,18}}</string>
|
||||
<string>{{376,1567},{26,18}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -646,7 +663,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{511,38}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{140,1582},{511,38}}</string>
|
||||
<string>{{1,1497},{511,38}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -680,7 +697,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{154,382}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{469,1113},{154,382}}</string>
|
||||
<string>{{313,1113},{154,382}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -697,7 +714,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{154,382}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{625,1113},{154,382}}</string>
|
||||
<string>{{670,1113},{154,382}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -714,7 +731,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{95,97}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{21,1497},{95,97}}</string>
|
||||
<string>{{742,1497},{95,97}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -731,7 +748,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{162,240}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{838,1113},{162,240}}</string>
|
||||
<string>{{826,1113},{162,240}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -748,7 +765,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{162,240}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{838,1277},{162,240}}</string>
|
||||
<string>{{826,1277},{162,240}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -765,7 +782,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{161,237}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{838,1441},{161,237}}</string>
|
||||
<string>{{839,1441},{161,237}}</string>
|
||||
<key>textureRotated</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -799,7 +816,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{154,382}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{157,1113},{154,382}}</string>
|
||||
<string>{{514,1113},{154,382}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -816,7 +833,7 @@
|
||||
<key>spriteSourceSize</key>
|
||||
<string>{154,382}</string>
|
||||
<key>textureRect</key>
|
||||
<string>{{313,1113},{154,382}}</string>
|
||||
<string>{{157,1113},{154,382}}</string>
|
||||
<key>textureRotated</key>
|
||||
<false/>
|
||||
</dict>
|
||||
@@ -832,9 +849,9 @@
|
||||
<key>realTextureFileName</key>
|
||||
<string>ubgs.png</string>
|
||||
<key>size</key>
|
||||
<string>{1084,1621}</string>
|
||||
<string>{1084,1624}</string>
|
||||
<key>smartupdate</key>
|
||||
<string>$TexturePacker:SmartUpdate:a83a6120afabe68900b04f71837efe33:7aff364169c2c374c9b449161459c880:5b41e8754d5c20ccbdfa5dd64a06ff5c$</string>
|
||||
<string>$TexturePacker:SmartUpdate:7e6d668eab434ec89c2667dcc7cba74d:b0fe9d84d14c76725cbf5d1c6350dac3:5b41e8754d5c20ccbdfa5dd64a06ff5c$</string>
|
||||
<key>textureFileName</key>
|
||||
<string>ubgs.png</string>
|
||||
</dict>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 122 KiB After Width: | Height: | Size: 123 KiB |
@@ -346,10 +346,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -392,10 +399,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -438,10 +452,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -484,10 +505,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -530,10 +558,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -576,10 +611,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -622,10 +664,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -668,10 +717,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -714,10 +770,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -806,10 +869,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -852,10 +922,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -898,10 +975,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -944,10 +1028,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -990,10 +1081,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -1036,10 +1134,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -1082,10 +1187,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -1128,10 +1240,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -1174,10 +1293,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -1220,10 +1346,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
@@ -1266,10 +1399,17 @@
|
||||
"height": 16,
|
||||
"rawWidth": 16,
|
||||
"rawHeight": 16,
|
||||
<<<<<<< HEAD
|
||||
"borderTop": 8,
|
||||
"borderBottom": 8,
|
||||
"borderLeft": 8,
|
||||
"borderRight": 8,
|
||||
=======
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
>>>>>>> 18b1c3346a19c155a549482792c7edd39d5bedae
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
|
||||
Reference in New Issue
Block a user