lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

对战与AR骑行相关逻辑修改

Browse Source
This commit is contained in:
lishuo 2022-08-24 18:43:43 +08:00
parent 3bcb3ee83e
commit 89b5275efd
64 changed files with 50131 additions and 29495 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Models/PlayerAnimator.controller
View File

@ -530,9 +530,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0.0000001430508
m_ExitTime: 1.0188327
m_TransitionDuration: 0.24999976
m_TransitionOffset: 0.043568414
m_ExitTime: 0.7949294
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0

1067
Assets/NV_Models/PlayerNVAnimator.controller Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/NV_Models/PlayerNVAnimator.controller.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3d067189c6bd042468a0866710be5f9e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

181
Assets/NV_Models/ViewPlayer_NV.controller
View File

@ -161,7 +161,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-6280473346169069233
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -172,7 +172,6 @@ AnimatorState:
m_Transitions:
- {fileID: 4962937267187318886}
- {fileID: 628895593721634343}
- {fileID: 8335684326445612345}
- {fileID: 8004998155799987221}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
@ -192,7 +191,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-6197807439964194722
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -323,7 +322,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-5028631798582772322
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -373,7 +372,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-4448948008395002896
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -399,31 +398,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-4041146987074567963
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1921903986252914710}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999988
m_TransitionOffset: 0.00000015549041
m_ExitTime: 0.99523795
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3823386753831176018
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -448,7 +422,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-3789228838010061756
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -475,7 +449,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-3680733670995154060
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -525,7 +499,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-3206231950487047934
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -597,7 +571,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-2690597925175035265
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -626,7 +600,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-2561558923055515796
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -662,7 +636,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-2474074929572245477
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -688,31 +662,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-2448630386238416150
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: -1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1921903986252914710}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999976
m_TransitionOffset: 0
m_ExitTime: 0.9978974
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1109 &-2159963661882776293
AnimatorTransition:
m_ObjectHideFlags: 1
@ -729,7 +678,7 @@ AnimatorTransition:
serializedVersion: 1
--- !u!1102 &-1921903986252914710
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -757,7 +706,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-1867621270447226975
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -865,7 +814,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-1696406813102555496
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -893,7 +842,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-1674479558448565141
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -902,10 +851,8 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -2448630386238416150}
- {fileID: -1348034233613075618}
- {fileID: 6643453857259642113}
- {fileID: -4041146987074567963}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -924,7 +871,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1107 &-1637695127637103515
AnimatorStateMachine:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1031,12 +978,6 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: -1
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: 1
- m_ConditionMode: 3
m_ConditionEvent: grade
m_EventTreshold: 5
@ -1065,12 +1006,6 @@ AnimatorStateTransition:
- m_ConditionMode: 3
m_ConditionEvent: grade
m_EventTreshold: 5
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: -1
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8037845210809518626}
m_Solo: 0
@ -1109,7 +1044,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-149237661038222874
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1149,73 +1084,73 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: speed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: power
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: cadance
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: preSpeed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: grade
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: touchHead
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: headBack
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: cadanceConnected
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: cadance 0
m_Type: 3
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: drinking
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: canturn
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -1231,7 +1166,7 @@ AnimatorController:
m_Controller: {fileID: 9100000}
--- !u!1102 &57360962280543080
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1259,7 +1194,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &152988074441697560
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1315,7 +1250,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &646349641302932126
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1343,7 +1278,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &1018308057553964354
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1424,12 +1359,6 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: -1
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: 1
- m_ConditionMode: 3
m_ConditionEvent: speed
m_EventTreshold: 35
@ -1496,7 +1425,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &3705284127588475039
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1524,7 +1453,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &3857089115179635187
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1597,7 +1526,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &4213284675513532716
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1703,7 +1632,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &5931569063321047081
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1731,7 +1660,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &5932869819320440490
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1834,7 +1763,7 @@ AnimatorTransition:
serializedVersion: 1
--- !u!1102 &7167068954877030447
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1978,7 +1907,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &8037845210809518626
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -2051,34 +1980,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8335684326445612345
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: 1
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: -1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3680733670995154060}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.99939305
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8459541290117965463
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -2103,7 +2004,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &8758911657893801591
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -2131,7 +2032,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &9029427672491609446
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}

4
Assets/Resources/UI/Prefab/AR/RankingItem.prefab
View File

@ -336,7 +336,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 112, y: -16}
m_SizeDelta: {x: 120, y: 16}
m_SizeDelta: {x: 110, y: 16}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &356461757142253269
CanvasRenderer:
@ -633,7 +633,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6265415831168584355
RectTransform:
m_ObjectHideFlags: 0

20
Assets/Resources/UI/Prefab/GameRoom/GameRoomResult.prefab
View File

@ -484,7 +484,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 7bec3c5a77ae7054bb13db59c2ae929a, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
@ -2373,13 +2373,13 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 00:00:00
m_Text: --:--:--
--- !u!1 &4873159523634155249
GameObject:
m_ObjectHideFlags: 0
@ -2820,13 +2820,13 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 008
m_Text: ---
--- !u!1 &6025547990755233621
GameObject:
m_ObjectHideFlags: 0
@ -4110,7 +4110,7 @@ GameObject:
- component: {fileID: 6602980413080576046}
- component: {fileID: 8688675883976159322}
- component: {fileID: 6281573892788897340}
- component: {fileID: -3059709694689522915}
- component: {fileID: 8188417874126366143}
m_Layer: 5
m_Name: GameRoomResult
m_TagString: Untagged
@ -4195,7 +4195,7 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &-3059709694689522915
--- !u!114 &8188417874126366143
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -4204,7 +4204,7 @@ MonoBehaviour:
m_GameObject: {fileID: 7915857310844509775}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 873bd5947356d6f4d84526e63f9643fc, type: 3}
m_Script: {fileID: 11500000, guid: 1fbc05c763a9da04c9a30c0eb2e41cd6, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8535043302962927274

20
Assets/Resources/UI/Prefab/GameRoom/GameRoomResultPanel.prefab
View File

@ -484,7 +484,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 7bec3c5a77ae7054bb13db59c2ae929a, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
@ -2373,13 +2373,13 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 00:00:00
m_Text: --:--:--
--- !u!1 &4873159523634155249
GameObject:
m_ObjectHideFlags: 0
@ -2820,13 +2820,13 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 008
m_Text: ---
--- !u!1 &6025547990755233621
GameObject:
m_ObjectHideFlags: 0
@ -4110,7 +4110,7 @@ GameObject:
- component: {fileID: 6602980413080576046}
- component: {fileID: 8688675883976159322}
- component: {fileID: 6281573892788897340}
- component: {fileID: 68697117919639325}
- component: {fileID: -7074787166692982281}
m_Layer: 5
m_Name: GameRoomResultPanel
m_TagString: Untagged
@ -4195,7 +4195,7 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &68697117919639325
--- !u!114 &-7074787166692982281
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -4204,7 +4204,7 @@ MonoBehaviour:
m_GameObject: {fileID: 7915857310844509775}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 873bd5947356d6f4d84526e63f9643fc, type: 3}
m_Script: {fileID: 11500000, guid: 180198074f4b2344d8fd96e8e068324b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8535043302962927274

4
Assets/Resources/UI/Prefab/GameRoom/RoomRankItem.prefab
View File

@ -197,8 +197,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 230, y: -33}
m_SizeDelta: {x: 200, y: 20}
m_AnchoredPosition: {x: 205, y: -33}
m_SizeDelta: {x: 149.99954, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7841509205764756371
CanvasRenderer:

4
Assets/Resources/UI/Prefab/Match/CompetitionResultPanel.prefab
View File

@ -2823,10 +2823,10 @@ MonoBehaviour:
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 008
m_Text: 000
--- !u!1 &6025547990755233621
GameObject:
m_ObjectHideFlags: 0

26
Assets/Resources/UI/Prefab/Match/onlinePlayerNoScript.prefab
View File

@ -1957,7 +1957,6 @@ GameObject:
m_Component:
- component: {fileID: 81872886619855202}
- component: {fileID: 750146586084246490}
- component: {fileID: -4224042437987400684}
m_Layer: 0
m_Name: onlinePlayerNoScript
m_TagString: Untagged
@ -2291,31 +2290,6 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &-4224042437987400684
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 750146586084246488}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 281c3f68a13a427499876dec554c3223, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 0}
characterAnimator: {fileID: 0}
nextPos: {x: 0, y: 0, z: 0}
ticks: 0
stopRecord: 0
CurrentIndex: 0
CurrentDistance: 0
NextSlopeTotalDistance: 0
PreElevation: 0
PreSlope: 0
currentRotation: {x: 0, y: 0, z: 0, w: 0}
currentPos: {x: 0, y: 0, z: 0}
_playerController: {fileID: 0}
--- !u!1 &762731628722452839
GameObject:
m_ObjectHideFlags: 0

2
Assets/Resources/UI/Prefab/Match/onlinePlayerNoScriptback.prefab.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1857b202bf5b0dd41b6f7f76b5c837f8
guid: 94a353e3a43182d4c81a470b4765b1e0
PrefabImporter:
externalObjects: {}
userData:

97
Assets/Resources/UI/Prefab/Panel/ActivityAdPanel.prefab
View File

@ -275,6 +275,7 @@ GameObject:
- component: {fileID: 525523089472465304}
- component: {fileID: 525523089472465306}
- component: {fileID: 525523089472465307}
- component: {fileID: 7000213686909820465}
m_Layer: 5
m_Name: Exit
m_TagString: Untagged
@ -292,14 +293,15 @@ RectTransform:
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_Children:
- {fileID: 3975350269154595095}
m_Father: {fileID: 525523089819956055}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 152, y: 251.5}
m_SizeDelta: {x: 46, y: 49}
m_SizeDelta: {x: 46, y: 46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &525523089472465306
CanvasRenderer:
@ -322,13 +324,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: d1b6b675814203941b27cd80999b11cf, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -338,6 +340,19 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &7000213686909820465
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 525523089472465305}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 23
--- !u!1 &525523089819956052
GameObject:
m_ObjectHideFlags: 0
@ -750,6 +765,80 @@ MonoBehaviour:
y: 0
width: 1
height: 1
--- !u!1 &6803679133113468264
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3975350269154595095}
- component: {fileID: 7561448256770633040}
- component: {fileID: 8739609566505426063}
m_Layer: 5
m_Name: Exit (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3975350269154595095
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6803679133113468264}
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: 525523089472465304}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 26.11, y: 26.11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7561448256770633040
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6803679133113468264}
m_CullTransparentMesh: 0
--- !u!114 &8739609566505426063
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6803679133113468264}
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: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0c96af6ac7950394f81832009c039c98, 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!1 &6816544219278866307
GameObject:
m_ObjectHideFlags: 0

123
Assets/Resources/UI/Prefab/Panel/GameRoomListPanel.prefab
View File

