소스 검색

1.homeview and homeMgr

slambb 1 년 전
부모
커밋
7b75dfb421
2개의 변경된 파일179개의 추가작업 그리고 18개의 파일을 삭제
  1. 177 15
      Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/HomeView.prefab
  2. 2 3
      Assets/BowArrow/Scripts/Manager/HomeMgr.cs

+ 177 - 15
Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/HomeView.prefab

@@ -348,7 +348,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 24
+  m_RootOrder: 25
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -2277,7 +2277,7 @@ RectTransform:
   m_Children:
   - {fileID: 5619992489816659127}
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 17
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3888,7 +3888,7 @@ RectTransform:
   m_Children:
   - {fileID: 6664087260270305381}
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4179,7 +4179,7 @@ RectTransform:
   m_Children:
   - {fileID: 4053767362170825677}
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 22
+  m_RootOrder: 23
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5662,8 +5662,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 16.058823, y: -20}
-  m_SizeDelta: {x: 32.117645, y: 38}
+  m_AnchoredPosition: {x: 16, y: -20}
+  m_SizeDelta: {x: 32, y: 38}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5099759915330397004
 CanvasRenderer:
@@ -7751,7 +7751,7 @@ RectTransform:
   m_Children:
   - {fileID: 8896645203190509743}
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 21
+  m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -8271,7 +8271,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 23
+  m_RootOrder: 24
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -8346,7 +8346,7 @@ RectTransform:
   m_Children:
   - {fileID: 7722667448104509489}
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 20
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -8560,7 +8560,7 @@ RectTransform:
   m_Children:
   - {fileID: 5892914358186895724}
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 16
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9653,7 +9653,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2380280116642831893
 RectTransform:
   m_ObjectHideFlags: 0
@@ -9667,7 +9667,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -10148,6 +10148,7 @@ RectTransform:
   - {fileID: 6345266662986624358}
   - {fileID: 8493734455800086512}
   - {fileID: 6368579349687022705}
+  - {fileID: 8722856461091371234}
   - {fileID: 2380280116642831893}
   - {fileID: 8672759446345348335}
   - {fileID: 8585814553883140170}
@@ -10270,7 +10271,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 87584a66b237c3745895f24664bbf72a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  buttons: []
+  allButtons: []
 --- !u!114 &6029351975256609850
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10550,6 +10551,10 @@ MonoBehaviour:
     languageType: 1
     startGameType: 15
   - Name: "\u79FB\u52A8\u9776"
+    Icon: {fileID: 0}
+    textId: 
+    languageType: 0
+    startGameType: -1
   gameIndex: 0
 --- !u!114 &6767739428596938328
 MonoBehaviour:
@@ -11625,6 +11630,163 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7981140100506091011
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8722856461091371234}
+  - component: {fileID: 3282755956505999602}
+  - component: {fileID: 6390940592114866183}
+  - component: {fileID: 5007454218346560673}
+  - component: {fileID: 7532227491419067465}
+  m_Layer: 5
+  m_Name: IconSetUp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8722856461091371234
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7981140100506091011}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.3499999, y: 1.3499999, z: 1.3499999}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7022781866214807768}
+  m_RootOrder: 14
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -244.0249, y: -236.02502}
+  m_SizeDelta: {x: 123, y: 123}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3282755956505999602
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7981140100506091011}
+  m_CullTransparentMesh: 1
+--- !u!114 &6390940592114866183
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7981140100506091011}
+  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: bad5aa825ca93ce4c82c1aa10f50ecee, 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 &5007454218346560673
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7981140100506091011}
+  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: 2
+  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: 21300000, guid: f555516a7b7d7b94f9da68c41e81dc98, type: 3}
+    m_PressedSprite: {fileID: 21300000, guid: f555516a7b7d7b94f9da68c41e81dc98, type: 3}
+    m_SelectedSprite: {fileID: 21300000, guid: f555516a7b7d7b94f9da68c41e81dc98, type: 3}
+    m_DisabledSprite: {fileID: 21300000, guid: bad5aa825ca93ce4c82c1aa10f50ecee, type: 3}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6390940592114866183}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4900885815709082620}
+        m_TargetAssemblyTypeName: HomeView_BottomBarView, Assembly-CSharp
+        m_MethodName: GoToSetup
+        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 &7532227491419067465
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7981140100506091011}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 8722856461091371234}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 5007454218346560673}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8033537982446274309
 GameObject:
   m_ObjectHideFlags: 0
@@ -12725,7 +12887,7 @@ RectTransform:
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 15
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -12925,7 +13087,7 @@ RectTransform:
   m_Children:
   - {fileID: 1471586144269215773}
   m_Father: {fileID: 7022781866214807768}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

+ 2 - 3
Assets/BowArrow/Scripts/Manager/HomeMgr.cs

@@ -12,7 +12,7 @@ public class HomeMgr : MonoBehaviour
     {
         ins = this;
         PersistenHandler.Init();
-        ViewMgr.Instance.ShowView<TopBarView>();
+        //ViewMgr.Instance.ShowView<TopBarView>();
         ViewMgr.Instance.ShowView<HomeView>();
         //ViewMgr.Instance.ShowView<HomeFrameView>();
         Instantiate(SceneResourceManager.Instance.GetPrefab("DeviceBatteryView"));
@@ -42,10 +42,9 @@ public class HomeMgr : MonoBehaviour
         if (CommonConfig.StandaloneModeOrPlatformB)
         {
             DoTweenUtil.CallDelay(0.1f, () => new UserPlayer());
+            StandaloneAPI.InitTimeCounter();
         }
         else UserPlayer.ConnectServer();
-
-        StandaloneAPI.InitTimeCounter();
     }
 
     void OnDestroy()