lvjincheng 3 vuotta sitten
vanhempi
sitoutus
3025578355

+ 158 - 98
Assets/BowArrow/Prefabs/Views/HomeView.prefab

@@ -1024,8 +1024,9 @@ GameObject:
   - component: {fileID: 8493734455800086512}
   - component: {fileID: 9005640840167746109}
   - component: {fileID: 6869505596738821332}
+  - component: {fileID: 1174873602034629604}
   m_Layer: 5
-  m_Name: RenderBow
+  m_Name: HomeViewRenderBow
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1041,13 +1042,15 @@ RectTransform:
   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: 6953157504088653691}
-  m_RootOrder: 0
+  m_Children:
+  - {fileID: 5635050908703302760}
+  - {fileID: 371368797149577239}
+  m_Father: {fileID: 7022781866214807768}
+  m_RootOrder: 7
   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_AnchoredPosition: {x: -129.25003, y: -10.000016}
   m_SizeDelta: {x: 500, y: 500}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9005640840167746109
@@ -1085,6 +1088,20 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
+--- !u!114 &1174873602034629604
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1249308475108434720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 47523cfe53036fd45b245694d80d85ac, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  prefabRenderBowCamera: {fileID: 8783645853738562994, guid: 5b9185d051f03ab4cad6e95796ec1649, type: 3}
+  btnConnectBow: {fileID: 2317149572522622741}
 --- !u!1 &1360928897231276735
 GameObject:
   m_ObjectHideFlags: 0
@@ -1712,12 +1729,12 @@ RectTransform:
   m_Children:
   - {fileID: 6777324196931759332}
   - {fileID: 2300338662116850381}
-  m_Father: {fileID: 6953157504088653691}
+  m_Father: {fileID: 8493734455800086512}
   m_RootOrder: 1
   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: -260}
+  m_AnchoredPosition: {x: 0, y: -259.99997}
   m_SizeDelta: {x: 0, y: 49}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8345323175167181390
@@ -2141,95 +2158,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
---- !u!1 &3083030928066054118
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6953157504088653691}
-  - component: {fileID: 8764865903185195900}
-  - component: {fileID: 1922871569498494335}
-  - component: {fileID: 8444621500927905226}
-  m_Layer: 5
-  m_Name: HomeViewRenderBow
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6953157504088653691
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3083030928066054118}
-  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:
-  - {fileID: 8493734455800086512}
-  - {fileID: 371368797149577239}
-  m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -129.25002, y: -10}
-  m_SizeDelta: {x: -753.49994, y: 500}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8764865903185195900
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3083030928066054118}
-  m_CullTransparentMesh: 1
---- !u!114 &1922871569498494335
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3083030928066054118}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 0}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
---- !u!114 &8444621500927905226
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3083030928066054118}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 47523cfe53036fd45b245694d80d85ac, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  prefabRenderBowCamera: {fileID: 8783645853738562994, guid: 5b9185d051f03ab4cad6e95796ec1649, type: 3}
-  btnConnectBow: {fileID: 2317149572522622741}
 --- !u!1 &3458655398071026365
 GameObject:
   m_ObjectHideFlags: 0
@@ -2339,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.3557392, y: 1.3557392, z: 1.3557392}
+  m_LocalScale: {x: 1.3715065, y: 1.3715065, z: 1.3715065}
   m_Children: []
   m_Father: {fileID: 7022781866214807768}
   m_RootOrder: 0
@@ -5226,7 +5154,7 @@ RectTransform:
   - {fileID: 3545089500185046010}
   - {fileID: 2642621673839568804}
   - {fileID: 6345266662986624358}
-  - {fileID: 6953157504088653691}
+  - {fileID: 8493734455800086512}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5944,6 +5872,138 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8370306910892904901
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5635050908703302760}
+  - component: {fileID: 2772499607495721543}
+  - component: {fileID: 8617244312983880565}
+  - component: {fileID: 222312185216894622}
+  m_Layer: 5
+  m_Name: BtnShowDetail
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5635050908703302760
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8370306910892904901}
+  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: 8493734455800086512}
+  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: 300, y: 460}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2772499607495721543
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8370306910892904901}
+  m_CullTransparentMesh: 1
+--- !u!114 &8617244312983880565
+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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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 &222312185216894622
+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: 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: 0
+  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: 8617244312983880565}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1174873602034629604}
+        m_TargetAssemblyTypeName: HomeViewRenderBow, Assembly-CSharp
+        m_MethodName: OnClick_ShowDeviceView
+        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!1 &8636979900590103740
 GameObject:
   m_ObjectHideFlags: 0

+ 5 - 24
Assets/BowArrow/Prefabs/Views/HomeView/HomeViewRenderBow.cs

@@ -4,14 +4,12 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
 
-public class HomeViewRenderBow : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IPointerMoveHandler
+public class HomeViewRenderBow : MonoBehaviour
 {
     [SerializeField] GameObject prefabRenderBowCamera;
     [SerializeField] GameObject btnConnectBow;
     GameObject renderBowCamera;
     Transform sphere;
-    bool isDown = false;
-    float timeForDoubleClickCheck = 0;
 
     void Start()
     {
@@ -24,9 +22,7 @@ public class HomeViewRenderBow : MonoBehaviour, IPointerDownHandler, IPointerUpH
 
     void Update()
     {
-        if (!isDown) {
-            sphere.Rotate(Vector3.up, Time.deltaTime * 60);
-        }
+        sphere.Rotate(Vector3.up, Time.deltaTime * 60);
         UpdateBtnForConnect();
     }
 
@@ -41,23 +37,8 @@ public class HomeViewRenderBow : MonoBehaviour, IPointerDownHandler, IPointerUpH
         }
     }
 
-    public void OnPointerDown(PointerEventData eventData) {
-        isDown = true;
-        float last = timeForDoubleClickCheck;
-        timeForDoubleClickCheck = Time.time;
-        if (timeForDoubleClickCheck - last < 0.5f) {
-            AudioMgr.ins.PlayBtn();
-            GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/DeviceView 1"));
-        }
-    }
-
-    public void OnPointerUp(PointerEventData eventData) {
-        isDown = false;
-    }
-    
-    public void OnPointerMove(PointerEventData eventData) {
-        if (isDown) {
-            sphere.Rotate(Vector3.up, -eventData.delta.x);
-        }   
+    public void OnClick_ShowDeviceView() {
+        AudioMgr.ins.PlayBtn();
+        GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/DeviceView 1"));
     }
 }

+ 1 - 1
Assets/BowArrow/Scripts/Components/TextAutoLanguage.cs

@@ -123,7 +123,7 @@ class LanguageDefault {
     public string text11 = "昵称不能为空";
     public string text12 = "保存成功";
     public string text13 = "我的";
-    public string text14 = "  连接  ";
+    public string text14 = "   连接   ";
     public string text15 = "正在连接";
     public string text16 = "连接成功";
     public string text17 = "断开连接";