zh 6 месяцев назад
Родитель
Сommit
86854ec22f
100 измененных файлов с 74 добавлено и 74 удалено
  1. BIN
      assets/effect/tex/shengji.png
  2. 6 6
      assets/effect/tex/shengji.png.meta
  3. BIN
      assets/effect/tex/zidonggongji.png
  4. 2 2
      assets/effect/tex/zidonggongji.png.meta
  5. BIN
      assets/res/UI/activity/airDropView/bg.png
  6. 2 2
      assets/res/UI/activity/airDropView/bg.png.meta
  7. BIN
      assets/res/UI/activity/airDropView/btn_get.png
  8. BIN
      assets/res/UI/activity/airDropView/btn_refrsh.png
  9. BIN
      assets/res/UI/activity/airDropView/icon.png
  10. BIN
      assets/res/UI/activity/airDropView/itemBg.png
  11. BIN
      assets/res/UI/activity/common/close.png
  12. BIN
      assets/res/UI/activity/crazy/byjs.png
  13. 3 3
      assets/res/UI/activity/crazy/byjs.png.meta
  14. BIN
      assets/res/UI/activity/crazy/fxtsjs_biaoti.png
  15. BIN
      assets/res/UI/activity/crazy/gongji_anniu.png
  16. BIN
      assets/res/UI/activity/crazy/jindutiao1.png
  17. BIN
      assets/res/UI/activity/crazy/jindutiao2.png
  18. BIN
      assets/res/UI/activity/crazy/jsjl.png
  19. 2 2
      assets/res/UI/activity/crazy/jsjl.png.meta
  20. BIN
      assets/res/UI/activity/crazy/kdzl.png
  21. 6 6
      assets/res/UI/activity/crazy/kdzl.png.meta
  22. BIN
      assets/res/UI/activity/crazy/point.png
  23. BIN
      assets/res/UI/activity/obtainView/bg.png
  24. BIN
      assets/res/UI/activity/obtainView/collect.png
  25. BIN
      assets/res/UI/activity/obtainView/gou.png
  26. BIN
      assets/res/UI/activity/obtainView/gou1.png
  27. BIN
      assets/res/UI/activity/obtainView/gou2.png
  28. 2 2
      assets/res/UI/activity/obtainView/gou2.png.meta
  29. BIN
      assets/res/UI/activity/obtainView/sblq_btn4.png
  30. BIN
      assets/res/UI/activity/shopView/bg.png
  31. 2 2
      assets/res/UI/activity/shopView/bg.png.meta
  32. BIN
      assets/res/UI/activity/shopView/btn.png
  33. BIN
      assets/res/UI/activity/shopView/icon.png
  34. BIN
      assets/res/UI/activity/shopView/info.png
  35. 3 3
      assets/res/UI/activity/shopView/info.png.meta
  36. BIN
      assets/res/UI/activity/signView/1.png
  37. BIN
      assets/res/UI/activity/signView/2.png
  38. BIN
      assets/res/UI/activity/signView/3.png
  39. BIN
      assets/res/UI/activity/signView/4.png
  40. BIN
      assets/res/UI/activity/signView/5.png
  41. BIN
      assets/res/UI/activity/signView/6.png
  42. BIN
      assets/res/UI/activity/signView/7.png
  43. BIN
      assets/res/UI/activity/signView/allNode.png
  44. BIN
      assets/res/UI/activity/signView/bg.png
  45. BIN
      assets/res/UI/activity/signView/day1.png
  46. 2 2
      assets/res/UI/activity/signView/day1.png.meta
  47. BIN
      assets/res/UI/activity/signView/day2.png
  48. 2 2
      assets/res/UI/activity/signView/day2.png.meta
  49. BIN
      assets/res/UI/activity/signView/day3.png
  50. 2 2
      assets/res/UI/activity/signView/day3.png.meta
  51. BIN
      assets/res/UI/activity/signView/day4.png
  52. 2 2
      assets/res/UI/activity/signView/day4.png.meta
  53. BIN
      assets/res/UI/activity/signView/day5.png
  54. 2 2
      assets/res/UI/activity/signView/day5.png.meta
  55. BIN
      assets/res/UI/activity/signView/day6.png
  56. 2 2
      assets/res/UI/activity/signView/day6.png.meta
  57. BIN
      assets/res/UI/activity/signView/day7.png
  58. 2 2
      assets/res/UI/activity/signView/day7.png.meta
  59. BIN
      assets/res/UI/activity/signView/daylq.png
  60. 2 2
      assets/res/UI/activity/signView/daylq.png.meta
  61. BIN
      assets/res/UI/activity/signView/det_yj.png
  62. BIN
      assets/res/UI/activity/signView/done.png
  63. 2 2
      assets/res/UI/activity/signView/done.png.meta
  64. BIN
      assets/res/UI/activity/signView/faguang_k.png
  65. BIN
      assets/res/UI/activity/signView/icon1_fg.png
  66. BIN
      assets/res/UI/activity/signView/icon2_fg.png
  67. BIN
      assets/res/UI/activity/signView/jiaobiao.png
  68. BIN
      assets/res/UI/activity/signView/jiaobiao_y.png
  69. BIN
      assets/res/UI/activity/signView/qq_yj.png
  70. BIN
      assets/res/UI/activity/welfareView/bg.png
  71. BIN
      assets/res/UI/activity/welfareView/btn_free.png
  72. BIN
      assets/res/UI/activity/welfareView/icon_btn.png
  73. BIN
      assets/res/UI/activity/welfareView/icon_recruit.png
  74. BIN
      assets/res/UI/activity/welfareView/recruit.png
  75. BIN
      assets/res/UI/activity/welfareView/xcz_4m.png
  76. 2 2
      assets/res/UI/activity/welfareView/xcz_4m.png.meta
  77. BIN
      assets/res/UI/activity/welfareView/xcz_qx.png
  78. BIN
      assets/res/UI/activity/welfareView/xcz_wq.png
  79. BIN
      assets/res/UI/activity/welfareView/xcz_wz.png
  80. 3 3
      assets/res/UI/activity/welfareView/xcz_wz.png.meta
  81. BIN
      assets/res/UI/activity/welfareView/xcz_zd.png
  82. BIN
      assets/res/UI/failView/chongxin.png
  83. 3 3
      assets/res/UI/failView/chongxin.png.meta
  84. BIN
      assets/res/UI/failView/jieshu.png
  85. 3 3
      assets/res/UI/failView/jieshu.png.meta
  86. BIN
      assets/res/UI/failView/jsbg.png
  87. BIN
      assets/res/UI/failView/mask.png
  88. BIN
      assets/res/UI/failView/youxiBG.png
  89. BIN
      assets/res/UI/fallitem/guna_catcun.png
  90. BIN
      assets/res/UI/fallitem/guna_m4.png
  91. BIN
      assets/res/UI/fallitem/guna_mg.png
  92. 3 3
      assets/res/UI/fallitem/guna_mg.png.meta
  93. BIN
      assets/res/UI/fallitem/guna_shotgun.png
  94. 3 3
      assets/res/UI/fallitem/guna_shotgun.png.meta
  95. BIN
      assets/res/UI/fallitem/guna_snipe.png
  96. 5 5
      assets/res/UI/fallitem/guna_snipe.png.meta
  97. BIN
      assets/res/UI/fallitem/gunb_bbgun.png
  98. 3 3
      assets/res/UI/fallitem/gunb_bbgun.png.meta
  99. BIN
      assets/res/UI/fallitem/gunb_pistol.png
  100. 3 3
      assets/res/UI/fallitem/gunb_pistol.png.meta

