Browse Source

Merge branch 'master' of http://git.mokasz.com/zouyong/art

shengjiaying 5 years ago
parent
commit
f879fb513f

File diff suppressed because it is too large
+ 0 - 0
轻松连连消/spine/loading/loading.json


BIN
轻松连连消/spine/loading/loading.png


+ 9 - 9
轻松连连消/spine/主页场景/changjing.json

@@ -1,6 +1,6 @@
 {
 "skeleton": {
-	"hash": "ybjFtZKGQKLpHOBh8ORCtv5d2GE",
+	"hash": "civ2gQrb2Nt/WnNmVwNr0rMLAAM",
 	"spine": "3.8.99",
 	"x": -374.88,
 	"y": 85.62,
@@ -26,7 +26,7 @@
 		"name": "背景/wave1",
 		"parent": "root",
 		"rotation": -177.98,
-		"x": -61.31,
+		"x": 8.51,
 		"y": 817.07,
 		"scaleX": 0.6,
 		"scaleY": 0.6
@@ -43,7 +43,7 @@
 		"name": "背景/wave2",
 		"parent": "root",
 		"rotation": 123.57,
-		"x": 298.85,
+		"x": 517.85,
 		"y": 706.16,
 		"scaleX": 0.4,
 		"scaleY": 0.4
@@ -88,7 +88,7 @@
 		"name": "背景/wave7",
 		"parent": "root",
 		"rotation": 27.38,
-		"x": -223.91,
+		"x": -490.59,
 		"y": 1007.14,
 		"scaleX": 0.4,
 		"scaleY": 0.4
@@ -97,8 +97,8 @@
 		"name": "背景/wave8",
 		"parent": "root",
 		"rotation": 7.73,
-		"x": 152.79,
-		"y": 1083.21,
+		"x": 108.66,
+		"y": 1071.52,
 		"scaleX": 0.5,
 		"scaleY": 0.5
 	},
@@ -106,7 +106,7 @@
 		"name": "背景/wave9",
 		"parent": "root",
 		"rotation": 156.59,
-		"x": 135.71,
+		"x": 529.29,
 		"y": 795.4,
 		"scaleX": 0.4259,
 		"scaleY": 0.4259
@@ -169,8 +169,8 @@
 		"name": "背景/wave16",
 		"parent": "root",
 		"rotation": 7.73,
-		"x": -48.98,
-		"y": 1060.77,
+		"x": -93.11,
+		"y": 1049.09,
 		"scaleX": 0.6,
 		"scaleY": 0.6
 	},

BIN
轻松连连消/spine/主页场景/changjing.png


File diff suppressed because it is too large
+ 2 - 2
轻松连连消/spine/熊猫引导/pandan.json


Some files were not shown because too many files changed in this diff