wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
lq 2024-12-11 16:41:46 +08:00
parent 328c69e877
commit dba8c4a975
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xiaofang/Assets/Script/UI/TemplateInfo.cs
View File

@ -5,17 +5,7 @@ using UnityEngine.UI;
public class TemplateInfo : MonoBehaviour
{
<<<<<<< HEAD
public Text templateText;
=======
//<<<<<<< HEAD:xiaofang/Assets/Script/hylScripts/Free01/NetPings.cs
//=======
public Text templateText;
//>>>>>>> e0ef89a8cfb64341378541f16f1e9f5cffbc01eb:xiaofang/Assets/Script/UI/TemplateInfo.cs
// Start is called before the first frame update
>>>>>>> f0b9f206aabafd00c78d6374b48d4057bbe57cf6
void Start()
{