diff --git a/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_lfzz.prefab b/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_lfzz.prefab
index fd575d48a8..b4438a13c5 100644
--- a/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_lfzz.prefab
+++ b/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_lfzz.prefab
@@ -47079,7 +47079,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 11
+ m_SortingOrder: 16
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@@ -51898,7 +51898,7 @@ Canvas:
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
- m_SortingOrder: 10
+ m_SortingOrder: 15
m_TargetDisplay: 0
--- !u!1 &3996167517654444152
GameObject:
diff --git a/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab b/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
index e75e54a218..6ca208dca5 100644
--- a/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
@@ -4680,8 +4680,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: 0.000015258789, y: -89.600006}
- m_SizeDelta: {x: 64.4, y: 37.51}
+ m_AnchoredPosition: {x: 0.000015258789, y: -91.24}
+ m_SizeDelta: {x: 64.4, y: 40.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222600956484834218
CanvasRenderer:
@@ -5104,6 +5104,8 @@ RectTransform:
- {fileID: 1298334587255639450}
- {fileID: 1799237812738150230}
- {fileID: 8592251680213530260}
+ - {fileID: 6193489970714018668}
+ - {fileID: 1449685011234502786}
m_Father: {fileID: 224797861638971062}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -38611,6 +38613,85 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
+--- !u!1 &1597479055163298302
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1449685011234502786}
+ - component: {fileID: 1091151930144477597}
+ - component: {fileID: 6827508354133794526}
+ m_Layer: 5
+ m_Name: middleDownLv
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1449685011234502786
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1597479055163298302}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.9009009, y: 0.9009009, z: 1}
+ m_Children: []
+ m_Father: {fileID: 224550793111032812}
+ m_RootOrder: 12
+ 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.62, y: -46.553}
+ m_SizeDelta: {x: 127.2, y: 33.125}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1091151930144477597
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1597479055163298302}
+ m_CullTransparentMesh: 0
+--- !u!114 &6827508354133794526
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1597479055163298302}
+ 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: 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: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 7
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: +88
--- !u!1 &2066763438172914823
GameObject:
m_ObjectHideFlags: 0
@@ -39136,6 +39217,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &3519125261167570629
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6193489970714018668}
+ - component: {fileID: 6593720557690555738}
+ - component: {fileID: 5584268453037143474}
+ m_Layer: 5
+ m_Name: rightUplv
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6193489970714018668
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3519125261167570629}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.9009009, y: 0.9009009, z: 1}
+ m_Children: []
+ m_Father: {fileID: 224550793111032812}
+ m_RootOrder: 11
+ 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: 32.199997, y: 47.13}
+ m_SizeDelta: {x: 61.8, y: 34.29}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6593720557690555738
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3519125261167570629}
+ m_CullTransparentMesh: 0
+--- !u!114 &5584268453037143474
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3519125261167570629}
+ 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: 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: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 5
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: +88
--- !u!1 &3721601256782621991
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab
index 575a0ba7fb..24a4fd445b 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab
@@ -1,79 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &154342888
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 154342889}
- - component: {fileID: 154342891}
- - component: {fileID: 154342890}
- m_Layer: 5
- m_Name: Image (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &154342889
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 154342888}
- 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: 3429848893303434099}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &154342891
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 154342888}
- m_CullTransparentMesh: 0
---- !u!114 &154342890
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 154342888}
- 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: d1ae2fdf5abfca745baf5d316f53b922, 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 &1051661085763968
GameObject:
m_ObjectHideFlags: 0
@@ -104,30 +30,17 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 29959941330452512}
- {fileID: 224858912925290730}
- - {fileID: 224470223336895144}
- {fileID: 224231594156623100}
- {fileID: 1487334206293699636}
- - {fileID: 224301927287941064}
- - {fileID: 224560761078020366}
- - {fileID: 224329181157161428}
- - {fileID: 5073002665743333441}
- - {fileID: 7314318884884515957}
- - {fileID: 9006242014269321552}
- - {fileID: 8910112172900146093}
- - {fileID: 1202024464223070450}
- - {fileID: 1537709242865011066}
- - {fileID: 3429848893303434099}
- - {fileID: 6315777813238424457}
- - {fileID: 200987415758722225}
+ - {fileID: 8601325964190918751}
m_Father: {fileID: 224400331968681076}
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.31, y: -18}
- m_SizeDelta: {x: 934.82, y: 1354.29}
+ m_AnchoredPosition: {x: 0.31, y: -11.5}
+ m_SizeDelta: {x: 934.8, y: 1341.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222825221280641506
CanvasRenderer:
@@ -208,212 +121,6 @@ MonoBehaviour:
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
---- !u!1 &1109229765254488
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 224598554367495538}
- - component: {fileID: 114298299405193568}
- - component: {fileID: 114213375696776046}
- m_Layer: 5
- m_Name: grid
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &224598554367495538
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1109229765254488}
- 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: 224329181157161428}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 1}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: 0.00000013838624}
- m_SizeDelta: {x: 912.8, y: 0}
- m_Pivot: {x: 0.5, y: 1}
---- !u!114 &114298299405193568
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1109229765254488}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 0
- m_StartCorner: 0
- m_StartAxis: 0
- m_CellSize: {x: 912.8, y: 60}
- m_Spacing: {x: 0, y: 8}
- m_Constraint: 0
- m_ConstraintCount: 2
---- !u!114 &114213375696776046
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1109229765254488}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 0
- m_VerticalFit: 2
---- !u!1 &1121660272366582
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 224560761078020366}
- - component: {fileID: 222587172791576546}
- m_Layer: 5
- m_Name: armorInfo
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &224560761078020366
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1121660272366582}
- 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: 224899409323690872}
- - {fileID: 224253198927914972}
- - {fileID: 3423017531354456566}
- - {fileID: 5330580804550346226}
- - {fileID: 224719441058549306}
- - {fileID: 5804312208329413697}
- - {fileID: 2603738261374886464}
- m_Father: {fileID: 224199271576904048}
- m_RootOrder: 6
- 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: 28.440002, y: 426.59998}
- m_SizeDelta: {x: 873.1, y: 171}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &222587172791576546
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1121660272366582}
- m_CullTransparentMesh: 0
---- !u!1 &1208891036823800
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 224719441058549306}
- - component: {fileID: 222029699015186502}
- - component: {fileID: 7922316899136432607}
- m_Layer: 5
- m_Name: equipQuaText
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &224719441058549306
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1208891036823800}
- 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: 224560761078020366}
- m_RootOrder: 4
- 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: 284.20093, y: 42.7}
- m_SizeDelta: {x: 170.3, y: 101.6}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &222029699015186502
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1208891036823800}
- m_CullTransparentMesh: 0
---- !u!114 &7922316899136432607
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1208891036823800}
- 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.9882353, g: 0.92156863, b: 0.7921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 44
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 45
- m_Alignment: 5
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1.44
- m_Text: "[\u4F20\u8BF4]"
- LanguageIndex: 0
--- !u!1 &1211719135439158
GameObject:
m_ObjectHideFlags: 0
@@ -530,11 +237,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224199271576904048}
- m_RootOrder: 3
+ 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.28999758, y: -127}
+ m_AnchoredPosition: {x: -0.28999758, y: -302.8}
m_SizeDelta: {x: 898.92, y: 4.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222080409572554106
@@ -574,355 +281,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &1482780465896726
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 224301927287941064}
- - component: {fileID: 222895587236181168}
- - component: {fileID: 114241330590320256}
- - component: {fileID: 114768475442790622}
- - component: {fileID: 95776355488792712}
- m_Layer: 5
- m_Name: btnBack
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &224301927287941064
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1482780465896726}
- 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: 224199271576904048}
- m_RootOrder: 5
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 1}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -40, y: -34.90503}
- m_SizeDelta: {x: 154, y: 120}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &222895587236181168
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1482780465896726}
- m_CullTransparentMesh: 0
---- !u!114 &114241330590320256
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1482780465896726}
- 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: 87b3cd7ab5ab3854db979a44d7e17767, 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 &114768475442790622
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1482780465896726}
- 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: 114241330590320256}
- 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 &95776355488792712
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1482780465896726}
- 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 &1557159508162248
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 224253198927914972}
- - component: {fileID: 222648746930564346}
- - component: {fileID: 114094640042657120}
- m_Layer: 5
- m_Name: icon
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &224253198927914972
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1557159508162248}
- 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: 224560761078020366}
- 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: -29.399994, y: 22.300005}
- m_SizeDelta: {x: 140, y: 140}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &222648746930564346
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1557159508162248}
- m_CullTransparentMesh: 0
---- !u!114 &114094640042657120
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1557159508162248}
- 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: 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 &1594411007685724
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 224054012233527022}
- - component: {fileID: 222139857334499600}
- - component: {fileID: 114730971872105180}
- - component: {fileID: 114818390635888258}
- - component: {fileID: 95676884335993178}
- m_Layer: 5
- m_Name: btnStrong
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &224054012233527022
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1594411007685724}
- 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: 136220962748896570}
- m_Father: {fileID: 5073002665743333441}
- 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 &222139857334499600
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1594411007685724}
- m_CullTransparentMesh: 0
---- !u!114 &114730971872105180
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1594411007685724}
- 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: 1
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!114 &114818390635888258
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1594411007685724}
- 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: 114730971872105180}
- 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 &95676884335993178
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1594411007685724}
- 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 &1595637088291016
GameObject:
m_ObjectHideFlags: 0
@@ -952,8 +310,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 224199271576904048}
- m_RootOrder: 2
+ m_Father: {fileID: 8601325964190918751}
+ 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}
@@ -1003,201 +361,6 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5F3A\u5316\u5B9D\u7269"
LanguageIndex: 0
---- !u!1 &1767456461533600
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 224899409323690872}
- - component: {fileID: 222330271840074616}
- - component: {fileID: 114316205119100838}
- m_Layer: 5
- m_Name: frame
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &224899409323690872
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1767456461533600}
- 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: 224560761078020366}
- 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: -29.4, y: 22.3}
- m_SizeDelta: {x: 150, y: 150}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &222330271840074616
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1767456461533600}
- m_CullTransparentMesh: 0
---- !u!114 &114316205119100838
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1767456461533600}
- 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: 0f7579036915c65459a15fae41f1c712, 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 &1802421928742500
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 224329181157161428}
- - component: {fileID: 222760057534299902}
- - component: {fileID: 114917738477840292}
- - component: {fileID: 114425703449556568}
- - component: {fileID: 114571374100982868}
- m_Layer: 5
- m_Name: scroll
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &224329181157161428
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1802421928742500}
- 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: 224598554367495538}
- m_Father: {fileID: 224199271576904048}
- 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: -1.99, y: 180}
- m_SizeDelta: {x: 912.8, y: 415}
- m_Pivot: {x: 0.5, y: 1}
---- !u!222 &222760057534299902
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1802421928742500}
- m_CullTransparentMesh: 0
---- !u!114 &114917738477840292
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1802421928742500}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 10758, guid: 0000000000000000f000000000000000, type: 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: 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!114 &114425703449556568
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1802421928742500}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Content: {fileID: 224598554367495538}
- m_Horizontal: 0
- m_Vertical: 1
- m_MovementType: 1
- m_Elasticity: 0.1
- m_Inertia: 1
- m_DecelerationRate: 0.135
- m_ScrollSensitivity: 1
- m_Viewport: {fileID: 0}
- m_HorizontalScrollbar: {fileID: 0}
- m_VerticalScrollbar: {fileID: 0}
- m_HorizontalScrollbarVisibility: 0
- m_VerticalScrollbarVisibility: 0
- m_HorizontalScrollbarSpacing: 0
- m_VerticalScrollbarSpacing: 0
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
---- !u!114 &114571374100982868
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1802421928742500}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &1921899366914214
GameObject:
m_ObjectHideFlags: 0
@@ -1228,7 +391,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224199271576904048}
- m_RootOrder: 1
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -1346,7 +509,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &20732012085010188
+--- !u!1 &315085738118997065
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1354,246 +517,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 3429848893303434099}
- m_Layer: 5
- m_Name: propertyPre
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &3429848893303434099
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 20732012085010188}
- 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: 154342889}
- - {fileID: 211025231975520396}
- - {fileID: 1346551320064730162}
- - {fileID: 3888626507259867584}
- m_Father: {fileID: 224199271576904048}
- m_RootOrder: 14
- 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.000024059, y: 223}
- m_SizeDelta: {x: 908.82, y: 59.6}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &193242148344833601
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 200987415758722225}
- - component: {fileID: 1622020682388613000}
- - component: {fileID: 1259112399338797564}
- m_Layer: 5
- m_Name: hintTxt
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &200987415758722225
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 193242148344833601}
- 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: 224199271576904048}
- m_RootOrder: 16
- 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.99, y: -364.88004}
- m_SizeDelta: {x: 755.3, y: 88.74}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1622020682388613000
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 193242148344833601}
- m_CullTransparentMesh: 0
---- !u!114 &1259112399338797564
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 193242148344833601}
- 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.5058824, g: 0.42745098, b: 0.30588236, 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: 50
- m_FontStyle: 0
- m_BestFit: 1
- m_MinSize: 3
- m_MaxSize: 50
- m_Alignment: 1
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u66F4\u9AD8\u54C1\u8D28\u7684\u5B9D\u7269\u53EF\u63D0\u5347"
- LanguageIndex: 0
---- !u!1 &246801933638980789
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3888626507259867584}
- - component: {fileID: 152011556248132221}
- - component: {fileID: 974946671950208535}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &3888626507259867584
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 246801933638980789}
- 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: 3429848893303434099}
- 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: 120, y: -0.0000058413}
- m_SizeDelta: {x: 50, y: 52}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &152011556248132221
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 246801933638980789}
- m_CullTransparentMesh: 0
---- !u!114 &974946671950208535
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 246801933638980789}
- 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: 81fd51d00b50d784ab6e523eb8951722, 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 &247864747304192944
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 29959941330452512}
- - component: {fileID: 27352730712855346}
- m_Layer: 5
- m_Name: bg
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &29959941330452512
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 247864747304192944}
- 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: 224199271576904048}
- 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.0005472605, y: 0.005553484}
- m_SizeDelta: {x: 934.2, y: 1358.4}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &27352730712855346
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 247864747304192944}
- m_CullTransparentMesh: 0
---- !u!1 &371885649714964429
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2591358067226158667}
- - component: {fileID: 4498454939088688942}
- - component: {fileID: 7209755932875389085}
+ - component: {fileID: 5222069971023262893}
+ - component: {fileID: 8103502471223157627}
+ - component: {fileID: 3824330138241205228}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@@ -1601,40 +527,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &2591358067226158667
+--- !u!224 &5222069971023262893
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 371885649714964429}
+ m_GameObject: {fileID: 315085738118997065}
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: 6392869070835945469}
+ m_Father: {fileID: 5304136016580012509}
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.47, y: 5.14}
- m_SizeDelta: {x: 202.83, y: 53.58}
+ m_AnchoredPosition: {x: -0.72, y: 4.68}
+ m_SizeDelta: {x: 202.77, y: 54.5}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4498454939088688942
+--- !u!222 &8103502471223157627
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 371885649714964429}
+ m_GameObject: {fileID: 315085738118997065}
m_CullTransparentMesh: 0
---- !u!114 &7209755932875389085
+--- !u!114 &3824330138241205228
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 371885649714964429}
+ m_GameObject: {fileID: 315085738118997065}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
@@ -1661,9 +587,9 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u7CBE \u70BC"
+ m_Text: "\u5F3A \u5316"
LanguageIndex: 0
---- !u!1 &447749236674790211
+--- !u!1 &904155751624298721
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1671,137 +597,78 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1955064960753932493}
- - component: {fileID: 8916317711203751259}
- - component: {fileID: 9166196600232150349}
- - component: {fileID: 1030139591328887995}
+ - component: {fileID: 3353385484946297119}
m_Layer: 5
- m_Name: Text
+ m_Name: firstScroll
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1955064960753932493
+--- !u!224 &3353385484946297119
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 447749236674790211}
- 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: 5701584552021141591}
- 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.41, y: 3.31}
- m_SizeDelta: {x: 124.43, y: 74.19}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8916317711203751259
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 447749236674790211}
- m_CullTransparentMesh: 0
---- !u!114 &9166196600232150349
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 447749236674790211}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1573420865, 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!114 &1030139591328887995
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 447749236674790211}
- 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.65882355, g: 0.65882355, b: 0.654902, 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: 45
- m_FontStyle: 0
- m_BestFit: 1
- m_MinSize: 4
- m_MaxSize: 45
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u7CBE \u70BC"
- LanguageIndex: 0
---- !u!1 &583400197383459734
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 9006242014269321552}
- - component: {fileID: 1267635333025182550}
- m_Layer: 5
- m_Name: costGrid
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &9006242014269321552
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 583400197383459734}
+ m_GameObject: {fileID: 904155751624298721}
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: 224199271576904048}
+ m_Father: {fileID: 8601325964190918751}
+ m_RootOrder: 4
+ 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.2075, y: 272.5}
+ m_SizeDelta: {x: 932.4, y: 578.4}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1312853492439174918
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8766961231832293434}
+ - component: {fileID: 3287052441690214797}
+ m_Layer: 5
+ m_Name: btnGrid
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8766961231832293434
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1312853492439174918}
+ 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: 5304136016580012509}
+ - {fileID: 7987669967423616727}
+ m_Father: {fileID: 8601325964190918751}
m_RootOrder: 10
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.98, y: -220.18}
- m_SizeDelta: {x: 488.7, y: 185.3}
+ m_AnchoredPosition: {x: -4.5175, y: -523.8}
+ m_SizeDelta: {x: 925.8, y: 118.1}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1267635333025182550
+--- !u!114 &3287052441690214797
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 583400197383459734}
+ m_GameObject: {fileID: 1312853492439174918}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -1815,11 +682,11 @@ MonoBehaviour:
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
- m_CellSize: {x: 150, y: 150}
- m_Spacing: {x: 50, y: 0}
- m_Constraint: 0
- m_ConstraintCount: 2
---- !u!1 &894437548824072034
+ m_CellSize: {x: 260, y: 80}
+ m_Spacing: {x: 65.96, y: 0}
+ m_Constraint: 2
+ m_ConstraintCount: 1
+--- !u!1 &1479426666700072429
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1827,322 +694,53 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5559492089770357373}
- - component: {fileID: 2160341278019337203}
- - component: {fileID: 5195291640708188511}
- - component: {fileID: 1416101558767434426}
+ - component: {fileID: 5304136016580012509}
+ - component: {fileID: 8026084942981901111}
+ - component: {fileID: 7072306317375809799}
+ - component: {fileID: 143095634428376611}
+ - component: {fileID: 7413795000573766927}
m_Layer: 5
- m_Name: icon
+ m_Name: btnStrong
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &5559492089770357373
+--- !u!224 &5304136016580012509
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 894437548824072034}
- 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: 7314318884884515957}
- 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.21000004, y: 1.5999999}
- m_SizeDelta: {x: 145, y: 145}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2160341278019337203
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 894437548824072034}
- m_CullTransparentMesh: 0
---- !u!114 &5195291640708188511
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 894437548824072034}
- 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: 28ab552430990fc4e8916d99f2d8c7bf, 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 &1416101558767434426
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 894437548824072034}
- 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: 5195291640708188511}
- 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 &917860059901269761
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6315777813238424457}
- - component: {fileID: 409599533291894833}
- - component: {fileID: 2050400664784066150}
- m_Layer: 5
- m_Name: btnList
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6315777813238424457
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 917860059901269761}
+ m_GameObject: {fileID: 1479426666700072429}
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: 5495216742107921350}
- - {fileID: 1236371834270139311}
- - {fileID: 5701584552021141591}
- m_Father: {fileID: 224199271576904048}
- m_RootOrder: 15
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 469.39, y: 85.57507}
- m_SizeDelta: {x: 912.8, y: 145.15}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &409599533291894833
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 917860059901269761}
- m_CullTransparentMesh: 0
---- !u!114 &2050400664784066150
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 917860059901269761}
- 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: 2609ccd74e672d84c8e128abd8dc9428, 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 &1113983571454832052
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1745417881599949250}
- - component: {fileID: 8315779457062192270}
- - component: {fileID: 2813423429657349049}
- m_Layer: 5
- m_Name: add
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1745417881599949250
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1113983571454832052}
- 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: 907290967827395017}
- m_Father: {fileID: 7314318884884515957}
- 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.0000035762787, y: 0.0012540817}
- m_SizeDelta: {x: 151.84, y: 149.03}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8315779457062192270
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1113983571454832052}
- m_CullTransparentMesh: 0
---- !u!114 &2813423429657349049
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1113983571454832052}
- 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: 0}
- 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: 10917, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!1 &1432427302613694074
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6392869070835945469}
- - component: {fileID: 1526903336700493124}
- - component: {fileID: 3891317252911521974}
- - component: {fileID: 4048912649217451205}
- - component: {fileID: 5876601600652965533}
- m_Layer: 5
- m_Name: btnRefine
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6392869070835945469
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1432427302613694074}
- 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: 2591358067226158667}
- m_Father: {fileID: 5073002665743333441}
- m_RootOrder: 1
+ - {fileID: 5222069971023262893}
+ m_Father: {fileID: 8766961231832293434}
+ 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 &1526903336700493124
+--- !u!222 &8026084942981901111
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1432427302613694074}
+ m_GameObject: {fileID: 1479426666700072429}
m_CullTransparentMesh: 0
---- !u!114 &3891317252911521974
+--- !u!114 &7072306317375809799
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1432427302613694074}
+ m_GameObject: {fileID: 1479426666700072429}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -2165,13 +763,13 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!114 &4048912649217451205
+--- !u!114 &143095634428376611
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1432427302613694074}
+ m_GameObject: {fileID: 1479426666700072429}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -2201,20 +799,20 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
- m_TargetGraphic: {fileID: 3891317252911521974}
+ m_TargetGraphic: {fileID: 7072306317375809799}
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 &5876601600652965533
+--- !u!95 &7413795000573766927
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1432427302613694074}
+ m_GameObject: {fileID: 1479426666700072429}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
@@ -2226,7 +824,7 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
---- !u!1 &1525622514208820096
+--- !u!1 &1559326825348530193
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2234,147 +832,88 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8910112172900146093}
- - component: {fileID: 5408151663148942050}
- - component: {fileID: 8544733722906789568}
+ - component: {fileID: 1637966701065397349}
+ - component: {fileID: 1635651972752724239}
+ - component: {fileID: 1454835920716131757}
m_Layer: 5
- m_Name: coinBg
+ m_Name: itemView
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &8910112172900146093
+--- !u!224 &1637966701065397349
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1525622514208820096}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_GameObject: {fileID: 1559326825348530193}
+ 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: 224199271576904048}
- m_RootOrder: 11
+ m_Children:
+ - {fileID: 5256173008985457623}
+ - {fileID: 1735107859949433548}
+ m_Father: {fileID: 8601325964190918751}
+ 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.32, y: -377.24988}
- m_SizeDelta: {x: 198.56, y: 55.42}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5408151663148942050
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1525622514208820096}
- m_CullTransparentMesh: 0
---- !u!114 &8544733722906789568
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1525622514208820096}
- 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: 2325bf2dd33e51f439a871065ee1936c, 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!1 &2385322032321275614
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8392905709637296888}
- - component: {fileID: 8304878974226422029}
- - component: {fileID: 3574517526902655145}
- m_Layer: 5
- m_Name: iconBg
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8392905709637296888
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2385322032321275614}
- 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: 7314318884884515957}
- 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.00000333786, y: 0.042500973}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: -7590.3, y: -314.07507}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8304878974226422029
+--- !u!222 &1635651972752724239
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2385322032321275614}
+ m_GameObject: {fileID: 1559326825348530193}
m_CullTransparentMesh: 0
---- !u!114 &3574517526902655145
+--- !u!114 &1454835920716131757
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2385322032321275614}
- m_Enabled: 1
+ m_GameObject: {fileID: 1559326825348530193}
+ m_Enabled: 0
m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, 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: e08e5d784d4a9fa4a8b3886587dfb536, 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 &2540865820060096328
+ tweenSequeue:
+ - initV3: {x: 3, y: 3, z: 3}
+ initFloat: 0
+ isInit: 1
+ changeV3: {x: 1.15, y: 1.15, z: 1.15}
+ changeFloat: 0
+ duration: 0.2
+ delay: 0.13
+ curveType: 0
+ changeType: 4
+ sequeueType: 0
+ loop: 0
+ loopType: 0
+ targetObj: {fileID: 1637966701065397349}
+ - initV3: {x: 0, y: 0, z: 0}
+ initFloat: 0
+ isInit: 1
+ changeV3: {x: 0, y: 0, z: 0}
+ changeFloat: 1
+ duration: 0.4
+ delay: 0
+ curveType: 0
+ changeType: 8
+ sequeueType: 1
+ loop: 0
+ loopType: 0
+ targetObj: {fileID: 1637966701065397349}
+ isPlayAudio: 1
+ isHaveCloseBtn: 0
+ isPlayOnOpen: 0
+--- !u!1 &1719994769865641753
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2382,342 +921,52 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5701584552021141591}
- - component: {fileID: 3181038515659486262}
- - component: {fileID: 6417701490651073381}
+ - component: {fileID: 1499697434375710272}
+ - component: {fileID: 903598582962903888}
+ - component: {fileID: 5070764150917837516}
+ - component: {fileID: 5636721635624234170}
m_Layer: 5
- m_Name: selectBtn
+ m_Name: btnRefine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &5701584552021141591
+--- !u!224 &1499697434375710272
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2540865820060096328}
+ m_GameObject: {fileID: 1719994769865641753}
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: 1955064960753932493}
- m_Father: {fileID: 6315777813238424457}
+ - {fileID: 6138932371674921367}
+ m_Father: {fileID: 6863185804939559100}
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: -71.14999, y: -0.93}
- m_SizeDelta: {x: 157.49, y: 105.31}
+ m_AnchoredPosition: {x: 93.56, y: -36.02}
+ m_SizeDelta: {x: 224.68, y: 86.51}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3181038515659486262
+--- !u!222 &903598582962903888
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2540865820060096328}
+ m_GameObject: {fileID: 1719994769865641753}
m_CullTransparentMesh: 0
---- !u!114 &6417701490651073381
+--- !u!114 &5070764150917837516
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2540865820060096328}
- 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: 0e97e3866623faa4fa4a58ebb054267c, 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 &3149057747733147579
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1346551320064730162}
- - component: {fileID: 2798314743829266872}
- - component: {fileID: 2208667342001971180}
- m_Layer: 5
- m_Name: rightTxt
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1346551320064730162
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3149057747733147579}
- 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: 3429848893303434099}
- 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: 343.89, y: 12.604}
- m_SizeDelta: {x: 309.41, y: 47.435}
- m_Pivot: {x: 0.6427968, y: 0.7175935}
---- !u!222 &2798314743829266872
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3149057747733147579}
- m_CullTransparentMesh: 0
---- !u!114 &2208667342001971180
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3149057747733147579}
- 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.32156864, g: 0.50980395, b: 0.18823531, 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: 38
- m_FontStyle: 0
- m_BestFit: 1
- m_MinSize: 26
- m_MaxSize: 38
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: 1/11
---- !u!1 &3303996978115537919
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5192785441491762852}
- - component: {fileID: 406487657384510625}
- - component: {fileID: 7467486030994685458}
- m_Layer: 5
- m_Name: proImg
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5192785441491762852
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3303996978115537919}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -100}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 7314318884884515957}
- 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: -48.4, y: 46.9}
- m_SizeDelta: {x: 80, y: 80}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &406487657384510625
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3303996978115537919}
- m_CullTransparentMesh: 0
---- !u!114 &7467486030994685458
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3303996978115537919}
- 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: 8748766ca3b15a94496c10f21d68c450, 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 &3520896522812727470
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5073002665743333441}
- - component: {fileID: 4130355120968930253}
- m_Layer: 5
- m_Name: btnGrid
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5073002665743333441
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3520896522812727470}
- 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: 224054012233527022}
- - {fileID: 6392869070835945469}
- m_Father: {fileID: 224199271576904048}
- m_RootOrder: 8
- 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.5599785, y: -468.3}
- m_SizeDelta: {x: 100, y: 118.1}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &4130355120968930253
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3520896522812727470}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -2095666955, 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_StartCorner: 0
- m_StartAxis: 0
- m_CellSize: {x: 260, y: 80}
- m_Spacing: {x: 65.96, y: 0}
- m_Constraint: 2
- m_ConstraintCount: 1
---- !u!1 &3632853231820302341
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5495216742107921350}
- - component: {fileID: 1012143961079131606}
- - component: {fileID: 5492494315450868211}
- - component: {fileID: 1275504080481545226}
- m_Layer: 5
- m_Name: btnStrong
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5495216742107921350
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3632853231820302341}
- 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: 5220662710083410280}
- m_Father: {fileID: 6315777813238424457}
- 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: -71.15, y: -0.35998}
- m_SizeDelta: {x: 157.49, y: 106.45}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1012143961079131606
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3632853231820302341}
- m_CullTransparentMesh: 0
---- !u!114 &5492494315450868211
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3632853231820302341}
+ m_GameObject: {fileID: 1719994769865641753}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -2740,13 +989,13 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!114 &1275504080481545226
+--- !u!114 &5636721635624234170
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3632853231820302341}
+ m_GameObject: {fileID: 1719994769865641753}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -2776,13 +1025,13 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
- m_TargetGraphic: {fileID: 5492494315450868211}
+ m_TargetGraphic: {fileID: 5070764150917837516}
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 &4570052971014880991
+--- !u!1 &1841645999426851110
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2790,9 +1039,127 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 136220962748896570}
- - component: {fileID: 3501660418317487315}
- - component: {fileID: 3170970345365984063}
+ - component: {fileID: 5482789836646361175}
+ - component: {fileID: 4663026695833607491}
+ - component: {fileID: 972125918473519543}
+ - component: {fileID: 4388186785825493819}
+ m_Layer: 5
+ m_Name: btnStrong
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5482789836646361175
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841645999426851110}
+ 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: 7616489259570186854}
+ m_Father: {fileID: 6863185804939559100}
+ 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: -98.12, y: -36.02}
+ m_SizeDelta: {x: 221.56, y: 86.51}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4663026695833607491
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841645999426851110}
+ m_CullTransparentMesh: 0
+--- !u!114 &972125918473519543
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841645999426851110}
+ 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: dcab34f84847d94448b245ab7e62e44e, 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 &4388186785825493819
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841645999426851110}
+ 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: 972125918473519543}
+ 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 &2486696392898417555
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6567990969607741379}
+ - component: {fileID: 4714396971746102436}
+ - component: {fileID: 3878151694774909013}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@@ -2800,40 +1167,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &136220962748896570
+--- !u!224 &6567990969607741379
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4570052971014880991}
+ m_GameObject: {fileID: 2486696392898417555}
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: 224054012233527022}
+ m_Father: {fileID: 7987669967423616727}
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.72, y: 4.68}
- m_SizeDelta: {x: 202.77, y: 54.5}
+ m_AnchoredPosition: {x: -0.47, y: 5.14}
+ m_SizeDelta: {x: 202.83, y: 53.58}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3501660418317487315
+--- !u!222 &4714396971746102436
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4570052971014880991}
+ m_GameObject: {fileID: 2486696392898417555}
m_CullTransparentMesh: 0
---- !u!114 &3170970345365984063
+--- !u!114 &3878151694774909013
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4570052971014880991}
+ m_GameObject: {fileID: 2486696392898417555}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
@@ -2860,9 +1227,9 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u5F3A \u5316"
+ m_Text: "\u7CBE \u70BC"
LanguageIndex: 0
---- !u!1 &4584102586715162326
+--- !u!1 &3355960965441325692
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2870,208 +1237,120 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 211025231975520396}
- - component: {fileID: 6436212623530968397}
- - component: {fileID: 5767227051076526311}
+ - component: {fileID: 8526449022804383897}
+ - component: {fileID: 3977965609153665237}
+ - component: {fileID: 6922230065668968602}
+ - component: {fileID: 2776571641897122950}
+ - component: {fileID: 7915879237876410779}
m_Layer: 5
- m_Name: leftTxt
+ m_Name: secondScroll
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &211025231975520396
+--- !u!224 &8526449022804383897
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4584102586715162326}
- 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: 3429848893303434099}
- 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: -267.6, y: -0.0000047684}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6436212623530968397
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4584102586715162326}
- m_CullTransparentMesh: 0
---- !u!114 &5767227051076526311
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4584102586715162326}
- 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.6117647, g: 0.5686275, b: 0.454902, 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: 37
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 50
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u5F3A\u5316\u7B49\u7EA7"
- LanguageIndex: 0
---- !u!1 &4600216061506629356
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7314318884884515957}
- - component: {fileID: 6821424463134233887}
- m_Layer: 5
- m_Name: costItemPre
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7314318884884515957
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4600216061506629356}
+ m_GameObject: {fileID: 3355960965441325692}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 100}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 8392905709637296888}
- - {fileID: 5559492089770357373}
- - {fileID: 5192785441491762852}
- - {fileID: 1745417881599949250}
- - {fileID: 8207376377053420799}
- m_Father: {fileID: 224199271576904048}
- m_RootOrder: 9
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 468.83, y: -890.66}
- m_SizeDelta: {x: 150, y: 150}
- m_Pivot: {x: 0.5160313, y: 0.5444565}
---- !u!222 &6821424463134233887
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4600216061506629356}
- m_CullTransparentMesh: 0
---- !u!1 &5395920767404331588
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5330580804550346226}
- - component: {fileID: 5328007497398450486}
- - component: {fileID: 7972261494921536928}
- m_Layer: 5
- m_Name: nameTxt
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5330580804550346226
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5395920767404331588}
- 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: 224560761078020366}
- m_RootOrder: 3
+ - {fileID: 5076362339141073474}
+ m_Father: {fileID: 8601325964190918751}
+ m_RootOrder: 6
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: -29.4, y: -87.7}
- m_SizeDelta: {x: 197.2, y: 44.15}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5328007497398450486
+ m_AnchoredPosition: {x: 1.98, y: -101.4}
+ m_SizeDelta: {x: 912.8, y: 190.6}
+ m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3977965609153665237
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5395920767404331588}
+ m_GameObject: {fileID: 3355960965441325692}
m_CullTransparentMesh: 0
---- !u!114 &7972261494921536928
+--- !u!114 &6922230065668968602
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5395920767404331588}
+ m_GameObject: {fileID: 3355960965441325692}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.75294125, g: 0.69803923, b: 0.48627454, a: 1}
+ m_Material: {fileID: 10758, guid: 0000000000000000f000000000000000, type: 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 38
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 40
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u5929\u5730\u582A\u8206\u56FE"
- LanguageIndex: 0
---- !u!1 &5580360979982198715
+ 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!114 &2776571641897122950
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3355960965441325692}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 5076362339141073474}
+ m_Horizontal: 0
+ m_Vertical: 1
+ m_MovementType: 1
+ m_Elasticity: 0.1
+ m_Inertia: 1
+ m_DecelerationRate: 0.135
+ m_ScrollSensitivity: 1
+ m_Viewport: {fileID: 0}
+ m_HorizontalScrollbar: {fileID: 0}
+ m_VerticalScrollbar: {fileID: 0}
+ m_HorizontalScrollbarVisibility: 0
+ m_VerticalScrollbarVisibility: 0
+ m_HorizontalScrollbarSpacing: 0
+ m_VerticalScrollbarSpacing: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!114 &7915879237876410779
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3355960965441325692}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &3543488216793568729
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3079,10 +1358,84 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5181752287221677881}
- - component: {fileID: 8449258996102396517}
- - component: {fileID: 205666271171635533}
- - component: {fileID: 8218832420587948468}
+ - component: {fileID: 7708970020296267502}
+ - component: {fileID: 1372905920870659543}
+ - component: {fileID: 2313156259853110934}
+ m_Layer: 5
+ m_Name: select
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7708970020296267502
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3543488216793568729}
+ 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: 8601325964190918751}
+ 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: -3287, y: 570}
+ m_SizeDelta: {x: 167.01, y: 167.7}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1372905920870659543
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3543488216793568729}
+ m_CullTransparentMesh: 0
+--- !u!114 &2313156259853110934
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3543488216793568729}
+ 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: e0b47bc9a280e904f8fa3ee0e74d04ef, 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!1 &3555126904631651249
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7616489259570186854}
+ - component: {fileID: 3737762887012129571}
+ - component: {fileID: 4510672133309488295}
+ - component: {fileID: 6206945222915739695}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@@ -3090,40 +1443,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &5181752287221677881
+--- !u!224 &7616489259570186854
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5580360979982198715}
+ m_GameObject: {fileID: 3555126904631651249}
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: 1236371834270139311}
+ m_Father: {fileID: 5482789836646361175}
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.24, y: 3.5}
- m_SizeDelta: {x: 122.72, y: 75.16}
+ m_AnchoredPosition: {x: -0.2, y: 2.22}
+ m_SizeDelta: {x: 120.52, y: 74.05}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8449258996102396517
+--- !u!222 &3737762887012129571
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5580360979982198715}
+ m_GameObject: {fileID: 3555126904631651249}
m_CullTransparentMesh: 0
---- !u!114 &205666271171635533
+--- !u!114 &4510672133309488295
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5580360979982198715}
+ m_GameObject: {fileID: 3555126904631651249}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -3132,13 +1485,109 @@ MonoBehaviour:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
---- !u!114 &8218832420587948468
+--- !u!114 &6206945222915739695
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5580360979982198715}
+ m_GameObject: {fileID: 3555126904631651249}
+ 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.65882355, g: 0.65882355, b: 0.654902, 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: 45
+ m_FontStyle: 0
+ m_BestFit: 1
+ m_MinSize: 4
+ m_MaxSize: 45
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u5F3A \u5316"
+ LanguageIndex: 0
+--- !u!1 &3783686479210395328
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6138932371674921367}
+ - component: {fileID: 6279716942845303771}
+ - component: {fileID: 2293008699038936559}
+ - component: {fileID: 3067946697135753934}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6138932371674921367
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3783686479210395328}
+ 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: 1499697434375710272}
+ 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.24, y: 3.5}
+ m_SizeDelta: {x: 122.72, y: 75.16}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6279716942845303771
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3783686479210395328}
+ m_CullTransparentMesh: 0
+--- !u!114 &2293008699038936559
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3783686479210395328}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1573420865, 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!114 &3067946697135753934
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3783686479210395328}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
@@ -3167,7 +1616,7 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u7CBE \u70BC"
LanguageIndex: 0
---- !u!1 &6034096691612192640
+--- !u!1 &3942217229165222720
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3175,57 +1624,57 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8207376377053420799}
- - component: {fileID: 3198063896692121512}
- - component: {fileID: 4745481479353003747}
+ - component: {fileID: 9037458184156353713}
+ - component: {fileID: 1816302621520469665}
+ - component: {fileID: 5845331252472638659}
m_Layer: 5
- m_Name: numTxt
+ m_Name: rightTxt
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &8207376377053420799
+--- !u!224 &9037458184156353713
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6034096691612192640}
+ m_GameObject: {fileID: 3942217229165222720}
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: 7314318884884515957}
- m_RootOrder: 4
+ m_Father: {fileID: 8131619857262012692}
+ 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.0000019073486, y: -96.8}
- m_SizeDelta: {x: 151.84, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3198063896692121512
+ m_AnchoredPosition: {x: 343.89, y: 12.604}
+ m_SizeDelta: {x: 309.41, y: 47.435}
+ m_Pivot: {x: 0.6427968, y: 0.7175935}
+--- !u!222 &1816302621520469665
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6034096691612192640}
+ m_GameObject: {fileID: 3942217229165222720}
m_CullTransparentMesh: 0
---- !u!114 &4745481479353003747
+--- !u!114 &5845331252472638659
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6034096691612192640}
+ m_GameObject: {fileID: 3942217229165222720}
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.5058824, g: 0.427451, b: 0.30588236, a: 1}
+ m_Color: {r: 0.32156864, g: 0.50980395, b: 0.18823531, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -3234,18 +1683,446 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 30
+ m_FontSize: 38
m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 2
- m_MaxSize: 40
+ m_BestFit: 1
+ m_MinSize: 26
+ m_MaxSize: 38
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: 400/100
+ m_Text: 1/11
+--- !u!1 &4082008301872149992
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2603420918101853094}
+ - component: {fileID: 1855505137862399346}
+ - component: {fileID: 2347426719139663598}
+ - component: {fileID: 7740944521749466333}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2603420918101853094
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4082008301872149992}
+ 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: 6677696287487751865}
+ 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.24, y: 3.5}
+ m_SizeDelta: {x: 122.72, y: 75.16}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1855505137862399346
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4082008301872149992}
+ m_CullTransparentMesh: 0
+--- !u!114 &2347426719139663598
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4082008301872149992}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1573420865, 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!114 &7740944521749466333
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4082008301872149992}
+ 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.65882355, g: 0.65882355, b: 0.654902, 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: 45
+ m_FontStyle: 0
+ m_BestFit: 1
+ m_MinSize: 4
+ m_MaxSize: 45
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u7CBE \u70BC"
+ LanguageIndex: 0
+--- !u!1 &4441748077046889500
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6863185804939559100}
+ - component: {fileID: 7297031293768963172}
+ m_Layer: 5
+ m_Name: btnList
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6863185804939559100
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4441748077046889500}
+ 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: 6342299792110033615}
+ - {fileID: 5482789836646361175}
+ - {fileID: 1499697434375710272}
+ - {fileID: 6677696287487751865}
+ m_Father: {fileID: 8601325964190918751}
+ m_RootOrder: 11
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 469.39, y: 79.07507}
+ m_SizeDelta: {x: 912.8, y: 145.15}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7297031293768963172
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4441748077046889500}
+ m_CullTransparentMesh: 0
+--- !u!1 &5338247663729585592
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6467057438910059460}
+ - component: {fileID: 7792040176337340304}
+ - component: {fileID: 531976598324969726}
+ m_Layer: 5
+ m_Name: gongming
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6467057438910059460
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5338247663729585592}
+ 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: 8601325964190918751}
+ m_RootOrder: 9
+ 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: -4.5174975, y: -145.77002}
+ m_SizeDelta: {x: 246.3, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7792040176337340304
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5338247663729585592}
+ m_CullTransparentMesh: 0
+--- !u!114 &531976598324969726
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5338247663729585592}
+ 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: bfb6bdae28a72bd48bf6a13d39f1cb28, 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 &5391178095229414390
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8601325964190918751}
+ - component: {fileID: 4908661012729874881}
+ m_Layer: 5
+ m_Name: content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8601325964190918751
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5391178095229414390}
+ 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: 224470223336895144}
+ - {fileID: 2083538556740796198}
+ - {fileID: 7708970020296267502}
+ - {fileID: 1637966701065397349}
+ - {fileID: 3353385484946297119}
+ - {fileID: 8131619857262012692}
+ - {fileID: 8526449022804383897}
+ - {fileID: 2877954084376210547}
+ - {fileID: 7483877465745836902}
+ - {fileID: 6467057438910059460}
+ - {fileID: 8766961231832293434}
+ - {fileID: 6863185804939559100}
+ m_Father: {fileID: 224199271576904048}
+ 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: 0}
+ m_SizeDelta: {x: 934.82, y: 1354.29}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4908661012729874881
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5391178095229414390}
+ m_CullTransparentMesh: 0
+--- !u!1 &5543560261280320385
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1735107859949433548}
+ - component: {fileID: 7954594292029678291}
+ - component: {fileID: 4490830190718756631}
+ m_Layer: 5
+ m_Name: red
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1735107859949433548
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5543560261280320385}
+ 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: 1637966701065397349}
+ 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: -10, y: -10}
+ m_SizeDelta: {x: 20, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7954594292029678291
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5543560261280320385}
+ m_CullTransparentMesh: 0
+--- !u!114 &4490830190718756631
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5543560261280320385}
+ 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: 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 &5557326502520265416
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2877954084376210547}
+ - component: {fileID: 7941771466587653062}
+ - component: {fileID: 8234415689790499902}
+ m_Layer: 5
+ m_Name: hintTxt
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2877954084376210547
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5557326502520265416}
+ 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: 8601325964190918751}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0.00001955, y: -169}
+ m_SizeDelta: {x: 755.3, y: 88.74}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7941771466587653062
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5557326502520265416}
+ m_CullTransparentMesh: 0
+--- !u!114 &8234415689790499902
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5557326502520265416}
+ 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.5058824, g: 0.42745098, b: 0.30588236, 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: 50
+ m_FontStyle: 0
+ m_BestFit: 1
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 1
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u66F4\u9AD8\u54C1\u8D28\u7684\u5B9D\u7269\u53EF\u63D0\u5347"
+ LanguageIndex: 0
--- !u!1 &6110083088568785268
GameObject:
m_ObjectHideFlags: 0
@@ -3276,11 +2153,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224199271576904048}
- m_RootOrder: 4
+ 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.28999758, y: 269}
+ m_AnchoredPosition: {x: -0.28999758, y: -25.4}
m_SizeDelta: {x: 898.92, y: 4.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1957170809448953427
@@ -3320,7 +2197,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &6190721907427258962
+--- !u!1 &6302290971359689568
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3328,50 +2205,130 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 3423017531354456566}
- - component: {fileID: 812267333596454734}
- - component: {fileID: 4471906533932314602}
+ - component: {fileID: 4312717128000631083}
+ - component: {fileID: 3011002936221189589}
+ - component: {fileID: 6555160297567750354}
m_Layer: 5
- m_Name: proImg
+ m_Name: leftTxt
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &3423017531354456566
+--- !u!224 &4312717128000631083
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6190721907427258962}
+ m_GameObject: {fileID: 6302290971359689568}
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: 224560761078020366}
- m_RootOrder: 2
+ m_Father: {fileID: 8131619857262012692}
+ 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: -81.5, y: 71.1}
- m_SizeDelta: {x: 80, y: 80}
+ m_AnchoredPosition: {x: -267.6, y: -0.0000047684}
+ m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &812267333596454734
+--- !u!222 &3011002936221189589
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6190721907427258962}
+ m_GameObject: {fileID: 6302290971359689568}
m_CullTransparentMesh: 0
---- !u!114 &4471906533932314602
+--- !u!114 &6555160297567750354
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6190721907427258962}
+ m_GameObject: {fileID: 6302290971359689568}
+ 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.6117647, g: 0.5686275, b: 0.454902, 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: 37
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 50
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u5F3A\u5316\u7B49\u7EA7"
+ LanguageIndex: 0
+--- !u!1 &6451632583078169862
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6187868803791175554}
+ - component: {fileID: 8163805731759817949}
+ - component: {fileID: 1796667674051340938}
+ m_Layer: 5
+ m_Name: Image (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6187868803791175554
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6451632583078169862}
+ 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: 8131619857262012692}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8163805731759817949
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6451632583078169862}
+ m_CullTransparentMesh: 0
+--- !u!114 &1796667674051340938
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6451632583078169862}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -3385,7 +2342,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: 8748766ca3b15a94496c10f21d68c450, type: 3}
+ m_Sprite: {fileID: 21300000, guid: d1ae2fdf5abfca745baf5d316f53b922, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -3394,7 +2351,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &6237291814734523984
+--- !u!1 &6771589962805459897
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3402,51 +2359,125 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 907290967827395017}
- - component: {fileID: 6044364243150037184}
- - component: {fileID: 8799323113728238704}
+ - component: {fileID: 4497224548005237276}
+ - component: {fileID: 4198773501184323010}
+ - component: {fileID: 2502022824582007545}
m_Layer: 5
- m_Name: add
+ m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &907290967827395017
+--- !u!224 &4497224548005237276
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6237291814734523984}
+ m_GameObject: {fileID: 6771589962805459897}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.99900043, y: 0.99900025, z: 0.999}
- m_Children:
- - {fileID: 1595157145786544363}
- m_Father: {fileID: 1745417881599949250}
- m_RootOrder: 0
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 8131619857262012692}
+ 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.64, y: 0.6}
- m_SizeDelta: {x: 153.26, y: 152.95}
+ m_AnchoredPosition: {x: 120, y: -0.0000058413}
+ m_SizeDelta: {x: 50, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6044364243150037184
+--- !u!222 &4198773501184323010
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6237291814734523984}
+ m_GameObject: {fileID: 6771589962805459897}
m_CullTransparentMesh: 0
---- !u!114 &8799323113728238704
+--- !u!114 &2502022824582007545
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6237291814734523984}
+ m_GameObject: {fileID: 6771589962805459897}
+ 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: 81fd51d00b50d784ab6e523eb8951722, 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 &6868879513277821303
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6677696287487751865}
+ - component: {fileID: 8899086003853839299}
+ - component: {fileID: 3960982793170782085}
+ m_Layer: 5
+ m_Name: selectBtn
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6677696287487751865
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6868879513277821303}
+ 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: 2603420918101853094}
+ m_Father: {fileID: 6863185804939559100}
+ 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: -277, y: -1746}
+ m_SizeDelta: {x: 224.68, y: 96.2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8899086003853839299
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6868879513277821303}
+ m_CullTransparentMesh: 0
+--- !u!114 &3960982793170782085
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6868879513277821303}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -3460,8 +2491,8 @@ 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: 477ecd3af8f109449a1c3a27c5e8d047, type: 3}
- m_Type: 0
+ m_Sprite: {fileID: 21300000, guid: 0e97e3866623faa4fa4a58ebb054267c, type: 3}
+ m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -3469,7 +2500,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &6517113451337644584
+--- !u!1 &7515428143273543697
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3477,81 +2508,90 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1236371834270139311}
- - component: {fileID: 6674571402858623254}
- - component: {fileID: 9192072522027871460}
- - component: {fileID: 8187774707778152599}
+ - component: {fileID: 8131619857262012692}
m_Layer: 5
- m_Name: btnRefine
+ m_Name: propertyPre
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1236371834270139311
+--- !u!224 &8131619857262012692
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6517113451337644584}
+ m_GameObject: {fileID: 7515428143273543697}
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: 5181752287221677881}
- m_Father: {fileID: 6315777813238424457}
- m_RootOrder: 1
+ - {fileID: 6187868803791175554}
+ - {fileID: 4312717128000631083}
+ - {fileID: 9037458184156353713}
+ - {fileID: 4497224548005237276}
+ m_Father: {fileID: 8601325964190918751}
+ m_RootOrder: 5
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: 63.15003, y: 0.87}
- m_SizeDelta: {x: 157.3, y: 103.99}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 469.41, y: -739}
+ m_SizeDelta: {x: 912.8, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6674571402858623254
+--- !u!1 &7669026485797189264
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5256173008985457623}
+ - component: {fileID: 5957657076174754104}
+ - component: {fileID: 8297099232408903618}
+ - component: {fileID: 124949003347516842}
+ m_Layer: 5
+ m_Name: btn
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5256173008985457623
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7669026485797189264}
+ 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: 1637966701065397349}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5957657076174754104
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6517113451337644584}
+ m_GameObject: {fileID: 7669026485797189264}
m_CullTransparentMesh: 0
---- !u!114 &9192072522027871460
+--- !u!114 &8297099232408903618
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6517113451337644584}
- 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: dcab34f84847d94448b245ab7e62e44e, 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 &8187774707778152599
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6517113451337644584}
+ m_GameObject: {fileID: 7669026485797189264}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -3581,92 +2621,33 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
- m_TargetGraphic: {fileID: 9192072522027871460}
+ m_TargetGraphic: {fileID: 124949003347516842}
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 &7276912640159049234
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5804312208329413697}
- - component: {fileID: 7801799998937169455}
- - component: {fileID: 5838512993460733151}
- m_Layer: 5
- m_Name: lvTxt
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &5804312208329413697
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7276912640159049234}
- 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: 224560761078020366}
- m_RootOrder: 5
- 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: -31, y: 58.5}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7801799998937169455
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7276912640159049234}
- m_CullTransparentMesh: 0
---- !u!114 &5838512993460733151
+--- !u!114 &124949003347516842
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7276912640159049234}
+ m_GameObject: {fileID: 7669026485797189264}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.85882354, b: 0.19607843, a: 1}
+ 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: 20
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 2
- m_MaxSize: 40
- m_Alignment: 5
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: New Text
---- !u!1 &8055243758114481566
+--- !u!1 &7964268720778564142
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3674,9 +2655,84 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1595157145786544363}
- - component: {fileID: 2437715871934829721}
- - component: {fileID: 8593748451365075271}
+ - component: {fileID: 5076362339141073474}
+ - component: {fileID: 1104336181256749953}
+ - component: {fileID: 3795659575372293691}
+ m_Layer: 5
+ m_Name: grid
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5076362339141073474
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7964268720778564142}
+ 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: 8526449022804383897}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0.00000013838624}
+ m_SizeDelta: {x: 912.8, y: 0}
+ m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &1104336181256749953
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7964268720778564142}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_StartCorner: 0
+ m_StartAxis: 0
+ m_CellSize: {x: 912.8, y: 60}
+ m_Spacing: {x: 0, y: 8}
+ m_Constraint: 0
+ m_ConstraintCount: 2
+--- !u!114 &3795659575372293691
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7964268720778564142}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
+--- !u!1 &8302720824241811012
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6342299792110033615}
+ - component: {fileID: 7910508246414614372}
+ - component: {fileID: 6856835917285273656}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
@@ -3684,40 +2740,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1595157145786544363
+--- !u!224 &6342299792110033615
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8055243758114481566}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_GameObject: {fileID: 8302720824241811012}
+ 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: 907290967827395017}
+ m_Father: {fileID: 6863185804939559100}
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.63994867, y: -0.6015425}
- m_SizeDelta: {x: 64, y: 64}
+ m_AnchoredPosition: {x: -2.1, y: -36.5}
+ m_SizeDelta: {x: 926.2, y: 118.1}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2437715871934829721
+--- !u!222 &7910508246414614372
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8055243758114481566}
+ m_GameObject: {fileID: 8302720824241811012}
m_CullTransparentMesh: 0
---- !u!114 &8593748451365075271
+--- !u!114 &6856835917285273656
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8055243758114481566}
+ m_GameObject: {fileID: 8302720824241811012}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -3731,7 +2787,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: 4080a1963cb778b47b33972e55bd5d9d, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 2609ccd74e672d84c8e128abd8dc9428, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -3740,7 +2796,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &8404378537730412001
+--- !u!1 &8476843000664390820
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3748,78 +2804,59 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1537709242865011066}
- - component: {fileID: 2506222931990367302}
- - component: {fileID: 5192666604835215522}
+ - component: {fileID: 7483877465745836902}
+ - component: {fileID: 847425721496783540}
m_Layer: 5
- m_Name: coinNumTxt
+ m_Name: costGrid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1537709242865011066
+--- !u!224 &7483877465745836902
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8404378537730412001}
+ m_GameObject: {fileID: 8476843000664390820}
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: 224199271576904048}
- m_RootOrder: 13
+ m_Father: {fileID: 8601325964190918751}
+ m_RootOrder: 8
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: 28.440002, y: -376.75}
- m_SizeDelta: {x: 101.06, y: 30}
+ m_AnchoredPosition: {x: -0.5, y: -398.81}
+ m_SizeDelta: {x: 907.8, y: 142.1}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2506222931990367302
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8404378537730412001}
- m_CullTransparentMesh: 0
---- !u!114 &5192666604835215522
+--- !u!114 &847425721496783540
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8404378537730412001}
+ m_GameObject: {fileID: 8476843000664390820}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.41960788, g: 0.45098042, b: 0.43921572, 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: 30
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 2
- m_MaxSize: 40
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: 1000000
---- !u!1 &8573841984110015117
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_StartCorner: 0
+ m_StartAxis: 0
+ m_CellSize: {x: 150, y: 150}
+ m_Spacing: {x: 63.8, y: 0}
+ m_Constraint: 0
+ m_ConstraintCount: 2
+--- !u!1 &8632757234768106076
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3827,146 +2864,52 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5220662710083410280}
- - component: {fileID: 8721243443690881153}
- - component: {fileID: 2805111740152470676}
- - component: {fileID: 8358001794217902379}
+ - component: {fileID: 2083538556740796198}
+ - component: {fileID: 2647285438495502701}
+ - component: {fileID: 6416499959385431295}
+ - component: {fileID: 4677969840178700385}
+ - component: {fileID: 7439690023403680596}
m_Layer: 5
- m_Name: Text
+ m_Name: btnBack
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &5220662710083410280
+--- !u!224 &2083538556740796198
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8573841984110015117}
+ m_GameObject: {fileID: 8632757234768106076}
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: 5495216742107921350}
- m_RootOrder: 0
+ m_Father: {fileID: 8601325964190918751}
+ 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.2, y: 2.22}
- m_SizeDelta: {x: 120.52, y: 74.05}
+ m_AnchorMin: {x: 1, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -40, y: -34.90503}
+ m_SizeDelta: {x: 154, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8721243443690881153
+--- !u!222 &2647285438495502701
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8573841984110015117}
+ m_GameObject: {fileID: 8632757234768106076}
m_CullTransparentMesh: 0
---- !u!114 &2805111740152470676
+--- !u!114 &6416499959385431295
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8573841984110015117}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1573420865, 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!114 &8358001794217902379
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8573841984110015117}
- 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.65882355, g: 0.65882355, b: 0.654902, 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: 45
- m_FontStyle: 0
- m_BestFit: 1
- m_MinSize: 4
- m_MaxSize: 45
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u5F3A \u5316"
- LanguageIndex: 0
---- !u!1 &8991745488323421655
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1202024464223070450}
- - component: {fileID: 424007041762651870}
- - component: {fileID: 1287082905783322148}
- m_Layer: 5
- m_Name: coinImg
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1202024464223070450
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8991745488323421655}
- 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: 224199271576904048}
- m_RootOrder: 12
- 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: -61.9, y: -376.75}
- m_SizeDelta: {x: 65, y: 65}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &424007041762651870
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8991745488323421655}
- m_CullTransparentMesh: 0
---- !u!114 &1287082905783322148
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8991745488323421655}
+ m_GameObject: {fileID: 8632757234768106076}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -3980,7 +2923,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: 13359dde0f9d67c4aa047816a4d00962, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 87b3cd7ab5ab3854db979a44d7e17767, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -3989,7 +2932,68 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &9205761692783631661
+--- !u!114 &4677969840178700385
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8632757234768106076}
+ 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: 6416499959385431295}
+ 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 &7439690023403680596
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8632757234768106076}
+ 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 &8861653218947781881
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3997,74 +3001,133 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 2603738261374886464}
- - component: {fileID: 4150592732069839154}
- - component: {fileID: 7814509725038742813}
+ - component: {fileID: 7987669967423616727}
+ - component: {fileID: 7121697623358728574}
+ - component: {fileID: 3444799358289647715}
+ - component: {fileID: 1231266498258574494}
+ - component: {fileID: 1192952208287973316}
m_Layer: 5
- m_Name: refineLv
+ m_Name: btnRefine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &2603738261374886464
+ m_IsActive: 1
+--- !u!224 &7987669967423616727
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9205761692783631661}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_GameObject: {fileID: 8861653218947781881}
+ 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: 224560761078020366}
- m_RootOrder: 6
+ m_Children:
+ - {fileID: 6567990969607741379}
+ m_Father: {fileID: 8766961231832293434}
+ 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: -26, y: -56.5}
- m_SizeDelta: {x: 160, y: 30}
+ 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 &4150592732069839154
+--- !u!222 &7121697623358728574
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9205761692783631661}
+ m_GameObject: {fileID: 8861653218947781881}
m_CullTransparentMesh: 0
---- !u!114 &7814509725038742813
+--- !u!114 &3444799358289647715
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9205761692783631661}
+ m_GameObject: {fileID: 8861653218947781881}
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.19607843, g: 0.37254903, b: 0.3764706, a: 0.89411765}
+ 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 20
- 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: New Text
+ m_Sprite: {fileID: 21300000, guid: 7c3a0437ae0a0ea4a85275c9a27bf73f, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &1231266498258574494
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8861653218947781881}
+ 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: 3444799358289647715}
+ 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 &1192952208287973316
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8861653218947781881}
+ 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
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
index eec3ccb7c0..567ba11f06 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
@@ -140170,8 +140170,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: 48, y: 44}
- m_SizeDelta: {x: 40, y: 40}
+ m_AnchoredPosition: {x: 58, y: 49}
+ m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5191567546156269120
CanvasRenderer:
@@ -140201,7 +140201,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: 4080a1963cb778b47b33972e55bd5d9d, type: 3}
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -144984,7 +144984,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &268016902880247916
RectTransform:
m_ObjectHideFlags: 0
@@ -145000,10 +145000,10 @@ RectTransform:
m_Father: {fileID: 224358324289722092}
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, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 97.10004, y: -82}
+ m_SizeDelta: {x: 155, y: 85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1834664782885917125
CanvasRenderer:
@@ -179039,8 +179039,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: 48, y: 44}
- m_SizeDelta: {x: 40, y: 40}
+ m_AnchoredPosition: {x: 58, y: 49}
+ m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6052895282540631022
CanvasRenderer:
@@ -179070,7 +179070,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: 4080a1963cb778b47b33972e55bd5d9d, type: 3}
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index 1b73d88ebe..64524da525 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -1082,7 +1082,7 @@ JumpType = {
NPCPosType={
maincity=1,
onHook = 2,
-
+ smallMap = 3,
}
YaoHunFrame = {
diff --git a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
index 7f0d84c04d..e8cc6ae153 100644
--- a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
@@ -30,6 +30,7 @@ ARENARECORDINFORESPONSE_ARENARECORDINFO_FIELD = protobuf.FieldDescriptor();
PLAYWITHSBREQUEST = protobuf.Descriptor();
PLAYWITHSBREQUEST_CHALLENGEUID_FIELD = protobuf.FieldDescriptor();
PLAYWITHSBREQUEST_MYTEAMID_FIELD = protobuf.FieldDescriptor();
+PLAYWITHSBREQUEST_CROSS_FIELD = protobuf.FieldDescriptor();
PLAYWITHSBRESPONSE = protobuf.Descriptor();
PLAYWITHSBRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
CHAMPIONGETINFORESPONSE = protobuf.Descriptor();
@@ -327,11 +328,21 @@ PLAYWITHSBREQUEST_MYTEAMID_FIELD.default_value = 0
PLAYWITHSBREQUEST_MYTEAMID_FIELD.type = 5
PLAYWITHSBREQUEST_MYTEAMID_FIELD.cpp_type = 1
+PLAYWITHSBREQUEST_CROSS_FIELD.name = "cross"
+PLAYWITHSBREQUEST_CROSS_FIELD.full_name = ".rpc.protocols.PlayWithSbRequest.cross"
+PLAYWITHSBREQUEST_CROSS_FIELD.number = 3
+PLAYWITHSBREQUEST_CROSS_FIELD.index = 2
+PLAYWITHSBREQUEST_CROSS_FIELD.label = 1
+PLAYWITHSBREQUEST_CROSS_FIELD.has_default_value = false
+PLAYWITHSBREQUEST_CROSS_FIELD.default_value = 0
+PLAYWITHSBREQUEST_CROSS_FIELD.type = 5
+PLAYWITHSBREQUEST_CROSS_FIELD.cpp_type = 1
+
PLAYWITHSBREQUEST.name = "PlayWithSbRequest"
PLAYWITHSBREQUEST.full_name = ".rpc.protocols.PlayWithSbRequest"
PLAYWITHSBREQUEST.nested_types = {}
PLAYWITHSBREQUEST.enum_types = {}
-PLAYWITHSBREQUEST.fields = {PLAYWITHSBREQUEST_CHALLENGEUID_FIELD, PLAYWITHSBREQUEST_MYTEAMID_FIELD}
+PLAYWITHSBREQUEST.fields = {PLAYWITHSBREQUEST_CHALLENGEUID_FIELD, PLAYWITHSBREQUEST_MYTEAMID_FIELD, PLAYWITHSBREQUEST_CROSS_FIELD}
PLAYWITHSBREQUEST.is_extendable = false
PLAYWITHSBREQUEST.extensions = {}
PLAYWITHSBRESPONSE_FIGHTDATA_FIELD.name = "fightData"
diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
index ae3bd09ed6..df25412dc7 100644
--- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
@@ -163,7 +163,7 @@ function ExpeditionMainPanel:OnOpen()
if self.liveNode then
self.liveNode:OnClose()
end
- self.liveNode = PlayerLiveView:New(Util.GetTransform(self.parent, "playerLive"),1,nil,self.sortingOrder)
+ self.liveNode = PlayerLiveView:New(Util.GetTransform(self.parent, "playerLive"),1,nil,self.sortingOrder,NPCPosType.smallMap)
self.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale10,nil,WALK_DIR.IDLE_FRONT)
if ExpeditionManager.ExpeditionState == 3 then
ExpeditionManager.SetExpeditionState(1)
diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
index 75323fd070..f55da043db 100644
--- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
@@ -847,7 +847,7 @@ function this.RefreshLittleMap()
if this.liveNode then
this.liveNode:OnClose()
end
- this.liveNode = PlayerLiveView:New(this.btnMap.transform,1,nil,orginLayer)
+ this.liveNode = PlayerLiveView:New(this.btnMap.transform,1,nil,orginLayer,NPCPosType.smallMap)
this.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale3,Vector3.New(0,-40,0))
if FightPointPassManager.GetRoleDirection()==1 then
this.liveNode:SetWalkDir(WALK_DIR.RUN_LEFT)
diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua
index b2884e4bfc..87bd04f311 100644
--- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua
@@ -39,6 +39,7 @@ function this:Init(_curSmallFightId,_IsPlayAni,_openPanel)
end
this.liveNode = PlayerLiveView:New(Util.GetGameObject(rootParent, "mapParent/selectMap/Image (1)/roleRoot"),1)
this.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale5,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT)
+ this.liveNode:SetTitleHide()
this:LoadMapData()
if IsPlayAni then
isWalk = true
diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua
index edc4e47090..feff863399 100644
--- a/Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua
@@ -6,8 +6,12 @@ local this = JumpServerHightLadderFormation
this.IsNeedChangeFormation = false
--- 初始化
-function this.Init(root)
+this.isDemonstrateTheir = false
+this.pData = nil
+function this.Init(root,_isDemonstrateTheir,_pData)--isDemonstrateTheir是否是切磋
this.root = root
+ this.isDemonstrateTheir = _isDemonstrateTheir or false
+ this.pData = _pData or nil
this.InitView()
end
--- 获取需要显示的编队id
@@ -29,19 +33,44 @@ function this.On_Btn2_Click()
PopupTipPanel.ShowTip(string.format(Language[10701], 1))
return
end
- this.root:ClosePanel()
- -- 如果未打开则打开
+ if this.isDemonstrateTheir then
+ -- 请求开始挑战
+ PlayerManager.RequestPlayWithSomeOne(this.pData.uid, FormationTypeDef.JUMPSERVER_HIGHTLADDER, this.pData.name, function(result)
+ this.root:ClosePanel()
+
+ local arg = {}
+ arg.result = result.result
+ arg.blue = {}
+ arg.blue.uid = PlayerManager.uid
+ arg.blue.name = PlayerManager.nickName
+ arg.blue.head = PlayerManager.head
+ arg.blue.frame = HeadManager.GetCurFrameId()
+ arg.red= {}
+ arg.red.uid = this.pData.uid
+ arg.red.name = this.pData.name
+ arg.red.head = this.pData.head
+ arg.red.frame = this.pData.headFrame
+
+ -- 不用回放直接显示结果
+ UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
+ end,this.isDemonstrateTheir)
+ else
+ this.root:ClosePanel()
+ -- 如果未打开则打开
+ end
end
--
function this.InitView()
this.root.bg:SetActive(true)
this.root.btn_2:SetActive(true)
this.root.btn_2_lab.text = Language[10715]
+ if this.isDemonstrateTheir then
+ this.root.btn_2_lab.text = Language[10729]
+ end
this.root.btn_1:SetActive(true)
this.root.btn_1_lab.text = Language[10710]
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.JumpServerHightLadder })
-
end
function this.On_Btn1_Click()
diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
index 4cc74546f5..5b8d5bf250 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
@@ -2,6 +2,7 @@ GuideManager = {}
local this = GuideManager
local GuideConfig = ConfigManager.GetConfig(ConfigName.GuideConfig)
local GlobalSystemConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig)
+local SpecialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
local openDic = {}
local funcDic = {}
@@ -59,6 +60,9 @@ function this.OnLevelChange()
this.CheckFuncGuide()
elseif PlayerManager.level == 22 then
StoryMapManager.isShowStory = 3
+ elseif PlayerManager.level == tonumber(SpecialConfig[89].Value) then
+ table.insert(_FuncGuideList, 103000)
+ this.CheckFuncGuide()
end
end
--
diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
index cb32a90c19..ada942a852 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
@@ -2832,13 +2832,33 @@ function this.GetFormationHeroRedPoint()
local teamHero = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL)
for i, v in pairs(teamHero) do
local curHeroData = HeroManager.GetSingleHeroData(i)
+ local isCanUpEquipTreasure
+ local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,40)
+ if config then
+ local limits = string.split(config.Value, "|")
+ if limits then
+ local heroConfig = curHeroData.heroConfig
+ local lvs = string.split(limits[1], "#")
+ local stars = string.split(limits[2], "#")
+ if PlayerManager.level >= tonumber(lvs[2]) and heroConfig ~= nil and heroConfig.MaxRank >= tonumber(stars[2]) then
+ isCanUpEquipTreasure = true
+ else
+ isCanUpEquipTreasure = false
+ end
+ else
+ isCanUpEquipTreasure = false
+ end
+ else
+ isCanUpEquipTreasure = false
+ end
if
this.GetCurHeroUpLvOrUpStarSData(curHeroData) or this.LvUpBtnRedPoint(curHeroData) or
this.IsShowUpStarRedPoint(curHeroData) or
#this.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or
this.GetIsShowSoulPrintRedPoint(curHeroData) or
- this.GetIsShowTalismanRedPoint(curHeroData)
- then
+ this.GetIsShowTalismanRedPoint(curHeroData) or
+ (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)
+ then
return true
end
end
@@ -2859,11 +2879,32 @@ function this.GetAllHeroCompoundRedPoint()
end
--单个英雄所有红点判断
function this.GetCurHeroIsShowRedPoint(curHeroData)
+ local isCanUpEquipTreasure
+ local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,40)
+ if config then
+ local limits = string.split(config.Value, "|")
+ if limits then
+ local heroConfig = curHeroData.heroConfig
+ local lvs = string.split(limits[1], "#")
+ local stars = string.split(limits[2], "#")
+ if PlayerManager.level >= tonumber(lvs[2]) and heroConfig ~= nil and heroConfig.MaxRank >= tonumber(stars[2]) then
+ isCanUpEquipTreasure = true
+ else
+ isCanUpEquipTreasure = false
+ end
+ else
+ isCanUpEquipTreasure = false
+ end
+ else
+ isCanUpEquipTreasure = false
+ end
+
return this.GetCurHeroUpLvOrUpStarSData(curHeroData) or this.LvUpBtnRedPoint(curHeroData) or
this.IsShowUpStarRedPoint(curHeroData) or
#this.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or
this.GetIsShowSoulPrintRedPoint(curHeroData) or
- this.GetIsShowTalismanRedPoint(curHeroData)
+ this.GetIsShowTalismanRedPoint(curHeroData) or
+ (#this.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0 and isCanUpEquipTreasure)
end
--获取当前英雄的下一突破 和 升星 静态数据
function this.GetCurHeroUpLvOrUpStarSData(curHeroData)
@@ -3047,6 +3088,7 @@ function this.GetHeroIsUpEquip(heroDid)
end
end
+
--有同系 且未在英雄身上的装备
local equips = BagManager.GetEquipDataByEquipPosition(heroData.heroConfig.Profession)
@@ -3094,6 +3136,77 @@ function this.GetHeroIsUpEquip(heroDid)
end
return {}
end
+--宝物
+function this.GetHeroIsUpTreasure(heroDid,pos)
+ if heroDatas[heroDid] then
+ local heroData = heroDatas[heroDid]
+ local lackEquips = {}
+ for i = 1, 2 do
+ local equipIdAndWarPower = {}
+ equipIdAndWarPower.pos = i
+ equipIdAndWarPower.id = "0"
+ equipIdAndWarPower.warPower = 0
+ lackEquips[i] = equipIdAndWarPower
+ end
+
+ -- 有装备的位置赋值装备id及战力
+ if heroData.jewels and #heroData.jewels > 0 then
+ for i = 1, #heroData.jewels do
+ if not heroData.jewels[i] then
+ else
+ local curEquipConFigData =
+ EquipTreasureManager.GetSingleTreasureByIdDyn(heroData.jewels[i])
+ if not curEquipConFigData then
+ LogBlue("-------------------------"..heroData.jewels[i] .. " " .. heroDid)
+ else
+ lackEquips[curEquipConFigData.equipType].id = heroData.jewels[i]
+ lackEquips[curEquipConFigData.equipType].warPower =
+ EquipTreasureManager.CalculateWarForce(heroData.jewels[i])
+ end
+ end
+ end
+ end
+ local allEquipTreasures = EquipTreasureManager.GetAllTreasuresByLocation(pos, heroData.heroConfig.PropertyName)
+ for k, v in ipairs(allEquipTreasures) do
+ --比较战力 高战力的装备add
+ if lackEquips[v.equipType].id == "0" then
+ lackEquips[v.equipType].id = v.idDyn
+ lackEquips[v.equipType].warPower = EquipTreasureManager.CalculateWarForce(v.idDyn)
+ else
+ local nextEquipWarPower = EquipTreasureManager.CalculateWarForce(v.idDyn)
+ if nextEquipWarPower > lackEquips[v.equipType].warPower then
+ lackEquips[v.equipType].id = v.idDyn
+ lackEquips[v.equipType].warPower = EquipTreasureManager.CalculateWarForce(v.idDyn)
+ end
+ end
+ end
+
+ --去掉与自己本身自带的重合装备
+ local allUpEquipDidTabs = {}
+ for k,v in pairs(lackEquips) do
+ if v.id ~= "0" then
+ local isAdd = true
+ for j = 1, #heroData.jewels do
+ if heroData.jewels[j] == v.id then
+ isAdd = false
+ end
+ end
+ if isAdd then
+ table.insert(allUpEquipDidTabs, v.id)
+ end
+ end
+ end
+ if #allUpEquipDidTabs > 0 then
+ return allUpEquipDidTabs
+ end
+ return {}
+ end
+ return {}
+end
+
+
+
+
--单个英雄魂印红点
--获取魂印环形布局数据 didMaxLen最大槽位数量 didLen可装备槽位数量 didLv最大动态等级 maxLv配置最大等级
function this.GetSoulPrintLoopUIMaxData()
@@ -3603,4 +3716,8 @@ function this.GetEquipedEquipList()
end
return EquipedEquipList
end
+
+function this.CheckIsUp()
+
+end
return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua
index 4a2d0f2455..35dfb7e234 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua
@@ -143,7 +143,7 @@ function this.InitRolePre(u, v)
this.NpcGO:OnClose()
end
Util.GetTransform(this.leader, "root/ui/nemeDi").gameObject:SetActive(false)
- this.NpcGO = PlayerLiveView:New(Util.GetTransform(this.leader, "root/ui/roleRoot"),1)
+ this.NpcGO = PlayerLiveView:New(Util.GetTransform(this.leader, "root/ui/roleRoot"),1,nil,MapPanel.sortingOrder)
this.NpcGO:OnOpen(GetPlayerRoleSingleConFig().Scale9,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT)
this.NpcGO:RemoveTitleCanvas()
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 10e8375718..530997d3ed 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -1781,10 +1781,11 @@ function this.RequestGetFriendInfo(type, func)
end
-- 好友切磋
-function this.RequestPlayWithSomeOne(uid, teamId, func)
+function this.RequestPlayWithSomeOne(uid, teamId,isDemonstrateTheir, func)
local data = ArenaInfoProto_pb.PlayWithSbRequest()
data.challengeUid = uid
data.myteamId = teamId
+ data.cross = isDemonstrateTheir and 1 or 0
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.PLAY_WITH_SB_REQUEST, MessageTypeProto_pb.PLAY_WITH_SB_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
index 65c2665680..fb3a93da55 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
@@ -330,12 +330,13 @@ end
--------------------------------------------
-- 切磋
-function this.RequestPlayWithSomeOne(uid, teamId, tname, func)
+function this.RequestPlayWithSomeOne(uid, teamId, tname, func,_isDemonstrateTheir)
if uid == PlayerManager.uid then
PopupTipPanel.ShowTip(Language[11398])
return
end
- NetManager.RequestPlayWithSomeOne(uid, teamId, function(msg)
+ local isDemonstrateTheir = _isDemonstrateTheir or false
+ NetManager.RequestPlayWithSomeOne(uid, teamId,isDemonstrateTheir, function(msg)
local fightData = BattleManager.GetBattleServerData({fightData = msg.fightData}, 1)
if tname then
tname = PlayerManager.nickName .."|" .. tname
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
index b78e49ec3c..f66939bc1b 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
@@ -3,7 +3,7 @@ local PlayerInfoPopup = Inherit(BasePanel)
local this = PlayerInfoPopup
local netserverName = nil
local XiuXianSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig)
-
+local isNpc = false--是否是机器人
local _ViewConfig = {
[PLAYER_INFO_VIEW_TYPE.NORMAL] = {
formationType = FormationTypeDef.FORMATION_NORMAL,
@@ -50,7 +50,8 @@ local _ViewConfig = {
formationType = FormationTypeDef.JUMPSERVER_HIGHTLADDER,
tip = "罗浮争锋阵容:",
btnType = {
- {name = "挑战", func = 6},
+ -- {name = "挑战", func = 6},
+ {name = "切磋", func = 6},
}
},
}
@@ -157,6 +158,7 @@ function PlayerInfoPopup:OnOpen(playerId, viewType,serverName)
this._PlayerId = playerId
this._ViewType = viewType or PLAYER_INFO_VIEW_TYPE.NORMAL
this.serverName = serverName--跨服加的服务器数据
+ isNpc = this._PlayerId <= 1000000
-- 界面类型修正
if this._ViewType == PLAYER_INFO_VIEW_TYPE.NORMAL and GoodFriendManager.IsInBlackList(this._PlayerId) then
this._ViewType = PLAYER_INFO_VIEW_TYPE.GO_TO_BLACK
@@ -415,7 +417,7 @@ function this.RefreshBtnShow()
end
-- 判断该界面类型是否有按钮显示
LogYellow("this._ViewType "..this._ViewType.." "..tostring(not JumpServerManager.GetCurPersonInfo()))
- if not this._Config or not this._Config.btnType or (this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER and not JumpServerManager.GetCurPersonInfo()) then
+ if not this._Config or not this._Config.btnType or isNpc then--or (this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER and not JumpServerManager.GetCurPersonInfo())
this.boxLine:SetActive(false)
this.btnBox:SetActive(false)
this.addFriendBtn:SetActive(false)
@@ -492,26 +494,28 @@ function this.BeatHim()
end
-- 跨服天梯
function this.JumpServerBattle()
- local JoinRank = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).JoinRank
- if not JumpServerManager.GetHightLadderDataEnterable() then
- PopupTipPanel.ShowTip("本服千战逐胜台前"..JoinRank.."名可以参加")
- return
- end
- local JumpPanel = UIManager.GetOpenPanel(UIName.JumpServerHightLadderPanel)
- if not JumpPanel then return end
- local curData = JumpServerManager.GetCurPersonInfo()
- if not curData then return end
this:ClosePanel()
- JumpPanel.BuyVipFun(1,1,function()
- --直接战斗
- JumpServerManager.StarFightHightLadder(curData,0,function(msg)
- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM, 1)--更新特权
- JumpPanel = UIManager.GetOpenPanel(UIName.JumpServerHightLadderPanel)
- JumpPanel.RefreshBuyNum()
- JumpPanel.OnShowPanel()
- JumpServerManager.SetCurPersonInfo(nil)
- end)
- end)
+ UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER,true, this._PlayerData)
+ -- local JoinRank = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).JoinRank
+ -- if not JumpServerManager.GetHightLadderDataEnterable() then
+ -- PopupTipPanel.ShowTip("本服千战逐胜台前"..JoinRank.."名可以参加")
+ -- return
+ -- end
+ -- local JumpPanel = UIManager.GetOpenPanel(UIName.JumpServerHightLadderPanel)
+ -- if not JumpPanel then return end
+ -- local curData = JumpServerManager.GetCurPersonInfo()
+ -- if not curData then return end
+ -- this:ClosePanel()
+ -- JumpPanel.BuyVipFun(1,1,function()
+ -- --直接战斗
+ -- JumpServerManager.StarFightHightLadder(curData,0,function(msg)
+ -- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM, 1)--更新特权
+ -- JumpPanel = UIManager.GetOpenPanel(UIName.JumpServerHightLadderPanel)
+ -- JumpPanel.RefreshBuyNum()
+ -- JumpPanel.OnShowPanel()
+ -- JumpServerManager.SetCurPersonInfo(nil)
+ -- end)
+ -- end)
end
--界面关闭时调用(用于子类重写)
function PlayerInfoPopup:OnClose()
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
index b28178112b..ae8a02a9a1 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
@@ -72,6 +72,18 @@ function this.GetTreasureDataByPos(_pos, _idDyn, PropertyName)
return equips
end
+--获取玩家穿戴的宝物
+function this.GetAllHeroEquipedTreasureData()
+ local equips = {}
+ for i, v in pairs(allTreasures) do
+ if (v.upHeroDid == "" or v.upHeroDid == 0) then
+ else
+ table.insert(equips, v)
+ end
+ end
+ return equips
+end
+
function this.OpenTreasure(star)
local config = ConfigManager.GetConfigData(40)
local configs = string.split(config.Value, "|")
@@ -376,7 +388,7 @@ function this.GetAllTreasuresByLocation(Location, PropertyName)
local curAllEquipTreasure = {}
for key, value in pairs(allTreasures) do
if
- (value.upHeroDid == "" or value.upHeroDid == "0" ) and jewelConfig[value.id].Location == Location and
+ (value.upHeroDid == "" or value.upHeroDid == "0" ) and (Location == 0 or jewelConfig[value.id].Location == Location) and
jewelConfig[value.id].Race == PropertyName
then
table.insert(curAllEquipTreasure, value)
@@ -496,6 +508,7 @@ function this.CalculateWarForce(Did)
if curTreasure then
return this.CalculateWarForceBase(curTreasure.id, curTreasure.lv, curTreasure.refineLv)
end
+ return 0
end
function this.CalculateWarForceBase(sId, lv, rlv)
local curEuipTreaSureConfig = ConfigManager.GetConfigData(ConfigName.JewelConfig, sId)
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
index 81d30a82a6..082edd6d42 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
@@ -4,8 +4,6 @@ local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local jewelConfig=ConfigManager.GetConfig(ConfigName.JewelConfig)
local this=EquipTreasureStrongPopup
local curEquipData
-local properList={}
-local costItemPreList={}
local haveTreasures={}
local type
local isMatEnough=true
@@ -13,37 +11,39 @@ local matId=0
local isCoinEnough=true
local isMax=false
local isEnough = false
+local curIndex = 0
--初始化组件(用于子类重写)
function EquipTreasureStrongPopup:InitComponent()
this.spLoader = SpriteLoader.New()
- this.btnBack= Util.GetGameObject(self.transform, "bg/btnBack")
- this.titleTxt=Util.GetGameObject(self.transform, "bg/name"):GetComponent("Text")
- this.equipFrame=Util.GetGameObject(self.transform, "bg/armorInfo/frame"):GetComponent("Image")
- this.equipIcon=Util.GetGameObject(self.transform, "bg/armorInfo/icon"):GetComponent("Image")
- this.equipName=Util.GetGameObject(self.transform, "bg/armorInfo/nameTxt"):GetComponent("Text")
- this.equipQuaTxt=Util.GetGameObject(self.transform, "bg/armorInfo/equipQuaText"):GetComponent("Text")
- this.btn_strong=Util.GetGameObject(self.transform, "bg/btnGrid/btnStrong")
- this.btn_refine=Util.GetGameObject(self.transform, "bg/btnGrid/btnRefine")
- this.btn_strongPage=Util.GetGameObject(self.transform, "bg/btnList/btnStrong")
- this.btn_refinePage=Util.GetGameObject(self.transform, "bg/btnList/btnRefine")
- this.coinImg=Util.GetGameObject(self.transform, "bg/coinImg"):GetComponent("Image")
- this.coinTxt=Util.GetGameObject(self.transform, "bg/coinNumTxt"):GetComponent("Text")
- this.coinBg=Util.GetGameObject(self.transform, "bg/coinBg")
- this.costItemPre=Util.GetGameObject(self.transform, "bg/costItemPre")
- this.costItemPre.gameObject:SetActive(false)
- this.properItemPre=Util.GetGameObject(self.transform, "bg/propertyPre")
- this.costItemGrid=Util.GetGameObject(self.transform, "bg/costGrid")
- this.propertyGrid=Util.GetGameObject(self.transform, "bg/scroll/grid")
- this.equipLvTxt=Util.GetGameObject(self.transform, "bg/armorInfo/lvTxt"):GetComponent("Text")
- this.equipRefineLvTxt=Util.GetGameObject(self.transform, "bg/armorInfo/refineLv"):GetComponent("Text")
- this.selectBtn=Util.GetGameObject(self.transform,"bg/btnList/selectBtn")
- this.lvTxt=Util.GetGameObject(self.transform,"bg/propertyPre/leftTxt"):GetComponent("Text")
- this.lvValueTxt=Util.GetGameObject(self.transform,"bg/propertyPre/rightTxt"):GetComponent("Text")
- this.proImg=Util.GetGameObject(self.transform,"bg/armorInfo/proImg"):GetComponent("Image")
- this.hintTxt=Util.GetGameObject(self.transform,"bg/hintTxt"):GetComponent("Text")
-
-
-
+ this.content = Util.GetGameObject(self.transform, "bg/content")
+ this.btnBack= Util.GetGameObject(this.content,"btnBack")
+ this.titleTxt=Util.GetGameObject(this.content,"name"):GetComponent("Text")
+ this.itemPre = Util.GetGameObject(this.content,"itemView")
+ this.firstScroll=Util.GetGameObject(this.content,"firstScroll")
+ this.properItemPre = Util.GetGameObject(this.content,"propertyPre")
+ this.propertyGrid=Util.GetGameObject(this.content,"secondScroll/grid")
+ this.costItemGrid=Util.GetGameObject(this.content,"costGrid")
+ this.hintTxt=Util.GetGameObject(this.content,"hintTxt"):GetComponent("Text")
+ this.btnRefine=Util.GetGameObject(this.content,"btnGrid/btnRefine")
+ this.btnRefineText = Util.GetGameObject(this.btnRefine,"Text"):GetComponent("Text")
+ this.btnStrong=Util.GetGameObject(this.content,"btnGrid/btnStrong")
+ this.btnStrongText = Util.GetGameObject(this.btnStrong,"Text"):GetComponent("Text")
+ this.btn_strongPage=Util.GetGameObject(this.content,"btnList/btnStrong")
+ this.btn_refinePage=Util.GetGameObject(this.content,"btnList/btnRefine")
+ this.selectBtn=Util.GetGameObject(this.content,"btnList/selectBtn")
+ this.treasureDatas = {}
+ this.costTreasureDatas = {}
+ this.properList = {}
+ this.properList[0] = {}
+ this.properList[0].go = this.properItemPre
+ this.properList[0].leftTxt = Util.GetGameObject(this.properItemPre,"leftTxt"):GetComponent("Text")
+ this.properList[0].rightTxt = Util.GetGameObject(this.properItemPre,"rightTxt"):GetComponent("Text")
+ local rootHight = this.firstScroll.transform.rect.height
+ local rootWidth=this.firstScroll.transform.rect.width
+ this.firstScrollCycleView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.firstScroll.transform,this.itemPre,nil, Vector2.New(rootWidth,rootHight), 1, 5, Vector2.New(15,30))
+ this.gongming = Util.GetGameObject(this.content,"gongming")
+ this.gongming.gameObject:SetActive(false)
+ this.select = Util.GetGameObject(this.content,"select")
end
--绑定事件(用于子类重写)
@@ -55,20 +55,17 @@ function EquipTreasureStrongPopup:BindEvent()
end)
--强化页签
Util.AddClick(this.btn_strongPage, function()
- if HarmonyManager.IsInfo(curEquipData.upHeroDid) then
- -- body
- PopupTipPanel.ShowTip(Language[12184])
- else
- this.SetWindShow(1)
- end
-
+ this:SetWindShow(1)
end)
--精炼页签
Util.AddClick(this.btn_refinePage, function()
- this.SetWindShow(2)
+ this:SetWindShow(2)
end)
--强化按钮
- Util.AddClick(this.btn_strong, function()
+ Util.AddClick(this.btnStrong, function()
+ if HarmonyManager.IsInfo(curEquipData.upHeroDid) then
+ return
+ end
--如果强化界面 强化到最高等级谈提示 精炼界面 就切界面
if type==1 then
if isMax then
@@ -76,7 +73,7 @@ function EquipTreasureStrongPopup:BindEvent()
return
end
else
- this.SetWindShow(1)
+ this:SetWindShow(1)
return
end
--材料是否足够
@@ -91,7 +88,8 @@ function EquipTreasureStrongPopup:BindEvent()
end
NetManager.EquipTreasureBuildRequest(curEquipData.idDyn,1,nil,function (msg)
EquipTreasureManager.ChangeTreasureLv(curEquipData.idDyn,type)
- this.SetWindShow(type)
+ this:SetWindShow(type)
+ this.treasureDatas[curIndex]:OnOpen(false, {curEquipData.id,0}, 1, true, false, false, 0,curEquipData.idDyn)
if isMax then
PopupTipPanel.ShowTip(Language[11772])
else
@@ -107,7 +105,7 @@ function EquipTreasureStrongPopup:BindEvent()
end)
--精炼按钮
- Util.AddClick(this.btn_refine, function()
+ Util.AddClick(this.btnRefine, function()
--如果精炼界面 精炼到最高等级谈提示 否 强化界面 就切界面
if type==2 then
if isMax then
@@ -115,7 +113,7 @@ function EquipTreasureStrongPopup:BindEvent()
return
end
else
- this.SetWindShow(2)
+ this:SetWindShow(2)
return
end
if isMatEnough==false then
@@ -147,7 +145,8 @@ function EquipTreasureStrongPopup:BindEvent()
end
end
EquipTreasureManager.ChangeTreasureLv(curEquipData.idDyn,type)
- this.SetWindShow(type)
+ this:SetWindShow(type)
+ this.treasureDatas[curIndex]:OnOpen(false, {curEquipData.id,0}, 1, true, false, false, 0,curEquipData.idDyn)
if isMax then
PopupTipPanel.ShowTip(Language[11774])
else
@@ -169,160 +168,186 @@ function EquipTreasureStrongPopup:OnOpen(...)
local datas={...}
curEquipData=datas[1]
type=datas[2]
-
end
function EquipTreasureStrongPopup:OnShow()
- this.SetWindShow(type)
+ local datas = EquipTreasureManager.GetAllHeroEquipedTreasureData()
+ this.formationInfo = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
+ table.sort(datas,function(a,b)
+ local aIsMainFormation = this:GetHeroIsMainFormation(a.upHeroDid)
+ local bIsMainFormation = this:GetHeroIsMainFormation(b.upHeroDid)
+ if aIsMainFormation and bIsMainFormation then
+ if a.upHeroDid ~= b.upHeroDid then
+ return aIsMainFormation.position < bIsMainFormation.position
+ else
+ return a.equipType < b.equipType
+ end
+ elseif not aIsMainFormation and not bIsMainFormation then
+ if a.quantity == b.quantity then
+ return a.id < b.id
+ else
+ return a.quantity > b.quantity
+ end
+ else
+ return aIsMainFormation
+ end
+ end)
+ this:ShowTopDataList(datas)
+ this:SetWindShow(type)
+end
+
+function EquipTreasureStrongPopup:GetHeroIsMainFormation(HeroId)
+ for k,v in ipairs(this.formationInfo.teamHeroInfos) do
+ if HeroId == v.heroId then
+ return v
+ end
+ end
+ return nil
+end
+
+function EquipTreasureStrongPopup:ShowTopDataList(list)
+ if not this.treasureDatas then
+ this.treasureDatas = {}
+ end
+
+ this.firstScrollCycleView:ForeachItemGO(function(index, go)
+ go.gameObject:SetActive(false)
+ end)
+
+ this.firstScrollCycleView:SetData(list,function(index, go)
+ this:SetScrollPre(go,list[index],index)
+ end,false,false)
+
+ for i = 1,#list do
+ if list[i].idDyn == curEquipData.idDyn then
+ curIndex = i
+ this.firstScrollCycleView:SetIndex(i)
+ break
+ end
+ end
+end
+
+function EquipTreasureStrongPopup:SetScrollPre(go,data,_index)
+ if data.idDyn == curEquipData.idDyn then
+ this.select.transform:SetParent(go.transform)
+ this.select:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(-8.5,6.8,0)
+ this.select.gameObject:SetActive(true)
+ end
+ go.gameObject:SetActive(true)
+ local btn = Util.GetGameObject(go,"btn")
+ local red = Util.GetGameObject(go,"red")
+ if not this.treasureDatas[_index] then
+ this.treasureDatas[_index] = SubUIManager.Open(SubUIConfig.ItemView,go.transform)
+ this.treasureDatas[_index].transform:SetAsFirstSibling()
+ end
+ this.treasureDatas[_index]:OnOpen(false, {data.id,0}, 1, true, false, false, 0,data.idDyn)
+ this.treasureDatas[_index].name:GetComponent("Text").text = HeroManager.GetSingleHeroData(data.upHeroDid).heroConfig.ReadingName
+ red.gameObject:SetActive(false)
+ Util.AddOnceClick(btn,function()
+ this.select.transform:SetParent(go.transform)
+ this.select:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(-8.5,6.8,0)
+ this.select.gameObject:SetActive(true)
+ curEquipData = data
+ curIndex = _index
+ this:SetWindShow(type)
+ end)
end
--设置界面显示 1.强化 2.精炼
-function this.SetWindShow(_index)
+function EquipTreasureStrongPopup:SetWindShow(_index)
haveTreasures = {}
- type=_index
- LogBlue("curEquipData.idDyn:"..curEquipData.idDyn)
+ type = _index
curEquipData = EquipTreasureManager.GetSingleEquipTreasreData(curEquipData.idDyn)
isMatEnough=true
isCoinEnough=true
- this.equipFrame.sprite=this.spLoader:LoadSprite(curEquipData.frame)
- this.equipIcon.sprite=this.spLoader:LoadSprite(curEquipData.icon)
- this.equipName.text=curEquipData.name
- this.proImg.sprite=this.spLoader:LoadSprite(curEquipData.proIcon)
- local items, coin
- if _index==1 then
- this.titleTxt.text=Language[11775]
- this.btn_refine:SetActive(false)
- this.btn_strong:SetActive(true)
+ local items, propertyShow
+ if _index == 1 then
+ this.titleTxt.text = Language[11775]
+ this.btnRefine:SetActive(false)
+ this.btnStrong:SetActive(true)
this.SetBtnSelect(this.btn_strongPage)
- --显示属性
- this.lvTxt.text=string.format( Language[11776],curEquipData.lv,curEquipData.maxLv)
- isMax =curEquipData.lv==curEquipData.maxLv
+ isMax = curEquipData.lv == curEquipData.maxLv
+ this.properList[0].leftTxt.text = "强化等级"
if isMax then
- this.lvValueTxt.text = isMax and Language[11062] or string.format( "%d/%d",curEquipData.lv,curEquipData.maxLv)
- --Util.GetGameObject(this.btn_strong,"Text"):GetComponent("Text").text="已达上限"
- --this.btn_refine.gameObject:SetActive(true)
- this.btn_strong.gameObject:SetActive(false)
+ this.properList[0].rightTxt.text = Language[11062]
+ this.btnStrong.gameObject:SetActive(false)
else
- Util.GetGameObject(this.btn_strong,"Text"):GetComponent("Text").text=Language[11777]
- this.lvValueTxt.text = isMax and Language[11062] or string.format( "%d/%d",curEquipData.lv+1,curEquipData.maxLv)
- this.btn_refine.gameObject:SetActive(false)
+ this.btnStrongText.text = Language[11777]
+ this.properList[0].rightTxt.text = string.format( "%d/%d",curEquipData.lv+1,curEquipData.maxLv)
end
- local info1=EquipTreasureManager.GetCurrLvAndNextLvPropertyValue(1,curEquipData.levelPool,curEquipData.lv)
- this.SetPropertyShow(info1)
+ propertyShow = EquipTreasureManager.GetCurrLvAndNextLvPropertyValue(1,curEquipData.levelPool,curEquipData.lv)
--显示消耗
- items,coin=this.GetCostItems(curEquipData.strongConfig)
+ items = this:GetCostItems(curEquipData.strongConfig)
this.hintTxt.text=Language[11778]
-
else
this.titleTxt.text=Language[11779]
- this.btn_strong:SetActive(false)
- this.btn_refine:SetActive(true)
+ this.btnRefine:SetActive(true)
+ this.btnStrong:SetActive(false)
this.SetBtnSelect(this.btn_refinePage)
- --显示属性
- this.lvTxt.text=string.format( Language[11780],curEquipData.refineLv,curEquipData.maxRefineLv)
isMax=curEquipData.refineLv==curEquipData.maxRefineLv
- if isMax then
- this.lvValueTxt.text = isMax and Language[11062] or string.format( "%d/%s",curEquipData.refineLv,curEquipData.maxRefineLv)
- --Util.GetGameObject(this.btn_refine,"Text"):GetComponent("Text").text="已达上限"
- --this.btn_strong.gameObject:SetActive(true)
- this.btn_refine.gameObject:SetActive(false)
+ this.properList[0].leftTxt.text = "精炼等级"
+ if isMax then
+ this.properList[0].rightTxt.text = Language[11062]
+ this.btnRefine.gameObject:SetActive(false)
else
- Util.GetGameObject(this.btn_refine,"Text"):GetComponent("Text").text=Language[11781]
- this.btn_strong.gameObject:SetActive(false)
- this.lvValueTxt.text = isMax and Language[11062] or string.format( "%d/%s",curEquipData.refineLv+1,curEquipData.maxRefineLv)
+ this.btnRefineText.text=Language[11781]
+ this.properList[0].rightTxt.text = string.format( "%d/%s",curEquipData.refineLv+1,curEquipData.maxRefineLv)
end
- local info2=EquipTreasureManager.GetCurrLvAndNextLvPropertyValue(2,curEquipData.refinePool,curEquipData.refineLv)
- this.SetPropertyShow(info2)
- items,coin=this.GetCostItems(curEquipData.refineConfig)
+ propertyShow = EquipTreasureManager.GetCurrLvAndNextLvPropertyValue(2,curEquipData.refinePool,curEquipData.refineLv)
+ items = this:GetCostItems(curEquipData.refineConfig)
this.hintTxt.text=Language[11782]
end
- this.hintTxt.gameObject:SetActive(isMax)
- --显示消耗金币
- if coin and isMax==false then
- this.coinImg.gameObject:SetActive(true)
- this.coinTxt.gameObject:SetActive(true)
- this.coinBg.gameObject:SetActive(true)
- this.coinImg.sprite=this.spLoader:LoadSprite(coin.icon)
- if coin.isEnough then
- this.coinTxt.text=string.format("%s",coin.needNum)
- else
- isCoinEnough=false
- this.coinTxt.text=string.format("%s",coin.needNum)
- end
+
+ if HarmonyManager.IsInfo(curEquipData.upHeroDid) and _index == 1 then
+ this.hintTxt.text = "共鸣中的宝物无法强化"
+ this.hintTxt.gameObject:SetActive(true)
else
- this.coinImg.gameObject:SetActive(false)
- this.coinTxt.gameObject:SetActive(false)
- this.coinBg.gameObject:SetActive(false)
+ this.hintTxt.gameObject:SetActive(isMax)
+ end
+ this:SetPropertyShow(propertyShow)
+ this:CostShow(items)
+end
+
+function EquipTreasureStrongPopup:CostShow(items)
+ if not this.costItemPreList then
+ this.costItemPreList = {}
end
--显示消耗物品
if items and isMax==false then
this.costItemGrid.gameObject:SetActive(true)
- local dataCount=table.getn(items)
- local preCount=table.getn(costItemPreList)
- for i = 1, dataCount-preCount do
- local pre=newObjToParent(this.costItemPre,this.costItemGrid)
- pre.transform.localScale = Vector3.one
- pre.transform.localPosition = Vector3.zero
- table.insert(costItemPreList,pre)
- end
- local index=1
- for i, v in pairs(items) do
- local obj=costItemPreList[index]
- obj.gameObject:SetActive(true)
- if v then
- obj.gameObject:SetActive(true)
+ for i = 1,math.max(#items,#this.costItemPreList) do
+ if not items[i] then
+ this.costItemPreList[i].gameObject:SetActive(false)
else
- obj.gameObject:SetActive(false)
- end
- Util.GetGameObject(obj,"iconBg"):GetComponent("Image").sprite=this.spLoader:LoadSprite(v.frame)
- Util.GetGameObject(obj,"icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(v.icon)
- if jewelConfig[v.id] then
- Util.GetGameObject(obj,"proImg"):SetActive(true)
- Util.GetGameObject(obj,"proImg"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(itemConfig[v.id].PropertyName))
- else
- Util.GetGameObject(obj,"proImg"):SetActive(false)
- end
- if v.isEnough then
- Util.GetGameObject(obj,"numTxt"):GetComponent("Text").text=string.format("%s/%s",v.haveNum,v.needNum)
- else
- --如果材料不足默认弹第一个不足的材料tip
- if isMatEnough then
- isMatEnough=false
- matId=v.id
+ if not this.costItemPreList[i] then
+ this.costItemPreList[i] = SubUIManager.Open(SubUIConfig.ItemView,this.costItemGrid.transform)
end
- Util.GetGameObject(obj,"numTxt"):GetComponent("Text").text=string.format("%s/%s",v.haveNum,v.needNum)
- end
- if v.id==curEquipData.id then
- if v.isEnough then
- Util.GetGameObject(obj,"add").gameObject:SetActive(false)
+ this.costItemPreList[i].gameObject:SetActive(true)
+ if items[i].id==curEquipData.id then
+ this.costItemPreList[i]:OnOpen(false,{items[i].id,0}, 0.8, true, items[i].isEnough , false, 0)
else
- Util.GetGameObject(obj,"add").gameObject:SetActive(true)
+ this.costItemPreList[i]:OnOpen(false,{items[i].id,0}, 0.8, true, false , false, 0)
end
- else
- Util.GetGameObject(obj,"add").gameObject:SetActive(false)
- end
- Util.AddClick(Util.GetGameObject(obj,"icon"),function ()
- if jewelConfig[v.id] then
- UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",v.id,0,0)
+ if items[i].isEnough then
+ this.costItemPreList[i].name:GetComponent("Text").text = string.format("%s/%s",items[i].haveNum,items[i].needNum)
else
- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,v.id)
+ --如果材料不足默认弹第一个不足的材料tip
+ if isMatEnough then
+ isMatEnough=false
+ matId=items[i].id
+ end
+ this.costItemPreList[i].name:GetComponent("Text").text = string.format("%s/%s",items[i].haveNum,items[i].needNum)
end
- end)
- index=index+1
- end
- for i = 1,#costItemPreList do
- if i>=index then
- costItemPreList[i]:SetActive(false)
end
end
else
- this.costItemGrid.gameObject:SetActive(false)
+ this.costItemGrid.gameObject:SetActive(false)
end
end
--获取消耗物品数据
-function this.GetCostItems(_config)
+function EquipTreasureStrongPopup:GetCostItems(_config)
if _config==nil then
return
end
@@ -331,7 +356,6 @@ function this.GetCostItems(_config)
if exps==nil then
return
end
- local costCoin
local items={}
for i = 1,#exps do
local id=exps[i][1]
@@ -343,12 +367,7 @@ function this.GetCostItems(_config)
item.haveNum=BagManager.GetItemCountById(id)
item.needNum=exps[i][2]
item.isEnough=item.haveNum>=item.needNum
- --消耗金币
- if id==14 then
- costCoin=item
- else
- items[i]=item
- end
+ items[i]=item
end
end
if config.JewelExpend then
@@ -416,37 +435,44 @@ end
--设置属性的显示
-function this.SetPropertyShow(_infos)
- local dataCount=LengthOfTable(_infos)
- local preCount=#properList
- for i = 1, dataCount-preCount do
- local go = newObject(this.properItemPre)
- go.transform:SetParent(this.propertyGrid.transform)
- go.transform.localScale = Vector3.one
- go.transform.localPosition = Vector3.zero
- go.gameObject:SetActive(false)
- --properList[i] = go
- table.insert(properList,go)
+function EquipTreasureStrongPopup:SetPropertyShow(_infos)
+ if this.hintTxt.gameObject.activeInHierarchy then
+ this.properList[0].go.gameObject:SetActive(false)
+ this.propertyGrid.gameObject:SetActive(false)
+ return
end
- local index=1
+ this.propertyGrid.gameObject:SetActive(true)
+ if type == 1 and HarmonyManager.IsInfo(curEquipData.upHeroDid) then
+ for i = 0, #this.properList do
+ this.properList[i].go.gameObject:SetActive(false)
+ end
+ --this.gongming.gameObject:SetActive(true)
+ return
+ end
+ --this.gongming.gameObject:SetActive(false)
+ this.properList[0].go.gameObject:SetActive(true)
+ for i = 1, #this.properList do
+ this.properList[i].go.gameObject:SetActive(false)
+ end
+ local index = 1
for key, value in pairs(_infos) do
- local obj=properList[index]
+ if not this.properList[index] then
+ this.properList[index] = {}
+ this.properList[index].go = newObjToParent(this.properItemPre,this.propertyGrid)
+ this.properList[index].leftTxt = Util.GetGameObject(this.properList[index].go,"leftTxt"):GetComponent("Text")
+ this.properList[index].rightTxt = Util.GetGameObject(this.properList[index].go,"rightTxt"):GetComponent("Text")
+ end
+ this.properList[index].go.gameObject:SetActive(true)
local proper=ConfigManager.GetConfigData(ConfigName.PropertyConfig,key)
if proper.Style==1 then
- Util.GetGameObject(obj,"leftTxt"):GetComponent("Text").text=string.format("%s+%s",GetLanguageStrById(proper.Info),value.currValue)
- Util.GetGameObject(obj,"rightTxt"):GetComponent("Text").text= isMax and Language[11062] or value.nextValue
+ this.properList[index].leftTxt.text=string.format("%s+%s",GetLanguageStrById(proper.Info),value.currValue)
+ this.properList[index].rightTxt.text= isMax and Language[11062] or value.nextValue
else
- Util.GetGameObject(obj,"leftTxt"):GetComponent("Text").text=GetLanguageStrById(proper.Info).."+"..value.currValue/100 .."%"
- Util.GetGameObject(obj,"rightTxt"):GetComponent("Text").text=isMax and Language[11062] or value.nextValue/100 .."%"
+ this.properList[index].leftTxt.text=GetLanguageStrById(proper.Info).."+"..value.currValue/100 .."%"
+ this.properList[index].rightTxt.text = isMax and Language[11062] or value.nextValue/100 .."%"
end
- obj.gameObject:SetActive(true)
index=index+1
end
- for i = 1, #properList do
- if i>=index then
- properList[i]:SetActive(false)
- end
- end
end
--设置物体选中
@@ -459,22 +485,30 @@ end
--界面关闭时调用(用于子类重写)
function EquipTreasureStrongPopup:OnClose()
-
+ curEquipData=nil
+ isEnough=true
+ type=0
+ isMax=false
+ isCoinEnough=false
+ isMatEnough=false
+ haveTreasures={}
+ matId = 0
end
--界面销毁时调用(用于子类重写)
function EquipTreasureStrongPopup:OnDestroy()
this.spLoader:Destroy()
- curEquipData=nil
- properList={}
- costItemPreList={}
- isEnough=true
- haveTreasures={}
- type=0
- isMatEnough=false
- matId=0
- isCoinEnough=false
- isMax=false
+ Util.ClearChild(this.propertyGrid.transform)
+ this.properList = {}
+ for i = 1,#this.costItemPreList do
+ SubUIManager.Close(this.costItemPreList[i])
+ end
+ this.costItemPreList = {}
+ for i = 1,#this.costItemPreList do
+ SubUIManager.Close(this.treasureDatas[i])
+ end
+ this.costItemPreList = {}
+ SubUIManager.Close(this.firstScrollCycleView)
end
return EquipTreasureStrongPopup
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
index 7774246785..df801a336a 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
@@ -32,7 +32,7 @@ local curHeroData
local heroListData
local curSelectEquipData
local index
-local indexBtnNum = 0
+local indexBtnNum = 1
local typeTab = {
[0] = Language[10175],
[1] = Language[10391],
@@ -86,7 +86,7 @@ function RoleEquipPanel:InitComponent()
end
--装备list
this.effect = Util.GetGameObject(self.transform, "bg/effect")
- for i = 0, 6 do
+ for i = 1, 6 do
tabs[i] = Util.GetGameObject(self.transform, "Tabs/Btn" .. i)
Util.GetGameObject(tabs[i], "Text"):GetComponent("Text").fontSize = GetCurLanguage() == 0 and 48 or 40
effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect")
@@ -192,7 +192,7 @@ function RoleEquipPanel:BindEvent()
end
)
- for i = 0, 6 do
+ for i = 1, 6 do
Util.AddClick(
tabs[i],
function()
@@ -201,11 +201,12 @@ function RoleEquipPanel:BindEvent()
return
end
indexBtnNum = i
- if indexBtnNum == PosIdConst.All then
- this:OnClickAllBtn()
- else
- this:OnClickTabBtn(indexBtnNum)
- end
+ this:OnClickTabBtn(indexBtnNum)
+ -- if indexBtnNum == PosIdConst.All then
+ -- this:OnClickAllBtn()
+ -- else
+ -- this:OnClickTabBtn(indexBtnNum)
+ -- end
end
)
end
@@ -247,11 +248,12 @@ end
function this.CurrEquipDataChange()
this.ShowHeroEquip()
- if indexBtnNum == PosIdConst.All then
- this:OnClickAllBtn()
- else
- this:OnClickTabBtn(indexBtnNum)
- end
+ this:OnClickTabBtn(indexBtnNum)
+ -- if indexBtnNum == PosIdConst.All then
+ -- this:OnClickAllBtn()
+ -- else
+ -- this:OnClickTabBtn(indexBtnNum)
+ -- end
end
--界面打开时调用(用于子类重写)
@@ -284,10 +286,10 @@ function RoleEquipPanel:OnShow()
effectList[i]:SetActive(false)
end
end
- indexBtnNum = PosIdConst.All
+ indexBtnNum = PosIdConst.WuQi
teamHero = FormationManager.GetAllMainFormationHeroId()
this.ShowHeroEquip(true)
- this:OnClickAllBtn()
+ this:OnClickTabBtn(indexBtnNum)
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
end
@@ -301,22 +303,24 @@ function this:RightBtnOnClick()
index = (index + 1 <= #heroListData and index + 1 or 1)
curHeroData = heroListData[index]
this.ShowHeroEquip()
- if indexBtnNum == PosIdConst.All then
- this:OnClickAllBtn()
- else
- this:OnClickTabBtn(indexBtnNum)
- end
+ this:OnClickTabBtn(indexBtnNum)
+ -- if indexBtnNum == PosIdConst.All then
+ -- this:OnClickAllBtn()
+ -- else
+ -- this:OnClickTabBtn(indexBtnNum)
+ -- end
end
--左切换按钮点击
function this:LeftBtnOnClick()
index = (index - 1 > 0 and index - 1 or #heroListData)
curHeroData = heroListData[index]
this.ShowHeroEquip()
- if indexBtnNum == PosIdConst.All then
- this:OnClickAllBtn()
- else
- this:OnClickTabBtn(indexBtnNum)
- end
+ this:OnClickTabBtn(indexBtnNum)
+ -- if indexBtnNum == PosIdConst.All then
+ -- this:OnClickAllBtn()
+ -- else
+ -- this:OnClickTabBtn(indexBtnNum)
+ -- end
end
--一键装备
@@ -716,25 +720,25 @@ function this:UpdateEquipItem(go,data,lvObj,refineObj)
end
EquipManager.SetEquipStarShow(this.spLoader, Util.GetGameObject(go.transform, "frame/star"),data.itemConfig.Id)
end
---点击全部按钮
-function this:OnClickAllBtn()
- this:SetSelectBtn()
- local itemData = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession)
- this:SortEquipDatas(itemData)
- local count = 0
- for i=1,#itemData do
- count = count + 1--itemData[i].num
- end
- --加上宝器数据
- local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.heroConfig.PropertyName)
- --宝器排序
- for i = 1, #curAllEquipTreasure do
- table.insert(itemData, curAllEquipTreasure[i])
- end
- --"装备数量:"
- this.itemNumText.text = Language[12181] .. count + LengthOfTable(curAllEquipTreasure)
- this:SetItemData(itemData)
-end
+-- --点击全部按钮
+-- function this:OnClickAllBtn()
+-- this:SetSelectBtn()
+-- local itemData = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession)
+-- this:SortEquipDatas(itemData)
+-- local count = 0
+-- for i=1,#itemData do
+-- count = count + 1--itemData[i].num
+-- end
+-- --加上宝器数据
+-- local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.heroConfig.PropertyName)
+-- --宝器排序
+-- for i = 1, #curAllEquipTreasure do
+-- table.insert(itemData, curAllEquipTreasure[i])
+-- end
+-- --"装备数量:"
+-- this.itemNumText.text = Language[12181] .. count + LengthOfTable(curAllEquipTreasure)
+-- this:SetItemData(itemData)
+-- end
--点击装备按钮
function this:OnClickTabBtn(_index)
@@ -1075,13 +1079,17 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
--刷新界面
this.ShowHeroEquip()
--上阵刷新红点
- this.allEquipUpRedPoint:SetActive(#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and isUpZhen)
- --刷新当前英雄可穿装备
- if indexBtnNum == PosIdConst.All then
- this:OnClickAllBtn()
- else
- this:OnClickTabBtn(indexBtnNum)
- end
+ this.allEquipUpRedPoint:SetActive((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)) and isUpZhen)
+ this.equipBTn5Add.gameObject:SetActive(isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,1) > 0)
+ this.equipBtn6Add.gameObject:SetActive(isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,2) > 0)
+
+ this:OnClickTabBtn(indexBtnNum)
+ -- --刷新当前英雄可穿装备
+ -- if indexBtnNum == PosIdConst.All then
+ -- this:OnClickAllBtn()
+ -- else
+ -- this:OnClickTabBtn(indexBtnNum)
+ -- end
--对比战力并更新战力值 播放战力变更动画
HeroManager.CompareWarPower(curHeroData.dynamicId)
end
@@ -1114,9 +1122,13 @@ end
function this:SortEquipDatas(_equipDatas)
if teamHero[curHeroData.dynamicId] then
isUpZhen = true
- this.allEquipUpRedPoint:SetActive(#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0)
+ this.equipBTn5Add.gameObject:SetActive(isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,1) > 0)
+ this.equipBtn6Add.gameObject:SetActive(isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,2) > 0)
+ this.allEquipUpRedPoint:SetActive((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)) and isUpZhen)
curHeroCanUpEquipTabs = HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId)
else
+ this.equipBTn5Add.gameObject:SetActive(false)
+ this.equipBtn6Add.gameObject:SetActive(false)
isUpZhen = false
this.allEquipUpRedPoint:SetActive(false)
curHeroCanUpEquipTabs = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
index 31f37c0b4b..150fa852f6 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
@@ -359,7 +359,7 @@ end
function this.SetPropertyShow(_infos,_preList,_grid)
local dataCount=LengthOfTable(_infos)
- local preCount=#_preList
+ local preCount = #_preList
for i = 1, dataCount-preCount do
local go = newObject(this.propertyPre)
go.transform:SetParent(_grid.transform)
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
index 327db913d5..02e946acfa 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
@@ -554,7 +554,26 @@ function this:UpdateHeroInfoData()
local EquipSignUnlockTwo = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,87).OpenRules[2]
if teamHero[curHeroData.dynamicId] then
isUpZhen = true
- this.equipBtnRedPoint:SetActive(#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0)
+ local isCanUpEquipTreasure
+ local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,40)
+ if config then
+ local limits = string.split(config.Value, "|")
+ if limits then
+ local heroConfig = curHeroData.heroConfig
+ local lvs = string.split(limits[1], "#")
+ local stars = string.split(limits[2], "#")
+ if PlayerManager.level >= tonumber(lvs[2]) and heroConfig ~= nil and heroConfig.MaxRank >= tonumber(stars[2]) then
+ isCanUpEquipTreasure = true
+ else
+ isCanUpEquipTreasure = false
+ end
+ else
+ isCanUpEquipTreasure = false
+ end
+ else
+ isCanUpEquipTreasure = false
+ end
+ this.equipBtnRedPoint:SetActive((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)))
this.talismanBtnRedPoint:SetActive(HeroManager.GetIsShowTalismanRedPoint(curHeroData))
this.soulPrintBtnRedPoint:SetActive(HeroManager.GetIsShowSoulPrintRedPoint(curHeroData))
else
diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua
index 3644e8c10e..1d019bb04e 100644
--- a/Assets/ManagedResources/~Lua/View/ItemView.lua
+++ b/Assets/ManagedResources/~Lua/View/ItemView.lua
@@ -28,6 +28,8 @@ function ItemView:InitComponent()
Util.GetGameObject(self.gameObject, "item/heroShow/posIcon"):SetActive(false)
self.name = Util.GetGameObject(self.gameObject, "name")
self.resetLv = Util.GetGameObject(self.gameObject, "item/resetLv")
+ self.rightUplv = Util.GetGameObject(self.gameObject, "item/rightUplv"):GetComponent("Text")
+ self.middleDownLv = Util.GetGameObject(self.gameObject, "item/middleDownLv"):GetComponent("Text")
self.item = Util.GetGameObject(self.gameObject, "item")
self.innateImage=Util.GetGameObject(self.gameObject, "item/innateImage")
self.innateText=Util.GetGameObject(self.gameObject, "item/innateImage/Text"):GetComponent("Text")
@@ -82,7 +84,7 @@ end
--isPlayAnim 是否播放获得动画(默认不播)
--effectLayer 当前界面层级(显示粒子特效用)
--界面打开时调用(用于子类重写)
-function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, isPlayAnim, effectLayer)
+function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, isPlayAnim, effectLayer,Did)
isShowName = isShowName or false
isShowAddImage = isShowAddImage or false
isPlayAnim = isPlayAnim or false
@@ -92,6 +94,7 @@ function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, i
self.addImage:SetActive(isShowAddImage)
self.gameObject:GetComponent("PlayFlyAnim").enabled = isPlayAnim
self.scale = _scale or 1
+ self.Did = Did
--self.gameObject:GetComponent("RectTransform").localScale = Vector2.New(scale, scale)
self.gameObject:GetComponent("RectTransform").sizeDelta = Vector2.New(135, 135)
if isGet and itemDatas then
@@ -101,6 +104,8 @@ function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, i
end
end
function ItemView:GetRewardShow(_itemData, effectLayer)
+ self.rightUplv.gameObject:SetActive(false)
+ self.middleDownLv.gameObject:SetActive(false)
self.isRewardItemPop=true
self.fragmentIcon:SetActive(false)
self.heroShowGo:SetActive(false)
@@ -393,6 +398,8 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.UI_Effect_jinkuang_Yuan:SetActive(false)
self.UI_effect_ItemView_saoguang:SetActive(false)
self.UI_effect_WuCai_Kuang:SetActive(false)
+ self.rightUplv.gameObject:SetActive(false)
+ self.middleDownLv.gameObject:SetActive(false)
self.iconGo:SetActive(true)
self.circleFrameBg:SetActive(false)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_JinSe, effectLayer - self.EffectOrginLayerQu)
@@ -565,6 +572,29 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
self.fragmentIcon:SetActive(true)
self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(itemConfig[itemSId].PropertyName))
+ if not self.Did then
+ self.rightUplv.gameObject:SetActive(false)
+ self.middleDownLv.gameObject:SetActive(false)
+ else
+ local data = EquipTreasureManager.GetSingleTreasureByIdDyn(self.Did)
+ if not data then
+ self.rightUplv.gameObject:SetActive(false)
+ self.middleDownLv.gameObject:SetActive(false)
+ else
+ if data.lv > 0 then
+ self.rightUplv.gameObject:SetActive(true)
+ self.rightUplv.text = string.format("+%s",data.lv)
+ else
+ self.rightUplv.gameObject:SetActive(false)
+ end
+ if data.refineLv > 0 then
+ self.middleDownLv.gameObject:SetActive(true)
+ self.middleDownLv.text =string.format("+%s", data.refineLv)
+ else
+ self.middleDownLv.gameObject:SetActive(false)
+ end
+ end
+ end
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0)
end)
@@ -715,6 +745,9 @@ function ItemView:OnClose()
-- 修复对象池回收层级没有重置,导致特效穿透的问题
self:SetEffectLayer(-self.EffectOrginLayerQu)
self.spLoader:Destroy()
+ self.rightUplv.gameObject:SetActive(false)
+ self.middleDownLv.gameObject:SetActive(false)
+ self.Did = nil
end
function ItemView:OnDestroy()
diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua
index 36cac6687b..f5067f55fa 100644
--- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua
+++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua
@@ -187,14 +187,16 @@ function PlayerLiveView:OnShowLive()
-- curArtResourcesConfig.Scale* self.transform.localScale.x
local effect=0
if self.posType==NPCPosType.maincity then
- LogError("=================zhucheng".." "..self.transform.localScale.x)
effect=self.transform.localScale.x
elseif self.posType==NPCPosType.onHook then
effect=50
- else
+ elseif self.posType==NPCPosType.smallMap then
effect=self.leader.transform.localScale.x
+ else
+ --effect=self.leader.transform.localScale.x
+ effect=45
end
- LogError("curArtResourcesConfig.Scale=="..curArtResourcesConfig.Scale.." effect=="..effect)
+ LogError(" effect scale=="..effect)
self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale * effect,self.orginLayer)
end
end
@@ -202,6 +204,11 @@ function PlayerLiveView:SetNameHeight(hei)
self.nameHeight=hei
end
+function PlayerLiveView:SetTitleHide()
+ self.titleLiveGo:SetActive(false)
+end
+
+
function PlayerLiveView:SetWalkDir(dir)
-- LogBlue("PlayerLiveView dir : "..dir)
if dir == WALK_DIR.IDLE_FRONT then-- 站立_向前
diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua
index cf1f1cdad8..a0ac2367f0 100644
--- a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua
+++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua
@@ -53,7 +53,6 @@ function PlayerTitle:SetShow(itemId, position, scale, effectScale, layer)
self.curTitleName = curArtResourcesConfig.Name
self.titleLive = poolManager:LoadAsset(self.curTitleName, PoolManager.AssetType.GameObject)
self.titleLive.transform:SetParent(self.transform)
- self.titleLive.gameObject:SetActive(false)
if effectScale then
self:SetEffectScale(effectScale)
end
@@ -68,7 +67,6 @@ function PlayerTitle:SetShow(itemId, position, scale, effectScale, layer)
if layer then
self:SetLayer(layer)
end
- self.titleLive.gameObject:SetActive(true)
end
function PlayerTitle:SetPostion(position)
@@ -87,6 +85,7 @@ end
function PlayerTitle:SetEffectScale(effectScale)
if self.titleLive then
+ self.titleLive.gameObject:SetActive(false)
Util.SetParticleScale(self.titleLive, effectScale)
local isScaleActive = true
-- 处理喜扑老包称号显示异常的问题,喜扑第一个版本的包在底层删除了缩放节点,这里要处理下针对此包不再进行缩放还原
@@ -109,6 +108,7 @@ function PlayerTitle:SetEffectScale(effectScale)
self.titleLive.transform.localScale = Vector3.one * (self.scale or 1)
end
end
+ self.titleLive.gameObject:SetActive(true)
end
end
diff --git a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua
index 75d09a3264..c930e0212a 100644
--- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua
+++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua
@@ -159,7 +159,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
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
- self.playerLiveView = PlayerLiveView:New(self.roleRoot,1,nil,sortingorder,NPCPosType.onHook)
+ self.playerLiveView = PlayerLiveView:New(self.roleRoot,1,nil,sortingorder)
self.playerLiveView:RemoveTitleCanvas()
self.nameDi.gameObject:SetActive(false)
--如果修行开启设置修行标识
@@ -176,7 +176,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
sex = data.sex,
ride = data.userMount,
designation = data.userTitle,
- },sortingorder,NPCPosType.onHook)
+ },sortingorder)
self.playerLiveView:SetNameHeight(1.5)
self.playerLiveView:RemoveTitleCanvas()
if data.userMount == 0 then