From 4b04861df9f8a430bb0d92571d7a13c0146ccdb0 Mon Sep 17 00:00:00 2001 From: wulongxiao <2545507770@qq.com> Date: Thu, 28 Nov 2024 07:00:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=B7=AE=E9=AB=98?= =?UTF-8?q?=E4=BA=AE=E7=9A=84=EF=BC=8C=E5=89=A9=E4=B8=8B=E7=9A=84=E5=85=A8?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BA=86=EF=BC=8C=E5=B0=8Fbug=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E6=9B=B4=E6=96=B0=E9=9C=80=E8=A6=81=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LLPrefabs/zhanghao_SafetyPanel.prefab | 4 +- .../Assets/Scenes/Scene_main.unity | 97 +- .../Assets/Scripts/Scene_main/mainBTN.cs | 4 +- .../Assets/Scripts/Scene_main/main_game.cs | 9 +- .../Assets/Scripts/Scene_main/main_shop.cs | 6 +- .../Assets/Scripts/Scene_shop/itemInfo.cs | 4 +- .../Assets/Scripts/Scene_shop/shopPanel.cs | 4 +- .../Assets/Scripts/Scene_shop/wokePanel.cs | 6 +- .../Assets/Scripts/Trade/TradeUnion.cs | 2 +- .../Assets/Scripts/lianghaoLL/LoginItem.cs | 2 +- .../AlibabaPuHuiTi-3-95-ExtraBold/hyl.asset | 10095 ++++++++------- .../AlibabaPuHuiTi-3-95-ExtraBold/hyl_0.asset | 10216 ++++++++-------- .../Assets/font_textmeshpro/hyl.txt | 2 +- .../Assets/prefabs/New_GonghuiInfo.prefab | 2 +- .../Assets/prefabs/woniukaPanel.prefab | 81 +- 15 files changed, 10972 insertions(+), 9562 deletions(-) diff --git a/TheStrongestSnail/Assets/Resources/LLPrefabs/zhanghao_SafetyPanel.prefab b/TheStrongestSnail/Assets/Resources/LLPrefabs/zhanghao_SafetyPanel.prefab index d034f72..c6f6079 100644 --- a/TheStrongestSnail/Assets/Resources/LLPrefabs/zhanghao_SafetyPanel.prefab +++ b/TheStrongestSnail/Assets/Resources/LLPrefabs/zhanghao_SafetyPanel.prefab @@ -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 diff --git a/TheStrongestSnail/Assets/Scenes/Scene_main.unity b/TheStrongestSnail/Assets/Scenes/Scene_main.unity index 0d77207..adc49fa 100644 --- a/TheStrongestSnail/Assets/Scenes/Scene_main.unity +++ b/TheStrongestSnail/Assets/Scenes/Scene_main.unity @@ -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 diff --git a/TheStrongestSnail/Assets/Scripts/Scene_main/mainBTN.cs b/TheStrongestSnail/Assets/Scripts/Scene_main/mainBTN.cs index 2aa0adf..85a8d34 100644 --- a/TheStrongestSnail/Assets/Scripts/Scene_main/mainBTN.cs +++ b/TheStrongestSnail/Assets/Scripts/Scene_main/mainBTN.cs @@ -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().LoadImageAsync(playerIconURL); this.playerName.text = playerName; this.playerWoKeNumber.text = playerWoKeNumber; this.playerWoDanNumber.text = playerWoDanNumber; diff --git a/TheStrongestSnail/Assets/Scripts/Scene_main/main_game.cs b/TheStrongestSnail/Assets/Scripts/Scene_main/main_game.cs index 4a28ef0..73dc8a8 100644 --- a/TheStrongestSnail/Assets/Scripts/Scene_main/main_game.cs +++ b/TheStrongestSnail/Assets/Scripts/Scene_main/main_game.cs @@ -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().HideRedDot(); + BTN.transform.GetComponent().HideRedDot(); + SceneManager.LoadScene(index); } } diff --git a/TheStrongestSnail/Assets/Scripts/Scene_main/main_shop.cs b/TheStrongestSnail/Assets/Scripts/Scene_main/main_shop.cs index 8f10990..aba4d7f 100644 --- a/TheStrongestSnail/Assets/Scripts/Scene_main/main_shop.cs +++ b/TheStrongestSnail/Assets/Scripts/Scene_main/main_shop.cs @@ -20,7 +20,11 @@ public class main_shop :BaseUIPanel { await ButtonClickAnimationAsync(BTN.gameObject); - BTN.GetComponent().HideRedDot(); + if (BTN.GetComponent()!=null) + { + BTN.GetComponent().HideRedDot(); + } + if (Panel == null) { diff --git a/TheStrongestSnail/Assets/Scripts/Scene_shop/itemInfo.cs b/TheStrongestSnail/Assets/Scripts/Scene_shop/itemInfo.cs index e5f8028..08f5e03 100644 --- a/TheStrongestSnail/Assets/Scripts/Scene_shop/itemInfo.cs +++ b/TheStrongestSnail/Assets/Scripts/Scene_shop/itemInfo.cs @@ -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().LoadImageAsync(iconURL); nameText.text = name; priceText.text = "￥" + price; } diff --git a/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs b/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs index f56c927..fd7d498 100644 --- a/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs +++ b/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs @@ -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