Jelajahi Sumber

Merge branch 'master' of http://47.115.177.97:3000/chenjixiang/CatFish

chenjixiang 1 tahun lalu
induk
melakukan
8c3b51418a
100 mengubah file dengan 26 tambahan dan 25 penghapusan
  1. TEMPAT SAMPAH
      CatFish.keystore
  2. 2 1
      assets/Scene/gameScene.fire.meta
  3. TEMPAT SAMPAH
      assets/resources/bg/bg1.png
  4. TEMPAT SAMPAH
      assets/resources/bg/tb_hc.png
  5. TEMPAT SAMPAH
      assets/resources/bg/tb_hc1.png
  6. TEMPAT SAMPAH
      assets/resources/bg/tb_hd.png
  7. TEMPAT SAMPAH
      assets/resources/bg/tb_yg.png
  8. TEMPAT SAMPAH
      assets/resources/common/btn_cheng2.png
  9. TEMPAT SAMPAH
      assets/resources/common/btn_lv.png
  10. TEMPAT SAMPAH
      assets/resources/common/guangquan.png
  11. 4 4
      assets/resources/common/guangquan.png.meta
  12. TEMPAT SAMPAH
      assets/resources/common/tb_sp.png
  13. TEMPAT SAMPAH
      assets/resources/common/ui_dadikuang.png
  14. TEMPAT SAMPAH
      assets/resources/common/ui_title.png
  15. TEMPAT SAMPAH
      assets/resources/common/ui_tj2.png
  16. TEMPAT SAMPAH
      assets/resources/common/wz_mc.png
  17. TEMPAT SAMPAH
      assets/resources/common/wz_sbmc.png
  18. TEMPAT SAMPAH
      assets/resources/effect/effect1/mao.png
  19. TEMPAT SAMPAH
      assets/resources/effect/effect2/shuibowen.png
  20. TEMPAT SAMPAH
      assets/resources/effect/effect3/ice.png
  21. TEMPAT SAMPAH
      assets/resources/effect/effect5/jb.png
  22. TEMPAT SAMPAH
      assets/resources/fameLayer/btn_an.png
  23. TEMPAT SAMPAH
      assets/resources/fameLayer/ui_jdt1.png
  24. TEMPAT SAMPAH
      assets/resources/fameLayer/ui_jdt2.png
  25. TEMPAT SAMPAH
      assets/resources/fameLayer/ui_jdt3.png
  26. TEMPAT SAMPAH
      assets/resources/fameLayer/ui_yxk.png
  27. TEMPAT SAMPAH
      assets/resources/fameLayer/wz_ksdjfzytp.png
  28. TEMPAT SAMPAH
      assets/resources/fameLayer/wz_pydzz.png
  29. TEMPAT SAMPAH
      assets/resources/fishing/fishing1.png
  30. 2 2
      assets/resources/fishing/fishing1.png.meta
  31. TEMPAT SAMPAH
      assets/resources/fishing/fishing10.png
  32. TEMPAT SAMPAH
      assets/resources/fishing/fishing11.png
  33. TEMPAT SAMPAH
      assets/resources/fishing/fishing12.png
  34. TEMPAT SAMPAH
      assets/resources/fishing/fishing13.png
  35. TEMPAT SAMPAH
      assets/resources/fishing/fishing14.png
  36. TEMPAT SAMPAH
      assets/resources/fishing/fishing15.png
  37. TEMPAT SAMPAH
      assets/resources/fishing/fishing16.png
  38. TEMPAT SAMPAH
      assets/resources/fishing/fishing17.png
  39. TEMPAT SAMPAH
      assets/resources/fishing/fishing18.png
  40. TEMPAT SAMPAH
      assets/resources/fishing/fishing19.png
  41. TEMPAT SAMPAH
      assets/resources/fishing/fishing2.png
  42. TEMPAT SAMPAH
      assets/resources/fishing/fishing20.png
  43. TEMPAT SAMPAH
      assets/resources/fishing/fishing21.png
  44. TEMPAT SAMPAH
      assets/resources/fishing/fishing22.png
  45. TEMPAT SAMPAH
      assets/resources/fishing/fishing23.png
  46. TEMPAT SAMPAH
      assets/resources/fishing/fishing24.png
  47. TEMPAT SAMPAH
      assets/resources/fishing/fishing3.png
  48. TEMPAT SAMPAH
      assets/resources/fishing/fishing4.png
  49. TEMPAT SAMPAH
      assets/resources/fishing/fishing5.png
  50. TEMPAT SAMPAH
      assets/resources/fishing/fishing6.png
  51. TEMPAT SAMPAH
      assets/resources/fishing/fishing7.png
  52. TEMPAT SAMPAH
      assets/resources/fishing/fishing8.png
  53. TEMPAT SAMPAH
      assets/resources/fishing/fishing9.png
  54. TEMPAT SAMPAH
      assets/resources/guide/shouzhi.png
  55. TEMPAT SAMPAH
      assets/resources/mainLayer/bj.png
  56. TEMPAT SAMPAH
      assets/resources/mainLayer/btn_dakuang.png
  57. TEMPAT SAMPAH
      assets/resources/mainLayer/btn_lan1.png
  58. TEMPAT SAMPAH
      assets/resources/mainLayer/sz_baise.png
  59. TEMPAT SAMPAH
      assets/resources/mainLayer/sz_baise2.png
  60. TEMPAT SAMPAH
      assets/resources/mainLayer/sz_huang.png
  61. TEMPAT SAMPAH
      assets/resources/mainLayer/sz_juse.png
  62. TEMPAT SAMPAH
      assets/resources/mainLayer/sz_lanse.png
  63. TEMPAT SAMPAH
      assets/resources/mainLayer/sz_lv.png
  64. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_bx.png
  65. 6 6
      assets/resources/mainLayer/tb_bx.png.meta
  66. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_cj1.png
  67. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_jb.png
  68. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_jbt.png
  69. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_kszp.png
  70. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_mrlb.png
  71. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_phb.png
  72. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_qd.png
  73. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_qy.png
  74. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_sy1.png
  75. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_sy2.png
  76. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_yg.png
  77. 2 2
      assets/resources/mainLayer/tb_yg.png.meta
  78. TEMPAT SAMPAH
      assets/resources/mainLayer/tb_yu.png
  79. TEMPAT SAMPAH
      assets/resources/mainLayer/ui_dikuang.png
  80. 3 3
      assets/resources/mainLayer/ui_dikuang.png.meta
  81. TEMPAT SAMPAH
      assets/resources/mainLayer/ui_dikuang2.png
  82. TEMPAT SAMPAH
      assets/resources/mainLayer/ui_fanguang.png
  83. 5 5
      assets/resources/mainLayer/ui_fanguang.png.meta
  84. TEMPAT SAMPAH
      assets/resources/mainLayer/ui_tiao1.png
  85. TEMPAT SAMPAH
      assets/resources/mainLayer/ui_tiao2.png
  86. 2 2
      assets/resources/mainLayer/ui_tiao2.png.meta
  87. TEMPAT SAMPAH
      assets/resources/mainLayer/ui_tiao3.png
  88. TEMPAT SAMPAH
      assets/resources/mainLayer/ui_tiao4.png
  89. TEMPAT SAMPAH
      assets/resources/mainLayer/wz_djpmksdy.png
  90. TEMPAT SAMPAH
      assets/resources/mainLayer/wz_phb.png
  91. TEMPAT SAMPAH
      assets/resources/mainLayer/wz_qd.png
  92. TEMPAT SAMPAH
      assets/resources/mainLayer/wz_sy.png
  93. TEMPAT SAMPAH
      assets/resources/mainLayer/wz_sz.png
  94. TEMPAT SAMPAH
      assets/resources/mainLayer/wz_tj.png
  95. TEMPAT SAMPAH
      assets/resources/mainLayer/wz_ye.png
  96. TEMPAT SAMPAH
      assets/resources/mainLayer/wz_yg.png
  97. TEMPAT SAMPAH
      assets/resources/mainLayer/wz_zl.png
  98. TEMPAT SAMPAH
      assets/resources/share/img1.jpg
  99. TEMPAT SAMPAH
      assets/resources/share/img2.jpg
  100. 0 0
      assets/resources/tujian/tb_gb.png