@ -945,7 +945,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &331369851390850339
RectTransform:
m_ObjectHideFlags: 0
@ -3792,7 +3792,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8086726971969315674}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -7213,7 +7213,7 @@ RectTransform:
m_Children:
- {fileID: 704110296417297756}
m_Father: {fileID: 8086726971969315674}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -13374,7 +13374,7 @@ RectTransform:
m_Children:
- {fileID: 2690898451575886419}
m_Father: {fileID: 8086726971969315674}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -13609,7 +13609,7 @@ RectTransform:
m_Children:
- {fileID: 7031437268621813050}
m_Father: {fileID: 8086726971969315674}
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}
@ -18347,7 +18347,7 @@ RectTransform:
- {fileID: 5967062115290069149}
- {fileID: 127748209899617015}
m_Father: {fileID: 8086726971969315674}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -19059,7 +19059,7 @@ RectTransform:
m_Children:
- {fileID: 1083039102908431656}
m_Father: {fileID: 8086726971969315674}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -20820,7 +20820,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Enter text...
m_Text: 0
--- !u!114 &8081068613764583540
MonoBehaviour:
m_ObjectHideFlags: 0
@ -24273,7 +24273,7 @@ RectTransform:
m_Children:
- {fileID: 6896825094636373229}
m_Father: {fileID: 8086726971969315674}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -26001,7 +26001,7 @@ RectTransform:
- {fileID: 7392823680021850885}
- {fileID: 7392823680698472122}
m_Father: {fileID: 8086726971969315674}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -29946,6 +29946,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6923617167653226497}
- {fileID: 3595815223747699486}
- {fileID: 4910602583273684002}
- {fileID: 7392823678790746391}
- {fileID: 5572369522234568391}
@ -30020,6 +30021,7 @@ MonoBehaviour:
_noDataFound: {fileID: 4686927349675230379}
_downLoadTask: {fileID: 6875313112404340189, guid: 867d36d385cb4d54ea0b2964fc27eb08,
type: 3}
_avatar: {fileID: 1146187573085744031}
--- !u!1 &8135655826908012392
GameObject:
m_ObjectHideFlags: 0
@ -30447,7 +30449,7 @@ RectTransform:
m_Children:
- {fileID: 2390970544393718076}
m_Father: {fileID: 8086726971969315674}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -32798,6 +32800,91 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
radius: 20
--- !u!1 &8774092304942281733
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3595815223747699486}
- component: {fileID: 7420653606984664933}
- component: {fileID: 2584447157873094409}
- component: {fileID: 8981330488742791520}
m_Layer: 5
m_Name: gq
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3595815223747699486
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8774092304942281733}
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: 8086726971969315674}
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: -56, y: -26}
m_SizeDelta: {x: 72, y: 72}
m_Pivot: {x: 1, y: 1}
--- !u!222 &7420653606984664933
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8774092304942281733}
m_CullTransparentMesh: 0
--- !u!114 &2584447157873094409
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8774092304942281733}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 39c7432c0e6b9864d9adbcd21d6ead4b, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!114 &8981330488742791520
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8774092304942281733}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 32
--- !u!1 &8782172158664149682
GameObject:
m_ObjectHideFlags: 0
@ -33813,7 +33900,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Enter text...
m_Text: 0
--- !u!114 &259735464141452530
MonoBehaviour:
m_ObjectHideFlags: 0
@ -35054,18 +35141,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3}
--- !u!224 &6099122571648147432 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4956049655466877929, guid: f1906df0b7fa2614abca6d1c34d78699,
type: 3}
m_PrefabInstance: {fileID: 1180791158023617537}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8659547187054224908 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7516480307603888653, guid: f1906df0b7fa2614abca6d1c34d78699,
type: 3}
m_PrefabInstance: {fileID: 1180791158023617537}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6099122571648147432 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4956049655466877929, guid: f1906df0b7fa2614abca6d1c34d78699,
type: 3}
m_PrefabInstance: {fileID: 1180791158023617537}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4938250171698684290
PrefabInstance:
m_ObjectHideFlags: 0

26
Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
View File

@ -950,7 +950,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 8462
m_Text: --
--- !u!1 &2265257584654954635
GameObject:
m_ObjectHideFlags: 0
@ -1788,7 +1788,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 8462
m_Text: --
--- !u!1 &4165958457219240916
GameObject:
m_ObjectHideFlags: 0
@ -1986,7 +1986,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 8462
m_Text: --
--- !u!1 &4455414704490449947
GameObject:
m_ObjectHideFlags: 0
@ -2547,7 +2547,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Devin Andrews
m_Text: powerfun
--- !u!1 &5404217438093112802
GameObject:
m_ObjectHideFlags: 0
@ -2763,7 +2763,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: ID:8464291
m_Text: ID:0000000
--- !u!1 &5404217439532697478
GameObject:
m_ObjectHideFlags: 0
@ -3901,7 +3901,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: administrator@powerfun.com
m_Text: powerfun@powerfun.com
--- !u!1 &6476809560549656971
GameObject:
m_ObjectHideFlags: 0
@ -4399,7 +4399,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 85KG
m_Text: --KG
--- !u!1 &7462604566810469048
GameObject:
m_ObjectHideFlags: 0
@ -4647,7 +4647,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 85KG
m_Text: --KG
--- !u!1 &7462604567275235208
GameObject:
m_ObjectHideFlags: 0
@ -4725,7 +4725,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 85KG
m_Text: --KG
--- !u!1 &7462604567275421331
GameObject:
m_ObjectHideFlags: 0
@ -4895,7 +4895,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 85KG
m_Text: --KG
--- !u!1 &7462604567503793489
GameObject:
m_ObjectHideFlags: 0
@ -5217,7 +5217,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 85KG
m_Text: --KG
--- !u!1 &7462604567977832409
GameObject:
m_ObjectHideFlags: 0
@ -6083,7 +6083,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 8462
m_Text: --
--- !u!1 &8742705129243243295
GameObject:
m_ObjectHideFlags: 0
@ -6608,7 +6608,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 8462
m_Text: --
--- !u!1001 &4734340669132012360
PrefabInstance:
m_ObjectHideFlags: 0

2
Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab
View File

@ -5190,7 +5190,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4701201928324246661
RectTransform:
m_ObjectHideFlags: 0

518
Assets/Resources/UI/Prefab/Ride/Panel.prefab
View File

@ -242,6 +242,84 @@ MonoBehaviour:
m_EditorClassIdentifier:
mType: 0
Tooltips:
--- !u!1 &297900577361049966
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2164182762139956484}
- component: {fileID: 7494954692313026482}
- component: {fileID: 8206249691069134768}
- component: {fileID: 9063789103611451070}
m_Layer: 5
m_Name: Lines
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2164182762139956484
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 297900577361049966}
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: 1980389068150088602}
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_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7494954692313026482
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 297900577361049966}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!222 &8206249691069134768
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 297900577361049966}
m_CullTransparentMesh: 0
--- !u!114 &9063789103611451070
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 297900577361049966}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: []
Thickness: 2
--- !u!1 &685319856715084514
GameObject:
m_ObjectHideFlags: 0
@ -17516,7 +17594,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -75.5, y: 55}
m_AnchoredPosition: {x: -108, y: 55}
m_SizeDelta: {x: 111, y: 22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &765892906472282515
@ -17553,7 +17631,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 48
m_Alignment: 5
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -21838,7 +21916,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &897261556026011096
--- !u!1 &969911389835366252
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -21846,9 +21924,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3376086253513265076}
- component: {fileID: 9145608373558373876}
- component: {fileID: 4956818725367094812}
- component: {fileID: 1955686821713182705}
- component: {fileID: 6880504936399357733}
- component: {fileID: 411661905721470178}
m_Layer: 5
m_Name: textController
m_TagString: Untagged
@ -21856,18 +21934,18 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3376086253513265076
--- !u!224 &1955686821713182705
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 897261556026011096}
m_GameObject: {fileID: 969911389835366252}
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: 4995116408562394011}
m_Father: {fileID: 7960069841282038231}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -21875,25 +21953,25 @@ RectTransform:
m_AnchoredPosition: {x: -771, y: -44}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &9145608373558373876
--- !u!114 &6880504936399357733
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 897261556026011096}
m_GameObject: {fileID: 969911389835366252}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &4956818725367094812
--- !u!114 &411661905721470178
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 897261556026011096}
m_GameObject: {fileID: 969911389835366252}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3}
@ -22008,7 +22086,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &1342669145725974673
--- !u!1 &1995686856905933909
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -22016,10 +22094,10 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4841203650928097880}
- component: {fileID: 1744932285003073036}
- component: {fileID: 3776155521228129246}
- component: {fileID: 3066237206571617605}
- component: {fileID: 1027009351732928221}
- component: {fileID: 7810955073671470708}
- component: {fileID: 5849651006172345110}
- component: {fileID: 3918241713490527762}
m_Layer: 5
m_Name: Lines
m_TagString: Untagged
@ -22027,18 +22105,18 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4841203650928097880
--- !u!224 &1027009351732928221
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1342669145725974673}
m_GameObject: {fileID: 1995686856905933909}
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: 6871970735565837905}
m_Father: {fileID: 1980389068150088602}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -22046,33 +22124,33 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1744932285003073036
--- !u!114 &7810955073671470708
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1342669145725974673}
m_GameObject: {fileID: 1995686856905933909}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!222 &3776155521228129246
--- !u!222 &5849651006172345110
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1342669145725974673}
m_GameObject: {fileID: 1995686856905933909}
m_CullTransparentMesh: 0
--- !u!114 &3066237206571617605
--- !u!114 &3918241713490527762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1342669145725974673}
m_GameObject: {fileID: 1995686856905933909}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3}
@ -25320,109 +25398,6 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &2521352769102565827
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6871970735565837905}
- component: {fileID: 5142435537658091649}
- component: {fileID: 45889605061409921}
- component: {fileID: 7181129151100895886}
- component: {fileID: 8208784755317893622}
m_Layer: 5
m_Name: RectMask(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6871970735565837905
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2521352769102565827}
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: 4841203650928097880}
- {fileID: 5953706282880257250}
m_Father: {fileID: 4995116408562394011}
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: 88}
m_SizeDelta: {x: 1542, y: 88}
m_Pivot: {x: 0, y: 1}
--- !u!114 &5142435537658091649
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2521352769102565827}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!222 &45889605061409921
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2521352769102565827}
m_CullTransparentMesh: 0
--- !u!114 &7181129151100895886
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2521352769102565827}
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: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8208784755317893622
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2521352769102565827}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2877296740073624296
GameObject:
m_ObjectHideFlags: 0
@ -25453,7 +25428,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4995116408562394011}
- {fileID: 7960069841282038231}
- {fileID: 3591901196367126761}
m_Father: {fileID: 765892906030958096}
m_RootOrder: 3
@ -27981,6 +27956,109 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &4724676833684656552
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1980389068150088602}
- component: {fileID: 2781209844784678196}
- component: {fileID: 648963400993299855}
- component: {fileID: 4371682126523087743}
- component: {fileID: 6626822377312525827}
m_Layer: 5
m_Name: RectMask(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1980389068150088602
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4724676833684656552}
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: 1027009351732928221}
- {fileID: 2164182762139956484}
m_Father: {fileID: 7960069841282038231}
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: 88}
m_SizeDelta: {x: 1542, y: 88}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2781209844784678196
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4724676833684656552}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!222 &648963400993299855
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4724676833684656552}
m_CullTransparentMesh: 0
--- !u!114 &4371682126523087743
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4724676833684656552}
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: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &6626822377312525827
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4724676833684656552}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &5011985780756399770
GameObject:
m_ObjectHideFlags: 0
@ -28151,6 +28229,56 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &6413475596566475824
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7960069841282038231}
- component: {fileID: 8956318250660842226}
m_Layer: 0
m_Name: New Game Object
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7960069841282038231
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6413475596566475824}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.97727275, y: 0.97727275, z: 1}
m_Children:
- {fileID: 1980389068150088602}
- {fileID: 1955686821713182705}
m_Father: {fileID: 2877296740073624297}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1542, y: 88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8956318250660842226
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6413475596566475824}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6653291467032316143
GameObject:
m_ObjectHideFlags: 0
@ -28413,56 +28541,6 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &6819009095012479235
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4995116408562394011}
- component: {fileID: 6450186978809094331}
m_Layer: 0
m_Name: New Game Object
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4995116408562394011
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6819009095012479235}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.97727275, y: 0.97727275, z: 1}
m_Children:
- {fileID: 6871970735565837905}
- {fileID: 3376086253513265076}
m_Father: {fileID: 2877296740073624297}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1542, y: 88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6450186978809094331
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6819009095012479235}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6885174058740936923
GameObject:
m_ObjectHideFlags: 0
@ -31051,84 +31129,6 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &7993103140849216197
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5953706282880257250}
- component: {fileID: 9212963550564024053}
- component: {fileID: 4885339082537014084}
- component: {fileID: 3072343618324652361}
m_Layer: 5
m_Name: Lines
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5953706282880257250
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7993103140849216197}
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: 6871970735565837905}
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_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &9212963550564024053
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7993103140849216197}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!222 &4885339082537014084
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7993103140849216197}
m_CullTransparentMesh: 0
--- !u!114 &3072343618324652361
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7993103140849216197}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: []
Thickness: 2
--- !u!1 &8167803179722282851
GameObject:
m_ObjectHideFlags: 0

22324
Assets/Resources/UI/Prefab/Ride/Player.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/UI/Prefab/Ride/Player.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a10e7827433afd04f80f26acf4acec71
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

22635
Assets/Resources/UI/Prefab/Ride/Player_NV.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/UI/Prefab/Ride/Player_NV.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 52e5f36edfd1e3049aa0be62b1815baf
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

10
Assets/Resources/UI/language.json
View File

@ -420,7 +420,10 @@
"Helmet": "头盔",
"Uniform": "上衣",
"Skin": "皮肤",
"Bicycle": "自行车"
"Bicycle": "自行车",
"cannot be negative!":"不可为负数！",
"closetime cannot over 120 minutes!":"关门时间不能大于120分钟！",
"Time Limit:":"倒计时:"
},
"en": {
"HOT ROUTES": "HOT ROUTES",
@ -836,6 +839,9 @@
"Helmet": "Helmet",
"Uniform": "Uniform",
"Skin": "Skin",
"Bicycle": "Bicycle"
"Bicycle": "Bicycle",
"cannot be negative!":"cannot be negative!",
"closetime cannot over 120 minutes!":"closetime cannot over 120 minutes!",
"Time Limit:":"Time Limit:"
}
}

2
Assets/Scenes.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 02bae854c34fc6f408330699136a74db
guid: 7bdcc063f7cac584caf8efbc4446964a
folderAsset: yes
DefaultImporter:
externalObjects: {}

25837
Assets/Scenes/Ride.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scenes/VideoPlay.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 63005296214ef5444bf00054478018e7
guid: 1385855c29de88e479995187f50e07af
folderAsset: yes
DefaultImporter:
externalObjects: {}

5757
Assets/Scenes/VideoPlay.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Scripts/Apis/MapApi.cs
View File

@ -64,14 +64,14 @@ namespace Assets.Scripts.Apis
/// <param name="sort">hot, distance</param>
/// <param name="sortDire">asc</param>
/// <returns></returns>
public Task<JsonResult<List<MapRoute>>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false,bool isMine = false,bool isRecent = false,bool isEnableAR = false)
public Task<JsonResult<List<MapRoute>>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false,bool isMine = false,bool isRecent = false,bool isEnableAR = false, bool isEnableBattle = false)
{
string lngLat = "";
if (sort.Equals("Near"))
{
lngLat = $"{App.longitude},{App.latitude}";
}
var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}&lngLat={lngLat}&isMine={isMine}&isRecent={isRecent}&isEnableAR={isEnableAR}";
var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}&lngLat={lngLat}&isMine={isMine}&isRecent={isRecent}&isEnableAR={isEnableAR}&isEnableBattle={isEnableBattle}";
return GetAsync<JsonResult<List<MapRoute>>>(url);
}

6
Assets/Scripts/Apis/Models/ActivityModel.cs
View File

@ -58,5 +58,11 @@ namespace Assets.Scripts.Apis.Models
public double TotalTicks { get; set; }
public string Url { get; set; }
public string GlobalDetailUrl { get; set; }
/// <summary>
/// 活动类型0：网页活动 1:App内部骑行活动 2：App内部赛事活动
/// </summary>
public int ActivityType { get; set; }
public int RouteId { get; set; }
public int CompetitionId { get; set; }
}
}

2
Assets/Scripts/Apis/Models/GameRoomModel.cs
View File

@ -176,5 +176,7 @@ namespace Assets.Scripts.Apis.Models
public string Source { get; set; }
public bool IsDNF { get; set; }
public double? HeartRate { get; set; }
public string DeviceType { get; set; }
}
}

2
Assets/Scripts/Apis/PfHttpClientHandler.cs
View File

@ -64,7 +64,7 @@ namespace Assets.Scripts.Apis
IEnumerator LoadLogin(string msg)
{
//释放资源
MapUDPService.Dispose();
//MapUDPService.Dispose();
//删除本地文件
Helper.DelectDir(PFConstants.MapWorkoutRecordTempFolder);
App.tempRecordData = null;

2
Assets/Scripts/Scenes/LoginController.cs
View File

@ -597,6 +597,8 @@ public class LoginController : BaseScene
}
async void Init()
{
MapUDPService.Dispose();
Loom.Dispose();
UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
userInfos = UIManager.Instance.userInfos;
App.DefaultRotateTexture = Utils.ReadTextureFromPlayerPrefs("rotateImage");

9
Assets/Scripts/Scenes/MainController.cs
View File

@ -331,6 +331,11 @@ public class MainController : BaseScene
{
UIManager.ShowRaceHomePanel();
}
if (App.MainSceneParam["Name"] == "GameRoomList")
{
UIManager.ShowGameRoomListPanel();
}
App.MainSceneParam["Name"] = string.Empty;
}
else
@ -352,7 +357,9 @@ public class MainController : BaseScene
if (App.adQueue.Count > 0)
{
var ad = App.adQueue.Dequeue();
UIManager.ShowActivityAdPanel(ad.Id, App.GetLocalLanguage() == "zh" ? ad.DetailUrl : ad.GlobalDetailUrl, ad.Url + $"?Token={App.CurrentUser.cookie}");
ad.DetailUrl = App.GetLocalLanguage() == "zh" ? ad.DetailUrl : ad.GlobalDetailUrl;
ad.Url += $"?Token={App.CurrentUser.cookie}";
UIManager.ShowActivityAdPanel(ad);
}
}
}

282
Assets/Scripts/Scenes/Ride/GameRoom/GameRoomResultPanelScript.cs Normal file
View File

@ -0,0 +1,282 @@
using Assets.Scenes.Ride.Scripts.Model.CyclingModels;
using Assets.Scripts;
using Assets.Scripts.UI.UIEffect;
using System.Linq;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using DG.Tweening;
using System;
using Facebook.Unity;
namespace Assets.Scenes.Ride.Scripts
{
public class GameRoomResultPanelScript : MonoBehaviour
{
CyclingController cyclingController;
RawImage Head;
Text Ranking;
Text Timer;
GameObject Mine { get; set; }
GameObject TitleImage { get; set; }
GameObject WatchTitle { get; set; }
GameObject RankingPanel { get; set; }
GameObject ShareButton { get; set; }
GameObject ToolBarPanel { get; set; }
GameObject WeChatButton { get; set; }
GameObject WeChatGpButton { get; set; }
RawImage TopHead { get; set; }
RawImage SecondHead { get; set; }
RawImage ThirdHead { get; set; }
Image Top { get; set; }
Sprite SpriteTop { get; set; }
Sprite SpriteSecond { get; set; }
Sprite SpriteThrid { get; set; }
Text RankingTitle { get; set; }
Text TimerTitle { get; set; }
Text CloseTime { get; set; }
Text CloseTitle { get; set; }
private void Awake()
{
cyclingController = FindObjectOfType<CyclingController>();
var closeBtn = transform.Find("Close").gameObject;
Head = transform.Find("Mine/Head").GetComponent<RawImage>();
Ranking = transform.Find("Mine/Ranking").GetComponent<Text>();
RankingTitle = transform.Find("Mine/RankingTitle").GetComponent<Text>();
TimerTitle = transform.Find("Mine/TimerTitle").GetComponent<Text>();
Timer = transform.Find("Mine/Timer").GetComponent<Text>();
Top = transform.Find("Mine/TOP").GetComponent<Image>();
Mine = transform.Find("Mine").gameObject;
RankingPanel = transform.Find("Ranking").gameObject;
TopHead = transform.Find("Ranking/TopHead").GetComponent<RawImage>();
SecondHead = transform.Find("Ranking/SecondHead").GetComponent<RawImage>();
ThirdHead = transform.Find("Ranking/ThirdHead").GetComponent<RawImage>();
TitleImage = transform.Find("TitleImage").gameObject;
WatchTitle = transform.Find("WatchTitle").gameObject;
CloseTitle = transform.Find("CloseTitle").GetComponent<Text>();
CloseTime = transform.Find("CloseTime").GetComponent<Text>();
#if UNITY_IOS || UNITY_ANDROID
ShareButton = transform.Find("ShareButton").gameObject;
ToolBarPanel = transform.Find("ToolBarPanel").gameObject;
WeChatButton = transform.Find("ToolBarPanel/WeChatButton").gameObject;
WeChatGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject;
UIManager.AddEvent(WeChatButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechat);
UIManager.AddEvent(WeChatGpButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechatGp);
var fbButton = transform.Find("ToolBarPanel/FaceBookButton").gameObject;
UIManager.AddEvent(fbButton, EventTriggerType.PointerClick, shareFb);
#endif
SpriteTop = Resources.Load<Sprite>("Images/Ride/Match/top-1");
SpriteSecond = Resources.Load<Sprite>("Images/Ride/Match/top-2");
SpriteThrid = Resources.Load<Sprite>("Images/Ride/Match/top-3");
UIManager.AddEvent(closeBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Close);
}
float time = 1;
private void Update()
{
//var model = cyclingController.cyclingController as GameModel;
//if (model != null)
//{
///var s = model.EndCountDown();
//显示关门时间
//var isshow = s.Item3 && s.Item1 >= 0 && !cyclingController.isWatch;
//CloseTime.text = Helper.FormatTicks(s.Item1);
//CloseTitle.gameObject.SetActive(isshow);
//CloseTime.gameObject.SetActive(isshow);
//}
time -= Time.deltaTime;
while (time < 0)
{
Refresh();
time += 1;
}
}
private Color RED = new Color(0.9764706f, 0.1882353f, 0.5254902f);
private Color SHALLOW_RED = new Color(1f, 0.454902f, 0.5215687f);
private Color PURPLE = new Color(0.1568628f, 0.4431373f, 0.8745098f);
private Color SHALLOW_PURPLE = new Color(0.3843137f, 0.7764706f, 1f);
private Color BLUE = new Color(0.4352941f, 0.3333333f, 0.9372549f);
private Color SHALLOW_BLUE = new Color(0.772549f, 0.5529412f, 1f);
private Color WHITE = new Color(1f, 1f, 1f);
public void Refresh()
{
if (cyclingController.cyclingController is GameModel model)
{
var list = model?.mapWorkoutRecordRankings;
if (list == null) return;
var parent = transform.Find("ScrollView/Viewport/Content");
Mine.SetActive(!cyclingController.isWatch);
RankingPanel.SetActive(cyclingController.isWatch);
TitleImage.SetActive(!cyclingController.isWatch);
WatchTitle.SetActive(cyclingController.isWatch);
if (model.FirstEndTime.HasValue)
{
var gap = model.FirstEndTime.Value - UIManager.Now.GetDateTime();
var seconds = (int)Math.Floor(gap.TotalSeconds);
CloseTime.text = Helper.FormatTicks(seconds);
CloseTitle.gameObject.SetActive(true);
CloseTime.gameObject.SetActive(true);
}
if (!cyclingController.isWatch)
{
//当前用户排名
var currentRanking = list.Where(c => c.UserId == cyclingController.currentPlayer.UserId).FirstOrDefault();
if (currentRanking != null)
{
Utils.DisplayImage(Head, currentRanking.WxHeadImg, true);
Ranking.text = currentRanking.Rank.ToString().PadLeft(3, '0');
Timer.text = currentRanking.TotalTime;
var uigradient = Mine.transform.GetComponent<UIGradient>();
if (currentRanking.Rank <= 3)
{
TimerTitle.color = WHITE;
RankingTitle.color = WHITE;
}
if (currentRanking.Rank == 1)
{
uigradient.color1 = RED;
uigradient.color2 = SHALLOW_RED;
Top.sprite = SpriteTop;
Top.gameObject.SetActive(true);
}
if (currentRanking.Rank == 2)
{
uigradient.color1 = PURPLE;
uigradient.color2 = SHALLOW_PURPLE;
Top.sprite = SpriteSecond;
Top.gameObject.SetActive(true);
}
if (currentRanking.Rank == 3)
{
uigradient.color1 = BLUE;
uigradient.color2 = SHALLOW_BLUE;
Top.sprite = SpriteThrid;
Top.gameObject.SetActive(true);
}
}
}
else
{
//观察者模式左边显示前三名
var topList = list.OrderBy(c => c.Rank).Take(3);
foreach (var item in topList)
{
if (item.Rank == 1)
{
Utils.DisplayImage(TopHead, item.WxHeadImg, true);
var name = TopHead.transform.Find("Name").GetComponent<Text>();
name.text = item.NickName;
TopHead.gameObject.SetActive(true);
}
if (item.Rank == 2)
{
Utils.DisplayImage(SecondHead, item.WxHeadImg, true);
var name = SecondHead.transform.Find("Name").GetComponent<Text>();
name.text = item.NickName;
SecondHead.gameObject.SetActive(true);
}
if (item.Rank == 3)
{
Utils.DisplayImage(ThirdHead, item.WxHeadImg, true);
var name = ThirdHead.transform.Find("Name").GetComponent<Text>();
name.text = item.NickName;
ThirdHead.gameObject.SetActive(true);
}
}
}
//排名列表
var rankingList = FindObjectsOfType<FinalRankingItemScript>();
foreach (var item in list)
{
var finalRankingItemScript = rankingList.Where(c => c.UserId == item.UserId).FirstOrDefault();
//没有就创建
if (finalRankingItemScript == null)
{
#if UNITY_IOS || UNITY_ANDROID
var finalRankingItem = Instantiate(Resources.Load<GameObject>("UI/Prefab/Match/Mobile/FinalRankingItem"), parent);
#else
var finalRankingItem = Instantiate(Resources.Load<GameObject>("UI/Prefab/Match/FinalRankingItem"), parent);
#endif
finalRankingItemScript = finalRankingItem.GetComponent<FinalRankingItemScript>();
}
//有就更新
finalRankingItemScript.setGap(item.Gap);
finalRankingItemScript.setSource(item.Source);
finalRankingItemScript.setUserId(item.UserId, item.WxHeadImg);
finalRankingItemScript.setRanking(item.Rank);
finalRankingItemScript.setHeartRate(item.HeartRate);
finalRankingItemScript.setName(item.NickName);
finalRankingItemScript.setPower(item.Power.ToString());
finalRankingItemScript.setRatio(item.WeightKG);
finalRankingItemScript.setTimer(item.TotalTime);
finalRankingItemScript.transform.SetSiblingIndex(item.Rank);
}
}
}
private void Close(BaseEventData baseEventData)
{
this.gameObject.SetActive(false);
this.Destroy();
SceneManager.LoadScene("MainScene");
//App.MainSceneParam["Name"] = "RaceHomePanel";
}
private void OpenShare(BaseEventData baseEventData)
{
((RectTransform)ToolBarPanel.transform).pivot = new Vector2(0, ((RectTransform)ToolBarPanel.transform).pivot.y);
ShareButton.SetActive(false);
ToolBarPanel.transform.DOScaleX(1, 1);
}
private void ShareWechat(BaseEventData baseEventData)
{
if (!App.weChatController.IsWeChatAppInstalled())
{
App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.Title, "By " + App.CurrentUser.Nickname, null);
}
else
{
Utils.showToast(null, "未安装微信");
}
}
private void shareFb(BaseEventData arg0)
{
//cyclingController.competition.Title, "By " + App.CurrentUser.Nickname, null)
FB.ShareLink(contentURL: new Uri($"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}"),
contentTitle: cyclingController.competition.Title,
contentDescription: "By " + App.CurrentUser.Nickname,
photoURL: new Uri(cyclingController.competition.CoverImage));
}
private void ShareWechatGp(BaseEventData baseEventData)
{
if (App.weChatController.IsWeChatAppInstalled())
{
App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.Title, "By " + App.CurrentUser.Nickname, null);
}
else
{
Utils.showToast(null, "未安装微信");
}
}
}
}

