From 9dafa8585822b9234cfe51c5c6e9998467452cf4 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Tue, 28 Dec 2021 13:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../GeneralSizeFitterPopup.prefab | 1810 ++---------------
.../~Lua/Common/functions.lua | 2 +-
.../~Lua/Modules/Explore/ExploreMainPanel.lua | 3 +
.../~Lua/Modules/Explore/ExploreManager.lua | 36 +-
.../Modules/Fight/View/ExploreMapView.lua | 16 -
.../Modules/Formation/FormationPanelV2.lua | 6 +-
.../Formation/View/ExploreFormation.lua | 5 +
...SizeFitterPopup_ExploreSelectFormation.lua | 17 +-
.../GeneralSizeFitterPopup_OneKeyExplore.lua | 119 +-
.../~Lua/Modules/Net/IndicationManager.lua | 2 +-
.../~Lua/Modules/Net/NetManager.lua | 3 +-
.../~Lua/View/SingleExplorePlayerView.lua | 6 +-
12 files changed, 296 insertions(+), 1729 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab
index 94b73ebdc3..4a3795d389 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab
@@ -191,85 +191,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &206215128914595236
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1741418779281031960}
- - component: {fileID: 2809046160944180431}
- - component: {fileID: 8808322391134706583}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1741418779281031960
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 206215128914595236}
- 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: 7569568978207666448}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 1}
---- !u!222 &2809046160944180431
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 206215128914595236}
- m_CullTransparentMesh: 0
---- !u!114 &8808322391134706583
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 206215128914595236}
- 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.882353, g: 0.83921576, b: 0.5568628, 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: 0
- m_MaxSize: 89
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u7EFF\u8272\u6C99\u6F20"
--- !u!1 &258422294888443759
GameObject:
m_ObjectHideFlags: 0
@@ -383,85 +304,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &323656861895800691
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7993283441254603234}
- - component: {fileID: 7064125310110151319}
- - component: {fileID: 5610457649428920529}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7993283441254603234
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 323656861895800691}
- 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: 7454766713061782434}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 1}
---- !u!222 &7064125310110151319
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 323656861895800691}
- m_CullTransparentMesh: 0
---- !u!114 &5610457649428920529
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 323656861895800691}
- 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.9254902, g: 0.8039216, b: 0.68235296, 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: 0
- m_MaxSize: 89
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "4\u5C0F\u65F6"
--- !u!1 &336404919335304143
GameObject:
m_ObjectHideFlags: 0
@@ -479,7 +321,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &6627285922979105498
RectTransform:
m_ObjectHideFlags: 0
@@ -571,7 +413,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 49.055, y: -67.6}
+ m_AnchoredPosition: {x: 57.055, y: -67.6}
m_SizeDelta: {x: 80.11, y: 80.11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &404496781241236717
@@ -810,6 +652,8 @@ GameObject:
- component: {fileID: 6431489948651442355}
- component: {fileID: 5631798196378829241}
- component: {fileID: 3258725364623398056}
+ - component: {fileID: 6183958188606034256}
+ - component: {fileID: 112889846376714442}
m_Layer: 5
m_Name: mapTip
m_TagString: Untagged
@@ -829,10 +673,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8296948800799076257}
- - {fileID: 7569568978207666448}
- - {fileID: 1008680100257945535}
- - {fileID: 8776444149562316514}
- - {fileID: 4728447709695009520}
m_Father: {fileID: 7159837365308353879}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -935,6 +775,44 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
+--- !u!223 &6183958188606034256
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 508765141820649822}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 1
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!114 &112889846376714442
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 508765141820649822}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &528478652376581225
GameObject:
m_ObjectHideFlags: 0
@@ -1692,124 +1570,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &833238652163041012
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4202095411584633928}
- - component: {fileID: 6252646409365994210}
- - component: {fileID: 3796983782455213360}
- - component: {fileID: 8931414324845592887}
- m_Layer: 5
- m_Name: targgetBtnPre (2)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4202095411584633928
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 833238652163041012}
- 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: 7172614361955042301}
- m_Father: {fileID: 585096355663662452}
- 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: 120.25, y: -186.94}
- m_SizeDelta: {x: 220.5, y: 67}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6252646409365994210
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 833238652163041012}
- m_CullTransparentMesh: 0
---- !u!114 &3796983782455213360
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 833238652163041012}
- 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: 97de4c69aec8c0042acee2387b469a6b, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!114 &8931414324845592887
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 833238652163041012}
- 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: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_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: 3796983782455213360}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
--- !u!1 &897516177821276966
GameObject:
m_ObjectHideFlags: 0
@@ -2225,85 +1985,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &1125480830588849430
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2870709695606326960}
- - component: {fileID: 5769490748120220781}
- - component: {fileID: 7000487056993313905}
- m_Layer: 5
- m_Name: time
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &2870709695606326960
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1125480830588849430}
- 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: 4463090309462480275}
- 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: 14.4, y: 51.4}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5769490748120220781
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1125480830588849430}
- m_CullTransparentMesh: 0
---- !u!114 &7000487056993313905
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1125480830588849430}
- 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.88235295, g: 0.8392157, b: 0.5568628, 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: 32
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 45
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "4\uFF1A30\u540E\u7ED3\u675F"
--- !u!1 &1147904081239323205
GameObject:
m_ObjectHideFlags: 0
@@ -2338,7 +2019,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 18.8, y: -32.2}
+ m_AnchoredPosition: {x: 27.8, y: -32.2}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1124979048482131543
@@ -2429,124 +2110,6 @@ RectTransform:
m_AnchoredPosition: {x: -3.3, y: 0.000012398}
m_SizeDelta: {x: 893.4, y: 202.7}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1278286074193610819
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4799926976210104149}
- - component: {fileID: 2775871640852333967}
- - component: {fileID: 8290245890106506309}
- - component: {fileID: 3276555402522290202}
- m_Layer: 5
- m_Name: targgetBtnPre (4)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4799926976210104149
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1278286074193610819}
- 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: 773300495304655681}
- m_Father: {fileID: 585096355663662452}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 120.25, y: -330.38}
- m_SizeDelta: {x: 220.5, y: 67}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2775871640852333967
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1278286074193610819}
- m_CullTransparentMesh: 0
---- !u!114 &8290245890106506309
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1278286074193610819}
- 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: 97de4c69aec8c0042acee2387b469a6b, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!114 &3276555402522290202
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1278286074193610819}
- 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: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_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: 8290245890106506309}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
--- !u!1 &1305481513269907105
GameObject:
m_ObjectHideFlags: 0
@@ -2997,7 +2560,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 411.61502, y: -67.6}
+ m_AnchoredPosition: {x: 419.61502, y: -67.6}
m_SizeDelta: {x: 80.11, y: 80.11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1626420654736209632
@@ -3188,7 +2751,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 78.7, y: -23.3}
+ m_AnchoredPosition: {x: 87.5, y: -23.3}
m_SizeDelta: {x: 130.85, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!222 &6175954865206953111
@@ -3424,85 +2987,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &1811740286823245965
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 287666652375487330}
- - component: {fileID: 7622901821516064805}
- - component: {fileID: 8200803602195356725}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &287666652375487330
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1811740286823245965}
- 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: 4526011421603298195}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 1}
---- !u!222 &7622901821516064805
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1811740286823245965}
- m_CullTransparentMesh: 0
---- !u!114 &8200803602195356725
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1811740286823245965}
- 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.9254902, g: 0.8039216, b: 0.68235296, 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: 0
- m_MaxSize: 89
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "4\u5C0F\u65F6"
--- !u!1 &2023529756368910805
GameObject:
m_ObjectHideFlags: 0
@@ -4959,124 +4443,6 @@ RectTransform:
m_AnchoredPosition: {x: 502.25504, y: -67.6}
m_SizeDelta: {x: 80.11, y: 80.11}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &2843975861570876981
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7454766713061782434}
- - component: {fileID: 1026228844151237726}
- - component: {fileID: 1397420661814295133}
- - component: {fileID: 4920775492513729014}
- m_Layer: 5
- m_Name: targgetBtnPre (3)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7454766713061782434
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2843975861570876981}
- 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: 7993283441254603234}
- m_Father: {fileID: 585096355663662452}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 120.25, y: -258.66}
- m_SizeDelta: {x: 220.5, y: 67}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1026228844151237726
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2843975861570876981}
- m_CullTransparentMesh: 0
---- !u!114 &1397420661814295133
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2843975861570876981}
- 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: 97de4c69aec8c0042acee2387b469a6b, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!114 &4920775492513729014
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2843975861570876981}
- 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: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_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: 1397420661814295133}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
--- !u!1 &2901936970516778941
GameObject:
m_ObjectHideFlags: 0
@@ -5225,7 +4591,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &8296948800799076257
RectTransform:
m_ObjectHideFlags: 0
@@ -5359,8 +4725,8 @@ RectTransform:
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: 2.96, y: 79.38096}
- m_SizeDelta: {x: 910.15, y: 51.51}
+ m_AnchoredPosition: {x: 7.14, y: 79.38096}
+ m_SizeDelta: {x: 901.79, y: 51.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6238209311415372031
CanvasRenderer:
@@ -5399,124 +4765,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &3301255814312299789
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1008680100257945535}
- - component: {fileID: 6145943882162050980}
- - component: {fileID: 10892335320355217}
- - component: {fileID: 8248836578839663862}
- m_Layer: 5
- m_Name: targgetBtnPre (2)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1008680100257945535
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3301255814312299789}
- 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: 2998138412192493025}
- m_Father: {fileID: 815779503794647692}
- 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: 145.6, y: -186.94}
- m_SizeDelta: {x: 271.2, y: 67}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6145943882162050980
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3301255814312299789}
- m_CullTransparentMesh: 0
---- !u!114 &10892335320355217
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3301255814312299789}
- 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: 97de4c69aec8c0042acee2387b469a6b, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!114 &8248836578839663862
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3301255814312299789}
- 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: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_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: 10892335320355217}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
--- !u!1 &3331548723577211077
GameObject:
m_ObjectHideFlags: 0
@@ -5818,7 +5066,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 320.975, y: -67.6}
+ m_AnchoredPosition: {x: 328.975, y: -67.6}
m_SizeDelta: {x: 80.11, y: 80.11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3484868015538817279
@@ -6012,7 +5260,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 224, y: -23.3}
+ m_AnchoredPosition: {x: 257, y: -23.3}
m_SizeDelta: {x: 73, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1612501726270142804
@@ -6298,6 +5546,8 @@ GameObject:
- component: {fileID: 6948105197892269211}
- component: {fileID: 72514831074170097}
- component: {fileID: 5652209980834862974}
+ - component: {fileID: 7923390553550935633}
+ - component: {fileID: 5170178045047049312}
m_Layer: 5
m_Name: mapTimeTip
m_TagString: Untagged
@@ -6317,10 +5567,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1633336161680252057}
- - {fileID: 4526011421603298195}
- - {fileID: 4202095411584633928}
- - {fileID: 7454766713061782434}
- - {fileID: 4799926976210104149}
m_Father: {fileID: 7159837365308353879}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6423,85 +5669,44 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
---- !u!1 &3957566057038203625
-GameObject:
+--- !u!223 &7923390553550935633
+Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8195162958710492834}
- - component: {fileID: 5805141891913759154}
- - component: {fileID: 2007004480910890998}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8195162958710492834
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3957566057038203625}
- 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: 4728447709695009520}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 1}
---- !u!222 &5805141891913759154
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3957566057038203625}
- m_CullTransparentMesh: 0
---- !u!114 &2007004480910890998
+ m_GameObject: {fileID: 3723922372709788042}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 1
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!114 &5170178045047049312
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3957566057038203625}
+ m_GameObject: {fileID: 3723922372709788042}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.882353, g: 0.83921576, b: 0.5568628, 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: 0
- m_MaxSize: 89
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u7EFF\u8272\u6C99\u6F20"
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &4041091804481645236
GameObject:
m_ObjectHideFlags: 0
@@ -7151,203 +6356,6 @@ RectTransform:
m_AnchoredPosition: {x: 0.46, y: 0.28}
m_SizeDelta: {x: 61.28, y: 60.39}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &4463584128451541106
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8776444149562316514}
- - component: {fileID: 7405575265216899253}
- - component: {fileID: 4103881268898986815}
- - component: {fileID: 1769338719273590292}
- m_Layer: 5
- m_Name: targgetBtnPre (3)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8776444149562316514
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4463584128451541106}
- 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: 808939394912846938}
- m_Father: {fileID: 815779503794647692}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 145.6, y: -258.66}
- m_SizeDelta: {x: 271.2, y: 67}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7405575265216899253
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4463584128451541106}
- m_CullTransparentMesh: 0
---- !u!114 &4103881268898986815
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4463584128451541106}
- 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: 97de4c69aec8c0042acee2387b469a6b, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!114 &1769338719273590292
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4463584128451541106}
- 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: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_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: 4103881268898986815}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
---- !u!1 &4538429503962575873
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2998138412192493025}
- - component: {fileID: 2692026398272581737}
- - component: {fileID: 9139164350906203984}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &2998138412192493025
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4538429503962575873}
- 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: 1008680100257945535}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 1}
---- !u!222 &2692026398272581737
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4538429503962575873}
- m_CullTransparentMesh: 0
---- !u!114 &9139164350906203984
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4538429503962575873}
- 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.882353, g: 0.83921576, b: 0.5568628, 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: 0
- m_MaxSize: 89
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u7EFF\u8272\u6C99\u6F20"
--- !u!1 &4553569662331027646
GameObject:
m_ObjectHideFlags: 0
@@ -7650,85 +6658,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
---- !u!1 &4888363849031744430
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 773300495304655681}
- - component: {fileID: 8921104684139875629}
- - component: {fileID: 7374034911631514798}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &773300495304655681
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4888363849031744430}
- 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: 4799926976210104149}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 1}
---- !u!222 &8921104684139875629
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4888363849031744430}
- m_CullTransparentMesh: 0
---- !u!114 &7374034911631514798
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4888363849031744430}
- 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.9254902, g: 0.8039216, b: 0.68235296, 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: 0
- m_MaxSize: 89
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "4\u5C0F\u65F6"
--- !u!1 &4930399939444608735
GameObject:
m_ObjectHideFlags: 0
@@ -7765,7 +6694,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 402.44, y: -36.549995}
+ m_AnchoredPosition: {x: 424.9, y: -36.549995}
m_SizeDelta: {x: 187.3, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3654798453273645482
@@ -7913,13 +6842,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3181486912426266052}
- - {fileID: 2870709695606326960}
m_Father: {fileID: 3029355539889997812}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 316.62, y: -47.1}
+ m_AnchoredPosition: {x: 290.2, y: -33.64}
m_SizeDelta: {x: 203.85, y: 58.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1740395087232270423
@@ -8001,85 +6929,6 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
---- !u!1 &5083757852829751241
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7172614361955042301}
- - component: {fileID: 4361174133554017218}
- - component: {fileID: 2906425318635692401}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7172614361955042301
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5083757852829751241}
- 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: 4202095411584633928}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 1}
---- !u!222 &4361174133554017218
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5083757852829751241}
- m_CullTransparentMesh: 0
---- !u!114 &2906425318635692401
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5083757852829751241}
- 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.9254902, g: 0.8039216, b: 0.68235296, 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: 0
- m_MaxSize: 89
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "4\u5C0F\u65F6"
--- !u!1 &5249128535574990425
GameObject:
m_ObjectHideFlags: 0
@@ -8807,6 +7656,8 @@ GameObject:
m_Component:
- component: {fileID: 6666605437607463240}
- component: {fileID: 2860327502804025555}
+ - component: {fileID: 4762175645361796938}
+ - component: {fileID: 1871983759775142034}
m_Layer: 5
m_Name: scroll
m_TagString: Untagged
@@ -8852,7 +7703,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
- m_Left: 9
+ m_Left: 17
m_Right: 0
m_Top: 0
m_Bottom: 0
@@ -8862,6 +7713,43 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
+--- !u!222 &4762175645361796938
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6025264967048336732}
+ m_CullTransparentMesh: 0
+--- !u!114 &1871983759775142034
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6025264967048336732}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
+ 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: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &6132162646248471801
GameObject:
m_ObjectHideFlags: 0
@@ -9476,7 +8364,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 54
- m_Alignment: 4
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@@ -9775,7 +8663,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 619.9, y: -23.3}
+ m_AnchoredPosition: {x: 601.7, y: -23.3}
m_SizeDelta: {x: 73, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2133230399831492597
@@ -10210,7 +9098,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 139.695, y: -67.6}
+ m_AnchoredPosition: {x: 147.695, y: -67.6}
m_SizeDelta: {x: 80.11, y: 80.11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6843827463055588170
@@ -10292,124 +9180,6 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 100
---- !u!1 &7082848844240327606
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4526011421603298195}
- - component: {fileID: 4818351331354784847}
- - component: {fileID: 1592098840839417542}
- - component: {fileID: 7795258198486900481}
- m_Layer: 5
- m_Name: targgetBtnPre (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4526011421603298195
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7082848844240327606}
- 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: 287666652375487330}
- m_Father: {fileID: 585096355663662452}
- 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: 120.25, y: -115.22}
- m_SizeDelta: {x: 220.5, y: 67}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4818351331354784847
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7082848844240327606}
- m_CullTransparentMesh: 0
---- !u!114 &1592098840839417542
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7082848844240327606}
- 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: 97de4c69aec8c0042acee2387b469a6b, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!114 &7795258198486900481
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7082848844240327606}
- 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: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_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: 1592098840839417542}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
--- !u!1 &7109157438160404622
GameObject:
m_ObjectHideFlags: 0
@@ -10946,7 +9716,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9960785, g: 0.8313726, b: 0.56078434, a: 1}
+ m_Color: {r: 1, g: 0.86274517, b: 0.5921569, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -10955,7 +9725,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 59
+ m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
@@ -11466,7 +10236,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1633336161680252057
RectTransform:
m_ObjectHideFlags: 0
@@ -11602,7 +10372,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 42.6, y: -41.390015}
+ m_AnchoredPosition: {x: 55.7, y: -41.390015}
m_SizeDelta: {x: 52, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &688165294946439067
@@ -12151,124 +10921,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &7868746686533703915
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4728447709695009520}
- - component: {fileID: 5557233896115733312}
- - component: {fileID: 4613331295588795468}
- - component: {fileID: 5187392088475823394}
- m_Layer: 5
- m_Name: targgetBtnPre (4)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4728447709695009520
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7868746686533703915}
- 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: 8195162958710492834}
- m_Father: {fileID: 815779503794647692}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 145.6, y: -330.38}
- m_SizeDelta: {x: 271.2, y: 67}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5557233896115733312
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7868746686533703915}
- m_CullTransparentMesh: 0
---- !u!114 &4613331295588795468
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7868746686533703915}
- 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: 97de4c69aec8c0042acee2387b469a6b, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!114 &5187392088475823394
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7868746686533703915}
- 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: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_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: 4613331295588795468}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
--- !u!1 &7960255554015091349
GameObject:
m_ObjectHideFlags: 0
@@ -12305,7 +10957,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 819.56, y: -36.55}
+ m_AnchoredPosition: {x: 799.2, y: -36.55}
m_SizeDelta: {x: 140.52, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2442473608387177621
@@ -12443,7 +11095,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &9159548010215061646
RectTransform:
m_ObjectHideFlags: 0
@@ -12731,7 +11383,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 502.25504, y: -67.6}
+ m_AnchoredPosition: {x: 510.25504, y: -67.6}
m_SizeDelta: {x: 80.11, y: 80.11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8220234628446472220
@@ -13112,9 +11764,9 @@ RectTransform:
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: 173.20007, y: -33.64}
+ m_AnchoredPosition: {x: 300.35504, y: -33.64}
m_SizeDelta: {x: 64.31, y: 35.5}
- m_Pivot: {x: 0, y: 0.5}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4214633719435064483
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -13238,7 +11890,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u4E00\u952E\u63A2\u7D22"
+ m_Text: "\u4E00\u952E\u9886\u53D6"
--- !u!1 &8663067260245077426
GameObject:
m_ObjectHideFlags: 0
@@ -13274,7 +11926,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 230.33499, y: -67.6}
+ m_AnchoredPosition: {x: 238.33499, y: -67.6}
m_SizeDelta: {x: 80.11, y: 80.11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8667891653928200337
@@ -13312,124 +11964,6 @@ RectTransform:
m_AnchoredPosition: {x: -8.7, y: -8.1}
m_SizeDelta: {x: 60.7, y: 19.29}
m_Pivot: {x: 0, y: 0}
---- !u!1 &8714562129522909874
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7569568978207666448}
- - component: {fileID: 1920994052089942396}
- - component: {fileID: 1685211962372954708}
- - component: {fileID: 4279040627635301542}
- m_Layer: 5
- m_Name: targgetBtnPre (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7569568978207666448
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8714562129522909874}
- 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: 1741418779281031960}
- m_Father: {fileID: 815779503794647692}
- 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: 145.6, y: -115.22}
- m_SizeDelta: {x: 271.2, y: 67}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1920994052089942396
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8714562129522909874}
- m_CullTransparentMesh: 0
---- !u!114 &1685211962372954708
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8714562129522909874}
- 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: 97de4c69aec8c0042acee2387b469a6b, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!114 &4279040627635301542
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8714562129522909874}
- 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: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_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: 1685211962372954708}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
--- !u!1 &8722579220367582163
GameObject:
m_ObjectHideFlags: 0
@@ -13797,6 +12331,8 @@ GameObject:
m_Component:
- component: {fileID: 4444846578210283193}
- component: {fileID: 1605235959788632088}
+ - component: {fileID: 8339999056905713885}
+ - component: {fileID: 8241022212900679178}
m_Layer: 5
m_Name: scroll
m_TagString: Untagged
@@ -13826,7 +12362,7 @@ RectTransform:
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: -117, y: -33.640015}
+ m_AnchoredPosition: {x: -104.3, y: -33.640015}
m_SizeDelta: {x: 643.18, y: 135.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1605235959788632088
@@ -13852,85 +12388,43 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
---- !u!1 &9089362079984564703
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 808939394912846938}
- - component: {fileID: 2264839954862161283}
- - component: {fileID: 3613764967954601309}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &808939394912846938
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9089362079984564703}
- 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: 8776444149562316514}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 1}
---- !u!222 &2264839954862161283
+--- !u!222 &8339999056905713885
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9089362079984564703}
+ m_GameObject: {fileID: 9055192973060332235}
m_CullTransparentMesh: 0
---- !u!114 &3613764967954601309
+--- !u!114 &8241022212900679178
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9089362079984564703}
+ m_GameObject: {fileID: 9055192973060332235}
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.882353, g: 0.83921576, b: 0.5568628, a: 1}
+ m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
+ 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_FontData:
- m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 43
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 89
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u7EFF\u8272\u6C99\u6F20"
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &9126149048016157796
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua
index defe63e747..60b8f58b76 100644
--- a/Assets/ManagedResources/~Lua/Common/functions.lua
+++ b/Assets/ManagedResources/~Lua/Common/functions.lua
@@ -425,7 +425,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
local starSize
if not _starSize and type == 3 then
--第一个值代表缩放,第二个值代表y轴移动到的y轴的位置
- starSize = Vector3.New(1,-15.6)
+ starSize = Vector3.New(1,-15.6)
elseif not _starSize and star >= 10 then
starSize = Vector2(60,57)
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua
index 62edef6346..c2264f77ae 100644
--- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua
@@ -79,6 +79,9 @@ function ExploreMainPanel:InitComponent()
lasty = 0
setPosFunc(d.delta)
end
+ self.trigger.onPointerUp = self.trigger.onPointerUp + function()
+ self:SetTip(self.tipRoot,self.mapId)
+ end
end
--绑定事件(用于子类重写)
diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua
index 0275ac4641..d1f380f2a8 100644
--- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua
@@ -74,7 +74,6 @@ end
--刷新编队
function this.UpdateFormationData(team)
- LogGreen("team.teamId:"..team.teamId.." team.hp:"..team.hp.." team.exploreTime:"..team.exploreTime)
if this.FormationData[team.teamId] then
this.FormationData[team.teamId].hp = team.hp
this.FormationData[team.teamId].exploreTime = team.exploreTime
@@ -102,7 +101,6 @@ function this.UpdateFormationData(team)
else
LogGreen(string.format("%s编队不属于探索玩法",team.teamId))
end
- LogGreen("this.FormationData[team.teamId].state:"..this.FormationData[team.teamId].state.." team.exploreTime - GetTimeStamp():"..team.exploreTime - GetTimeStamp())
CheckRedPointStatus(RedPointType.ExploreFunc)
end
@@ -115,6 +113,8 @@ function this.ResetTeamByTeamId(teamId)
this.UpdateMapFormationData(this.FormationData[teamId].mapId,teamId,-1)
this.FormationData[teamId].mapId = 0
end
+ Game.GlobalEvent:DispatchEvent(GameEvent.Explore.UpdateFormation)
+ CheckRedPointStatus(RedPointType.ExploreFunc)
end
-- 刷新地图编队
@@ -163,6 +163,7 @@ end
function this.InitMapUserInfosData(data,mapId)
local datas = {}
+ local myData
for i = 1,#data do
local singleUserData = {}
singleUserData.userName = data[i].name
@@ -171,19 +172,32 @@ function this.InitMapUserInfosData(data,mapId)
singleUserData.userSkin = data[i].userSkin
singleUserData.userTitle = data[i].userTitle
singleUserData.userMount = data[i].userMount
- singleUserData.precticelevel = data[i].practiceLevel
+ singleUserData.practiceLevel = data[i].practiceLevel
singleUserData.lv = data[i].level
singleUserData.formationId = i
- singleUserData.hp = 0
- table.insert(datas,singleUserData)
- end
- for k,v in pairs(this.ExploreMapData[mapId].formations) do
- for i = 1,#datas do
- if datas[i].uid == PlayerManager.uid then
- datas[i].formationId = k
- end
+ singleUserData.hp = 0
+ LogGreen("data[i].uid:"..data[i].uid.." PlayerManager.uid:"..PlayerManager.uid)
+ if singleUserData.uid == PlayerManager.uid then
+ myData = singleUserData
+ else
+ table.insert(datas,singleUserData)
end
end
+
+ for k,v in pairs(this.ExploreMapData[mapId].formations) do
+ local singleUserData = {}
+ singleUserData.userName = myData.userName
+ singleUserData.sex = myData.sex
+ singleUserData.uid = myData.uid
+ singleUserData.userSkin = myData.userSkin
+ singleUserData.userTitle = myData.userTitle
+ singleUserData.userMount = myData.userMount
+ singleUserData.practiceLevel = myData.practiceLevel
+ singleUserData.lv = myData.lv
+ singleUserData.formationId = k
+ singleUserData.hp = this.FormationData[k].hp
+ table.insert(datas,singleUserData)
+ end
return datas
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
index 5c6a60a6f6..42000f52ff 100644
--- a/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
@@ -8,15 +8,6 @@ local mapIconConfig = ConfigManager.GetConfig(ConfigName.MainMapIconConfig)
local iconAction = require("Modules/Fight/View/FightMapIconShowView")
local this = {}
---地图id
-local mapIdList = {
- [1] = 5002,
- [2] = 5003,
- [3] = 5005,
- [4] = 4002,
- [5] = 5004,
-}
-
-- 临时可生成怪的区域
local monsterArea = {
@@ -146,13 +137,6 @@ function this:LoadMapData()
this.mapRoot.transform.position = Vector3.New(0, 0, -100)
TileMapView.fogSize = 2
- local curChapter = FightPointPassManager.GetCurChapterIndex()
- local index = 1
- index = math.floor((curChapter - 1) % 5 + 1)
- -- --Log(curChapter)
- -- --Log(index)
- m_parent.mapData.exploreMapId = mapIdList[index]
- -- LogPink("#mapIdList:"..#mapIdList.." m_parent.mapData.exploreMapId:"..m_parent.mapData.exploreMapId.." curChapter:"..curChapter.." index:"..index.." State:"..tostring(FightPointPassManager.isOpenNewChapter))
TileMapView.AwakeInit(this.mapRoot, m_parent.mapData.exploreMapId, nil, Vector2.New(180, 180))
TileMapView.isShowFog = false
TileMapController.IsShieldDrag = function()
diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
index 6449ebf290..31036169c7 100644
--- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
@@ -618,7 +618,9 @@ end
--设置英雄列表数据
function this.SetRoleList(_roleDatas, isTop,isAni)
- if this.opView.SortHeroDatas then
+ if panelType == FORMATION_TYPE.ExploreFunc then
+ _roleDatas = this.opView.SortHeroDatas(_roleDatas)
+ elseif this.opView.SortHeroDatas then
this.opView.SortHeroDatas(_roleDatas)
else
this.SortHeroDatas(_roleDatas)
@@ -639,7 +641,7 @@ function this.SetRoleList(_roleDatas, isTop,isAni)
end, not isTop,not isAni)
end
-
+
--排序英雄数据
function this.SortHeroDatas(_heroDatas)
local choosed = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua
index 243725638f..26df129ed1 100644
--- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua
@@ -76,6 +76,11 @@ function this.SortHeroDatas(_roleDatas)
return a.sort < b.sort
end
end)
+ local data2 = {}
+ for k,v in ipairs(datas1) do
+ table.insert(data2,v.herodata)
+ end
+ return data2
end
function this.GetHeroTeam(did)
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua
index 74dd6a198f..e27400dee8 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua
@@ -133,7 +133,16 @@ function this:Refresh(_data,_item)
_item.heroList[j].hero:SetActive(true)
_item.heroList[j].levelText.text = heroData.lv
local star,starType = heroData.GetStar(1)
- SetHeroStars(this.spLoader, _item.heroList[j].starGrid, star,starType)
+ local starSize = Vector2.New(25,25)
+ local starScale = -12.3
+ if starType == 3 then
+ starSize = Vector2.New(0.7,-25)
+ starScale = -23.75
+ elseif starType == 2 then
+ starSize = Vector2.New(36.868,39.76)
+ end
+ SetHeroStars(this.spLoader, _item.heroList[j].starGrid, star,starType,starSize,starScale)
+ Util.SetParticleSortLayer( _item.heroList[j].starGrid,sortingOrder + 1)
local demonId = heroData.id
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
_item.heroList[j].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
@@ -195,7 +204,7 @@ function this:TimeCountDown()
this.timer:Stop()
this.timer = nil
end
- this.timer = Timer.New(function()
+ local s = function()
for i = 1,#this.itemList do
if this.itemList[i].data and this.itemList[i].data.state > 0 then
local time = this.itemList[i].data.exploreTime - GetTimeStamp()
@@ -208,7 +217,9 @@ function this:TimeCountDown()
end
end
end
- end,1,-1,true)
+ end
+ s()
+ this.timer = Timer.New(s,1,-1,true)
this.timer:Start()
end
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua
index 578e717114..7e80dea750 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua
@@ -5,7 +5,7 @@ local sortingOrder
local SpecialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,142)
local Explore = ConfigManager.GetConfig(ConfigName.Explore)
local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
---红 fe5757 黄 f3e168 绿 58f567
+
--初始化组件(用于子类重写)
function this:InitComponent(gameObject)
this.spLoader = SpriteLoader.New()
@@ -33,6 +33,9 @@ function this:InitComponent(gameObject)
this.gameObject = gameObject
this.transform = this.gameObject.transform
this.formationList = {}
+
+ this.mapTipLayer = this.mapTip:GetComponent("Canvas")
+ this.mapTimeTipLayer = this.mapTimeTip:GetComponent("Canvas")
end
--绑定事件(用于子类重写)
@@ -63,16 +66,16 @@ function this:BindEvent()
end
function this:OnSortingOrderChange()
-
end
--添加事件监听(用于子类重写)
function this:AddListener()
-
+ Game.GlobalEvent:AddEvent(GameEvent.Explore.UpdateFormation,this.OnShow)
end
--移除事件监听(用于子类重写)
function this:RemoveListener()
+ Game.GlobalEvent:RemoveEvent(GameEvent.Explore.UpdateFormation,this.OnShow)
end
--界面打开时调用(用于子类重写)
@@ -85,10 +88,14 @@ function this:OnOpen(_parent,...)
this.mapDatas = args[2] --地图数据
this.formationList = {} --formationId 为索引 ,预设index,mapId,exploreTime,formationId
this.formationId,this.mapId,this.exploreTime = 0,0,0
+ this.mapTipLayer.overrideSorting = true
+ this.mapTipLayer.sortingOrder = sortingOrder + 1
+ this.mapTimeTipLayer.overrideSorting = true
+ this.mapTimeTipLayer.sortingOrder = sortingOrder + 1
end
--界面打开时调用(用于子类重写)
-function this:OnShow(_parent,...)
+function this:OnShow()
this.icon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(Explore[1].Cost[1]))
--队伍
for i = 1,math.max(#this.itemList,#this.data) do
@@ -148,10 +155,9 @@ function this:OnShow(_parent,...)
this.mapTipPreList[k].des.text = v.name
this.mapTipPreList[k].data = v
Util.AddOnceClick(this.mapTipPreList[k].go,function()
- this.mapTip.gameObject:SetActive(false)
- LogGreen("this.formationId:"..this.formationId)
this.formationList[this.formationId].mapId = v.mapId
this.SetMapName()
+ this.SetPos(this.mapTip,nil,this.formationId)
end)
end
--时间下拉框
@@ -168,36 +174,65 @@ function this:OnShow(_parent,...)
this.mapTimeTipPreList[i].des.text = this.timeList[i].."小时"
this.mapTimeTipPreList[i].data = this.timeList[i]
Util.AddOnceClick(this.mapTimeTipPreList[i].go,function()
- this.mapTimeTip.gameObject:SetActive(false)
this.formationList[this.formationId].exploreTime = this.timeList[i]
this.SetExploreTime()
+ this.SetPos(this.mapTimeTip,nil,this.formationId)
end)
end
end
this:TimeCountDown()
end
+function this.RefreshMapNameColor()
+ --红 fe5757 黄 f3e168 绿 58f567
+ for k,v in pairs(this.mapDatas) do
+ if FormationManager.GetFormationPower(this.formationId)/v.force < 0.8 then
+ this.mapTipPreList[k].des.text = string.format("%s","fe5757", v.name)
+ elseif FormationManager.GetFormationPower(this.formationId)/v.force >= 0.8 and FormationManager.GetFormationPower(this.formationId)/v.force < 1 then
+ this.mapTipPreList[k].des.text = string.format("%s","f3e168", v.name)
+ else
+ this.mapTipPreList[k].des.text = string.format("%s","58f567", v.name)
+ end
+ end
+end
+
function this.SetMapName(id)
- local forId = id or this.formationId
- this.itemList[this.formationList[forId].index].targgetBtnText.text = Explore[this.formationList[forId].mapId].Name
+ local forId = id or this.formationId
+ if FormationManager.GetFormationPower(forId)/Explore[this.formationList[forId].mapId].Force < 0.8 then
+ this.itemList[this.formationList[forId].index].targgetBtnText.text = string.format("%s","fe5757", Explore[this.formationList[forId].mapId].Name)
+ elseif FormationManager.GetFormationPower(forId)/Explore[this.formationList[forId].mapId].Force >= 0.8 and FormationManager.GetFormationPower(forId)/Explore[this.formationList[forId].mapId].Force < 1 then
+ this.itemList[this.formationList[forId].index].targgetBtnText.text = string.format("%s","f3e168", Explore[this.formationList[forId].mapId].Name)
+ else
+ this.itemList[this.formationList[forId].index].targgetBtnText.text = string.format("%s","58f567", Explore[this.formationList[forId].mapId].Name)
+ end
this.SetExploreCost(forId)
end
function this.SetExploreTime(id)
local forId = id or this.formationId
- this.itemList[this.formationList[forId].index].targgetTimeBtnText.text = this.formationList[forId].exploreTime.."小时"
+ if this.formationList[forId].select == -1 then
+ this.itemList[this.formationList[forId].index].cost.gameObject:SetActive(false)
+ else
+ this.itemList[this.formationList[forId].index].cost.gameObject:SetActive(true)
+ this.itemList[this.formationList[forId].index].targgetTimeBtnText.text = this.formationList[forId].exploreTime.."小时"
+ end
this.SetExploreCost(forId)
end
function this.SetExploreCost(forId)
+ this.haveNum = BagManager.GetItemCountById(Explore[1].Cost[1])
if forId then
if this.formationList[forId].select == -1 then
- this.formationList[forId].cost.gameObject:SetActive(false)
+ this.itemList[this.formationList[forId].index].cost.gameObject:SetActive(false)
else
- this.formationList[forId].cost.gameObject:SetActive(true)
+ this.itemList[this.formationList[forId].index].cost.gameObject:SetActive(true)
this.itemList[this.formationList[forId].index].costIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(Explore[this.formationList[forId].mapId].Cost[1]))
this.formationList[forId].costNum = Explore[this.formationList[forId].mapId].Cost[2] * (this.formationList[forId].exploreTime * 60)
- this.itemList[this.formationList[forId].index].costNum.text = this.formationList[forId].costNum
+ if this.formationList[forId].costNum >= this.haveNum then
+ this.itemList[this.formationList[forId].index].costNum.text = string.format("%s","00ff00",this.formationList[forId].costNum)
+ else
+ this.itemList[this.formationList[forId].index].costNum.text = this.formationList[forId].costNum
+ end
end
end
local num = 0
@@ -206,13 +241,11 @@ function this.SetExploreCost(forId)
num = num + v.costNum
end
end
- this.haveNum = BagManager.GetItemCountById(Explore[1].Cost[1])
if num < this.haveNum then
- this.num.text = string.format("%s/%s","00ff00",num,this.haveNum)
+ this.num.text = string.format("%s/%s","00ff00",num,this.haveNum)
else
- this.num.text = string.format("%s/%s","ff0000",num,this.haveNum)
+ this.num.text = string.format("%s/%s","ffddbb",num,this.haveNum)
end
- this.formationId = 0
end
function this.SetPos(gobj,pos,formationId)
@@ -225,6 +258,7 @@ function this.SetPos(gobj,pos,formationId)
else
gobj.gameObject:SetActive(false)
gobj.transform:SetParent(this.transform)
+ this.formationId = 0
end
end
@@ -237,6 +271,20 @@ function this:Refresh(_data,_item,index)
_item.heroList[j].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(1))
_item.heroList[j].hero:SetActive(false)
_item.heroList[j].frame.gameObject:GetComponent("Button").onClick:RemoveAllListeners()
+ _item.heroList[j].heroData = nil
+ Util.AddOnceClick(_item.heroList[j].frame.gameObject,function()
+ if _data.state < 1 then
+ ExploreManager.curFormationIndex = _data.formationId
+ UIManager.OpenPanel(UIName.FormationPanelV2,FORMATION_TYPE.ExploreFunc)
+ else
+ PopupTipPanel.ShowTip(string.format("队伍正在探索%s,无法进行调整!",ExploreManager.ExploreMapData[_data.mapId].name))
+ end
+ end)
+ Util.AddLongPressClick(_item.heroList[j].frame.gameObject, function()
+ if _item.heroList[j].heroData then
+ UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,_item.heroList[j].heroData.id,_item.heroList[j].heroData.star)
+ end
+ end, 0.5)
end
local formation = FormationManager.GetFormationByID(_data.formationId)
for j, hero in ipairs(formation.teamHeroInfos) do
@@ -244,25 +292,22 @@ function this:Refresh(_data,_item,index)
_item.heroList[j].hero:SetActive(true)
_item.heroList[j].levelText.text = heroData.lv
local star,starType = heroData.GetStar(1)
- SetHeroStars(this.spLoader, _item.heroList[j].starGrid, star,starType)
+ local star,starType = heroData.GetStar(1)
+ local starSize = Vector2.New(25,25)
+ local starScale = -12.3
+ if starType == 3 then
+ starSize = Vector2.New(0.7,-25)
+ starScale = -23.75
+ elseif starType == 2 then
+ starSize = Vector2.New(36.868,39.76)
+ end
+ SetHeroStars(this.spLoader, _item.heroList[j].starGrid, star,starType,starSize,starScale)
local demonId = heroData.id
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
_item.heroList[j].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
_item.heroList[j].icon.sprite = this.spLoader:LoadSprite(heroData.icon)
_item.heroList[j].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
- Util.AddOnceClick(_item.heroList[j].frame.gameObject,function()
- if _data.state < 1 then
- ExploreManager.curFormationIndex = _data.formationId
- UIManager.OpenPanel(UIName.FormationPanelV2,FORMATION_TYPE.ExploreFunc)
- else
- PopupTipPanel.ShowTip(string.format("队伍正在探索%s,无法进行调整!",ExploreManager.ExploreMapData[_data.mapId].name))
- end
- end)
- Util.AddLongPressClick(_item.heroList[j].frame.gameObject, function()
- if this.typeIndex ~= 0 then
- UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,demonId,hero.star)
- end
- end, 0.5)
+ _item.heroList[j].heroData = heroData
end
this.formationList[_data.formationId] = {} --formationId 为索引 ,预设index,mapId,exploreTime,formationId
@@ -285,10 +330,11 @@ function this:Refresh(_data,_item,index)
else
_item.exploring.gameObject:SetActive(true)
this.formationList[_data.formationId].select = -1
- this.formationList[_data.formationId].mapId = this.mapDatas[1].mapId
+ this.formationList[_data.formationId].mapId = _data.mapId
this.formationList[_data.formationId].exploreTime = this.mapDatas[1].exploreTime
_item.targgetTimeBtn.gameObject:SetActive(false)
end
+ LogGreen("_data.formationId:".._data.formationId.." this.formationList[_data.formationId].mapId:"..this.formationList[_data.formationId].mapId)
this.SetMapName(_data.formationId)
this.SetExploreTime(_data.formationId)
_item.selectIma.gameObject:SetActive(this.formationList[_data.formationId].select == 1)
@@ -303,9 +349,14 @@ function this:Refresh(_data,_item,index)
end)
Util.AddOnceClick(_item.targgetBtn,function()
- this.SetPos(this.mapTip,_item.targgetRoot,_data.formationId)
+ if _data.state < 1 then
+ this.SetPos(this.mapTimeTip,nil,this.formationId)
+ this.SetPos(this.mapTip,_item.targgetRoot,_data.formationId)
+ this.RefreshMapNameColor()
+ end
end)
Util.AddOnceClick(_item.targgetTimeBtn,function()
+ this.SetPos(this.mapTip,nil,this.formationId)
this.SetPos(this.mapTimeTip,_item.targgetTimeRoot,_data.formationId)
end)
@@ -359,6 +410,8 @@ end
function this:OnDestroy()
this.spLoader:Destroy()
this.itemList = {}
+ this.mapTipPreList = {}
+ this.mapTimeTipPreList = {}
end
return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
index a1af90f584..158c10f530 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
@@ -1083,7 +1083,6 @@ function this.LingMaiIndication(buffer)
LingMaiMiJingManager.curPage = 0
Game.GlobalEvent:DispatchEvent(GameEvent.LingMaiMiJing.RefreshPanel)
end)
-
end
--刷新探索编队
@@ -1092,6 +1091,7 @@ function NetManager.ExplorerMapIndicationResponse(buffer)
local msg = PlayerInfoProto_pb.ExplorerMapIndicationResponse()
msg:ParseFromString(data)
ExploreManager.UpdateFormationData(msg.exploreInfo)
+ Game.GlobalEvent:DispatchEvent(GameEvent.Explore.UpdateFormation)
end
return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index abb339207a..0e1f5ef914 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -6357,7 +6357,8 @@ function NetManager.ExplorerMapRewardRequest(typeId,teamId,fun)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.ExplorerMapRewardResponse()
msg:ParseFromString(data)
- ExploreManager.ResetTeamByTeamId(teamId)
+ ExploreManager.UpdateFormationData(msg.exploreInfo)
+ Game.GlobalEvent:DispatchEvent(GameEvent.Explore.UpdateFormation)
if fun then
fun(msg.drop)
end
diff --git a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
index 63d7303e32..0ada611eb2 100644
--- a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
+++ b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
@@ -147,7 +147,7 @@ function SingleExplorePlayerView:SetData(u,v,isSelf,data)
if isSelf then
self.ui:GetComponent("Canvas").worldCamera = TileMapView.GetCamera()
end
- self.isSelf = isSelf or data.formationId > 3100
+ self.isSelf = isSelf
local v3 = TileMapView.GetLiveTilePos(u, v)
self.gameObject.transform.localPosition = Vector3(v3.x, v3.y, v3.z - 10)
@@ -159,7 +159,7 @@ function SingleExplorePlayerView:SetData(u,v,isSelf,data)
end
local npc,scale
- if self.isSelf then
+ if data.formationId > 3100 then
npc = NameManager.roleSex == ROLE_SEX.BOY and npc1 or npc2
scale = NameManager.roleSex == ROLE_SEX.BOY and 1 or 0.5
self.userId = PlayerManager.uid
@@ -230,7 +230,7 @@ function SingleExplorePlayerView:SetData(u,v,isSelf,data)
end
function SingleExplorePlayerView:RefreshHp()
- if self.isSelf then
+ if self.data.formationId > 3100 then
self.blood:SetActive(true)
local hp = ExploreManager.GetHpById(self.data.formationId)
if hp <= 0 then