From d15fc4c55822e3a71f7e7212011fb2eac1bef8c0 Mon Sep 17 00:00:00 2001
From: xu_yanfeng <xu_yanfeng@126.com>
Date: Mon, 27 Jan 2025 21:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=B3=E9=94=AE=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E7=BB=9F=E8=AE=A1=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cc-inspector/src/ga/type.ts                   |  3 ---
 cc-inspector/src/scripts/inject-view/app.vue  | 17 +++++++----------
 cc-inspector/src/views/devtools/inspector.vue | 16 ++++++++++------
 cc-inspector/src/views/devtools/store.ts      | 10 ++++++++++
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/cc-inspector/src/ga/type.ts b/cc-inspector/src/ga/type.ts
index 6935a2f..ff40be4 100644
--- a/cc-inspector/src/ga/type.ts
+++ b/cc-inspector/src/ga/type.ts
@@ -82,9 +82,6 @@ export enum GA_EventName {
   GamePlayer = "game_player",
   GamePause = "game_pause",
   GameStep = "game_step",
-  PickTop = "pick_top",
-  InspectorClear = "inspector_clear",
-  GameInspectorFilter = "game_inspector_filter",
   /**
    * 用户点击store广告链接
    */
diff --git a/cc-inspector/src/scripts/inject-view/app.vue b/cc-inspector/src/scripts/inject-view/app.vue
index b26de65..1aa9843 100644
--- a/cc-inspector/src/scripts/inject-view/app.vue
+++ b/cc-inspector/src/scripts/inject-view/app.vue
@@ -129,6 +129,7 @@ export default defineComponent({
               enabled: inspectTarget.enabled,
               selected: inspectTarget.isContainInspectType(item.type),
               callback: (menu: IUiMenuItem) => {
+                ga(GA_EventName.MouseMenu, menu.name);
                 if (menu.selected) {
                   inspectTarget.removeInspectType(item.type);
                 } else {
@@ -143,7 +144,7 @@ export default defineComponent({
               callback: (menu: IUiMenuItem) => {
                 const event = new CustomEvent(DocumentEvent.InspectorClear);
                 document.dispatchEvent(event);
-                ga(GA_EventName.InspectorClear);
+                ga(GA_EventName.MouseMenu, menu.name);
               },
             },
             {
@@ -152,19 +153,15 @@ export default defineComponent({
               callback: (menu: IUiMenuItem) => {
                 config.value.pickTop = !config.value.pickTop;
                 appStore().save();
-                ga(GA_EventName.PickTop);
+                ga(GA_EventName.MouseMenu, menu.name);
               },
             },
-            {
-              name: "",
-              type: ccui.menu.MenuType.Separator,
-              callback() {},
-            },
+            { type: ccui.menu.MenuType.Separator },
             {
               name: "Filter Enabled",
               selected: inspectTarget.enabled,
               callback: (menu: IUiMenuItem) => {
-                ga(GA_EventName.GameInspectorFilter);
+                ga(GA_EventName.MouseMenu, menu.name);
                 inspectTarget.enabled = !inspectTarget.enabled;
               },
             },
@@ -244,10 +241,10 @@ export default defineComponent({
           {
             name: "auto hide",
             selected: config.value.autoHide,
-            callback: () => {
+            callback: (item) => {
               config.value.autoHide = !config.value.autoHide;
               appStore().save();
-              ga(GA_EventName.MouseMenu, "auto hide");
+              ga(GA_EventName.MouseMenu, item.name);
               if (!config.value.autoHide) {
                 clearTimeout(autoHideTimer);
                 showBtns.value = true;
diff --git a/cc-inspector/src/views/devtools/inspector.vue b/cc-inspector/src/views/devtools/inspector.vue
index f1293ec..dfcc266 100644
--- a/cc-inspector/src/views/devtools/inspector.vue
+++ b/cc-inspector/src/views/devtools/inspector.vue
@@ -120,28 +120,32 @@ export default defineComponent({
         const menus: IUiMenuItem[] = [];
         menus.push({
           name: "update node info",
-          callback: () => {
+          callback: (item) => {
             updateNodeInfo();
-            ga.fireEventWithParam(GA_EventName.MouseMenu, "update node info");
+            ga.fireEventWithParam(GA_EventName.MouseMenu, item.name);
           },
         });
+        menus.push({ type: ccui.menu.MenuType.Separator });
         menus.push({
           name: "fresh auto",
-          callback: () => {
+          callback: (item) => {
             timer.create(true);
+            ga.fireEventWithParam(GA_EventName.MouseMenu, item.name);
           },
         });
         menus.push({
           name: "fresh manual",
-          callback: () => {
+          callback: (item) => {
             timer.clean();
+            ga.fireEventWithParam(GA_EventName.MouseMenu, item.name);
           },
         });
+        menus.push({ type: ccui.menu.MenuType.Separator });
         menus.push({
           name: simpleProperties ? "show more properties" : "show simple properties",
-          callback: () => {
+          callback: (item) => {
             simpleProperties = !simpleProperties;
-            ga.fireEventWithParam(GA_EventName.MouseMenu, "simple/more properties");
+            ga.fireEventWithParam(GA_EventName.MouseMenu, item.name);
           },
         });
         ccui.menu.showMenuByMouseEvent(evnet, menus);
diff --git a/cc-inspector/src/views/devtools/store.ts b/cc-inspector/src/views/devtools/store.ts
index f034e1e..cd6fdf9 100644
--- a/cc-inspector/src/views/devtools/store.ts
+++ b/cc-inspector/src/views/devtools/store.ts
@@ -28,6 +28,14 @@ export class ConfigData {
    * 是否自动刷新hierarchy
    */
   refreshHirarchy: boolean = true;
+  /**
+   * 当鼠标滑过节点树时，游戏是否同步Inspect
+   */
+  hoverInspect: boolean = true;
+  /**
+   * 当节点树点击时，游戏是否同步Inspect
+   */
+  clickInspect: boolean = true;
 }
 
 export const appStore = defineStore("app", () => {
@@ -42,6 +50,8 @@ export const appStore = defineStore("app", () => {
     config.value.expandTest = !!data.expandTest;
     config.value.refreshHirarchy = !!data.refreshHirarchy;
     config.value.refreshInspector = !!data.refreshInspector;
+    config.value.hoverInspect = !!data.hoverInspect;
+    config.value.clickInspect = !!data.clickInspect;
   }
   return {
     frameID,