diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 76357ea..313ec49 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -576,8 +576,8 @@ var GameTool = { // MiniGameSdk.API.showToast(data); } else { - let data = "消耗" + (-coin) + "金币"; - MiniGameSdk.API.showToast(data); + // let data = "消耗" + (-coin) + "金币"; + // MiniGameSdk.API.showToast(data); } if (cc.fx.GameConfig.GM_INFO.coin < 0) { cc.fx.GameConfig.GM_INFO.coin = 0; diff --git a/assets/UI/UI/pop/guide2.meta b/assets/UI/UI/pop/guide2.meta new file mode 100644 index 0000000..4adab39 --- /dev/null +++ b/assets/UI/UI/pop/guide2.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "27b3dd90-25b6-4473-89db-abdebeb08248", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/UI/UI/pop/guide2/CAIDAI.png b/assets/UI/UI/pop/guide2/CAIDAI.png new file mode 100644 index 0000000..c531a7c Binary files /dev/null and b/assets/UI/UI/pop/guide2/CAIDAI.png differ diff --git a/assets/UI/UI/pop/guide2/CAIDAI.png.meta b/assets/UI/UI/pop/guide2/CAIDAI.png.meta new file mode 100644 index 0000000..7906529 --- /dev/null +++ b/assets/UI/UI/pop/guide2/CAIDAI.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "471e0f60-9989-4e66-9355-c6d821e77169", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 386, + "height": 426, + "platformSettings": {}, + "subMetas": { + "CAIDAI": { + "ver": "1.0.6", + "uuid": "e8920af3-7bbc-4b7a-81fa-7322be1e666a", + "importer": "sprite-frame", + "rawTextureUuid": "471e0f60-9989-4e66-9355-c6d821e77169", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -0.5, + "trimX": 0, + "trimY": 1, + "width": 386, + "height": 425, + "rawWidth": 386, + "rawHeight": 426, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/UI/pop/guide2/daojuditu.png b/assets/UI/UI/pop/guide2/daojuditu.png new file mode 100644 index 0000000..7621534 Binary files /dev/null and b/assets/UI/UI/pop/guide2/daojuditu.png differ diff --git a/assets/UI/UI/pop/guide2/daojuditu.png.meta b/assets/UI/UI/pop/guide2/daojuditu.png.meta new file mode 100644 index 0000000..3d7afa7 --- /dev/null +++ b/assets/UI/UI/pop/guide2/daojuditu.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "db6b1c60-7fe8-4d70-a7a5-3b721abc70ad", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 788, + "height": 788, + "platformSettings": {}, + "subMetas": { + "daojuditu": { + "ver": "1.0.6", + "uuid": "3ceea96d-8a3a-40fb-9e30-d9b3ea8c4092", + "importer": "sprite-frame", + "rawTextureUuid": "db6b1c60-7fe8-4d70-a7a5-3b721abc70ad", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 788, + "height": 788, + "rawWidth": 788, + "rawHeight": 788, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/UI/pop/guide2/landei.png b/assets/UI/UI/pop/guide2/landei.png new file mode 100644 index 0000000..24e8699 Binary files /dev/null and b/assets/UI/UI/pop/guide2/landei.png differ diff --git a/assets/UI/UI/pop/guide2/landei.png.meta b/assets/UI/UI/pop/guide2/landei.png.meta new file mode 100644 index 0000000..7d4ee33 --- /dev/null +++ b/assets/UI/UI/pop/guide2/landei.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "f93a4935-23cf-411c-8cdf-84938f9b70dc", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 592, + "height": 419, + "platformSettings": {}, + "subMetas": { + "landei": { + "ver": "1.0.6", + "uuid": "f9545822-4235-4a6c-bb1e-66d9e59dc70e", + "importer": "sprite-frame", + "rawTextureUuid": "f93a4935-23cf-411c-8cdf-84938f9b70dc", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 592, + "height": 419, + "rawWidth": 592, + "rawHeight": 419, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/UI/pop/guide2/linqu.png b/assets/UI/UI/pop/guide2/linqu.png new file mode 100644 index 0000000..bbb5b36 Binary files /dev/null and b/assets/UI/UI/pop/guide2/linqu.png differ diff --git a/assets/UI/UI/pop/guide2/linqu.png.meta b/assets/UI/UI/pop/guide2/linqu.png.meta new file mode 100644 index 0000000..da8888b --- /dev/null +++ b/assets/UI/UI/pop/guide2/linqu.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "3c94fad9-79ba-49a2-9f4c-c6a72c642e92", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 472, + "height": 162, + "platformSettings": {}, + "subMetas": { + "linqu": { + "ver": "1.0.6", + "uuid": "e447580f-5a67-4c78-927a-99d9cb820b35", + "importer": "sprite-frame", + "rawTextureUuid": "3c94fad9-79ba-49a2-9f4c-c6a72c642e92", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 472, + "height": 162, + "rawWidth": 472, + "rawHeight": 162, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/UI/pop/guide2/shuizi.png b/assets/UI/UI/pop/guide2/shuizi.png new file mode 100644 index 0000000..16a386d Binary files /dev/null and b/assets/UI/UI/pop/guide2/shuizi.png differ diff --git a/assets/UI/UI/pop/guide2/shuizi.png.meta b/assets/UI/UI/pop/guide2/shuizi.png.meta new file mode 100644 index 0000000..5e2db7e --- /dev/null +++ b/assets/UI/UI/pop/guide2/shuizi.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "91d304b2-b54e-4aac-ab0a-e31eea07acc1", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 335, + "height": 375, + "platformSettings": {}, + "subMetas": { + "shuizi": { + "ver": "1.0.6", + "uuid": "d3820083-8dca-4026-b900-b612f690c81d", + "importer": "sprite-frame", + "rawTextureUuid": "91d304b2-b54e-4aac-ab0a-e31eea07acc1", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 335, + "height": 375, + "rawWidth": 335, + "rawHeight": 375, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/UI/pop/guide2/zi.png b/assets/UI/UI/pop/guide2/zi.png new file mode 100644 index 0000000..fa573e6 Binary files /dev/null and b/assets/UI/UI/pop/guide2/zi.png differ diff --git a/assets/UI/UI/pop/guide2/zi.png.meta b/assets/UI/UI/pop/guide2/zi.png.meta new file mode 100644 index 0000000..3bea361 --- /dev/null +++ b/assets/UI/UI/pop/guide2/zi.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "95e7220c-ce5c-48c6-a95d-02c298fa4bed", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 770, + "height": 193, + "platformSettings": {}, + "subMetas": { + "zi": { + "ver": "1.0.6", + "uuid": "c9dad5fa-dbcb-4480-ae8a-642d27583b88", + "importer": "sprite-frame", + "rawTextureUuid": "95e7220c-ce5c-48c6-a95d-02c298fa4bed", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 770, + "height": 193, + "rawWidth": 770, + "rawHeight": 193, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/UI/pop/guide2/zi02.png b/assets/UI/UI/pop/guide2/zi02.png new file mode 100644 index 0000000..71d9bfa Binary files /dev/null and b/assets/UI/UI/pop/guide2/zi02.png differ diff --git a/assets/UI/UI/pop/guide2/zi02.png.meta b/assets/UI/UI/pop/guide2/zi02.png.meta new file mode 100644 index 0000000..bf4c9cb --- /dev/null +++ b/assets/UI/UI/pop/guide2/zi02.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "6a6d5fad-ba07-45c6-872a-07a9d477ed7e", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 888, + "height": 150, + "platformSettings": {}, + "subMetas": { + "zi02": { + "ver": "1.0.6", + "uuid": "6589032c-e39c-4425-8be0-68f12c50d53f", + "importer": "sprite-frame", + "rawTextureUuid": "6a6d5fad-ba07-45c6-872a-07a9d477ed7e", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 888, + "height": 150, + "rawWidth": 888, + "rawHeight": 150, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/custom/Json/level64.json b/assets/custom/Json/level64.json index 56f7513..3482f06 100644 --- a/assets/custom/Json/level64.json +++ b/assets/custom/Json/level64.json @@ -156,7 +156,7 @@ "y": -360, "z": 0 }, - "stacking": 5, + "stacking": 9, "id": 330 }, { @@ -289,4 +289,4 @@ } ] ] -} \ No newline at end of file +}