Commit f8bb183c authored by zxhljwl's avatar zxhljwl

修改

parent a8b74e8f
......@@ -19,7 +19,7 @@ public class HttpTool : MonoBehaviour
private static HttpTool _instacne = null;
private string TEST_BASE_GAEM_URL = "http://feedapitest.zhangxinhulian.com/";//测试游戏域名
private string TEST_BASE_GAEM_URL = "http://feedapitest3.zhangxinhulian.com/";//测试游戏域名
private string TEST_BASE_AD_URL = "https://bstest.zhangxinhulian.com/";//测试广告域名
private string TEST_BASE_EVENT_URL = "http://reporttest.zhangxinhulian.com/";//测试上报域名
......@@ -391,7 +391,7 @@ public class HttpTool : MonoBehaviour
paragrams["imei"] = PrefenceUtils.GetInstance().getImei();
paragrams["aid"] = PrefenceUtils.GetInstance().getAid();
#if UNITY_EDITOR
paragrams["device"] = "test0000003";
paragrams["device"] = "test0000005";
#else
paragrams["device"] = PrefenceUtils.GetInstance().getDevice();
#endif
......
......@@ -380,7 +380,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3599322565748797915}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
......@@ -744,7 +744,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4118514701274675047
RectTransform:
m_ObjectHideFlags: 0
......@@ -1000,7 +1000,7 @@ MonoBehaviour:
UpdateBtn: {fileID: 7624131750652548272}
UnLock: {fileID: 3599322565748797915}
FullOfGrades: {fileID: 8307004310667988840}
UnLockLast: {fileID: 0}
UnLockLast: {fileID: 300525325931415228}
CarImgs:
- {fileID: 21300000, guid: 07d810acca0e2884ca40fda205131275, type: 3}
- {fileID: 21300000, guid: c6b4e08cbdf2f334e9b2ee50b51897aa, type: 3}
......
......@@ -2862,10 +2862,10 @@ MonoBehaviour:
DoubleObj: {fileID: 606793024}
tvrewardCoinEveryMinute: {fileID: 30418249}
tvrewardCashEveryMinute: {fileID: 154543858}
cashNumTv: {fileID: 0}
levelTv: {fileID: 920415600}
procetTimeObj: {fileID: 70009392}
EveryDayWithDraw: {fileID: 1309034794}
avatar: {fileID: 291217793}
--- !u!1 &107878020
GameObject:
m_ObjectHideFlags: 0
......@@ -6559,7 +6559,7 @@ GameObject:
- component: {fileID: 291217794}
- component: {fileID: 291217793}
m_Layer: 5
m_Name: RawImage
m_Name: avatar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -25403,7 +25403,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}
......@@ -27081,6 +27081,7 @@ GameObject:
- component: {fileID: 1176052160}
- component: {fileID: 1176052162}
- component: {fileID: 1176052161}
- component: {fileID: 1176052163}
m_Layer: 5
m_Name: topButton
m_TagString: Untagged
......@@ -27146,6 +27147,60 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1176052159}
m_CullTransparentMesh: 0
--- !u!114 &1176052163
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1176052159}
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: 1176052161}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1317235527}
m_MethodName: withdraw
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 &1183343286
GameObject:
m_ObjectHideFlags: 0
......@@ -19,9 +19,7 @@ public class MyGaragePresenter : MyGarageContract.Presenter
mView.MyGarageInfo(bean);
}), new Action<string, string>((code, errMsg) =>
{
//Debug.unityLogger.Log("我的车库 error:", "errMsg:" + errMsg + " code:" + code);
}));
}
}
......@@ -2,6 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.UI;
public class HomeInfoControl : MonoBehaviour, HomeContract.View
......@@ -14,9 +15,11 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
//主页底部司机文字
public GameObject StickTimerObj, StickObj, MyDriverTimerObj, MyDriverObj, DoubleTimerObj, DoubleObj;
public Text tvrewardCoinEveryMinute, tvrewardCashEveryMinute;
public Text cashNumTv,levelTv;
public Text levelTv;
public GameObject procetTimeObj;
public GameObject EveryDayWithDraw;
public RawImage avatar;
private void Awake()
{
mPresenter = new HomePresenter(this);
......@@ -82,6 +85,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
public void ParkInfo(ParkInfoBean mCarInfo)
{
StartCoroutine(setUrlImage(avatar, mCarInfo.headImage));
PrefenceUtils.GetInstance().setWxAvatar(mCarInfo.headImage);
PrefenceUtils.GetInstance().setWxName(mCarInfo.nickName);
coinNum = mCarInfo.avaCoin;
......@@ -382,4 +386,21 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
{
GameObject.Find("Dialog").GetComponent<DialogControl>().showWithdrawShopDialog();
}
/**
* 显示url图片
*/
private IEnumerator setUrlImage(RawImage image, string url)
{
UnityWebRequest www = UnityWebRequestTexture.GetTexture(url);
yield return www.SendWebRequest();
if (www.isNetworkError || www.isHttpError)
{
Debug.Log(www.error);
}
else
{
image.texture = DownloadHandlerTexture.GetContent(www);//获取并创建Texture
}
}
}
using DG.Tweening;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
......@@ -109,4 +108,16 @@ public class MyGarageControl : MonoBehaviour, MyGarageContract.View
mPresenter.GetGarageInfo();
}));
}
public void withdraw()
{
Dictionary<string, object> parameters = new Dictionary<string, object>();
parameters.Add("wdId", "307");
HttpTool.Instance._Post("app/v3/game/fkqcw/wd/do", parameters, new Action<WithdrawShopBean>((bean) =>
{
mPresenter.GetGarageInfo();
}), new Action<string, string>((code, errMsg) =>
{
}));
}
}
......@@ -42,6 +42,7 @@ public class MyGarageItem : MonoBehaviour
carUpdateTv.text = carInfo.upgradePrice + "";
CarImg.sprite = CarImgs[carInfo.carId - 1];
hintButtons();
if (carInfo.parkingSpaceStatus == 0)
{
UnLockLast.SetActive(true);
......@@ -69,7 +70,9 @@ public class MyGarageItem : MonoBehaviour
UnLock.SetActive(false);
LockBtn.SetActive(false);
UpdateBtn.SetActive(false);
}
UnLockLast.SetActive(false);
}
/// <summary>
/// 车库列表点击解锁车辆
......
......@@ -24,7 +24,7 @@ public class SettingControl : MonoBehaviour
//{
// notifClose.SetActive(true);
//}
StartCoroutine(setUrlImage(avatar, PrefenceUtils.GetInstance().getWxName()));
StartCoroutine(setUrlImage(avatar, PrefenceUtils.GetInstance().getWxAvatar()));
WxNameTv.text = "微信名:" + PrefenceUtils.GetInstance().getWxName();
UserIdTv.text = "用户ID:" + PrefenceUtils.GetInstance().getUid();
QQTv.text = PlayerDataControl.Instance.MyQQ;
......
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