修复小人移动动画显示异常和一些界面调整
This commit is contained in:
parent
b9db3325a8
commit
33df128750
@ -312,6 +312,84 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -20, y: -20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1555260678575545608
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 790317586759198537}
|
||||
- component: {fileID: 6055002719563706353}
|
||||
- component: {fileID: 3598411765229254135}
|
||||
m_Layer: 5
|
||||
m_Name: MapName
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &790317586759198537
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1555260678575545608}
|
||||
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: 6558498177448486125}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 309.5, y: -128.5}
|
||||
m_SizeDelta: {x: 499, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6055002719563706353
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1555260678575545608}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3598411765229254135
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1555260678575545608}
|
||||
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: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 24
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 52
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!1 &1574085681054204948
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -437,7 +515,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 7308942387469008178}
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 24
|
||||
m_RootOrder: 27
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -773,7 +851,7 @@ RectTransform:
|
||||
- {fileID: 5698108039784919937}
|
||||
- {fileID: 7832561499842500791}
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 30
|
||||
m_RootOrder: 33
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -1145,11 +1223,11 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 29
|
||||
m_RootOrder: 32
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -1209, y: 621}
|
||||
m_AnchoredPosition: {x: -831, y: 621}
|
||||
m_SizeDelta: {x: 84, y: 28}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6673787635055784084
|
||||
@ -1223,7 +1301,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 16
|
||||
m_RootOrder: 17
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -1595,7 +1673,7 @@ RectTransform:
|
||||
- {fileID: 7508488585840996723}
|
||||
- {fileID: 804126381881165943}
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 33
|
||||
m_RootOrder: 35
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -1730,7 +1808,7 @@ RectTransform:
|
||||
- {fileID: 9050330319599987492}
|
||||
- {fileID: 4958187996342670554}
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 34
|
||||
m_RootOrder: 37
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -2258,7 +2336,7 @@ RectTransform:
|
||||
- {fileID: 6558498177838812408}
|
||||
- {fileID: 6558498178609268828}
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 35
|
||||
m_RootOrder: 38
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -2390,7 +2468,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 23
|
||||
m_RootOrder: 26
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -2464,7 +2542,7 @@ GameObject:
|
||||
- component: {fileID: 6558498177387274039}
|
||||
- component: {fileID: 6558498177387273992}
|
||||
m_Layer: 5
|
||||
m_Name: MapName
|
||||
m_Name: CompetitionName
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -2842,6 +2920,7 @@ RectTransform:
|
||||
- {fileID: 8816040285526341278}
|
||||
- {fileID: 6558498179115500272}
|
||||
- {fileID: 6558498177387273993}
|
||||
- {fileID: 790317586759198537}
|
||||
- {fileID: 6558498178078156022}
|
||||
- {fileID: 6558498178081842216}
|
||||
- {fileID: 6558498179132532172}
|
||||
@ -2854,6 +2933,8 @@ RectTransform:
|
||||
- {fileID: 7411107261559440790}
|
||||
- {fileID: 6558498177678574344}
|
||||
- {fileID: 6558498178512125495}
|
||||
- {fileID: 455999053341543882}
|
||||
- {fileID: 5095066172370528861}
|
||||
- {fileID: 6558498178250830976}
|
||||
- {fileID: 6558498179264530620}
|
||||
- {fileID: 3169525404832314336}
|
||||
@ -2866,9 +2947,9 @@ RectTransform:
|
||||
- {fileID: 5987798170253205739}
|
||||
- {fileID: 8563954619679277008}
|
||||
- {fileID: 5123053819850429709}
|
||||
- {fileID: 6558498178671643836}
|
||||
- {fileID: 6558498178198826442}
|
||||
- {fileID: 4233764473327857169}
|
||||
- {fileID: 6558498178671643836}
|
||||
- {fileID: 3664757228482092608}
|
||||
- {fileID: 6558498177216885471}
|
||||
- {fileID: 6558498178561756610}
|
||||
@ -3069,7 +3150,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 17
|
||||
m_RootOrder: 18
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -3113,7 +3194,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: Time
|
||||
@ -3147,12 +3228,12 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 22
|
||||
m_RootOrder: 25
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 128, y: -455}
|
||||
m_SizeDelta: {x: 136, y: 34}
|
||||
m_AnchoredPosition: {x: 130.3, y: -455}
|
||||
m_SizeDelta: {x: 144.53284, y: 34}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6558498177724301629
|
||||
CanvasRenderer:
|
||||
@ -3191,7 +3272,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: Description
|
||||
@ -3432,7 +3513,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 27
|
||||
m_RootOrder: 30
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -3512,7 +3593,7 @@ RectTransform:
|
||||
- {fileID: 5276663987612575157}
|
||||
- {fileID: 6558498178766627004}
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 25
|
||||
m_RootOrder: 28
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -3591,7 +3672,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 26
|
||||
m_RootOrder: 29
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -3755,7 +3836,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -3829,7 +3910,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 8
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -3907,7 +3988,7 @@ RectTransform:
|
||||
- {fileID: 6558498178642912254}
|
||||
- {fileID: 6558498177739491041}
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 32
|
||||
m_RootOrder: 34
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -4122,12 +4203,12 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 19
|
||||
m_RootOrder: 22
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 128, y: -335}
|
||||
m_SizeDelta: {x: 136, y: 34}
|
||||
m_AnchoredPosition: {x: 135.6, y: -335}
|
||||
m_SizeDelta: {x: 151.18146, y: 34}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6558498178250830990
|
||||
CanvasRenderer:
|
||||
@ -4166,10 +4247,10 @@ MonoBehaviour:
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Contestant
|
||||
m_Text: Contestants
|
||||
--- !u!1 &6558498178318939179
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4407,7 +4488,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 10
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -4481,7 +4562,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 18
|
||||
m_RootOrder: 19
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -4559,7 +4640,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 12
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -4633,7 +4714,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 36
|
||||
m_RootOrder: 39
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -4918,7 +4999,7 @@ RectTransform:
|
||||
- {fileID: 6558498178369272025}
|
||||
- {fileID: 6558498178957397887}
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 31
|
||||
m_RootOrder: 36
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -5351,7 +5432,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 13
|
||||
m_RootOrder: 14
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -5429,7 +5510,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 11
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -5595,7 +5676,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 9
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -5666,7 +5747,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 14
|
||||
m_RootOrder: 15
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -5740,7 +5821,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 20
|
||||
m_RootOrder: 23
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -5787,7 +5868,7 @@ MonoBehaviour:
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 0 Players
|
||||
m_Text: 0 Riders
|
||||
--- !u!1 &6558498179321791265
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5818,7 +5899,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 15
|
||||
m_RootOrder: 16
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -5866,6 +5947,84 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 0%
|
||||
--- !u!1 &6769584619611438823
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5095066172370528861}
|
||||
- component: {fileID: 1285597684163038355}
|
||||
- component: {fileID: 2611598498826262503}
|
||||
m_Layer: 5
|
||||
m_Name: EndTime
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5095066172370528861
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6769584619611438823}
|
||||
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: 6558498177448486125}
|
||||
m_RootOrder: 21
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 542.7, y: -281}
|
||||
m_SizeDelta: {x: 295, y: 34}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1285597684163038355
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6769584619611438823}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2611598498826262503
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6769584619611438823}
|
||||
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: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
|
||||
m_FontSize: 24
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 0000 - 00-00 00:00:00
|
||||
--- !u!1 &6980510087908380503
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5972,11 +6131,11 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 28
|
||||
m_RootOrder: 31
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -1213, y: 644}
|
||||
m_AnchoredPosition: {x: -835, y: 644}
|
||||
m_SizeDelta: {x: 61, y: 17}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &927843223585017441
|
||||
@ -6424,7 +6583,7 @@ RectTransform:
|
||||
- {fileID: 4513700211969794283}
|
||||
- {fileID: 4980171126590156168}
|
||||
m_Father: {fileID: 6558498177448486125}
|
||||
m_RootOrder: 21
|
||||
m_RootOrder: 24
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -6622,6 +6781,84 @@ MonoBehaviour:
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
--- !u!1 &8138088904092765177
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 455999053341543882}
|
||||
- component: {fileID: 7688066609793815029}
|
||||
- component: {fileID: 1187409085812220317}
|
||||
m_Layer: 5
|
||||
m_Name: TO
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &455999053341543882
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8138088904092765177}
|
||||
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: 6558498177448486125}
|
||||
m_RootOrder: 20
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 364.4, y: -281}
|
||||
m_SizeDelta: {x: 40, y: 34}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7688066609793815029
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8138088904092765177}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1187409085812220317
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8138088904092765177}
|
||||
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: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
|
||||
m_FontSize: 24
|
||||
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: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: TO
|
||||
--- !u!1 &8457773700689350405
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1564,7 +1564,7 @@ GameObject:
|
||||
- component: {fileID: 7021295876449305338}
|
||||
- component: {fileID: 2695832401669139913}
|
||||
m_Layer: 0
|
||||
m_Name: B@CyclistMaleBase_01
|
||||
m_Name: onlinePlayer
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -1579,7 +1579,7 @@ Transform:
|
||||
m_GameObject: {fileID: 7021295876441927992}
|
||||
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_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
|
||||
m_Children:
|
||||
- {fileID: 7021295876441894172}
|
||||
- {fileID: 7021295876441894150}
|
||||
|
||||
@ -107,12 +107,18 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
}
|
||||
GameObject Detail { get; set; }
|
||||
GameObject Apply { get; set; }
|
||||
GameObject Watcher { get; set; }
|
||||
GameObject MoreHead { get; set; }
|
||||
Text CompetitionTitle { get; set; }
|
||||
Text EndTime { get; set; }
|
||||
//构建赛事界面
|
||||
protected override void InitGameObject()
|
||||
{
|
||||
base.InitGameObject();
|
||||
CompetitionTitle = panel.transform.Find("CompetitionName").GetComponent<Text>();
|
||||
CompetitionDesc = panel.transform.Find("CompetitionDesc").GetComponent<RawImage>();
|
||||
StartTime = panel.transform.Find("Time").GetComponent<Text>();
|
||||
EndTime = panel.transform.Find("EndTime").GetComponent<Text>();
|
||||
Contestant = panel.transform.Find("Contestant").GetComponent<Text>();
|
||||
Watch = panel.transform.Find("Watch").gameObject;
|
||||
CancelJoin = panel.transform.Find("CancelJoin").gameObject;
|
||||
@ -125,7 +131,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
ReadMore = panel.transform.Find("ReadMore").gameObject;
|
||||
GetReady = panel.transform.Find("GetReady").GetComponent<Text>();
|
||||
GetReadyTitle = panel.transform.Find("GetReadyTitle").GetComponent<Text>();
|
||||
|
||||
Watcher = Resources.Load<GameObject>("UI/Prefab/Match/Watcher");
|
||||
MoreHead = Resources.Load<GameObject>("UI/Prefab/Match/MoreHead");
|
||||
Watch.GetComponent<Button>().enabled = false;
|
||||
Watch.GetComponent<Button>().interactable = false;
|
||||
|
||||
@ -151,7 +158,9 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
_canWatch = competition.CanWatch;
|
||||
#region 赛事基本信息
|
||||
//赛事名称
|
||||
mapName.text = competition.Title;
|
||||
CompetitionTitle.text = competition.Title;
|
||||
//线路名称
|
||||
mapName.text = route.Name;
|
||||
//距离
|
||||
distance.text = route.Distance.ToString("f1") + "KM";
|
||||
//海拔
|
||||
@ -160,6 +169,8 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
slope.text = Math.Round(route.AverageGrade, 2).ToString() + "%";
|
||||
//比赛开始时间
|
||||
StartTime.text = competition.StartTime.ToLocalTime().ToString();
|
||||
//比赛结束时间
|
||||
EndTime.text = competition.EndTime.ToLocalTime().ToString();
|
||||
//比赛状态
|
||||
CompetitionStatus.text = competition.StatusVlaue.ToString();
|
||||
//参赛选手
|
||||
@ -196,18 +207,17 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
private int maxShowCout = 9;
|
||||
private void ShowPlayers(List<CompetitionPlayer> list)
|
||||
{
|
||||
var watcher = Resources.Load<GameObject>("UI/Prefab/Match/Watcher");
|
||||
var moreHead = Resources.Load<GameObject>("UI/Prefab/Match/MoreHead");
|
||||
int index = 0;
|
||||
Utils.DestroyChildren(PlayersPanel);
|
||||
foreach (var item in list)
|
||||
{
|
||||
index++;
|
||||
if (index >= maxShowCout)
|
||||
{
|
||||
Instantiate(moreHead, PlayersPanel);
|
||||
Instantiate(MoreHead, PlayersPanel);
|
||||
break;
|
||||
}
|
||||
var head = Instantiate(watcher, PlayersPanel);
|
||||
var head = Instantiate(Watcher, PlayersPanel);
|
||||
var headiamge = head.GetComponent<RawImage>();
|
||||
if (!string.IsNullOrEmpty(item.WxHeadImg))
|
||||
{
|
||||
@ -268,11 +278,14 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
_canCancelApply = competition.CanCancelJoin;
|
||||
_canWatch = competition.CanWatch;
|
||||
_raceStart = competition.Status == 3;
|
||||
|
||||
Contestant.text = competition.UserList.Count.ToString() + "Riders";
|
||||
ShowPlayers(competition.UserList);
|
||||
}
|
||||
}
|
||||
protected void ApplyRace(BaseEventData baseEvent)
|
||||
{
|
||||
UIManager.ShowConfirm("Join", "you want to join?", async () =>
|
||||
UIManager.ShowConfirm("Join", "Do you want to join?", async () =>
|
||||
{
|
||||
MapCompetitionApi s = ConfigHelper.mapCompetitionApi;
|
||||
var rrr = s.ApplyMapCompetition(cyclingController.competitionId);
|
||||
@ -298,7 +311,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
{
|
||||
try
|
||||
{
|
||||
UIManager.ShowConfirm("Canel Reservation", "you want to cancel reservation?", async () =>
|
||||
UIManager.ShowConfirm("Canel Reservation", "Do you want to cancel reservation?", async () =>
|
||||
{
|
||||
MapCompetitionApi api = ConfigHelper.mapCompetitionApi;
|
||||
var data = api.CancelMapCompetition(cyclingController.competition.Id);
|
||||
|
||||
@ -181,7 +181,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
}
|
||||
if (mainController.isWatch)
|
||||
{
|
||||
UIManager.ShowConfirm("Quit", "Are you want to quit?", async () =>
|
||||
UIManager.ShowConfirm("Quit", "Do you want to quit?", async () =>
|
||||
{
|
||||
SceneManager.LoadScene("MainScene");
|
||||
UIManager.CloseConfirm();
|
||||
|
||||
@ -33,7 +33,19 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
var ss = s?.competitionRankingModel;
|
||||
rankingList = ss?.TopList;
|
||||
if (rankingList == null) return;
|
||||
|
||||
|
||||
//删除
|
||||
var currentTopRankingList = FindObjectsOfType<TopRankingItem>();
|
||||
foreach (var o in currentTopRankingList)
|
||||
{
|
||||
var e = rankingList.Where(c => c.UserId == o.UserId).FirstOrDefault();
|
||||
if (e == null)
|
||||
{
|
||||
o.transform.gameObject.SetActive(false);//TODO：这里暂时不删除，删除对应的图片和脚本依赖这个对象；脚本提供一个dispose
|
||||
bufferSize--;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < rankingList.Count(); i++)
|
||||
{
|
||||
Create(rankingList[i]);
|
||||
@ -60,6 +72,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
//情况二：没有足够的buffer，找到要被淘汰的buffer()最后一名
|
||||
competitionRankingItem = rankingList.OrderByDescending(c => c.rank).FirstOrDefault();
|
||||
}
|
||||
|
||||
}
|
||||
competitionRankingItem.setHead(item.Head);
|
||||
competitionRankingItem.setTimer(item.TripTime);
|
||||
|
||||
@ -119,6 +119,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
|
||||
public void SaveWithLocalRecordAysnc(CyclingModel cyclingModel, RouteResultParam selectParam, string imageName,string recordId,string path)
|
||||
{
|
||||
Saved = true;
|
||||
Dictionary<MapInterruptRecord, List<string>> recordData = new Dictionary<MapInterruptRecord, List<string>>();
|
||||
if (RiderDatas.Count <= 0)
|
||||
{
|
||||
@ -220,7 +221,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
System.IO.File.WriteAllText(recordFilePath, recordString);
|
||||
|
||||
recordData.Add(interruptRecord, files);
|
||||
Saved = true;
|
||||
//Saved = true;
|
||||
SaveDataAysnc(recordData, path);
|
||||
}
|
||||
/// <summary>
|
||||
|
||||
@ -194,7 +194,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
prePos = transform.localPosition;//当前点
|
||||
thisRotation = transform.localRotation;
|
||||
//移动动画控制
|
||||
if (distance > 0)
|
||||
if (distance >= 0)
|
||||
{
|
||||
//transform.localPosition = nextPos;
|
||||
StartCoroutine(LookAtNextPos());//转向
|
||||
@ -254,6 +254,11 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
break;
|
||||
}
|
||||
}
|
||||
var DOUBLE_DELTA = 1E-6;
|
||||
if (Math.Abs(totalDistance - mapData.TotalDistance) < DOUBLE_DELTA)
|
||||
{
|
||||
index = pointList.Count - 1;
|
||||
}
|
||||
preIndex = index > 0 ? index - 1:0;//前一个索引
|
||||
CurrentIndex = index;//当前索引
|
||||
int nextIndex = index == pointList.Count - 1 ? index : index + 1; //计算下一个点的坡度和距离
|
||||
|
||||
@ -288,8 +288,13 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
shadowButton.enabled = true;
|
||||
shadowButton.interactable = true;
|
||||
}
|
||||
//标记3d的地图可以用
|
||||
if (!route.RouteInstance.Enable3D)
|
||||
//默认地图3d/2d
|
||||
DefaultView(routeInstance);
|
||||
}
|
||||
|
||||
private void DefaultView(MapRoute routeInstance)
|
||||
{
|
||||
if (!routeInstance.Enable3D)
|
||||
{
|
||||
viewButton.enabled = false;
|
||||
viewButton.interactable = false;
|
||||
|
||||
@ -324,7 +324,7 @@ public class CyclingController : DeviceServiceMonoBase
|
||||
private GameObject onlinePlayer { get; set; }
|
||||
|
||||
Vector3 MAX_SIZE = new Vector3(3f, 3f, 3f);
|
||||
Vector3 MIN_SIZE = new Vector3(0.1f, 0.1f, 0.1f);
|
||||
Vector3 MIN_SIZE = new Vector3(0.01f, 0.01f, 0.01f);
|
||||
public void ChangeCurrentPlayer(int userId)
|
||||
{
|
||||
var coll = FindObjectsOfType<AbstractPlayer>();
|
||||
@ -421,7 +421,7 @@ public class CyclingController : DeviceServiceMonoBase
|
||||
var onlineRider = item as OnlineRiderModel;
|
||||
var currentUser = currentOnlineUserList.Where(c => c.UserId == item.UserId).FirstOrDefault();
|
||||
var onlineDistance = onlineRider.EndDistance - onlineRider.PreDistance;
|
||||
var onlineTotalDistance = onlineRider.EndDistance;
|
||||
var onlineTotalDistance = onlineRider.PreDistance;
|
||||
var index = GetCurrentIndex(onlineTotalDistance);
|
||||
|
||||
if (currentUser == null)
|
||||
@ -564,7 +564,7 @@ public class CyclingController : DeviceServiceMonoBase
|
||||
//人物属性变更
|
||||
var pos = map.GeoToWorldPosition(currentPlayer.Currentlatlong);
|
||||
player.transform.position = pos;
|
||||
player.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
|
||||
player.transform.localScale = new Vector3(0.01f, 0.01f, 0.01f);
|
||||
target.position = pos;
|
||||
//playerController.currentPos = Vector3.zero;
|
||||
arrowGameObj.SetActive(true);
|
||||
@ -677,7 +677,6 @@ public class CyclingController : DeviceServiceMonoBase
|
||||
{
|
||||
isQuit = true;
|
||||
isStart = false;
|
||||
|
||||
string recordId = Guid.NewGuid().ToString();
|
||||
//var path = Helper.GetDataDir("MapWorkoutRecords/"+ recordId);
|
||||
var path = PFConstants.MapWorkoutRecordFolder + "/" + recordId;
|
||||
|
||||
@ -35,7 +35,7 @@ public class RaceButtonGroupScript : MonoBehaviour
|
||||
}
|
||||
void GoJoin()
|
||||
{
|
||||
UIManager.ShowConfirm("Join", "you want to join?", () =>
|
||||
UIManager.ShowConfirm("Join", "Do you want to join?", () =>
|
||||
{
|
||||
if (!map.HasJoin)
|
||||
{
|
||||
@ -54,7 +54,7 @@ public class RaceButtonGroupScript : MonoBehaviour
|
||||
}
|
||||
void GoCancel()
|
||||
{
|
||||
UIManager.ShowConfirm("Cancel Reservation", "you want to cancel reservation?", () =>
|
||||
UIManager.ShowConfirm("Cancel Reservation", "Do you want to cancel reservation?", () =>
|
||||
{
|
||||
if (map.HasJoin)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user