Commit b449308e authored by maxiaoliang's avatar maxiaoliang

修改首页漏的现金显示和音效

parent 865da1fa
......@@ -10,7 +10,14 @@ AudioImporter:
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
platformSettingOverrides:
7:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
......
......@@ -10,7 +10,14 @@ AudioImporter:
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
platformSettingOverrides:
7:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
......
fileFormatVersion: 2
guid: 6aa1c1c7bb0064904a771ea1dbba1f5b
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides:
7:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
......@@ -10,7 +10,14 @@ AudioImporter:
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
platformSettingOverrides:
7:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
......
......@@ -10,7 +10,14 @@ AudioImporter:
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
platformSettingOverrides:
7:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
......
fileFormatVersion: 2
guid: b5ab9d45f1c1a487086a87b51860a905
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:
......@@ -2871,6 +2871,8 @@ MonoBehaviour:
img_pig_cash_trips: {fileID: 494523678}
flycoin: {fileID: 1565151035}
Protv: {fileID: 1000549263}
rmb: {fileID: 1042552706}
tvrmb: {fileID: 1839056438}
--- !u!1 &107878020
GameObject:
m_ObjectHideFlags: 0
......@@ -16741,6 +16743,7 @@ RectTransform:
- {fileID: 220833996}
- {fileID: 864805490}
- {fileID: 1528497812}
- {fileID: 1042552707}
m_Father: {fileID: 716226832}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -24960,6 +24963,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041433899}
m_CullTransparentMesh: 0
--- !u!1 &1042552706
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1042552707}
- component: {fileID: 1042552709}
- component: {fileID: 1042552708}
m_Layer: 5
m_Name: rmb
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1042552707
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1042552706}
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: 1839056437}
m_Father: {fileID: 666210206}
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: 13, y: -42}
m_SizeDelta: {x: 116, y: 47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1042552708
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1042552706}
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: b5ab9d45f1c1a487086a87b51860a905, 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!222 &1042552709
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1042552706}
m_CullTransparentMesh: 0
--- !u!1 &1048471772
GameObject:
m_ObjectHideFlags: 0
......@@ -25914,7 +25992,7 @@ PrefabInstance:
- target: {fileID: 2853166085728200632, guid: 1053be02c113a7a45adf322c929b0cb6,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
type: 3}
......@@ -42417,6 +42495,84 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1835654806}
m_CullTransparentMesh: 0
--- !u!1 &1839056436
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1839056437}
- component: {fileID: 1839056439}
- component: {fileID: 1839056438}
m_Layer: 5
m_Name: tvrmb
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1839056437
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1839056436}
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: 1042552707}
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.9, y: -5.1379}
m_SizeDelta: {x: 161.81888, y: 36.724228}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1839056438
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1839056436}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u7EA60\u5143"
--- !u!222 &1839056439
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1839056436}
m_CullTransparentMesh: 0
--- !u!1 &1845351021
GameObject:
m_ObjectHideFlags: 0
......@@ -45129,6 +45285,7 @@ MonoBehaviour:
music: {fileID: 2012954742}
btnAudio: {fileID: 8300000, guid: d689a50c283384dfd97e11d035c9c911, type: 3}
speedAudio: {fileID: 8300000, guid: b906fc0b592f44a68aa2e740c51aeaeb, type: 3}
updateAudio: {fileID: 8300000, guid: 6aa1c1c7bb0064904a771ea1dbba1f5b, type: 3}
musicOpenIcon: {fileID: 2134061596}
musicCloseIcon: {fileID: 1867138965}
--- !u!114 &2012954744
......@@ -5,7 +5,7 @@ using UnityEngine;
public class AudioUtils : MonoBehaviour
{
public AudioSource music;
public AudioClip btnAudio, speedAudio;
public AudioClip btnAudio, speedAudio, updateAudio;
public GameObject musicOpenIcon,musicCloseIcon;
private string IS_OPEN_MUSIC;
private bool IsPlay;
......@@ -55,7 +55,13 @@ public class AudioUtils : MonoBehaviour
StartCoroutine(playAtdio(2));
}
}
public void PlayUpdateAudio()
{
if (IsPlay)
{
StartCoroutine(playAtdio(3));
}
}
private IEnumerator playAtdio(int type)
{
yield return null;
......@@ -69,6 +75,10 @@ public class AudioUtils : MonoBehaviour
{
AudioSource.PlayClipAtPoint(speedAudio, transform.position);
}
if (type == 3)
{
AudioSource.PlayClipAtPoint(updateAudio, transform.position);
}
//if (type == 1)
//{
......
......@@ -70,6 +70,7 @@ public class CarUIControl : MonoBehaviour
private void playLandLight(int arg)
{
Debug.unityLogger.Log("升级执行");
AudioUtils.ins.PlayUpdateAudio();
if (arg == mCarData.id)
{
m_Animator.Play("level_update");
......
......@@ -23,6 +23,8 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
public GameObject img_pig_cash_trips;
public GameObject flycoin;
public GameObject Protv;
public GameObject rmb;
public Text tvrmb;
private void Awake()
{
mPresenter = new HomePresenter(this);
......@@ -32,6 +34,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
EventCenter.AddListener(MyEventType.START_DOUBLE_INCOME_ANIMATION, startDoubleIncomeAnimal);
EventCenter.AddListener(MyEventType.STOP_DOUBLE_INCOME_ANIMATION, stoptDoubleIncomeAnimal);
EventCenter.AddListener(MyEventType.GET_COIN_FLY, flyCoin);
startCountDown();
if (PrefenceUtils.GetInstance().getIsFirst() == 0) {
PrefenceUtils.GetInstance().setIsFirst(1);
......@@ -138,9 +141,10 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
SetDoubleTimer(mCarInfo.doubleCountdownSecond);
ParkListInfo(mCarInfo.parkingSpaceList);
setProction(mCarInfo.protectionCountdownSecond);
tvrewardCoinEveryMinute.text = "<size=33>" + mCarInfo.rewardCoinEveryMinute + "</size>"+"<size=25>/分钟</size>";
tvrewardCashEveryMinute.text = "约"+mCarInfo.rewardCashEveryMinute.ToString()+ "元/分钟";
tvrewardCoinEveryMinute.text = "<size=33>" + UnityUtil.TransUnit(mCarInfo.rewardCoinEveryMinute) + "</size>"+"<size=25>/分钟</size>";
tvrewardCashEveryMinute.text = "约"+mCarInfo.rewardCashEveryMinute.ToString("f2")+ "元/分钟";
levelTv.text = "Lv:"+mCarInfo.levelProgress.level;
tvrmb.text = "约" + (mCarInfo.avaCoin / 10000.0f).ToString("f2")+"元";
withdrawBoxText.text = mCarInfo.wdTitle;
}
......@@ -154,10 +158,11 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
private IEnumerator showPigTrip()
{
img_pig_cash_trips.SetActive(true);
rmb.SetActive(true);
yield return new WaitForSecondsRealtime(2f);
img_pig_cash_trips.SetActive(false);
rmb.SetActive(false);
yield return new WaitForSecondsRealtime(time);
startCountDown();
......
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