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

Compare commits

base: wulongxiao:480d7d6338cddbf0394e9e4454f982da9b2857a9
Branches Tags
wulongxiao:main
..
compare: wulongxiao:e0ef89a8cfb64341378541f16f1e9f5cffbc01eb
Branches Tags
wulongxiao:main

No commits in common. "480d7d6338cddbf0394e9e4454f982da9b2857a9" and "e0ef89a8cfb64341378541f16f1e9f5cffbc01eb" have entirely different histories.
480d7d6338 ... e0ef89a8cf

2 changed files with 467 additions and 1192 deletions
Show Stats Expand all files Collapse all files

1654
xiaofang/Assets/Resources/JsonAsset/Language.json
View File

File diff suppressed because it is too large Load Diff

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

@ -5,12 +5,7 @@ using UnityEngine.UI;
public class TemplateInfo : MonoBehaviour
{
<<<<<<< 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
void Start()
{