diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
index e89e698e3f..42862b9f73 100644
--- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
@@ -1175,7 +1175,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7820087682555189779}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1377,80 +1377,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &223306834095126769
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4478008260165681538}
- - component: {fileID: 5324200053444124096}
- - component: {fileID: 8409009962017652164}
- m_Layer: 5
- m_Name: mask
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4478008260165681538
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 223306834095126769}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
- m_Children: []
- m_Father: {fileID: 4571423557191831031}
- 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: 384, y: 112}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5324200053444124096
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 223306834095126769}
- m_CullTransparentMesh: 0
---- !u!114 &8409009962017652164
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 223306834095126769}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 9282a727850779b4c982b7339b750be0, 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
--- !u!1 &230665814953277176
GameObject:
m_ObjectHideFlags: 0
@@ -1805,80 +1731,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 301642073522379586}
m_CullTransparentMesh: 0
---- !u!1 &333319612489355117
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5850354891024791658}
- - component: {fileID: 7252536312545506951}
- - component: {fileID: 1267721992337269535}
- m_Layer: 5
- m_Name: redPoint
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5850354891024791658
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 333319612489355117}
- 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: 4571423557191831031}
- m_RootOrder: 2
- 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: 151.33118, y: 40}
- m_SizeDelta: {x: 26, y: 26}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7252536312545506951
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 333319612489355117}
- m_CullTransparentMesh: 0
---- !u!114 &1267721992337269535
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 333319612489355117}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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
--- !u!1 &336460749731130647
GameObject:
m_ObjectHideFlags: 0
@@ -4622,6 +4474,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &746310646692417331
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3581356840615692410}
+ - component: {fileID: 844065912663238443}
+ - component: {fileID: 1592042576478935912}
+ m_Layer: 5
+ m_Name: Num
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3581356840615692410
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 746310646692417331}
+ 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: 2048247964116872586}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 58.1, y: -7.1000023}
+ m_SizeDelta: {x: 37.8, y: 49}
+ m_Pivot: {x: 0.49999988, y: 0.50000006}
+--- !u!222 &844065912663238443
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 746310646692417331}
+ m_CullTransparentMesh: 0
+--- !u!114 &1592042576478935912
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 746310646692417331}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.08627451, g: 0.121568635, b: 0.14901961, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 46
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: x200
--- !u!1 &756844839022187522
GameObject:
m_ObjectHideFlags: 0
@@ -5662,6 +5593,85 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "1\u7EA7"
LanguageIndex: 0
+--- !u!1 &845916926941535479
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7937634058444584631}
+ - component: {fileID: 836136713242876105}
+ - component: {fileID: 1091771149279677262}
+ m_Layer: 5
+ m_Name: Num
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7937634058444584631
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 845916926941535479}
+ 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: 6774716285007450803}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 214.8, y: -37.5}
+ m_SizeDelta: {x: 63, y: 49}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &836136713242876105
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 845916926941535479}
+ m_CullTransparentMesh: 0
+--- !u!114 &1091771149279677262
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 845916926941535479}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.08627451, g: 0.12156863, b: 0.14901961, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 46
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: x2000
--- !u!1 &879394900677192158
GameObject:
m_ObjectHideFlags: 0
@@ -7885,6 +7895,83 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!1 &1323328589686905693
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6774716285007450803}
+ - component: {fileID: 5479362912612369318}
+ - component: {fileID: 4201562861637486361}
+ m_Layer: 5
+ m_Name: Content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6774716285007450803
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1323328589686905693}
+ 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: 6301509842926614696}
+ - {fileID: 5835774782347319676}
+ - {fileID: 7937634058444584631}
+ m_Father: {fileID: 4133758476626075042}
+ 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.0000000059881, y: 4.25}
+ m_SizeDelta: {x: 267, y: 75}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5479362912612369318
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1323328589686905693}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 1
+ m_ChildControlHeight: 1
+--- !u!114 &4201562861637486361
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1323328589686905693}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 2
+ m_VerticalFit: 2
--- !u!1 &1349637953966417863
GameObject:
m_ObjectHideFlags: 0
@@ -9209,6 +9296,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &1514346918316570373
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5835774782347319676}
+ - component: {fileID: 9159237173304375831}
+ - component: {fileID: 5091142378722167765}
+ - component: {fileID: 7350842419650130542}
+ m_Layer: 5
+ m_Name: Icon
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5835774782347319676
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1514346918316570373}
+ 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: 6774716285007450803}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 133.5, y: -39.2}
+ m_SizeDelta: {x: 80, y: 80}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9159237173304375831
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1514346918316570373}
+ m_CullTransparentMesh: 0
+--- !u!114 &5091142378722167765
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1514346918316570373}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 5e0fcfbe0e93ce5499edaf50f73ac9fb, 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
+--- !u!114 &7350842419650130542
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1514346918316570373}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 0
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: 75
+ m_PreferredHeight: 75
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
--- !u!1 &1519642980827618702
GameObject:
m_ObjectHideFlags: 0
@@ -9427,7 +9609,7 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1575504838305710442
+--- !u!1 &1575215899841287663
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -9435,77 +9617,72 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 4072063689803119738}
- - component: {fileID: 1896946325596543184}
- - component: {fileID: 6378696058148602306}
+ - component: {fileID: 2125961562245441223}
+ - component: {fileID: 2033904573397657131}
+ - component: {fileID: 7927690761564205991}
m_Layer: 5
- m_Name: num
+ m_Name: Bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &4072063689803119738
+--- !u!224 &2125961562245441223
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1575504838305710442}
+ m_GameObject: {fileID: 1575215899841287663}
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_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
m_Children: []
- m_Father: {fileID: 8332916289982393833}
- m_RootOrder: 2
+ m_Father: {fileID: 670856768907097295}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 3.0235, y: -8.1266}
+ m_SizeDelta: {x: 317.71, y: 109.18}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1896946325596543184
+--- !u!222 &2033904573397657131
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1575504838305710442}
+ m_GameObject: {fileID: 1575215899841287663}
m_CullTransparentMesh: 0
---- !u!114 &6378696058148602306
+--- !u!114 &7927690761564205991
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1575504838305710442}
+ m_GameObject: {fileID: 1575215899841287663}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1}
- m_RaycastTarget: 0
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_FontData:
- m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 43
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 48
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\xD71"
+ m_Sprite: {fileID: 21300000, guid: 7c3a0437ae0a0ea4a85275c9a27bf73f, 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
--- !u!1 &1589407182218801186
GameObject:
m_ObjectHideFlags: 0
@@ -10380,6 +10557,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &1715297042128999927
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3051787913818944100}
+ - component: {fileID: 4439210250111863642}
+ - component: {fileID: 2492229112783153672}
+ m_Layer: 5
+ m_Name: Bg
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3051787913818944100
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1715297042128999927}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
+ m_Children: []
+ m_Father: {fileID: 4133758476626075042}
+ 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: 1.65, y: 1.25}
+ m_SizeDelta: {x: 314.17, y: 87.31}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4439210250111863642
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1715297042128999927}
+ m_CullTransparentMesh: 0
+--- !u!114 &2492229112783153672
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1715297042128999927}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, 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
--- !u!1 &1738905922342526200
GameObject:
m_ObjectHideFlags: 0
@@ -12647,7 +12898,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1102990033159115824
RectTransform:
m_ObjectHideFlags: 0
@@ -12661,10 +12912,9 @@ RectTransform:
m_Children:
- {fileID: 7820087682555189779}
- {fileID: 4299951856526574867}
- - {fileID: 7654645561292062922}
- - {fileID: 6327688729907635040}
- - {fileID: 6029003134468890357}
- - {fileID: 2988009206387614546}
+ - {fileID: 8798056771769622754}
+ - {fileID: 5672307998101951523}
+ - {fileID: 5083263184234040354}
- {fileID: 6217694533676830852}
m_Father: {fileID: 6860498336681067139}
m_RootOrder: 10
@@ -14523,116 +14773,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &2307269914716158935
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4571423557191831031}
- - component: {fileID: 3802736511896570233}
- - component: {fileID: 1073262735948443867}
- - component: {fileID: 1898759915055520038}
- m_Layer: 5
- m_Name: ten
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4571423557191831031
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2307269914716158935}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
- m_Children:
- - {fileID: 4478008260165681538}
- - {fileID: 1843860983756475744}
- - {fileID: 5850354891024791658}
- m_Father: {fileID: 6029003134468890357}
- 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: -260, y: 0}
- m_SizeDelta: {x: 384, y: 112}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3802736511896570233
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2307269914716158935}
- m_CullTransparentMesh: 0
---- !u!114 &1073262735948443867
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2307269914716158935}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 3
- 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_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_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 0}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
---- !u!95 &1898759915055520038
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2307269914716158935}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &2310027506893991378
GameObject:
m_ObjectHideFlags: 0
@@ -14931,83 +15071,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &2388577494584704618
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1843860983756475744}
- - component: {fileID: 2764928169698246858}
- - component: {fileID: 4954268442850863059}
- m_Layer: 5
- m_Name: layout
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1843860983756475744
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2388577494584704618}
- 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: 4152648186854187102}
- - {fileID: 1917553076554599621}
- - {fileID: 944149024977186077}
- m_Father: {fileID: 4571423557191831031}
- 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: 7.2}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2764928169698246858
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2388577494584704618}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 4
- m_Spacing: 0
- m_ChildForceExpandWidth: 1
- m_ChildForceExpandHeight: 0
- m_ChildControlWidth: 1
- m_ChildControlHeight: 1
---- !u!114 &4954268442850863059
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2388577494584704618}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 2
- m_VerticalFit: 2
--- !u!1 &2407185892528601439
GameObject:
m_ObjectHideFlags: 0
@@ -25745,12 +25808,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1102990033159115824}
- m_RootOrder: 2
+ m_Father: {fileID: 5672307998101951523}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 1}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -85.11011, y: -231.19531}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 120}
m_SizeDelta: {x: 127, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3656323073567497059
@@ -27149,80 +27212,6 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "1\u6B21"
LanguageIndex: 11457
---- !u!1 &3689270041995916550
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5807637057237364106}
- - component: {fileID: 130002130591402245}
- - component: {fileID: 3100288909090841537}
- m_Layer: 5
- m_Name: mask
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5807637057237364106
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3689270041995916550}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
- m_Children: []
- m_Father: {fileID: 2119490655848828779}
- 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: 384, y: 112}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &130002130591402245
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3689270041995916550}
- m_CullTransparentMesh: 0
---- !u!114 &3100288909090841537
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3689270041995916550}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 7c3a0437ae0a0ea4a85275c9a27bf73f, 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
--- !u!1 &3719902728092931357
GameObject:
m_ObjectHideFlags: 0
@@ -27494,86 +27483,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &3746676860351355877
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4152648186854187102}
- - component: {fileID: 8309405828231293231}
- - component: {fileID: 7963635707896186405}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4152648186854187102
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3746676860351355877}
- 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: 1843860983756475744}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8309405828231293231
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3746676860351355877}
- m_CullTransparentMesh: 0
---- !u!114 &7963635707896186405
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3746676860351355877}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_FontData:
- m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 43
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 48
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "10\u8FDE\u53EC\u5524"
- LanguageIndex: 11457
--- !u!1 &3819583024297131976
GameObject:
m_ObjectHideFlags: 0
@@ -27682,6 +27591,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!1 &3823185015480066840
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7981025302346265881}
+ - component: {fileID: 7600453379190723520}
+ - component: {fileID: 3047712864938620633}
+ m_Layer: 5
+ m_Name: RedPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7981025302346265881
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3823185015480066840}
+ 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: 670856768907097295}
+ m_RootOrder: 2
+ 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: 125.33, y: 28.75}
+ m_SizeDelta: {x: 26, y: 26}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7600453379190723520
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3823185015480066840}
+ m_CullTransparentMesh: 0
+--- !u!114 &3047712864938620633
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3823185015480066840}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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
--- !u!1 &3838117883538887705
GameObject:
m_ObjectHideFlags: 0
@@ -27711,12 +27694,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1102990033159115824}
- m_RootOrder: 5
+ m_Father: {fileID: 5083263184234040354}
+ 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: -718}
+ m_AnchoredPosition: {x: 0, y: -63}
m_SizeDelta: {x: 488.20996, y: 56.54004}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7809405074636033283
@@ -28039,86 +28022,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &3885802456286512714
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 803824314760929640}
- - component: {fileID: 5454325271541831365}
- - component: {fileID: 2175953464254154346}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &803824314760929640
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3885802456286512714}
- 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: 8332916289982393833}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5454325271541831365
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3885802456286512714}
- m_CullTransparentMesh: 0
---- !u!114 &2175953464254154346
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3885802456286512714}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_FontData:
- m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 43
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 52
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "1\u6B21\u53EC\u5524"
- LanguageIndex: 11457
--- !u!1 &3901118890473333735
GameObject:
m_ObjectHideFlags: 0
@@ -29254,6 +29157,102 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &4035214789080839966
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2742580743904864915}
+ - component: {fileID: 2901106328140445380}
+ - component: {fileID: 7706389928270472496}
+ - component: {fileID: 121564649761857600}
+ m_Layer: 5
+ m_Name: Tip2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2742580743904864915
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4035214789080839966}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
+ m_Children: []
+ m_Father: {fileID: 5083263184234040354}
+ m_RootOrder: 3
+ 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: 444}
+ m_SizeDelta: {x: 202.9, y: 25.97}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2901106328140445380
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4035214789080839966}
+ m_CullTransparentMesh: 0
+--- !u!114 &7706389928270472496
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4035214789080839966}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.9960785, g: 0.8078432, b: 0.5647059, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 45
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 45
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u5269\u4F5999\u6B21\u5FC5\u51FA\u7075\u517D\xB7\u51E4\u51F0"
+ LanguageIndex: 11485
+--- !u!114 &121564649761857600
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4035214789080839966}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &4045286101417021864
GameObject:
m_ObjectHideFlags: 0
@@ -31819,6 +31818,116 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u9650\u5B9A\u62DB\u52DF\u671F\u95F4\u8FBE\u5230\u6307\u5B9A\u62DB\u52DF\u6B21\u6570\u53EF\u83B7\u5F97\u5BF9\u5E94\u5956\u52B1"
+--- !u!1 &4372978542805741078
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4133758476626075042}
+ - component: {fileID: 1289399845235602855}
+ - component: {fileID: 3304079858092443828}
+ - component: {fileID: 4377175319022459135}
+ m_Layer: 5
+ m_Name: Btn10
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4133758476626075042
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4372978542805741078}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
+ m_Children:
+ - {fileID: 3051787913818944100}
+ - {fileID: 6774716285007450803}
+ - {fileID: 3803973092024636774}
+ m_Father: {fileID: 6029003134468890357}
+ 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: 260, y: 0}
+ m_SizeDelta: {x: 301.1, y: 89.79}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1289399845235602855
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4372978542805741078}
+ m_CullTransparentMesh: 0
+--- !u!114 &3304079858092443828
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4372978542805741078}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 3
+ 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 0}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!95 &4377175319022459135
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4372978542805741078}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &4375663773828899833
GameObject:
m_ObjectHideFlags: 0
@@ -32086,7 +32195,7 @@ RectTransform:
m_AnchoredPosition: {x: -1680, y: 145.09998}
m_SizeDelta: {x: 1080, y: 192.67}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &4435059751484180836
+--- !u!1 &4435177589503216349
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -32094,54 +32203,54 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 2119490655848828779}
- - component: {fileID: 4614453867466762196}
- - component: {fileID: 4647602466990529762}
- - component: {fileID: 6385735289079290537}
+ - component: {fileID: 670856768907097295}
+ - component: {fileID: 1683694499669460270}
+ - component: {fileID: 6938456948631400671}
+ - component: {fileID: 3052773737174285146}
m_Layer: 5
- m_Name: once
+ m_Name: Btn1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &2119490655848828779
+--- !u!224 &670856768907097295
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4435059751484180836}
+ m_GameObject: {fileID: 4435177589503216349}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
m_Children:
- - {fileID: 5807637057237364106}
- - {fileID: 8332916289982393833}
- - {fileID: 3913246315274521616}
+ - {fileID: 2125961562245441223}
+ - {fileID: 2048247964116872586}
+ - {fileID: 7981025302346265881}
m_Father: {fileID: 6029003134468890357}
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: 260, y: 0}
- m_SizeDelta: {x: 384, y: 112}
+ m_AnchoredPosition: {x: -260, y: 0}
+ m_SizeDelta: {x: 311.6, y: 92.9}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4614453867466762196
+--- !u!222 &1683694499669460270
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4435059751484180836}
+ m_GameObject: {fileID: 4435177589503216349}
m_CullTransparentMesh: 0
---- !u!114 &4647602466990529762
+--- !u!114 &6938456948631400671
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4435059751484180836}
+ m_GameObject: {fileID: 4435177589503216349}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -32177,14 +32286,14 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
---- !u!95 &6385735289079290537
+--- !u!95 &3052773737174285146
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4435059751484180836}
+ m_GameObject: {fileID: 4435177589503216349}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
@@ -34316,6 +34425,143 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &4705774923301357433
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7178888919267453926}
+ - component: {fileID: 8735702632700926291}
+ - component: {fileID: 6528342043406989137}
+ - component: {fileID: 6306917170388287394}
+ - component: {fileID: 5792932488997600202}
+ m_Layer: 5
+ m_Name: change
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7178888919267453926
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4705774923301357433}
+ 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: 5672307998101951523}
+ m_RootOrder: 2
+ 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: -179}
+ m_SizeDelta: {x: 123, y: 123}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8735702632700926291
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4705774923301357433}
+ m_CullTransparentMesh: 0
+--- !u!114 &6528342043406989137
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4705774923301357433}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 54b6493f792933a409d6f5e155b6db3c, 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
+--- !u!114 &6306917170388287394
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4705774923301357433}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 3
+ 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 6528342043406989137}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!95 &5792932488997600202
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4705774923301357433}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &4727898780272651682
GameObject:
m_ObjectHideFlags: 0
@@ -35961,7 +36207,7 @@ GameObject:
- component: {fileID: 9020044576581666551}
- component: {fileID: 675905033719272940}
m_Layer: 5
- m_Name: monster
+ m_Name: aniRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -35979,7 +36225,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2616583529260305035}
- m_Father: {fileID: 7820087682555189779}
+ m_Father: {fileID: 1102990033159115824}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -36438,101 +36684,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &5000241224883463540
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1917553076554599621}
- - component: {fileID: 7717994111459545106}
- - component: {fileID: 5682016745976213914}
- - component: {fileID: 145215246791586541}
- m_Layer: 5
- m_Name: icon
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1917553076554599621
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5000241224883463540}
- 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: 1843860983756475744}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7717994111459545106
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5000241224883463540}
- m_CullTransparentMesh: 0
---- !u!114 &5682016745976213914
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5000241224883463540}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 5e0fcfbe0e93ce5499edaf50f73ac9fb, 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
---- !u!114 &145215246791586541
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5000241224883463540}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IgnoreLayout: 0
- m_MinWidth: -1
- m_MinHeight: -1
- m_PreferredWidth: 75
- m_PreferredHeight: 75
- m_FlexibleWidth: -1
- m_FlexibleHeight: -1
- m_LayoutPriority: 1
--- !u!1 &5023660598496389228
GameObject:
m_ObjectHideFlags: 0
@@ -43791,6 +43942,86 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &5503697118361919903
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3181389166672040123}
+ - component: {fileID: 2818330198976214087}
+ - component: {fileID: 6449496406754255820}
+ m_Layer: 5
+ m_Name: Info
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3181389166672040123
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5503697118361919903}
+ 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: 2048247964116872586}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: -69, y: -7.1000023}
+ m_SizeDelta: {x: 70, y: 55}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2818330198976214087
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5503697118361919903}
+ m_CullTransparentMesh: 0
+--- !u!114 &6449496406754255820
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5503697118361919903}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.09411766, g: 0.1254902, b: 0.16078432, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 46
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "1\u6B21"
+ LanguageIndex: 11457
--- !u!1 &5509575088230043484
GameObject:
m_ObjectHideFlags: 0
@@ -49562,6 +49793,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &6342793023785009843
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3803973092024636774}
+ - component: {fileID: 2067091174228286660}
+ - component: {fileID: 8178532289753054821}
+ m_Layer: 5
+ m_Name: RedPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3803973092024636774
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6342793023785009843}
+ 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: 4133758476626075042}
+ m_RootOrder: 2
+ 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: 127.9, y: 33.7}
+ m_SizeDelta: {x: 26, y: 26}
+ m_Pivot: {x: 0.49999765, y: 0.5}
+--- !u!222 &2067091174228286660
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6342793023785009843}
+ m_CullTransparentMesh: 0
+--- !u!114 &8178532289753054821
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6342793023785009843}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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
--- !u!1 &6344923951847583693
GameObject:
m_ObjectHideFlags: 0
@@ -49862,83 +50167,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &6391290895244209862
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8332916289982393833}
- - component: {fileID: 353377531799478970}
- - component: {fileID: 9101481904554825623}
- m_Layer: 5
- m_Name: layout
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8332916289982393833
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6391290895244209862}
- 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: 803824314760929640}
- - {fileID: 4416694001403996958}
- - {fileID: 4072063689803119738}
- m_Father: {fileID: 2119490655848828779}
- 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: 7.2}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &353377531799478970
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6391290895244209862}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 4
- m_Spacing: 0
- m_ChildForceExpandWidth: 1
- m_ChildForceExpandHeight: 0
- m_ChildControlWidth: 1
- m_ChildControlHeight: 1
---- !u!114 &9101481904554825623
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6391290895244209862}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 2
- m_VerticalFit: 2
--- !u!1 &6397979664467674157
GameObject:
m_ObjectHideFlags: 0
@@ -53773,6 +54001,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &7071636652529420702
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3333085713275439436}
+ - component: {fileID: 534658846167101161}
+ - component: {fileID: 7842454962106939331}
+ - component: {fileID: 8916782195011766161}
+ m_Layer: 5
+ m_Name: Icon
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3333085713275439436
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7071636652529420702}
+ 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: 2048247964116872586}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: -0.00000047684, y: -7.1}
+ m_SizeDelta: {x: 90, y: 90}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &534658846167101161
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7071636652529420702}
+ m_CullTransparentMesh: 0
+--- !u!114 &7842454962106939331
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7071636652529420702}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 5e0fcfbe0e93ce5499edaf50f73ac9fb, 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
+--- !u!114 &8916782195011766161
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7071636652529420702}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 0
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: 75
+ m_PreferredHeight: 75
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
--- !u!223 &3258687200946143067
Canvas:
m_ObjectHideFlags: 0
@@ -54113,101 +54436,6 @@ MonoBehaviour:
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &7092610647386683576
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4416694001403996958}
- - component: {fileID: 4155324691880207743}
- - component: {fileID: 9060157155314917404}
- - component: {fileID: 9217279999572877260}
- m_Layer: 5
- m_Name: icon
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4416694001403996958
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7092610647386683576}
- 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: 8332916289982393833}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4155324691880207743
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7092610647386683576}
- m_CullTransparentMesh: 0
---- !u!114 &9060157155314917404
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7092610647386683576}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 5e0fcfbe0e93ce5499edaf50f73ac9fb, 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
---- !u!114 &9217279999572877260
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7092610647386683576}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IgnoreLayout: 0
- m_MinWidth: -1
- m_MinHeight: -1
- m_PreferredWidth: 75
- m_PreferredHeight: 75
- m_FlexibleWidth: -1
- m_FlexibleHeight: -1
- m_LayoutPriority: 1
--- !u!1 &7093570845949115162
GameObject:
m_ObjectHideFlags: 0
@@ -54920,80 +55148,6 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
---- !u!1 &7207938228946261353
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3913246315274521616}
- - component: {fileID: 412106396825973462}
- - component: {fileID: 7192805951630266689}
- m_Layer: 5
- m_Name: redPoint
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &3913246315274521616
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7207938228946261353}
- 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: 2119490655848828779}
- m_RootOrder: 2
- 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: 150, y: 40}
- m_SizeDelta: {x: 26, y: 26}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &412106396825973462
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7207938228946261353}
- m_CullTransparentMesh: 0
---- !u!114 &7192805951630266689
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7207938228946261353}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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
--- !u!1 &7214070656843295783
GameObject:
m_ObjectHideFlags: 0
@@ -56549,6 +56703,83 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 170}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7444316994232745377
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2048247964116872586}
+ - component: {fileID: 4825713766061528209}
+ - component: {fileID: 5146492929351632727}
+ m_Layer: 5
+ m_Name: Content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2048247964116872586
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7444316994232745377}
+ 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: 3181389166672040123}
+ - {fileID: 3333085713275439436}
+ - {fileID: 3581356840615692410}
+ m_Father: {fileID: 670856768907097295}
+ 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.0000000059881, y: 4.25}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4825713766061528209
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7444316994232745377}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 1
+ m_ChildControlHeight: 1
+--- !u!114 &5146492929351632727
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7444316994232745377}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 2
+ m_VerticalFit: 2
--- !u!1 &7445982136704058740
GameObject:
m_ObjectHideFlags: 0
@@ -59770,7 +60001,7 @@ RectTransform:
- {fileID: 691354302362489517}
- {fileID: 6978097845207285815}
m_Father: {fileID: 1102990033159115824}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -61965,6 +62196,102 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &8110999055358478380
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7671617782805025223}
+ - component: {fileID: 5529415003011331765}
+ - component: {fileID: 9001682002276628389}
+ - component: {fileID: 2397932095206695178}
+ m_Layer: 5
+ m_Name: Tip1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7671617782805025223
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8110999055358478380}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
+ m_Children: []
+ m_Father: {fileID: 5083263184234040354}
+ m_RootOrder: 2
+ 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: -260, y: 121.18608}
+ m_SizeDelta: {x: 202.9, y: 25.97}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5529415003011331765
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8110999055358478380}
+ m_CullTransparentMesh: 0
+--- !u!114 &9001682002276628389
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8110999055358478380}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.9811321, g: 0.97976804, b: 0.9765041, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "17:20:01\u540E\u5237\u65B0"
+ LanguageIndex: 11485
+--- !u!114 &2397932095206695178
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8110999055358478380}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &8114478389259479652
GameObject:
m_ObjectHideFlags: 0
@@ -63225,13 +63552,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1102990033159115824}
- m_RootOrder: 3
+ m_Father: {fileID: 5672307998101951523}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 1}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -85.11011, y: -374.79492}
- m_SizeDelta: {x: 129, y: 126}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: -33}
+ m_SizeDelta: {x: 123, y: 123}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3777901507376591240
CanvasRenderer:
@@ -63261,7 +63588,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 9d43d721334e65441a2c6faad14bfdc2, type: 3}
+ m_Sprite: {fileID: 21300000, guid: add5a59d72c6133408a05f83c3cec2af, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -64527,6 +64854,86 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 37}
m_SizeDelta: {x: 0, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8443774241881000479
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6301509842926614696}
+ - component: {fileID: 4580945292215027047}
+ - component: {fileID: 2407368602517036416}
+ m_Layer: 5
+ m_Name: Info
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6301509842926614696
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8443774241881000479}
+ 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: 6774716285007450803}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 56.4, y: -39.2}
+ m_SizeDelta: {x: 129, y: 42}
+ m_Pivot: {x: 0.5000001, y: 0.49999842}
+--- !u!222 &4580945292215027047
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8443774241881000479}
+ m_CullTransparentMesh: 0
+--- !u!114 &2407368602517036416
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8443774241881000479}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.08627451, g: 0.12156863, b: 0.14901961, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 46
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "10\u6B21"
+ LanguageIndex: 11457
--- !u!1 &8452638437605458746
GameObject:
m_ObjectHideFlags: 0
@@ -66613,6 +67020,45 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &8782849852338682950
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5083263184234040354}
+ m_Layer: 5
+ m_Name: bottom
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5083263184234040354
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8782849852338682950}
+ 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: 6029003134468890357}
+ - {fileID: 2988009206387614546}
+ - {fileID: 7671617782805025223}
+ - {fileID: 2742580743904864915}
+ m_Father: {fileID: 1102990033159115824}
+ m_RootOrder: 4
+ 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: 0, y: -655}
+ m_SizeDelta: {x: 0, y: 300}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8813840576614181867
GameObject:
m_ObjectHideFlags: 0
@@ -66681,7 +67127,6 @@ RectTransform:
m_Children:
- {fileID: 6210777772170699947}
- {fileID: 2714658210011787203}
- - {fileID: 8798056771769622754}
- {fileID: 7897760998384322390}
m_Father: {fileID: 1102990033159115824}
m_RootOrder: 0
@@ -66876,85 +67321,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &8834462982550784238
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 944149024977186077}
- - component: {fileID: 1761921355166249403}
- - component: {fileID: 8055456676863938762}
- m_Layer: 5
- m_Name: num
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &944149024977186077
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8834462982550784238}
- 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: 1843860983756475744}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1761921355166249403
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8834462982550784238}
- m_CullTransparentMesh: 0
---- !u!114 &8055456676863938762
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8834462982550784238}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_FontData:
- m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 43
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 48
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\xD710"
--- !u!1 &8865336046665327622
GameObject:
m_ObjectHideFlags: 0
@@ -67788,18 +68154,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8985890005689783377}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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: 2119490655848828779}
- - {fileID: 4571423557191831031}
- m_Father: {fileID: 1102990033159115824}
- m_RootOrder: 4
+ - {fileID: 670856768907097295}
+ - {fileID: 4133758476626075042}
+ m_Father: {fileID: 5083263184234040354}
+ 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: -600}
+ m_AnchoredPosition: {x: 0, y: 55}
m_SizeDelta: {x: 900, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8999291761026026472
@@ -68824,6 +69190,44 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &9119027925578777076
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5672307998101951523}
+ m_Layer: 5
+ m_Name: rightUp
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5672307998101951523
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9119027925578777076}
+ 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: 7654645561292062922}
+ - {fileID: 6327688729907635040}
+ - {fileID: 7178888919267453926}
+ m_Father: {fileID: 1102990033159115824}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0.5}
+ m_AnchorMax: {x: 1, y: 0.5}
+ m_AnchoredPosition: {x: -100, y: 603}
+ m_SizeDelta: {x: 150, y: 400}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9124980537691706210
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index bc6271eb66..3e6f78dac3 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -1074,6 +1074,8 @@ ActivityTypeDef = {
EightDayGift = 56,--八日登陆
SignInfo = 57,--三日七日签到
Celebration = 60,--主题活动 社稷大典
+ ShenYiTianJiang = 71, --神衣天降
+ LingShouBaoGe = 100,--灵兽宝阁
--主题活动
FindFairy=43,--限时招募
@@ -1086,7 +1088,6 @@ ActivityTypeDef = {
TreasureStore = 6000,--百宝商会
YiJingBaoKu = 8000,--易经宝库
- ShenYiTianJiang = 71, --神衣天降
}
--活动结束需要处理面板关闭类型
diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua
index d08b97e95f..7945ab520b 100644
--- a/Assets/ManagedResources/~Lua/Data/UIData.lua
+++ b/Assets/ManagedResources/~Lua/Data/UIData.lua
@@ -355,6 +355,8 @@ UIName = {
PokemonSingleResultPanel=354,--灵兽
GeneralRewardPopup = 355,--通用奖励领取弹窗
GeneralBigPopup = 357,--通用大弹窗界面
+ LingShouBaoGeOneResultPanel = 358,--灵兽宝阁单抽
+ LingShouBaoGeTenResultPanel = 359,--灵兽宝阁十抽
}
SubUIConfig = {
diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
index 63014584d5..56829a7f9d 100644
--- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
+++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
@@ -3,17 +3,25 @@ local this = LingShouBaoGe
local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
+local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
+local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
+local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local activityId = 0
local singleRecruit = nil
local tenRecruit = nil
local sortingOrder = 0
local parent
+local freeTime= 0 --免费抽取次数
+
+local ActData=nil
--按钮类型
local bType={
Btn1=1,
Btn10=2
}
+--type与lotterySetting表中的id对应
+local btns={ [bType.Btn1]={name="Btn1",isInfo="1次"}, [bType.Btn10]={name="Btn10",isInfo="10次"}}
function LingShouBaoGe:ctor(mainPanel, gameObject)
this.mainPanel = mainPanel
@@ -26,13 +34,18 @@ function LingShouBaoGe:InitComponent(gameObject)
this.helpBtn = Util.GetGameObject(this.gameObject,"help")
this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition
- this.priview = Util.GetGameObject(this.gameObject,"priview")
- this.detailBtn = Util.GetGameObject(this.gameObject,"detailBtn")
+ this.preview = Util.GetGameObject(this.gameObject,"rightUp/preview")
+ this.change = Util.GetGameObject(this.gameObject,"rightUp/change")
+ this.detailBtn = Util.GetGameObject(this.gameObject,"rightUp/detailBtn")
- this.upper=Util.GetGameObject(this.gameObject,"times"):GetComponent("Text") ---召唤上限
+ this.upper=Util.GetGameObject(this.gameObject,"bottom/times"):GetComponent("Text") ---召唤上限
+ this.tip1=Util.GetGameObject(this.gameObject,"bottom/Tip1"):GetComponent("Text") ---刷新时间
+ this.tip2=Util.GetGameObject(this.gameObject,"bottom/Tip2"):GetComponent("Text") ---必出
+ this.btnGroup=Util.GetGameObject(this.gameObject,"bottom/btngroup")
this.detail= Util.GetGameObject(this.gameObject, "detail")
this.detail.gameObject:SetActive(false)
+
end
function LingShouBaoGe:BindEvent()
@@ -41,20 +54,25 @@ function LingShouBaoGe:BindEvent()
LogYellow("帮助按钮")
-- UIManager.OpenPanel(UIName.HelpPopup,activityType[activityId].helptype,this.helpPosition.x,this.helpPosition.y)
end)
- -- Util.AddClick(this.detailBtn, function()
- -- ActivityDetail.new(this.detail,3)
- -- end)
+ Util.AddClick(this.detailBtn, function()
+ LogYellow("查看详情")
+ -- ActivityDetail.new(this.detail,3)
+ end)
+ Util.AddClick(this.change, function()
+ LogYellow("更改灵兽")
+ end)
- -- Util.AddClick(this.preview, function()
- -- local fb = ConfigManager.GetConfigData(ConfigName.FakeBattle, 1001)
- -- local testFightData = {
- -- fightData = loadstring("return "..fb.FightData)(),
- -- fightSeed = fb.TimeSeed,
- -- fightType = 0,
- -- maxRound = 20
- -- }
- -- UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test)
- -- end)
+ Util.AddClick(this.preview, function()
+ -- local fb = ConfigManager.GetConfigData(ConfigName.FakeBattle, 1001)
+ -- local testFightData = {
+ -- fightData = loadstring("return "..fb.FightData)(),
+ -- fightSeed = fb.TimeSeed,
+ -- fightType = 0,
+ -- maxRound = 20
+ -- }
+ -- UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test)
+ LogYellow("假战斗")
+ end)
end
function LingShouBaoGe:OnShow(_sortingOrder,_parent)
@@ -62,116 +80,120 @@ function LingShouBaoGe:OnShow(_sortingOrder,_parent)
sortingOrder = _sortingOrder
this.gameObject:SetActive(true)
- activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
+ this:Refresh()
+end
+
+function LingShouBaoGe:Refresh()
+ ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LingShouBaoGe)
+ activityId = ActData.activityId
+ LogYellow("activityId:"..activityId)
local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId)
singleRecruit = array[1]
tenRecruit = array[2]
-
+
this:refreshBtnShow()--刷新按钮显示
-
- this:timeCountDown()--时间
+ this:TimeCountDown()--时间
end
-function LingShouBaoGe:RefreshNextLevelReward()
- local curLvstate = 0
- local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
- local curTimes = 0
- local data1 = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId) --通过活动id获取阶段任务
- local rewarditem
- for n,m in ipairs(data1) do
- curTimes,curLvstate = this:GetMissionStateById(m.Id,activityId)
- if(curTimes>=m.Values[1][1]) then
- if curLvstate==0 then
- curLvstate=0
- curLv=m.Id
- rewarditem=m
- break
- end
- else
- curLvstate=2
- curLv=m.Id
- rewarditem=m
- break
- end
- end
- --所有任务都已完成
- if not rewarditem then
- curLvstate = -1
- rewarditem = data1[#data1]
- curLv=data1[#data1].Id
- end
- OperatingManager.TimeLimitedTimes = curTimes
- if not itemView then
- itemView= SubUIManager.Open(SubUIConfig.ItemView,this.nextReward.transform)
- end
- itemView:OnOpen(false, {rewarditem.Reward[1][1],rewarditem.Reward[1][2]}, 0.73, false)
- itemView.gameObject:SetActive(true)
- Util.GetGameObject(itemView.gameObject,"item/frame"):GetComponent("Button").enabled=false
- if (curLvstate==0) then
- -- this.slider.gameObject:SetActive(false)\
- local temp = curTimes <= rewarditem.Values[1][1] and curTimes or rewarditem.Values[1][1]
- Util.GetGameObject(this.slider.gameObject,"Text"):GetComponent("Text").text=temp.."/"..rewarditem.Values[1][1]
- this.slider.value=temp /rewarditem.Values[1][1]
- local vec=this.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D
- vec.y=22.4
- this.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D=vec
- this.sliderText.text=Language[12183]
- this.sliderText.fontSize=26
- Util.AddOnceClick(this.getBtn,function()
- NetManager.GetActivityRewardRequest(curLv, activityId,
- function(respond)
- UIManager.OpenPanel(UIName.RewardItemPopup, respond, 1)
- this:RefreshNextLevelReward()
- this:RefreshGetHeroTimes()
- end)
- end)
- this.effect.gameObject:SetActive(true)
- elseif (curLvstate==-1) then
- this.slider.value=1
- Util.GetGameObject(this.slider.gameObject,"Text"):GetComponent("Text").text="300/300"
- this.sliderText.text=Language[12322]
- Util.AddOnceClick(this.getBtn,function()
- RewardPreview.new(this.reward)
- end)
- else
- this.slider.gameObject:SetActive(true)
- Util.GetGameObject(this.slider.gameObject,"Text"):GetComponent("Text").text=curTimes.."/"..rewarditem.Values[1][1]
- local vec=this.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D
- vec.y=22.4
- this.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D = vec
- this.sliderText.text=Language[12184]..curTimes.."/"..rewarditem.Values[1][1]
- this.sliderText.fontSize=26
- this.slider.value=curTimes/rewarditem.Values[1][1]
- this.effect.gameObject:SetActive(false)
- Util.AddOnceClick(this.getBtn,function()
- RewardPreview.new(this.reward)
- end)
- end
+function LingShouBaoGe:refreshBtnShow()
+ --下方的数量显示
+ local maxtimesId=lotterySetting[singleRecruit.Id].MaxTimes
+ local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
+ this.upper.text = Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--召唤上限
+ -- LogYellow("singleRecruit.Id:"..singleRecruit.Id)
+ -- LogYellow("lotterySetting[singleRecruit.Id].DiamondBoxContain[2]"..(lotterySetting[singleRecruit.Id].DiamondBoxContain[1][2]).." ActData.value"..ActData.value)
+ local leftTime = lotterySetting[singleRecruit.Id].DiamondBoxContain[1][2] - ActData.value
+ this.tip2.text = Language[11480]..""..leftTime.."次必出"
+
+ --是否是免费抽
+ local freeTimesId=lotterySetting[singleRecruit.Id].FreeTimes
+ if freeTimesId > 0 then
+ freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
+ RecruitManager.freeUseTimeList[freeTimesId] = freeTime
+ end
+ LogYellow("freeTimesId:"..freeTimesId.." freeTime:"..freeTime.." curTimes:"..curTimes.." 上限:"..privilegeConfig[maxtimesId].Condition[1][2])
- local reMaintimes = info.value
- --LogBlue("reMaintimes:"..reMaintimes)
- --LogGreen("singleRecruit.MergePool:"..singleRecruit.MergePool)
- local totalTimes = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",singleRecruit.MergePool).Count
- reMaintimes = totalTimes - reMaintimes
- if reMaintimes == 0 then
- reMaintimes = totalTimes
- end
+ --按钮赋值
+ for n, m in ipairs(btns) do
+ local btn = Util.GetGameObject(this.btnGroup,m.name)
+ local redPot = Util.GetGameObject(btn.gameObject,"RedPoint")
+ local info = Util.GetGameObject(btn.gameObject,"Content/Info"):GetComponent("Text")
+ local icon = Util.GetGameObject(btn.gameObject,"Content/Icon"):GetComponent("Image")
+ local num = Util.GetGameObject(btn.gameObject,"Content/Num"):GetComponent("Text")
+ --存在免费次数 并且 免费>=1 并且是1按钮
+ local isFree = freeTime and freeTime >= 1 and n == bType.Btn1
+ redPot.gameObject:SetActive(isFree)
+ icon.gameObject:SetActive(not isFree)
+ num.gameObject:SetActive(not isFree)
- this.recruitTimesUpdate.text = string.format(Language[12229],reMaintimes)
+ local itemId=0
+ local itemNum=0
+ local type = 0
- local timeDown = info.endTime - PlayerManager.serverTime
- this.recruitTimeUpdate.text = string.format(Language[12230]..this:TimeToDHMS(timeDown))
- Timer.New(function()
- if timeDown < 1 then
- this.recruitTimeUpdate.text = string.format(Language[12230]..this:TimeToDHMS(0))
+ type = n == bType.Btn1 and singleRecruit.Id or tenRecruit.Id
+ local d = RecruitManager.GetExpendData(type)
+
+ if isFree then
+ info.text=" "..Language[11759]
else
- timeDown = timeDown - 1
- this.recruitTimeUpdate.text = string.format(Language[12230]..this:TimeToDHMS(timeDown))
+ itemId = d[1]
+ itemNum = d[2]
+ icon.sprite = Util.LoadSprite(artResourcesConfig[itemConfig[itemId].ResourceID].Name)
+ info.text = m.isInfo
+ num.text = "x"..itemNum
end
- end, 1, -1, true):Start()
+
+ Util.AddOnceClick(btn,function()
+ local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen)
+ LogYellow("type:"..type.." n:"..n.." state:"..state)
+ if n == bType.Btn1 then
+ if isFree then
+ self:Recruit(type,maxtimesId,0,0,state,freeTimesId)
+ else
+ self:Recruit(type,maxtimesId,itemId,itemNum,state,freeTimesId)
+ end
+ elseif n==bType.Btn10 then
+ self:Recruit(type,maxtimesId,itemId,itemNum,state,freeTimesId)
+ end
+ end)
+ end
end
+
+function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTimesId)
+ local generalType = id%2 == 0 and RecruitType.LingShowSingle or RecruitType.LingShowTen
+ local num = id%2 == 0 and 1 or 10
+ --是否超过每日最大上限
+ if PrivilegeManager.GetPrivilegeRemainValue(RecruitMaxtimesId) < num then
+ PopupTipPanel.ShowTip(Language[11760])
+ return
+ end
+ if itemId ~= 0 then
+ if BagManager.GetItemCountById(itemId) < itemNum then
+ PopupTipPanel.ShowTip(itemConfig[itemId].Name..Language[10492])
+ return
+ end
+ end
+ if itemId == 16 and state == 0 then
+ UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,generalType,
+ function()
+ RecruitManager.RecruitRequest(id,
+ function(msg)
+ PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num)--记录抽卡次数
+ UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,activityId)
+ this:Refresh()
+ end,freeTimesId,itemId,itemNum)
+ end,itemNum)
+ else
+ RecruitManager.RecruitRequest(id, function(msg)
+ PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num)--记录抽卡次数
+ UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,activityId)
+ this:Refresh()
+ end,freeTimesId,itemId,itemNum)
+ end
+end
+
--- 将一段时间转换为天时分秒
function LingShouBaoGe:TimeToDHMS(second)
local day = math.floor(second / (24 * 3600))
@@ -185,115 +207,14 @@ function LingShouBaoGe:TimeToDHMS(second)
end
end
-function LingShouBaoGe:GetMissionStateById(num,activityId)
- local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据
- return mission.progress,mission.state
-end
-
---刷新剩余次数
-function LingShouBaoGe:RefreshGetHeroTimes()
- local freeTimesId=lotterySetting[singleRecruit.Id].FreeTimes
- local maxtimesId=lotterySetting[singleRecruit.Id].MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id
- local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
- this.upper.text= Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--特权上限
- this.timeupdate.gameObject:SetActive(true)
- local freeTime= 0
- if freeTimesId>0 then
- freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
- RecruitManager.freeUseTimeList[freeTimesId]=freeTime
- end
- --按钮赋值
- for n, m in ipairs(btns) do
- local btn=Util.GetGameObject(this.gameObject,m.name)
- local redPot=Util.GetGameObject(btn.gameObject,"redPoint")
- local info=Util.GetGameObject(btn.gameObject,"layout/Text"):GetComponent("Text")
- local icon=Util.GetGameObject(btn.gameObject,"layout/icon"):GetComponent("Image")
- local num=Util.GetGameObject(btn.gameObject,"layout/num"):GetComponent("Text")
-
- --存在免费次数 并且 免费>=1 并且是1按钮
- local isFree=freeTime and freeTime >= 1 and n==bType.Btn1
- redPot.gameObject:SetActive(isFree)
- icon.gameObject:SetActive(not isFree)
- num.gameObject:SetActive(not isFree)
- if n==bType.Btn1 and isFree then
- this.timeupdate.gameObject:SetActive(false)
- end
-
- local itemId=0
- local itemNum=0
- local type = 0
- if n==bType.Btn1 then
- type = singleRecruit.Id
- else
- type = tenRecruit.Id
- end
- local d=RecruitManager.GetExpendData(type)
- if(isFree) then
- info.text=Language[11759]
- else
- itemId=d[1]
- itemNum=d[2]
- icon.sprite=Util.LoadSprite(artResourcesConfig[itemConfig[itemId].ResourceID].Name)
- info.text=m.isInfo
- num.text= tostring(itemNum)
- end
-
- Util.AddOnceClick(btn,function()
- if not isFree then
- if BagManager.GetItemCountById(itemId)privilegeConfig[maxtimesId].Condition[1][2] then
- PopupTipPanel.ShowTip(Language[11760])
- return
- end
- local recruitOne = function()
- RecruitManager.RecruitRequest(singleRecruit.Id, function(msg)
- PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数
- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],singleRecruit.Id,bType.Btn1)
- CheckRedPointStatus(RedPointType.TimeLimited)
- end,freeTimesId)
- end
- if state==0 and d[1] == 16 and not isFree then
- UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,singleRecruit.Id,recruitOne)
- else
- recruitOne()
- end
-
- elseif n==bType.Btn10 then
- if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+10>privilegeConfig[maxtimesId].Condition[1][2] then
- PopupTipPanel.ShowTip(Language[11760])
- return
- end
- local recruitTen = function()
- RecruitManager.RecruitRequest(tenRecruit.Id, function(msg)
- PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数
- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, tenRecruit.Id,bType.Btn10)
- CheckRedPointStatus(RedPointType.TimeLimited)
- end,freeTimesId)
- end
- if state==0 and d[1] ==16 and not isFree then
- UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,tenRecruit.Id,recruitTen)
- else
- recruitTen()
- end
- end
- end)
- end
-end
-
--刷新时间
function LingShouBaoGe:TimeCountDown()
if this.timer then
this.timer:Stop()
this.timer = nil
end
- local timeDown=CalculateSecondsNowTo_N_OClock(5)--ActivityGiftManager.GetTaskRemainTime(ActivityTypeDef.FindFairy)
- this.timeupdate.text = TimeToHMS(timeDown)..Language[12200]
+ local timeDown=CalculateSecondsNowTo_N_OClock(5)
+ this.tip1.text = TimeToHMS(timeDown)..Language[12200]
this.timer = Timer.New(function()
if timeDown < 1 then
this.timer:Stop()
@@ -302,7 +223,7 @@ function LingShouBaoGe:TimeCountDown()
return
end
timeDown = timeDown - 1
- this.timeupdate.text = TimeToHMS(timeDown)..Language[12200]
+ this.tip1.text = TimeToHMS(timeDown)..Language[12200]
end, 1, -1, true)
this.timer:Start()
end
@@ -310,7 +231,6 @@ end
function LingShouBaoGe:OnHide()
this.gameObject:SetActive(false)
this.detail.gameObject:SetActive(false)
- this.reward.gameObject:SetActive(false)
if this.timer then
this.timer:Stop()
this.timer = nil
@@ -318,12 +238,11 @@ function LingShouBaoGe:OnHide()
end
function LingShouBaoGe:OnDestroy()
- ActivityDetail.OnDestroy()
- RewardPreview.OnDestroy()
- if itemView then
- SubUIManager.Close(itemView)
- itemView=nil
- end
+ -- ActivityDetail.OnDestroy()
+ -- if itemView then
+ -- SubUIManager.Close(itemView)
+ -- itemView=nil
+ -- end
end
--添加事件监听(用于子类重写)
diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
new file mode 100644
index 0000000000..733e83465f
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
@@ -0,0 +1,153 @@
+require("Base/BasePanel")
+LingShouBaoGeOneResultPanel = Inherit(BasePanel)
+local this=LingShouBaoGeOneResultPanel
+local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
+local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting)
+local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
+local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
+local itemNum=0 --抽卡小号道具数量
+local isFree=false
+local itemId = 0
+local RecruitMaxtimesId = 0
+local freeTimesId = 0
+local activityId = nil
+local singleRecruit = nil
+local tenRecruit = nil
+--活动抽卡类型(动态的数据)
+local drawtType={
+ FindFairySingle=0,
+}
+
+local orginLayer
+local itemViewList = {}
+--初始化组件(用于子类重写)
+function LingShouBaoGeOneResultPanel:InitComponent()
+ orginLayer = 10
+ self.bg = Util.GetGameObject(self.gameObject, "effect")
+ this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard })
+ screenAdapte(self.bg)
+ this.btnBack=Util.GetGameObject(self.gameObject, "bottom/backButton")
+ this.openOneAgainButton=Util.GetGameObject(self.gameObject, "bottom/openOneAgainButton")
+
+ this.content3=Util.GetGameObject(self.gameObject,"bottom/openOneAgainButton/Content3")
+ this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
+ this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
+ this.itemInfo3=Util.GetGameObject(this.content3, "info"):GetComponent("Text")
+ this.tipText=Util.GetGameObject(this.openOneAgainButton, "Text"):GetComponent("Text")
+ this.content=Util.GetGameObject(self.gameObject, "content")
+ this.detailImage=Util.GetGameObject(self.gameObject, "Tip")
+end
+
+--绑定事件(用于子类重写)
+function LingShouBaoGeOneResultPanel:BindEvent()
+
+ Util.AddClick(this.btnBack, function ()
+ self:ClosePanel()
+ end)
+ Util.AddClick(this.openOneAgainButton, function ()
+ --是否超过每日最大上限
+ if PrivilegeManager.GetPrivilegeRemainValue(RecruitMaxtimesId) < 1 then
+ PopupTipPanel.ShowTip(Language[11760])
+ return
+ end
+ if not isFree then
+ if BagManager.GetItemCountById(itemId) < itemNum then
+ PopupTipPanel.ShowTip(ItemConfig[itemId].Name..Language[10492])
+ return
+ end
+ end
+ RecruitManager.RecruitRequest(this.recruitType, function(msg)
+ PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,1)--记录抽卡次数
+ UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop,activityId)
+ end,freeTimesId,itemId,itemNum)
+ end)
+end
+
+--添加事件监听(用于子类重写)
+function LingShouBaoGeOneResultPanel:AddListener()
+
+end
+
+--移除事件监听(用于子类重写)
+function LingShouBaoGeOneResultPanel:RemoveListener()
+
+end
+
+function LingShouBaoGeOneResultPanel:OnSortingOrderChange()
+ Util.AddParticleSortLayer(self.bg, self.sortingOrder - orginLayer)
+ orginLayer = self.sortingOrder
+ if this.view then
+ this.view:OnOpen(true,this.itemDataList[1],1.4,true,false,false,self.sortingOrder)
+ end
+end
+--界面打开时调用(用于子类重写)
+function LingShouBaoGeOneResultPanel:OnOpen(...)
+ this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LingShou})
+ local args = { ... }
+ this.drop=args[1]
+ this.recruitType = args[2]
+ activityId = args[3]
+ this.detailImage:SetActive(false)
+ this.content3:SetActive(true)
+ --获取免费次数
+ local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId)
+ singleRecruit = array[1]
+ tenRecruit = array[2]
+ local currLottery= ConfigManager.GetConfigData(ConfigName.LotterySetting,singleRecruit.Id)
+ freeTimesId=currLottery.FreeTimes
+ RecruitMaxtimesId = currLottery.MaxTimes
+ local freeTime=0
+ if freeTimesId>0 then
+ freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
+ RecruitManager.freeUseTimeList[freeTimesId] = freeTime
+ end
+ isFree=freeTime and freeTime >= 1
+ if isFree then
+ this.itemNum3.gameObject:SetActive(false)
+ this.itemIcon3.gameObject:SetActive(false)
+ this.itemInfo3.text="免费召唤"
+ this.tipText.gameObject:SetActive(false)
+ else
+ this.itemNum3.gameObject:SetActive(true)
+ this.itemIcon3.gameObject:SetActive(true)
+ this.itemInfo3.text="再来1次"
+ itemId=0
+ local d = RecruitManager.GetExpendData(this.recruitType)
+ itemId = d[1]
+ itemNum = d[2]
+
+ this.tipText.gameObject:SetActive(false)
+ this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
+ this.itemNum3.text= "×"..itemNum
+ end
+ this.itemDataList = {}
+ this.itemDataList = BagManager.GetTableByBackDropData(this.drop)
+
+ if not itemViewList then
+ itemViewList = {}
+ end
+ for k,v in pairs(itemViewList) do
+ v.gameObject:SetActive(false)
+ end
+ for i = 1, #this.itemDataList do
+ if not itemViewList[i] then
+ Util.GetTransform(this.content, "itemContent"..i).gameObject:SetActive(true)
+ itemViewList[i] = SubUIManager.Open(SubUIConfig.ItemView,Util.GetTransform(this.content, "itemContent"..i))
+ end
+ itemViewList[i].gameObject:SetActive(true)
+ itemViewList[i]:OnOpen(true,this.itemDataList[i],1.4,true,false,false,self.sortingOrder)
+ end
+end
+--界面关闭时调用(用于子类重写)
+function LingShouBaoGeOneResultPanel:OnClose()
+
+end
+
+--界面销毁时调用(用于子类重写)
+function LingShouBaoGeOneResultPanel:OnDestroy()
+ SubUIManager.Close(this.UpView)
+ this.view = nil
+ itemViewList = {}
+end
+
+return LingShouBaoGeOneResultPanel
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua.meta b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua.meta
new file mode 100644
index 0000000000..5563588ffa
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b4fc91ffec61dd64d86b466384623326
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
new file mode 100644
index 0000000000..49567d358f
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
@@ -0,0 +1,165 @@
+require("Base/BasePanel")
+require("Base/Stack")
+LingShouBaoGeTenResultPanel = Inherit(BasePanel)
+local this=LingShouBaoGeTenResultPanel
+local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
+local gameSetting=ConfigManager.GetConfig(ConfigName.GameSetting)
+local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
+local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
+local itemId=0
+local itemNum=0 --抽卡小号道具数量
+
+local activityId = nil
+local singleRecruit = nil
+local tenRecruit = nil
+
+local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting)
+
+this.contentList={}
+this.contentListParent={}
+this.isElementDrawPanel=false
+local orginLayer
+--初始化组件(用于子类重写)
+function LingShouBaoGeTenResultPanel:InitComponent()
+ orginLayer = 0
+ self.bg = Util.GetGameObject(self.gameObject, "effect")
+ screenAdapte(self.bg)
+ this.btnBack=Util.GetGameObject(self.gameObject, "bottom/backButton")
+ this.openTenAgainButton=Util.GetGameObject(self.gameObject, "bottom/openTenAgainButton")
+ this.costImage=Util.GetGameObject(self.gameObject, "bottom/openTenAgainButton/Image")
+ this.detailImage=Util.GetGameObject(self.gameObject, "Tip")
+ this.content1=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content1")
+ this.itemIcon1=Util.GetGameObject(this.content1,"Icon"):GetComponent("Image")
+ this.detailImage1=Util.GetGameObject(this.content1,"Tip")
+ this.detailText1 = Util.GetGameObject(this.detailImage1, "contentDetailText"):GetComponent("Text")
+ this.content3=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content3")
+ this.infoTxt=Util.GetGameObject(this.content3,"info"):GetComponent("Text")
+ this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
+ this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
+ this.content2=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content2")
+ this.itemIcon2=Util.GetGameObject(this.content2,"Icon"):GetComponent("Image")
+ this.itemNum2=Util.GetGameObject(this.content2,"Num"):GetComponent("Text")
+ this.tipText=Util.GetGameObject(this.openTenAgainButton, "Text"):GetComponent("Text")
+ for i = 1, 10 do
+ this.contentList[i]=Util.GetGameObject(self.gameObject, "content/itemAnimEffect"..i.."/image/Kuang/itemName/itemContent")
+ this.contentListParent[i]=Util.GetGameObject(self.gameObject, "content/itemAnimEffect"..i)
+ end
+ this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft})--, panelType = PanelType.ElementDrawCard })
+end
+
+--绑定事件(用于子类重写)
+function LingShouBaoGeTenResultPanel:BindEvent()
+
+ Util.AddClick(this.btnBack, function ()
+ PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
+ self:ClosePanel()
+ end)
+ Util.AddClick(this.openTenAgainButton, function ()
+ local maxTimesId = lotterySetting[singleRecruit.Id].MaxTimes
+ local freeTimesId = lotterySetting[singleRecruit.Id].FreeTimes
+ --是否超过每日最大上限
+ if PrivilegeManager.GetPrivilegeRemainValue(maxTimesId) < 10 then
+ LogGreen("maxTimesId:"..maxTimesId.." times:"..PrivilegeManager.GetPrivilegeRemainValue(maxTimesId))
+ PopupTipPanel.ShowTip(Language[11760])
+ return
+ end
+ if BagManager.GetItemCountById(itemId) < itemNum then
+ PopupTipPanel.ShowTip(ItemConfig[itemId].Name..Language[10492])
+ return
+ end
+ RecruitManager.RecruitRequest(this.recruitType, function(msg)
+ PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数
+ UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop,activityId)
+ end,freeTimesId,itemId,itemNum)
+ end)
+end
+
+--添加事件监听(用于子类重写)
+function LingShouBaoGeTenResultPanel:AddListener()
+
+end
+
+--移除事件监听(用于子类重写)
+function LingShouBaoGeTenResultPanel:RemoveListener()
+
+end
+
+function LingShouBaoGeTenResultPanel:OnSortingOrderChange()
+ Util.AddParticleSortLayer(self.bg, self.sortingOrder - orginLayer)
+ for i = 1, 10 do
+ Util.AddParticleSortLayer(this.contentListParent[i], self.sortingOrder - orginLayer)
+ end
+ orginLayer = self.sortingOrder
+
+ if this.views and this.itemDataList then
+ for index, view in pairs(this.views) do
+ view:OnOpen(true,this.itemDataList[index],1.4,true,false,false,self.sortingOrder)
+ end
+ end
+
+end
+--界面打开时调用(用于子类重写)
+function LingShouBaoGeTenResultPanel:OnOpen(...)
+ this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LingShou})
+ local args = { ... }
+ this.drop=args[1]
+ this.recruitType = args[2]
+ activityId = args[3]
+ this.detailImage:SetActive(false)
+ this.content1:SetActive(false)
+ this.content2:SetActive(false)
+ this.content3:SetActive(true)
+
+ local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId)
+ singleRecruit = array[1]
+ tenRecruit = array[2]
+
+ local d
+ d = RecruitManager.GetExpendData(this.recruitType)
+ itemId = d[1]
+ itemNum = d[2]
+ this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
+
+ this.tipText.gameObject:SetActive(false)
+ this.infoTxt.text="再来10次"
+ this.itemNum3.text= "×"..itemNum
+
+ local itemDataList={}
+ itemDataList=BagManager.GetTableByBackDropData(this.drop)
+
+ if not this.views then
+ this.views = {}
+ end
+ for k,v in pairs(this.views) do
+ v.gameObject:SetActive(false)
+ end
+
+ this.itemDataList = itemDataList
+ local dataNum = #itemDataList > 10 and 10 or #itemDataList
+ for i = dataNum, 1, -1 do
+ if not this.views[i] then
+ this.views[i] = SubUIManager.Open(SubUIConfig.ItemView,this.contentList[i].transform)
+ end
+ this.views[i].gameObject:SetActive(true)
+ local curItemData = itemDataList[i]
+ local contentGO = this.contentListParent[i]
+ this.views[i]:OnOpen(true,curItemData,1.4,true,false,false,self.sortingOrder)
+ contentGO:SetActive(true)
+ end
+end
+
+--界面关闭时调用(用于子类重写)
+function LingShouBaoGeTenResultPanel:OnClose()
+
+end
+
+--界面销毁时调用(用于子类重写)
+function LingShouBaoGeTenResultPanel:OnDestroy()
+ SubUIManager.Close(this.UpView)
+ this.views = nil
+ this.contentList={}
+ this.contentListParent={}
+ this.views = {}
+end
+
+return LingShouBaoGeTenResultPanel
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua.meta b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua.meta
new file mode 100644
index 0000000000..8383b1c1c9
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1cb9b55611616cd4bb317181735f35d7
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua
index 7ea06df46a..e7d733e1c6 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua
@@ -14,6 +14,7 @@ local timeNum2--第二个特效等待播放的时间
local timeNum3--第三个特效等待播放的时间
local type --抽卡类型
local index=0 --十连抽索引
+local activityId--活动id
local orginLayer
local heroStaticData
@@ -75,6 +76,7 @@ function PokemonSingleResultPanel:OnOpen(...)
local args = { ... }
type = args[1]
drop = args[2]
+ activityId = args[3]
_heroTable = drop.pokemon
end
@@ -135,11 +137,24 @@ function PokemonSingleResultPanel:OnClose()
poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO)
end
heroStaticData, testLiveGO = nil, nil
- if type == RecruitType.LingShowSingle then
- UIManager.OpenPanel(UIName.PokemonSummonOneResultPanel, drop,type)
- else
- UIManager.OpenPanel(UIName.PokemonSummonTenResultPanel, drop,type)
+ if activityId then--限时活动抽卡
+ local singleRecruit
+ local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId)
+ singleRecruit = array[1]
+ if type == singleRecruit.Id then
+ UIManager.OpenPanel(UIName.LingShouBaoGeOneResultPanel, drop,type,activityId)
+ else
+ UIManager.OpenPanel(UIName.LingShouBaoGeTenResultPanel, drop,type,activityId)
+ end
+
+ else--灵兽山抽卡
+ if type == RecruitType.LingShowSingle then
+ UIManager.OpenPanel(UIName.PokemonSummonOneResultPanel, drop,type)
+ else
+ UIManager.OpenPanel(UIName.PokemonSummonTenResultPanel, drop,type)
+ end
end
+
_heroTable={}
drop = {}
end