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

Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

Browse Source
This commit is contained in:
lq 2024-12-11 16:00:12 +08:00
commit 22f3b964c9
2 changed files with 1185 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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