11
Assets/Scripts/Scenes/Ride/GameRoom/GameRoomResultPanelScript.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 180198074f4b2344d8fd96e8e068324b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

169
Assets/Scripts/Scenes/Ride/GameRoom/GameRoomResultScript.cs
View File

@ -6,15 +6,15 @@ using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using DG.Tweening;
using System;
using Facebook.Unity;
using Assets.Scripts.Scenes.VideoRide;
using Assets.Scenes.Ride.Scripts;
namespace Assets.Scenes.Ride.Scripts
namespace Assets.Scripts.Scenes.Scripts
{
public class GameRoomResultScript : MonoBehaviour
{
CyclingController cyclingController;
VideoGameManager cyclingController;
RawImage Head;
Text Ranking;
Text Timer;
@ -26,8 +26,6 @@ namespace Assets.Scenes.Ride.Scripts
GameObject ToolBarPanel { get; set; }
GameObject WeChatButton { get; set; }
GameObject WeChatGpButton { get; set; }
RawImage TopHead { get; set; }
RawImage SecondHead { get; set; }
RawImage ThirdHead { get; set; }
@ -35,14 +33,13 @@ namespace Assets.Scenes.Ride.Scripts
Sprite SpriteTop { get; set; }
Sprite SpriteSecond { get; set; }
Sprite SpriteThrid { get; set; }
Text RankingTitle { get; set; }
Text TimerTitle { get; set; }
Text CloseTime { get; set; }
Text CloseTitle { get; set; }
private void Awake()
{
cyclingController = FindObjectOfType<CyclingController>();
cyclingController = FindObjectOfType<VideoGameManager>();
var closeBtn = transform.Find("Close").gameObject;
Head = transform.Find("Mine/Head").GetComponent<RawImage>();
Ranking = transform.Find("Mine/Ranking").GetComponent<Text>();
@ -76,20 +73,9 @@ namespace Assets.Scenes.Ride.Scripts
UIManager.AddEvent(closeBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Close);
}
float time = 1;
private void Update()
{
//var model = cyclingController.cyclingController as GameModel;
//if (model != null)
//{
///var s = model.EndCountDown();
//显示关门时间
//var isshow = s.Item3 && s.Item1 >= 0 && !cyclingController.isWatch;
//CloseTime.text = Helper.FormatTicks(s.Item1);
//CloseTitle.gameObject.SetActive(isshow);
//CloseTime.gameObject.SetActive(isshow);
//}
time -= Time.deltaTime;
while (time < 0)
{
@ -118,10 +104,10 @@ namespace Assets.Scenes.Ride.Scripts
if (list == null) return;
var parent = transform.Find("ScrollView/Viewport/Content");
Mine.SetActive(!cyclingController.isWatch);
RankingPanel.SetActive(cyclingController.isWatch);
TitleImage.SetActive(!cyclingController.isWatch);
WatchTitle.SetActive(cyclingController.isWatch);
Mine.SetActive(true);
RankingPanel.SetActive(false);
TitleImage.SetActive(true);
WatchTitle.SetActive(false);
if (model.FirstEndTime.HasValue)
{
@ -132,74 +118,41 @@ namespace Assets.Scenes.Ride.Scripts
CloseTime.gameObject.SetActive(true);
}
if (!cyclingController.isWatch)
//当前用户排名
var currentRanking = list.Where(c => c.UserId == cyclingController.CurrentPlayer.UserId).FirstOrDefault();
if (currentRanking != null)
{
//当前用户排名
var currentRanking = list.Where(c => c.UserId == cyclingController.currentPlayer.UserId).FirstOrDefault();
if (currentRanking != null)
Utils.DisplayImage(Head, currentRanking.WxHeadImg, true);
Ranking.text = currentRanking.Rank.ToString().PadLeft(3, '0');
Timer.text = currentRanking.TotalTime;
var uigradient = Mine.transform.GetComponent<UIGradient>();
if (currentRanking.Rank <= 3)
{
Utils.DisplayImage(Head, currentRanking.WxHeadImg, true);
Ranking.text = currentRanking.Rank.ToString().PadLeft(3, '0');
Timer.text = currentRanking.TotalTime;
var uigradient = Mine.transform.GetComponent<UIGradient>();
if (currentRanking.Rank <= 3)
{
TimerTitle.color = WHITE;
RankingTitle.color = WHITE;
}
if (currentRanking.Rank == 1)
{
uigradient.color1 = RED;
uigradient.color2 = SHALLOW_RED;
Top.sprite = SpriteTop;
Top.gameObject.SetActive(true);
}
if (currentRanking.Rank == 2)
{
uigradient.color1 = PURPLE;
uigradient.color2 = SHALLOW_PURPLE;
Top.sprite = SpriteSecond;
Top.gameObject.SetActive(true);
}
if (currentRanking.Rank == 3)
{
uigradient.color1 = BLUE;
uigradient.color2 = SHALLOW_BLUE;
Top.sprite = SpriteThrid;
Top.gameObject.SetActive(true);
}
TimerTitle.color = WHITE;
RankingTitle.color = WHITE;
}
if (currentRanking.Rank == 1)
{
uigradient.color1 = RED;
uigradient.color2 = SHALLOW_RED;
Top.sprite = SpriteTop;
Top.gameObject.SetActive(true);
}
if (currentRanking.Rank == 2)
{
uigradient.color1 = PURPLE;
uigradient.color2 = SHALLOW_PURPLE;
Top.sprite = SpriteSecond;
Top.gameObject.SetActive(true);
}
if (currentRanking.Rank == 3)
{
uigradient.color1 = BLUE;
uigradient.color2 = SHALLOW_BLUE;
Top.sprite = SpriteThrid;
Top.gameObject.SetActive(true);
}
}
else
{
//观察者模式左边显示前三名
var topList = list.OrderBy(c => c.Rank).Take(3);
foreach (var item in topList)
{
if (item.Rank == 1)
{
Utils.DisplayImage(TopHead, item.WxHeadImg, true);
var name = TopHead.transform.Find("Name").GetComponent<Text>();
name.text = item.NickName;
TopHead.gameObject.SetActive(true);
}
if (item.Rank == 2)
{
Utils.DisplayImage(SecondHead, item.WxHeadImg, true);
var name = SecondHead.transform.Find("Name").GetComponent<Text>();
name.text = item.NickName;
SecondHead.gameObject.SetActive(true);
}
if (item.Rank == 3)
{
Utils.DisplayImage(ThirdHead, item.WxHeadImg, true);
var name = ThirdHead.transform.Find("Name").GetComponent<Text>();
name.text = item.NickName;
ThirdHead.gameObject.SetActive(true);
}
}
}
//排名列表
var rankingList = FindObjectsOfType<FinalRankingItemScript>();
@ -219,7 +172,7 @@ namespace Assets.Scenes.Ride.Scripts
//有就更新
finalRankingItemScript.setGap(item.Gap);
//finalRankingItemScript.setSource(item.de);
finalRankingItemScript.setSource(item.Source);
finalRankingItemScript.setUserId(item.UserId, item.WxHeadImg);
finalRankingItemScript.setRanking(item.Rank);
finalRankingItemScript.setHeartRate(item.HeartRate);
@ -237,46 +190,6 @@ namespace Assets.Scenes.Ride.Scripts
this.gameObject.SetActive(false);
this.Destroy();
SceneManager.LoadScene("MainScene");
//App.MainSceneParam["Name"] = "RaceHomePanel";
}
private void OpenShare(BaseEventData baseEventData)
{
((RectTransform)ToolBarPanel.transform).pivot = new Vector2(0, ((RectTransform)ToolBarPanel.transform).pivot.y);
ShareButton.SetActive(false);
ToolBarPanel.transform.DOScaleX(1, 1);
}
private void ShareWechat(BaseEventData baseEventData)
{
if (!App.weChatController.IsWeChatAppInstalled())
{
App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.Title, "By " + App.CurrentUser.Nickname, null);
}
else
{
Utils.showToast(null, "未安装微信");
}
}
private void shareFb(BaseEventData arg0)
{
//cyclingController.competition.Title, "By " + App.CurrentUser.Nickname, null)
FB.ShareLink(contentURL: new Uri($"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}"),
contentTitle: cyclingController.competition.Title,
contentDescription: "By " + App.CurrentUser.Nickname,
photoURL: new Uri(cyclingController.competition.CoverImage));
}
private void ShareWechatGp(BaseEventData baseEventData)
{
if (App.weChatController.IsWeChatAppInstalled())
{
App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.Title, "By " + App.CurrentUser.Nickname, null);
}
else
{
Utils.showToast(null, "未安装微信");
}
}
}
}