BIN
assets/effect/tex/shengji.png


+ 6 - 6
assets/effect/tex/shengji.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 152,
-      "height": 77,
+      "offsetX": 0.5,
+      "offsetY": 2.5,
+      "trimX": 1,
+      "trimY": 6,
+      "width": 151,
+      "height": 60,
       "rawWidth": 152,
       "rawHeight": 77,
       "borderTop": 0,

BIN
assets/effect/tex/zidonggongji.png


+ 2 - 2
assets/effect/tex/zidonggongji.png.meta

@@ -21,9 +21,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 1,
       "width": 93,
-      "height": 125,
+      "height": 123,
       "rawWidth": 93,
       "rawHeight": 125,
       "borderTop": 0,

BIN
assets/res/UI/activity/airDropView/bg.png


+ 2 - 2
assets/res/UI/activity/airDropView/bg.png.meta

@@ -21,9 +21,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 4,
       "width": 886,
-      "height": 548,
+      "height": 540,
       "rawWidth": 886,
       "rawHeight": 548,
       "borderTop": 0,

BIN
assets/res/UI/activity/airDropView/btn_get.png


BIN
assets/res/UI/activity/airDropView/btn_refrsh.png


BIN
assets/res/UI/activity/airDropView/icon.png


BIN
assets/res/UI/activity/airDropView/itemBg.png


BIN
assets/res/UI/activity/common/close.png


