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

multimove动画修改，先关闭回弹功能

Browse Source
This commit is contained in:
TJH 2025-09-27 16:05:18 +08:00
parent f9f17d6658
commit 44c143f89f
7 changed files with 134 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2588,7 +2588,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "0euoObUkVGX5LoqiE8cv/e" "fileId": "c1lgZQGPNMUpJFAvXdBqmZ"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2598,7 +2598,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "64/egN0GdCApwff0N3cjUL", "fileId": "33F5G6SO9GUY32s7a24zQq",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2629,7 +2629,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f2PpLooNNFHLxCuwwxVXE1" "fileId": "c8E9c3/GFOw6Nojq67nQ74"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2639,7 +2639,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "fbm6m58wtG16MRaBGbYlzn", "fileId": "a9sC0PBlNJBIxFfQ0qvmJq",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2670,7 +2670,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "76PaICG55K9ZPfMiSS9WqI" "fileId": "73OJKHaI5FYIxqpe29GvGI"
}, },
{ {
"__type__": "5fc10Zl7lVO97/rr2J1uxWH", "__type__": "5fc10Zl7lVO97/rr2J1uxWH",
@ -2694,7 +2694,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "31Zucfo3lNCL2CJXrmY5Td" "fileId": "030Y+BnYJNap9vkARHp/mh"
}, },
{ {
"__type__": "5fd13+Xa69CZogb3Q/F1lnC", "__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@ -2867,7 +2867,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "d8i5sgC7RKLJdSAemqmFL2", "fileId": "9d+sqcudZNHpxsilYhJfZg",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2892,7 +2892,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "99d1XfhCxGbY3HfH3Zyo46" "fileId": "f5zX4enPVEXLCvZsTM+Zf+"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -2920,7 +2920,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "c2pWym27VB06Kk/P7sVzDa" "fileId": "38xHqZfB5D2L38RiYcoLdS"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
@ -2965,7 +2965,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "aeWLkaBBFHUbRdYNKq1wCc" "fileId": "7aLWXTzG5LQ5NPIVzGOojq"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2975,7 +2975,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b5XQbudgVBRLbEn+a1s6SB", "fileId": "64+zfF+3VJTpscvsSLdyKr",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3230,7 +3230,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "135CE7RUZEyqPdocGs+ND5" "fileId": "ebKbBEvYhMQp9hfMbXS/Ga"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3240,7 +3240,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "19Wu1nr+pJnKg6IQpx1ty5", "fileId": "ebciWz8dxNYo1nlFtF5pA9",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3271,7 +3271,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "ccmsCuBU5AmY2jthpBk3Ga" "fileId": "f4o3UyY6BBkKAPSTElpWnE"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3281,7 +3281,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b3F4WJ4b1HFJ73Gjs0uAPV", "fileId": "e91boiUslHl5GhKeT+BQwq",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3312,7 +3312,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "cen+CXHANEF5Hl3Yg49UeT" "fileId": "f54AfOTwlOvr24b3qxWgYr"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3336,7 +3336,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "00GoMUnjtKAr7MGQz/q8tB" "fileId": "e8FjohTxVJv5S7RZYJT9Sc"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3346,7 +3346,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "7bE9aoSIJMk7DyQx/OrVak", "fileId": "a1LSX/Es5DzInWp5Fekki8",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3529,7 +3529,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "8fWO1N3MRKK4McXBZW+WJu" "fileId": "69n3O+5B9OZ6QtvjYrAyIz"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3539,7 +3539,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "70Q9xD9shBFJrdXoXKqP2u", "fileId": "c3V/sVNCRENo7d7kHf1o1q",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3570,7 +3570,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "acZfGe78BIyaR14mHIIKll" "fileId": "2bLTEFnzFIhK/9iuTMTnNK"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3580,7 +3580,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "52LwSL2qpMnYe0eH0PhWaM", "fileId": "5aXtnsbyxI84WnC+z0DB3x",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3611,7 +3611,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "50/wi/ExBCMq1Cf0jE9Fry" "fileId": "ccrzHVtptNebLEz6lp54AD"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3635,7 +3635,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e7zNP7y6VIvYST6WqJC41A" "fileId": "67fnashLVFKJriLpFkMp2J"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3645,7 +3645,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "86UvITSZJFXqGKVAjEL7Rm", "fileId": "dfIQ761t5IOKC7a+8/spQ2",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3828,7 +3828,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "6egnLHxvhGDaDJH+YNFcqe" "fileId": "51ke3y7l5BorzxCh33hTYv"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3838,7 +3838,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "69jbzKwxlFpa1bgd6c9MGX", "fileId": "2a6EzBPjROuYTlrU0iMr8d",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3869,7 +3869,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "c2LTflFLBMNpdqfaIIjanK" "fileId": "12FRZR/mhHeafUDf9rT47g"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3879,7 +3879,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "f9Iyao869GGJIWJS6uXogM", "fileId": "b2k+uo389GqLdEt6D0nZEq",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3910,7 +3910,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "4acUBEr3FBBrOBuH2haVnf" "fileId": "4bg5oFrU9PLrH9QiNmhUQa"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3934,7 +3934,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "4enx9xXn5KTqjx/wLnjG1z" "fileId": "c1028mX6RLUJBvgBsdwWi7"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3944,7 +3944,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "4dBlyKOc5I0o/DIEKGjLAC", "fileId": "527Kp0GedOCLJfk518DzUo",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4127,7 +4127,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "898icOtEFH65YjP8Oxxy83" "fileId": "87iww79aZEg7vxMmfEPPj3"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4137,7 +4137,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "80bTeg4LdI0aAouDozlI3O", "fileId": "cfJAz+cn1B45SYeP8tci++",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4168,7 +4168,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "86yXnfkT1FpqaiiciCGp2Q" "fileId": "98GZ881dhDzZyhJBmHngIj"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4178,7 +4178,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "8bxzTApbJOd5wUKDlt20+K", "fileId": "e14SV0H0xLaJb9w0RrKJKS",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4209,7 +4209,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "0990u/+U5GW5oT+yV1PkTW" "fileId": "e6qsawow5PGZt7indLr1/P"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4233,7 +4233,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "acxu94Y/pO+qvWrlkgzWbA" "fileId": "dfQ8BstodL87Koi6S5VQkt"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4243,7 +4243,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b3wK5vV21PNoBj1JiFl5Gb", "fileId": "36xSxVxMpLY4pLofimLdIx",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4426,7 +4426,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "a2S7NNwi9NGI/2qpYvWux9" "fileId": "29F0OURvBILqZStlp6OBnr"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4436,7 +4436,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "a2la34vlVMeqIRJGgv2+Ea", "fileId": "ffaObL4dxO15/TDPCNO9Hr",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4467,7 +4467,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "00kCIrntlLHoa0hUl1lPwP" "fileId": "26Qubig5BAZILo42kUjLzG"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4477,7 +4477,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "9fOWzll0JO869f5ISSJ80v", "fileId": "a3Mdl7N7xHVbB1BiDfKaKu",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4508,7 +4508,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "57DmSez+hJOI3zw9owpCW+" "fileId": "6ffOFfPltDapjWtfymz+ZB"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4532,7 +4532,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "b7bnsu4cVDxo8x4COuUa+6" "fileId": "dcDrgNcKxJFachSMQgrH4z"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4542,7 +4542,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "18rtQwLoxCv4DZad2wrtC0", "fileId": "82ZdUy7KtEBqMWVseWOdib",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4725,7 +4725,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f6j7C2zCNHOrHWvpvKEqH3" "fileId": "9czK+rmi1Fo5DI3LNIMXiN"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4735,7 +4735,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "00g5Ht7YRGKqbk3Noc5KyW", "fileId": "95ZJbBSYtMLLJFqbu0bVhN",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4766,7 +4766,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "38RrPCJw1K+I5U6+wFkp5D" "fileId": "f7oN7R/9lGgoWnJsvcssYr"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4776,7 +4776,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "2fslz7JHNM36HzqQrKlM7B", "fileId": "d5UGXHCzdB8aJLbRHpoflW",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4807,7 +4807,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "5b43k44JFMtKpASYwPhTX4" "fileId": "f1tYcjUvpLgb3TkMvHqbMi"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4831,7 +4831,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d6CioqmQ1OtaDMhH93X7fE" "fileId": "56LTQXmU5BoKBhuoeYpUO2"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4841,7 +4841,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "c73cfM4/pDhaaWnB1l8NYZ", "fileId": "5dO5aFWltI+po9mgpzJiTb",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4866,7 +4866,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d6SpKBLJhB4rj0ivKF2YsQ" "fileId": "dfcWfndXtI7592qchDrZrO"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -4894,7 +4894,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "fbD8zjJvBP6ILMynndd0pC" "fileId": "efVn9BLzhEEY6KFjOIVpw8"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
@ -4939,7 +4939,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d2BzvjHiBJ/LAb07GUdDW9" "fileId": "bcKTmJDJFOlpLvD55lnl6B"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4949,7 +4949,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "a4tUFCupBPwKw71PKIifRW", "fileId": "e9mA7jePFLU4+LvE9lSjnY",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null

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

@ -312,47 +312,47 @@ export class SlotGame extends Component {
// changeIconAndFrameType(spinData: any) { // changeIconAndFrameType(spinData: any) {
// this.spinData = spinData; // this.spinData = spinData;
// // 先去找到PanChange当中是否有oldPos,如果没有代表当前icon没有动，就去crossSymbols当中找 // // 先去找到PanChange当中是否有oldPos,如果没有代表当前icon没有动，就去crossSymbols当中找
// // 初始化changeData数组 // // 初始化changeData数组
// let changeData = []; // let changeData = [];
// let colorChanges = this.spinData.PanChanges.CrossSymbolColorChange // let colorChanges = this.spinData.PanChanges.CrossSymbolColorChange
// // 遍历CrossSymbolColorChange获取颜色变化信息 // // 遍历CrossSymbolColorChange获取颜色变化信息
// for (let key in this.spinData.PanChanges.CrossSymbolColorChange) { // for (let key in this.spinData.PanChanges.CrossSymbolColorChange) {
// let colorChange = this.spinData.PanChanges.CrossSymbolColorChange[key]; // let colorChange = this.spinData.PanChanges.CrossSymbolColorChange[key];
// let newIndex = colorChange.NewColor; // let newIndex = colorChange.NewColor;
// let oldStartPos; // let oldStartPos;
// let frameType; // let frameType;
// let height; // let height;
// // 先在CrossSymbolPosChange中查找位置变化 // // 先在CrossSymbolPosChange中查找位置变化
// if (this.spinData.PanChanges.CrossSymbolPosChange[key]) { // if (this.spinData.PanChanges.CrossSymbolPosChange[key]) {
// oldStartPos = this.spinData.PanChanges.CrossSymbolPosChange[key].OldPos[0]; // oldStartPos = this.spinData.PanChanges.CrossSymbolPosChange[key].OldPos[0];
// } // }
// // 如果没找到则在crossSymbols中查找 // // 如果没找到则在crossSymbols中查找
// else if (this.spinData.CrossSymbols[key]) { // else if (this.spinData.CrossSymbols[key]) {
// oldStartPos = this.spinData.CrossSymbols[key].PosFirst; // oldStartPos = this.spinData.CrossSymbols[key].PosFirst;
// } // }
// // 从crossSymbols获取frameType和height // // 从crossSymbols获取frameType和height
// if (this.spinData.CrossSymbols[key]) { // if (this.spinData.CrossSymbols[key]) {
// let symbol = this.spinData.CrossSymbols[key]; // let symbol = this.spinData.CrossSymbols[key];
// frameType = symbol.FrameType; // frameType = symbol.FrameType;
// height = symbol.PosLast - symbol.PosFirst + 1; // height = symbol.PosLast - symbol.PosFirst + 1;
// } // }
// // 添加到changeData数组 // // 添加到changeData数组
// changeData.push({ // changeData.push({
// oldStartPos: oldStartPos + 4, // oldStartPos: oldStartPos + 4,
// newIndex: newIndex, // newIndex: newIndex,
// newFrameType: frameType, // newFrameType: frameType,
// lheight: height // lheight: height
// }); // });
// } // }
// this.rollerManager.changeIconAndFrameType(changeData); // this.rollerManager.changeIconAndFrameType(changeData);
// } // }
// 消除创建的逻辑 // 消除创建的逻辑
@ -460,20 +460,21 @@ export class SlotGame extends Component {
multiCopy.getComponent(UIOpacity).opacity = 0 multiCopy.getComponent(UIOpacity).opacity = 0
multiCopy.setScale(0, 0, 0) multiCopy.setScale(0, 0, 0)
tween(multiCopy) tween(multiCopy)
.delay(0.5) .to(0.4, { scale: new Vec3(1.5, 1.5, 1) })
.to(0.4, { scale: new Vec3(1.2, 1.2, 1) }) .delay(0.3)
.to(0.4, { scale: new Vec3(0, 0, 0) }) .to(0.3, { scale: new Vec3(0.4, 0.4, 1) })
.start() .start()
tween(multiCopy.getComponent(UIOpacity)) tween(multiCopy.getComponent(UIOpacity))
.delay(0.5) .to(0.4, { opacity: 250 })
.to(0.4, { opacity: 255 }) .delay(0.3)
.to(0.4, { opacity: 0 }) .to(0.3, { opacity: 50 })
.start() .start()
tween(multiCopy) tween(multiCopy)
.delay(0.8) .delay(0.4)
.to(0.5, { position: new Vec3(0, -550, 0) }) .to(0.3, { position: new Vec3(0, -450, 0) })
.delay(0.3)
.call(() => { .call(() => {
multiCopy.destroy() multiCopy.destroy()
}) })

9
assets/Game/scripts/SlotScene.ts
View File

@ -741,11 +741,12 @@ export class SlotScene extends Component {
callback?.(); callback?.();
return; return;
} }
let delay = 0.1
// 2 // 2
if (winType === WIN_TYPE.NONE) { if (winType === WIN_TYPE.NONE) {
//小游戏中增加新倍率但没有赢分 //小游戏中增加新倍率但没有赢分
if (this.spinData.XnInfo.AddN > 1 && isFreeSpin && !this.isfirstSpinInFreeMode()) { if (this.spinData.XnInfo.AddN > 1 && isFreeSpin && !this.isfirstSpinInFreeMode()) {
delay = 2.5
this.slotGame.showMultiMove(this.spinData.XnInfo) this.slotGame.showMultiMove(this.spinData.XnInfo)
this.slotGame.showMultiMoveInFreeSpin(this.spinData.XnInfo) this.slotGame.showMultiMoveInFreeSpin(this.spinData.XnInfo)
this.scheduleOnce(() => { this.scheduleOnce(() => {
@ -759,7 +760,11 @@ export class SlotScene extends Component {
} }
//播放倍率飞到信息栏的动画 //播放倍率飞到信息栏的动画
if (this.spinData.XnInfo.NowN > 1 && !this.isfirstSpinInFreeMode()) { if (this.spinData.XnInfo.NowN > 1 && !this.isfirstSpinInFreeMode()) {
delay = 2.5
if (this.spinData.XnInfo.AddN == 0) {
delay = 1
}
this.slotGame.showMultiMove(this.spinData.XnInfo) this.slotGame.showMultiMove(this.spinData.XnInfo)
this.slotGame.showMultiMoveInFreeSpin(this.spinData.XnInfo) this.slotGame.showMultiMoveInFreeSpin(this.spinData.XnInfo)
} }
@ -780,7 +785,7 @@ export class SlotScene extends Component {
this.slotBar.setWin(this.spinData.AllScore); this.slotBar.setWin(this.spinData.AllScore);
callback?.(); callback?.();
} }
}, this.spinData.XnInfo.NowN > 1 ? 2.5 : 0.1) }, delay)
} }

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

@ -29,7 +29,7 @@ export class FreeSpinAdd extends Component {
// this.freeSpinEnterTitleSp = titleNode.getChildByName('SpriteFREESPINWON').getComponent(Sprite); // this.freeSpinEnterTitleSp = titleNode.getChildByName('SpriteFREESPINWON').getComponent(Sprite);
this.freeCount = freeCount; this.freeCount = freeCount;
this.freeCountLabel.string = `${freeCount}`; this.freeCountLabel.string = 'x' + `${freeCount}`;
this.node.addChild(this.freeSpinAddUI); this.node.addChild(this.freeSpinAddUI);
this.playAnimation(); this.playAnimation();
this.closeCallBack = closeCallBack; this.closeCallBack = closeCallBack;

20
assets/Game/scripts/game/HRoller.ts
View File

@ -548,14 +548,14 @@ export class HRoller extends BaseRoller {
let position = this.getIconPosition(startPos, lHeight); let position = this.getIconPosition(startPos, lHeight);
// 设置初始位置（向下偏移） // 设置初始位置（向下偏移）
icon.setPosition(position.add(v3(-offset, 0, 0)));
icon.setPosition(position); icon.setPosition(position);
iconComponent.playSpawnAni(); iconComponent.playSpawnAni();
// 创建回弹动画 // 创建回弹动画
tween(icon) // icon.setPosition(position.add(v3(-offset, 0, 0)));
.by(time, { position: v3(offset, 0, 0) }) // tween(icon)
.start(); // .by(time, { position: v3(offset, 0, 0) })
// .start();
}); });
// 延迟切换到停止状态 // 延迟切换到停止状态
@ -729,12 +729,12 @@ export class HRoller extends BaseRoller {
let time = 0.3; let time = 0.3;
tween(oldIconNode) tween(oldIconNode)
.to(time, { position: v3(newX, 0, 0) }) .to(time, { position: v3(newX, 0, 0) })
.call(() => { // .call(() => {
tween(oldIconNode) // tween(oldIconNode)
.by(0.2, { position: v3(50, 0, 0) }) // .by(0.2, { position: v3(50, 0, 0) })
.by(0.1, { position: v3(-50, 0, 0) }) // .by(0.1, { position: v3(-50, 0, 0) })
.start(); // .start();
}) // })
.start(); .start();
} }

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

