lvjincheng 3 anni fa
parent
commit
05dd1ba6cf

+ 39 - 7
Assets/BowArrow/Prefabs/Views/HomeView.prefab

@@ -2267,7 +2267,7 @@ RectTransform:
   m_GameObject: {fileID: 3572727387850533746}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.0622933, y: 1.0622933, z: 1.0622933}
   m_Children: []
   m_Father: {fileID: 7022781866214807768}
   m_RootOrder: 0
@@ -2680,9 +2680,9 @@ RectTransform:
   m_Father: {fileID: 3890223726825215840}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -20}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5099759915330397004
@@ -3950,8 +3950,9 @@ GameObject:
   - component: {fileID: 4438778747625001102}
   - component: {fileID: 4438778747625001103}
   - component: {fileID: 4438778747625001104}
+  - component: {fileID: 6176153047882164539}
   m_Layer: 0
-  m_Name: Btn
+  m_Name: BtnToMeView
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3973,8 +3974,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 73.00001, y: 0}
-  m_SizeDelta: {x: 260, y: 100}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4438778747625001102
 MonoBehaviour:
@@ -4070,6 +4071,21 @@ MonoBehaviour:
           m_StringArgument: "\u6211\u7684"
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &6176153047882164539
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4438778747625001106}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 8057171544677848915}
+  targetGraphic: {fileID: 4303860577039744277}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.60784316}
 --- !u!1 &4438778747837112320
 GameObject:
   m_ObjectHideFlags: 0
@@ -5871,6 +5887,7 @@ GameObject:
   - component: {fileID: 2772499607495721543}
   - component: {fileID: 8617244312983880565}
   - component: {fileID: 222312185216894622}
+  - component: {fileID: 4630184286848083301}
   m_Layer: 5
   m_Name: BtnShowDetail
   m_TagString: Untagged
@@ -5991,6 +6008,21 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &4630184286848083301
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8370306910892904901}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 8617244312983880565}
+  selectedColor: {r: 0, g: 1, b: 1, a: 0.21568628}
 --- !u!1 &8636979900590103740
 GameObject:
   m_ObjectHideFlags: 0

+ 10 - 9
Assets/BowArrow/Scripts/Expand/SB_EventSystem.cs

@@ -37,17 +37,17 @@ public class SB_EventSystem : MonoBehaviour
     [SerializeField] public SimulateMouse simulateMouse;
 
     #region  客户要求鼠标点到按钮时,按钮高亮
-        Color pointerHoverColor = new Color(233f/255, 233f/255, 233f/255, 128f/255);
+        // Color pointerHoverColor = new Color(233f/255, 233f/255, 233f/255, 128f/255);
         void InitListenerForMouseHoverHightColor() {
             simulateMouse.OnPointerEnter += (Selectable target) => {
                 mouseConfirm.SetSelectable(target);
-                Button btn = target.GetComponent<Button>();
-                if (!btn) return;
-                if (btn.transition != Selectable.Transition.ColorTint) return;
-                if (!btn.interactable) return;
-                ColorBlock colorBlock = btn.colors;
-                colorBlock.highlightedColor = pointerHoverColor;
-                btn.colors = colorBlock;
+                // Button btn = target.GetComponent<Button>();
+                // if (!btn) return;
+                // if (btn.transition != Selectable.Transition.ColorTint) return;
+                // if (!btn.interactable) return;
+                // ColorBlock colorBlock = btn.colors;
+                // colorBlock.highlightedColor = pointerHoverColor;
+                // btn.colors = colorBlock;
             };
         }
     #endregion
@@ -101,7 +101,8 @@ public class SB_EventSystem : MonoBehaviour
         bool isCooling = IsClickMouseCooling();
         RecordClickMouseTime();
         if (isCooling) return;
-        simulateMouse.ClickMousePointer();
+        // simulateMouse.ClickMousePointer();
+        mouseConfirm.OnClikc_Confirm();
     }
 
     /** 鼠标测试类 */

+ 46 - 123
Assets/BowArrow/Scripts/Expand/SB_EventSystem.prefab

@@ -30,7 +30,7 @@ Transform:
   m_Children:
   - {fileID: 9153529459286837273}
   - {fileID: 4466511099740143219}
-  - {fileID: 6460681503731722814}
+  - {fileID: 4099006661200911299}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -46,7 +46,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da1ed5633f17c1d41a560d677659322a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mouseConfirm: {fileID: 1927403290695149093}
+  mouseConfirm: {fileID: 88918043126582612}
   simulateMouse: {fileID: 4466511099740143218}
 --- !u!1 &6022902056680718010
 GameObject:
@@ -114,6 +114,50 @@ MonoBehaviour:
   m_InputActionsPerSecond: 10
   m_RepeatDelay: 0.5
   m_ForceModuleActive: 0
+--- !u!1 &8120470249902026758
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4099006661200911299}
+  - component: {fileID: 88918043126582612}
+  m_Layer: 0
+  m_Name: MouseConfirm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &4099006661200911299
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8120470249902026758}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8896251417503616548}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &88918043126582612
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8120470249902026758}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe67bad6e6cfcef45bea5b99bf6dd59b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  btnConfirm: {fileID: 0}
 --- !u!1001 &221688797660022829
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -187,124 +231,3 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 230f31333a554724899153c32f5c2881, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &3813801672593820031
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 8896251417503616548}
-    m_Modifications:
-    - target: {fileID: 1089973789941449029, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_Name
-      value: MouseConfirm
-      objectReference: {fileID: 0}
-    - target: {fileID: 1089973789941449029, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1406887300890989585, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_SortingOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
---- !u!224 &6460681503731722814 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7873888582726017857, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-  m_PrefabInstance: {fileID: 3813801672593820031}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &1927403290695149093 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3337971612114972506, guid: 0694ea385f0d805479f9859bcf8c2f7e, type: 3}
-  m_PrefabInstance: {fileID: 3813801672593820031}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe67bad6e6cfcef45bea5b99bf6dd59b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

BIN
Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/BtnMouseConfirm.png


+ 0 - 120
Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/BtnMouseConfirm.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 35cb9ed4c1d9b6b4499f313f7ba15022
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 29 - 0
Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/MouseButton.cs

@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class MouseButton : MonoBehaviour
+{   
+    [SerializeField] RectTransform targetRTF;
+    [SerializeField] Graphic targetGraphic;
+    [SerializeField] Color selectedColor = new Color(1, 1, 1, 0.6f);
+    Vector3 _scale;
+    Color _color;
+
+    public void OnSelect() {
+        if (targetGraphic) {
+            _color = targetGraphic.color;
+            targetGraphic.color = selectedColor;
+        }
+        if (targetRTF) {
+            _scale = targetRTF.localScale;
+            targetRTF.localScale = _scale * 1.15f;
+        }
+    }
+
+    public void OnExit() {
+        if (targetGraphic) targetGraphic.color = _color;
+        if (targetRTF) targetRTF.localScale = _scale;
+    }
+}

+ 11 - 0
Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/MouseButton.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9041465d981afb74e8861a84f98f2dbd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 45 - 42
Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/MouseConfirm.cs

@@ -8,70 +8,31 @@ using JC.Unity;
 
 public class MouseConfirm : MonoBehaviour
 {
-    [SerializeField] Button btnConfirm;
-
     Selectable _targetSelectable;
     Selectable _selfSelectable;
-    bool _prepared = false;
-
-    void Awake() {
-        btnConfirm.gameObject.SetActive(false);
-    }
     
-    void Start()
-    {
-        _selfSelectable = btnConfirm.GetComponent<Selectable>();
-        btnConfirm.onClick.AddListener(OnClikc_Confirm);
-    }
-
     void Update()
     {
         if (!SB_EventSystem.ins.simulateMouseIsAwaked) {
             Hide();
             return;
         }
-        if (!SB_EventSystem.ins.simulateMouse.GetCurrentSelectable()) {
-            Hide();
-            return;
-        }
-        if (_targetSelectable) {
-            if (!_prepared) {
-                _prepared = true;
-
-                RectTransform rtf = _targetSelectable.transform as RectTransform;
-                Vector3 size = rtf.rect.size;
-                if (size.x == 0 || size.y == 0) {
-                    Hide();
-                    return;
-                } 
-                Vector3 maxSize = RectTransformUtils.CanvasV3ToScreenV3(Vector3.one * 120, transform as RectTransform); 
-                size = RectTransformUtils.CanvasV3ToScreenV3(size, rtf);
-                if (size.x > maxSize.x || size.y > maxSize.y) {
-                    Hide();
-                    return;
-                }
-        
-                btnConfirm.transform.position = RectTransformUtils.GetPositionByPivot(_targetSelectable.transform as RectTransform, Vector2.one * 0.5f);
-                btnConfirm.gameObject.SetActive(true);
-                GetComponent<Canvas>().sortingOrder = _targetSelectable.GetComponentInParent<Canvas>().sortingOrder + 1;
-            }
-        } else {
+        if (!_targetSelectable) {
             Hide();
         }
     }
 
     void Show() {
-        _prepared = false;
         if (!gameObject.activeSelf) gameObject.SetActive(true);
     }
 
     void Hide() {
+        ResumeTarget();
         _targetSelectable = null;
-        btnConfirm.gameObject.SetActive(false);
         if (gameObject.activeSelf) gameObject.SetActive(false);
     }
 
-    void OnClikc_Confirm()
+    public void OnClikc_Confirm()
     {
         try
         {
@@ -92,7 +53,49 @@ public class MouseConfirm : MonoBehaviour
         if (!selectable) return;
         if (selectable == _targetSelectable) return;
         if (selectable == _selfSelectable) return;
+
+        ResumeTarget();
+
+        Button btn = selectable.GetComponent<Button>();
+        if (!btn) return;
+        if (!btn.interactable) return;
+
         _targetSelectable = selectable;
+
+        RectTransform rtf = _targetSelectable.transform as RectTransform;
+        _btnTransition = btn.transition;
+        if (btn.transition == Selectable.Transition.ColorTint) { //变色和放大
+            Vector3 pos = RectTransformUtils.GetPositionByPivot(rtf, Vector2.one * 0.5f);
+            rtf.pivot = Vector2.one * 0.5f;
+            rtf.position = pos;
+            _targetlocalScale = rtf.localScale;
+            rtf.localScale = rtf.localScale * 1.15f;
+            _targetColor = _targetSelectable.targetGraphic.color;
+            var newcolor = _targetSelectable.targetGraphic.color;
+            newcolor.a = 0.6f;
+            _targetSelectable.targetGraphic.color = newcolor;
+        } else if (btn.transition == Selectable.Transition.None) { //则使用自定义变色和放大
+            _mouseButton = rtf.GetComponent<MouseButton>();
+            if (_mouseButton) _mouseButton.OnSelect();
+        }
+
         Show();
     }
+
+    Vector3 _targetlocalScale;
+    Color _targetColor;
+    Selectable.Transition _btnTransition;
+    MouseButton _mouseButton;
+    void ResumeTarget()
+    {
+        if (_targetSelectable) {
+            if (_btnTransition == Selectable.Transition.ColorTint) {
+                _targetSelectable.transform.localScale = _targetlocalScale;
+                _targetSelectable.targetGraphic.color = _targetColor;
+            } else if (_btnTransition == Selectable.Transition.None) {
+                if (_mouseButton) _mouseButton.OnExit();
+            }
+        }
+        _mouseButton = null;
+    }
 }

+ 0 - 250
Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/MouseConfirm.prefab

@@ -1,250 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1027170455086060293
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7436955359867182612}
-  - component: {fileID: 7768636925052580736}
-  - component: {fileID: 4964138757173537796}
-  - component: {fileID: 5192797147029930198}
-  - component: {fileID: 5345562233793385585}
-  m_Layer: 0
-  m_Name: BtnConfirm
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7436955359867182612
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1027170455086060293}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 7873888582726017857}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 120, y: 120}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &7768636925052580736
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1027170455086060293}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a2bce9fdac4a1504b93f82dbca753910, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  radius: 60
---- !u!222 &4964138757173537796
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1027170455086060293}
-  m_CullTransparentMesh: 1
---- !u!114 &5192797147029930198
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1027170455086060293}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 35cb9ed4c1d9b6b4499f313f7ba15022, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &5345562233793385585
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1027170455086060293}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 5192797147029930198}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!1 &1089973789941449029
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7873888582726017857}
-  - component: {fileID: 1406887300890989585}
-  - component: {fileID: 5216328264538281483}
-  - component: {fileID: 3351332642776757331}
-  - component: {fileID: 3337971612114972506}
-  m_Layer: 0
-  m_Name: MouseConfirm
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7873888582726017857
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1089973789941449029}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 7436955359867182612}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!223 &1406887300890989585
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1089973789941449029}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &5216328264538281483
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1089973789941449029}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1280, y: 720}
-  m_ScreenMatchMode: 1
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!114 &3351332642776757331
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1089973789941449029}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &3337971612114972506
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1089973789941449029}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe67bad6e6cfcef45bea5b99bf6dd59b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  btnConfirm: {fileID: 5345562233793385585}

