Merge branch 'AnHui_SheYing' of http://git.zxkedu.com:33769/shenjianxing/VirtualFramework into AnHui_SheYing

Assets/Art/UIPrefab/UIDeviceTip.prefab

@@ -199,7 +199,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: Label
   CustomComment: 
   mComponentName: TMPro.TextMeshProUGUI
 --- !u!1 &6870530999289627961
@@ -370,6 +370,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: Point
   CustomComment: 
   mComponentName: RectTransform

Assets/Art/UIPrefab/UIModuleSelect.prefab

@@ -627,10 +627,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 4901489479028683830}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 47, y: 0}
-  m_SizeDelta: {x: 40, y: 40}
+  m_SizeDelta: {x: 40, y: -32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6122065367745752132
 CanvasRenderer:
@@ -1718,10 +1718,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1545877700601826487}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 367.5011, y: 0}
+  m_AnchoredPosition: {x: 0, y: -62}
-  m_SizeDelta: {x: -735.0022, y: 0}
+  m_SizeDelta: {x: 0, y: 124}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1939500228230628690
 CanvasRenderer:
@@ -1814,7 +1814,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 738.5781, w: 0}
+  m_margin: {x: 719.63617, y: 0, z: 742.6217, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0

Assets/Art/UIPrefab/UIRightTop.prefab

@@ -32,6 +32,7 @@ RectTransform:
   m_Children:
   - {fileID: 1084066206592261424}
   - {fileID: 2167848608907369295}
+  - {fileID: 4973967785904576765}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -785,10 +786,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 4973967785904576765}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -59.5, y: 0}
+  m_AnchoredPosition: {x: -10, y: 0}
-  m_SizeDelta: {x: 40, y: 40}
+  m_SizeDelta: {x: -59, y: -32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4479626071937858289
 CanvasRenderer:
@@ -1139,10 +1140,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1084066206592261424}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -62}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 1920, y: 124}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2593912390276514130
 CanvasRenderer:
@@ -1231,11 +1232,11 @@ MonoBehaviour:
   m_verticalMapping: 0
   m_uvLineOffset: 0
   m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
+  m_IsTextObjectScaleStatic: 1
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: -3.5822144, y: 3.9630127, z: 0.47802734, w: 1.916748}
+  m_margin: {x: 751.9402, y: 3.9630127, z: 763.93274, w: 1.916748}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -1355,7 +1356,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 906599229421366858}
-  - {fileID: 4973967785904576765}
   m_Father: {fileID: 1040478484821896}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
@@ -1771,11 +1771,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4639085785150733075}
-  m_Father: {fileID: 2167848608907369295}
+  m_Father: {fileID: 1040478484821896}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 49.5254, y: -16}
+  m_AnchoredPosition: {x: 49.5254, y: -36.71704}
   m_SizeDelta: {x: 99.0507, y: 71}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2596458345833328256

Assets/Art/UIPrefab/UISetting.prefab

@@ -727,7 +727,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -23}
+  m_AnchoredPosition: {x: 0, y: 56}
   m_SizeDelta: {x: 102, y: 34}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2503034876695940267

Assets/Art/UIPrefab/UITipWindow.prefab

@@ -796,7 +796,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 2
+  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}

Assets/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs

@@ -292,13 +292,18 @@ namespace HighlightPlus {
 
 
         void OnMouseDown() {
+            Debug.Log("OnMouseDown111"); 
             if (isActiveAndEnabled && triggerMode == TriggerMode.ColliderEventsOnlyOnThisObject) {
-                if (!CanInteract()) return;
+                if (!CanInteract()) {
+                    Debug.Log("OnMouseDown000");
+                    return;
+                }
                 if (selectOnClick && InputProxy.GetMouseButtonDown(0)) {
                     ToggleSelection();
                     return;
                 }
                 Highlight(true);
+                Debug.Log("OnMouseDown222");
             }
         }
 
@@ -308,6 +313,7 @@ namespace HighlightPlus {
                 if (!CanInteract()) return;
                 hb.outline = 1;
                 Highlight(true);
+                Debug.Log("应该高亮？？？");
             }
         }