Commit 6574433a authored by maxiaoliang's avatar maxiaoliang

修改问题

parent 71000362
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: level_update
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2
guid: 8334e3fe9998c42f696c50eae3b0d6d5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-2221667577142781020
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: level_update
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c26ad77181ed14c149a93e47df56517e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: light1
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 6419939839929279784}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1817442040195836821
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: nomal
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &6419939839929279784
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2221667577142781020}
m_Position: {x: 290, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: 1817442040195836821}
m_Position: {x: 350, y: 110, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1817442040195836821}
fileFormatVersion: 2
guid: bb07c6266280e479988df2971a26f93d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: c26ad77181ed14c149a93e47df56517e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b906fc0b592f44a68aa2e740c51aeaeb
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &220613344382917427
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3383051787489234722}
- component: {fileID: 5714053488270774662}
- component: {fileID: 4408607590086360934}
- component: {fileID: 6735109984255279607}
- component: {fileID: 1577999915622880501}
m_Layer: 5
m_Name: light1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3383051787489234722
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220613344382917427}
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: 2398796921380492884}
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: 210, y: 457}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5714053488270774662
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220613344382917427}
m_CullTransparentMesh: 0
--- !u!114 &4408607590086360934
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220613344382917427}
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: 0}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b21c5fee3159442f1acc1fc724965815, 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!114 &6735109984255279607
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220613344382917427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8baf80a0c31a84971bd127a9c8a0babf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!95 &1577999915622880501
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220613344382917427}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: bb07c6266280e479988df2971a26f93d, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &455528766983709153 --- !u!1 &455528766983709153
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -233,6 +340,7 @@ RectTransform: ...@@ -233,6 +340,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 2985811221824287939}
- {fileID: 455528768893061781} - {fileID: 455528768893061781}
- {fileID: 259696605779131939} - {fileID: 259696605779131939}
- {fileID: 455528767847454826} - {fileID: 455528767847454826}
...@@ -725,7 +833,7 @@ RectTransform: ...@@ -725,7 +833,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 455528767290619777} m_Father: {fileID: 455528767290619777}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -1326,6 +1434,7 @@ MonoBehaviour: ...@@ -1326,6 +1434,7 @@ MonoBehaviour:
CarName: {fileID: 455528768869102777} CarName: {fileID: 455528768869102777}
guang: {fileID: 3879264199707281495} guang: {fileID: 3879264199707281495}
bian: {fileID: 7806476887536258262} bian: {fileID: 7806476887536258262}
light1: {fileID: 4408607590086360934}
progressBarImg: {fileID: 455528767669848398} progressBarImg: {fileID: 455528767669848398}
fruitTimeTv: {fileID: 455528768568571532} fruitTimeTv: {fileID: 455528768568571532}
--- !u!114 &3603921452413514014 --- !u!114 &3603921452413514014
...@@ -1385,7 +1494,7 @@ RectTransform: ...@@ -1385,7 +1494,7 @@ RectTransform:
- {fileID: 455528767669848399} - {fileID: 455528767669848399}
- {fileID: 455528768568571533} - {fileID: 455528768568571533}
m_Father: {fileID: 455528767290619777} m_Father: {fileID: 455528767290619777}
m_RootOrder: 6 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -1471,7 +1580,7 @@ RectTransform: ...@@ -1471,7 +1580,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 455528767290619777} m_Father: {fileID: 455528767290619777}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -1791,7 +1900,7 @@ RectTransform: ...@@ -1791,7 +1900,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 455528767290619777} m_Father: {fileID: 455528767290619777}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -1866,7 +1975,7 @@ RectTransform: ...@@ -1866,7 +1975,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 455528767290619777} m_Father: {fileID: 455528767290619777}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -1964,7 +2073,7 @@ RectTransform: ...@@ -1964,7 +2073,7 @@ RectTransform:
- {fileID: 8758704712556509915} - {fileID: 8758704712556509915}
- {fileID: 2950162160294252860} - {fileID: 2950162160294252860}
m_Father: {fileID: 455528767290619777} m_Father: {fileID: 455528767290619777}
m_RootOrder: 3 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -2107,7 +2216,7 @@ RectTransform: ...@@ -2107,7 +2216,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1441305568589058748} - {fileID: 1441305568589058748}
m_Father: {fileID: 455528767290619777} m_Father: {fileID: 455528767290619777}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -3111,14 +3220,13 @@ RectTransform: ...@@ -3111,14 +3220,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3621470817883655587} m_GameObject: {fileID: 3621470817883655587}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 3231836307049436765} - {fileID: 3231836307049436765}
- {fileID: 2985811221824287939}
m_Father: {fileID: 3675828155254899034} m_Father: {fileID: 3675828155254899034}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -3400,8 +3508,9 @@ RectTransform: ...@@ -3400,8 +3508,9 @@ RectTransform:
m_Children: m_Children:
- {fileID: 5797253806410612721} - {fileID: 5797253806410612721}
- {fileID: 6947629026041755111} - {fileID: 6947629026041755111}
- {fileID: 3204179862502384081}
- {fileID: 8427849856264495514} - {fileID: 8427849856264495514}
- {fileID: 3204179862502384081}
- {fileID: 2398796921380492884}
m_Father: {fileID: 455528768202490615} m_Father: {fileID: 455528768202490615}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -3922,6 +4031,42 @@ MonoBehaviour: ...@@ -3922,6 +4031,42 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: +100 m_Text: +100
--- !u!1 &7114791484059538736
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2398796921380492884}
m_Layer: 5
m_Name: update_level
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2398796921380492884
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7114791484059538736}
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: 3383051787489234722}
m_Father: {fileID: 3675828155254899034}
m_RootOrder: 4
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: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7229797777484960618 --- !u!1 &7229797777484960618
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4027,12 +4172,12 @@ RectTransform: ...@@ -4027,12 +4172,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7806476887536258262} m_GameObject: {fileID: 7806476887536258262}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 3204179862502384081} m_Father: {fileID: 455528767290619777}
m_RootOrder: 1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -4280,7 +4425,7 @@ RectTransform: ...@@ -4280,7 +4425,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 8312206044161418702} - {fileID: 8312206044161418702}
m_Father: {fileID: 3675828155254899034} m_Father: {fileID: 3675828155254899034}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
......
...@@ -6734,7 +6734,7 @@ MonoBehaviour: ...@@ -6734,7 +6734,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 0
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
...@@ -8750,7 +8750,7 @@ Transform: ...@@ -8750,7 +8750,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 357337980} m_GameObject: {fileID: 357337980}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -24.49, y: 21.3, z: 0} m_LocalPosition: {x: -44.4, y: 15.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -9112,17 +9112,17 @@ RectTransform: ...@@ -9112,17 +9112,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 376648356} m_GameObject: {fileID: 376648356}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 2125038054} m_Father: {fileID: 2125038054}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 650, y: 1234} m_SizeDelta: {x: 750, y: 3000}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &376648358 --- !u!114 &376648358
MonoBehaviour: MonoBehaviour:
...@@ -9137,7 +9137,7 @@ MonoBehaviour: ...@@ -9137,7 +9137,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.5019608} m_Color: {r: 0, g: 0, b: 0, a: 0.5254902}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
...@@ -10449,10 +10449,10 @@ RectTransform: ...@@ -10449,10 +10449,10 @@ RectTransform:
m_Father: {fileID: 300181109} m_Father: {fileID: 300181109}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 93.36, y: -45.84} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 126.72, y: 31.68} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &409306806 --- !u!114 &409306806
MonoBehaviour: MonoBehaviour:
...@@ -17881,7 +17881,7 @@ Canvas: ...@@ -17881,7 +17881,7 @@ Canvas:
m_SortingBucketNormalizedSize: 0 m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 1 m_SortingOrder: -1
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!224 &714966653 --- !u!224 &714966653
RectTransform: RectTransform:
...@@ -22014,7 +22014,7 @@ MonoBehaviour: ...@@ -22014,7 +22014,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 0
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
...@@ -36167,6 +36167,7 @@ GameObject: ...@@ -36167,6 +36167,7 @@ GameObject:
- component: {fileID: 1528497812} - component: {fileID: 1528497812}
- component: {fileID: 1528497814} - component: {fileID: 1528497814}
- component: {fileID: 1528497813} - component: {fileID: 1528497813}
- component: {fileID: 1528497815}
m_Layer: 5 m_Layer: 5
m_Name: Image m_Name: Image
m_TagString: Untagged m_TagString: Untagged
...@@ -36232,6 +36233,60 @@ CanvasRenderer: ...@@ -36232,6 +36233,60 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1528497811} m_GameObject: {fileID: 1528497811}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &1528497815
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1528497811}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1528497813}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2012954741}
m_MethodName: JumpSetting
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &1531241508 --- !u!1 &1531241508
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -42972,10 +43027,10 @@ RectTransform: ...@@ -42972,10 +43027,10 @@ RectTransform:
m_Father: {fileID: 300181109} m_Father: {fileID: 300181109}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 30, y: -97.04} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30.720001} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1853878469 --- !u!114 &1853878469
MonoBehaviour: MonoBehaviour:
...@@ -45073,6 +45128,7 @@ MonoBehaviour: ...@@ -45073,6 +45128,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
music: {fileID: 2012954742} music: {fileID: 2012954742}
btnAudio: {fileID: 8300000, guid: d689a50c283384dfd97e11d035c9c911, type: 3} btnAudio: {fileID: 8300000, guid: d689a50c283384dfd97e11d035c9c911, type: 3}
speedAudio: {fileID: 8300000, guid: b906fc0b592f44a68aa2e740c51aeaeb, type: 3}
musicOpenIcon: {fileID: 2134061596} musicOpenIcon: {fileID: 2134061596}
musicCloseIcon: {fileID: 1867138965} musicCloseIcon: {fileID: 1867138965}
--- !u!114 &2012954744 --- !u!114 &2012954744
...@@ -48435,7 +48491,7 @@ Transform: ...@@ -48435,7 +48491,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2132775647} m_GameObject: {fileID: 2132775647}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalPosition: {x: 0.9, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -28,6 +28,7 @@ public class CarPresenter : CarContract.Presenter ...@@ -28,6 +28,7 @@ public class CarPresenter : CarContract.Presenter
{ {
mView.ShowFlyClock(bean.reduceMinute, (int)bean.incrCoin); mView.ShowFlyClock(bean.reduceMinute, (int)bean.incrCoin);
} }
mView.CarInfo(bean.parkingSpaceData); mView.CarInfo(bean.parkingSpaceData);
} }
else else
...@@ -88,7 +89,9 @@ public class CarPresenter : CarContract.Presenter ...@@ -88,7 +89,9 @@ public class CarPresenter : CarContract.Presenter
if (bean.status == 1) { if (bean.status == 1) {
Guide.guide.onClickStep2(); Guide.guide.onClickStep2();
EventCenter.Broadcast(MyEventType.PLAY_LAND_LIGHT, parkingSpaceId);
EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA); EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
mView.showFlyLevel(); mView.showFlyLevel();
} }
else else
...@@ -97,7 +100,8 @@ public class CarPresenter : CarContract.Presenter ...@@ -97,7 +100,8 @@ public class CarPresenter : CarContract.Presenter
} }
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
GameObject.Find("Dialog").GetComponent<DialogControl>().showGoldInsufficientDialog(); UnityEngine.Debug.Log("错误信息"+errMsg);
//GameObject.Find("Dialog").GetComponent<DialogControl>().showGoldInsufficientDialog();
})); }));
} }
public void GetUnLockCar(int parkingSpaceId) public void GetUnLockCar(int parkingSpaceId)
......
...@@ -5,7 +5,7 @@ using UnityEngine; ...@@ -5,7 +5,7 @@ using UnityEngine;
public class AudioUtils : MonoBehaviour public class AudioUtils : MonoBehaviour
{ {
public AudioSource music; public AudioSource music;
public AudioClip btnAudio; public AudioClip btnAudio, speedAudio;
public GameObject musicOpenIcon,musicCloseIcon; public GameObject musicOpenIcon,musicCloseIcon;
private string IS_OPEN_MUSIC; private string IS_OPEN_MUSIC;
private bool IsPlay; private bool IsPlay;
...@@ -44,15 +44,32 @@ public class AudioUtils : MonoBehaviour ...@@ -44,15 +44,32 @@ public class AudioUtils : MonoBehaviour
{ {
if (IsPlay) if (IsPlay)
{ {
StartCoroutine(playAtdio()); StartCoroutine(playAtdio(1));
} }
//AudioSource.PlayClipAtPoint(playAtdio, transform.position); //AudioSource.PlayClipAtPoint(playAtdio, transform.position);
} }
public void PlaySpeedAudio()
{
if (IsPlay)
{
StartCoroutine(playAtdio(2));
}
}
private IEnumerator playAtdio() private IEnumerator playAtdio(int type)
{ {
yield return null; yield return null;
AudioSource.PlayClipAtPoint(btnAudio, transform.position);
if (type == 1)
{
AudioSource.PlayClipAtPoint(btnAudio, transform.position);
}
if (type == 2)
{
AudioSource.PlayClipAtPoint(speedAudio, transform.position);
}
//if (type == 1) //if (type == 1)
//{ //{
// AudioSource.PlayClipAtPoint(btnClickAudio, transform.position); // AudioSource.PlayClipAtPoint(btnClickAudio, transform.position);
......
...@@ -38,12 +38,13 @@ public class CarUIControl : MonoBehaviour ...@@ -38,12 +38,13 @@ public class CarUIControl : MonoBehaviour
private Coroutine flyCoinTimeControl; private Coroutine flyCoinTimeControl;
public GameObject guang,bian; public GameObject guang,bian;
private Animator m_Animator; private Animator m_Animator;
public Image light1;
private void Awake() private void Awake()
{ {
mCarImg = GetComponent<CarTypeImg>(); mCarImg = GetComponent<CarTypeImg>();
m_Animator = guang.GetComponent<Animator>(); m_Animator = light1.GetComponent<Animator>();
EventCenter.AddListener(MyEventType.CLOSE_PROCTION, closeProction); EventCenter.AddListener(MyEventType.CLOSE_PROCTION, closeProction);
EventCenter.AddListener(MyEventType.PLAY_LAND_LIGHT, playLandLight); EventCenter.AddListener<int>(MyEventType.PLAY_LAND_LIGHT, playLandLight);
EventCenter.AddListener(MyEventType.END_LAND_LIGHT, endLandLight); EventCenter.AddListener(MyEventType.END_LAND_LIGHT, endLandLight);
EventCenter.AddListener<int>(MyEventType.ONE_CAR_PLAY_ANIMAL, oneCarPlayAnimal); EventCenter.AddListener<int>(MyEventType.ONE_CAR_PLAY_ANIMAL, oneCarPlayAnimal);
} }
...@@ -56,34 +57,30 @@ public class CarUIControl : MonoBehaviour ...@@ -56,34 +57,30 @@ public class CarUIControl : MonoBehaviour
private void OnDestroy() private void OnDestroy()
{ {
EventCenter.RemoveListener(MyEventType.CLOSE_PROCTION, closeProction); EventCenter.RemoveListener(MyEventType.CLOSE_PROCTION, closeProction);
EventCenter.RemoveListener(MyEventType.PLAY_LAND_LIGHT, playLandLight); EventCenter.RemoveListener<int>(MyEventType.PLAY_LAND_LIGHT, playLandLight);
EventCenter.RemoveListener(MyEventType.END_LAND_LIGHT, endLandLight); EventCenter.RemoveListener(MyEventType.END_LAND_LIGHT, endLandLight);
} }
private void endLandLight() private void endLandLight()
{ {
// m_Animator.Play("nomal"); m_Animator.Play("nomal");
Debug.Log("结束动画"); Debug.Log("结束动画");
guang.SetActive(false);
bian.SetActive(false);
} }
private void playLandLight() private void playLandLight(int arg)
{ {
Debug.Log("展示动画"); Debug.unityLogger.Log("升级执行");
if (mCarData.status == 2) if (arg == mCarData.id)
{ {
Debug.Log("有车的播放动画"); m_Animator.Play("level_update");
// m_Animator.Play("speed_light");
guang.SetActive(true);
bian.SetActive(true);
} }
else else
{ {
// m_Animator.Play("nomal"); m_Animator.Play("nomal");
guang.SetActive(false);
bian.SetActive(false);
} }
} }
//关闭防护罩 //关闭防护罩
private void closeProction() private void closeProction()
......
...@@ -98,7 +98,7 @@ public class DoubleIncomeDialog : MonoBehaviour ...@@ -98,7 +98,7 @@ public class DoubleIncomeDialog : MonoBehaviour
//倒计时结束 //倒计时结束
StopCoroutine(DriverTimeControl); StopCoroutine(DriverTimeControl);
EventCenter.Broadcast(MyEventType.STOP_DOUBLE_INCOME_ANIMATION); EventCenter.Broadcast(MyEventType.STOP_DOUBLE_INCOME_ANIMATION);
EventCenter.Broadcast(MyEventType.END_LAND_LIGHT); EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
break; break;
} }
else else
......
...@@ -395,7 +395,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -395,7 +395,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
DoubleTimerObj.SetActive(false); DoubleTimerObj.SetActive(false);
DoubleObj.SetActive(true); DoubleObj.SetActive(true);
stoptDoubleIncomeAnimal(); stoptDoubleIncomeAnimal();
EventCenter.Broadcast(MyEventType.END_LAND_LIGHT); // EventCenter.Broadcast(MyEventType.END_LAND_LIGHT);
} }
} }
...@@ -411,13 +411,14 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -411,13 +411,14 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
DoubleTimerObj.SetActive(false); DoubleTimerObj.SetActive(false);
DoubleObj.SetActive(true); DoubleObj.SetActive(true);
stoptDoubleIncomeAnimal(); stoptDoubleIncomeAnimal();
EventCenter.Broadcast(MyEventType.END_LAND_LIGHT); EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
//关闭上一次倒计时 //关闭上一次倒计时
StopCoroutine(DoubleControl); StopCoroutine(DoubleControl);
break; break;
} }
else else
{ {
AudioUtils.ins.PlaySpeedAudio();
DoubleTime--; DoubleTime--;
DoubleTimerTV.text = UnityUtil.getCountdown(DoubleTime); DoubleTimerTV.text = UnityUtil.getCountdown(DoubleTime);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment