Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #17484: 修复tsx文件对象层自定义属性读取错误 #17641

Merged
merged 6 commits into from
Sep 18, 2024

Conversation

Jerry457
Copy link
Contributor

No description provided.

Copy link

github-actions bot commented Sep 14, 2024

Interface Check Report

! WARNING this pull request has changed these public interfaces:

@@ -69415,9 +69415,8 @@
             constructor();
             getIndexData(k: _cocos_terrain_terrain_lod__TerrainLodKey): _cocos_terrain_terrain_lod__TerrainIndexData | null;
         }
         export type _cocos_tiledmap_tiled_types__GID = number;
-        export type _cocos_tiledmap_tiled_types__MixedGID = number;
         /**
          * Size in pixels of the image
          * @property {cc.Size} imageSize
          */
@@ -69464,9 +69463,9 @@
             imageSize: math.Size;
             tileOffset: math.Vec2;
             _tileSize: math.Size;
             collection: boolean;
-            rectForGID(gid_: _cocos_tiledmap_tiled_types__MixedGID | _cocos_tiledmap_tiled_types__GID, result?: _cocos_tiledmap_tiled_types__TiledGrid): math.Rect | _cocos_tiledmap_tiled_types__TiledGrid;
+            rectForGID(gid_: number, result?: _cocos_tiledmap_tiled_types__TiledGrid): math.Rect | _cocos_tiledmap_tiled_types__TiledGrid;
         }
         export interface _cocos_tiledmap_tiled_types__TiledGrid {
             tileset: _cocos_tiledmap_tiled_types__TMXTilesetInfo;
             x: number;
@@ -69519,11 +69518,11 @@
         export interface _cocos_tiledmap_tiled_map__ImageExtendedNode extends Node {
             layerInfo: _cocos_tiledmap_tiled_types__TMXImageLayerInfo;
             _offset: math.Vec2;
         }
-        export type _cocos_tiledmap_tiled_types__PropertiesInfo = {
+        export interface _cocos_tiledmap_tiled_types__PropertiesInfo {
             [key: string]: number | string;
-        };
+        }
         /**
          * @en The orientation of tiled map.
          * @zh Tiled Map 地图方向。
          * @enum TiledMap.Orientation
@@ -69554,8 +69553,9 @@
              * @static
              */
             ISO = 2
         }
+        export type _cocos_tiledmap_tiled_types__MixedGID = number;
         /**
          * @en The render order of tiled map.
          * @zh 地图的渲染顺序
          * @enum TiledMap.RenderOrder
@@ -69631,8 +69631,9 @@
              */
             TEXT = 5
         }
         export interface _cocos_tiledmap_tiled_types__TMXObject {
+            properties: _cocos_tiledmap_tiled_types__PropertiesInfo;
             id: number | string;
             name: string;
             width: number;
             height: number;

cocos/tiledmap/tmx-xml-parser.ts Outdated Show resolved Hide resolved
cocos/tiledmap/tmx-xml-parser.ts Outdated Show resolved Hide resolved
@qiuguohua
Copy link
Contributor

@cocos-robot run test cases

Copy link

@Jerry457, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
mac PASS PASS FAIL Hexa,puzzle,shield-node

Copy link

@Jerry457, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
windows PASS PASS FAIL Hexa,puzzle,shield-node

@qiuguohua
Copy link
Contributor

@cocos-robot run test cases

Copy link

@Jerry457, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
web-mobile PASS PASS FAIL Hexa,puzzle,shield-node
ios PASS PASS FAIL Hexa,puzzle,shield-node
mac PASS PASS FAIL Hexa,puzzle,shield-node

Copy link

@Jerry457, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
windows PASS PASS FAIL Hexa,puzzle,shield-node
android PASS PASS FAIL Hexa,puzzle,shield-node
wechatgame PASS PASS FAIL Hexa,puzzle,shield-node

@minggo minggo merged commit d7aae74 into cocos:v3.8.5 Sep 18, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants