Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2025-02-16 21:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

convert zone name

Browse source
This commit is contained in:
in0finite 2020-04-29 01:08:38 +02:00
parent e415d019fc
commit b1f6c2b8fa
2 changed files with 169 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

168
Assets/Prefabs/UI.prefab
View file

@ -381,7 +381,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1377734331079614}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.00012207031}
m_LocalPosition: {x: 0, y: 0, z: -0.00030517578}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 224538364652313416}
@ -2205,7 +2205,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7060217674643716524}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -3341,6 +3341,85 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &2980963080963553855
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 94147915238981989}
- component: {fileID: 7618712068212303432}
- component: {fileID: 6134579940906677980}
m_Layer: 0
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &94147915238981989
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2980963080963553855}
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: 8429378531352769343}
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 &7618712068212303432
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2980963080963553855}
m_CullTransparentMesh: 0
--- !u!114 &6134579940906677980
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2980963080963553855}
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: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 15
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Zone Name
--- !u!1 &3085107679637990115
GameObject:
m_ObjectHideFlags: 0
@ -4539,6 +4618,79 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &4382140291134805148
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8429378531352769343}
- component: {fileID: 3535806125381433082}
- component: {fileID: 3426349143891760289}
m_Layer: 0
m_Name: MinimapZoneName
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8429378531352769343
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4382140291134805148}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.000061035156}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 94147915238981989}
m_Father: {fileID: 7060217674643716524}
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: -104.99988, y: -224}
m_SizeDelta: {x: 190, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3535806125381433082
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4382140291134805148}
m_CullTransparentMesh: 0
--- !u!114 &3426349143891760289
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4382140291134805148}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.18867922, g: 0.18867922, b: 0.18867922, a: 0.41960785}
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_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &4539774699302292208
GameObject:
m_ObjectHideFlags: 0
@ -4946,7 +5098,7 @@ RectTransform:
m_Children:
- {fileID: 7628842719590850114}
m_Father: {fileID: 7060217674643716524}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -5829,7 +5981,7 @@ RectTransform:
- {fileID: 278302565178246837}
- {fileID: 7969073078139311442}
m_Father: {fileID: 7060217674643716524}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -5904,7 +6056,7 @@ RectTransform:
m_Children:
- {fileID: 1924169772538139782}
m_Father: {fileID: 7060217674643716524}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -7434,6 +7586,7 @@ MonoBehaviour:
mapTransform: {fileID: 224779433496236624}
maskTransform: {fileID: 224020270871840966}
mapContainer: {fileID: 224402533417526356}
zoneNameLabel: {fileID: 6134579940906677980}
zoom: 1.3
calibrator: 3.9
zoomDuration: 1
@ -7473,6 +7626,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 8548189601126062776}
- {fileID: 8429378531352769343}
- {fileID: 80055436736433295}
- {fileID: 4419537099734923214}
- {fileID: 2739518780603236801}
@ -7656,7 +7810,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7060217674643716524}
m_RootOrder: 1
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}
@ -7828,7 +7982,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7060217674643716524}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}

8
Assets/Scripts/Behaviours/MiniMap.cs
View file

@ -32,6 +32,8 @@ namespace SanAndreasUnity.Behaviours
maskTransform,
mapContainer;
public Text zoneNameLabel;
public float zoom = 1.3f;
private const float scaleConst = 1f;
@ -380,6 +382,12 @@ namespace SanAndreasUnity.Behaviours
if (playerImage != null && m_ped != null)
playerImage.rectTransform.localRotation = Quaternion.Euler(0, 0, relAngle - (m_ped.transform.eulerAngles.y + 180));
// update zone name label
string currentZoneName = this.ZoneName;
if (currentZoneName != this.zoneNameLabel.text)
this.zoneNameLabel.text = currentZoneName;
}
private IEnumerator ChangeZoom(bool isIncreasing)