TEMPAT SAMPAH
CatFish.keystore


+ 2 - 1
assets/Scene/gameScene.fire.meta

@@ -1,6 +1,7 @@
 {
-  "ver": "1.2.9",
+  "ver": "1.3.2",
   "uuid": "bdd49880-e979-4838-9398-465039f61e6f",
+  "importer": "scene",
   "asyncLoadAssets": false,
   "autoReleaseAssets": false,
   "subMetas": {}

TEMPAT SAMPAH
assets/resources/bg/bg1.png


TEMPAT SAMPAH
assets/resources/bg/tb_hc.png


TEMPAT SAMPAH
assets/resources/bg/tb_hc1.png


TEMPAT SAMPAH
assets/resources/bg/tb_hd.png


TEMPAT SAMPAH
assets/resources/bg/tb_yg.png


TEMPAT SAMPAH
assets/resources/common/btn_cheng2.png


TEMPAT SAMPAH
assets/resources/common/btn_lv.png


TEMPAT SAMPAH
assets/resources/common/guangquan.png


+ 4 - 4
assets/resources/common/guangquan.png.meta

@@ -22,10 +22,10 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 357,
-      "height": 369,
+      "trimX": 14,
+      "trimY": 22,
+      "width": 329,
+      "height": 325,
       "rawWidth": 357,
       "rawHeight": 369,
       "borderTop": 0,

TEMPAT SAMPAH
assets/resources/common/tb_sp.png


TEMPAT SAMPAH
assets/resources/common/ui_dadikuang.png


TEMPAT SAMPAH
assets/resources/common/ui_title.png


TEMPAT SAMPAH
assets/resources/common/ui_tj2.png


TEMPAT SAMPAH
assets/resources/common/wz_mc.png


TEMPAT SAMPAH
assets/resources/common/wz_sbmc.png


TEMPAT SAMPAH
assets/resources/effect/effect1/mao.png


TEMPAT SAMPAH
assets/resources/effect/effect2/shuibowen.png


TEMPAT SAMPAH
assets/resources/effect/effect3/ice.png


TEMPAT SAMPAH
assets/resources/effect/effect5/jb.png


TEMPAT SAMPAH
assets/resources/fameLayer/btn_an.png


TEMPAT SAMPAH
assets/resources/fameLayer/ui_jdt1.png


TEMPAT SAMPAH
assets/resources/fameLayer/ui_jdt2.png


TEMPAT SAMPAH
assets/resources/fameLayer/ui_jdt3.png


TEMPAT SAMPAH
assets/resources/fameLayer/ui_yxk.png


TEMPAT SAMPAH
assets/resources/fameLayer/wz_ksdjfzytp.png


TEMPAT SAMPAH
assets/resources/fameLayer/wz_pydzz.png


TEMPAT SAMPAH
assets/resources/fishing/fishing1.png


+ 2 - 2
assets/resources/fishing/fishing1.png.meta

@@ -20,11 +20,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 92,
+      "width": 91,
       "height": 55,
       "rawWidth": 92,
       "rawHeight": 55,

TEMPAT SAMPAH
assets/resources/fishing/fishing10.png


TEMPAT SAMPAH
assets/resources/fishing/fishing11.png


TEMPAT SAMPAH
assets/resources/fishing/fishing12.png


TEMPAT SAMPAH
assets/resources/fishing/fishing13.png


TEMPAT SAMPAH
assets/resources/fishing/fishing14.png


TEMPAT SAMPAH
assets/resources/fishing/fishing15.png


TEMPAT SAMPAH
assets/resources/fishing/fishing16.png


TEMPAT SAMPAH
assets/resources/fishing/fishing17.png


TEMPAT SAMPAH
assets/resources/fishing/fishing18.png


TEMPAT SAMPAH
assets/resources/fishing/fishing19.png


TEMPAT SAMPAH
assets/resources/fishing/fishing2.png


TEMPAT SAMPAH
assets/resources/fishing/fishing20.png


TEMPAT SAMPAH
assets/resources/fishing/fishing21.png


TEMPAT SAMPAH
assets/resources/fishing/fishing22.png


TEMPAT SAMPAH
assets/resources/fishing/fishing23.png


TEMPAT SAMPAH
assets/resources/fishing/fishing24.png


TEMPAT SAMPAH
assets/resources/fishing/fishing3.png


TEMPAT SAMPAH
assets/resources/fishing/fishing4.png


TEMPAT SAMPAH
assets/resources/fishing/fishing5.png


TEMPAT SAMPAH
assets/resources/fishing/fishing6.png


TEMPAT SAMPAH
assets/resources/fishing/fishing7.png


TEMPAT SAMPAH
assets/resources/fishing/fishing8.png


TEMPAT SAMPAH
assets/resources/fishing/fishing9.png


TEMPAT SAMPAH
assets/resources/guide/shouzhi.png


TEMPAT SAMPAH
assets/resources/mainLayer/bj.png


TEMPAT SAMPAH
assets/resources/mainLayer/btn_dakuang.png


TEMPAT SAMPAH
assets/resources/mainLayer/btn_lan1.png


TEMPAT SAMPAH
assets/resources/mainLayer/sz_baise.png


TEMPAT SAMPAH
assets/resources/mainLayer/sz_baise2.png


TEMPAT SAMPAH
assets/resources/mainLayer/sz_huang.png


TEMPAT SAMPAH
assets/resources/mainLayer/sz_juse.png


TEMPAT SAMPAH
assets/resources/mainLayer/sz_lanse.png


TEMPAT SAMPAH
assets/resources/mainLayer/sz_lv.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_bx.png


+ 6 - 6
assets/resources/mainLayer/tb_bx.png.meta

@@ -20,12 +20,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 75,
-      "height": 79,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 74,
+      "height": 78,
       "rawWidth": 75,
       "rawHeight": 79,
       "borderTop": 0,

TEMPAT SAMPAH
assets/resources/mainLayer/tb_cj1.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_jb.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_jbt.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_kszp.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_mrlb.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_phb.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_qd.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_qy.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_sy1.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_sy2.png


TEMPAT SAMPAH
assets/resources/mainLayer/tb_yg.png


+ 2 - 2
assets/resources/mainLayer/tb_yg.png.meta

@@ -20,11 +20,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 98,
+      "width": 97,
       "height": 75,
       "rawWidth": 98,
       "rawHeight": 75,

TEMPAT SAMPAH
assets/resources/mainLayer/tb_yu.png


TEMPAT SAMPAH
assets/resources/mainLayer/ui_dikuang.png


+ 3 - 3
assets/resources/mainLayer/ui_dikuang.png.meta

@@ -20,11 +20,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -3,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 1,
       "trimY": 0,
-      "width": 640,
+      "width": 632,
       "height": 46,
       "rawWidth": 640,
       "rawHeight": 46,

TEMPAT SAMPAH
assets/resources/mainLayer/ui_dikuang2.png


TEMPAT SAMPAH
assets/resources/mainLayer/ui_fanguang.png


+ 5 - 5
assets/resources/mainLayer/ui_fanguang.png.meta

@@ -20,12 +20,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 125,
-      "height": 107,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 124,
+      "height": 105,
       "rawWidth": 125,
       "rawHeight": 107,
       "borderTop": 0,

TEMPAT SAMPAH
assets/resources/mainLayer/ui_tiao1.png


TEMPAT SAMPAH
assets/resources/mainLayer/ui_tiao2.png


+ 2 - 2
assets/resources/mainLayer/ui_tiao2.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 445,
-      "height": 143,
+      "height": 142,
       "rawWidth": 445,
       "rawHeight": 143,
       "borderTop": 0,

TEMPAT SAMPAH
assets/resources/mainLayer/ui_tiao3.png


TEMPAT SAMPAH
assets/resources/mainLayer/ui_tiao4.png


TEMPAT SAMPAH
assets/resources/mainLayer/wz_djpmksdy.png


TEMPAT SAMPAH
assets/resources/mainLayer/wz_phb.png


TEMPAT SAMPAH
assets/resources/mainLayer/wz_qd.png


TEMPAT SAMPAH
assets/resources/mainLayer/wz_sy.png


TEMPAT SAMPAH
assets/resources/mainLayer/wz_sz.png


TEMPAT SAMPAH
assets/resources/mainLayer/wz_tj.png


TEMPAT SAMPAH
assets/resources/mainLayer/wz_ye.png


TEMPAT SAMPAH
assets/resources/mainLayer/wz_yg.png


TEMPAT SAMPAH
assets/resources/mainLayer/wz_zl.png


TEMPAT SAMPAH
assets/resources/share/img1.jpg


TEMPAT SAMPAH
assets/resources/share/img2.jpg


+ 0 - 0
assets/resources/tujian/tb_gb.png


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini