1、修正spine动画引起的渲染问题

2、sortinggroup组件只在当前节点和其子节点有效，其他节点仍然使用节点树遍历
2025-11-13 10:47:40 +00:00 · 2023-03-21 22:23:01 +08:00
parent 918104a057
commit 973434cd71
18 changed files with 4727 additions and 84 deletions
--- a/2.4.11/assets/test/prefabs/ListTestItem-sorting.prefab
+++ b/2.4.11/assets/test/prefabs/ListTestItem-sorting.prefab
@@ -1265,18 +1265,6 @@
    "_atlas": null,
    "_id": ""
  },
-  {
-    "__type__": "ac8d9FmQixM06C+C9zdtS2i",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_sortingLayer": 1,
-    "_orderInLayer": 0,
-    "_id": ""
-  },
  {
    "__type__": "9f538fWaWpEkYLqGkQ0A+08",
    "_name": "",
@@ -1308,6 +1296,18 @@
    },
    "_id": ""
  },
+  {
+    "__type__": "ac8d9FmQixM06C+C9zdtS2i",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_sortingLayer": 0,
+    "_orderInLayer": 0,
+    "_id": ""
+  },
  {
    "__type__": "cc.PrefabInfo",
    "root": {
--- a/2.4.11/assets/test/scenes/test-scene-sorting.fire
+++ b/2.4.11/assets/test/scenes/test-scene-sorting.fire
@@ -75,19 +75,22 @@
        "__id__": 5
      },
      {
-        "__id__": 15
+        "__id__": 16
+      },
+      {
+        "__id__": 18
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 24
+        "__id__": 27
      },
      {
-        "__id__": 25
+        "__id__": 28
      },
      {
-        "__id__": 26
+        "__id__": 29
      }
    ],
    "_prefab": null,
@@ -251,7 +254,7 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 14
+        "__id__": 15
      }
    ],
    "_prefab": null,
@@ -317,7 +320,7 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 13
+        "__id__": 14
      }
    ],
    "_prefab": null,
@@ -383,10 +386,10 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 11
+        "__id__": 12
      },
      {
-        "__id__": 12
+        "__id__": 13
      }
    ],
    "_prefab": null,
@@ -452,6 +455,9 @@
      },
      {
        "__id__": 10
+      },
+      {
+        "__id__": 11
      }
    ],
    "_prefab": null,
@@ -561,6 +567,18 @@
    "_N$affectedByScale": false,
    "_id": "99ZnNIIfdGYr/767ja4ooN"
  },
+  {
+    "__type__": "ac8d9FmQixM06C+C9zdtS2i",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": false,
+    "_sortingLayer": 1,
+    "_orderInLayer": 0,
+    "_id": "95L6yHtudDn4DXi9XNXUWm"
+  },
  {
    "__type__": "cc.Mask",
    "_name": "",
@@ -666,6 +684,110 @@
    "_atlas": null,
    "_id": "c3cT/PBaxC0ZZTS52ZUc/N"
  },
+  {
+    "__type__": "cc.Node",
+    "_name": "raptor-pro",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1280.26,
+      "height": 1039.44
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -573.152,
+        -334.2,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": "b2sxgOXEtLurYDvQ/Y6o1s"
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 16
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "walk",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": true,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "walk",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 0,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "48c998f8-8b63-4afa-b422-3a16c9af34f1"
+    },
+    "_N$_defaultCacheMode": 0,
+    "_N$debugSlots": false,
+    "_N$debugBones": false,
+    "_N$debugMesh": false,
+    "_N$useTint": false,
+    "_N$enableBatch": false,
+    "_id": "e11y2DpPVHi7Kf0FQ5dF3T"
+  },
  {
    "__type__": "cc.Node",
    "_name": "New Node",
@@ -674,20 +796,20 @@
      "__id__": 2
    },
    "_children": [
-      {
-        "__id__": 16
-      },
      {
        "__id__": 19
      },
      {
-        "__id__": 21
+        "__id__": 22
+      },
+      {
+        "__id__": 24
      }
    ],
-    "_active": false,
+    "_active": true,
    "_components": [
      {
-        "__id__": 23
+        "__id__": 26
      }
    ],
    "_prefab": null,
@@ -713,7 +835,7 @@
      "__type__": "TypedArray",
      "ctor": "Float64Array",
      "array": [
-        -604,
+        -185.437,
        -360,
        0,
        0,
@@ -743,16 +865,16 @@
    "_name": "New Label 1",
    "_objFlags": 0,
    "_parent": {
-      "__id__": 15
+      "__id__": 18
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 17
+        "__id__": 20
      },
      {
-        "__id__": 18
+        "__id__": 21
      }
    ],
    "_prefab": null,
@@ -808,7 +930,7 @@
    "_name": "",
    "_objFlags": 0,
    "node": {
-      "__id__": 16
+      "__id__": 19
    },
    "_enabled": true,
    "_materials": [
@@ -841,7 +963,7 @@
    "_name": "",
    "_objFlags": 0,
    "node": {
-      "__id__": 16
+      "__id__": 19
    },
    "_enabled": true,
    "_sortingLayer": 1,
@@ -853,13 +975,13 @@
    "_name": "New Sprite(Splash)",
    "_objFlags": 0,
    "_parent": {
-      "__id__": 15
+      "__id__": 18
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 20
+        "__id__": 23
      }
    ],
    "_prefab": null,
