lvjincheng 3 лет назад
Родитель
Сommit
705762ecb5

+ 10 - 7
Assets/BowArrow/Scripts/Manager/LoginMgr/AgreementPopup.cs

@@ -20,22 +20,25 @@ public class AgreementPopup : MonoBehaviour, MenuBackInterface
             };
             };
         }
         }
     }
     }
-    
-    void Start()
+
+    void OnEnable()
     {
     {
         PersistenHandler.ins?.menuBackCtr.views.Add(this);
         PersistenHandler.ins?.menuBackCtr.views.Add(this);
+    }
 
 
+    void OnDisable()
+    {
+        PersistenHandler.ins?.menuBackCtr.views.Remove(this);
+    }
+    
+    void Start()
+    {
         if (PlayerPrefs.GetInt("AgreementPopupChecked", 0) == 1) {
         if (PlayerPrefs.GetInt("AgreementPopupChecked", 0) == 1) {
             this.gameObject.SetActive(false);
             this.gameObject.SetActive(false);
             AgreenmentOption.ins.SetAgreementChecked(true);
             AgreenmentOption.ins.SetAgreementChecked(true);
         }
         }
     }
     }
 
 
-    void OnDestroy()
-    {
-        PersistenHandler.ins?.menuBackCtr.views.Remove(this);
-    }
-
     public bool OnMenuBack() {
     public bool OnMenuBack() {
         Disagree();
         Disagree();
         return true;
         return true;

+ 2 - 2
Assets/HeartRateBand/Views/Degrease/HRB_DegreaseView.cs

@@ -48,12 +48,12 @@ public class HRB_DegreaseView : ViewBase, MenuBackInterface
         UpdateForTimeCounter();
         UpdateForTimeCounter();
     }
     }
 
 
-    public override void OnShowView(object[] args)
+    void OnEnable()
     {
     {
         PersistenHandler.ins?.menuBackCtr.views.Add(this);
         PersistenHandler.ins?.menuBackCtr.views.Add(this);
     }
     }
 
 
-    public override void OnHideView(object[] args)
+    void OnDisable()
     {
     {
         PersistenHandler.ins?.menuBackCtr.views.Remove(this);
         PersistenHandler.ins?.menuBackCtr.views.Remove(this);
     }
     }

+ 6 - 0
Assets/HeartRateBand/Views/Me/HRB_MeView.cs

@@ -34,6 +34,12 @@ public class HRB_MeView : JCUnityLib.ViewBase, MenuBackInterface
         HRB_ViewMgr.Instance.ShowView<HRB_LoginView>();
         HRB_ViewMgr.Instance.ShowView<HRB_LoginView>();
     }
     }
 
 
+    public void OnClick_QuitApp()
+    {
+        AudioMgr.ins.PlayBtn();
+        Application.Quit();
+    }
+
     public bool OnMenuBack() {
     public bool OnMenuBack() {
         if (!meUserInfo.ShowModalForSave()) {
         if (!meUserInfo.ShowModalForSave()) {
             ExcuteLogic_Destroy();
             ExcuteLogic_Destroy();

+ 238 - 4
Assets/HeartRateBand/Views/Me/HRB_MeView.prefab

@@ -1,5 +1,238 @@
 %YAML 1.1
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3294954663748591283
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4162881899410151045}
+  - component: {fileID: 7333881311768859135}
+  - component: {fileID: 6463759115210952166}
+  - component: {fileID: 7727477194330207009}
+  - component: {fileID: 4547492196850918071}
+  m_Layer: 5
+  m_Name: BtnQuitApp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4162881899410151045
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3294954663748591283}
+  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: 8444610166728372607}
+  m_Father: {fileID: 5848810120533036446}
+  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: -390, y: -262.8}
+  m_SizeDelta: {x: 250, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7333881311768859135
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3294954663748591283}
+  m_CullTransparentMesh: 1
+--- !u!114 &6463759115210952166
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3294954663748591283}
+  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: 0.533423, b: 0, 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: 0}
+  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 &7727477194330207009
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3294954663748591283}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b827f0b23585c0944ae9b30bea76d9ce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  borderRaduis: 25
+  borderRadiusSwitch:
+    LeftTop: 1
+    RightTop: 1
+    RightBottom: 1
+    LeftBottom: 1
+  borderWidth: 2
+  borderColor: {r: 0.98372006, g: 1, b: 0, a: 1}
+--- !u!114 &4547492196850918071
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3294954663748591283}
+  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: 6463759115210952166}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 5848810120533036442}
+        m_TargetAssemblyTypeName: HRB_MeView, Assembly-CSharp
+        m_MethodName: OnClick_QuitApp
+        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 &3715125139932334346
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8444610166728372607}
+  - component: {fileID: 4828233594491422636}
+  - component: {fileID: 8884282618716122407}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8444610166728372607
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3715125139932334346}
+  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: 4162881899410151045}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4828233594491422636
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3715125139932334346}
+  m_CullTransparentMesh: 1
+--- !u!114 &8884282618716122407
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3715125139932334346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9000\u51FAAPP"
 --- !u!1 &5848810118518228569
 --- !u!1 &5848810118518228569
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1198,7 +1431,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -390, y: -210}
+  m_AnchoredPosition: {x: -390, y: -156}
   m_SizeDelta: {x: 250, y: 80}
   m_SizeDelta: {x: 250, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5848810118900143764
 --- !u!222 &5848810118900143764
@@ -1447,7 +1680,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -391.16776, y: 44.814064}
+  m_AnchoredPosition: {x: -391.16776, y: 106}
   m_SizeDelta: {x: 210, y: 183}
   m_SizeDelta: {x: 210, y: 183}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5848810118990661453
 --- !u!222 &5848810118990661453
@@ -1675,7 +1908,7 @@ RectTransform:
   - {fileID: 5848810118518228568}
   - {fileID: 5848810118518228568}
   - {fileID: 5848810119719114329}
   - {fileID: 5848810119719114329}
   m_Father: {fileID: 5848810120533036446}
   m_Father: {fileID: 5848810120533036446}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1990,7 +2223,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -343.22708, y: -103.87136}
+  m_AnchoredPosition: {x: -343.22708, y: -42.68543}
   m_SizeDelta: {x: 291, y: 89}
   m_SizeDelta: {x: 291, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5848810119110711663
 --- !u!222 &5848810119110711663
@@ -6165,6 +6398,7 @@ RectTransform:
   - {fileID: 5848810119912744372}
   - {fileID: 5848810119912744372}
   - {fileID: 5848810120534130673}
   - {fileID: 5848810120534130673}
   - {fileID: 5848810118900143763}
   - {fileID: 5848810118900143763}
+  - {fileID: 4162881899410151045}
   - {fileID: 5848810119040330412}
   - {fileID: 5848810119040330412}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_RootOrder: 0