1 jaar geleden · 8c3b51418a
--- a/CatFish.keystore
+++ b/CatFish.keystore
--- a/assets/Scene/gameScene.fire.meta
+++ b/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": {}
			
--- a/assets/resources/bg/bg1.png
+++ b/assets/resources/bg/bg1.png
--- a/assets/resources/bg/tb_hc.png
+++ b/assets/resources/bg/tb_hc.png
--- a/assets/resources/bg/tb_hc1.png
+++ b/assets/resources/bg/tb_hc1.png
--- a/assets/resources/bg/tb_hd.png
+++ b/assets/resources/bg/tb_hd.png
--- a/assets/resources/bg/tb_yg.png
+++ b/assets/resources/bg/tb_yg.png
--- a/assets/resources/common/btn_cheng2.png
+++ b/assets/resources/common/btn_cheng2.png
--- a/assets/resources/common/btn_lv.png
+++ b/assets/resources/common/btn_lv.png
--- a/assets/resources/common/guangquan.png
+++ b/assets/resources/common/guangquan.png
--- a/assets/resources/common/guangquan.png.meta
+++ b/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,
			
--- a/assets/resources/common/tb_sp.png
+++ b/assets/resources/common/tb_sp.png
--- a/assets/resources/common/ui_dadikuang.png
+++ b/assets/resources/common/ui_dadikuang.png
--- a/assets/resources/common/ui_title.png
+++ b/assets/resources/common/ui_title.png
--- a/assets/resources/common/ui_tj2.png
+++ b/assets/resources/common/ui_tj2.png
--- a/assets/resources/common/wz_mc.png
+++ b/assets/resources/common/wz_mc.png
--- a/assets/resources/common/wz_sbmc.png
+++ b/assets/resources/common/wz_sbmc.png
--- a/assets/resources/effect/effect1/mao.png
+++ b/assets/resources/effect/effect1/mao.png
--- a/assets/resources/effect/effect2/shuibowen.png
+++ b/assets/resources/effect/effect2/shuibowen.png
--- a/assets/resources/effect/effect3/ice.png
+++ b/assets/resources/effect/effect3/ice.png
--- a/assets/resources/effect/effect5/jb.png
+++ b/assets/resources/effect/effect5/jb.png
--- a/assets/resources/fameLayer/btn_an.png
+++ b/assets/resources/fameLayer/btn_an.png
--- a/assets/resources/fameLayer/ui_jdt1.png
+++ b/assets/resources/fameLayer/ui_jdt1.png
--- a/assets/resources/fameLayer/ui_jdt2.png
+++ b/assets/resources/fameLayer/ui_jdt2.png
--- a/assets/resources/fameLayer/ui_jdt3.png
+++ b/assets/resources/fameLayer/ui_jdt3.png
--- a/assets/resources/fameLayer/ui_yxk.png
+++ b/assets/resources/fameLayer/ui_yxk.png
--- a/assets/resources/fameLayer/wz_ksdjfzytp.png
+++ b/assets/resources/fameLayer/wz_ksdjfzytp.png
--- a/assets/resources/fameLayer/wz_pydzz.png
+++ b/assets/resources/fameLayer/wz_pydzz.png
--- a/assets/resources/fishing/fishing1.png
+++ b/assets/resources/fishing/fishing1.png
--- a/assets/resources/fishing/fishing1.png.meta
+++ b/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,
			
--- a/assets/resources/fishing/fishing10.png
+++ b/assets/resources/fishing/fishing10.png
--- a/assets/resources/fishing/fishing11.png
+++ b/assets/resources/fishing/fishing11.png
--- a/assets/resources/fishing/fishing12.png
+++ b/assets/resources/fishing/fishing12.png
--- a/assets/resources/fishing/fishing13.png
+++ b/assets/resources/fishing/fishing13.png
--- a/assets/resources/fishing/fishing14.png
+++ b/assets/resources/fishing/fishing14.png
--- a/assets/resources/fishing/fishing15.png
+++ b/assets/resources/fishing/fishing15.png
--- a/assets/resources/fishing/fishing16.png
+++ b/assets/resources/fishing/fishing16.png
--- a/assets/resources/fishing/fishing17.png
+++ b/assets/resources/fishing/fishing17.png
--- a/assets/resources/fishing/fishing18.png
+++ b/assets/resources/fishing/fishing18.png
--- a/assets/resources/fishing/fishing19.png
+++ b/assets/resources/fishing/fishing19.png
--- a/assets/resources/fishing/fishing2.png
+++ b/assets/resources/fishing/fishing2.png
--- a/assets/resources/fishing/fishing20.png
+++ b/assets/resources/fishing/fishing20.png
--- a/assets/resources/fishing/fishing21.png
+++ b/assets/resources/fishing/fishing21.png
--- a/assets/resources/fishing/fishing22.png
+++ b/assets/resources/fishing/fishing22.png
--- a/assets/resources/fishing/fishing23.png
+++ b/assets/resources/fishing/fishing23.png
--- a/assets/resources/fishing/fishing24.png
+++ b/assets/resources/fishing/fishing24.png
--- a/assets/resources/fishing/fishing3.png
+++ b/assets/resources/fishing/fishing3.png
--- a/assets/resources/fishing/fishing4.png
+++ b/assets/resources/fishing/fishing4.png
--- a/assets/resources/fishing/fishing5.png
+++ b/assets/resources/fishing/fishing5.png
--- a/assets/resources/fishing/fishing6.png
+++ b/assets/resources/fishing/fishing6.png
--- a/assets/resources/fishing/fishing7.png
+++ b/assets/resources/fishing/fishing7.png
--- a/assets/resources/fishing/fishing8.png
+++ b/assets/resources/fishing/fishing8.png
--- a/assets/resources/fishing/fishing9.png
+++ b/assets/resources/fishing/fishing9.png
--- a/assets/resources/guide/shouzhi.png
+++ b/assets/resources/guide/shouzhi.png
--- a/assets/resources/mainLayer/bj.png
+++ b/assets/resources/mainLayer/bj.png
--- a/assets/resources/mainLayer/btn_dakuang.png
+++ b/assets/resources/mainLayer/btn_dakuang.png
--- a/assets/resources/mainLayer/btn_lan1.png
+++ b/assets/resources/mainLayer/btn_lan1.png
--- a/assets/resources/mainLayer/sz_baise.png
+++ b/assets/resources/mainLayer/sz_baise.png
--- a/assets/resources/mainLayer/sz_baise2.png
+++ b/assets/resources/mainLayer/sz_baise2.png
--- a/assets/resources/mainLayer/sz_huang.png
+++ b/assets/resources/mainLayer/sz_huang.png
--- a/assets/resources/mainLayer/sz_juse.png
+++ b/assets/resources/mainLayer/sz_juse.png
--- a/assets/resources/mainLayer/sz_lanse.png
+++ b/assets/resources/mainLayer/sz_lanse.png
--- a/assets/resources/mainLayer/sz_lv.png
+++ b/assets/resources/mainLayer/sz_lv.png
--- a/assets/resources/mainLayer/tb_bx.png
+++ b/assets/resources/mainLayer/tb_bx.png
--- a/assets/resources/mainLayer/tb_bx.png.meta
+++ b/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,
			
--- a/assets/resources/mainLayer/tb_cj1.png
+++ b/assets/resources/mainLayer/tb_cj1.png
--- a/assets/resources/mainLayer/tb_jb.png
+++ b/assets/resources/mainLayer/tb_jb.png
--- a/assets/resources/mainLayer/tb_jbt.png
+++ b/assets/resources/mainLayer/tb_jbt.png
--- a/assets/resources/mainLayer/tb_kszp.png
+++ b/assets/resources/mainLayer/tb_kszp.png
--- a/assets/resources/mainLayer/tb_mrlb.png
+++ b/assets/resources/mainLayer/tb_mrlb.png
--- a/assets/resources/mainLayer/tb_phb.png
+++ b/assets/resources/mainLayer/tb_phb.png
--- a/assets/resources/mainLayer/tb_qd.png
+++ b/assets/resources/mainLayer/tb_qd.png
--- a/assets/resources/mainLayer/tb_qy.png
+++ b/assets/resources/mainLayer/tb_qy.png
--- a/assets/resources/mainLayer/tb_sy1.png
+++ b/assets/resources/mainLayer/tb_sy1.png
--- a/assets/resources/mainLayer/tb_sy2.png
+++ b/assets/resources/mainLayer/tb_sy2.png
--- a/assets/resources/mainLayer/tb_yg.png
+++ b/assets/resources/mainLayer/tb_yg.png
--- a/assets/resources/mainLayer/tb_yg.png.meta
+++ b/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,
			
--- a/assets/resources/mainLayer/tb_yu.png
+++ b/assets/resources/mainLayer/tb_yu.png
--- a/assets/resources/mainLayer/ui_dikuang.png
+++ b/assets/resources/mainLayer/ui_dikuang.png
--- a/assets/resources/mainLayer/ui_dikuang.png.meta
+++ b/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,
			
--- a/assets/resources/mainLayer/ui_dikuang2.png
+++ b/assets/resources/mainLayer/ui_dikuang2.png
--- a/assets/resources/mainLayer/ui_fanguang.png
+++ b/assets/resources/mainLayer/ui_fanguang.png
--- a/assets/resources/mainLayer/ui_fanguang.png.meta
+++ b/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,
			
--- a/assets/resources/mainLayer/ui_tiao1.png
+++ b/assets/resources/mainLayer/ui_tiao1.png
--- a/assets/resources/mainLayer/ui_tiao2.png
+++ b/assets/resources/mainLayer/ui_tiao2.png
--- a/assets/resources/mainLayer/ui_tiao2.png.meta
+++ b/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,
			
--- a/assets/resources/mainLayer/ui_tiao3.png
+++ b/assets/resources/mainLayer/ui_tiao3.png
--- a/assets/resources/mainLayer/ui_tiao4.png
+++ b/assets/resources/mainLayer/ui_tiao4.png
--- a/assets/resources/mainLayer/wz_djpmksdy.png
+++ b/assets/resources/mainLayer/wz_djpmksdy.png
--- a/assets/resources/mainLayer/wz_phb.png
+++ b/assets/resources/mainLayer/wz_phb.png
--- a/assets/resources/mainLayer/wz_qd.png
+++ b/assets/resources/mainLayer/wz_qd.png
--- a/assets/resources/mainLayer/wz_sy.png
+++ b/assets/resources/mainLayer/wz_sy.png
--- a/assets/resources/mainLayer/wz_sz.png
+++ b/assets/resources/mainLayer/wz_sz.png
--- a/assets/resources/mainLayer/wz_tj.png
+++ b/assets/resources/mainLayer/wz_tj.png
--- a/assets/resources/mainLayer/wz_ye.png
+++ b/assets/resources/mainLayer/wz_ye.png
--- a/assets/resources/mainLayer/wz_yg.png
+++ b/assets/resources/mainLayer/wz_yg.png
--- a/assets/resources/mainLayer/wz_zl.png
+++ b/assets/resources/mainLayer/wz_zl.png
--- a/assets/resources/share/img1.jpg
+++ b/assets/resources/share/img1.jpg
--- a/assets/resources/share/img2.jpg
+++ b/assets/resources/share/img2.jpg
--- a/assets/resources/tujian/tb_gb.png
+++ b/assets/resources/tujian/tb_gb.png