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

Compare commits

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

2 Commits
e0ef89a8cf ... 480d7d6338

Author SHA1 Message Date
huyulong
480d7d6338 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 
# Conflicts:
#	xiaofang/Assets/Script/UI/TemplateInfo.cs
 2024-12-11 15:58:15 +08:00
huyulong
48f4c0dc98 UI相关文件，以及Language表更新 2024-12-11 15:55:46 +08:00
2 changed files with 1185 additions and 460 deletions
Show Stats 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()
{ {