tjh/rp_10012
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改一到三号问题
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 40s
Details

Browse Source
This commit is contained in:
TJH 2025-10-10 10:59:32 +08:00
parent 410379ebed
commit 5cfc2c63bf
5 changed files with 101 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
assets/Game/prefabs/SlotScene.prefab
View File

@ -629,7 +629,7 @@
"__expectedType__": "sp.SkeletonData" "__expectedType__": "sp.SkeletonData"
}, },
"defaultSkin": "default", "defaultSkin": "default",
"defaultAnimation": "", "defaultAnimation": "<None>",
"_premultipliedAlpha": false, "_premultipliedAlpha": false,
"_timeScale": 1, "_timeScale": 1,
"_preCacheMode": 0, "_preCacheMode": 0,
@ -2294,7 +2294,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "0anr2r+rZGRpm3dAu+hLQb" "fileId": "53OkM1QXJIIYTTECG/BOks"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2304,7 +2304,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "75lPUwnBBGvo/l3oimd7cb", "fileId": "78SkWuFPNPrrhYWUb5sgpQ",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2335,7 +2335,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "9aUbbrdZxM070eB/gTo7in" "fileId": "a5EJpCNqFCCJy4TOx5T7aB"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2345,7 +2345,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "47r7vaXN9ISr1XO18T8vGx", "fileId": "22IYS90fJIrYYcaSshdIGU",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2376,7 +2376,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f6RSEnvelL+Iv/qNNfLmLT" "fileId": "69r4gHcp9Gw4X+H8VfqiES"
}, },
{ {
"__type__": "5fc10Zl7lVO97/rr2J1uxWH", "__type__": "5fc10Zl7lVO97/rr2J1uxWH",
@ -2400,7 +2400,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "51JWZZPeJL5I98K8LqvvmY" "fileId": "0cNZ6dN2xD3aeeC4I7buEj"
}, },
{ {
"__type__": "5fd13+Xa69CZogb3Q/F1lnC", "__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@ -2573,7 +2573,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "fb9qRQn41P/ofPCVqIc6HM", "fileId": "ecRqPLr6JOwJBbm2mlmLQ4",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2598,7 +2598,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "47MhhINnVO/ZGDRNU76820" "fileId": "7ecg9svgBKwL/Wc+dFHn6B"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -2626,7 +2626,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "3eKyO/qIZBWKSpN0GkRIyS" "fileId": "ccsvA0C1RAOpyaLvXlrLjt"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
@ -2671,7 +2671,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "dbtPrk9/RAZKLJATTg+Ogw" "fileId": "c5WEWDMrBHuJ5Ontm9iuob"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2681,7 +2681,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "bcyY6Ur7hHX6bCY+A9VZ4h", "fileId": "96eAxLQmxJDZ4DTYjLnfXk",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2936,7 +2936,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "bdCCEk3vpLvZFUdNNh/lQX" "fileId": "25xt4XFTlBZrH2x2pwtXvV"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2946,7 +2946,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "58VSBEPFxGHKTrXXtlh3Ea", "fileId": "b39akHkzhPSZJ6oK59GtPH",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2977,7 +2977,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "2dvh8sQkNIv5q18pFffoGI" "fileId": "09zADo1qdIXoKFcv7wMXXX"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2987,7 +2987,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "bdZtkE77ZKO6ZyvHLfbb7n", "fileId": "68628o04hAp5BNLrNyCDUw",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3018,7 +3018,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f2sKKS1HhEO6TPvOWqcuqq" "fileId": "36ZvBCDIZFKbsJW4xuIpOo"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3042,7 +3042,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "a6wKIqorhHF4pUjncFVquh" "fileId": "3d+RrRPgRKJbiteMDjWLNi"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3052,7 +3052,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "a6L9xh8j9PB4u2PsjoRLSv", "fileId": "96haqIhTZMppPElEnk6duc",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3235,7 +3235,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "69ZgnTvUVGl7QC5Q4I3RN6" "fileId": "2d7F/AlLZA9ZiPsZbSWA/c"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3245,7 +3245,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "feBIcOpFFBKJy16emJ/2mK", "fileId": "05/Qos8lhCR4EWRwOu8MOK",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3276,7 +3276,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "3dLGDdNsdPzph/Ltqmp2kA" "fileId": "a1fhd626pOs7W9I38O3Bmx"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3286,7 +3286,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "f01XMeOyFPH6oLaEs6Qe/p", "fileId": "bdJwVQkfRC+r3D+wvmF2EU",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3317,7 +3317,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "4dYQU/G9lD5YoCFNbnxDvf" "fileId": "22rpEmtB5IlKXdOabRTEGJ"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3341,7 +3341,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "07Bq9DF15KoqYNuvCEteOS" "fileId": "c63Qo9wM9Kxq1gAwL/yfWg"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3351,7 +3351,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "99kvJ47u9FGpXsPxpD4ZIV", "fileId": "a05TLaDfhELZaXQkg037+P",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3534,7 +3534,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "aaMFt9eR9PUY5ncEJ9QrxO" "fileId": "54J0wpvbNHe7xr5k7kEsfb"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3544,7 +3544,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "3dZqpsWY5L5JDXQKkdyot/", "fileId": "27T631j+FEgK+DhUsKVjsY",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3575,7 +3575,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "53zPWbwbtEqKw3hwBwNjNG" "fileId": "70GZbCN6JP9rpDvqVw9Z8Q"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3585,7 +3585,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "a8NKqT/cBBlqKcTRUVLMaq", "fileId": "e6dzGIpfhBI5hBu58Ato98",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3616,7 +3616,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "610YknMHpAHY6sdhMRO67A" "fileId": "10DaUugztAapUdRwD67any"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3640,7 +3640,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "7caaRyX8lKPonMfvofyx6Z" "fileId": "e79Z5WncpFS7iWfH4utA5w"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3650,7 +3650,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "cewZh/aMZP2bL9HY9HABSU", "fileId": "543fCYcoVD2r2dUNXKT//r",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3833,7 +3833,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e09jpBRYNBRIBIipUYZegs" "fileId": "35y7kONXtBnbD6Shx3tGuQ"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3843,7 +3843,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "c6vgxjx8FEU4oQP/Lfd3fb", "fileId": "cfGCyyQj9OLqFjFTzoi6n2",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3874,7 +3874,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "66IfdxyS5BcIkicXC3t/5g" "fileId": "13An/vhstEZ4GkJX4dXTn2"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3884,7 +3884,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "bewbZZXCZDwJf4w7dlbFVZ", "fileId": "05zloR7vRKU41BdzborPVe",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3915,7 +3915,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "c5+PAQUQxLa61+x6MwoqJp" "fileId": "99cXsty9tLEbdrR6fw8lqL"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3939,7 +3939,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "faZmMVakJCp5SxXD/b63vv" "fileId": "34td6A8ANFQ5YOYZH5aC81"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3949,7 +3949,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "e5D4WCdOpODrXk3eW0lPU/", "fileId": "68FJR04ttGU48eqRowW0/o",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4132,7 +4132,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "07EKTHAXFOGaxfcAZk2J4r" "fileId": "e33FazIVhAdKno8/fT/KFQ"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4142,7 +4142,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "2bMe9Yqe1FaYNmE6v6I9OA", "fileId": "b1If9Yr2lCiJys8CCPzJpm",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4173,7 +4173,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "7dhA/c2uJBtKk5xhRBrW6T" "fileId": "f6E2+HnsNG3J3lnZogV20E"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4183,7 +4183,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b6cu+5l41L5K27zE8FRFLN", "fileId": "8chB2wsAlFA62g0JhJDt1d",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4214,7 +4214,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "46bOQHeSxExaGMRF3TA2OW" "fileId": "2dqWr/h95MvJ675Fpy+Hk8"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4238,7 +4238,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "61VcYvoAVK2YusLgM5uV7A" "fileId": "9czfzEvpNCQKv9kt8yxkDi"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4248,7 +4248,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "532MCoFOxOmoLwaGmwo3G3", "fileId": "c6plb7SI1EE5eEPWyd/Ppx",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4431,7 +4431,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "64/C7hQlRElKsOtoMO4UFe" "fileId": "fbE8Vvxp5O1767n1MlLprY"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4441,7 +4441,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "f7tXNU0zZNFZ0hsZDWY2MU", "fileId": "13r5wjfYlCoYuhoBL9QPoA",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4472,7 +4472,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "78dJXgSm9KPIBvu1Hekf0P" "fileId": "8co1vukxxJypIfoR469Duw"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4482,7 +4482,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "3dkHStysJNo7zeSxoFXF3x", "fileId": "2aF3bNmeZH+piPkxQTZ/g6",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4513,7 +4513,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "3cPOI4g/VEjoy9gIMRXAap" "fileId": "a7C5KpneRN5pwQbW8uLaFZ"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4537,7 +4537,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "72x1a0PDtCtLA3Iq0xP3R1" "fileId": "d6AW1UWU9Ki6v0XijWGR6T"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4547,7 +4547,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "1aUOz94y9KtaRsLFoh4aeG", "fileId": "e9MRBASrtEnouOH+z66Vdb",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4572,7 +4572,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f6gh1WmNBNeLG7YoabOIe9" "fileId": "b11vBnFzNCxYxmG3CW/OC0"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -4600,7 +4600,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "933cf/J35J35ItZuTBXw4e" "fileId": "93wEmk2VVKm76uecWoXQfn"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
@ -4645,7 +4645,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d9eflcCFdH14irO1kfYQ3C" "fileId": "7coXrko0xJWbDSRMFmOzeX"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4655,7 +4655,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "67DHLFaAFHpY2yl49TPdfw", "fileId": "43GzXqt5VO3pto40NZRJf3",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -11907,7 +11907,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1919.9999999999998
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -18605,7 +18605,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -1000, "y": -600,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -21568,7 +21568,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1919.9999999999998
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -21730,7 +21730,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1919.9999999999998
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -21925,7 +21925,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1919.9999999999998
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -22077,7 +22077,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1919.9999999999998
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -22229,7 +22229,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1919.9999999999998
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -22381,7 +22381,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1919.9999999999998
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -27961,7 +27961,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1920 "height": 1919.9999999999998
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",

3
assets/Game/scripts/SlotGame.ts
View File

@ -116,6 +116,9 @@ export class SlotGame extends Component {
this.baseBg = this.node.getChildByName('base_bg'); this.baseBg = this.node.getChildByName('base_bg');
this.freeBg = this.node.getChildByName('free_bg'); this.freeBg = this.node.getChildByName('free_bg');
this.baseBg.getChildByName('deng').getComponent(sp.Skeleton).setAnimation(0, 'animation', true)
this.baseBg.getChildByName('mainFrame_01').getComponent(sp.Skeleton).setAnimation(0, 'anim1', true)
this.baseBg.getChildByName('mainFrame_02').getComponent(sp.Skeleton).setAnimation(0, 'animation', true)
this.base = this.node.getChildByName('base'); this.base = this.node.getChildByName('base');
// this.normalMultiAni = this.base.getChildByName('NormalMultiAniNode').getComponent(Animation); // this.normalMultiAni = this.base.getChildByName('NormalMultiAniNode').getComponent(Animation);

2
assets/Game/scripts/game/Icon.ts
View File

@ -541,9 +541,9 @@ export class Icon extends Component {
.to(1, { position: new Vec3(0, 200, 0) }) .to(1, { position: new Vec3(0, 200, 0) })
.call(() => { .call(() => {
multiMoveNode.destroy() multiMoveNode.destroy()
AudioManager.instance.playSFX('Multi_merge');
if (bigMultiNode.active) return if (bigMultiNode.active) return
AudioManager.instance.playSFX('Multi_merge');
bigMultiLabel.getComponent(Label).string = 'x' + XnInfo.NowN bigMultiLabel.getComponent(Label).string = 'x' + XnInfo.NowN
bigMultiNode.active = true bigMultiNode.active = true
bigMultiNode.getComponent(sp.Skeleton).setAnimation(0, 'animation', false) bigMultiNode.getComponent(sp.Skeleton).setAnimation(0, 'animation', false)

4
assets/Loading/game.scene
View File

@ -1647,8 +1647,8 @@
}, },
"_lscale": { "_lscale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 1.2, "x": 1,
"y": 1.4, "y": 1,
"z": 1 "z": 1
}, },
"_mobility": 0, "_mobility": 0,

42
assets/Loading/scripts/manager/AudioManager.ts
View File

@ -55,39 +55,45 @@ export class AudioManager {
} }
playBGM(name: string, loop: boolean = true) { playBGM(name: string, loop: boolean = true) {
if (this._isMuted || !this._bgmAudioSource) return; // if (this._isMuted || !this._bgmAudioSource) return;
this._bgmAudioSource.stop(); // this._bgmAudioSource.stop();
let clip = this._audioClips.get(name); // let clip = this._audioClips.get(name);
if (!clip) { // if (!clip) {
console.warn(`BGM ${name} 不存在`); // console.warn(`BGM ${name} 不存在`);
return; // return;
} // }
this._bgmClip = clip; // this._bgmClip = clip;
this._bgmAudioSource.clip = clip; // this._bgmAudioSource.clip = clip;
this._bgmAudioSource.loop = loop; // this._bgmAudioSource.loop = loop;
this._bgmAudioSource.volume = this._bgmVolume; // this._bgmAudioSource.volume = this._bgmVolume;
this._bgmAudioSource.play(); // this._bgmAudioSource.play();
this._isPaused = false; // this._isPaused = false;
} }
playSFX(name: string, volume: number = 1.0, loop: boolean = false) { playSFX(name: string, volume: number = 1.0, loop: boolean = false) {
if (this._isMuted) return; if (this._isMuted) return;
let clip = this._audioClips.get(name); let clip = this._audioClips.get(name);
if (!clip) { if (!clip) {
console.warn(`音效 ${name} 不存在`); console.warn(`音效 ${name} 不存在`);
return; return;
} }
console.log('播放', clip)
// 找到一个空闲的AudioSource // 找到一个空闲的AudioSource
let availableSource = this._sfxAudioSources.find(source => !source.playing); let availableSource = this._sfxAudioSources.find(source => !source.playing);
if (availableSource) { if (availableSource) {
// 确保音量正确 // 确保音量正确
availableSource.volume = volume; availableSource.volume = volume;
availableSource.loop = loop;
availableSource.clip = clip; availableSource.clip = clip;
// 播放新音效 // 播放新音效
if (loop) {
availableSource.loop = loop;
availableSource.play() availableSource.play()
} else {
availableSource.playOneShot(clip, volume)
}
} else { } else {
// 如果没有空闲的AudioSource，创建一个新的 // 如果没有空闲的AudioSource，创建一个新的
let sfxNode = new Node(`SFX_${this._sfxAudioSources.length}`); let sfxNode = new Node(`SFX_${this._sfxAudioSources.length}`);
@ -95,10 +101,14 @@ export class AudioManager {
let newSource = sfxNode.addComponent(AudioSource); let newSource = sfxNode.addComponent(AudioSource);
newSource.playOnAwake = false; newSource.playOnAwake = false;
newSource.volume = volume; newSource.volume = volume;
newSource.loop = loop;
newSource.clip = clip; newSource.clip = clip;
this._sfxAudioSources.push(newSource); this._sfxAudioSources.push(newSource);
if (loop) {
newSource.loop = loop;
newSource.play() newSource.play()
} else {
newSource.playOneShot(clip, volume)
}
} }
} }