Commit bf2ba257 authored by zxhljwl's avatar zxhljwl

修改

parent 74da3164
...@@ -227,5 +227,16 @@ public class PrefenceUtils ...@@ -227,5 +227,16 @@ public class PrefenceUtils
{ {
return PlayerPrefs.GetString(WxName, ""); return PlayerPrefs.GetString(WxName, "");
} }
private string IsFirst = "IsFirst";
public void setIsFirst(int first)
{
PlayerPrefs.SetInt(IsFirst, first);
}
public int getIsFirst()
{
return PlayerPrefs.GetInt(IsFirst, 0);
}
} }
...@@ -281,10 +281,13 @@ public class HttpTool : MonoBehaviour ...@@ -281,10 +281,13 @@ public class HttpTool : MonoBehaviour
else if(response.status == 105) else if(response.status == 105)
{ {
//提示信息 //提示信息
ToastPlugin.ToastHelper.ShowToast(response.msg);
}else if(response.status == 101) }else if(response.status == 101)
{ {
//Token失效 //Token失效
}else WxLoginUtil.WxLogin.ShowWxLoginPage();
}
else
{ {
if (failed != null) if (failed != null)
{ {
......
...@@ -339,6 +339,7 @@ GameObject: ...@@ -339,6 +339,7 @@ GameObject:
- component: {fileID: 1887564305728234182} - component: {fileID: 1887564305728234182}
- component: {fileID: 1629534006857474154} - component: {fileID: 1629534006857474154}
- component: {fileID: 4125667012939788534} - component: {fileID: 4125667012939788534}
- component: {fileID: 411278344809238023}
m_Layer: 5 m_Layer: 5
m_Name: UnLock m_Name: UnLock
m_TagString: Untagged m_TagString: Untagged
...@@ -402,6 +403,60 @@ MonoBehaviour: ...@@ -402,6 +403,60 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!114 &411278344809238023
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3599322565748797915}
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: 4125667012939788534}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4118514701650003299}
m_MethodName: OnClickUnLockCar
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 &4118514700182169029 --- !u!1 &4118514700182169029
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -478,6 +478,10 @@ MonoBehaviour: ...@@ -478,6 +478,10 @@ MonoBehaviour:
pbText: {fileID: 3429054282211219240} pbText: {fileID: 3429054282211219240}
buttonText: {fileID: 1213180463313063732} buttonText: {fileID: 1213180463313063732}
pb: {fileID: 3429054281777272389} pb: {fileID: 3429054281777272389}
button: {fileID: 8131331122070025293}
buttonImages:
- {fileID: 21300000, guid: e24684b862e72474e9c65f2251ea8519, type: 3}
- {fileID: 21300000, guid: 613552255be3cf148b15cf3b6fed245b, type: 3}
--- !u!1 &5907772169871033784 --- !u!1 &5907772169871033784
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
fileFormatVersion: 2
guid: 613552255be3cf148b15cf3b6fed245b
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:
...@@ -2854,6 +2854,7 @@ MonoBehaviour: ...@@ -2854,6 +2854,7 @@ MonoBehaviour:
DoubleTimerTV: {fileID: 1465665560} DoubleTimerTV: {fileID: 1465665560}
AllSpeedTimerTV: {fileID: 1077363537} AllSpeedTimerTV: {fileID: 1077363537}
proTimerTv: {fileID: 70009395} proTimerTv: {fileID: 70009395}
withdrawBoxText: {fileID: 569884961}
StickTimerObj: {fileID: 694002146} StickTimerObj: {fileID: 694002146}
StickObj: {fileID: 1183343286} StickObj: {fileID: 1183343286}
MyDriverTimerObj: {fileID: 1507646506} MyDriverTimerObj: {fileID: 1507646506}
...@@ -3352,7 +3353,7 @@ MonoBehaviour: ...@@ -3352,7 +3353,7 @@ MonoBehaviour:
m_Calls: m_Calls:
- m_Target: {fileID: 105570272} - m_Target: {fileID: 105570272}
m_MethodName: onClickWithDrawShop m_MethodName: onClickWithDrawShop
m_Mode: 1 m_Mode: 6
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
...@@ -11876,7 +11877,8 @@ RectTransform: ...@@ -11876,7 +11877,8 @@ RectTransform:
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: 569884963}
m_Father: {fileID: 2018736220} m_Father: {fileID: 2018736220}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -13668,6 +13670,100 @@ CanvasRenderer: ...@@ -13668,6 +13670,100 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 569864733} m_GameObject: {fileID: 569864733}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &569884960
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 569884963}
- component: {fileID: 569884962}
- component: {fileID: 569884961}
- component: {fileID: 569884964}
m_Layer: 5
m_Name: withdrawBoxText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &569884961
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 569884960}
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: 10102, guid: 0000000000000000e000000000000000, type: 0}
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: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6700\u9AD85\u5143\u63D0\u73B0"
--- !u!222 &569884962
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 569884960}
m_CullTransparentMesh: 0
--- !u!224 &569884963
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 569884960}
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: 494523679}
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: -4.93, y: -0.000013828}
m_SizeDelta: {x: 135.14072, y: 51.999985}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &569884964
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 569884960}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.64705884, g: 0.11764706, b: 0.13725491, a: 1}
m_EffectDistance: {x: 1, y: 1}
m_UseGraphicAlpha: 1
--- !u!1 &577365248 --- !u!1 &577365248
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -16786,14 +16882,14 @@ MonoBehaviour: ...@@ -16786,14 +16882,14 @@ MonoBehaviour:
m_CallState: 2 m_CallState: 2
- m_Target: {fileID: 105570272} - m_Target: {fileID: 105570272}
m_MethodName: onClickWithDrawShop m_MethodName: onClickWithDrawShop
m_Mode: 1 m_Mode: 6
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0 m_IntArgument: 0
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 1
m_CallState: 2 m_CallState: 2
--- !u!95 &666210210 --- !u!95 &666210210
Animator: Animator:
...@@ -35726,7 +35822,7 @@ MonoBehaviour: ...@@ -35726,7 +35822,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 5012 m_Text: 5000
--- !u!222 &1515336381 --- !u!222 &1515336381
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -36273,7 +36369,7 @@ MonoBehaviour: ...@@ -36273,7 +36369,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e0bb5b6ba78cb3e45813c9a994c551b4, type: 3} m_Script: {fileID: 11500000, guid: e0bb5b6ba78cb3e45813c9a994c551b4, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
GoldNumber: {fileID: 0} GoldNumber: {fileID: 1515336380}
--- !u!1 &1531958711 --- !u!1 &1531958711
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
using System; using System;
using System.Collections.Generic;
[Serializable] [Serializable]
public class MyDriverBean public class MyDriverBean
...@@ -8,4 +7,5 @@ public class MyDriverBean ...@@ -8,4 +7,5 @@ public class MyDriverBean
public int driverCountdownSecond { get; set; }//司机倒计时时间(秒) public int driverCountdownSecond { get; set; }//司机倒计时时间(秒)
public int todayRemainingNum { get; set; }//司机加时次数 public int todayRemainingNum { get; set; }//司机加时次数
public int driverTotalSecond { get; set; }//司机上限时间(秒) public int driverTotalSecond { get; set; }//司机上限时间(秒)
public int status { get; set; }
} }
...@@ -8,6 +8,7 @@ public class MyGarageBean ...@@ -8,6 +8,7 @@ public class MyGarageBean
public int totalLevelCurrent { get; set; }//车辆总等级进度当前值 public int totalLevelCurrent { get; set; }//车辆总等级进度当前值
public List<CarInfo> carList { get; set; }//车库列表 public List<CarInfo> carList { get; set; }//车库列表
public int nextLevelForAllUpgrade { get; set; }//下次升级级数 public int nextLevelForAllUpgrade { get; set; }//下次升级级数
public int status { get; set; }
} }
[Serializable] [Serializable]
public class CarInfo public class CarInfo
......
...@@ -51,6 +51,7 @@ public class ParkInfoBean ...@@ -51,6 +51,7 @@ public class ParkInfoBean
/// </summary> /// </summary>
public double rewardCashEveryMinute { get; set; } public double rewardCashEveryMinute { get; set; }
public LevelProgress levelProgress { get; set; } public LevelProgress levelProgress { get; set; }
public string wdTitle { get; set; }
public class LevelProgress public class LevelProgress
{ {
......
public class UpgradeCarBean {
public int status;
}
\ No newline at end of file
fileFormatVersion: 2
guid: 012d2b100d68d5842aa50b8db00a5980
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
...@@ -3,12 +3,15 @@ ...@@ -3,12 +3,15 @@
public class WithdrawShopBean public class WithdrawShopBean
{ {
public List<WD> upgradeWdList; public List<WD> upgradeWdList;
public int status;
public string reason;
public class WD public class WD
{ {
public int id; public int id;
public string showCash; public string showCash;
public ProgressData progressData; public ProgressData progressData;
public int status;
} }
public class ProgressData { public class ProgressData {
......
...@@ -81,13 +81,15 @@ public class CarPresenter : CarContract.Presenter ...@@ -81,13 +81,15 @@ public class CarPresenter : CarContract.Presenter
{ {
parm.Clear(); parm.Clear();
parm.Add("carId", parkingSpaceId); parm.Add("carId", parkingSpaceId);
HttpTool.Instance._Post("app/v1/game/fkqcw/parking/upgrade", parm, new Action<EmptyBean>((bean) => HttpTool.Instance._Post("app/v1/game/fkqcw/parking/upgrade", parm, new Action<UpgradeCarBean>((bean) =>
{ {
//Guide.guide.onClickStep3(); //Guide.guide.onClickStep3();
// mView.CarInfo(bean); // mView.CarInfo(bean);
Guide.guide.onClickStep2(); Guide.guide.onClickStep2();
EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA); EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
if (bean.status == -1) {
GameObject.Find("Dialog").GetComponent<DialogControl>().showGoldInsufficientDialog();
}
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
GameObject.Find("Dialog").GetComponent<DialogControl>().showGoldInsufficientDialog(); GameObject.Find("Dialog").GetComponent<DialogControl>().showGoldInsufficientDialog();
......
...@@ -206,11 +206,11 @@ public class Guide : MonoBehaviour ...@@ -206,11 +206,11 @@ public class Guide : MonoBehaviour
} }
public void onclick10() public void onclick10()
{ {
EventUtils.OnEvent("newUser_guide");
click10.SetActive(false); click10.SetActive(false);
if (PlayerPrefs.GetInt(step10Key, 0) == 0) if (PlayerPrefs.GetInt(step10Key, 0) == 0)
{ {
PlayerPrefs.SetInt(step10Key, 1); PlayerPrefs.SetInt(step10Key, 1);
} }
} }
......
...@@ -88,7 +88,7 @@ public class WxLoginUtil : MonoBehaviour ...@@ -88,7 +88,7 @@ public class WxLoginUtil : MonoBehaviour
/// <param name="code"></param> /// <param name="code"></param>
private void OnWxSuccess() private void OnWxSuccess()
{ {
EventUtils.OnEvent("login_success"); EventUtils.OnEvent("user_login_success");
if (loadingImg != null) if (loadingImg != null)
{ {
loadingImg.SetActive(false); loadingImg.SetActive(false);
...@@ -106,7 +106,7 @@ public class WxLoginUtil : MonoBehaviour ...@@ -106,7 +106,7 @@ public class WxLoginUtil : MonoBehaviour
/// <param name="code"></param> /// <param name="code"></param>
private void OnWxFaile(string code,string errorMes) private void OnWxFaile(string code,string errorMes)
{ {
EventUtils.OnEvent("login_fail", code+errorMes); EventUtils.OnEvent("user_login_fail", code+errorMes);
if (loadingImg != null) if (loadingImg != null)
{ {
loadingImg.SetActive(false); loadingImg.SetActive(false);
......
...@@ -59,6 +59,9 @@ public class ClockInTopItem : MonoBehaviour ...@@ -59,6 +59,9 @@ public class ClockInTopItem : MonoBehaviour
{ {
EventCenter.Broadcast(MyEventType.WITHDRAW_DIALOG, bean); EventCenter.Broadcast(MyEventType.WITHDRAW_DIALOG, bean);
EventCenter.Broadcast(MyEventType.UPDATE_CLOCKIN_TASK_DATA); EventCenter.Broadcast(MyEventType.UPDATE_CLOCKIN_TASK_DATA);
if (bean.status == 1 || bean.status == 3) {
ToastPlugin.ToastHelper.ShowToast(bean.reason);
}
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
Debug.unityLogger.Log("打卡 请求失败" + code + errMsg); Debug.unityLogger.Log("打卡 请求失败" + code + errMsg);
......
...@@ -335,6 +335,7 @@ public class DialogControl : MonoBehaviour ...@@ -335,6 +335,7 @@ public class DialogControl : MonoBehaviour
*/ */
public void showTomorrowWithdrawDialog() public void showTomorrowWithdrawDialog()
{ {
EventUtils.OnEvent("buttonClick_tomorrowCashBank");
TomorrowWithdrawDialog.SetActive(true); TomorrowWithdrawDialog.SetActive(true);
} }
...@@ -426,7 +427,6 @@ public class DialogControl : MonoBehaviour ...@@ -426,7 +427,6 @@ public class DialogControl : MonoBehaviour
public void showGoldInsufficientDialog() public void showGoldInsufficientDialog()
{ {
GoldInsufficientDialog.SetActive(true); GoldInsufficientDialog.SetActive(true);
} }
public void closeGoldInsufficientDialog() public void closeGoldInsufficientDialog()
......
...@@ -66,9 +66,12 @@ public class DoubleIncomeDialog : MonoBehaviour ...@@ -66,9 +66,12 @@ public class DoubleIncomeDialog : MonoBehaviour
/// </summary> /// </summary>
public void OnClcikUseDoubleCoin() public void OnClcikUseDoubleCoin()
{ {
EventUtils.OnEvent("buttonClick_doubleIncome_receive");
GameObject.Find("Dialog").GetComponent<DialogControl>().OnClickCloseDoubleDialog(); GameObject.Find("Dialog").GetComponent<DialogControl>().OnClickCloseDoubleDialog();
AdUtils.PlayRewardAd("doubling_reward", new Action<bool>((cb) => AdUtils.PlayRewardAd("rewardVideo_doubleIncome", new Action<bool>((cb) =>
{ {
EventUtils.OnEvent("rewardVideo_doubleIncome");
EventUtils.OnEvent("rewardVideo_all");
if (cb) if (cb)
{ {
HttpTool.Instance._Post("app/v1/game/fkqcw/doubling/incr_time_by_video", null, new Action<VideoStatusBean>((bean) => HttpTool.Instance._Post("app/v1/game/fkqcw/doubling/incr_time_by_video", null, new Action<VideoStatusBean>((bean) =>
......
...@@ -57,10 +57,10 @@ public class EveryDayControl : MonoBehaviour ...@@ -57,10 +57,10 @@ public class EveryDayControl : MonoBehaviour
/// <param name="sid"></param> /// <param name="sid"></param>
public void videoGetHeart(int sid) public void videoGetHeart(int sid)
{ {
AdUtils.PlayRewardAd("reward_everydayCash", new Action<bool>((adEntity) => AdUtils.PlayRewardAd("rewardVideo_dayCash", new Action<bool>((adEntity) =>
{ {
EventUtils.OnEvent("reward_receiveLove", "激励视频_天天提现领取红心"); EventUtils.OnEvent("rewardVideo_dayCash", "激励视频_天天提现领取红心");
EventUtils.OnEvent("reward_all", "激励视频_天天提现领取红心"); EventUtils.OnEvent("rewardVideo_all", "激励视频_天天提现领取红心");
Dictionary<string, object> parameters = new Dictionary<string, object>(); Dictionary<string, object> parameters = new Dictionary<string, object>();
parameters.Add("adCode", AdUtils.getCurrentAdEntity().codeId); parameters.Add("adCode", AdUtils.getCurrentAdEntity().codeId);
parameters.Add("id", sid); parameters.Add("id", sid);
......
using UnityEngine; using System;
using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
public class GoldInsufficientControl : MonoBehaviour public class GoldInsufficientControl : MonoBehaviour
{ {
...@@ -14,6 +15,18 @@ public class GoldInsufficientControl : MonoBehaviour ...@@ -14,6 +15,18 @@ public class GoldInsufficientControl : MonoBehaviour
*/ */
public void receive() public void receive()
{ {
EventUtils.OnEvent("buttonClick_goldAcquisition");
AdUtils.PlayRewardAd("rewardVideo_goldAcquisition", new Action<bool>((cb) =>
{
EventUtils.OnEvent("rewardVideo_goldAcquisition");
EventUtils.OnEvent("rewardVideo_all");
HttpTool.Instance._Post("app/v3/game/fkqcw/parking/addCoin", null, new Action<WithdrawShopBean>((bean) =>
{
GameObject.Find("Dialog").GetComponent<DialogControl>().closeGoldInsufficientDialog();
GameObject.Find("Main").GetComponent<HomeInfoControl>().OnUpdateCarListData();
}), new Action<string, string>((code, errMsg) =>
{
}));
}));
} }
} }
...@@ -35,6 +35,7 @@ public class HomeFloatCoin : MonoBehaviour ...@@ -35,6 +35,7 @@ public class HomeFloatCoin : MonoBehaviour
public void OnClickFloatCoin(int coin) public void OnClickFloatCoin(int coin)
{ {
EventUtils.OnEvent("buttonClick_goldBubble");
cointype = coin; cointype = coin;
HttpTool.Instance._Get("app/v1/game/fkqcw/parking/bubble_reward", null, new Action<RewardBean>((bean) => HttpTool.Instance._Get("app/v1/game/fkqcw/parking/bubble_reward", null, new Action<RewardBean>((bean) =>
{ {
...@@ -64,11 +65,14 @@ public class HomeFloatCoin : MonoBehaviour ...@@ -64,11 +65,14 @@ public class HomeFloatCoin : MonoBehaviour
private Dictionary<string, object> parms = new Dictionary<string, object>(); private Dictionary<string, object> parms = new Dictionary<string, object>();
public void OnClickVideoReward() public void OnClickVideoReward()
{ {
EventUtils.OnEvent("buttonClick_goldBubble_receive");
OnClickCloseDialog(); OnClickCloseDialog();
parms.Clear(); parms.Clear();
parms.Add("rewardNum", rewardNum); parms.Add("rewardNum", rewardNum);
AdUtils.PlayRewardAd("video_bubble", new Action<bool>((cb) => AdUtils.PlayRewardAd("rewardVideo_goldBubble", new Action<bool>((cb) =>
{ {
EventUtils.OnEvent("rewardVideo_goldBubble");
EventUtils.OnEvent("rewardVideo_all");
if (cb) if (cb)
{ {
HttpTool.Instance._Post("app/v1/game/fkqcw/parking/receive_bubble", parms, new Action<RewardBean>((bean) => HttpTool.Instance._Post("app/v1/game/fkqcw/parking/receive_bubble", parms, new Action<RewardBean>((bean) =>
......
...@@ -8,7 +8,7 @@ using UnityEngine.UI; ...@@ -8,7 +8,7 @@ using UnityEngine.UI;
public class HomeInfoControl : MonoBehaviour, HomeContract.View public class HomeInfoControl : MonoBehaviour, HomeContract.View
{ {
private HomePresenter mPresenter; private HomePresenter mPresenter;
public Text CoinNumTV, StickTimerTV, DriverTimerTV, DoubleTimerTV,AllSpeedTimerTV,proTimerTv; public Text CoinNumTV, StickTimerTV, DriverTimerTV, DoubleTimerTV,AllSpeedTimerTV,proTimerTv, withdrawBoxText;
//主页底部贴条倒计时 //主页底部贴条倒计时
//主页底部贴条文字 //主页底部贴条文字
//主页底部司机倒计时文字 //主页底部司机倒计时文字
...@@ -29,6 +29,11 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -29,6 +29,11 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
EventCenter.AddListener<int>(MyEventType.ADD_COIN, OnAddCoin); EventCenter.AddListener<int>(MyEventType.ADD_COIN, OnAddCoin);
EventCenter.AddListener(MyEventType.START_DOUBLE_INCOME_ANIMATION, startDoubleIncomeAnimal); EventCenter.AddListener(MyEventType.START_DOUBLE_INCOME_ANIMATION, startDoubleIncomeAnimal);
EventCenter.AddListener(MyEventType.STOP_DOUBLE_INCOME_ANIMATION, stoptDoubleIncomeAnimal); EventCenter.AddListener(MyEventType.STOP_DOUBLE_INCOME_ANIMATION, stoptDoubleIncomeAnimal);
if (PrefenceUtils.GetInstance().getIsFirst() == 0) {
PrefenceUtils.GetInstance().setIsFirst(1);
EventUtils.OnEvent("home_first");
}
} }
private void startDoubleIncomeAnimal() private void startDoubleIncomeAnimal()
...@@ -49,8 +54,6 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -49,8 +54,6 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
EventCenter.RemoveListener(MyEventType.STOP_DOUBLE_INCOME_ANIMATION, stoptDoubleIncomeAnimal); EventCenter.RemoveListener(MyEventType.STOP_DOUBLE_INCOME_ANIMATION, stoptDoubleIncomeAnimal);
} }
private void Start() private void Start()
{ {
mPresenter.GetParkInfo(); mPresenter.GetParkInfo();
...@@ -73,6 +76,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -73,6 +76,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
/// </summary> /// </summary>
public void OnClickDoubleCoin() public void OnClickDoubleCoin()
{ {
EventUtils.OnEvent("buttonClick_doubleIncome");
AudioUtils.ins.PlayBtnAudio(); AudioUtils.ins.PlayBtnAudio();
if (DoubleTime > 0) if (DoubleTime > 0)
{ {
...@@ -114,6 +118,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -114,6 +118,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
tvrewardCoinEveryMinute.text = "<size=33>" + mCarInfo.rewardCoinEveryMinute + "</size>"+"<size=25>/分钟</size>"; tvrewardCoinEveryMinute.text = "<size=33>" + mCarInfo.rewardCoinEveryMinute + "</size>"+"<size=25>/分钟</size>";
tvrewardCashEveryMinute.text = "约"+mCarInfo.rewardCashEveryMinute.ToString()+ "元/分钟"; tvrewardCashEveryMinute.text = "约"+mCarInfo.rewardCashEveryMinute.ToString()+ "元/分钟";
levelTv.text = "Lv:"+mCarInfo.levelProgress.level; levelTv.text = "Lv:"+mCarInfo.levelProgress.level;
withdrawBoxText.text = mCarInfo.wdTitle;
} }
...@@ -387,6 +392,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -387,6 +392,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
//点击天天提现 //点击天天提现
public void onClickEveryDayWithDraw() public void onClickEveryDayWithDraw()
{ {
EventUtils.OnEvent("buttonClick_dayCash");
AudioUtils.ins.PlayBtnAudio(); AudioUtils.ins.PlayBtnAudio();
EveryDayWithDraw.SetActive(true); EveryDayWithDraw.SetActive(true);
EventCenter.Broadcast(MyEventType.UPDATE_EVERY_DAT_LIST); EventCenter.Broadcast(MyEventType.UPDATE_EVERY_DAT_LIST);
...@@ -394,11 +400,20 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -394,11 +400,20 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
//点击防火罩 //点击防火罩
public void onClickProction() public void onClickProction()
{ {
EventUtils.OnEvent("buttonClick_shield");
GameObject.Find("Dialog").GetComponent<DialogControl>().showProtectionCoverDialog(); GameObject.Find("Dialog").GetComponent<DialogControl>().showProtectionCoverDialog();
} }
//点击提现商店 //点击提现商店
public void onClickWithDrawShop() public void onClickWithDrawShop(bool b)
{ {
if (b)
{
EventUtils.OnEvent("buttonClick_withdrawal");
}
else
{
EventUtils.OnEvent("buttonClick_exchangeShop");
}
GameObject.Find("Dialog").GetComponent<DialogControl>().showWithdrawShopDialog(); GameObject.Find("Dialog").GetComponent<DialogControl>().showWithdrawShopDialog();
} }
......
...@@ -30,6 +30,7 @@ public class MyDriverControl : MonoBehaviour ...@@ -30,6 +30,7 @@ public class MyDriverControl : MonoBehaviour
public void OnClickOpenMyDriverDialog() public void OnClickOpenMyDriverDialog()
{ {
EventUtils.OnEvent("buttonClick_driverHire");
GetDriverInfo(); GetDriverInfo();
} }
...@@ -83,9 +84,12 @@ public class MyDriverControl : MonoBehaviour ...@@ -83,9 +84,12 @@ public class MyDriverControl : MonoBehaviour
public void OnCkickGetDriver() public void OnCkickGetDriver()
{ {
EventUtils.OnEvent("buttonClick_driverHire_receive");
AudioUtils.ins.PlayBtnAudio(); AudioUtils.ins.PlayBtnAudio();
AdUtils.PlayRewardAd("fkqcw_driver", new Action<bool>((cb) => AdUtils.PlayRewardAd("rewardVideo_driverHire", new Action<bool>((cb) =>
{ {
EventUtils.OnEvent("rewardVideo_driverHire");
EventUtils.OnEvent("rewardVideo_all");
if (cb) if (cb)
{//广告播放完成 {//广告播放完成
HttpTool.Instance._Post("app/v1/game/fkqcw/driver/incr_time_by_video", null, new Action<StickMoneyBean>((bean) => HttpTool.Instance._Post("app/v1/game/fkqcw/driver/incr_time_by_video", null, new Action<StickMoneyBean>((bean) =>
......
...@@ -37,6 +37,7 @@ public class MyGarageControl : MonoBehaviour, MyGarageContract.View ...@@ -37,6 +37,7 @@ public class MyGarageControl : MonoBehaviour, MyGarageContract.View
//打开车库面板 //打开车库面板
public void OnClickOpenGaragePanel() public void OnClickOpenGaragePanel()
{ {
EventUtils.OnEvent("buttonClick_myCar");
AudioUtils.ins.PlayBtnAudio(); AudioUtils.ins.PlayBtnAudio();
Guide.guide.onClickStep5(); Guide.guide.onClickStep5();
OnUpdateGarageList(); OnUpdateGarageList();
...@@ -103,9 +104,15 @@ public class MyGarageControl : MonoBehaviour, MyGarageContract.View ...@@ -103,9 +104,15 @@ public class MyGarageControl : MonoBehaviour, MyGarageContract.View
HttpTool.Instance._Post("app/v3/game/fkqcw/parking/all_upgrade", null, new Action<MyGarageBean>((bean) => HttpTool.Instance._Post("app/v3/game/fkqcw/parking/all_upgrade", null, new Action<MyGarageBean>((bean) =>
{ {
mPresenter.GetGarageInfo(); mPresenter.GetGarageInfo();
GameObject.Find("Main").GetComponent<HomeInfoControl>().OnUpdateCarListData();
if (bean.status == -1)
{
GameObject.Find("Dialog").GetComponent<DialogControl>().showGoldInsufficientDialog();
}
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
mPresenter.GetGarageInfo(); mPresenter.GetGarageInfo();
GameObject.Find("Main").GetComponent<HomeInfoControl>().OnUpdateCarListData();
})); }));
} }
...@@ -116,6 +123,10 @@ public class MyGarageControl : MonoBehaviour, MyGarageContract.View ...@@ -116,6 +123,10 @@ public class MyGarageControl : MonoBehaviour, MyGarageContract.View
HttpTool.Instance._Post("app/v3/game/fkqcw/wd/do", parameters, new Action<WithdrawShopBean>((bean) => HttpTool.Instance._Post("app/v3/game/fkqcw/wd/do", parameters, new Action<WithdrawShopBean>((bean) =>
{ {
mPresenter.GetGarageInfo(); mPresenter.GetGarageInfo();
if (bean.status == 1 || bean.status == 3)
{
ToastPlugin.ToastHelper.ShowToast(bean.reason);
}
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
})); }));
......
...@@ -95,11 +95,13 @@ public class MyGarageItem : MonoBehaviour ...@@ -95,11 +95,13 @@ public class MyGarageItem : MonoBehaviour
EventCenter.Broadcast(MyEventType.UPDATE_GARAGE); EventCenter.Broadcast(MyEventType.UPDATE_GARAGE);
//更新车库列表 //更新车库列表
EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA); EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
if (bean.status == -1)
{
GameObject.Find("Dialog").GetComponent<DialogControl>().showGoldInsufficientDialog();
}
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
})); }));
} }
} }
...@@ -68,9 +68,12 @@ public class ProtectionControl : MonoBehaviour ...@@ -68,9 +68,12 @@ public class ProtectionControl : MonoBehaviour
/// </summary> /// </summary>
public void OnClcikProtion() public void OnClcikProtion()
{ {
EventUtils.OnEvent("buttonClick_shield_receive");
GameObject.Find("Dialog").GetComponent<DialogControl>().closeProtectionCoverDialog(); GameObject.Find("Dialog").GetComponent<DialogControl>().closeProtectionCoverDialog();
AdUtils.PlayRewardAd("fkqcw_protection", new Action<bool>((cb) => AdUtils.PlayRewardAd("rewardVideo_shield", new Action<bool>((cb) =>
{ {
EventUtils.OnEvent("rewardVideo_shield");
EventUtils.OnEvent("rewardVideo_all");
if (cb) if (cb)
{ {
HttpTool.Instance._Post("app/v1/game/fkqcw/protection/incr_time_by_video", null, new Action<VideoStatusBean>((bean) => HttpTool.Instance._Post("app/v1/game/fkqcw/protection/incr_time_by_video", null, new Action<VideoStatusBean>((bean) =>
......
...@@ -14,7 +14,7 @@ public class SettingControl : MonoBehaviour ...@@ -14,7 +14,7 @@ public class SettingControl : MonoBehaviour
private string NotifIsOpen = "NOTIF_IS_OPEN"; private string NotifIsOpen = "NOTIF_IS_OPEN";
private void Awake() public void Start()
{ {
//if (PlayerPrefs.GetInt(NotifIsOpen, 0) == 0) //if (PlayerPrefs.GetInt(NotifIsOpen, 0) == 0)
//{ //{
......
...@@ -46,12 +46,14 @@ public class StickMoneyItem : MonoBehaviour ...@@ -46,12 +46,14 @@ public class StickMoneyItem : MonoBehaviour
} }
} }
public void OnClickStickMoneyItem() public void OnClickStickMoneyItem()
{ {
EventUtils.OnEvent("buttonClick_stickers_receive");
AudioUtils.ins.PlayBtnAudio(); AudioUtils.ins.PlayBtnAudio();
AdUtils.PlayRewardAd("stick", new Action<bool>((cb) => AdUtils.PlayRewardAd("rewardVideo_stickers", new Action<bool>((cb) =>
{ {
EventUtils.OnEvent("rewardVideo_stickers");
EventUtils.OnEvent("rewardVideo_all");
if (cb) if (cb)
{ {
Dictionary<string, object> parm = new Dictionary<string, object>(); Dictionary<string, object> parm = new Dictionary<string, object>();
...@@ -67,11 +69,6 @@ public class StickMoneyItem : MonoBehaviour ...@@ -67,11 +69,6 @@ public class StickMoneyItem : MonoBehaviour
})); }));
} }
})); }));
} }
} }
...@@ -51,6 +51,7 @@ public class StickMoneyPanel : MonoBehaviour, StickContract.View ...@@ -51,6 +51,7 @@ public class StickMoneyPanel : MonoBehaviour, StickContract.View
//打开贴条面板 //打开贴条面板
public void OnClickOpenStickMoneyPanel() public void OnClickOpenStickMoneyPanel()
{ {
EventUtils.OnEvent("buttonClick_stickers");
AudioUtils.ins.PlayBtnAudio(); AudioUtils.ins.PlayBtnAudio();
OnUpdateStickList(); OnUpdateStickList();
EventCenter.Broadcast(MyEventType.OPEN_PANEL); EventCenter.Broadcast(MyEventType.OPEN_PANEL);
......
...@@ -105,6 +105,10 @@ public class WelfareControl : MonoBehaviour,WelfareContract.View ...@@ -105,6 +105,10 @@ public class WelfareControl : MonoBehaviour,WelfareContract.View
HttpTool.Instance._Post("app/v1/game/fkqcw/wd/do", parms, new Action<WithDrawDialogBean>((bean) => HttpTool.Instance._Post("app/v1/game/fkqcw/wd/do", parms, new Action<WithDrawDialogBean>((bean) =>
{ {
EventCenter.Broadcast(MyEventType.WITHDRAW_DIALOG, bean); EventCenter.Broadcast(MyEventType.WITHDRAW_DIALOG, bean);
if (bean.status == 1 || bean.status == 3)
{
ToastPlugin.ToastHelper.ShowToast(bean.reason);
}
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
Debug.unityLogger.Log("提现 请求失败" + code + errMsg); Debug.unityLogger.Log("提现 请求失败" + code + errMsg);
......
...@@ -153,6 +153,10 @@ public class WithDrawControl : MonoBehaviour ...@@ -153,6 +153,10 @@ public class WithDrawControl : MonoBehaviour
HttpTool.Instance._Post("app/v1/game/fkqcw/wd/do", parms, new Action<WithDrawDialogBean>((bean) => HttpTool.Instance._Post("app/v1/game/fkqcw/wd/do", parms, new Action<WithDrawDialogBean>((bean) =>
{ {
EventCenter.Broadcast(MyEventType.WITHDRAW_DIALOG, bean); EventCenter.Broadcast(MyEventType.WITHDRAW_DIALOG, bean);
if (bean.status == 1 || bean.status == 3)
{
ToastPlugin.ToastHelper.ShowToast(bean.reason);
}
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
Debug.unityLogger.Log("提现 请求失败" + code + errMsg); Debug.unityLogger.Log("提现 请求失败" + code + errMsg);
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
public class WithdrawShopControl : MonoBehaviour public class WithdrawShopControl : MonoBehaviour
{ {
......
...@@ -8,6 +8,8 @@ public class WithdrawShopItem : MonoBehaviour ...@@ -8,6 +8,8 @@ public class WithdrawShopItem : MonoBehaviour
public Text title, pbText, buttonText; public Text title, pbText, buttonText;
public Image pb; public Image pb;
public Image button;
public Sprite[] buttonImages;
public WithdrawShopBean.WD mData; public WithdrawShopBean.WD mData;
public void setItemData(WithdrawShopBean.WD data) public void setItemData(WithdrawShopBean.WD data)
...@@ -17,6 +19,14 @@ public class WithdrawShopItem : MonoBehaviour ...@@ -17,6 +19,14 @@ public class WithdrawShopItem : MonoBehaviour
buttonText.text = data.showCash; buttonText.text = data.showCash;
pb.fillAmount = (float)Math.Round(((decimal)data.progressData.currentProgress / data.progressData.maxProgress), 2); pb.fillAmount = (float)Math.Round(((decimal)data.progressData.currentProgress / data.progressData.maxProgress), 2);
this.mData = data; this.mData = data;
if (data.status != 2)
{
button.sprite = buttonImages[0];
}
else
{
button.sprite = buttonImages[1];
}
} }
public void withdraw() public void withdraw()
...@@ -28,6 +38,10 @@ public class WithdrawShopItem : MonoBehaviour ...@@ -28,6 +38,10 @@ public class WithdrawShopItem : MonoBehaviour
if (null != bean) if (null != bean)
{ {
GameObject.Find("WithdrawShopDialog").GetComponent<WithdrawShopControl>().getEverydayTaskList();//刷新数据 GameObject.Find("WithdrawShopDialog").GetComponent<WithdrawShopControl>().getEverydayTaskList();//刷新数据
if (bean.status == 1 || bean.status == 3)
{
ToastPlugin.ToastHelper.ShowToast(bean.reason);
}
} }
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
......
...@@ -36,6 +36,7 @@ public class EveryDayItem : MonoBehaviour ...@@ -36,6 +36,7 @@ public class EveryDayItem : MonoBehaviour
/// </summary> /// </summary>
public void clickCrushBtn() public void clickCrushBtn()
{ {
EventUtils.OnEvent("buttonClick_dayCash_receive");
AudioUtils.ins.PlayBtnAudio(); AudioUtils.ins.PlayBtnAudio();
if (taskItemDate.status == 1) if (taskItemDate.status == 1)
{ {
......
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