掉落组合块的显示问题
This commit is contained in:
parent
8cf24a1cab
commit
cc1da9aace
@ -88,7 +88,7 @@
|
||||
"__id__": 15
|
||||
}
|
||||
],
|
||||
"_active": true,
|
||||
"_active": false,
|
||||
"_components": [
|
||||
{
|
||||
"__id__": 21
|
||||
@ -503,7 +503,7 @@
|
||||
"__expectedType__": "sp.SkeletonData"
|
||||
},
|
||||
"defaultSkin": "default",
|
||||
"defaultAnimation": "idle_1",
|
||||
"defaultAnimation": "idle_4",
|
||||
"_premultipliedAlpha": false,
|
||||
"_timeScale": 1,
|
||||
"_preCacheMode": 0,
|
||||
@ -639,7 +639,7 @@
|
||||
"__id__": 33
|
||||
}
|
||||
],
|
||||
"_active": false,
|
||||
"_active": true,
|
||||
"_components": [
|
||||
{
|
||||
"__id__": 39
|
||||
|
||||
@ -1270,7 +1270,7 @@
|
||||
"__id__": 48
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
|
||||
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -1281,7 +1281,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "c2UGg88ppP4ovvFvbG4spS",
|
||||
"fileId": "49dcTtERNCma+8MPy5aHt6",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -1307,7 +1307,7 @@
|
||||
"__id__": 51
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -1318,7 +1318,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "49YC+in7ZJpIRVS9P8u/Nq",
|
||||
"fileId": "61iie93hNHA4tl7lYO4/VN",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -1344,7 +1344,7 @@
|
||||
"__id__": 54
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -1355,7 +1355,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "00AgrcLuJFBr9ajUa8j4ZP",
|
||||
"fileId": "89o2oHaXtFx4h/p/ta1sb6",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -1381,7 +1381,7 @@
|
||||
"__id__": 57
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -1392,7 +1392,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "faWLdKjCNPRo0F8+eVWMA2",
|
||||
"fileId": "10Gez3QqhAiLBUMHzcJg2/",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -1418,7 +1418,7 @@
|
||||
"__id__": 60
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -1429,7 +1429,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "3cACdo5WBM0Y54kegG6Dxo",
|
||||
"fileId": "a79rqWOjZP+ahKH5wQ4d7b",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -1464,7 +1464,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "0cQxezrf9Ma5AUL6sML/Yu"
|
||||
"fileId": "4e+f5dqHpIG7ZwKAMXI1Uh"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -1474,7 +1474,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "cfpzGkC25A4JhrkqDf4q25",
|
||||
"fileId": "27HMo53LZBq7M7uj925mcA",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -1505,7 +1505,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "47LGISve1OAIcPoIc7hQfx"
|
||||
"fileId": "1fag1JhMxLpZzLvepj3Qox"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -1515,7 +1515,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "8aoHo/+FlBg6GmNBGTMWiz",
|
||||
"fileId": "54gKJC749FTJS/MmB7j41v",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -1546,7 +1546,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "5ckOPbBuxCu7INjDN9i5ri"
|
||||
"fileId": "a2l1jb6gtK7awnU2PdY1tU"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -1571,7 +1571,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "7bUJbQV7FOr5Q5lYrAiGla"
|
||||
"fileId": "c2FoztheNKLIHkLnQv0hNm"
|
||||
},
|
||||
{
|
||||
"__type__": "5fd13+Xa69CZogb3Q/F1lnC",
|
||||
@ -1744,7 +1744,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "b76NcuGVVKI4jRhRO1fkHj",
|
||||
"fileId": "6fZmQYXcJHxJO7hvQcq3vC",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -1934,7 +1934,7 @@
|
||||
"__id__": 83
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -1945,7 +1945,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "14sAa4EppJyKgdRqGYzad2",
|
||||
"fileId": "f3u964KjRKgK8g/dyIQ/g+",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -1971,7 +1971,7 @@
|
||||
"__id__": 86
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -1982,7 +1982,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "06M12VpEJABLXUSQh8LH8i",
|
||||
"fileId": "50K8P0pZtJMLPtE4/dDnlW",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2008,7 +2008,7 @@
|
||||
"__id__": 89
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
|
||||
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2019,7 +2019,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "d1yP2KvehPjZZ958xtzmhL",
|
||||
"fileId": "04hNx4OKNLHq7SWd5orxLd",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2045,7 +2045,7 @@
|
||||
"__id__": 92
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2056,7 +2056,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "deUQufYsBI05aOdw7h5o6W",
|
||||
"fileId": "59jomdxe5Dr7Jsf+RNR9kx",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2082,7 +2082,7 @@
|
||||
"__id__": 95
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2093,7 +2093,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "db+KsgBmlH2ZSkt0GiIOee",
|
||||
"fileId": "a3ybD7XhFJz6/u1ZBjijIo",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2128,7 +2128,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "9c47t66xxLV6OcQ+3NuNve"
|
||||
"fileId": "2537JjRfVCArCylIGNGc68"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2138,7 +2138,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "f7BY1ed09JM5MR6TdWxJu5",
|
||||
"fileId": "f6X6niLQxLtK8EHTKm3sGG",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2169,7 +2169,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "8dQmHaHAVDFask1p83iqvB"
|
||||
"fileId": "5bPtbv5DBLfphOoPjxgrh4"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2179,7 +2179,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "3emTtGZJtIa58gYv8Wp0Xq",
|
||||
"fileId": "68LyEO8M1G2pjg4eOVwUlD",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2210,7 +2210,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "28B1FEIapFO50YUmDIgATq"
|
||||
"fileId": "22hapk9bhHMaJBY4N3YNjr"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -2235,7 +2235,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "46C3776UtD6qmHHzT7hb/0"
|
||||
"fileId": "c6AcUh5GdECbVCza/OD7bg"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2245,7 +2245,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "8aFUy5KOlL/53H4Y7huwJL",
|
||||
"fileId": "1ewhCJDWhMgr/Kcl49RPzP",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2435,7 +2435,7 @@
|
||||
"__id__": 112
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2446,7 +2446,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "a0RD9G9CpFU63quiyKv9KV",
|
||||
"fileId": "5dgEAu99VGtYqAbPC9Faol",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2472,7 +2472,7 @@
|
||||
"__id__": 115
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2483,7 +2483,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "e9x8ibQANF4YUm+3690LCG",
|
||||
"fileId": "b1UvGu+ehGPaDB+d6kYEDw",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2509,7 +2509,7 @@
|
||||
"__id__": 118
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd",
|
||||
"__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2520,7 +2520,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "12xjG5e8hHN7DJgihsg6IV",
|
||||
"fileId": "faxbl282RCv6dwC/vP5Ptz",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2546,7 +2546,7 @@
|
||||
"__id__": 121
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2557,7 +2557,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "abcYWp655FmJ4iRbui0zBn",
|
||||
"fileId": "3aJFI/vHJH6Y9LOUbhbwF9",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2594,7 +2594,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "3djpgjs39PzriOhREnUQuY",
|
||||
"fileId": "50cmGOaoNCGLuqPybdqoCY",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2629,7 +2629,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "17vENKB9JH+6TKFPKiMGXX"
|
||||
"fileId": "87tYUJgsRKia3hRY2i2aH8"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2639,7 +2639,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "18O+j0S8xEYIv6WMXcyeIw",
|
||||
"fileId": "a80xr2y8lMZ4MCN9QNPqd8",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2670,7 +2670,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "478Z8BuO5M75Jhu6GMpMhT"
|
||||
"fileId": "30L9llCIlAS4dQy6Ps19i1"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2680,7 +2680,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "ebsIZE7xdDbb5tJoqarUox",
|
||||
"fileId": "17rsA5ZVhEb7eBO3vu/Bso",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2711,7 +2711,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "4cQjGOFQlIQ6GxeL2bA2mr"
|
||||
"fileId": "83qZ9QZ/ZIF7pJFrmkCcwC"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -2736,7 +2736,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "1f1eZxy3pBuJEJ6amYCj38"
|
||||
"fileId": "8083N6zXdBe7547SaeWcIy"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2746,7 +2746,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "28c3VojQZGOLvCPh0RpLis",
|
||||
"fileId": "9b4E1ihS5LVqIHaEHanm3b",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2936,7 +2936,7 @@
|
||||
"__id__": 141
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2947,7 +2947,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "a4fHIOBRBJ6qq45d4LXQ+7",
|
||||
"fileId": "36XjtDWgFL3JtqvPbvX2Pl",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2973,7 +2973,7 @@
|
||||
"__id__": 144
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
|
||||
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2984,7 +2984,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "4fafsMyrlKlKQA8BZ5qSP6",
|
||||
"fileId": "baIoyp/uFHHbLCN8PMf0Nm",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3010,7 +3010,7 @@
|
||||
"__id__": 147
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3021,7 +3021,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "fb12V8nnlMrJi69PQDL8nL",
|
||||
"fileId": "abskMPIQNAfais5oLYs3pu",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3047,7 +3047,7 @@
|
||||
"__id__": 150
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
|
||||
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3058,7 +3058,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "d2cjl4mUxAT7n8EK8ecj4B",
|
||||
"fileId": "99utRz3GdH8o9gfwZ6YJ1m",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3084,7 +3084,7 @@
|
||||
"__id__": 153
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
|
||||
"__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3095,7 +3095,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "baO/kGo1JCwpWprr6jh8Xz",
|
||||
"fileId": "87CUErQI5MzpP9aXtN6EuG",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3130,7 +3130,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "c6zQoPNw5FWIW94rjfUgxO"
|
||||
"fileId": "39UyhVsilFCb2QBT/94G7V"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3140,7 +3140,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "89VRlUiEtK2LFA2mwscg2z",
|
||||
"fileId": "8dFDs3cYhENpglWpxl8m4o",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3171,7 +3171,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "8b4h3rb1tElr9U2qPk+p2R"
|
||||
"fileId": "c0oGJp0VZJkYbPeZsuct/c"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3181,7 +3181,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "40m6spZ3RALJHqA4enwCoa",
|
||||
"fileId": "8et4lufVNOkocraKuSvLnM",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3212,7 +3212,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "f9TCX9iF9DwJfmngxtGhnq"
|
||||
"fileId": "a3926i8LxJyagXFXvVnyCv"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -3237,7 +3237,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "2dyDDK5chKsbilyzQompJ2"
|
||||
"fileId": "e6oPAiGjhCba2cutJwbJUX"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3247,7 +3247,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "fbF8V45jJCwolzZ3tDoqKW",
|
||||
"fileId": "1bcN98EoNPo5ALo0vZDJhY",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3437,7 +3437,7 @@
|
||||
"__id__": 170
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
|
||||
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3448,7 +3448,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "d3qwx5zDVAAo1sZargVLI8",
|
||||
"fileId": "2cs2hIAFZDtYxsEb0FZHai",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3474,7 +3474,7 @@
|
||||
"__id__": 173
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
|
||||
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3485,7 +3485,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "7a1RNzDKlI9YrVm8FhaW1F",
|
||||
"fileId": "44Ymic8JpBoqJG9+nK56ak",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3511,7 +3511,7 @@
|
||||
"__id__": 176
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3522,7 +3522,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "2fvZjmDUdOcJycyPpF9a2X",
|
||||
"fileId": "8a6icAKk5FBohZ8a2LTD+Y",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3548,7 +3548,7 @@
|
||||
"__id__": 179
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3559,7 +3559,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "14ohW9VJFGVb9NQ3njN853",
|
||||
"fileId": "80StY5XytJmo8uoW8qS3j1",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3585,7 +3585,7 @@
|
||||
"__id__": 182
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3596,7 +3596,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "939OBMe+lOV7aEaMckF1tU",
|
||||
"fileId": "a5MaTSQINGFYk0CQ/Mp0Je",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3631,7 +3631,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "b1fJVmWRpOMIUA71qQNfMv"
|
||||
"fileId": "f3deLlKe1DfaNH2lPvt12/"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3641,7 +3641,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "d3jsJpm1VPCIsF8qcbADJ8",
|
||||
"fileId": "f1HuBpV4JIlIPVM5l0Mf+S",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3672,7 +3672,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "e1ioF5KZBHSbW2v/adiCSS"
|
||||
"fileId": "deWM0YWORAYJ/R2sojWU5+"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3682,7 +3682,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "8eQkc8rIFD7pg9mDAE8KUm",
|
||||
"fileId": "b4IDrBS4ZNI60F3NT+isGj",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3713,7 +3713,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "ddP1hkh3hKIIqrVI/9mdly"
|
||||
"fileId": "d157wKYNpApaGS7bO3W2ws"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -3738,7 +3738,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "dddgFJj9RB57rinAzqk5mW"
|
||||
"fileId": "62gVkrtXpC8ps4HsizIvOl"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3748,7 +3748,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "df/8gYQMBK46BQsHVtCAOL",
|
||||
"fileId": "b9nvNFjspOYJAGxjRW6bVK",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3949,7 +3949,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "16AkGySf1F04bb5tkMW1cv",
|
||||
"fileId": "1deCY+kyFFB6abquVhy1hG",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3986,7 +3986,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "a311Q/pQlKKJ5zRDjzTiiw",
|
||||
"fileId": "afGuFvw2hAkbnvx9PaGs85",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4023,7 +4023,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "edZF2mO6hOv5XaFfv1znIn",
|
||||
"fileId": "8d6TGu5MxPVZWbkusbwnLm",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4049,7 +4049,7 @@
|
||||
"__id__": 208
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4060,7 +4060,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "b00Z42nKBBi6LlSzJsKFkb",
|
||||
"fileId": "02p2yt1sxJ3Jvu+B8QypzM",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4086,7 +4086,7 @@
|
||||
"__id__": 211
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4097,7 +4097,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "e8zmwRD7pFIpKo8XAsnA+a",
|
||||
"fileId": "31iC7CHShC3YR8Mk3qT+Sg",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4132,7 +4132,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "c2Mo68zvRPSYUurb1+ogHi"
|
||||
"fileId": "8dYvHCNB9B/5SPNbsmz+G4"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4142,7 +4142,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "e7hdJbvkhGapaf7m2ex5gN",
|
||||
"fileId": "d73VqgFhpD/7cgxSqnVbzv",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4173,7 +4173,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "14lO/V5ctPwK2vIbivTOlO"
|
||||
"fileId": "a9pwN9Az5NVbBY/pRTuWTg"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4183,7 +4183,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "a3jHXR06NGCo5/PI0WmJqS",
|
||||
"fileId": "85WhqXi5ZF172AE5XhuYHy",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4214,7 +4214,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "d1lGgmDuBPWYGx0q2M6FLn"
|
||||
"fileId": "51sRPJ0FhPCL5sPqbEZuvC"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -4239,7 +4239,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "03xDhQiORAN7kF/MwQ5/tn"
|
||||
"fileId": "b4R+HefTdLioAFpcUEl1kG"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4249,7 +4249,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "42jqkDgjBBgrNvZtDqHS4l",
|
||||
"fileId": "8eP7L/e9xIuakeObL8+QZA",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4274,7 +4274,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "83Wng+vXFDgZ49AGdleAdZ"
|
||||
"fileId": "54n49UzFpOmq6htVxAvK/b"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.UITransform",
|
||||
@ -4302,7 +4302,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "16fiOudSRLfYNOBht5EFbg"
|
||||
"fileId": "bcfH+xTk1D+JdsHdRJxeqw"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.Sprite",
|
||||
@ -4347,7 +4347,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "3e3qqaDiJMhqs6xb3u61uD"
|
||||
"fileId": "91P54An/1L77Wfbiwa5xWb"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4357,7 +4357,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "2ervHqoyJJPKs6YTyr/bwI",
|
||||
"fileId": "bbs1z4Ji5NiZRcndGPNfTx",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
|
||||
@ -305,11 +305,14 @@ export class SlotGame extends Component {
|
||||
|
||||
// 遍历CrossSymbolColorChange获取颜色变化信息
|
||||
for (let key in this.spinData.Change.Details) {
|
||||
if (!this.spinData.Change.Details[key].Symbol) {
|
||||
return
|
||||
//判断组合块是否发生了金变百搭
|
||||
let newIndex = -1;
|
||||
if (this.spinData.Change.Details[key].Symbol) {
|
||||
newIndex = this.spinData.Change.Details[key].Symbol.New
|
||||
} else {
|
||||
let newPos = this.spinData.Change.Details[key].Pos.New[0]
|
||||
newIndex = this.spinData.Symbol.Middle[newPos]
|
||||
}
|
||||
// let colorChange = this.spinData.PanChanges.CrossSymbolColorChange[key];
|
||||
let newIndex = this.spinData.Change.Details[key].Symbol.New;
|
||||
let oldStartPos;
|
||||
let frameType;
|
||||
let height;
|
||||
@ -345,8 +348,15 @@ export class SlotGame extends Component {
|
||||
// 消除创建的逻辑
|
||||
createNewIconTop(spinData: any) {
|
||||
this.spinData = spinData;
|
||||
let createDatas = this.spinData.Change.Middle;
|
||||
this.rollerManager.createNewIconTop([...createDatas]);
|
||||
let createDatas: number[][][] = [[[]]]
|
||||
let CroSymbols = null
|
||||
if (this.spinData.Change) {
|
||||
createDatas = this.spinData.Change.Middle;
|
||||
}
|
||||
if (this.spinData.CroSymbols) {
|
||||
CroSymbols = this.spinData.CroSymbols
|
||||
}
|
||||
this.rollerManager.createNewIconTop(createDatas, CroSymbols);
|
||||
}
|
||||
|
||||
// icon掉落的逻辑
|
||||
|
||||
@ -7,7 +7,7 @@ import {
|
||||
SLOT_GAME_EVENT,
|
||||
SYS_GIFT,
|
||||
WIN_TYPE,
|
||||
winTestData,
|
||||
TestData,
|
||||
} from "./game/Define";
|
||||
import { SlotBar } from "./SlotBar";
|
||||
import { SlotGame } from "./SlotGame";
|
||||
@ -203,7 +203,7 @@ export class SlotScene extends Component {
|
||||
this.checkHasEliminate();
|
||||
|
||||
if (this.gameState.isInFreeSpin) {
|
||||
this.slotBar.enterFreeSpin(this.spinData.FreeSpin.LeftCount);
|
||||
this.slotBar.enterFreeSpin(this.spinData.Free.LeftCount);
|
||||
}
|
||||
this.slotBar.reconnectState(true);
|
||||
this.slotGame.changeBg(this.gameState.isInFreeSpin);
|
||||
@ -326,7 +326,7 @@ export class SlotScene extends Component {
|
||||
// this.SysGift.handleSysInfoFreeCount(this.spinInfo.Frb.Ongoing.Frn);
|
||||
// }
|
||||
} else {
|
||||
this.spinInfo = winTestData;
|
||||
this.spinInfo = TestData;
|
||||
}
|
||||
|
||||
if (this.TipPanel.getHasTip()) {
|
||||
@ -502,12 +502,12 @@ export class SlotScene extends Component {
|
||||
if (isExpect) {
|
||||
this.slotGame.playScatterAni(() => {
|
||||
this.FreeSpinEnter.show(
|
||||
this.spinInfo.Data.FreeSpin.MaxCount,
|
||||
this.spinInfo.Data.Free.MaxCount,
|
||||
() => {
|
||||
AudioManager.instance.playBGM("Free_Mode_BGM");
|
||||
this.slotGame.changeBg(true);
|
||||
this.slotBar.enterFreeSpin(
|
||||
this.spinInfo.Data.FreeSpin.LeftCount
|
||||
this.spinInfo.Data.Free.LeftCount
|
||||
);
|
||||
this.scheduleOnce(() => {
|
||||
this.freeSpinStop();
|
||||
@ -524,9 +524,9 @@ export class SlotScene extends Component {
|
||||
);
|
||||
if (isExpect) {
|
||||
this.slotGame.playScatterAni(() => {
|
||||
this.FreeSpinAdd.show(this.spinInfo.Data.GetGamesTimes, () => {
|
||||
this.FreeSpinAdd.show(this.spinInfo.Data.GamesTimes, () => {
|
||||
this.slotBar.showLeftCount(
|
||||
this.spinInfo.Data.FreeSpin.LeftCount
|
||||
this.spinInfo.Data.Free.LeftCount
|
||||
);
|
||||
this.scheduleOnce(() => {
|
||||
this.freeSpinStop();
|
||||
@ -612,11 +612,11 @@ export class SlotScene extends Component {
|
||||
this.slotGame.playScatterAni(() => {
|
||||
// 第一次进入免费旋转需要切换背景和展示免费次数
|
||||
this.FreeSpinEnter.show(
|
||||
this.spinInfo.Data.FreeSpin.MaxCount,
|
||||
this.spinInfo.Data.Free.MaxCount,
|
||||
() => {
|
||||
this.slotGame.changeBg(true);
|
||||
this.slotBar.enterFreeSpin(
|
||||
this.spinInfo.Data.FreeSpin.LeftCount
|
||||
this.spinInfo.Data.Free.LeftCount
|
||||
);
|
||||
this.scheduleOnce(() => {
|
||||
this.freeSpinStop();
|
||||
@ -634,9 +634,9 @@ export class SlotScene extends Component {
|
||||
if (isExpect) {
|
||||
this.slotGame.rollerManager.checkNextRollerExpect(6, 4);
|
||||
this.slotGame.playScatterAni(() => {
|
||||
this.FreeSpinAdd.show(this.spinInfo.Data.GetGamesTimes, () => {
|
||||
this.FreeSpinAdd.show(this.spinInfo.Data.GamesTimes, () => {
|
||||
this.slotBar.showLeftCount(
|
||||
this.spinInfo.Data.FreeSpin.LeftCount
|
||||
this.spinInfo.Data.Free.LeftCount
|
||||
);
|
||||
this.scheduleOnce(() => {
|
||||
this.freeSpinStop();
|
||||
@ -667,7 +667,7 @@ export class SlotScene extends Component {
|
||||
}
|
||||
|
||||
checkHasGame() {
|
||||
let freeSpinData = this.spinData.FreeSpin;
|
||||
let freeSpinData = this.spinData.Free;
|
||||
this.gameState.isInFreeSpin = freeSpinData != null;
|
||||
if (this.gameState.isInFreeSpin) {
|
||||
if (freeSpinData.LeftCount == freeSpinData.MaxCount) {
|
||||
@ -685,7 +685,7 @@ export class SlotScene extends Component {
|
||||
}
|
||||
|
||||
checkHasMoreScatter() {
|
||||
return this.spinData.GetGamesTimes > 0;
|
||||
return this.spinData.GamesTimes > 0;
|
||||
}
|
||||
|
||||
private async normalStop(isReconnect: boolean = false) {
|
||||
@ -698,12 +698,12 @@ export class SlotScene extends Component {
|
||||
}
|
||||
|
||||
private async freeSpinStop(isReconnect: boolean = false) {
|
||||
let leftCount = this.spinData.FreeSpin.LeftCount;
|
||||
let leftCount = this.spinData.Free.LeftCount;
|
||||
|
||||
if (leftCount >= 1) {
|
||||
let score = 0;
|
||||
if (this.spinData.RoundInfo != null) {
|
||||
score = this.spinData.RoundInfo.AllScore;
|
||||
score = this.spinData.RoundInfo.Score;
|
||||
}
|
||||
let winType = this.slotGame.checkWinType(score);
|
||||
await this.handleOngoingFreeSpin(leftCount, winType);
|
||||
@ -717,7 +717,7 @@ export class SlotScene extends Component {
|
||||
let score = 0;
|
||||
let time = 1;
|
||||
if (this.spinData.RoundInfo != null) {
|
||||
score = this.spinData.RoundInfo.AllScore;
|
||||
score = this.spinData.RoundInfo.Score;
|
||||
time = 3;
|
||||
}
|
||||
let winType = this.slotGame.checkWinType(score);
|
||||
@ -823,7 +823,7 @@ export class SlotScene extends Component {
|
||||
// 3,4,5
|
||||
this.scheduleOnce(() => {
|
||||
let score = isFreeSpin
|
||||
? this.spinData.RoundInfo.AllScore
|
||||
? this.spinData.RoundInfo.Score
|
||||
: this.spinData.AllScore;
|
||||
if (winType >= WIN_TYPE.BIG_WIN) {
|
||||
this.BigWinUI.setCloseCallBack(() => {
|
||||
|
||||
@ -647,7 +647,7 @@ export abstract class BaseRoller extends Component {
|
||||
|
||||
abstract chanegeIconAndFrameType(data: any[]): void;
|
||||
|
||||
abstract createNewIconTop(createDatas: number[][]): void;
|
||||
abstract createNewIconTop(createDatas: number[][], CroSymbols: any): void;
|
||||
|
||||
abstract iconFallDown(data: number[], CroSymbols: any): void;
|
||||
}
|
||||
@ -597,7 +597,7 @@ export let winData: any = {
|
||||
}
|
||||
}
|
||||
|
||||
export let winTestData = {
|
||||
export let TestData = {
|
||||
"Balance": 512890548700,
|
||||
"Data": {
|
||||
"Rid": "67da7b0e3fb9bd4878ff44d2_7_21",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -578,8 +578,8 @@ export class Icon extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
this._iconChangeCallback = this.updateChangeSpriteFrame;
|
||||
this.schedule(this._iconChangeCallback, 0.1);
|
||||
// this._iconChangeCallback = this.updateChangeSpriteFrame;
|
||||
// this.schedule(this._iconChangeCallback, 0.1);
|
||||
} else {
|
||||
// 停止动画并清理
|
||||
if (this._iconChangeCallback) {
|
||||
|
||||
@ -763,21 +763,50 @@ export class Roller extends BaseRoller {
|
||||
* 创建新icon
|
||||
* @param createMsg 信息
|
||||
*/
|
||||
createNewIconTop(createDatas: number[][]) {
|
||||
createNewIconTop(createDatas: number[][], CroSymbols: any) {
|
||||
// 获取所有图标
|
||||
let topY = this.getIconPosition(0, 1);
|
||||
for (let i = 0; i < createDatas.length; i++) {
|
||||
let pos = i - createDatas.length;
|
||||
let iconIndex = createDatas[i][0];
|
||||
let iconHeight = createDatas[i].length
|
||||
let iconKey = this.generateIconKey(pos, iconHeight, pos);
|
||||
let icon = this.iconFactory.icfactoryCreateIcon(iconIndex);
|
||||
icon.getComponent(Icon).initIcon(iconIndex, iconHeight, iconKey, 0, this._rollerId);
|
||||
|
||||
let y = topY.y + (createDatas.length - i) * this.iconHeight;
|
||||
//总共掉落了多少格
|
||||
let fallDownNum = 0
|
||||
//已经计算的格数
|
||||
let nowDownNum = 0
|
||||
//692029aba23ce34d091e5c51
|
||||
//[[12],[6,6,6],[12]]
|
||||
//[[12],[6,6],[12]]
|
||||
//[[12],[6,6,6,6]]
|
||||
//[[12],[6,6],[8,8]]
|
||||
for (let i = 0; i < createDatas.length; i++) {
|
||||
fallDownNum += createDatas[i].length
|
||||
}
|
||||
|
||||
|
||||
for (let i = 0; i < createDatas.length; i++) {
|
||||
let iconHeight = createDatas[i].length
|
||||
let startPos = nowDownNum - fallDownNum;
|
||||
let iconIndex = createDatas[i][0];
|
||||
let iconKey = this.generateIconKey(startPos, iconHeight, startPos - iconHeight + 1);
|
||||
let icon = this.iconFactory.icfactoryCreateIcon(iconIndex);
|
||||
|
||||
let iconFramType = 0
|
||||
if (CroSymbols) {
|
||||
for (let key in CroSymbols) {
|
||||
if (CroSymbols[key].PosFirst / 5 == this._rollerId) {
|
||||
if (CroSymbols[key].PosFirst % 5 == i) {
|
||||
iconFramType = CroSymbols[key].Type
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
icon.getComponent(Icon).initIcon(iconIndex, iconHeight, iconKey, iconFramType, this._rollerId);
|
||||
|
||||
let y = topY.y + (((fallDownNum - nowDownNum) - 0.5 * (iconHeight - iconHeight > 1 ? 1 : 0)) * this.iconHeight);
|
||||
icon.setPosition(0, y, 0); this._content.addChild(icon);
|
||||
this._allIcons.set(iconKey, icon);
|
||||
this._posToIconKey.set(pos, iconKey);
|
||||
this._posToIconKey.set(startPos, iconKey);
|
||||
nowDownNum += iconHeight
|
||||
|
||||
}
|
||||
this.node.emit(ROLLER_EVENT.ICON_CREATE, this._rollerId);
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import { Roller } from './Roller';
|
||||
import { GameData, ICON_HEIGHT, ICON_WIDTH, ROLLER_COMBINE_EVENT, ROLLER_EVENT } from './Define';
|
||||
import { AudioManager } from '../../../Loading/scripts/manager/AudioManager';
|
||||
import { BaseRoller } from './BaseRoller';
|
||||
import { HRoller } from './HRoller';
|
||||
// import { HRoller } from './HRoller';
|
||||
let { ccclass, property, executeInEditMode } = _decorator;
|
||||
|
||||
@ccclass('RollerManager')
|
||||
@ -698,7 +698,7 @@ export class RollerManager extends Component {
|
||||
|
||||
|
||||
// 9. 计算动画播放时间并处理没有删除图标的roller
|
||||
let animationTime = aniData.length > 0 ? 2.4 : 1.2;
|
||||
let animationTime = aniData.length > 0 ? 1.2 : 1.2;
|
||||
let rollersWithoutDeleteOps = [];
|
||||
|
||||
for (let i = 0; i < this.allRollers.length; i++) {
|
||||
@ -790,10 +790,10 @@ export class RollerManager extends Component {
|
||||
}
|
||||
|
||||
|
||||
createNewIconTop(createDatas: number[][][]) {
|
||||
createNewIconTop(createDatas: number[][][], CroSymbols: any) {
|
||||
this.allRollers.forEach((roller, index) => {
|
||||
let rollerData = createDatas[index];
|
||||
roller.createNewIconTop(rollerData);
|
||||
roller.createNewIconTop(rollerData, CroSymbols);
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -187,7 +187,7 @@
|
||||
"_priority": 0,
|
||||
"_fov": 45,
|
||||
"_fovAxis": 0,
|
||||
"_orthoHeight": 960,
|
||||
"_orthoHeight": 960.0000000000001,
|
||||
"_near": 0,
|
||||
"_far": 2000,
|
||||
"_color": {
|
||||
|
||||
@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env"
|
||||
const gameId = "rp_11001";
|
||||
// let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
|
||||
let apiaddr = "";
|
||||
let token = "eyJQIjoxMDA5NDksIkUiOjE3NjM5OTA4NDAsIlMiOjEwMDUsIkQiOiJycF8xMTAwMSJ9.lNl-ezMadQU_1B7s0Y5UqxjtTvzimGgYai_r_TLonyA";
|
||||
let token = "eyJQIjoxMDA5NDksIkUiOjE3NjQxNjQ1NzAsIlMiOjEwMDMsIkQiOiJycF8xMTAwMSJ9.kKSayjTf0PFYljTKNn3_xmNku2Jj4rrDyLgeK50PPo0";
|
||||
|
||||
|
||||
let language = "en"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user