主界面差高亮的,剩下的全合并了,小bug头像更新需要时间
This commit is contained in:
parent
c3ea86e590
commit
4b04861df9
@ -2112,7 +2112,7 @@ 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: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 125}
|
||||
m_SizeDelta: {x: 1179, y: 1728}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9051052528993816628
|
||||
@ -3148,7 +3148,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -1063
|
||||
value: -1187
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
@ -1699,6 +1699,7 @@ GameObject:
|
||||
- component: {fileID: 264583910}
|
||||
- component: {fileID: 264583909}
|
||||
- component: {fileID: 264583911}
|
||||
- component: {fileID: 264583912}
|
||||
m_Layer: 5
|
||||
m_Name: kuangchang
|
||||
m_TagString: Untagged
|
||||
@ -1717,7 +1718,8 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 2081822475}
|
||||
m_Father: {fileID: 712977342}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -1808,6 +1810,19 @@ MonoBehaviour:
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &264583912
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 264583907}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9cdd24b678761ff4a945ba07d88461bc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
redDot: {fileID: 2081822474}
|
||||
--- !u!1 &265683438
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8534,9 +8549,9 @@ MonoBehaviour:
|
||||
panel3: {fileID: 0}
|
||||
panel4: {fileID: 0}
|
||||
Game_BTN1: {fileID: 1086743553}
|
||||
Game_BTN1_index: 0
|
||||
Game_BTN1_index: 3
|
||||
Game_BTN2: {fileID: 1121658608}
|
||||
Game_BTN2_index: 0
|
||||
Game_BTN2_index: 1
|
||||
--- !u!1 &1442926234
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -12397,6 +12412,82 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2064335498}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &2081822474
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2081822475}
|
||||
- component: {fileID: 2081822477}
|
||||
- component: {fileID: 2081822476}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2081822475
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2081822474}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 264583908}
|
||||
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: 80, y: 608}
|
||||
m_SizeDelta: {x: 70, y: 76}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2081822476
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2081822474}
|
||||
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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 0a83568b7b9108349ad8d1002ec6919d, 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 &2081822477
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2081822474}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &2088709624
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -189,9 +189,9 @@ public class mainBTN :main_game
|
||||
this.playerWoDanNumber.text = playerWoDanNumber;
|
||||
}
|
||||
|
||||
public void UpDatePlayer(Sprite playerIcon, string playerName,string playerWoKeNumber,string playerWoDanNumber)
|
||||
public async void UpDatePlayer(string playerIconURL, string playerName,string playerWoKeNumber,string playerWoDanNumber)
|
||||
{
|
||||
this.playerIcon.sprite = playerIcon;
|
||||
this.playerIcon.sprite = await Base.GlobalObj.GetComponent<ImageLoader>().LoadImageAsync(playerIconURL);
|
||||
this.playerName.text = playerName;
|
||||
this.playerWoKeNumber.text = playerWoKeNumber;
|
||||
this.playerWoDanNumber.text = playerWoDanNumber;
|
||||
|
@ -2,7 +2,7 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
public class main_game :Base
|
||||
{
|
||||
@ -57,14 +57,14 @@ public class main_game :Base
|
||||
if (Game_BTN1 != null)
|
||||
{
|
||||
Game_BTN1.onClick.AddListener(() => {
|
||||
asyncOnShopBTN(Game_BTN1, 0);
|
||||
asyncOnShopBTN(Game_BTN1, Game_BTN1_index);
|
||||
});
|
||||
}
|
||||
|
||||
if (Game_BTN2 != null)
|
||||
{
|
||||
Game_BTN2.onClick.AddListener(() => {
|
||||
asyncOnShopBTN(Game_BTN2, 0);
|
||||
asyncOnShopBTN(Game_BTN2, Game_BTN2_index);
|
||||
});
|
||||
}
|
||||
|
||||
@ -98,8 +98,9 @@ public class main_game :Base
|
||||
{
|
||||
await ButtonClickAnimationAsync(BTN.gameObject);
|
||||
|
||||
BTN.transform.GetComponent<main_RedDot>().HideRedDot();
|
||||
BTN.transform.GetComponent<main_RedDot>().HideRedDot();
|
||||
|
||||
SceneManager.LoadScene(index);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -20,7 +20,11 @@ public class main_shop :BaseUIPanel
|
||||
{
|
||||
await ButtonClickAnimationAsync(BTN.gameObject);
|
||||
|
||||
BTN.GetComponent<main_RedDot>().HideRedDot();
|
||||
if (BTN.GetComponent<main_RedDot>()!=null)
|
||||
{
|
||||
BTN.GetComponent<main_RedDot>().HideRedDot();
|
||||
}
|
||||
|
||||
|
||||
if (Panel == null)
|
||||
{
|
||||
|
@ -19,10 +19,10 @@ public class itemInfo : MonoBehaviour
|
||||
|
||||
|
||||
|
||||
public void initShow(int id, Sprite icon, string name, string price)
|
||||
public async void initShow(int id, string iconURL, string name, string price)
|
||||
{
|
||||
this.id = id;
|
||||
iconImage.sprite = icon;
|
||||
iconImage.sprite = await Base.GlobalObj.GetComponent<ImageLoader>().LoadImageAsync(iconURL);
|
||||
nameText.text = name;
|
||||
priceText.text = "£¤" + price;
|
||||
}
|
||||
|
@ -33,10 +33,10 @@ public class shopPanel: ui_huodong
|
||||
|
||||
// 更新当前 itemInfo 显示项
|
||||
itemInfos[index].gameObject.SetActive(true); // 显示当前项
|
||||
itemInfos[index].initShow(go.Value.ProductId, go.Value.ProductName,go.Value.Price.ToString());
|
||||
itemInfos[index].initShow(go.Value.ProductId,go.Value.ProductPic, go.Value.ProductName,go.Value.Price.ToString());
|
||||
itemInfos[index].GetComponent<Button>().onClick.AddListener(async()=> {
|
||||
await Scene_main_jiekou.instance.ShopItemDetail(go.Value.ProductId);
|
||||
GameObject.Instantiate(Panel, GameObject.Find("Canvas").transform).GetComponent<wokePanel>().initShow(go.Value.ProductId,go.Value.ProductName, go.Value.ProductName, go.Value.Price.ToString(), Scene_main_jiekou.instance._getProductResponse.Data.ProductName+":²âÊÔÎı¾");
|
||||
GameObject.Instantiate(Panel, GameObject.Find("Canvas").transform).GetComponent<wokePanel>().initShow(go.Value.ProductId, go.Value.ProductPic, go.Value.ProductName, go.Value.ProductName, go.Value.Price.ToString(), Scene_main_jiekou.instance._getProductResponse.Data.ProductName+":˛âĘÔÎÄąž");
|
||||
});
|
||||
index++;
|
||||
|
||||
|
@ -7,7 +7,7 @@ using TMPro;
|
||||
public class wokePanel : ui_huodong
|
||||
{
|
||||
|
||||
public Sprite icon;
|
||||
public Image icon;
|
||||
[Header("大的物品名的TextPro")]
|
||||
public TextMeshProUGUI BigNameText;
|
||||
[Header("物品名的TextPro")]
|
||||
@ -21,10 +21,10 @@ public class wokePanel : ui_huodong
|
||||
|
||||
public Button BuyBtn;
|
||||
|
||||
public void initShow(int id,string iconUrl,string BigNameText,string NameText,string priceText,string info)
|
||||
public async void initShow(int id,string iconUrl,string BigNameText,string NameText,string priceText,string info)
|
||||
{
|
||||
this.id = id;
|
||||
//this.icon = icon;
|
||||
this.icon.sprite = await Base.GlobalObj.GetComponent<ImageLoader>().LoadImageAsync(iconUrl);
|
||||
this.BigNameText.text = BigNameText;
|
||||
this.NameText.text = NameText;
|
||||
this.priceText.text = "¥" + priceText;
|
||||
|
@ -31,7 +31,7 @@ public class TradeUnion : MonoBehaviour
|
||||
GameObject union = GameObject.Instantiate(gonghuiPrefab, content);
|
||||
union.name = "union_" + i;
|
||||
TradeDes tradeDes = union.GetComponent<TradeDes>();
|
||||
tradeDes.SetInfo(unionPage.Data.DataList[i],transform);
|
||||
tradeDes.SetInfo(unionPage.Data.DataList[i],GameObject.Find("Canvas").transform);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -23,7 +23,7 @@ public class LoginItem :MonoBehaviour
|
||||
{
|
||||
GameObject Lhitem = (GameObject)Instantiate(Resources.Load("LLPrefabs/Beautiful_numberttem"), contentItem);
|
||||
Lhitem.GetComponent<NumberTc>().BeautifulNumber.text = idResponse.Data.DataList[i].CuteNo;
|
||||
Lhitem.GetComponent<NumberTc>().price.text = idResponse.Data.DataList[i].BeansCoin.ToString();
|
||||
Lhitem.GetComponent<NumberTc>().price.text = idResponse.Data.DataList[i].BeansCoin.ToString("f2");
|
||||
Lhitem.GetComponent<NumberTc>().id = idResponse.Data.DataList[i].Id;
|
||||
if (idResponse.Data.DataList[i].Type == 1)
|
||||
{
|
||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,2 +1,2 @@
|
||||
!@#¥%……&*()——+|}{”:?》《,。、;’【】、=-0987654321奇迹蜗牛逃亡霸主来袭手机号验证码记录排行灵液密码登入录获取没有立刻脱失败没关系拿到了榜单爷傲奈我何今日排行骑士投入秒后比赛开始灭霸雷神超人蝙蝠钢铁毒液蜘蛛美队卡槽豌豆黄毒蘑菇计时器激素去数加速器商店立刻即工会信息申请申请我的背包碎片兑换公告福利通知活动详情参与规则靓号商店取消确认补充打工时长剩余个人中心邀请好友一二三四五六七八九十鹅的主身份证保存认证真实完成收货新增加编辑安全退出修改注销订转赠送壳兑换购买赤橙黄绿青蓝紫鬼王怪物粉色嘻嬉笑舍洞窟趣巢穴破烂豆逗商城昨天鱼塘联系方式本公会立志做最强蜗牛最牛逼公会!请各位加入我吧!
|
||||
加入我们有鸡蛋领的哦!集齐100片iPhone16pm碎片可兑换一台iPhone16pm碎片可通过哔哩吧啦哔哩吧啦等方式获取。获取时间仅剩巴啦啦小魔仙小时!实名认证真实姓名银行卡请输入名称请输入银行卡绑定手机号收货地址账号安全账号注销后,背包内一切物品归零 不可恢复!是否确认注销该账号?暂无地址账用户协议隐私政策检查更收货人谢梦茜手机号码请输入手机号码所在地区省、市区县详细地址小区楼栋门牌号等余美丽浙江省杭州市杨帆中心1号楼1607
|
||||
加入我们有鸡蛋领的哦!集齐100片iPhone16pm碎片可兑换一台iPhone16pm碎片可通过哔哩吧啦哔哩吧啦等方式获取。获取时间仅剩巴啦啦小魔仙小时!实名认证真实姓名银行卡请输入名称请输入银行卡绑定手机号收货地址账号安全账号注销后,背包内一切物品归零 不可恢复!是否确认注销该账号?暂无地址账用户协议隐私政策检查更收货人谢梦茜手机号码请输入手机号码所在地区省、市区县详细地址小区楼栋门牌号等余美丽浙江省杭州市杨帆中心1号楼1607雄霸天下
|
@ -252,7 +252,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1001758454263862281, guid: 24d39cbc0ad9ddc4188e8448773f23c3, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: 193
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1001758454263862281, guid: 24d39cbc0ad9ddc4188e8448773f23c3, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
@ -785,88 +785,12 @@ MonoBehaviour:
|
||||
_panel: {fileID: 499058876202855932}
|
||||
btns: []
|
||||
panels: []
|
||||
icon: {fileID: 0}
|
||||
icon: {fileID: 499058876272741911}
|
||||
BigNameText: {fileID: 499058875440004111}
|
||||
NameText: {fileID: 499058876205321731}
|
||||
priceText: {fileID: 499058876083203626}
|
||||
info: {fileID: 499058874787693951}
|
||||
BuyBtn: {fileID: 499058874945094317}
|
||||
--- !u!1 &499058875926305708
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 499058875926305707}
|
||||
- component: {fileID: 499058875926305705}
|
||||
- component: {fileID: 499058875926305706}
|
||||
m_Layer: 5
|
||||
m_Name: cion
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &499058875926305707
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 499058875926305708}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.65, y: 0.65, z: 0.65}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 499058876272741912}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &499058875926305705
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 499058875926305708}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &499058875926305706
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 499058875926305708}
|
||||
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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: e8f2a724bc40d5f4bac92a8e36c6732a, 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!1 &499058876029164945
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1735,8 +1659,7 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 499058875926305707}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 499058876109961378}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
Loading…
Reference in New Issue
Block a user