Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master

This commit is contained in:
wangyang 2025-05-22 10:03:08 +08:00
commit 3243c02642
2 changed files with 1177 additions and 3 deletions

File diff suppressed because it is too large Load Diff

View File

@ -5,6 +5,18 @@ using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class allPlants
{
public class plantPart
{
public string partName;
public string partIntro;
}
public string plantName;
public List<plantPart> plantParts;
}
public class UI_GraphicRextualPanel : BasePanel
{
public RawImage rawImage;
@ -15,6 +27,13 @@ public class UI_GraphicRextualPanel : BasePanel
//ÄÚČÝ
public TextMeshProUGUI ContentTextMeshProUGUI;
public allPlants allPlants;
public void Init()
{
allPlants = JsonManager.Instance.LoadData<allPlants>("plantsInfo");
}
protected override void Awake()
{
base.Awake();