Merge branch 'main' of http://172.16.1.12/xuguocheng/AnimalSimulation

# Conflicts:
#	Assets/Scripts/DisplayServer.cs
#	UserSettings/Layouts/default-2021.dwlt

Assets/Main Camera Profile.asset

@@ -0,0 +1,116 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3}
+  m_Name: Main Camera Profile
+  m_EditorClassIdentifier: 
+  settings:
+  - {fileID: 7193639363079924865}
+  - {fileID: 2269449136819317941}
+--- !u!114 &2269449136819317941
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c1cb7e9e120078f43bce4f0b1be547a7, type: 3}
+  m_Name: AmbientOcclusion
+  m_EditorClassIdentifier: 
+  active: 1
+  enabled:
+    overrideState: 1
+    value: 1
+  mode:
+    overrideState: 1
+    value: 1
+  intensity:
+    overrideState: 1
+    value: 0.66
+  color:
+    overrideState: 1
+    value: {r: 0, g: 0, b: 0, a: 1}
+  ambientOnly:
+    overrideState: 1
+    value: 1
+  noiseFilterTolerance:
+    overrideState: 1
+    value: 0
+  blurTolerance:
+    overrideState: 1
+    value: -4.6
+  upsampleTolerance:
+    overrideState: 1
+    value: -12
+  thicknessModifier:
+    overrideState: 1
+    value: 10
+  zBias:
+    overrideState: 1
+    value: 0
+  directLightingStrength:
+    overrideState: 1
+    value: 0
+  radius:
+    overrideState: 1
+    value: 0.25
+  quality:
+    overrideState: 1
+    value: 2
+--- !u!114 &7193639363079924865
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 48a79b01ea5641d4aa6daa2e23605641, type: 3}
+  m_Name: Bloom
+  m_EditorClassIdentifier: 
+  active: 1
+  enabled:
+    overrideState: 1
+    value: 1
+  intensity:
+    overrideState: 1
+    value: 0.02
+  threshold:
+    overrideState: 1
+    value: 1
+  softKnee:
+    overrideState: 1
+    value: 0.5
+  clamp:
+    overrideState: 1
+    value: 65472
+  diffusion:
+    overrideState: 1
+    value: 7
+  anamorphicRatio:
+    overrideState: 1
+    value: 0
+  color:
+    overrideState: 1
+    value: {r: 1, g: 1, b: 1, a: 1}
+  fastMode:
+    overrideState: 1
+    value: 0
+  dirtTexture:
+    overrideState: 1
+    value: {fileID: 0}
+    defaultState: 1
+  dirtIntensity:
+    overrideState: 1
+    value: 0

Assets/Main Camera Profile.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e5394afaa3b6fc845a2fffd385c66611
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/TouchClient.cs

@@ -14,21 +14,14 @@ public class TouchClient : MonoBehaviour
     private UdpClient udpListener;
     private Thread udpThread;
 
-    public Transform background;
-    private string currentPage = "Ê×Ò³";
-
-
     void Start()
     {
-        Screen.SetResolution(1920, 1080, false);
-
         udpListener = new UdpClient(9999);
         udpThread = new Thread(ListenForBroadcast);
         udpThread.Start();
 
         Debug.Log("´¥Ãþ¶ËµÈ´ýÏÔʾ¶Ë¹ã²¥...");
 
-        ShowPage("Ê×Ò³");
     }
 
     private void ListenForBroadcast()
@@ -61,7 +54,7 @@ public class TouchClient : MonoBehaviour
         }
     }
 
-    private void SendMessageToServer(string msg)
+    void SendMessageToServer(string msg)
     {
         if (isConnected && stream != null)
         {
@@ -71,22 +64,6 @@ public class TouchClient : MonoBehaviour
         }
     }
 
-    public void OnButtonClick(string pageName)
-    {
-        ShowPage(pageName);
-        SendMessageToServer(pageName);
-    }
-
-    private void ShowPage(string pageName)
-    {
-        foreach (Transform child in background)
-        {
-            child.gameObject.SetActive(child.name == pageName);
-        }
-        currentPage = pageName;
-        Debug.Log($"Çл»µ½Ò³Ã棺{pageName}");
-    }
-
     private void OnApplicationQuit()
     {
         udpListener?.Close();

Assets/部件结构展示/Materials/CT金属.mat

@@ -63,9 +63,9 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.2
+    - _Glossiness: 0.738
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.44
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02

Assets/部件结构展示/Materials/外壳01.mat

@@ -63,9 +63,9 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.656
+    - _Glossiness: 0.938
     - _GlossyReflections: 1
-    - _Metallic: 0.224
+    - _Metallic: 0.198
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02

Assets/部件结构展示/Materials/白金属.mat

@@ -63,9 +63,9 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.734
+    - _Glossiness: 0.837
     - _GlossyReflections: 1
-    - _Metallic: 0.408
+    - _Metallic: 0.89
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02

Assets/部件结构展示/Materials/纯黑.mat

@@ -63,9 +63,9 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.5656854
+    - _Glossiness: 0.761
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.264
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02

Assets/部件结构展示/Materials/金属.mat

@@ -63,9 +63,9 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.19318727
+    - _Glossiness: 0.86
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.704
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
@@ -75,6 +75,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.33050847, g: 0.33050847, b: 0.33050847, a: 1}
+    - _Color: {r: 0.7106918, g: 0.7106918, b: 0.7106918, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Packages/manifest.json

@@ -5,6 +5,7 @@
     "com.unity.ide.rider": "3.0.28",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
+    "com.unity.postprocessing": "3.4.0",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.5",

Packages/packages-lock.json

@@ -67,6 +67,15 @@
       "dependencies": {},
       "url": "https://packages.unity.cn"
     },
+    "com.unity.postprocessing": {
+      "version": "3.4.0",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0"
+      },
+      "url": "https://packages.unity.cn"
+    },
     "com.unity.settings-manager": {
       "version": "1.0.3",
       "depth": 2,

ProjectSettings/ProjectSettings.asset

@@ -716,7 +716,20 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   webGLPowerPreference: 2
-  scriptingDefineSymbols: {}
+  scriptingDefineSymbols:
+    Android: UNITY_POST_PROCESSING_STACK_V2
+    EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2
+    GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2
+    Lumin: UNITY_POST_PROCESSING_STACK_V2
+    Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2
+    PS4: UNITY_POST_PROCESSING_STACK_V2
+    PS5: UNITY_POST_PROCESSING_STACK_V2
+    Stadia: UNITY_POST_PROCESSING_STACK_V2
+    Standalone: UNITY_POST_PROCESSING_STACK_V2
+    WebGL: UNITY_POST_PROCESSING_STACK_V2
+    Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2
+    XboxOne: UNITY_POST_PROCESSING_STACK_V2
+    tvOS: UNITY_POST_PROCESSING_STACK_V2
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend:

ProjectSettings/TagManager.asset

@@ -8,7 +8,7 @@ TagManager:
   - Default
   - TransparentFX
   - Ignore Raycast
-  - 
+  - post
   - Water
   - UI
   - Display

UserSettings/EditorUserSettings.asset

@@ -11,6 +11,9 @@ EditorUserSettings:
     RecentlyUsedSceneGuid-1:
       value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
       flags: 0
+    RecentlyUsedSceneGuid-2:
+      value: 5b08575357065d085f0c587114725c44154e4e2e297f72347a7c4e31e4b66661
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0