2
Assets/Scripts/Scenes/Ride/GameRoom/GameRoomResultScript.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 180198074f4b2344d8fd96e8e068324b
guid: 1fbc05c763a9da04c9a30c0eb2e41cd6
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs
View File

@ -115,7 +115,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
}
else
{
MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId, route.Point.First().Reverse().ToArray(), competitionId: recorderData.Competitionid);
MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId, route.Point.First().Reverse().ToArray(), competitionId: recorderData.Competitionid,roomId: recorderData.RoomId);
}
}
catch (Exception)

4
Assets/Scripts/Scenes/Ride/Model/CyclingModels/GameModel.cs
View File

@ -16,7 +16,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
public int? FirstUserId { get; private set; }
public GameRoomModel GameRoom { get; private set; }
public List<RoomRankItem> mapWorkoutRecordRankings = new List<RoomRankItem>();
public List<CompetitionResultModel> gameRoomResult;//new List<CompetitionResultModel>();
public GameModel(Route route,RouteResultParam param)
: base(route, CyclingModel.Single)
{
@ -125,7 +125,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
}
#region 骑行结束，比赛结果展示数据
var results = new List<CompetitionResultModel>();
gameRoomResult = new List<CompetitionResultModel>();
if (recorderData.IsCompleted || recorderData.Saved)
{
var users1 = userList.Where(d => d.IsCompleted || d.Saved);

45
Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs
View File

@ -63,7 +63,7 @@ namespace Assets.Scenes.Ride.Scripts
protected double totalClimb;
public double TotalClimb { get => totalClimb; }
public int UserId { set; get; }//{ get => userId; }
public int UserId { set; get; }
public double Speed { get => speed; }
public double Power { get => power; }
public double Cadance { get => cadance; }
@ -90,9 +90,7 @@ namespace Assets.Scenes.Ride.Scripts
#endregion
void Start()
{
Init();
//StartCoroutine("TestExcute");
}
void Update()
@ -117,10 +115,6 @@ namespace Assets.Scenes.Ride.Scripts
map = transform.parent.Find("Map").GetComponent<AbstractMap>();
mapData = mainController.GetMapData();//获取路书信息
////获取海拔图UI对象
//var graphObject = transform.parent.Find("UI/Panel/GraphChart");
//chartDataSourceScript = graphObject.GetComponent<ChartDataSourceScript>();
//graph = graphObject.GetComponent<GraphChartBase>();
chartDataSourceScript = mainController.chartDataSourceScript;
graph = mainController.graph;
cyclingExcutor = mainController.cyclingController;
@ -153,32 +147,29 @@ namespace Assets.Scenes.Ride.Scripts
//人物动画控制
if (characterAnimator != null)
{
//characterAnimator.SetFloat("Speed", (float)speed);
//characterAnimator.SetFloat("Slope", (float)currentSlope);
if (characterAnimator != null)
{
//characterAnimator.SetFloat("preSpeed", (float)preSpeed);
characterAnimator.SetFloat("speed", (float)speed);
characterAnimator.SetFloat("grade", (float)currentSlope);
characterAnimator.SetFloat("power", (float)power);
}
//if (currentSlope > 6)
// {
// characterAnimator.speed = 0.45f;
//}
// else
// {
// characterAnimator.speed = 0.65f;
//}
//if (speed > 40)
//{
// characterAnimator.speed = 0.75f;
//}
//if (totalDistance >= mapData.TotalDistance)
//{
// characterAnimator.SetBool("ReachEnd", true);//到达终点
//}
//根据速度和坡度不同分为4个等级的播放速度
if (speed > 20)
{
characterAnimator.speed = 1.15f;
}
else if (speed > 35)
{
characterAnimator.speed = 1.25f;
}
else if (speed > 45)
{
characterAnimator.speed = 1.45f;
}
else if (currentSlope > 4.5)
{
characterAnimator.speed = 0.5f;
}
}
Compute();//接受蓝牙设备数据计算
//开始骑行

6
Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs
View File

@ -224,6 +224,11 @@ namespace Assets.Scenes.Ride.Scripts
}
protected virtual void Cancel(BaseEventData baseEvent)
{
//如果在对战房间内,发送退出房间的命令
if (cyclingController.roomId > 0)
{
MapUDPService.SendGameRoomKick(cyclingController.roomId, App.CurrentUser.Id, App.CurrentUser.Id);
}
SceneManager.LoadScene("MainScene");
}
protected IEnumerator HiddenLoading()
@ -234,6 +239,7 @@ namespace Assets.Scenes.Ride.Scripts
private bool tileHeightProcessed = false;
protected void _map_OnInitialized()
{
panel.transform.Find("Multips")?.gameObject.SetActive(true);
var visualizer = _map.MapVisualizer;
visualizer.OnTileHeightProcessingFinished += (s) =>
{

18
Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
View File

@ -298,7 +298,7 @@ namespace Assets.Scenes.Ride.Scripts
{
playerController = FindObjectOfType<PlayerController>();
mainController = FindObjectOfType<CyclingController>();
player = transform.parent.Find("Player");
player = playerController.transform;
var route = mainController.GetRoute();
uipanel = mainController.GetUIPanel();
InitGameObject();
@ -384,7 +384,7 @@ namespace Assets.Scenes.Ride.Scripts
if (target != null && mainController.Is3dView && mainController.RotateLock && mainController.currentPlayer.Speed > 0)
{
Vector3 v = Vector3.zero;
v.y += mainController.currentPlayer.currentRotation.eulerAngles.y + 160f;
v.y += mainController.currentPlayer.currentRotation.eulerAngles.y-20f; //+ 160f;
if (mainController.RotateLock)
{
target.transform.DOLocalRotate(v, 1f, RotateMode.Fast);
@ -399,7 +399,7 @@ namespace Assets.Scenes.Ride.Scripts
if (!mainController.Is3dView)
{
Vector3 v = Vector3.zero;
v.y += mainController.currentPlayer.currentRotation.eulerAngles.y + 160f; //target.transform.rotation = playerController.transform.rotation;//new Quaternion(playerController.transform.rotation.x, playerController.transform.rotation.y +1f, playerController.transform.rotation.z, playerController.transform.rotation.w);
v.y += mainController.currentPlayer.currentRotation.eulerAngles.y-20f;// + 160f; //target.transform.rotation = playerController.transform.rotation;//new Quaternion(playerController.transform.rotation.x, playerController.transform.rotation.y +1f, playerController.transform.rotation.z, playerController.transform.rotation.w);
target.transform.eulerAngles = v; //.Set(0, playerController.currentRotation.eulerAngles.y + 160f, 0);// = new Vector3(0, playerController.transform.eulerAngles.y + 160f, 0);
//mainController.player.transform.localScale.Set(0.1f, 0.1f, 0.1f);
player.transform.localScale = m;
@ -519,15 +519,25 @@ namespace Assets.Scenes.Ride.Scripts
}
else
{
SendQuit4GameRoom();
SceneManager.LoadScene("MainScene");
}
}
private void SendQuit4GameRoom()
{
//如果在对战房间内,发送退出房间的命令
if (mainController.roomId > 0)
{
MapUDPService.SendGameRoomKick(mainController.roomId, App.CurrentUser.Id, App.CurrentUser.Id);
}
}
//不保存退出
public virtual void CancelQuit(BaseEventData baseEventData)
{
modalPanel.SetActive(false);
quitPanel.SetActive(false);
mainController.ClearTempFile();
SendQuit4GameRoom();
SceneManager.LoadScene("MainScene");
}
//取消退出
@ -546,6 +556,8 @@ namespace Assets.Scenes.Ride.Scripts
}
protected virtual void StopShortRide(BaseEventData baseEventData)
{
//发送退出房间的命令
SendQuit4GameRoom();
SceneManager.LoadScene("MainScene");
}
protected virtual void CancelStopShortRide(BaseEventData baseEventData)

31
Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
View File

@ -29,7 +29,7 @@ using System.Timers;
public class CyclingController : DeviceServiceMonoBase
{
public AbstractMap map;
public GameObject player;
public GameObject player { get; set; }
public GameObject UIObject;
public RouteResultParam selectParamModel;
public RouteResult routeResult;
@ -100,6 +100,7 @@ public class CyclingController : DeviceServiceMonoBase
competitionId = App.tempRecordData.CompetitionId;
routeId = App.tempRecordData.RouteId;
}
CreateCurrentPlayer();
Resources.UnloadUnusedAssets();
}
@ -219,10 +220,7 @@ public class CyclingController : DeviceServiceMonoBase
minicamera = transform.Find("MiniCamera").gameObject;
//进入倒计时
singleUIManager = UIObject.GetComponent<BaseUIManager>();
TrailRenderer trail = player.GetComponent<TrailRenderer>();
trail.Clear();
playerController = player.GetComponent<PlayerController>();
currentPlayer = playerController;//当前选中用户
if (competitionId > 0)
{
@ -761,6 +759,22 @@ public class CyclingController : DeviceServiceMonoBase
map.SetExtent(MapExtentType.RangeAroundTransform, options);
map.SetExtentOptions(options);
}
//根据性别创建当前骑手
private void CreateCurrentPlayer()
{
if (App.CurrentUser.Sex == 1)
{
player = Instantiate<GameObject>(Resources.Load<GameObject>("UI/Prefab/Ride/Player"),transform);
}
else
{
player = Instantiate<GameObject>(Resources.Load<GameObject>("UI/Prefab/Ride/Player_NV"), transform);
}
TrailRenderer trail = player.GetComponent<TrailRenderer>();
trail.Clear();
playerController = player.GetComponent<PlayerController>();
currentPlayer = playerController;
}
//设置骑行模式
public void SetCyclingModel(CyclingModel mode)
@ -826,7 +840,7 @@ public class CyclingController : DeviceServiceMonoBase
//设定人物方向
var s = map.GeoToWorldPosition(selectedPlayer.Currentlatlong);
var e = map.GeoToWorldPosition(nextLatLon);
Quaternion neededRotation = Quaternion.LookRotation(s - e);
Quaternion neededRotation = Quaternion.LookRotation(e - s);
selectedPlayer.transform.rotation = Quaternion.Euler(0, neededRotation.eulerAngles.y, 0);
selectedPlayer.currentRotation = neededRotation;
}
@ -840,7 +854,6 @@ public class CyclingController : DeviceServiceMonoBase
private void InitPlayer()
{
TempFileHandler();//处理中断骑行继续骑的逻辑
lockView = true;
Vector2d lastLatLon = Along(recorderData.EndDistance);
@ -858,7 +871,7 @@ public class CyclingController : DeviceServiceMonoBase
//设定人物方向
var s = map.GeoToWorldPosition(lastLatLon);
var e = map.GeoToWorldPosition(nextLatLon);
Quaternion neededRotation = Quaternion.LookRotation(s - e);
Quaternion neededRotation = Quaternion.LookRotation(e - s);
player.transform.rotation = Quaternion.Euler(0, neededRotation.eulerAngles.y, 0);
playerController.currentRotation = neededRotation;
//初始化海拔图头像位置
@ -880,7 +893,7 @@ public class CyclingController : DeviceServiceMonoBase
public BaseUIManager singleUIManager;
public void GameStart()
{
Camera.main.transform.DOLocalMove(neareast, 1f);
Camera.main.transform.DOLocalMove(near, 1f);
//StartCoroutine(MoveCamera(far, near));//初始摄像头
var check = CheckAnt();
#if UNITY_EDITOR

15
Assets/Scripts/Scenes/Ride/Scripts/InitMiniMapProvider.cs
View File

@ -20,7 +20,7 @@ namespace Assets.Scenes.Ride.Scripts
[SerializeField]
GameObject _player;
CyclingController cyclingCotroller;
public PlayerController playerController;
public PlayerController playerController { get; set; }
GameObject _mipMapRoute;
public RectTransform RectRoot;//rawImage
TrailRenderer trail;
@ -28,12 +28,9 @@ namespace Assets.Scenes.Ride.Scripts
void Start()
{
cyclingCotroller = FindObjectOfType<CyclingController>();
//playerController = FindObjectOfType<PlayerController>();
if (cyclingCotroller != null)
{
var mapdata = cyclingCotroller.GetMapData();
//初始化map
//var point = cyclingCotroller.GetCenterCoordinate();
if (_map != null && mapdata !=null)
{
_map.OnInitialized += _map_OnInitialized;
@ -57,10 +54,14 @@ namespace Assets.Scenes.Ride.Scripts
float timer = 0;
private void Update()
{
if (playerController != null)
if (playerController == null)
{
playerController = FindObjectOfType<PlayerController>();
}
else
{
var tr = uitransform.Find("MiniMap/MiniMap/arrow");
tr.SetSiblingIndex(9999);
tr.SetAsLastSibling();
var pos = _map.GeoToWorldPosition(playerController.Currentlatlong);
pos.y += 15f;
_player.transform.localPosition = pos;
@ -105,10 +106,8 @@ namespace Assets.Scenes.Ride.Scripts
}
}
private bool init = false;
private void _map_OnInitialized()
{
init = true;
var visualizer = _map.MapVisualizer;
visualizer.OnMapVisualizerStateChanged += (s) =>
{

4
Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs
View File

@ -42,9 +42,9 @@ namespace Assets.Scenes.Ride.Scripts
{
if (App.gameRoomDetail != null)
{
loadingPanel = panel.transform.Find("LoadingPanel").gameObject;
loadingPanel.showLoadingExtension();
ShowGameRoomLoading();
loadingPanel = panel.transform.Find("LoadingPanel").gameObject;
loadingPanel.showLoadingExtension();
}
}
private void ShowGameRoomLoading()

6
Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs
View File

@ -20,7 +20,6 @@ namespace Assets.Scenes.Ride.Scripts
}
parent = scroll.transform.Find("Viewport/Content");
cyclingController = FindObjectOfType<CyclingController>();
playerController = FindObjectOfType<PlayerController>();
#if UNITY_IOS || UNITY_ANDROID
nearByItem = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/NearbyItem");
nearByMajorItem = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/NearbyMajorItem");
@ -34,6 +33,11 @@ namespace Assets.Scenes.Ride.Scripts
}
protected override void CreateList()
{
if (playerController == null)
{
playerController = FindObjectOfType<PlayerController>();
return;
}
var roomId = cyclingController.cyclingController == null ? 0 : cyclingController.cyclingController.recorderData.RoomId;
OnlineUserNum.text = " "+ MapUDPService.GetNearRiderCount(roomId).ToString();
LayoutRebuilder.ForceRebuildLayoutImmediate(OnlineUserNum.rectTransform);

8
Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
View File

@ -56,9 +56,9 @@ namespace Assets.Scenes.Ride.Scripts
cadance = mainController.UpdateCadence();
weight = App.CurrentUser.Weight;
bicycleWeight = App.CurrentUser.BicycleWeight;
#if UNITY_EDITOR
power = 300;
#endif
//#if !UNITY_EDITOR
power = 100;
//#endif
mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
}
catch (Exception ex)
@ -113,7 +113,7 @@ namespace Assets.Scenes.Ride.Scripts
//实时计算MaxAp
//mainController.ComputeMaxAP(Power, ticks);
//实时保存骑行记录
if (ticks % 60 == 0)
if (ticks % 60 == 0 && !(mainController.cyclingController is GameModel))
{
mainController.SaveRealTime();
}

29
Assets/Scripts/Scenes/Ride/Scripts/RouteController.cs
View File

@ -67,15 +67,11 @@ namespace Assets.Scenes.Ride.Scripts
}
}
public PlayerController playerController;
public void Start()
{
cyclingCotroller = transform.parent.GetComponent<CyclingController>();
//playerController = FindObjectOfType<PlayerController>();
_map.OnTileFinished += _map_OnTileFinished;
StartCoroutine(QueryTimer());
//CreateRoute();
}
protected virtual void OnDestroy()
@ -103,32 +99,21 @@ namespace Assets.Scenes.Ride.Scripts
var mapData = cyclingCotroller.GetMapData();
if (mapData != null && cyclingCotroller.currentPlayer != null)
{
//foreach (var mapDataItem in mapData.List)
for (int i = 0; i < mapData.List.Count; i++)
{
var point = mapData.List[i].Point;
Vector3 item = _map.GeoToWorldPosition(new Vector2d(point[0], point[1]));
item.y += 1f;
//if (!posInScreen(item) && i > playerController.CurrentIndex)
//{
// break;
//}
//else if (posInScreen(item))
//{
// dat.Add(item);
//}
//前后取50个点
decimal diff = i - cyclingCotroller.currentPlayer.CurrentIndex;
decimal diffAbs = Math.Abs(diff);
if (diffAbs <= 200)
{
//if (!dat.Contains(item))
dat.Add(item);
}
if (diff <= 0 && diff > -200)
{
item.y += 0.15f;
//if (!dat.Contains(item))
path.Add(item);
}
}
@ -208,11 +193,11 @@ namespace Assets.Scenes.Ride.Scripts
lineRender.positionCount = dat.Count;
lineRender.SetPositions(feat.Points[0].ToArray());
lineRender.loop = false;
//lineRender.numCapVertices = 10;
//lineRender.numCornerVertices = 30;
lineRender.numCapVertices = 10;
lineRender.numCornerVertices = 30;
}
}
void CreatPathRoute(List<Vector3> feat)
{
@ -236,10 +221,10 @@ namespace Assets.Scenes.Ride.Scripts
lineRender.positionCount = feat.Count;
lineRender.SetPositions(feat.ToArray());
lineRender.loop = false;
//lineRender.numCapVertices = 10;
//lineRender.numCornerVertices = 10;
//
lineRender.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off;
lineRender.numCapVertices = 10;
lineRender.numCornerVertices = 30;
lineRender.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off;
lineRender.allowOcclusionWhenDynamic = false;
lineRender.textureMode = LineTextureMode.Tile;
lineRender.motionVectorGenerationMode = MotionVectorGenerationMode.ForceNoMotion;

32
Assets/Scripts/Scenes/VideoRide/AbstractVideoPlayer.cs
View File

@ -52,6 +52,10 @@ namespace Assets.Scripts.Scenes.VideoRide
Camera camera { get; set; }
float currenPlayerHeight;
Transform bone_bottle_2 { get; set; }
//切换视角
public double offsetX = 0d;
public double offsetY = 0d;
public double offsetZ = 0d;
protected virtual void Start()
{
@ -142,15 +146,25 @@ namespace Assets.Scripts.Scenes.VideoRide
{
if (animator != null)
{
animator.SetFloat("preSpeed", (float)preSpeed);
animator.SetFloat("speed", (float)speed);
animator.SetFloat("grade", (float)currentSlope);
animator.SetFloat("power", (float)power);
//播放喝水和回头的动画
var headBack = ticks % 60 == 0 && speed > 0;
var drink = ticks % 125 == 0 && speed > 0;
animator.SetBool("headBack", headBack);
animator.SetBool("drinking", drink);
if (manager._viewMode == VideoGameManager.ViewMode.FIRST &&manager.CurrentPlayer.UserId == App.CurrentUser.Id)
{
animator.SetFloat("preSpeed", (float)preSpeed);
animator.SetFloat("speed", (float)Math.Min(speed,30));
animator.SetFloat("grade", (float)currentSlope);
animator.SetFloat("power", (float)power);
}
else
{
animator.SetFloat("preSpeed", (float)preSpeed);
animator.SetFloat("speed", (float)speed);
animator.SetFloat("grade", (float)currentSlope);
animator.SetFloat("power", (float)power);
//播放喝水和回头的动画
var headBack = ticks % 60 == 0 && speed > 0;
var drink = ticks % 125 == 0 && speed > 0;
animator.SetBool("headBack", headBack);
animator.SetBool("drinking", drink);
}
}
}
protected virtual int GetCurrentFrame()

3
Assets/Scripts/Scenes/VideoRide/NearByScript.cs
View File

@ -59,7 +59,8 @@ namespace Assets.Scripts.Scenes.VideoRide
{
timer -= Time.deltaTime;
while (timer < 0) {
rideNum.text = $"{MapUDPService.GetAllOnlineUserCount()}";
var list = MapUDPService.GetOnlineUsers(App.RouteIdParam);//最新列表
rideNum.text = $"{list.Count}";
btnRideNum.text = rideNum.text;
if (manager._aRMode == VideoGameManager.ARMode.RIDE)
{

12
Assets/Scripts/Scenes/VideoRide/OnlineVideoPlayer.cs
View File

@ -22,11 +22,11 @@ namespace Assets.Scripts.Scenes.VideoRide
protected override void Update()
{
base.Update();
//如果当前用户是被观察则控制视频播放
if (manager.CurrentPlayer.UserId == UserId)
{
manager.Play(manager.CurrentPlayer.totalDistance);
}
////如果当前用户是被观察则控制视频播放
//if (manager.CurrentPlayer.UserId == UserId)
//{
// manager.Play(manager.CurrentPlayer.totalDistance);
//}
}
//计算
@ -55,6 +55,8 @@ namespace Assets.Scripts.Scenes.VideoRide
protected override void Turn()
{
base.Turn();
if (manager.CurrentPlayer.UserId == UserId)
return;
//计算前后位移
var current = manager.CurrentPlayer;
var interval = this.currentFrame - manager.GetCurrentFrame();

2
Assets/Scripts/Scenes/VideoRide/StickyListItem.cs
View File

@ -29,7 +29,7 @@ namespace Assets.Scripts.Scenes.VideoRide
if (videoPlayer != null)
{
nameLabel.text = videoPlayer.UserName;
distanceLabel.text = videoPlayer.totalDistance.ToString("f1");
distanceLabel.text = "0M";///videoPlayer.totalDistance.ToString("f1");
Id = videoPlayer.UserId.ToString();
}
timer += 1f;

38
Assets/Scripts/Scenes/VideoRide/VideoGameManager.cs
View File

@ -87,6 +87,14 @@ namespace Assets.Scripts.Scenes.VideoRide
RIDE,
INSPECT
}
public enum ViewMode
{
THIRD,
FIRST,
}
//当前是第一人称还是第三人称
public ViewMode _viewMode { get; set; }
//当前是观察者视角还是骑行者视角
public ARMode _aRMode { get; set; }
public int RankingId { get; set; }
@ -281,17 +289,25 @@ namespace Assets.Scripts.Scenes.VideoRide
SetCyclingModel(CyclingModel.Single);
}
}
GameObject videoPlayer;
//初始化人物模型
public void InitCurrentPlayer()
{
GameObject videoPlayer;
//初始化位置
var firstpoint = mockDirection.FirstOrDefault();
//videoPlayer.transform.DOMove(, 0);
var p = new Vector3(firstpoint.PositionX, firstpoint.PositionY, firstpoint.PositionZ);
if (App.CurrentUser.Sex == 1)
{
videoPlayer = Instantiate(Resources.Load<GameObject>("UI/Prefab/AR/VidePlayer"),transform);
var playerprefab = Resources.Load<GameObject>("UI/Prefab/AR/VidePlayer");
playerprefab.transform.position = p;
videoPlayer = Instantiate(playerprefab, transform);
}
else
{
videoPlayer = Instantiate(Resources.Load<GameObject>("UI/Prefab/AR/VidePlayer_NV"), transform);
var playerprefabNV = Resources.Load<GameObject>("UI/Prefab/AR/VidePlayer_NV");
playerprefabNV.transform.position = p;
videoPlayer = Instantiate(playerprefabNV, transform);
}
CurrentPlayer = videoPlayer.GetComponent<VideoPlayer>();
}
@ -371,9 +387,9 @@ namespace Assets.Scripts.Scenes.VideoRide
private void MockDirection()
{
//var arr = mapRoute.ARConfig.Replace("\r\n", " ").Split(' ');
var text = Resources.Load<TextAsset>("UI/direction");
var arr = text.text.Replace("\r\n", " ").Split(' ');
var arr = mapRoute.ARConfig.Replace("\r\n", " ").Split(' ');
//var text = Resources.Load<TextAsset>("UI/direction");
//var arr = text.text.Replace("\r\n", " ").Split(' ');
foreach (var item in arr)
{
if (string.IsNullOrEmpty(item))
@ -433,7 +449,7 @@ namespace Assets.Scripts.Scenes.VideoRide
//设置当前视频播放速度
public void Play(double totalDistance)
{
if (!isStart)
if (!isStart && _aRMode == ARMode.RIDE)
return;
if (mediaPlayer != null)
{
@ -455,14 +471,6 @@ namespace Assets.Scripts.Scenes.VideoRide
{
isStart = !isStart;
isStop = !isStop;
//if (isStop)
//{
// mediaPlayer?.Pause();
//}
//else
//{
// mediaPlayer?.Play();
//}
}
//退出骑行
public void Quit()

2
Assets/Scripts/Scenes/VideoRide/VideoLoading.cs
View File

@ -117,7 +117,7 @@ namespace Assets.Scripts.Scenes.VideoRide
if (File.Exists(filepath))
{
watch.SetActive(true);
//TODO:暂时隐藏watch.SetActive(true);
slider.value = 100;
download.gameObject.SetActive(false);
manager.SetMedia(filepath);

18
Assets/Scripts/Scenes/VideoRide/VideoPlayer.cs
View File

@ -57,10 +57,13 @@ namespace Assets.Scripts.Scenes.VideoRide
{
base.Turn();
//控制人物的前后左右
var l = new Vector3(pre.PositionX, pre.PositionY, pre.PositionZ);
var s = new Vector3(next.PositionX, next.PositionY, next.PositionZ);
var pos = Vector3.Lerp(l, s, t);
transform.DOMove(pos, 0);
if (manager._viewMode != VideoGameManager.ViewMode.FIRST)
{
var l = new Vector3(pre.PositionX, pre.PositionY, pre.PositionZ);
var s = new Vector3(next.PositionX, next.PositionY, next.PositionZ);
var pos = Vector3.Lerp(l, s, t);
transform.DOMove(pos, 0);
}
//控制光线
var z = new Vector3(50, pre.LightY, 0);
var c = new Vector3(50, next.LightY, 0);
@ -72,11 +75,11 @@ namespace Assets.Scripts.Scenes.VideoRide
heartRate = manager.UpDateHeart();
power = manager.UpdatePower();
cadance = manager.UpdateCadence();
#if UNITY_EDITOR
//#if !UNITY_EDITOR
power = 280;
cadance = 70;
heartRate = 160;
#endif
//#endif
weight = App.CurrentUser.Weight;
bicycleWeight = App.CurrentUser.BicycleWeight;
wkg = Math.Round(power / weight, 2);
@ -84,7 +87,7 @@ namespace Assets.Scripts.Scenes.VideoRide
var result = manager.mockDirection.Where(c => c.Start < mainFrame && c.End > mainFrame).FirstOrDefault();
bearing = result?.RotationY ?? 0;
//发送阻力
manager.TrackResistance(currentSlope);
manager.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
base.ComputePlayer();
//比人先完成触发关门时间
HandleForGameRoom();
@ -116,6 +119,7 @@ namespace Assets.Scripts.Scenes.VideoRide
protected override void ComputeRecord()
{
var mapData = manager.GetMapData();
//Debug.Log($"ticks:{manager.GetCurrentFrame()}:{manager.GetMapData().List[currentIndex].Elevation}");
//Debug.Log($"ticks:{ticks}-{manager.GetCurrentFrame()}-endistance:{totalDistance}-totalDistance:{mapData.TotalDistance}-index:{currentIndex}-speed:{speed}-currentSlope:{currentSlope}-GetCurrentFrame:{manager.GetCurrentFrame()}-currentlatLon:{bearing}");
//记录骑行数据
var recorderData = manager.cyclingController.recorderData;

37
Assets/Scripts/Scenes/VideoRide/VideoUIManager.cs
View File

@ -6,6 +6,7 @@ using UnityEngine.UI;
using DG.Tweening;
using UnityEngine.SceneManagement;
using Assets.Scenes.Ride.Scripts.Model.CyclingModels;
using static Assets.Scripts.Scenes.VideoRide.VideoGameManager;
namespace Assets.Scripts.Scenes.VideoRide
{
@ -31,7 +32,7 @@ namespace Assets.Scripts.Scenes.VideoRide
Image left { get; set; }
Image right { get; set; }
//ToolBarPanel
GameObject pauseBtn { get; set; }
GameObject settingBtn { get; set; }
GameObject deviceBtn { get; set; }
GameObject changeViewBtn { get; set; }
GameObject quitBtn { get; set; }
@ -50,14 +51,7 @@ namespace Assets.Scripts.Scenes.VideoRide
GameObject ftpPanel { get; set; }
Image ftpImage { get; set; }
Text wkg { get; set; }
public enum ViewMode
{
THIRD,
FIRST,
}
//当前是第一人称还是第三人称
public ViewMode _viewMode { get; set; }
// Start is called before the first frame update
void Start()
{
@ -83,7 +77,7 @@ namespace Assets.Scripts.Scenes.VideoRide
heartRate.text = Math.Round((manager.CurrentPlayer.heartRate ?? 0d)).ToString();
cadance.text = Math.Round(manager.CurrentPlayer.cadance).ToString();
playerTimer.text = Helper.FormatTicks(manager.CurrentPlayer.ticks);
distance.text = $"{Math.Round((manager.CurrentPlayer.totalDistance))}KM";
distance.text = $"{Math.Round((manager.CurrentPlayer.totalDistance),2)}KM";
left.fillAmount = (float)(Math.Round(manager.CurrentPlayer.power) / MAXPOWER_RATE);
right.fillAmount = (float)(Math.Round((manager.CurrentPlayer.heartRate ?? 0f)) / MAXHEARRATE);
SetSlopePanel();
@ -123,7 +117,7 @@ namespace Assets.Scripts.Scenes.VideoRide
left = transform.Find("Panel/ComputerPanel/Left").GetComponent<Image>();
right = transform.Find("Panel/ComputerPanel/Right").GetComponent<Image>();
//ToolBarPanel
pauseBtn = transform.Find("Panel/ToolBarPanel/StartOrPauseButton").gameObject;
settingBtn = transform.Find("Panel/ToolBarPanel/SettingButton").gameObject;
quitBtn = transform.Find("Panel/ToolBarPanel/ExitButton").gameObject;
changeViewBtn = transform.Find("Panel/ToolBarPanel/ChangeView").gameObject;
deviceBtn = transform.Find("Panel/ToolBarPanel/DeviceButton").gameObject;
@ -145,7 +139,7 @@ namespace Assets.Scripts.Scenes.VideoRide
//
explosive = transform.Find("Panel/Explosive").gameObject;
//toolbar 事件注册
UIManager.AddEvent(pauseBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, PauseClick);
UIManager.AddEvent(settingBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, PauseClick);
UIManager.AddEvent(changeViewBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, ChangeViewClick);
UIManager.AddEvent(deviceBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, DeviceClick);
UIManager.AddEvent(quitBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, QuitClick);
@ -188,7 +182,8 @@ namespace Assets.Scripts.Scenes.VideoRide
private void PauseClick(BaseEventData e)
{
manager.Pause();
settingPanel.SetActive(true);
settingPanel.transform.SetAsLastSibling();
}
private void DeviceClick(BaseEventData e)
{
@ -201,26 +196,18 @@ namespace Assets.Scripts.Scenes.VideoRide
var nearByScript = FindObjectOfType<NearByScript>();
var rankingScript = FindObjectOfType<RankingScript>();
var currentPlayer = manager.CurrentPlayer == null ? videoPlayer.transform : manager.CurrentPlayer.transform;
_viewMode = _viewMode == ViewMode.THIRD ? ViewMode.FIRST : ViewMode.THIRD;
manager._viewMode = manager._viewMode == ViewMode.THIRD ? ViewMode.FIRST : ViewMode.THIRD;
var cameraImage = changeViewBtn.transform.Find("Camera").gameObject;
if (_viewMode == ViewMode.FIRST)
if (manager._viewMode == ViewMode.FIRST)
{
currentPlayer.DOMoveZ(-0.09f, 0f);
currentPlayer.DOMoveX(0f, 0f);
currentPlayer.DOMoveZ(-0.1f, 0f);
currentPlayer.DOMoveY(-0.85f, 0f);
ftpPanel.SetActive(true);
nearByScript.Hidehandler(null);
rankingScript.Hidehandler(null);
cameraImage.SetActive(true);
}
else
{
ftpPanel.SetActive(false);
currentPlayer.DOMoveZ(4, 0f);
currentPlayer.DOMoveY(-1f, 0f);
nearByScript.Showhandler(null);
rankingScript.Showhandler(null);
cameraImage.SetActive(false);
}
}
public void ShowResultPanel()

37
Assets/Scripts/UI/Prefab/Activity/ActivityAdController.cs
View File

@ -1,13 +1,18 @@
using Assets.Scripts;
using Assets.Scripts.Apis.Models;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class ActivityAdController : PFUIPanel
{
Dictionary<string, Texture> caches;
private int activityType = 0;//0:内置网页 1：骑行 2:赛事
private int routeId = 0;
private int competitionId = 0;
protected override void Awake()
{
caches = new Dictionary<string, Texture>();
@ -22,6 +27,23 @@ public class ActivityAdController : PFUIPanel
UIManager.AddEvent(transform.Find("Image").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, async b =>
{
Close();
if (activityType == 1)
{
App.RouteIdParam = routeId;
var routeRes = ConfigHelper.mapApi.GetById(routeId);
if (routeRes.result)
{
if (routeRes.data.EnableAR)
{
SceneManager.LoadScene("VideoPlay");
}
else
{
SceneManager.LoadScene("Ride");
}
}
return;
}
//可以传参
//UIManager.ShowActivityPanel(url);
await ConfigHelper.activityApi.JoinActivity(id);
@ -44,18 +66,22 @@ public class ActivityAdController : PFUIPanel
private void ShowSelf()
{
var ad = App.adQueue.Dequeue();
UIManager.ShowActivityAdPanel(ad.Id, ad.DetailUrl, ad.Url + $"?Token={App.CurrentUser.cookie}");
ad.Url = ad.Url + $"?Token={App.CurrentUser.cookie}";
UIManager.ShowActivityAdPanel(ad);
}
string image = null, url = null;
int id = 0;
public void Initial(int id, string image, string url)
public void Initial(ActivityModel activity)
{
this.id = id;
this.image = image;
this.id = activity.Id;
this.image = activity.DetailUrl;
var ri = transform.Find("Image").GetComponent<RawImage>();
Utils.DisplayImageTempDict(ri, image, caches);
App.ActivityUrl = url;
this.url = url;
this.url = activity.Url;
this.activityType = activity.ActivityType;
this.routeId = activity.RouteId;
this.competitionId = activity.CompetitionId;
}
// Update is called once per frame
void Update()
@ -66,6 +92,5 @@ public class ActivityAdController : PFUIPanel
{
caches = null;
Resources.UnloadUnusedAssets();
GC.Collect();
}
}

13
Assets/Scripts/UI/Prefab/GameRoom/GameRoomCell.cs
View File

@ -77,6 +77,19 @@ public class GameRoomCell : MonoBehaviour, ICell, IBeginDragHandler, IDragHandle
UIManager.AddEvent(gameObject, EventTriggerType.PointerEnter,OnEnter);
UIManager.AddEvent(gameObject, EventTriggerType.PointerExit, OnExit);
UIManager.AddEvent(JoinBtn, EventTriggerType.PointerClick, JoinGameRoom);
//对战正在进行
UIManager.AddEvent(gameObject, EventTriggerType.PointerClick, (e) =>
{
if (gameRoom.Status == 1)
{
manager.ShowCycingPanel(gameRoom);
}
else if (gameRoom.Status == 2)
{
manager.ShowDonePanel(gameRoom.RoomId);
}
});
//对战正在进行
UIManager.AddEvent(CycingBtn, EventTriggerType.PointerClick, (e) =>
{

4
Assets/Scripts/UI/Prefab/GameRoom/GameRoomResult.cs
View File

@ -39,6 +39,10 @@ public class GameRoomResult : MonoBehaviour
private void Awake()
{
manager = FindObjectOfType<CyclingController>();
//if (manager == null)
//{
// manager = FindObjectOfType<VideoGameManager>();
//}
var closeBtn = transform.Find("Close").gameObject;
Head = transform.Find("Mine/Head").GetComponent<RawImage>();
Ranking = transform.Find("Mine/Ranking").GetComponent<Text>();

1
Assets/Scripts/UI/Prefab/MapList/MapItem.cs
View File

@ -35,6 +35,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
//[SerializeField] RawImage rawImage;
void Start()
{
transform.Find("CollectImg").gameObject.SetActive(false);
}
// Update is called once per frame

1
Assets/Scripts/UI/Prefab/Panel/GameRoomDetailController.cs
View File

@ -237,6 +237,7 @@ public class GameRoomDetailController : PFUIPanel
{
//路线
App.RouteIdParam = GameRoom.MapRouteId;
App.MainSceneParam["Name"] = "GameRoomList";
if (GameRoom.EnableAR)
{
SceneManager.LoadScene("VideoPlay");

55
Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs
View File

@ -96,6 +96,8 @@ public class GameRoomListController : PFUIPanel
[SerializeField]
GameObject _downLoadTask;
[SerializeField]
GameObject _avatar;
private GameObject RoomCell { get; set; }
@ -126,12 +128,18 @@ public class GameRoomListController : PFUIPanel
Query();
});
UIManager.AddEvent(_searchBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, SearchBtn_Click);
UIManager.AddEvent(_avatar, UnityEngine.EventSystems.EventTriggerType.PointerClick, AvatarBtn_Click);
}
private void SearchBtn_Click(BaseEventData data)
{
pageHelper.PageIndex = 0;
Query();
}
private void AvatarBtn_Click(BaseEventData data)
{
UIManager.ShowUserInfoPanel();
}
private void Query()
{
MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, pageHelper.PageIndex, pageHelper.PageSize, seachName);
@ -494,7 +502,7 @@ public class GameRoomListController : PFUIPanel
Query();
});
}
InputField hourInputField, minInputField;
private void InitStep2()
{
//关门时间
@ -510,8 +518,8 @@ public class GameRoomListController : PFUIPanel
btn5 = right2.transform.Find("btn5").gameObject;
btn6 = right2.transform.Find("btn6").gameObject;
//房间名和密码
var hourInputField = right2.transform.Find("HourInputField").GetComponent<InputField>();
var minInputField = right2.transform.Find("MinInputField").GetComponent<InputField>();
hourInputField = right2.transform.Find("HourInputField").GetComponent<InputField>();
minInputField = right2.transform.Find("MinInputField").GetComponent<InputField>();
var roomNameInputField = right2.transform.Find("RoomNameInputField").GetComponent<InputField>();
var passwordInputField = right2.transform.Find("PasswordInputField").GetComponent<InputField>();
btnMore.SetActive(true);
@ -539,7 +547,7 @@ public class GameRoomListController : PFUIPanel
Roompwd = e;
HandleFormInput();
});
UIManager.AddEvent(minInputField.gameObject, EventTriggerType.Select, (e) => {
hourInputField.GetComponent<Outline>().enabled = true;
HandleFormInput();
@ -563,6 +571,7 @@ public class GameRoomListController : PFUIPanel
UIManager.AddEvent(btnMore, EventTriggerType.PointerClick, (e) =>
{
btnMore.SetActive(false);
HandleCloseTimeBtnClick(0, hourInputField.name);
hourInputField.gameObject.SetActive(true);
minInputField.gameObject.SetActive(true);
});
@ -571,13 +580,23 @@ public class GameRoomListController : PFUIPanel
hourInputField.onValueChanged.AddListener((e) => {
hours = Convert.ToInt32(e);
CloseTime = hours * 60 + mins;
ValidateCloseTime(hours, CloseTime);
HandleCloseTimeBtnClick(CloseTime, hourInputField.name);
});
//分钟
minInputField.onValueChanged.RemoveAllListeners();
UIManager.AddEvent(minInputField.gameObject, EventTriggerType.PointerClick, (e) =>
{
HandleCloseTimeBtnClick(CloseTime, minInputField.name);
});
UIManager.AddEvent(hourInputField.gameObject, EventTriggerType.PointerClick, (e) =>
{
HandleCloseTimeBtnClick(CloseTime, hourInputField.name);
});
minInputField.onValueChanged.AddListener((e) => {
mins = Convert.ToInt32(e);
CloseTime = hours * 60 + mins;
ValidateCloseTime(hours, CloseTime);
HandleCloseTimeBtnClick(CloseTime, minInputField.name);
});
@ -604,6 +623,22 @@ public class GameRoomListController : PFUIPanel
HandleMembersBtnClick(6, btn6.name);
});
}
private bool ValidateCloseTime(int value,int closeTime)
{
bool result = true;
if (value < 0)
{
result = false;
Utils.showToast(gameObject, App.GetLocalString("cannot be negative!"));
}
if (closeTime > 120)
{
result = false;
Utils.showToast(gameObject, App.GetLocalString("closetime cannot over 120 minutes!"));
}
return result;
}
private void HandleStepBtn(string btnName)
{
next.SetActive(btnName == previous.name);
@ -620,7 +655,7 @@ public class GameRoomListController : PFUIPanel
}
private void HandleFormInput()
{
if (Members >= 2 && !string.IsNullOrEmpty(RoomName) && CloseTime > 0)
if (Members >= 2 && !string.IsNullOrEmpty(RoomName) && CloseTime > 0 && CloseTime < 120)
{
create.GetComponent<Image>().color = PFConstants.Pink;
create.transform.Find("Text").GetComponent<Text>().color = Color.white;
@ -639,6 +674,14 @@ public class GameRoomListController : PFUIPanel
}
private void HandleCloseTimeBtnClick(int closeTime, string btnName)
{
if (btnName != "MinInputField" && btnName != "HourInputField")
{
hourInputField.text = "0";
minInputField.text = "0";
hourInputField.gameObject.SetActive(false);
minInputField.gameObject.SetActive(false);
btnMore.SetActive(true);
}
ColorUtility.TryParseHtmlString("#3D3E4D", out Color grey);
ColorUtility.TryParseHtmlString("#F93086", out Color pink);
CloseTime = closeTime;
@ -865,7 +908,7 @@ public class GameRoomListController : PFUIPanel
private async void GetList()
{
if (isEnd) return;
var res = await ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname, distance, string.Join(",", hands), is3d, sort, sortDire, isEnableAR:false);//isEnableAR TODO:临时禁用AR地图
var res = await ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname, distance, string.Join(",", hands), is3d, sort, sortDire, isEnableAR:false, isEnableBattle: true);
if (res.result)
{
if (res.data.Count == 0)

9
Assets/Scripts/UI/Prefab/Panel/NewHomeController.cs
View File

@ -57,10 +57,11 @@ public class NewHomeController : PFUIPanel
mainNav = this.transform.Find("MainNav").GetComponent<MainNav>();
mainNav.ShowExit();
UIManager.AddEvent(transform.Find("TodayData/ChangePlayerBtn").gameObject, EventTriggerType.PointerClick, b =>
{
UIManager.ShowChangePlayerPanel();
});
//TODO:换装功能还未完善先注释功能
//UIManager.AddEvent(transform.Find("TodayData/ChangePlayerBtn").gameObject, EventTriggerType.PointerClick, b =>
//{
// UIManager.ShowChangePlayerPanel();
//});
BtnBattle = BtnContainer.Find("BtnBattle");
UIManager.AddEvent(BtnBattle.gameObject, EventTriggerType.PointerClick, GoGameRoom);
UIManager.AddEvent(BtnBattle.gameObject, EventTriggerType.PointerEnter, OnHover);

4
Assets/Scripts/UIManager.cs
View File

@ -405,9 +405,9 @@ public class UIManager : MonoBehaviour
return this.GetPanelInstance("ActivityAdPanel", ref this.mActivityAdController);
}
}
public static void ShowActivityAdPanel(int id, string image, string url)
public static void ShowActivityAdPanel(ActivityModel activity)
{
UIManager.Instance.ActivityAdController.GetComponent<ActivityAdController>().Initial(id, image, url);
UIManager.Instance.ActivityAdController.GetComponent<ActivityAdController>().Initial(activity);
UIManager.Show(UIManager.Instance.ActivityAdController, null, true);
}
//收货地址

10
Assets/Scripts/Utils/Loom.cs
View File

@ -164,4 +164,14 @@ public class Loom : MonoBehaviour
}
}
public static void Dispose()
{
if (_current != null)
{
initialized = false;
DestroyImmediate(_current.gameObject);
_current = null;
}
}
}

2
ProjectSettings/UnityConnectSettings.asset
View File

@ -9,6 +9,8 @@ UnityConnectSettings:
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
m_ConfigUrl: https://config.uca.cloud.unity3d.com
m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events
m_CNConfigUrl: https://cdp.cloud.unity.cn/config
m_TestInitMode: 0
CrashReportingSettings:
m_EventUrl: https://perf-events.cloud.unity.cn