BIN
assets/res/UI/activity/crazy/byjs.png


+ 3 - 3
assets/res/UI/activity/crazy/byjs.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 5,
       "width": 161,
-      "height": 37,
+      "height": 26,
       "rawWidth": 161,
       "rawHeight": 37,
       "borderTop": 0,

BIN
assets/res/UI/activity/crazy/fxtsjs_biaoti.png


BIN
assets/res/UI/activity/crazy/gongji_anniu.png


BIN
assets/res/UI/activity/crazy/jindutiao1.png


BIN
assets/res/UI/activity/crazy/jindutiao2.png


BIN
assets/res/UI/activity/crazy/jsjl.png


+ 2 - 2
assets/res/UI/activity/crazy/jsjl.png.meta

@@ -18,9 +18,9 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1,
+      "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
+      "trimX": 1,
       "trimY": 0,
       "width": 263,
       "height": 504,

BIN
assets/res/UI/activity/crazy/kdzl.png


+ 6 - 6
assets/res/UI/activity/crazy/kdzl.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 165,
-      "height": 138,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
+      "trimX": 2,
+      "trimY": 1,
+      "width": 160,
+      "height": 135,
       "rawWidth": 165,
       "rawHeight": 138,
       "borderTop": 0,

BIN
assets/res/UI/activity/crazy/point.png


BIN
assets/res/UI/activity/obtainView/bg.png


BIN
assets/res/UI/activity/obtainView/collect.png


BIN
assets/res/UI/activity/obtainView/gou.png


BIN
assets/res/UI/activity/obtainView/gou1.png


BIN
assets/res/UI/activity/obtainView/gou2.png


+ 2 - 2
assets/res/UI/activity/obtainView/gou2.png.meta

@@ -21,9 +21,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 5,
       "width": 108,
-      "height": 26,
+      "height": 16,
       "rawWidth": 108,
       "rawHeight": 26,
       "borderTop": 0,

BIN
assets/res/UI/activity/obtainView/sblq_btn4.png


BIN
assets/res/UI/activity/shopView/bg.png


+ 2 - 2
assets/res/UI/activity/shopView/bg.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 862,
+      "width": 861,
       "height": 623,
       "rawWidth": 862,
       "rawHeight": 623,

BIN
assets/res/UI/activity/shopView/btn.png


BIN
assets/res/UI/activity/shopView/icon.png


BIN
assets/res/UI/activity/shopView/info.png


+ 3 - 3
assets/res/UI/activity/shopView/info.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 240,
-      "height": 18,
+      "height": 13,
       "rawWidth": 240,
       "rawHeight": 18,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/1.png


BIN
assets/res/UI/activity/signView/2.png


BIN
assets/res/UI/activity/signView/3.png


BIN
assets/res/UI/activity/signView/4.png


BIN
assets/res/UI/activity/signView/5.png


BIN
assets/res/UI/activity/signView/6.png


BIN
assets/res/UI/activity/signView/7.png


BIN
assets/res/UI/activity/signView/allNode.png


BIN
assets/res/UI/activity/signView/bg.png


BIN
assets/res/UI/activity/signView/day1.png


+ 2 - 2
assets/res/UI/activity/signView/day1.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 107,
-      "height": 47,
+      "height": 46,
       "rawWidth": 107,
       "rawHeight": 47,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/day2.png


+ 2 - 2
assets/res/UI/activity/signView/day2.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 107,
-      "height": 47,
+      "height": 46,
       "rawWidth": 107,
       "rawHeight": 47,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/day3.png


+ 2 - 2
assets/res/UI/activity/signView/day3.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 107,
-      "height": 47,
+      "height": 46,
       "rawWidth": 107,
       "rawHeight": 47,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/day4.png


+ 2 - 2
assets/res/UI/activity/signView/day4.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 107,
-      "height": 47,
+      "height": 46,
       "rawWidth": 107,
       "rawHeight": 47,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/day5.png


+ 2 - 2
assets/res/UI/activity/signView/day5.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 107,
-      "height": 47,
+      "height": 46,
       "rawWidth": 107,
       "rawHeight": 47,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/day6.png


+ 2 - 2
assets/res/UI/activity/signView/day6.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 107,
-      "height": 47,
+      "height": 46,
       "rawWidth": 107,
       "rawHeight": 47,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/day7.png


+ 2 - 2
assets/res/UI/activity/signView/day7.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 107,
-      "height": 47,
+      "height": 46,
       "rawWidth": 107,
       "rawHeight": 47,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/daylq.png


