Merge branch 'F/20231018_Demo' of ssh://gogs.ghz-tech.com:30979/GHzGlass/GHZLangChao into F/20231018_Demo

Assets/Game/Blue/Action/ControlImageColor.cs → Assets/Game/Blue/Action/EnterExitImageChange.cs

@@ -3,9 +3,9 @@ using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
 /// <summary>
-/// 控制颜色深浅
+/// 鼠标进出图片切换
 /// </summary>
-public class ControlImageColor : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+public class EnterExitImageChange : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
 {
     public Sprite PointerEnterSprite;
     public Sprite PointerExitSprite;
@@ -20,4 +20,9 @@ public class ControlImageColor : MonoBehaviour, IPointerEnterHandler, IPointerEx
     {
         mImage.sprite = PointerExitSprite;
     }
+
+    public void BtnClickExecute()
+    {
+        mImage.sprite = PointerExitSprite;
+    }
 }

Assets/Game/Blue/Action/ControlImageColor.cs.meta → Assets/Game/Blue/Action/EnterExitImageChange.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2506d002a66d6b74b9c1fbb315f9b947
+guid: f8ffb2c1e2a20ac438f19113ba646fcb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Game/Blue/Action/ScaleFunction.cs

@@ -1,9 +0,0 @@
-using UnityEngine;
-
-/// <summary>
-/// 面板缩放功能
-/// </summary>
-public class ScaleFunction : MonoBehaviour
-{
-    
-}

Assets/Game/Blue/Action/ScaleFunction.cs.meta

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

Assets/Game/ShowDevice/BasicDeviceControl.cs

@@ -27,6 +27,7 @@ namespace GHZLangChao
                     ArrowToggleBackground.enabled = true;
 
             });
+            UICallManager.Instance.GetDeviceTransform();
         }
         public void ShowChoose()
         {
@@ -90,7 +91,6 @@ namespace GHZLangChao
         {
             transform.position = e.ShowDeviceTransform.position;
             transform.rotation = e.ShowDeviceTransform.rotation;
-            Debug.LogError($"position:{transform.position},rotation:{transform.rotation}");
             this.UnRegisterEvent<ShowDeviceEvent>(SetShowDeviceTransform);
         }
         #endregion

Assets/Game/ShowSupport/ShowRtc.prefab

@@ -947,6 +947,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 5260728561625928438}
+        m_TargetAssemblyTypeName: EnterExitImageChange, Assembly-CSharp
+        m_MethodName: BtnClickExecute
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &5260728561625928438
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -956,7 +968,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 6804054572846459353}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2506d002a66d6b74b9c1fbb315f9b947, type: 3}
+  m_Script: {fileID: 11500000, guid: f8ffb2c1e2a20ac438f19113ba646fcb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   PointerEnterSprite: {fileID: 21300000, guid: 8d422aceddb275a4398e7b9e5690f9e2, type: 3}

Assets/Game/ShowXunJian/ShowDaoHang.prefab

@@ -3964,7 +3964,7 @@ GameObject:
   - component: {fileID: 1724476960348921325}
   - component: {fileID: 3788643109077608353}
   - component: {fileID: 6114604666720134921}
-  - component: {fileID: 3123798732728642152}
+  - component: {fileID: 4920131121488241368}
   m_Layer: 5
   m_Name: HomeBtn
   m_TagString: Untagged
@@ -4013,7 +4013,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.627451}
+  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
@@ -4059,10 +4059,10 @@ MonoBehaviour:
     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_HighlightedSprite: {fileID: 21300000, guid: 8d422aceddb275a4398e7b9e5690f9e2, type: 3}
+    m_PressedSprite: {fileID: 21300000, guid: 8d422aceddb275a4398e7b9e5690f9e2, type: 3}
+    m_SelectedSprite: {fileID: 21300000, guid: f49982e1f6253434f9da1bf7079e0bec, type: 3}
+    m_DisabledSprite: {fileID: 21300000, guid: f49982e1f6253434f9da1bf7079e0bec, type: 3}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
@@ -4086,7 +4086,19 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!114 &3123798732728642152
+      - m_Target: {fileID: 4920131121488241368}
+        m_TargetAssemblyTypeName: EnterExitImageChange, Assembly-CSharp
+        m_MethodName: BtnClickExecute
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &4920131121488241368
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4095,9 +4107,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 6804054572846459353}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2506d002a66d6b74b9c1fbb315f9b947, type: 3}
+  m_Script: {fileID: 11500000, guid: f8ffb2c1e2a20ac438f19113ba646fcb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  PointerEnterSprite: {fileID: 21300000, guid: 8d422aceddb275a4398e7b9e5690f9e2, type: 3}
+  PointerExitSprite: {fileID: 21300000, guid: f49982e1f6253434f9da1bf7079e0bec, type: 3}
   mImage: {fileID: 3788643109077608353}
 --- !u!1 &6811682075174963131
 GameObject:

Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -7983,7 +7983,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.627451}
+  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
@@ -8056,6 +8056,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 2721672154411372802}
+        m_TargetAssemblyTypeName: EnterExitImageChange, Assembly-CSharp
+        m_MethodName: BtnClickExecute
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &2721672154411372802
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8065,9 +8077,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 6804054572846459353}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2506d002a66d6b74b9c1fbb315f9b947, type: 3}
+  m_Script: {fileID: 11500000, guid: f8ffb2c1e2a20ac438f19113ba646fcb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  PointerEnterSprite: {fileID: 21300000, guid: 8d422aceddb275a4398e7b9e5690f9e2, type: 3}
+  PointerExitSprite: {fileID: 21300000, guid: f49982e1f6253434f9da1bf7079e0bec, type: 3}
   mImage: {fileID: 3788643109077608353}
 --- !u!1 &6898885376573589907
 GameObject: