diff --git a/assets/resources/Json/NEW_LEVEL.json b/assets/resources/Json/NEW_LEVEL.json index 5792063..83ce063 100644 --- a/assets/resources/Json/NEW_LEVEL.json +++ b/assets/resources/Json/NEW_LEVEL.json @@ -124,6 +124,21 @@ "level": 1254, "name": "daoju24", "tips": "箭头挡板第一次出现" + }, + { + "level": 1298, + "name": "daoju25", + "tips": "组合变色块第一次出现" + }, + { + "level": 1398, + "name": "daoju26", + "tips": "伸缩杆第一次出现" + }, + { + "level": 1600, + "name": "daoju27", + "tips": "有颜色的移动门第一次出现" } ] } \ No newline at end of file diff --git a/assets/resources/Window_Prop/daoju0.png b/assets/resources/Window_Prop/daoju0.png index 3c3ebc5..ee65673 100644 Binary files a/assets/resources/Window_Prop/daoju0.png and b/assets/resources/Window_Prop/daoju0.png differ diff --git a/assets/resources/Window_Prop/daoju0.png.meta b/assets/resources/Window_Prop/daoju0.png.meta index bd9ad11..b68c9bf 100644 --- a/assets/resources/Window_Prop/daoju0.png.meta +++ b/assets/resources/Window_Prop/daoju0.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, + "offsetY": 2, "trimX": 10, "trimY": 30, "width": 765, - "height": 629, + "height": 626, "rawWidth": 785, "rawHeight": 690, "borderTop": 0, diff --git a/assets/resources/Window_Prop/daoju1.png b/assets/resources/Window_Prop/daoju1.png index 6b39c67..da8c592 100644 Binary files a/assets/resources/Window_Prop/daoju1.png and b/assets/resources/Window_Prop/daoju1.png differ diff --git a/assets/resources/Window_Prop/daoju1.png.meta b/assets/resources/Window_Prop/daoju1.png.meta index fcefacd..a1cc59a 100644 --- a/assets/resources/Window_Prop/daoju1.png.meta +++ b/assets/resources/Window_Prop/daoju1.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0.5, + "offsetY": 2, "trimX": 40, "trimY": 5, "width": 652, - "height": 700, + "height": 697, "rawWidth": 733, "rawHeight": 711, "borderTop": 0, diff --git a/assets/resources/Window_Prop/daoju10.png b/assets/resources/Window_Prop/daoju10.png index 275cb59..5086d29 100644 Binary files a/assets/resources/Window_Prop/daoju10.png and b/assets/resources/Window_Prop/daoju10.png differ diff --git a/assets/resources/Window_Prop/daoju10.png.meta b/assets/resources/Window_Prop/daoju10.png.meta index f03b680..893f62d 100644 --- a/assets/resources/Window_Prop/daoju10.png.meta +++ b/assets/resources/Window_Prop/daoju10.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 1, "trimX": 0, "trimY": 0, "width": 689, - "height": 528, + "height": 526, "rawWidth": 689, "rawHeight": 528, "borderTop": 0, diff --git a/assets/resources/Window_Prop/daoju11.png b/assets/resources/Window_Prop/daoju11.png index fe67d71..c93a8a8 100644 Binary files a/assets/resources/Window_Prop/daoju11.png and b/assets/resources/Window_Prop/daoju11.png differ diff --git a/assets/resources/Window_Prop/daoju12.png b/assets/resources/Window_Prop/daoju12.png index 5916a10..f54af0d 100644 Binary files a/assets/resources/Window_Prop/daoju12.png and b/assets/resources/Window_Prop/daoju12.png differ diff --git a/assets/resources/Window_Prop/daoju13.png b/assets/resources/Window_Prop/daoju13.png index 53f4e32..8c8416f 100644 Binary files a/assets/resources/Window_Prop/daoju13.png and b/assets/resources/Window_Prop/daoju13.png differ diff --git a/assets/resources/Window_Prop/daoju14.png b/assets/resources/Window_Prop/daoju14.png index 9d15cc4..58c9099 100644 Binary files a/assets/resources/Window_Prop/daoju14.png and b/assets/resources/Window_Prop/daoju14.png differ diff --git a/assets/resources/Window_Prop/daoju15.png b/assets/resources/Window_Prop/daoju15.png index 98b979d..dd4d234 100644 Binary files a/assets/resources/Window_Prop/daoju15.png and b/assets/resources/Window_Prop/daoju15.png differ diff --git a/assets/resources/Window_Prop/daoju16.png b/assets/resources/Window_Prop/daoju16.png index eaf25bb..751157e 100644 Binary files a/assets/resources/Window_Prop/daoju16.png and b/assets/resources/Window_Prop/daoju16.png differ diff --git a/assets/resources/Window_Prop/daoju17.png b/assets/resources/Window_Prop/daoju17.png index 2a44cc6..d0c7604 100644 Binary files a/assets/resources/Window_Prop/daoju17.png and b/assets/resources/Window_Prop/daoju17.png differ diff --git a/assets/resources/Window_Prop/daoju18.png b/assets/resources/Window_Prop/daoju18.png index a822588..1332de4 100644 Binary files a/assets/resources/Window_Prop/daoju18.png and b/assets/resources/Window_Prop/daoju18.png differ diff --git a/assets/resources/Window_Prop/daoju19.png b/assets/resources/Window_Prop/daoju19.png index b4435ed..f2e841b 100644 Binary files a/assets/resources/Window_Prop/daoju19.png and b/assets/resources/Window_Prop/daoju19.png differ diff --git a/assets/resources/Window_Prop/daoju2.png b/assets/resources/Window_Prop/daoju2.png index 4271024..4454eeb 100644 Binary files a/assets/resources/Window_Prop/daoju2.png and b/assets/resources/Window_Prop/daoju2.png differ diff --git a/assets/resources/Window_Prop/daoju2.png.meta b/assets/resources/Window_Prop/daoju2.png.meta index 847dbf0..4cd8a45 100644 --- a/assets/resources/Window_Prop/daoju2.png.meta +++ b/assets/resources/Window_Prop/daoju2.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, + "offsetY": 2, "trimX": 18, "trimY": 8, "width": 697, - "height": 652, + "height": 649, "rawWidth": 733, "rawHeight": 669, "borderTop": 0, diff --git a/assets/resources/Window_Prop/daoju20.png b/assets/resources/Window_Prop/daoju20.png index 213c18f..83e6bdf 100644 Binary files a/assets/resources/Window_Prop/daoju20.png and b/assets/resources/Window_Prop/daoju20.png differ diff --git a/assets/resources/Window_Prop/daoju21.png b/assets/resources/Window_Prop/daoju21.png index e08bd5e..767e6c7 100644 Binary files a/assets/resources/Window_Prop/daoju21.png and b/assets/resources/Window_Prop/daoju21.png differ diff --git a/assets/resources/Window_Prop/daoju22.png b/assets/resources/Window_Prop/daoju22.png index ea4ddd0..152594b 100644 Binary files a/assets/resources/Window_Prop/daoju22.png and b/assets/resources/Window_Prop/daoju22.png differ diff --git a/assets/resources/Window_Prop/daoju23.png b/assets/resources/Window_Prop/daoju23.png index 41e13ca..b129182 100644 Binary files a/assets/resources/Window_Prop/daoju23.png and b/assets/resources/Window_Prop/daoju23.png differ diff --git a/assets/resources/Window_Prop/daoju24.png b/assets/resources/Window_Prop/daoju24.png index 4aca80e..d8d5efe 100644 Binary files a/assets/resources/Window_Prop/daoju24.png and b/assets/resources/Window_Prop/daoju24.png differ diff --git a/assets/resources/Window_Prop/daoju25.png b/assets/resources/Window_Prop/daoju25.png new file mode 100644 index 0000000..b3066df Binary files /dev/null and b/assets/resources/Window_Prop/daoju25.png differ diff --git a/assets/resources/Window_Prop/daoju25.png.meta b/assets/resources/Window_Prop/daoju25.png.meta new file mode 100644 index 0000000..72da6b0 --- /dev/null +++ b/assets/resources/Window_Prop/daoju25.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "5cc09827-636b-4653-aab4-a93b4e8a7134", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 794, + "height": 802, + "platformSettings": {}, + "subMetas": { + "daoju25": { + "ver": "1.0.6", + "uuid": "b248fcf0-c8de-43c9-973b-4592ea787f61", + "importer": "sprite-frame", + "rawTextureUuid": "5cc09827-636b-4653-aab4-a93b4e8a7134", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 794, + "height": 802, + "rawWidth": 794, + "rawHeight": 802, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/resources/Window_Prop/daoju26.png b/assets/resources/Window_Prop/daoju26.png new file mode 100644 index 0000000..2950b30 Binary files /dev/null and b/assets/resources/Window_Prop/daoju26.png differ diff --git a/assets/resources/Window_Prop/daoju26.png.meta b/assets/resources/Window_Prop/daoju26.png.meta new file mode 100644 index 0000000..9a56300 --- /dev/null +++ b/assets/resources/Window_Prop/daoju26.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "49b133b9-b0a4-4409-865e-7627356958a5", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 789, + "height": 790, + "platformSettings": {}, + "subMetas": { + "daoju26": { + "ver": "1.0.6", + "uuid": "101ef188-ac0d-428f-a429-6beecec639fd", + "importer": "sprite-frame", + "rawTextureUuid": "49b133b9-b0a4-4409-865e-7627356958a5", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 789, + "height": 790, + "rawWidth": 789, + "rawHeight": 790, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/resources/Window_Prop/daoju27.png b/assets/resources/Window_Prop/daoju27.png new file mode 100644 index 0000000..6b79a95 Binary files /dev/null and b/assets/resources/Window_Prop/daoju27.png differ diff --git a/assets/resources/Window_Prop/daoju27.png.meta b/assets/resources/Window_Prop/daoju27.png.meta new file mode 100644 index 0000000..7900007 --- /dev/null +++ b/assets/resources/Window_Prop/daoju27.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "d0480833-a5ef-4eab-b83f-0114fecf3ab2", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 708, + "height": 790, + "platformSettings": {}, + "subMetas": { + "daoju27": { + "ver": "1.0.6", + "uuid": "17d6a972-701c-40e7-8d97-140b98d2d353", + "importer": "sprite-frame", + "rawTextureUuid": "d0480833-a5ef-4eab-b83f-0114fecf3ab2", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 708, + "height": 790, + "rawWidth": 708, + "rawHeight": 790, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/resources/Window_Prop/daoju3.png b/assets/resources/Window_Prop/daoju3.png index 81584ed..ff44807 100644 Binary files a/assets/resources/Window_Prop/daoju3.png and b/assets/resources/Window_Prop/daoju3.png differ diff --git a/assets/resources/Window_Prop/daoju3.png.meta b/assets/resources/Window_Prop/daoju3.png.meta index 2a171d3..16c1c0b 100644 --- a/assets/resources/Window_Prop/daoju3.png.meta +++ b/assets/resources/Window_Prop/daoju3.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 1, "trimX": 0, "trimY": 6, "width": 733, - "height": 657, + "height": 655, "rawWidth": 733, "rawHeight": 669, "borderTop": 0, diff --git a/assets/resources/Window_Prop/daoju4.png b/assets/resources/Window_Prop/daoju4.png index c428ada..57b97ca 100644 Binary files a/assets/resources/Window_Prop/daoju4.png and b/assets/resources/Window_Prop/daoju4.png differ diff --git a/assets/resources/Window_Prop/daoju4.png.meta b/assets/resources/Window_Prop/daoju4.png.meta index b226227..8695b71 100644 --- a/assets/resources/Window_Prop/daoju4.png.meta +++ b/assets/resources/Window_Prop/daoju4.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, + "offsetY": 2.5, "trimX": 35, "trimY": 5, "width": 663, - "height": 658, + "height": 654, "rawWidth": 733, "rawHeight": 669, "borderTop": 0, diff --git a/assets/resources/Window_Prop/daoju5.png b/assets/resources/Window_Prop/daoju5.png index 87e32ca..6d3cdfc 100644 Binary files a/assets/resources/Window_Prop/daoju5.png and b/assets/resources/Window_Prop/daoju5.png differ diff --git a/assets/resources/Window_Prop/daoju5.png.meta b/assets/resources/Window_Prop/daoju5.png.meta index 0cda8e0..5e4d4e4 100644 --- a/assets/resources/Window_Prop/daoju5.png.meta +++ b/assets/resources/Window_Prop/daoju5.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 1.5, "trimX": 19, "trimY": 21, "width": 695, - "height": 648, + "height": 645, "rawWidth": 733, "rawHeight": 690, "borderTop": 0, diff --git a/assets/resources/Window_Prop/daoju6.png b/assets/resources/Window_Prop/daoju6.png index ca2ea23..1e484c5 100644 Binary files a/assets/resources/Window_Prop/daoju6.png and b/assets/resources/Window_Prop/daoju6.png differ diff --git a/assets/resources/Window_Prop/daoju6.png.meta b/assets/resources/Window_Prop/daoju6.png.meta index bcdd112..1426804 100644 --- a/assets/resources/Window_Prop/daoju6.png.meta +++ b/assets/resources/Window_Prop/daoju6.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0, + "offsetY": 1.5, "trimX": 15, "trimY": 52, "width": 702, - "height": 565, + "height": 562, "rawWidth": 733, "rawHeight": 669, "borderTop": 0, diff --git a/assets/resources/Window_Prop/daoju7.png b/assets/resources/Window_Prop/daoju7.png index 35abbe9..664f9a9 100644 Binary files a/assets/resources/Window_Prop/daoju7.png and b/assets/resources/Window_Prop/daoju7.png differ diff --git a/assets/resources/Window_Prop/daoju7.png.meta b/assets/resources/Window_Prop/daoju7.png.meta index c78a6a5..9e59bdb 100644 --- a/assets/resources/Window_Prop/daoju7.png.meta +++ b/assets/resources/Window_Prop/daoju7.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0, + "offsetY": 1.5, "trimX": 5, "trimY": 4, "width": 722, - "height": 682, + "height": 679, "rawWidth": 733, "rawHeight": 690, "borderTop": 0, diff --git a/assets/resources/Window_Prop/daoju8.png b/assets/resources/Window_Prop/daoju8.png index 7d8bcda..ea5f8c1 100644 Binary files a/assets/resources/Window_Prop/daoju8.png and b/assets/resources/Window_Prop/daoju8.png differ diff --git a/assets/resources/Window_Prop/daoju9.png b/assets/resources/Window_Prop/daoju9.png index 0ee6bd3..e42ecfe 100644 Binary files a/assets/resources/Window_Prop/daoju9.png and b/assets/resources/Window_Prop/daoju9.png differ diff --git a/assets/resources/Window_Prop/daoju9.png.meta b/assets/resources/Window_Prop/daoju9.png.meta index 6dbc602..b92d3e6 100644 --- a/assets/resources/Window_Prop/daoju9.png.meta +++ b/assets/resources/Window_Prop/daoju9.png.meta @@ -21,11 +21,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 3.5, "trimX": 38, "trimY": 45, "width": 657, - "height": 579, + "height": 572, "rawWidth": 733, "rawHeight": 669, "borderTop": 0,