lq
328c69e877
# Conflicts: # xiaofang/Assets/Script/JSONReader/JSONReader.cs # xiaofang/Assets/Script/UI/TemplateInfo.cs
30 lines
621 B
C#
30 lines
621 B
C#
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using UnityEngine;
|
|
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()
|
|
{
|
|
|
|
}
|
|
|
|
// Update is called once per frame
|
|
void Update()
|
|
{
|
|
|
|
}
|
|
}
|