diff --git a/assets/Game/prefabs/Icon/Icon0.prefab b/assets/Game/prefabs/Icon/Icon0.prefab index a166da3..26ae366 100644 --- a/assets/Game/prefabs/Icon/Icon0.prefab +++ b/assets/Game/prefabs/Icon/Icon0.prefab @@ -500,7 +500,7 @@ "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", - "defaultAnimation": "", + "defaultAnimation": "1_1", "_premultipliedAlpha": false, "_timeScale": 1, "_preCacheMode": 0, diff --git a/assets/Game/prefabs/Icon/Icon1.prefab b/assets/Game/prefabs/Icon/Icon1.prefab index 355c3de..76053be 100644 --- a/assets/Game/prefabs/Icon/Icon1.prefab +++ b/assets/Game/prefabs/Icon/Icon1.prefab @@ -500,7 +500,7 @@ "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", - "defaultAnimation": "", + "defaultAnimation": "1_1", "_premultipliedAlpha": false, "_timeScale": 1, "_preCacheMode": 0, diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index 7b8e763..ce5fcc5 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2324,7 +2324,7 @@ "__id__": 88 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "1eqql5rNlOwLFK1yo+7HVk", + "fileId": "f1YYwwq65HzIL1Wox8Y5P/", "prefabRootNode": { "__id__": 1 }, @@ -2361,7 +2361,7 @@ "__id__": 91 }, "asset": { - "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2372,7 +2372,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a6jAaAxYRMAaiEBxc0pGEs", + "fileId": "aedHFL//NJcLAoBT3BY11C", "prefabRootNode": { "__id__": 1 }, @@ -2409,7 +2409,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e7SY7+UT1MQZoJ5moo5WQi", + "fileId": "b6Tr1LR6pBRYLTnHwX/cb4", "prefabRootNode": { "__id__": 1 }, @@ -2435,7 +2435,7 @@ "__id__": 97 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2446,7 +2446,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "68KmO39FFDLoMd0BkApwAa", + "fileId": "68LcmatDVGVYRjiL0C8sf5", "prefabRootNode": { "__id__": 1 }, @@ -2472,7 +2472,7 @@ "__id__": 100 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2483,7 +2483,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a0kM9ORsxFdIBJ0Vjf+uyz", + "fileId": "4amGCeF+JICJ1qx7XEEPV5", "prefabRootNode": { "__id__": 1 }, @@ -2518,7 +2518,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2atf6dHeZONbPuZS8x7D9/" + "fileId": "85JIJYB4pEIo2h6+LpRh5y" }, { "__type__": "cc.PrefabInfo", @@ -2528,7 +2528,7 @@ "asset": { "__id__": 0 }, - "fileId": "1dhRo5DhJEU6aLuD4irqd7", + "fileId": "d8HnU4oXRE16tiaR8PKHPW", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2559,7 +2559,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "95r17AlHNLgbiDrZbuhgrL" + "fileId": "44CZmpSLJKnpPYArWdBIiQ" }, { "__type__": "cc.PrefabInfo", @@ -2569,7 +2569,7 @@ "asset": { "__id__": 0 }, - "fileId": "08I49cm2tIC7Foxhbop6pj", + "fileId": "05W2MATkxNz7b8VJUr+kR7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2600,7 +2600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "49/Ei3azRD5ovZ6IKray2g" + "fileId": "4bHsnKFZFNmZzsLzTEmABe" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -2625,7 +2625,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d9hQSK4FxO9YySP4/4AwR5" + "fileId": "6dditgAIVBTbPfkWeFclPS" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2798,7 +2798,7 @@ "asset": { "__id__": 0 }, - "fileId": "5fDHphdn1PppVTjcMbrbwv", + "fileId": "3fSlfpgt9E5p5tMWi63ot0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2988,7 +2988,7 @@ "__id__": 123 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2999,7 +2999,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "589vdBwblJmaHEbzd+c++e", + "fileId": "0fY8zXCPpG9qTU3GVPVDsJ", "prefabRootNode": { "__id__": 1 }, @@ -3036,7 +3036,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "f7P/6MJZNNPaU/N0qN9hsN", + "fileId": "56q7ZZf0VDpIzFiTevFFXe", "prefabRootNode": { "__id__": 1 }, @@ -3062,7 +3062,7 @@ "__id__": 129 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3073,7 +3073,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e381H7/+NDdLUQfFqOlTBu", + "fileId": "65Y8r7Ug9Go4P7fvldjtb9", "prefabRootNode": { "__id__": 1 }, @@ -3099,7 +3099,7 @@ "__id__": 132 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3110,7 +3110,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a1UA3iFNhJhLs+xW+nx+iz", + "fileId": "2aQnKwy4FNaI+6k9dFUDAi", "prefabRootNode": { "__id__": 1 }, @@ -3136,7 +3136,7 @@ "__id__": 135 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3147,7 +3147,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e9PKkjMz5Hz6QjMXIM5yrq", + "fileId": "8eHLuyHBVJK5FxCF/kuj5L", "prefabRootNode": { "__id__": 1 }, @@ -3182,7 +3182,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9eUMXNXVREbYKG48CgXRuR" + "fileId": "c2J00F+yJM1brHqGmyO90N" }, { "__type__": "cc.PrefabInfo", @@ -3192,7 +3192,7 @@ "asset": { "__id__": 0 }, - "fileId": "e41qvXmexCI7MkjK0dsPxu", + "fileId": "ed5XZhWwlC8YehGxK8fOkQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3223,7 +3223,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "73fZOz3HFEboThXtpMmtUJ" + "fileId": "fdf0iOtqBMpImuvM+YhcKo" }, { "__type__": "cc.PrefabInfo", @@ -3233,7 +3233,7 @@ "asset": { "__id__": 0 }, - "fileId": "5cFzmFrBpG7Ks5/AaOzM0t", + "fileId": "femlNDv4pHSosMrloSGTjr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3264,7 +3264,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b14D53cyJKkbEBpyHCJ2Cv" + "fileId": "fcyHC0Aj9PRLbJ+kb8ds/4" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3289,7 +3289,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cbLT1ry/1J3rjH2FBh/wkh" + "fileId": "b068q71XpDjpttpitiK0IE" }, { "__type__": "cc.PrefabInfo", @@ -3299,7 +3299,7 @@ "asset": { "__id__": 0 }, - "fileId": "fbZRLd/NRPAJu9j+d3VcX1", + "fileId": "86ojFef/JC37W/KUjCQVEA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3489,7 +3489,7 @@ "__id__": 152 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3500,7 +3500,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fa7tH46DBMIqkyJXM+hqiS", + "fileId": "e5w6FpaaFPjrsTyQGoNkg2", "prefabRootNode": { "__id__": 1 }, @@ -3526,7 +3526,7 @@ "__id__": 155 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3537,7 +3537,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "76ftBpMRdCOJ6EBIkKlu9O", + "fileId": "e9V3QuTRJAQ5ow0//jSqZS", "prefabRootNode": { "__id__": 1 }, @@ -3563,7 +3563,7 @@ "__id__": 158 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3574,7 +3574,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "4615z8FVxG3rHo90wSWQAE", + "fileId": "09LhhF1vFGRLZm5NlPgq+S", "prefabRootNode": { "__id__": 1 }, @@ -3600,7 +3600,7 @@ "__id__": 161 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3611,7 +3611,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "9fZuEW/+BGh69bzFf4MzWN", + "fileId": "ffoELxF6hFrLYCj/RjBtdf", "prefabRootNode": { "__id__": 1 }, @@ -3637,7 +3637,7 @@ "__id__": 164 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3648,7 +3648,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "816kmjJSFMqoWDYfLv+W1N", + "fileId": "5eN5qLr4pEy5LQK8/pGy1r", "prefabRootNode": { "__id__": 1 }, @@ -3683,7 +3683,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f3Yx52dNNFZIgFkG3KlI+e" + "fileId": "caErcF+29EeZm1pnemXxpu" }, { "__type__": "cc.PrefabInfo", @@ -3693,7 +3693,7 @@ "asset": { "__id__": 0 }, - "fileId": "8cMg01MN1LerbDFUAxiirG", + "fileId": "26yaN3Pg5BRLOeDW2kUWNP", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3724,7 +3724,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ccDHiomCZDiq+vsX0weBmW" + "fileId": "51Ij8X6vhNBKbtN+NI/6gu" }, { "__type__": "cc.PrefabInfo", @@ -3734,7 +3734,7 @@ "asset": { "__id__": 0 }, - "fileId": "18jRTNR2hJe7HEVv78Ikxd", + "fileId": "82I5pNcjFH2rbvUHu7Tg+z", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3765,7 +3765,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e1Kz1RQ5tHUaWjJDo+Qxh3" + "fileId": "8fu2d2vBhOG5/CKS0c4MFR" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3790,7 +3790,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8fwWtbEaZMZ6lqBHW+Hkc7" + "fileId": "bemYysUYZDmplXp3KKvP2m" }, { "__type__": "cc.PrefabInfo", @@ -3800,7 +3800,7 @@ "asset": { "__id__": 0 }, - "fileId": "02hlFkJaZFoapncYvcCUTH", + "fileId": "39WdwZHeNGbJnkSVakEc+5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3990,7 +3990,7 @@ "__id__": 181 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4001,7 +4001,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "6f21fA4FNGvYipcuhia8Qr", + "fileId": "bcqcq3RVlFC4m6r22KsLIJ", "prefabRootNode": { "__id__": 1 }, @@ -4027,7 +4027,7 @@ "__id__": 184 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4038,7 +4038,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3c0qmcqdhPjoWImtRDDO35", + "fileId": "afo9KRc41AAq+Ca30b8CTf", "prefabRootNode": { "__id__": 1 }, @@ -4064,7 +4064,7 @@ "__id__": 187 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4075,7 +4075,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "14KGWcEVJPjZ6Mqb/ehqLU", + "fileId": "31hnxVmhFJsK28ROJYWLHE", "prefabRootNode": { "__id__": 1 }, @@ -4101,7 +4101,7 @@ "__id__": 190 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4112,7 +4112,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "5d0bOjUvJN146hBVhyAqld", + "fileId": "40mS4J2jlFbIijlibdJhbC", "prefabRootNode": { "__id__": 1 }, @@ -4138,7 +4138,7 @@ "__id__": 193 }, "asset": { - "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4149,7 +4149,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "7aiVnHZg9CpKxnLtkmI3WB", + "fileId": "63YUhC0HFPt5K1p2SgO5we", "prefabRootNode": { "__id__": 1 }, @@ -4184,7 +4184,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "27hsK28EVLMpARTj/kV9cC" + "fileId": "9bAoa+cfZOrLB/UULeJ1FP" }, { "__type__": "cc.PrefabInfo", @@ -4194,7 +4194,7 @@ "asset": { "__id__": 0 }, - "fileId": "41cZgdv4VIzoFjrSi5Keyp", + "fileId": "33e25gyJ1HWItmNbuQ8K2V", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4225,7 +4225,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a5YmQ5GiBP05X9Yi1QIIRW" + "fileId": "a052Dz97JAcKG8xv5o+ebj" }, { "__type__": "cc.PrefabInfo", @@ -4235,7 +4235,7 @@ "asset": { "__id__": 0 }, - "fileId": "dbu8zYse5Hsr8PJp5MqLvU", + "fileId": "dfJmVVxDlOz5PZdJH5eWWZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4266,7 +4266,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5aCEeLZSpFVYLUUKbivSfC" + "fileId": "c8qwpJFxtKr7K9XpSkqE14" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4291,7 +4291,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2aGERVnM5FIbLX4QvTMKMn" + "fileId": "d3JT4FRK9BAJlm1jfTNfwQ" }, { "__type__": "cc.PrefabInfo", @@ -4301,7 +4301,7 @@ "asset": { "__id__": 0 }, - "fileId": "9a3kbBMGlNMofSIXUAqP29", + "fileId": "e7LJPsozFMSpIihOj0p2F3", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4502,7 +4502,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "50bJLbOS9DiYqWw2DTq47A", + "fileId": "55QcrMIfJF0qL+emHy3JZY", "prefabRootNode": { "__id__": 1 }, @@ -4528,7 +4528,7 @@ "__id__": 213 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4539,7 +4539,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "43l7jWoYlGo5WmOawKmooV", + "fileId": "d8gY9tYUFD54KdEDssvoCP", "prefabRootNode": { "__id__": 1 }, @@ -4576,7 +4576,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "53IhWyDCVJLJHY5dssdh36", + "fileId": "46UhrJiJhHkYHbelrdJJAu", "prefabRootNode": { "__id__": 1 }, @@ -4613,7 +4613,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a7CW2DUNxEPoAtyb0TpWeo", + "fileId": "06uN7O2gxA4Z4b5EORImrv", "prefabRootNode": { "__id__": 1 }, @@ -4639,7 +4639,7 @@ "__id__": 222 }, "asset": { - "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4650,7 +4650,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "ed6kFlFTxEGp524j2bz4zK", + "fileId": "cbcJzl0xNINryA7WpcoXqq", "prefabRootNode": { "__id__": 1 }, @@ -4685,7 +4685,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ca+DvW2GhJLrQzFF1ZCU40" + "fileId": "1c0VDz2/ZFdYPSUFVXvGDF" }, { "__type__": "cc.PrefabInfo", @@ -4695,7 +4695,7 @@ "asset": { "__id__": 0 }, - "fileId": "acPB36ngFEy49YutRyFakr", + "fileId": "7dRf2a/eZI4b8BnoFbsbLe", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4726,7 +4726,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e6NzIlV4NCzpp9Wmgptm56" + "fileId": "19c10fmKBENo4ZhcpAlA5R" }, { "__type__": "cc.PrefabInfo", @@ -4736,7 +4736,7 @@ "asset": { "__id__": 0 }, - "fileId": "66keWDFvZOu4qPvi+f5DO+", + "fileId": "a9VD+uyiJCZrtLKjUVB1zP", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4767,7 +4767,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09qUGJivpA4pqn+mnivJjk" + "fileId": "77vE5LgbRBFZsx5WjmQ3K1" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4792,7 +4792,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "52EaI99mtC2JQ/Pkv+ivLM" + "fileId": "d5xQ8h3IxCPak5pIZ2qPUu" }, { "__type__": "cc.PrefabInfo", @@ -4802,7 +4802,7 @@ "asset": { "__id__": 0 }, - "fileId": "cfwEQkTnJJd6aG4iVD7A/A", + "fileId": "b9SmbHbd9NmIufii4nAb27", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4992,7 +4992,7 @@ "__id__": 239 }, "asset": { - "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", + "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5003,7 +5003,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "574T7ekHNOK4skaOlTwhzs", + "fileId": "4d5oTJWX5CcbCJqNnjhozV", "prefabRootNode": { "__id__": 1 }, @@ -5029,7 +5029,7 @@ "__id__": 242 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5040,7 +5040,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "12j8Zjx1NGzqleVQhe8jDh", + "fileId": "27iPzm2DNEv4yWikI4N6Yo", "prefabRootNode": { "__id__": 1 }, @@ -5066,7 +5066,7 @@ "__id__": 245 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5077,7 +5077,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "31UKwNvDlHDY0qrScGspwg", + "fileId": "22AiO/n25MG59m1z7pwV21", "prefabRootNode": { "__id__": 1 }, @@ -5103,7 +5103,7 @@ "__id__": 248 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5114,7 +5114,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "6cFLiGSrxGII21xYjRrE4E", + "fileId": "e2RIzsdftG7qvtxPY7gsZD", "prefabRootNode": { "__id__": 1 }, @@ -5140,7 +5140,7 @@ "__id__": 251 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5151,7 +5151,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "830yO1zuBKi4cTgtR6yl5f", + "fileId": "cdVi6CyuxGgq26fMFEs4le", "prefabRootNode": { "__id__": 1 }, @@ -5186,7 +5186,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "18zRKAy65Fe5J2YoPt1kRe" + "fileId": "1f7C4Wu/9BxLHLYFO/QspZ" }, { "__type__": "cc.PrefabInfo", @@ -5196,7 +5196,7 @@ "asset": { "__id__": 0 }, - "fileId": "f6Nihu+cdAPIPZQACdc4Pz", + "fileId": "2e1rkm2jtKmIMLLmwAR4vV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5227,7 +5227,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "daQRitg3VEIp5lmo6zkUT7" + "fileId": "dd/J914HJGw5awch69anEg" }, { "__type__": "cc.PrefabInfo", @@ -5237,7 +5237,7 @@ "asset": { "__id__": 0 }, - "fileId": "48kghGNbJCML1S0iJJyeyK", + "fileId": "1f2uLEkZ9DVY9jcWE2zHVp", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5268,7 +5268,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b762KR8uhHbo6addc2r7kQ" + "fileId": "f2B2Ne+2pP9pMeatyAZMLX" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -5293,7 +5293,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "44X+i4mPFAn6apsFVsLMMd" + "fileId": "397nWTrvBBj7n6GnzKpuJB" }, { "__type__": "cc.PrefabInfo", @@ -5303,7 +5303,7 @@ "asset": { "__id__": 0 }, - "fileId": "3f4aOq4ipGSZYhGDps07Uv", + "fileId": "66z2d1vthNIaBrbTCuuNzO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5328,7 +5328,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4aqRMvNgRJJLBix0cZhbu4" + "fileId": "12pXZ+hnVCbJC7MTIdF192" }, { "__type__": "cc.UITransform", @@ -5356,7 +5356,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2aoEHu6SxEN7mPRvg91iIk" + "fileId": "abGWMfoX9B1J0Da8N2O0N2" }, { "__type__": "cc.Graphics", @@ -5402,7 +5402,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a2diEH12tHcKtNnAYoXWOk" + "fileId": "5ePpmi1KlDiYsYrAK+oA4n" }, { "__type__": "cc.PrefabInfo", @@ -5412,7 +5412,7 @@ "asset": { "__id__": 0 }, - "fileId": "21Poe6zI5HaavIQsUG6pO1", + "fileId": "f0EltSxKdAdoaTPrgd8Wag", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/Game/scripts/game/Icon.ts b/assets/Game/scripts/game/Icon.ts index 6b803db..ebfc122 100644 --- a/assets/Game/scripts/game/Icon.ts +++ b/assets/Game/scripts/game/Icon.ts @@ -456,6 +456,11 @@ export class Icon extends Component { if (!this.iconSpine || !this.iconSpine.node) return; this.iconSpine.node.active = true; + if (this._isWildOrScatter) { + this.iconSpine.timeScale = 1 + this.iconSpine.clearTracks() + this.iconSpine.setAnimation(0, `${this.lHeight}_1`, true); + } this._normalSpriteNode && (this._normalSpriteNode.active = false); // 使用计时器回调而不是匿名函数,减少闭包 @@ -470,10 +475,12 @@ export class Icon extends Component { private playSpawnAnimation() { if (!this.iconSpine) return; - if (this._isWildOrScatter) { - this.iconSpine.timeScale = 1 - this.iconSpine.setAnimation(0, `${this.lHeight}_1`, true); - } else if (this._isQKJ) { + // if (this._isWildOrScatter) { + // this.iconSpine.timeScale = 1 + // this.iconSpine.clearTracks() + // this.iconSpine.setAnimation(0, `${this.lHeight}_1`, true); + // } else + if (this._isQKJ) { this.iconSpine.setAnimation(0, "animation", false); } else { this.iconSpine.setAnimation(0, "tan", false);