Skip to content

F
First_FKQCW
Commit fb702ce8 authored by zxhljwl's avatar zxhljwl
Browse files
Options

Merge branch 'develop_1.0.3' of gitlab.huolea.com:wangxuewei/first_fkqcw into develop_1.0.3

parents f19b5e3d 3b23d55e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 967 additions and 41 deletions
Assets/Game/Main/Animation/CoinTv.controller 0 → 100644
View file @ fb702ce8
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CoinTv
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 6929636153455423270}
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 &4190451611987463197
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: levevmove
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: a183c29f1d2b44659934668c4dea2f5e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &6929636153455423270
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: 4190451611987463197}
m_Position: {x: 200, y: 0, 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: 4190451611987463197}
Assets/Game/Main/Animation/CoinTv.controller.meta 0 → 100644
View file @ fb702ce8
fileFormatVersion: 2
guid: 725092af50cd94bf7a7266dec0759d41
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Animation/levevmove.anim 0 → 100644
View file @ fb702ce8
This diff is collapsed.
Assets/Game/Main/Animation/levevmove.anim.meta 0 → 100644
View file @ fb702ce8
fileFormatVersion: 2
guid: a183c29f1d2b44659934668c4dea2f5e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Prefabs/Car.prefab
View file @ fb702ce8
......@@ -285,7 +285,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 455528767290619782}
m_Enabled: 1
m_Alpha: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
......@@ -332,7 +332,7 @@ RectTransform:
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: 117, y: 23}
m_SizeDelta: {x: 194, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &455528767669848393
CanvasRenderer:
......@@ -361,7 +361,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8479866b216b4094ca54f11dc536ad7d, type: 3}
m_Sprite: {fileID: 21300000, guid: 12b9a6d8e7502ef41aa4368018cef115, type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -1390,7 +1390,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -54.4}
m_SizeDelta: {x: 117, y: 23}
m_SizeDelta: {x: 202, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &455528768205073264
CanvasRenderer:
......@@ -1419,7 +1419,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 12b9a6d8e7502ef41aa4368018cef115, type: 3}
m_Sprite: {fileID: 21300000, guid: cbdd580fb860e493f9cc6e2652fefa81, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -1600,6 +1600,7 @@ GameObject:
- component: {fileID: 455528768568571533}
- component: {fileID: 455528768568571535}
- component: {fileID: 455528768568571532}
- component: {fileID: 105073137918103850}
m_Layer: 5
m_Name: progress_tv
m_TagString: Untagged
......@@ -1654,9 +1655,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 20
m_FontStyle: 1
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 22
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
......@@ -1667,6 +1668,21 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 00:00:00
--- !u!114 &105073137918103850
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 455528768568571538}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.40784314, g: 0.21960784, b: 0.1764706, a: 1}
m_EffectDistance: {x: 2, y: -2}
m_UseGraphicAlpha: 1
--- !u!1 &455528768869102783
GameObject:
m_ObjectHideFlags: 0
......@@ -1830,6 +1846,7 @@ GameObject:
- component: {fileID: 259696605779131939}
- component: {fileID: 5770000278109398240}
- component: {fileID: 5203582658881749762}
- component: {fileID: 7404066110758983176}
m_Layer: 5
m_Name: protection
m_TagString: Untagged
......@@ -1853,7 +1870,7 @@ RectTransform:
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_AnchoredPosition: {x: -2, y: 14}
m_SizeDelta: {x: 345, y: 255}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5770000278109398240
......@@ -1893,6 +1910,25 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!95 &7404066110758983176
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 613104889841395424}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: b19307b1c93e04c95a2eb11cc2a2a409, 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 &762901296262371212
GameObject:
m_ObjectHideFlags: 0
......@@ -3227,7 +3263,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -4025,7 +4061,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -4224,7 +4260,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8427849856264495514}
- component: {fileID: 7239143492865378445}
m_Layer: 5
m_Name: level
m_TagString: Untagged
......@@ -4252,18 +4287,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0.5}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7239143492865378445
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8635268833345549401}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fdf5d53346e6b58448f045e258da9808, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &9032180109230993116
GameObject:
m_ObjectHideFlags: 0
......@@ -4275,6 +4298,8 @@ GameObject:
- component: {fileID: 8312206044161418702}
- component: {fileID: 5370282411012615652}
- component: {fileID: 9154443624061788419}
- component: {fileID: 2713444471516113627}
- component: {fileID: 5025385306030712101}
m_Layer: 5
m_Name: CoinTv
m_TagString: Untagged
......@@ -4342,3 +4367,35 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u7B49\u7EA7+1"
--- !u!95 &2713444471516113627
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9032180109230993116}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 725092af50cd94bf7a7266dec0759d41, 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!114 &5025385306030712101
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9032180109230993116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1348bff0b7ff248b3b21d1298fff8dab, type: 3}
m_Name:
m_EditorClassIdentifier:
level: {fileID: 8635268833345549401}
Assets/Game/Main/Resource/Carlist/进度条-10.png.meta 0 → 100644
View file @ fb702ce8
fileFormatVersion: 2
guid: cbdd580fb860e493f9cc6e2652fefa81
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Resource/Dialog/恭喜获得/btn-2.png.meta 0 → 100644
View file @ fb702ce8
fileFormatVersion: 2
guid: d04c7e54edd564cf9a829be41c9a8707
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Resource/Dialog/恭喜获得/标头-4.png.meta 0 → 100644
View file @ fb702ce8
fileFormatVersion: 2
guid: 2d324a4ed922b4d438eaec94135dd793
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ fb702ce8
......@@ -2854,7 +2854,7 @@ MonoBehaviour:
DoubleTimerTV: {fileID: 1465665560}
AllSpeedTimerTV: {fileID: 1077363537}
proTimerTv: {fileID: 70009395}
withdrawBoxText: {fileID: 0}
withdrawBoxText: {fileID: 569884961}
StickTimerObj: {fileID: 694002146}
StickObj: {fileID: 1183343286}
MyDriverTimerObj: {fileID: 1507646506}
......@@ -2868,6 +2868,7 @@ MonoBehaviour:
EveryDayWithDraw: {fileID: 1309034794}
avatar: {fileID: 291217793}
shouyi_animal: {fileID: 2070006612}
img_pig_cash_trips: {fileID: 494523678}
--- !u!1 &107878020
GameObject:
m_ObjectHideFlags: 0
......@@ -11847,7 +11848,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &494523679
RectTransform:
m_ObjectHideFlags: 0
......@@ -11866,7 +11867,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -128, y: 8}
m_SizeDelta: {x: 145, y: 52}
m_SizeDelta: {x: 160, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &494523680
MonoBehaviour:
......@@ -13690,7 +13691,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
......@@ -23288,13 +23289,13 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 84
m_FontStyle: 1
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 82
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 84
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
......@@ -23323,7 +23324,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.62352943, g: 0.3137255, b: 0.105882354, a: 1}
m_EffectDistance: {x: 3, y: 3}
m_UseGraphicAlpha: 1
m_UseGraphicAlpha: 0
--- !u!1 &974318290
GameObject:
m_ObjectHideFlags: 0
......@@ -41871,7 +41872,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 63c6bb90c85a15440a699188765a1543, type: 3}
m_Sprite: {fileID: 21300000, guid: d04c7e54edd564cf9a829be41c9a8707, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -44111,7 +44112,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ffa9225c34dc54c46a592b9dd5e72c72, type: 3}
m_Sprite: {fileID: 21300000, guid: 2d324a4ed922b4d438eaec94135dd793, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -45278,7 +45279,7 @@ RectTransform:
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: -134, y: 82}
m_AnchoredPosition: {x: -89, y: 82}
m_SizeDelta: {x: 144, y: 144}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2039863361
Assets/Game/Main/Scripts/EventUtil/MyEventType.cs
View file @ fb702ce8
......@@ -120,4 +120,6 @@ public enum MyEventType
PLAY_LAND_LIGHT,
//结束地块动画
END_LAND_LIGHT,
//单个车播放动画
ONE_CAR_PLAY_ANIMAL,
}
Assets/Game/Main/Scripts/Model/ParkInfoBean.cs
View file @ fb702ce8
......@@ -81,6 +81,7 @@ public class CarDataDTO
public int parkingTimeSecond { get; set; }//总共的停车时间
public int rewardEveryMinute { get; set; }//停车每分钟收益
public int? levelCoin { get; set; }
public int? doubleCountdownSecond { get; set; }
//public int? statusLastFlushTS { get; set; }//刷新状态时间戳
}
\ No newline at end of file
Assets/Game/Main/Scripts/View/Anim/FlyLevel.cs 0 → 100644
View file @ fb702ce8
using UnityEngine;
using System.Collections;
public class FlyLevel : MonoBehaviour
{
public GameObject level;
public void animalEnd(){
level.SetActive(false);
}
}
Assets/Game/Main/Scripts/View/Anim/FlyLevel.cs.meta 0 → 100644
View file @ fb702ce8
fileFormatVersion: 2
guid: 1348bff0b7ff248b3b21d1298fff8dab
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scripts/View/CarUIControl.cs
View file @ fb702ce8
......@@ -45,6 +45,12 @@ public class CarUIControl : MonoBehaviour
EventCenter.AddListener(MyEventType.CLOSE_PROCTION, closeProction);
EventCenter.AddListener(MyEventType.PLAY_LAND_LIGHT, playLandLight);
EventCenter.AddListener(MyEventType.END_LAND_LIGHT, endLandLight);
EventCenter.AddListener<int>(MyEventType.ONE_CAR_PLAY_ANIMAL, oneCarPlayAnimal);
}
private void oneCarPlayAnimal(int arg)
{
}
private void OnDestroy()
......@@ -108,6 +114,16 @@ public class CarUIControl : MonoBehaviour
get_car_lv.text = "Lv" + car.carDataDTO.level;
update_car_lv.text = "Lv" + car.carDataDTO.level;
level_coin.text = car.carDataDTO.levelCoin.ToString();
if (car.carDataDTO.doubleCountdownSecond !=null&& car.carDataDTO.doubleCountdownSecond> 0)
{
guang.SetActive(true);
bian.SetActive(true);
}
else
{
guang.SetActive(false);
bian.SetActive(false);
}
}
if (car.id < PlayerDataControl.Instance.VideoUnlockCarID)
......
Assets/Game/Main/Scripts/View/HomeInfoControl.cs
View file @ fb702ce8
......@@ -20,6 +20,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
public GameObject EveryDayWithDraw;
public RawImage avatar;
public GameObject shouyi_animal;
public GameObject img_pig_cash_trips;
private void Awake()
{
......@@ -112,6 +113,11 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
SetDriverTimer(mCarInfo.driverCountdownSecond);
SetStickTimer(mCarInfo.protectionCountdownSecond);
SetAllSpeedTimer(mCarInfo.allSpeedUpCd);
if (mCarInfo.doubleCountdownSecond > 0)
{
Debug.Log("当前处于双倍倒计时");
EventCenter.Broadcast(MyEventType.PLAY_LAND_LIGHT);
}
SetDoubleTimer(mCarInfo.doubleCountdownSecond);
ParkListInfo(mCarInfo.parkingSpaceList);
setProction(mCarInfo.protectionCountdownSecond);
......@@ -119,10 +125,28 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
tvrewardCashEveryMinute.text = "约"+mCarInfo.rewardCashEveryMinute.ToString()+ "元/分钟";
levelTv.text = "Lv:"+mCarInfo.levelProgress.level;
withdrawBoxText.text = mCarInfo.wdTitle;
startCountDown();
}
private int time = 5;
private void startCountDown()
{
Debug.Log("开始计时");
StartCoroutine(showPigTrip());
}
private IEnumerator showPigTrip()
{
img_pig_cash_trips.SetActive(true);
yield return new WaitForSecondsRealtime(time);
img_pig_cash_trips.SetActive(false);
yield return new WaitForSecondsRealtime(time);
startCountDown();
}
private void ParkListInfo(List<ParkingSpace> mCarList)
{
if (mCarList == null)
......@@ -193,14 +217,14 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
}
if (StickCurrentTime > 0)
{
StickTimerObj.SetActive(true);
//StickTimerObj.SetActive(true);
StickObj.SetActive(false);
StickTimerTV.text = UnityUtil.getCountdown(StickCurrentTime);
StickTimeControl = StartCoroutine(IEStickTimer());
}
else
{
StickTimerObj.SetActive(false);
//StickTimerObj.SetActive(false);
StickObj.SetActive(true);
}
}
......@@ -213,7 +237,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
{
//贴条倒计时结束
StickTimerObj.SetActive(false);
StickObj.SetActive(true);
// StickObj.SetActive(true);
//关闭上一次倒计时
StopCoroutine(StickTimeControl);
break;
......
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