+ 0 - 7
Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/MouseConfirm.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0694ea385f0d805479f9859bcf8c2f7e
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 5 - 5
Assets/JC/Untiy/SimulateMouse/SimulateMouse.cs

@@ -193,16 +193,16 @@ namespace JC.Unity {
         {
             if (mIsDrag == true) return;
  
-            if (m_currentSelectable) {
-                m_currentSelectable.OnPointerExit(m_pointerEvent);
-            }
+            // if (m_currentSelectable) { //退出选中
+            //     m_currentSelectable.OnPointerExit(m_pointerEvent);
+            // }
 
             m_currentSelectable = s;
  
             if (m_currentSelectable) {
                 try { mSimulateMouse.OnPointerEnter?.Invoke(m_currentSelectable); }
-                catch (System.Exception e) { Debug.LogError(e.Message); } 
-                m_currentSelectable.OnPointerEnter(m_pointerEvent);
+                catch (System.Exception e) { Debug.LogError(e.Message); Debug.LogError(e.StackTrace); } 
+                // m_currentSelectable.OnPointerEnter(m_pointerEvent); //选中
                 m_clickHandler = m_currentSelectable.GetComponent<IPointerClickHandler>();
                 m_dragHandler = m_currentSelectable.GetComponent<IDragHandler>();
             } else {