diff --git a/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab b/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab
index 90fa12be..3c9986bf 100644
--- a/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab
+++ b/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab
@@ -74,7 +74,7 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "xx\u4F01\u4E1A"
diff --git a/FuZhou_FirstPage/Assets/Scenes/MainScene.unity b/FuZhou_FirstPage/Assets/Scenes/MainScene.unity
index 71631e43..2b16ef95 100644
--- a/FuZhou_FirstPage/Assets/Scenes/MainScene.unity
+++ b/FuZhou_FirstPage/Assets/Scenes/MainScene.unity
@@ -121,84 +121,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &54858796
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 54858797}
- - component: {fileID: 54858799}
- - component: {fileID: 54858798}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &54858797
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 54858796}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
- m_Children: []
- m_Father: {fileID: 1837879639}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.5}
- m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 74.94104, y: -4.8}
- m_SizeDelta: {x: 216.9812, y: 69.00745}
- m_Pivot: {x: 0, y: 0.5}
---- !u!114 &54858798
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 54858796}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 34
- m_FontStyle: 2
- m_BestFit: 0
- m_MinSize: 1
- m_MaxSize: 40
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u798F\u5DDE\u6D77\u5173"
---- !u!222 &54858799
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 54858796}
- m_CullTransparentMesh: 0
--- !u!1 &55745639
GameObject:
m_ObjectHideFlags: 0
@@ -388,6 +310,11 @@ PrefabInstance:
propertyPath: m_Name
value: "\u9A6C\u5C3E\u6D77\u5173"
objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689185, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
propertyPath: m_LocalPosition.x
@@ -446,12 +373,12 @@ PrefabInstance:
- target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 265.6001
+ value: 260.7
objectReference: {fileID: 0}
- target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -6.600342
+ value: -9.099976
objectReference: {fileID: 0}
- target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
@@ -503,11 +430,51 @@ PrefabInstance:
propertyPath: shi_Panel
value:
objectReference: {fileID: 1350211547}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 180
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -99.5
+ objectReference: {fileID: 0}
- target: {fileID: 8856219313330948112, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
propertyPath: m_Text
value: "\u9A6C\u5C3E\u6D77\u5173"
objectReference: {fileID: 0}
+ - target: {fileID: 8856219313330948112, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_FontData.m_Alignment
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313330948119, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -174.6
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3}
--- !u!224 &122175123 stripped
@@ -637,6 +604,8 @@ RectTransform:
- {fileID: 553973513}
- {fileID: 906701174}
- {fileID: 1171306720}
+ - {fileID: 2020987139}
+ - {fileID: 511419853}
m_Father: {fileID: 1630019883}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -842,6 +811,151 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1001 &511419852
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 331429612}
+ m_Modifications:
+ - target: {fileID: 552651399343491238, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_Text
+ value: "\u957F\u4E50\u673A\u573A\u6D77\u5173"
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: customItem
+ value:
+ objectReference: {fileID: 1355077044}
+ - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: posPercent.x
+ value: 0.2535937
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: posPercent.y
+ value: 0.3703704
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170774, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_Name
+ value: tabItem (4)
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 486.9
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 400
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3}
+--- !u!224 &511419853 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ m_PrefabInstance: {fileID: 511419852}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &553973512
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2474,7 +2588,8 @@ RectTransform:
- {fileID: 1199190228}
- {fileID: 122175123}
- {fileID: 1869556844}
- - {fileID: 1837879639}
+ - {fileID: 1580570619}
+ - {fileID: 1355077043}
m_Father: {fileID: 736029548}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2652,6 +2767,11 @@ PrefabInstance:
propertyPath: m_Name
value: "\u6995\u57CE\u6D77\u5173"
objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689185, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
propertyPath: m_LocalPosition.x
@@ -2715,7 +2835,7 @@ PrefabInstance:
- target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 23.100098
+ value: 33.2
objectReference: {fileID: 0}
- target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
@@ -2767,11 +2887,51 @@ PrefabInstance:
propertyPath: shi_Panel
value:
objectReference: {fileID: 1350211547}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 180
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313227311839, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -99.8
+ objectReference: {fileID: 0}
- target: {fileID: 8856219313330948112, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
propertyPath: m_Text
value: "\u6995\u57CE\u6D77\u5173"
objectReference: {fileID: 0}
+ - target: {fileID: 8856219313330948112, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_FontData.m_Alignment
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313330948119, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -174.5
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3}
--- !u!224 &1199190228 stripped
@@ -3253,6 +3413,158 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bf97c2a6b127df849ac084408d12c579, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &1355077042
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1038666920}
+ m_Modifications:
+ - target: {fileID: 8856219313163689185, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_Name
+ value: "\u957F\u4E50\u673A\u573A\u6D77\u5173"
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 292.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 7
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: -1919
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: -1079
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689187, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: Custom_Code
+ value: 3507
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689187, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: shi_Panel
+ value:
+ objectReference: {fileID: 1350211547}
+ - target: {fileID: 8856219313330948112, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_Text
+ value: "\u957F\u4E50\u673A\u573A\u6D77\u5173"
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3}
+--- !u!224 &1355077043 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ m_PrefabInstance: {fileID: 1355077042}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1355077044 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 8856219313163689187, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ m_PrefabInstance: {fileID: 1355077042}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d5ecb6f991b8bdb41843244a06ff3ed8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!114 &1358083984 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8856219313163689187, guid: 06acf0d7bf4af584f97c5720760b436e,
@@ -3369,6 +3681,173 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1537448950}
m_CullTransparentMesh: 0
+--- !u!1001 &1580570618
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1038666920}
+ m_Modifications:
+ - target: {fileID: 8856219313163689185, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_Name
+ value: "\u5E73\u6F6D\u6D77\u5173"
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689185, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 7
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 327.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -64.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: -1919
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: -1079
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689187, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: Custom_Code
+ value: 3512
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689187, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: shi_Panel
+ value:
+ objectReference: {fileID: 1350211547}
+ - target: {fileID: 8856219313227311838, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313330948112, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_Text
+ value: "\u5E73\u6F6D\u6D77\u5173"
+ objectReference: {fileID: 0}
+ - target: {fileID: 8856219313330948118, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3}
+--- !u!224 &1580570619 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ m_PrefabInstance: {fileID: 1580570618}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1580570620 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 8856219313163689187, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ m_PrefabInstance: {fileID: 1580570618}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d5ecb6f991b8bdb41843244a06ff3ed8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!114 &1618120019 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8856219313163689187, guid: 06acf0d7bf4af584f97c5720760b436e,
@@ -3812,81 +4291,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bf97c2a6b127df849ac084408d12c579, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &1837879638
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1837879639}
- - component: {fileID: 1837879641}
- - component: {fileID: 1837879640}
- m_Layer: 5
- m_Name: bg
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1837879639
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1837879638}
- 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: 54858797}
- m_Father: {fileID: 1038666920}
- m_RootOrder: 7
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 412.90002, y: 81}
- m_SizeDelta: {x: -1651, y: -995}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1837879640
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1837879638}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: e68695297bab0764d8e14fa0ab5c2861, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &1837879641
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1837879638}
- m_CullTransparentMesh: 0
--- !u!1001 &1869556843
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3899,6 +4303,11 @@ PrefabInstance:
propertyPath: m_Name
value: "\u8386\u7530\u6D77\u5173"
objectReference: {fileID: 0}
+ - target: {fileID: 8856219313163689185, guid: 06acf0d7bf4af584f97c5720760b436e,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e,
type: 3}
propertyPath: m_LocalPosition.x
@@ -4176,6 +4585,151 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1918092859}
m_CullTransparentMesh: 0
+--- !u!1001 &2020987138
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 331429612}
+ m_Modifications:
+ - target: {fileID: 552651399343491238, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_Text
+ value: "\u5E73\u6F6D\u6D77\u5173"
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: customItem
+ value:
+ objectReference: {fileID: 1580570620}
+ - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: posPercent.x
+ value: 0.2463021
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: posPercent.y
+ value: 0.4259259
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170774, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_Name
+ value: tabItem (3)
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 472.9
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 460
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3}
+--- !u!224 &2020987139 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc,
+ type: 3}
+ m_PrefabInstance: {fileID: 2020987138}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2041827823
GameObject:
m_ObjectHideFlags: 0
@@ -4497,6 +5051,8 @@ MonoBehaviour:
customIcons:
- {fileID: 1199190228}
- {fileID: 122175123}
+ - {fileID: 1580570619}
+ - {fileID: 1355077043}
upValue: 32
--- !u!1001 &552651401015330966
PrefabInstance:
@@ -4927,7 +5483,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u798F\u5EFA\u7701"
+ m_Text: "\u798F\u5DDE\u6D77\u5173"
--- !u!114 &2403617721991577384
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs b/FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs
index 892e43e5..dc89530a 100644
--- a/FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs
+++ b/FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs
@@ -41,27 +41,39 @@ public class FirstPanel : MonoBehaviour
///
[HideInInspector]
public string serverIP;
+ ///
+ /// 当前选中的海关
+ ///
+ public static CustomItem currentChoseCustonItem;
void Awake()
{
+ currentChoseCustonItem = null;
instance = this;
backbtn.onClick.AddListener(() =>
{
+ //点福州海关，回到首页，当前无选中关区
+ currentChoseCustonItem = null;
sheng_Panel.gameObject.SetActive(true);
- tab.gameObject.SetActive(true);
+ //关闭所有市
citys.transform.GetComponentsInChildren().ToList().ForEach(a =>
{
a.gameObject.SetActive(false);
});
+ //取消所有标签选中
+ FirstPanel.instance.tab.GetComponentsInChildren().ToList().ForEach(a =>
+ {
+ a.SetNoChoseState();
+ });
});
//初始化
Application.ExternalCall("OnWake");
#if UNITY_EDITOR
- serverIP = "172.16.1.164";
+ serverIP = "111.229.30.246";
#endif
}
diff --git a/FuZhou_FirstPage/Assets/Scripts/Item/CustomItem.cs b/FuZhou_FirstPage/Assets/Scripts/Item/CustomItem.cs
index 41641566..57b8184b 100644
--- a/FuZhou_FirstPage/Assets/Scripts/Item/CustomItem.cs
+++ b/FuZhou_FirstPage/Assets/Scripts/Item/CustomItem.cs
@@ -22,13 +22,14 @@ public class CustomItem : MonoBehaviour
///
public CityPanel shi_Panel;
- private void Awake()
+ void Awake()
{
//默认关闭
shi_Panel.gameObject.SetActive(false);
+ //点击海关标签
btn.onClick.AddListener(() =>
{
- EnterCity();
+ FirstPanel.instance.tab.GetComponentsInChildren().ToList().Find(a => a.customItem == this).Click(null);
});
}
@@ -47,6 +48,8 @@ public class CustomItem : MonoBehaviour
///
public void EnterCity()
{
+ FirstPanel.currentChoseCustonItem = this;
+ //清空选择
FirstPanel.instance.citys.transform.GetComponentsInChildren().ToList().ForEach(a =>
{
a.gameObject.SetActive(false);
diff --git a/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs b/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs
index ccd81e42..9e8368c4 100644
--- a/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs
+++ b/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs
@@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
+using System.Linq;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
@@ -23,10 +24,9 @@ public class TabItem : MonoBehaviour
{
parentRectTransform = transform.parent.GetComponent();
rectTransform=GetComponent();
- //posPercent = new Vector2();
- //posPercent.x = rectTransform.anchoredPosition.x / parentRectTransform.rect.width;
- //posPercent.y= rectTransform.anchoredPosition.y / parentRectTransform.rect.height;
- //print(gameObject.name +" "+ posPercent.x+" "+ posPercent.y);
+#if UNITY_EDITOR
+ Debug.Log("地图比例:"+gameObject.name + " " + rectTransform.anchoredPosition.x / parentRectTransform.rect.width + " " + rectTransform.anchoredPosition.y / parentRectTransform.rect.height);
+#endif
}
void Update()
@@ -49,11 +49,25 @@ public class TabItem : MonoBehaviour
}
public void PointOut(BaseEventData data)
+ {
+ //选中此关区，不切换状态
+ if (customItem != null && FirstPanel.currentChoseCustonItem == customItem)
+ {
+ return;
+ }
+
+ SetNoChoseState();
+ }
+
+ ///
+ /// 未选中状态
+ ///
+ public void SetNoChoseState()
{
showIcon.gameObject.SetActive(false);
GetComponent().sprite = nochoseSprite;
//联动
- if(customItem != null)
+ if (customItem != null)
{
nameText.fontSize = 60;
nameText.font = nochoseFont;
@@ -62,11 +76,29 @@ public class TabItem : MonoBehaviour
}
}
+ ///
+ /// 点击海关标签
+ ///
+ ///
public void Click(BaseEventData data)
{
if (customItem != null)
{
+ //点海关，进入海关页面
customItem.EnterCity();
+ //其他状态取消
+ FirstPanel.instance.tab.GetComponentsInChildren().ToList().ForEach(a =>
+ {
+ if(a!=this)
+ {
+ a.SetNoChoseState();
+ }
+ else
+ {
+ //标签状态选中
+ a.PointIn(null);
+ }
+ });
}
}
}