+ 2 - 2
assets/res/UI/activity/signView/daylq.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 107,
-      "height": 47,
+      "height": 46,
       "rawWidth": 107,
       "rawHeight": 47,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/det_yj.png


BIN
assets/res/UI/activity/signView/done.png


+ 2 - 2
assets/res/UI/activity/signView/done.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 107,
-      "height": 47,
+      "height": 46,
       "rawWidth": 107,
       "rawHeight": 47,
       "borderTop": 0,

BIN
assets/res/UI/activity/signView/faguang_k.png


BIN
assets/res/UI/activity/signView/icon1_fg.png


BIN
assets/res/UI/activity/signView/icon2_fg.png


BIN
assets/res/UI/activity/signView/jiaobiao.png


BIN
assets/res/UI/activity/signView/jiaobiao_y.png


BIN
assets/res/UI/activity/signView/qq_yj.png


BIN
assets/res/UI/activity/welfareView/bg.png


BIN
assets/res/UI/activity/welfareView/btn_free.png


BIN
assets/res/UI/activity/welfareView/icon_btn.png


BIN
assets/res/UI/activity/welfareView/icon_recruit.png


BIN
assets/res/UI/activity/welfareView/recruit.png


BIN
assets/res/UI/activity/welfareView/xcz_4m.png


+ 2 - 2
assets/res/UI/activity/welfareView/xcz_4m.png.meta

@@ -21,9 +21,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 3,
       "width": 335,
-      "height": 352,
+      "height": 346,
       "rawWidth": 335,
       "rawHeight": 352,
       "borderTop": 0,

BIN
assets/res/UI/activity/welfareView/xcz_qx.png


BIN
assets/res/UI/activity/welfareView/xcz_wq.png


BIN
assets/res/UI/activity/welfareView/xcz_wz.png


+ 3 - 3
assets/res/UI/activity/welfareView/xcz_wz.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 19,
       "trimY": 0,
-      "width": 309,
+      "width": 272,
       "height": 306,
       "rawWidth": 309,
       "rawHeight": 306,

BIN
assets/res/UI/activity/welfareView/xcz_zd.png


BIN
assets/res/UI/failView/chongxin.png


+ 3 - 3
assets/res/UI/failView/chongxin.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 32,
       "trimY": 0,
-      "width": 254,
+      "width": 189,
       "height": 69,
       "rawWidth": 254,
       "rawHeight": 69,

BIN
assets/res/UI/failView/jieshu.png


+ 3 - 3
assets/res/UI/failView/jieshu.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 28,
       "trimY": 0,
-      "width": 738,
+      "width": 681,
       "height": 145,
       "rawWidth": 738,
       "rawHeight": 145,

BIN
assets/res/UI/failView/jsbg.png


BIN
assets/res/UI/failView/mask.png


BIN
assets/res/UI/failView/youxiBG.png


BIN
assets/res/UI/fallitem/guna_catcun.png


BIN
assets/res/UI/fallitem/guna_m4.png


BIN
assets/res/UI/fallitem/guna_mg.png


+ 3 - 3
assets/res/UI/fallitem/guna_mg.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -1,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 3,
       "width": 57,
-      "height": 32,
+      "height": 28,
       "rawWidth": 57,
       "rawHeight": 32,
       "borderTop": 0,

BIN
assets/res/UI/fallitem/guna_shotgun.png


+ 3 - 3
assets/res/UI/fallitem/guna_shotgun.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 1,
       "width": 54,
-      "height": 19,
+      "height": 18,
       "rawWidth": 54,
       "rawHeight": 19,
       "borderTop": 0,

BIN
assets/res/UI/fallitem/guna_snipe.png


+ 5 - 5
assets/res/UI/fallitem/guna_snipe.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 70,
-      "height": 24,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 67,
+      "height": 22,
       "rawWidth": 70,
       "rawHeight": 24,
       "borderTop": 0,

BIN
assets/res/UI/fallitem/gunb_bbgun.png


+ 3 - 3
assets/res/UI/fallitem/gunb_bbgun.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 1,
       "width": 25,
-      "height": 19,
+      "height": 18,
       "rawWidth": 25,
       "rawHeight": 19,
       "borderTop": 0,

BIN
assets/res/UI/fallitem/gunb_pistol.png


+ 3 - 3
assets/res/UI/fallitem/gunb_pistol.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 22,
-      "height": 19,
+      "height": 16,
       "rawWidth": 22,
       "rawHeight": 19,
       "borderTop": 0,

Некоторые файлы не были показаны из-за большого количества измененных файлов