@@ -915,7 +1037,7 @@
    "_name": "",
    "_objFlags": 0,
    "node": {
-      "__id__": 19
+      "__id__": 22
    },
    "_enabled": true,
    "_materials": [
@@ -947,13 +1069,13 @@
    "_name": "New Label 2",
    "_objFlags": 0,
    "_parent": {
-      "__id__": 15
+      "__id__": 18
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 22
+        "__id__": 25
      }
    ],
    "_prefab": null,
@@ -1009,7 +1131,7 @@
    "_name": "",
    "_objFlags": 0,
    "node": {
-      "__id__": 21
+      "__id__": 24
    },
    "_enabled": true,
    "_materials": [
@@ -1042,7 +1164,7 @@
    "_name": "",
    "_objFlags": 0,
    "node": {
-      "__id__": 15
+      "__id__": 18
    },
    "_enabled": true,
    "_sortingLayer": 1,
--- a/2.4.11/assets/test/scenes/test-scene.fire
+++ b/2.4.11/assets/test/scenes/test-scene.fire
@@ -684,7 +684,7 @@
        "__id__": 21
      }
    ],
-    "_active": false,
+    "_active": true,
    "_components": [
      {
        "__id__": 23
--- a/2.4.11/assets/test/spine.meta
+++ b/2.4.11/assets/test/spine.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "d123a0ff-b542-4d81-aee4-255cc3ba2f13",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}
--- a/2.4.11/assets/test/spine/raptor-pro.atlas
+++ b/2.4.11/assets/test/spine/raptor-pro.atlas
@@ -0,0 +1,272 @@
+
+raptor-pro.png
+size: 2017,918
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+back-arm
+  rotate: false
+  xy: 1772, 17
+  size: 91, 48
+  orig: 91, 49
+  offset: 0, 0
+  index: -1
+back-bracer
+  rotate: false
+  xy: 1481, 34
+  size: 77, 55
+  orig: 77, 55
+  offset: 0, 0
+  index: -1
+back-hand
+  rotate: false
+  xy: 1407, 21
+  size: 72, 68
+  orig: 72, 68
+  offset: 0, 0
+  index: -1
+back-knee
+  rotate: false
+  xy: 1902, 69
+  size: 97, 134
+  orig: 97, 134
+  offset: 0, 0
+  index: -1
+back-thigh
+  rotate: false
+  xy: 1018, 125
+  size: 78, 47
+  orig: 78, 47
+  offset: 0, 0
+  index: -1
+eyes-open
+  rotate: false
+  xy: 719, 17
+  size: 93, 89
+  orig: 93, 89
+  offset: 0, 0
+  index: -1
+front-arm
+  rotate: false
+  xy: 402, 14
+  size: 96, 51
+  orig: 96, 51
+  offset: 0, 0
+  index: -1
+front-bracer
+  rotate: true
+  xy: 1347, 15
+  size: 81, 58
+  orig: 81, 58
+  offset: 0, 0
+  index: -1
+front-hand
+  rotate: true
+  xy: 1018, 41
+  size: 82, 75
+  orig: 82, 75
+  offset: 0, 0
+  index: -1
+front-open-hand
+  rotate: true
+  xy: 1258, 10
+  size: 86, 87
+  orig: 86, 87
+  offset: 0, 0
+  index: -1
+front-thigh
+  rotate: false
+  xy: 96, 7
+  size: 114, 58
+  orig: 114, 58
+  offset: 0, 0
+  index: -1
+gun
+  rotate: false
+  xy: 1577, 240
+  size: 212, 206
+  orig: 213, 206
+  offset: 0, 0
+  index: -1
+gun-nohand
+  rotate: false
+  xy: 1561, 35
+  size: 209, 203
+  orig: 210, 203
+  offset: 0, 0
+  index: -1
+head
+  rotate: false
+  xy: 1605, 618
+  size: 271, 298
+  orig: 271, 298
+  offset: 0, 0
+  index: -1
+lower-leg
+  rotate: false
+  xy: 1413, 91
+  size: 146, 189
+  orig: 146, 195
+  offset: 0, 6
+  index: -1
+mouth-grind
+  rotate: false
+  xy: 212, 6
+  size: 93, 59
+  orig: 93, 59
+  offset: 0, 0
+  index: -1
+mouth-smile
+  rotate: false
+  xy: 307, 6
+  size: 93, 59
+  orig: 93, 59
+  offset: 0, 0
+  index: -1
+neck
+  rotate: false
+  xy: 1865, 24
+  size: 35, 41
+  orig: 36, 41
+  offset: 0, 0
+  index: -1
+raptor-back-arm
+  rotate: true
+  xy: 844, 9
+  size: 163, 172
+  orig: 163, 172
+  offset: 0, 0
+  index: -1
+raptor-body
+  rotate: false
+  xy: 2, 451
+  size: 1261, 465
+  orig: 1264, 465
+  offset: 0, 0
+  index: -1
+raptor-front-arm
+  rotate: false
+  xy: 1413, 282
+  size: 162, 203
+  orig: 162, 203
+  offset: 0, 0
+  index: -1
+raptor-front-leg
+  rotate: true
+  xy: 2, 67
+  size: 382, 514
+  orig: 382, 514
+  offset: 0, 0
+  index: -1
+raptor-hindleg-back
+  rotate: false
+  xy: 1265, 487
+  size: 338, 429
+  orig: 338, 429
+  offset: 0, 0
+  index: -1
+raptor-horn
+  rotate: true
+  xy: 1098, 86
+  size: 363, 158
+  orig: 363, 159
+  offset: 0, 0
+  index: -1
+raptor-horn-back
+  rotate: true
+  xy: 1258, 98
+  size: 351, 153
+  orig: 351, 153
+  offset: 0, 0
+  index: -1
+raptor-jaw
+  rotate: false
+  xy: 844, 174
+  size: 252, 275
+  orig: 252, 275
+  offset: 0, 0
+  index: -1
+raptor-jaw-tooth
+  rotate: true
+  xy: 2, 2
+  size: 63, 92
+  orig: 73, 96
+  offset: 7, 4
+  index: -1
+raptor-mouth-inside
+  rotate: false
+  xy: 1095, 2
+  size: 71, 82
+  orig: 71, 82
+  offset: 0, 0
+  index: -1
+raptor-saddle-strap-back
+  rotate: false
+  xy: 1907, 205
+  size: 108, 148
+  orig: 108, 148
+  offset: 0, 0
+  index: -1
+raptor-saddle-strap-front
+  rotate: false
+  xy: 1791, 257
+  size: 114, 189
+  orig: 114, 189
+  offset: 0, 0
+  index: -1
+raptor-saddle-w-shadow
+  rotate: false
+  xy: 518, 108
+  size: 324, 341
+  orig: 324, 341
+  offset: 0, 0
+  index: -1
+raptor-tail-shadow
+  rotate: true
+  xy: 1878, 539
+  size: 377, 126
+  orig: 377, 126
+  offset: 0, 0
+  index: -1
+raptor-tongue
+  rotate: true
+  xy: 1772, 67
+  size: 171, 128
+  orig: 171, 128
+  offset: 0, 0
+  index: -1
+stirrup-back
+  rotate: false
+  xy: 1168, 15
+  size: 87, 69
+  orig: 87, 69
+  offset: 0, 0
+  index: -1
+stirrup-front
+  rotate: true
+  xy: 518, 17
+  size: 89, 100
+  orig: 89, 100
+  offset: 0, 0
+  index: -1
+stirrup-strap
+  rotate: false
+  xy: 620, 15
+  size: 97, 91
+  orig: 97, 91
+  offset: 0, 0
+  index: -1
+torso
+  rotate: false
+  xy: 1907, 355
+  size: 108, 182
+  orig: 108, 182
+  offset: 0, 0
+  index: -1
+visor
+  rotate: false
+  xy: 1605, 448
+  size: 261, 168
+  orig: 261, 168
+  offset: 0, 0
+  index: -1
--- a/2.4.11/assets/test/spine/raptor-pro.atlas.meta
+++ b/2.4.11/assets/test/spine/raptor-pro.atlas.meta
@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.3",
+  "uuid": "4ebb9735-2b25-4da4-a382-5bb4efa78216",
+  "importer": "asset",
+  "subMetas": {}
+}
--- a/2.4.11/assets/test/spine/raptor-pro.json
+++ b/2.4.11/assets/test/spine/raptor-pro.json
--- a/2.4.11/assets/test/spine/raptor-pro.json.meta
+++ b/2.4.11/assets/test/spine/raptor-pro.json.meta
@@ -0,0 +1,10 @@
+{
+  "ver": "1.2.5",
+  "uuid": "48c998f8-8b63-4afa-b422-3a16c9af34f1",
+  "importer": "spine",
+  "textures": [
+    "e2b3fdde-c253-4268-9a1b-8b780707f98f"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}
--- a/2.4.11/assets/test/spine/raptor-pro.png
+++ b/2.4.11/assets/test/spine/raptor-pro.png
--- a/2.4.11/assets/test/spine/raptor-pro.png.meta
+++ b/2.4.11/assets/test/spine/raptor-pro.png.meta
@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "e2b3fdde-c253-4268-9a1b-8b780707f98f",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 2017,
+  "height": 918,
+  "platformSettings": {},
+  "subMetas": {
+    "raptor-pro": {
+      "ver": "1.0.6",
+      "uuid": "e04b0422-0423-41ca-a1fd-a5fedcb8933a",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "e2b3fdde-c253-4268-9a1b-8b780707f98f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 2013,
+      "height": 914,
+      "rawWidth": 2017,
+      "rawHeight": 918,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}