@ -525,7 +525,7 @@ export class Icon extends Component {
tween(multiMoveNode) tween(multiMoveNode)
.delay(0.3) .delay(0.3)
.to(1, { scale: new Vec3(1.1, 1.1, 1) }) .to(1, { scale: new Vec3(1.2, 1.2, 1) })
.start() .start()
tween(multiMoveNode.getComponent(UIOpacity)) tween(multiMoveNode.getComponent(UIOpacity))
@ -546,13 +546,13 @@ export class Icon extends Component {
tween(bigMultiLabel.getComponent(UIOpacity)) tween(bigMultiLabel.getComponent(UIOpacity))
.to(0.3, { opacity: 255 }) .to(0.3, { opacity: 255 })
.delay(0.7) .delay(0.7)
.to(0.3, { opacity: 0 }) .to(0.2, { opacity: 0 })
.start() .start()
tween(bigMultiLabel) tween(bigMultiLabel)
.to(0.3, { scale: new Vec3(0.24, 0.24, 1) }) .to(0.3, { scale: new Vec3(0.24, 0.24, 1) })
.to(0.3, { scale: new Vec3(0.2, 0.2, 1) }) .to(0.3, { scale: new Vec3(0.2, 0.2, 1) })
.to(0.4, { position: new Vec3(0, multiMovePos, 0) }) .to(0.4, { position: new Vec3(0, multiMovePos, 0) })
.to(0.3, { scale: new Vec3(0.3, 0.3, 1) }) .to(0.2, { scale: new Vec3(0.3, 0.3, 1) })
.call(() => { .call(() => {
bigMultiLabel.setPosition(0, 100, 0) bigMultiLabel.setPosition(0, 100, 0)
bigMultiLabel.setScale(0.2, 0.2, 1) bigMultiLabel.setScale(0.2, 0.2, 1)

24
assets/Game/scripts/game/Roller.ts
View File

@ -612,12 +612,12 @@ export class Roller extends BaseRoller {
iconComponent.playSpawnAni(); iconComponent.playSpawnAni();
// 创建回弹动画 // 创建回弹动画
if (icon.parent.name != 'scatterLayer') { // if (icon.parent.name != 'scatterLayer') {
icon.setPosition(position.add(v3(0, -offset, 0))); // icon.setPosition(position.add(v3(0, -offset, 0)));
tween(icon) // tween(icon)
.by(time, { position: v3(0, offset, 0) }) // .by(time, { position: v3(0, offset, 0) })
.start(); // .start();
} // }
}); });
@ -893,12 +893,12 @@ export class Roller extends BaseRoller {
easing: 'quadIn' // 下落加速 easing: 'quadIn' // 下落加速
}) })
.call(() => { .call(() => {
if (update.node.parent.name != "scatterLayer") { // if (update.node.parent.name != "scatterLayer") {
tween(update.node) // tween(update.node)
.by(0.2, { position: v3(0, 50, 0) }) // .by(0.2, { position: v3(0, 50, 0) })
.by(0.1, { position: v3(0, -50, 0) }) // .by(0.1, { position: v3(0, -50, 0) })
.start() // .start()
} // }
}) })
.start(); .start();