From 6ec242e57c34d272fdf6a1ec14e5bf9c4e73d51d Mon Sep 17 00:00:00 2001 From: xu_yanfeng Date: Tue, 7 Jan 2025 19:44:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=93=BE=E6=8E=A5=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E5=8F=91=E7=8E=B0cocos=E6=B8=B8=E6=88=8F=E7=BB=99?= =?UTF-8?q?=E5=87=BA=E8=AF=A6=E7=BB=86=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/scripts/background/portDevtools.ts | 4 +++- cc-inspector/src/scripts/content/index.ts | 2 +- cc-inspector/src/scripts/inject/inspector.ts | 4 ++-- cc-inspector/src/views/devtools/comp/index.ts | 10 ++++++++++ cc-inspector/src/views/devtools/find.vue | 20 +++++++++++++++++-- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/cc-inspector/src/scripts/background/portDevtools.ts b/cc-inspector/src/scripts/background/portDevtools.ts index 6ef1ee5..b82207b 100644 --- a/cc-inspector/src/scripts/background/portDevtools.ts +++ b/cc-inspector/src/scripts/background/portDevtools.ts @@ -1,4 +1,4 @@ -import { Msg, Page, PluginEvent, RequestTreeInfoData, RequestUseFrameData } from "../../core/types"; +import { Msg, Page, PluginEvent, RequestTreeInfoData, RequestUseFrameData, ResponseSupportData } from "../../core/types"; import { PortMan } from "./portMan"; import { portMgr } from "./portMgr"; @@ -26,6 +26,8 @@ export class PortDevtools extends PortMan { const port = portMgr.getCurrentUsePort(); if (!port) { console.warn(`not find any port`); + const e = new PluginEvent(Page.Background, Page.Devtools, Msg.ResponseSupport, { support: false, msg: "disconnect with game, please refresh page" } as ResponseSupportData); + this.send(e); return; } port.send(data); diff --git a/cc-inspector/src/scripts/content/index.ts b/cc-inspector/src/scripts/content/index.ts index 11ed9f7..bf9405e 100644 --- a/cc-inspector/src/scripts/content/index.ts +++ b/cc-inspector/src/scripts/content/index.ts @@ -65,7 +65,7 @@ function checkGame() { let gameCanvas = document.querySelector("#GameCanvas"); const sendData = new PluginEvent(Page.Content, Page.Devtools, Msg.ResponseSupport, { support: !!gameCanvas, - msg: "未发现GameCanvas,不支持调试游戏!", + msg: "", } as ResponseSupportData); if (connect) { connect.postMessage(sendData); diff --git a/cc-inspector/src/scripts/inject/inspector.ts b/cc-inspector/src/scripts/inject/inspector.ts index fd099a2..4e7c3a1 100644 --- a/cc-inspector/src/scripts/inject/inspector.ts +++ b/cc-inspector/src/scripts/inject/inspector.ts @@ -1,6 +1,6 @@ // eval 注入脚本的代码,变量尽量使用var,后来发现在import之后,let会自动变为var import { uniq } from "lodash"; -import { debugLog, Msg, PluginEvent, RequestLogData, RequestNodeInfoData, RequestSetPropertyData, ResponseNodeInfoData, ResponseSetPropertyData, ResponseSupportData, ResponseTreeInfoData } from "../../core/types"; +import { Msg, PluginEvent, RequestLogData, RequestNodeInfoData, RequestSetPropertyData, ResponseNodeInfoData, ResponseSetPropertyData, ResponseSupportData, ResponseTreeInfoData } from "../../core/types"; import { ArrayData, BoolData, ColorData, DataType, EngineData, Group, ImageData, Info, InvalidData, NodeInfoData, NumberData, ObjectCircleData, ObjectData, Property, StringData, TreeData, Vec2Data, Vec3Data, Vec4Data } from "../../views/devtools/data"; import { InjectEvent } from "./event"; import { getValue, trySetValueWithConfig } from "./setValue"; @@ -81,7 +81,7 @@ export class Inspector extends InjectEvent { } } init() { - debugLog && console.log(...this.terminal.init()); + console.log(...this.terminal.init()); this.watchIsCocosGame(); } diff --git a/cc-inspector/src/views/devtools/comp/index.ts b/cc-inspector/src/views/devtools/comp/index.ts index 6cee63b..a14e379 100644 --- a/cc-inspector/src/views/devtools/comp/index.ts +++ b/cc-inspector/src/views/devtools/comp/index.ts @@ -23,10 +23,20 @@ export enum CompType { ToggleContainer = "cc.ToggleContainer", Toggle = "cc.Toggle", Button = "cc.Button", + BlockInputEvents = "cc.BlockInputEvents", + Scene = "cc.Scene", } export function getSimpleProperties(typeName: string): string[] { const config = {}; + config[CompType.Scene] = [ + "autoReleaseAssets", + "position", + "scale", + "rotation", + "color", // + ]; + config[CompType.BlockInputEvents] = ["enabled"]; config[CompType.Button] = [ "target", // "interactable", diff --git a/cc-inspector/src/views/devtools/find.vue b/cc-inspector/src/views/devtools/find.vue index 33e07a3..ba6f4ac 100644 --- a/cc-inspector/src/views/devtools/find.vue +++ b/cc-inspector/src/views/devtools/find.vue @@ -1,16 +1,32 @@