Commit Graph

6 Commits

Author SHA1 Message Date
lq
dba8c4a975 修改 2024-12-11 16:41:46 +08:00
lq
328c69e877 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
# Conflicts:
#	xiaofang/Assets/Script/JSONReader/JSONReader.cs
#	xiaofang/Assets/Script/UI/TemplateInfo.cs
2024-12-11 16:41:12 +08:00
lq
8f1c7cc03c 整体数据上传 2024-12-11 16:37:21 +08:00
huyulong
f0b9f206aa Taskjson的添加和Language文件的更新 2024-12-11 16:05:50 +08:00
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
lq
56174ab2ff 修改 2024-12-11 15:35:11 +08:00