diff --git a/Assets/ExitBack.cs b/Assets/ExitBack.cs index 6e4b91b..fd04613 100644 --- a/Assets/ExitBack.cs +++ b/Assets/ExitBack.cs @@ -23,6 +23,7 @@ public class ExitBack : MonoBehaviour InputManager.ResertInputmanage(); //重置到场力量 ArrivedPowerTotal.ResertArrivePowerTotal(); + DisasterLibraryFile.Instance.Reset(); } // Update is called once per frame diff --git a/Assets/Prefabs/Common/DisasterLibrary/DissaterSetting.prefab b/Assets/Prefabs/Common/DisasterLibrary/DissaterSetting.prefab index 28c5e57..6cd0204 100644 --- a/Assets/Prefabs/Common/DisasterLibrary/DissaterSetting.prefab +++ b/Assets/Prefabs/Common/DisasterLibrary/DissaterSetting.prefab @@ -6039,7 +6039,6 @@ GameObject: - component: {fileID: 222451386557043764} - component: {fileID: 114520599738601644} - component: {fileID: 114103038736852562} - - component: {fileID: 114467963921326812} - component: {fileID: 114911318478915966} - component: {fileID: 114196717519750358} m_Layer: 5 @@ -6139,19 +6138,6 @@ MonoBehaviour: fireLevel: hasDangerous: hasTrapped: ---- !u!114 &114467963921326812 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1258041660806408} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d7115f98db3ec14c9027fc28532df71, type: 3} - m_Name: - m_EditorClassIdentifier: - policeCallPanel: {fileID: 114103038736852562} --- !u!114 &114911318478915966 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16719,6 +16705,7 @@ GameObject: - component: {fileID: 114762315161020184} - component: {fileID: 114774897320712962} - component: {fileID: 114309462635098822} + - component: {fileID: 419728193961737239} m_Layer: 5 m_Name: PoliceCallSet m_TagString: Untagged @@ -16865,6 +16852,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: policeCallPanel: {fileID: 1258041660806408} +--- !u!114 &419728193961737239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1689996285127230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d7115f98db3ec14c9027fc28532df71, type: 3} + m_Name: + m_EditorClassIdentifier: + policeCallPanel: {fileID: 114103038736852562} --- !u!1 &1691016849283102 GameObject: m_ObjectHideFlags: 0 @@ -25431,6 +25431,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 98 objectReference: {fileID: 0} + - target: {fileID: 1038168047228766, guid: a90fb1c4427b81849bc9d0fb9a1a0287, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 224285037281392376, guid: a90fb1c4427b81849bc9d0fb9a1a0287, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Prefabs/Common/Police/Police.prefab b/Assets/Prefabs/Common/Police/Police.prefab index a295940..d4f33c3 100644 --- a/Assets/Prefabs/Common/Police/Police.prefab +++ b/Assets/Prefabs/Common/Police/Police.prefab @@ -399,9 +399,9 @@ RectTransform: m_Father: {fileID: 224854698571182720} m_RootOrder: 8 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 724.76666, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222018249726727686 @@ -627,9 +627,9 @@ RectTransform: m_Father: {fileID: 224263374970636356} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 379.83334, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222964685125570868 @@ -706,9 +706,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 382, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222063148375981916 @@ -944,9 +944,9 @@ RectTransform: m_Father: {fileID: 224745430434953358} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 552.30005, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222885652101612302 @@ -1023,9 +1023,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 541, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222890667402623262 @@ -1097,9 +1097,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 9 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 653, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222890604644005072 @@ -1343,9 +1343,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 8 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 597, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222112090093647042 @@ -1422,9 +1422,9 @@ RectTransform: m_Father: {fileID: 224854698571182720} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 59.95, y: -23} m_SizeDelta: {x: 119.9, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222098022755726142 @@ -1654,9 +1654,9 @@ RectTransform: m_Father: {fileID: 224949521480340822} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 638.5333, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222312124977212448 @@ -1728,9 +1728,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 382, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222595444836791442 @@ -1802,9 +1802,9 @@ RectTransform: m_Father: {fileID: 224745430434953358} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 207.36667, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222414479382284878 @@ -1881,9 +1881,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 190.5, y: -23} m_SizeDelta: {x: 157, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222878856097539702 @@ -1960,9 +1960,9 @@ RectTransform: m_Father: {fileID: 224949521480340822} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 466.06668, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222758473885169506 @@ -2034,9 +2034,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 8 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 597, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222899524332151294 @@ -2371,9 +2371,9 @@ RectTransform: m_Father: {fileID: 224745430434953358} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 59.95, y: -23} m_SizeDelta: {x: 119.9, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222314902118865714 @@ -2524,9 +2524,9 @@ RectTransform: m_Father: {fileID: 224854698571182720} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 638.5333, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222916273381017740 @@ -2598,9 +2598,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222255057805714874 @@ -3067,9 +3067,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222202301927245052 @@ -3146,9 +3146,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 541, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222082293424500164 @@ -3220,9 +3220,9 @@ RectTransform: m_Father: {fileID: 224263374970636356} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 207.36667, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222408476651883428 @@ -3457,9 +3457,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 461.5, y: -23} m_SizeDelta: {x: 157, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222726049780172552 @@ -3615,9 +3615,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 461.5, y: -23} m_SizeDelta: {x: 157, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222200064132405576 @@ -3969,9 +3969,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 270, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222733910229948832 @@ -4466,9 +4466,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 9 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 653, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222821088134212518 @@ -4540,9 +4540,9 @@ RectTransform: m_Father: {fileID: 224263374970636356} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 121.13333, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222215459722844050 @@ -5116,9 +5116,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 9 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 653, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222310303874989998 @@ -5190,9 +5190,9 @@ RectTransform: m_Father: {fileID: 224263374970636356} m_RootOrder: 8 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 724.76666, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222669177015387128 @@ -5847,9 +5847,9 @@ RectTransform: m_Father: {fileID: 224854698571182720} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 379.83334, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222251237244042876 @@ -6084,9 +6084,9 @@ RectTransform: m_Father: {fileID: 224263374970636356} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 59.95, y: -23} m_SizeDelta: {x: 119.9, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222053942204312826 @@ -6322,9 +6322,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222542576722275634 @@ -6401,9 +6401,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 190.5, y: -23} m_SizeDelta: {x: 157, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222787571937540782 @@ -6614,9 +6614,9 @@ RectTransform: m_Father: {fileID: 224949521480340822} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 207.36667, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222685917033940982 @@ -7018,9 +7018,9 @@ RectTransform: m_Father: {fileID: 224949521480340822} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 121.13333, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222538101056134672 @@ -7241,9 +7241,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 9 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 653, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222288722270437086 @@ -7652,9 +7652,9 @@ RectTransform: m_Father: {fileID: 224854698571182720} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 293.6, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222513828065114172 @@ -8051,9 +8051,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 461.5, y: -23} m_SizeDelta: {x: 157, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222199736069589546 @@ -8130,9 +8130,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 382, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222903617084539094 @@ -8204,9 +8204,9 @@ RectTransform: m_Father: {fileID: 224854698571182720} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 207.36667, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222894361741383570 @@ -8671,9 +8671,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 8 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 597, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222991607681884968 @@ -8824,9 +8824,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 10 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 732, y: -23} m_SizeDelta: {x: 156, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222539677535197788 @@ -9406,9 +9406,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 326, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222389885891932662 @@ -9668,9 +9668,9 @@ RectTransform: m_Father: {fileID: 224263374970636356} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 552.30005, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222280813436686648 @@ -9747,9 +9747,9 @@ RectTransform: m_Father: {fileID: 224854698571182720} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 466.06668, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222445826482712868 @@ -9821,9 +9821,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 111, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222318684156773678 @@ -9895,9 +9895,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 10 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 732, y: -23} m_SizeDelta: {x: 156, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222613293727217670 @@ -9974,9 +9974,9 @@ RectTransform: m_Father: {fileID: 224745430434953358} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 379.83334, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222409245550697466 @@ -10127,9 +10127,9 @@ RectTransform: m_Father: {fileID: 224949521480340822} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 293.6, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222371246060371638 @@ -10378,9 +10378,9 @@ RectTransform: m_Father: {fileID: 224263374970636356} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 466.06668, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222875050589270802 @@ -10452,9 +10452,9 @@ RectTransform: m_Father: {fileID: 224674258226223078} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 541, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222607971063099098 @@ -10917,9 +10917,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 10 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 732, y: -23} m_SizeDelta: {x: 156, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222535575287744506 @@ -11223,9 +11223,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 541, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222382754213622162 @@ -11297,9 +11297,9 @@ RectTransform: m_Father: {fileID: 224949521480340822} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 552.30005, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222094778829147958 @@ -11376,9 +11376,9 @@ RectTransform: m_Father: {fileID: 224949521480340822} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 59.95, y: -23} m_SizeDelta: {x: 119.9, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222930987840563002 @@ -11455,9 +11455,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 326, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222234542905424124 @@ -11534,9 +11534,9 @@ RectTransform: m_Father: {fileID: 224949521480340822} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 379.83334, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222015947977634796 @@ -11768,9 +11768,9 @@ RectTransform: m_Father: {fileID: 224745430434953358} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 121.13333, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222877452743453034 @@ -11997,9 +11997,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 111, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222761100355792100 @@ -12150,9 +12150,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 270, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222185558409516458 @@ -12484,9 +12484,9 @@ RectTransform: m_Father: {fileID: 224263374970636356} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 638.5333, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222197336755472028 @@ -12899,9 +12899,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 270, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222099883117475702 @@ -12973,9 +12973,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 326, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222130833159010134 @@ -13176,9 +13176,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 270, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222196793409068258 @@ -13638,9 +13638,9 @@ RectTransform: m_Father: {fileID: 224854698571182720} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 552.30005, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222997271737150524 @@ -13911,9 +13911,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 10 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 732, y: -23} m_SizeDelta: {x: 156, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222528086163003218 @@ -14495,9 +14495,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 190.5, y: -23} m_SizeDelta: {x: 157, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222021904487504394 @@ -14574,9 +14574,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 461.5, y: -23} m_SizeDelta: {x: 157, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222096645800143776 @@ -14760,9 +14760,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 111, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222429622710259226 @@ -14834,9 +14834,9 @@ RectTransform: m_Father: {fileID: 224263374970636356} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 293.6, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222603207074747910 @@ -15005,9 +15005,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 190.5, y: -23} m_SizeDelta: {x: 157, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222456155674916146 @@ -15163,9 +15163,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 111, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222991347717996128 @@ -15504,9 +15504,9 @@ RectTransform: m_Father: {fileID: 224745430434953358} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 466.06668, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222392321004829508 @@ -15654,9 +15654,9 @@ RectTransform: m_Father: {fileID: 224875155308905404} m_RootOrder: 8 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 597, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222248450125381382 @@ -15808,9 +15808,9 @@ RectTransform: m_Father: {fileID: 224745430434953358} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 638.5333, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222407960759231024 @@ -16086,9 +16086,9 @@ RectTransform: m_Father: {fileID: 224745430434953358} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 293.6, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222250516599768056 @@ -16160,9 +16160,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222419343957103726 @@ -16313,9 +16313,9 @@ RectTransform: m_Father: {fileID: 224949521480340822} m_RootOrder: 8 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 724.76666, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222920177968776190 @@ -16869,9 +16869,9 @@ RectTransform: m_Father: {fileID: 224364537071599080} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 326, y: -23} m_SizeDelta: {x: 110, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222371190288847924 @@ -16948,9 +16948,9 @@ RectTransform: m_Father: {fileID: 224745430434953358} m_RootOrder: 8 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 724.76666, y: -23} m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222160261668212838 @@ -17192,9 +17192,9 @@ RectTransform: m_Father: {fileID: 224277816973420058} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 382, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222159825507738758 @@ -17369,9 +17369,9 @@ RectTransform: m_Father: {fileID: 224854698571182720} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 121.13333, y: -23} m_SizeDelta: {x: 2, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222905875199867808 diff --git a/Assets/Scenes/DisasterLibraryManage.unity b/Assets/Scenes/DisasterLibraryManage.unity index 3010e64..4a6b99f 100644 --- a/Assets/Scenes/DisasterLibraryManage.unity +++ b/Assets/Scenes/DisasterLibraryManage.unity @@ -610,7 +610,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 828015231} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30600eb9e28e9b44384c2231be281e1f, type: 3} m_Name: @@ -622,7 +622,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 828015231} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7201e36b8d2982942a84979cfd0b20d1, type: 3} m_Name: @@ -1599,7 +1599,7 @@ PrefabInstance: - target: {fileID: 224885700138999974, guid: 9c85ddbcfc2c9924a8b9a9595c016377, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00005468184 + value: -0.00002113227 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c85ddbcfc2c9924a8b9a9595c016377, type: 3} diff --git a/Assets/Scripts/Common/GameSettings/GameSettings.cs b/Assets/Scripts/Common/GameSettings/GameSettings.cs index 28cdf0c..7e40716 100644 --- a/Assets/Scripts/Common/GameSettings/GameSettings.cs +++ b/Assets/Scripts/Common/GameSettings/GameSettings.cs @@ -108,7 +108,7 @@ public class OthersSettings playState = PlayState.None; //要加载的灾情库数据 - disaster = null; + //disaster = null; //总指挥移交需要 orgs = new List(); diff --git a/Assets/Scripts/DongYouLiQing/LeadGroup/Setting/WindTitle.cs b/Assets/Scripts/DongYouLiQing/LeadGroup/Setting/WindTitle.cs index fdfb2f4..3dd07d0 100644 --- a/Assets/Scripts/DongYouLiQing/LeadGroup/Setting/WindTitle.cs +++ b/Assets/Scripts/DongYouLiQing/LeadGroup/Setting/WindTitle.cs @@ -56,9 +56,10 @@ public class WindTitle : MonoBehaviour { private void DataBind() { - rotation_Y = ClampAngle(Mathf.Ceil(WindZone.rotation.eulerAngles.y)); - int dir = (int)(rotation_Y / 45); - windDirection = WindDir(dir); + // rotation_Y = ClampAngle(Mathf.Ceil(WindZone.rotation.eulerAngles.y)); + // Debug.Log(WindZone.rotation.eulerAngles); + //int dir = (int)(rotation_Y / 45); + windDirection = WindDir(WindZone.rotation.eulerAngles.y); var windDirOptions = DirectinDropDown.GetComponent().options; for (int i = 0; i < windDirOptions.Count; i++) @@ -81,38 +82,38 @@ public class WindTitle : MonoBehaviour { } } - private string WindDir(int dir) + private string WindDir(float dir) { string windDir = ""; - if (dir == (int)WindDirection.East) + if (Mathf.Abs(270 - dir)<1) { windDir = "东"; } - else if (dir == (int)WindDirection.West) + else if (Mathf.Abs(90 - dir)<1) { windDir = "西"; } - else if (dir == (int)WindDirection.South) + else if (Mathf.Abs(dir - 0)<1) { windDir = "南"; } - else if (dir == (int)WindDirection.North) + else if (Mathf.Abs (dir - 180)<1) { windDir = "北"; } - else if (dir == (int)WindDirection.East_South) + else if (Mathf.Abs(dir -315)<1) { windDir = "东南"; } - else if (dir == (int)WindDirection.East_North) + else if (Mathf.Abs(dir - 225)<1) { windDir = "东北"; } - else if (dir == (int)WindDirection.West_South) + else if (Mathf.Abs(dir - 45)<1) { windDir = "西南"; } - else if (dir == (int)WindDirection.West_North) + else if (Mathf.Abs(dir - 135)<1) { windDir = "西北"; } @@ -133,6 +134,7 @@ public class WindTitle : MonoBehaviour { { float argue = (float)value*45; WindZone.transform.rotation = Quaternion.Euler(0, AdjuctAng+ argue, 0); + Debug.Log(WindZone.transform.rotation.eulerAngles); MessageDispatcher.SendMessage("SET_SMOKE_DIRECTION"); //风力风向设置同步 diff --git a/Assets/UITexture/2.Menu/1598497402.png b/Assets/UITexture/2.Menu/1598497402.png new file mode 100644 index 0000000..bfbce31 Binary files /dev/null and b/Assets/UITexture/2.Menu/1598497402.png differ diff --git a/Assets/UITexture/2.Menu/1598497402.png.meta b/Assets/UITexture/2.Menu/1598497402.png.meta new file mode 100644 index 0000000..5dfcae9 --- /dev/null +++ b/Assets/UITexture/2.Menu/1598497402.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: f4262a9686e9dd44eae0a77d67e04631 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITexture/2.Menu/81F428B9-C8EC-42e1-B3E2-7D2614DBBD54.png b/Assets/UITexture/2.Menu/81F428B9-C8EC-42e1-B3E2-7D2614DBBD54.png new file mode 100644 index 0000000..1cae71e Binary files /dev/null and b/Assets/UITexture/2.Menu/81F428B9-C8EC-42e1-B3E2-7D2614DBBD54.png differ diff --git a/Assets/UITexture/2.Menu/81F428B9-C8EC-42e1-B3E2-7D2614DBBD54.png.meta b/Assets/UITexture/2.Menu/81F428B9-C8EC-42e1-B3E2-7D2614DBBD54.png.meta new file mode 100644 index 0000000..eff6c5d --- /dev/null +++ b/Assets/UITexture/2.Menu/81F428B9-C8EC-42e1-B3E2-7D2614DBBD54.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 9123073fe76e36f448dbba7a3f8fc45d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: