Compare commits
No commits in common. "cd00ac298d5564128c5cb1a95a5b2cd54f5df54d" and "c42c9208921a08181bd4c26ff2f5d608bcd746ba" have entirely different histories.
cd00ac298d
...
c42c920892
@ -6259,6 +6259,117 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1029618134}
|
m_GameObject: {fileID: 1029618134}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1 &1050248874
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1050248876}
|
||||||
|
- component: {fileID: 1050248875}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Global
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &1050248875
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1050248874}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 761bde84815251c42a1d655b4e8c2b0d, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
serverResponse:
|
||||||
|
code: 0
|
||||||
|
message:
|
||||||
|
data:
|
||||||
|
userId: 0
|
||||||
|
userName:
|
||||||
|
token:
|
||||||
|
nickName:
|
||||||
|
headImg:
|
||||||
|
gender:
|
||||||
|
birthday:
|
||||||
|
idCard:
|
||||||
|
inviteCodeMy:
|
||||||
|
inviteCodeBind:
|
||||||
|
bindTime:
|
||||||
|
station:
|
||||||
|
cuteNo:
|
||||||
|
memberTime:
|
||||||
|
response:
|
||||||
|
code: 0
|
||||||
|
message:
|
||||||
|
data:
|
||||||
|
carrySeconds: 0
|
||||||
|
gameEscapeRoomResponseVoList: []
|
||||||
|
gameEscapeModel:
|
||||||
|
id: 0
|
||||||
|
gameNo:
|
||||||
|
demonMode: 0
|
||||||
|
startTime:
|
||||||
|
betTime:
|
||||||
|
countTime:
|
||||||
|
settleTime:
|
||||||
|
status: 0
|
||||||
|
roomNoKill:
|
||||||
|
roomNoRemain:
|
||||||
|
beansCoinAll: 0
|
||||||
|
beansCoinKill: 0
|
||||||
|
beansCoinRemain: 0
|
||||||
|
beansCoinFee: 0
|
||||||
|
beansCoinRank: 0
|
||||||
|
beansCoinDivide: 0
|
||||||
|
realPlayerInfo:
|
||||||
|
code: 0
|
||||||
|
message:
|
||||||
|
data:
|
||||||
|
userId: 0
|
||||||
|
userName: 0
|
||||||
|
token:
|
||||||
|
nickName:
|
||||||
|
headImg:
|
||||||
|
gender: 0
|
||||||
|
birthday:
|
||||||
|
voluteCoin: 0
|
||||||
|
beansCoin: 0
|
||||||
|
ichorCoin: 0
|
||||||
|
idCard:
|
||||||
|
bank:
|
||||||
|
realName:
|
||||||
|
isCert: 0
|
||||||
|
inviteCodeMy:
|
||||||
|
inviteCodeBind:
|
||||||
|
bindTime:
|
||||||
|
station: 0
|
||||||
|
cuteNo:
|
||||||
|
memberTime:
|
||||||
|
isMember: 0
|
||||||
|
unionId: 0
|
||||||
|
--- !u!4 &1050248876
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1050248874}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 960.40076, y: 1284.435, z: -10.213597}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 4
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &1080349907
|
--- !u!1 &1080349907
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -14,10 +14,9 @@ public class Scene_main_jiekou :Base
|
|||||||
|
|
||||||
|
|
||||||
//商城信息
|
//商城信息
|
||||||
private MallResponsePro _mallResponsePro;//<2F>냘죗깊써뭐竟
|
public MallResponsePro _mallResponsePro;//É̳ÇÁбí½á¹¹Ìå
|
||||||
private getMallList21 _getMallList21;//商城列表获取方法
|
private getMallList21 _getMallList21;//商城列表获取方法
|
||||||
//<2F>냘info俚듕
|
|
||||||
public Dictionary<int, ProductPro> shopItemDic;
|
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
|
|
||||||
@ -25,8 +24,8 @@ public class Scene_main_jiekou :Base
|
|||||||
{
|
{
|
||||||
instance = this;
|
instance = this;
|
||||||
|
|
||||||
//testLogo();
|
testLogo();
|
||||||
//getPlayerInfo();
|
//getInfo();
|
||||||
// getShopInfo();
|
// getShopInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,25 +47,13 @@ public class Scene_main_jiekou :Base
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public async Task ShopInfo()
|
public async Task ShopInfo()
|
||||||
{
|
{
|
||||||
//瓊품헌왕
|
|
||||||
shopItemDic = null;
|
|
||||||
_mallResponsePro = null;
|
|
||||||
_getMallList21 = null;
|
|
||||||
|
|
||||||
|
|
||||||
//路畇畇흙
|
|
||||||
_mallResponsePro = new MallResponsePro();
|
_mallResponsePro = new MallResponsePro();
|
||||||
_getMallList21 = new getMallList21();
|
_getMallList21 = new getMallList21();
|
||||||
_mallResponsePro = await _getMallList21.getMallList(1, 1, 20);
|
|
||||||
|
|
||||||
foreach (ProductPro go in _mallResponsePro.Data.DataList)
|
_mallResponsePro = await _getMallList21.getMallList(1, 1, 20);
|
||||||
{
|
|
||||||
shopItemDic.Add(go.ProductId,go);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,12 +27,8 @@ public class main_shop :BaseUIPanel
|
|||||||
addEventPopUp("먦·Å", 3f);
|
addEventPopUp("먦·Å", 3f);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// 实例化 Panel 并设置缩放为 0.5
|
||||||
//await Scene_main_jiekou.instance.ShopInfo();
|
GameObject.Instantiate(Panel, canvas.transform);
|
||||||
//获取商城列表
|
|
||||||
Debug.Log("获取商城列表");
|
|
||||||
// 实例化 Panel
|
|
||||||
GameObject.Instantiate(Panel, canvas.transform);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,22 +5,7 @@ using UnityEngine;
|
|||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
|
|
||||||
public class shopPanel: ui_huodong
|
public class shopPanel: ui_huodong
|
||||||
{
|
{
|
||||||
public List<itemInfo> itemInfos = new List<itemInfo>();
|
|
||||||
|
|
||||||
void initShop()
|
|
||||||
{
|
|
||||||
|
|
||||||
int index= Scene_main_jiekou.instance._mallResponsePro.Data.TotalCount;//商城的商品数量
|
|
||||||
|
|
||||||
foreach (itemInfo item in itemInfos)
|
|
||||||
{
|
|
||||||
if (index>0)
|
|
||||||
{
|
|
||||||
item.gameObject.SetActive(true);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@ public class ui_huodong :main_BaseShowPanel
|
|||||||
[Header("面板,请和按钮一一对应")]
|
[Header("面板,请和按钮一一对应")]
|
||||||
public List<GameObject> panels=new List<GameObject>();
|
public List<GameObject> panels=new List<GameObject>();
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
public virtual void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
base.showPanel(base._panel);
|
base.showPanel(base._panel);
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@ GameObject:
|
|||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 5363579444209329408}
|
- component: {fileID: 5363579444209329408}
|
||||||
- component: {fileID: 2302796054771788344}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: shopPanel
|
m_Name: shopPanel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -39,21 +38,6 @@ RectTransform:
|
|||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &2302796054771788344
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5363579444209329409}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: e3c192bd726c790488c8fe8895226742, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
_panel: {fileID: 957974660627982085}
|
|
||||||
btns: []
|
|
||||||
panels: []
|
|
||||||
--- !u!1001 &5363579443773024874
|
--- !u!1001 &5363579443773024874
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -160,11 +144,6 @@ RectTransform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 5126270615579512174, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3}
|
m_CorrespondingSourceObject: {fileID: 5126270615579512174, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3}
|
||||||
m_PrefabInstance: {fileID: 5363579443773024874}
|
m_PrefabInstance: {fileID: 5363579443773024874}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &957974660627982085 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 5126270615579512175, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 5363579443773024874}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1001 &5363579444857241352
|
--- !u!1001 &5363579444857241352
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
Loading…
Reference in New Issue
Block a user