Skip to content

W
wdlc_mjb_unity
Commit 11276f8c authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改提现列表

parent 308273e4
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 42 deletions
Assets/Game/Main/Resource/LeeScripts/TiXianCell.cs
View file @ 11276f8c
......@@ -83,7 +83,7 @@ public class TiXianCell : BasePanel
case 1:
ToastHelper.ShowToast(obj.reason);
LeeMainController.Instance.UpdateZhongCaiTiXianPanel();
return;
case 2:
case 3:
......@@ -92,6 +92,8 @@ public class TiXianCell : BasePanel
case 7:
return;
}
EventCenter.Broadcast(MyEventType.RefreshPlantTreeWithDraw);
LeeMainController.Instance.UpdateZhongCaiTiXianPanel();
EventUtils.OnEvent("jy_ts_click");
DialogControl.Instance.nme.Show(info.id, obj);
});
......@@ -132,7 +134,7 @@ public class TiXianCell : BasePanel
yield return new WaitForSeconds(1f);
if (countTime <= 0)
{
// RefreshHomeInfo();
EventCenter.Broadcast(MyEventType.RefreshPlantTreeWithDraw);
StopCoroutine(lotteryControl);
break;
}
......
Assets/Game/Main/Resource/ui/WithdrawEveryDay.meta 0 → 100644
View file @ 11276f8c
fileFormatVersion: 2
guid: c8769dd604faf4fb9b727d8d2fe57934
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ 11276f8c
......@@ -19023,7 +19023,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
content: {fileID: 646497721}
twocontent: {fileID: 633174702}
plantItemPrfab: {fileID: 2279313733761871683, guid: 302184b1d3ad9466e9a1f37c9c348a6a,
plantItemPrfab: {fileID: 996605790905112305, guid: 3d5783f2c1a9e85449a2d72fb9854d80,
type: 3}
item2: {fileID: 519350962887166465, guid: 0187c168f5bfa4800be3c92098065283, type: 3}
item3: {fileID: 637023499005815143, guid: 4c67781a7885d47fda76c761f97e63c5, type: 3}
......@@ -20691,8 +20691,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 646497722}
- component: {fileID: 646497724}
- component: {fileID: 646497723}
- component: {fileID: 646497724}
m_Layer: 5
m_Name: Content
m_TagString: Untagged
......@@ -20717,7 +20717,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.0000026958473}
m_SizeDelta: {x: -719.1891, y: 40}
m_SizeDelta: {x: -35.494507, y: 10}
m_Pivot: {x: 0, y: 1}
--- !u!114 &646497723
MonoBehaviour:
......@@ -20742,22 +20742,21 @@ MonoBehaviour:
m_GameObject: {fileID: 646497721}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Left: 5
m_Right: 0
m_Top: 20
m_Top: 10
m_Bottom: 20
m_ChildAlignment: 1
m_Spacing: 20
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 654, y: 156}
m_Spacing: {x: 0, y: 20}
m_Constraint: 1
m_ConstraintCount: 1
--- !u!1 &651687696
GameObject:
m_ObjectHideFlags: 0
......@@ -63632,8 +63631,8 @@ 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: 24.1, y: -175.9}
m_SizeDelta: {x: 716.1891, y: 756.49896}
m_AnchoredPosition: {x: 11.753, y: -159.5}
m_SizeDelta: {x: 691.4945, y: 723.6514}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2086848423
MonoBehaviour:
Assets/Game/Main/Scenes/InitScene.unity
View file @ 11276f8c
......@@ -382,8 +382,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 788e2a3a769e26b459cd63d4a5de7d76, type: 3}
m_Name:
m_EditorClassIdentifier:
isTest: 1
isShowLog: 1
isTest: 0
isShowLog: 0
XyDialog: {fileID: 0}
--- !u!1 &2010092450
GameObject:
......
Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
View file @ 11276f8c
......@@ -31,19 +31,48 @@ public class PlantTreeControl : MonoBehaviour
//提现商城数据
private void getWithDrawData()
{
HttpTool.Instance._Get("app/v3/wdlc/wd/info", null, new Action<WithDrawBean>((bean) =>
DialogControl.Instance.NetWorkRequest<CashOutInfo>(true, "app/v3/cscmnq/info", null, (model) =>
{
InitWithDrawInfo(bean);
//ShowCashOut();
InitWithDrawInfo(model);
});
// HttpTool.Instance._Get("app/v3/cscmnq/info", null, new Action<CashOutInfo>((bean) =>
//{
// InitWithDrawInfo(bean);
// //ShowCashOut();
//scrollview1.gameObject.SetActive(false);
// //scrollview1.gameObject.SetActive(false);
}), new Action<string, string>((code, errMsg) =>
//}), new Action<string, string>((code, errMsg) =>
//{
// Debug.unityLogger.Log("提现列表 请求失败" + code + errMsg);
//}));
}
private void InitWithDrawInfo(CashOutInfo bean)
{
Debug.Log("加载数据");
if (bean.wdDataList != null && bean.wdDataList.Count > 0)
{
Debug.unityLogger.Log("提现列表 请求失败" + code + errMsg);
}));
int num = content.transform.childCount;
if (num > 0)
{
for (int i = 0; i < num; i++)
{
Destroy(content.transform.GetChild(i).gameObject);
}
}
for (int i = 0; i < bean.wdDataList.Count; i++)
{
GameObject itemObj = Instantiate(plantItemPrfab, content.transform);
content.GetComponent<GridLayoutGroup>().padding.left = 5;
itemObj.GetComponent<TiXianCell>().Init(bean.wdDataList[i]);
}
}
}
//获取兑换列表
private void getExchangeListData()
{
......@@ -83,7 +112,7 @@ public class PlantTreeControl : MonoBehaviour
foreach (GoodsBean itemData in bean)
{
GameObject itemObj = Instantiate(item3, content.transform);
content.GetComponent<VerticalLayoutGroup>().padding.left = 0;
content.GetComponent<GridLayoutGroup>().padding.left = 0;
itemObj.GetComponent<JiluItem>().setData(itemData);
}
......
Assets/Resources/Cell.prefab
View file @ 11276f8c
......@@ -2012,7 +2012,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 09:42:11
m_Text:
--- !u!1 &6738484659969736563
GameObject:
m_ObjectHideFlags: 0
......
Packages/packages-lock.json
View file @ 11276f8c
......@@ -19,7 +19,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.analytics": {
"version": "3.3.5",
......@@ -28,21 +28,21 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.collab-proxy": {
"version": "1.2.16",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ide.rider": {
"version": "1.1.4",
......@@ -51,14 +51,14 @@
"dependencies": {
"com.unity.test-framework": "1.1.1"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.multiplayer-hlapi": {
"version": "1.0.8",
......@@ -67,7 +67,7 @@
"dependencies": {
"nuget.mono-cecil": "0.1.6-preview"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.purchasing": {
"version": "2.2.1",
......@@ -76,7 +76,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.test-framework": {
"version": "1.1.20",
......@@ -87,7 +87,7 @@
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.textmeshpro": {
"version": "2.1.1",
......@@ -96,14 +96,14 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.timeline": {
"version": "1.2.17",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ugui": {
"version": "1.0.0",
......@@ -122,14 +122,14 @@
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"nuget.mono-cecil": {
"version": "0.1.6-preview",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.modules.ai": {
"version": "1.0.0",
......
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