diff --git a/cc-plugin.config.ts b/cc-plugin.config.ts index c1b38f9..0ed7581 100644 --- a/cc-plugin.config.ts +++ b/cc-plugin.config.ts @@ -9,7 +9,7 @@ function i18n(key: string) { const manifest: CocosPluginManifest = { name: pkgName, - version: "2.1.9", + version: "2.1.10", description: "Debug games made with CocosCreator and display node trees and node properties", store: "https://store.cocos.com/app/detail/2002", author: "xu_yanfeng", diff --git a/src/scripts/inject/connect-me.ts b/src/scripts/inject/connect-me.ts new file mode 100644 index 0000000..ec4898a --- /dev/null +++ b/src/scripts/inject/connect-me.ts @@ -0,0 +1,3 @@ +export function help() { + debugger; +} diff --git a/src/scripts/inject/enumConfig.ts b/src/scripts/inject/enumConfig.ts index a1dd6ce..e77f371 100644 --- a/src/scripts/inject/enumConfig.ts +++ b/src/scripts/inject/enumConfig.ts @@ -1,3 +1,5 @@ +import { help } from "./connect-me"; + declare const cc: any; export function getEnumListConfig() { @@ -268,7 +270,10 @@ export function getEnumListConfig() { { key: "clearFlags", values() { - return cc.Camera.ClearFlag.__enums__; + return adaptEnum( + cc.Camera.ClearFlags || // TODO: 2x是个掩码,不是枚举 + cc.Camera.ClearFlag // 3.x是枚举 + ); }, }, { @@ -307,3 +312,20 @@ export function getEnumListConfig() { ]; return enumConfig; } + +function adaptEnum(list: any): Array<{ name: string; value: number }> { + const target = list.__enums__; + if (!target) { + const arr = Object.keys(list).map((key) => { + return { + name: key, + value: list[key], + }; + }); + return arr; + } + if (!Array.isArray(target)) { + help(); + } + return target; +} diff --git a/src/scripts/inject/hint/hint-v3.ts b/src/scripts/inject/hint/hint-v3.ts index 55ad52e..0aa1cfd 100644 --- a/src/scripts/inject/hint/hint-v3.ts +++ b/src/scripts/inject/hint/hint-v3.ts @@ -123,6 +123,7 @@ export class HintV3 extends HintAdapter { return camera; } private getLayerID() { + // FIXME: https://forum.cocos.org/t/topic/165550 return cc.Layers.Enum.GIZMOS; } getRectPoints(node: any): RectPoints | null {