diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000..ddb6ff85 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "visualstudiotoolsforunity.vstuc" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..da60e25a --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..d7b07d06 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,60 @@ +{ + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.vs": true, + "**/.gitmodules": true, + "**/.vsconfig": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "Logs/": true, + "logs/": true, + "ProjectSettings/": true, + "UserSettings/": true, + "temp/": true, + "Temp/": true + }, + "dotnet.defaultSolution": "virtualframework.sln" +} \ No newline at end of file diff --git a/Assets/Art/UIPrefab/UITextTip.prefab b/Assets/Art/UIPrefab/UITextTip.prefab index ced987c6..82a1faa4 100644 --- a/Assets/Art/UIPrefab/UITextTip.prefab +++ b/Assets/Art/UIPrefab/UITextTip.prefab @@ -149,7 +149,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Art/UIPrefab/UITextWindow.prefab b/Assets/Art/UIPrefab/UITextWindow.prefab index af9e97d3..1339c98c 100644 --- a/Assets/Art/UIPrefab/UITextWindow.prefab +++ b/Assets/Art/UIPrefab/UITextWindow.prefab @@ -1314,7 +1314,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/QFrameworkData/QAssets.cs b/Assets/QFrameworkData/QAssets.cs index 0953d539..eabacb27 100644 --- a/Assets/QFrameworkData/QAssets.cs +++ b/Assets/QFrameworkData/QAssets.cs @@ -16,6 +16,16 @@ namespace QAssetBundle public const string BundleName = "line_prefab"; public const string LINE = "Line"; } + public class Pingfang_medium_sdf_asset + { + public const string BundleName = "pingfang medium sdf_asset"; + public const string PINGFANG_MEDIUM_SDF = "PingFang Medium SDF"; + } + public class Pingfangscmedium_sdf_asset + { + public const string BundleName = "pingfangsc-medium sdf_asset"; + public const string PINGFANGSCMEDIUM_SDF = "PingFangSC-Medium SDF"; + } public class Ui3dbodyinfo_prefab { public const string BundleName = "ui3dbodyinfo_prefab"; @@ -31,6 +41,11 @@ namespace QAssetBundle public const string BundleName = "ui3dobjshow_prefab"; public const string UI3DOBJSHOW = "UI3DObjShow"; } + public class Uibackpack_prefab + { + public const string BundleName = "uibackpack_prefab"; + public const string UIBACKPACK = "UIBackPack"; + } public class Uibody3d_prefab { public const string BundleName = "uibody3d_prefab"; @@ -146,6 +161,11 @@ namespace QAssetBundle public const string BundleName = "uitexttip_prefab"; public const string UITEXTTIP = "UITextTip"; } + public class Uitextwindow_prefab + { + public const string BundleName = "uitextwindow_prefab"; + public const string UITEXTWINDOW = "UITextWindow"; + } public class Uitimetip_prefab { public const string BundleName = "uitimetip_prefab"; diff --git a/Data/Xml/Pig1.xml b/Data/Xml/Pig1.xml index 678f1d5e..0b1c2d05 100644 --- a/Data/Xml/Pig1.xml +++ b/Data/Xml/Pig1.xml @@ -2,20 +2,19 @@ - - + - - - - - - + + + + + + @@ -250,7 +249,7 @@ - + @@ -320,7 +319,7 @@ - + @@ -381,7 +380,7 @@ - + @@ -410,7 +409,7 @@ - + @@ -425,6 +424,9 @@ + + + @@ -449,11 +451,13 @@ --> - + - - + + + + @@ -509,10 +513,10 @@ --> + - - + @@ -655,8 +659,8 @@ - - + + @@ -1249,8 +1253,9 @@ - - + + + @@ -1403,7 +1408,7 @@ - + diff --git a/Data/Xml/Pig2.xml b/Data/Xml/Pig2.xml index b7d7da0c..f3ef4f9c 100644 --- a/Data/Xml/Pig2.xml +++ b/Data/Xml/Pig2.xml @@ -5,17 +5,18 @@ - + - - - - - + + + + + + @@ -478,8 +479,7 @@ --> - - + @@ -619,7 +619,7 @@ --> - + @@ -920,11 +920,12 @@ - - - - + + + + + @@ -1077,7 +1078,7 @@ - + diff --git a/Data/Xml/Pig3.xml b/Data/Xml/Pig3.xml index f0242e54..247cb78e 100644 --- a/Data/Xml/Pig3.xml +++ b/Data/Xml/Pig3.xml @@ -4,24 +4,28 @@ - - + + + + - - - - - - - - + + + + + + + + + + @@ -602,7 +606,7 @@ --> - + @@ -715,8 +719,8 @@ - - + + @@ -728,9 +732,7 @@ - - - + @@ -787,9 +789,8 @@ - - - + + @@ -979,10 +980,8 @@ - - - - + + @@ -1031,9 +1030,7 @@ - - - + @@ -1052,8 +1049,8 @@ - - + + @@ -1128,8 +1125,8 @@ - - + + @@ -1260,8 +1257,7 @@ - - + @@ -1462,7 +1458,7 @@ - + diff --git a/Data/Xml/Pig4.xml b/Data/Xml/Pig4.xml index bd16923c..70a9dc04 100644 --- a/Data/Xml/Pig4.xml +++ b/Data/Xml/Pig4.xml @@ -16,10 +16,10 @@ - - + + - + @@ -30,11 +30,12 @@ - + - + + 该软件是以仔猪为对象,针对仔猪接生与护理的专业实训。是以典型的工作任务为驱动,以工作流程为主线所进行的内容设计。共分为假死仔猪急救、打耳牌、断尾、剪牙、去势、补铁六个模块。旨在让学生通过实训内容,了解仔猪接生与护理的专业知识,掌握各模块的工作流程及操作要点。 @@ -500,7 +501,7 @@ --> - + @@ -621,8 +622,7 @@ - - + @@ -1025,9 +1025,8 @@ + - - @@ -1182,7 +1181,7 @@ - + diff --git a/Data/Xml/Pig5.xml b/Data/Xml/Pig5.xml index c2be0897..34251cdb 100644 --- a/Data/Xml/Pig5.xml +++ b/Data/Xml/Pig5.xml @@ -7,9 +7,9 @@ - + - + @@ -21,7 +21,8 @@ - + + @@ -585,8 +586,8 @@ - - + + - - + @@ -763,8 +764,8 @@ - - + @@ -835,8 +836,8 @@ - - + @@ -898,8 +899,8 @@ - - + @@ -961,8 +962,8 @@ - - + @@ -1016,8 +1017,8 @@ - - + @@ -1064,8 +1065,8 @@ - - + @@ -1187,8 +1188,8 @@ - - + @@ -1343,8 +1344,8 @@ - - + + @@ -1566,7 +1567,7 @@ - + diff --git a/Data/Xml/Pig6.xml b/Data/Xml/Pig6.xml index ff24b61b..821a9e05 100644 --- a/Data/Xml/Pig6.xml +++ b/Data/Xml/Pig6.xml @@ -6,9 +6,9 @@ - + - + @@ -19,7 +19,8 @@ - + + @@ -595,8 +596,7 @@ --> - - + @@ -727,8 +727,8 @@ - - + @@ -807,8 +807,8 @@ - - + @@ -890,8 +890,8 @@ - - + @@ -917,8 +917,8 @@ - - + @@ -930,8 +930,8 @@ - - + @@ -994,8 +994,8 @@ - - + @@ -1015,8 +1015,8 @@ - - + @@ -1205,8 +1205,8 @@ - - + + @@ -1366,7 +1366,7 @@ - +