瀏覽代碼

Merge branch 'main' of http://www.chatgpt918.top:3000/wartheking/WaterFlush

Void_F 11 月之前
父節點
當前提交
8ee2e2d847

+ 2 - 2
Assets/Art/Material/Effect/ShuSanLuJing.mat

@@ -41,8 +41,8 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 414693b704610af458bee4eb63e98205, type: 3}
-        m_Scale: {x: 20.48, y: 0.84}
+        m_Texture: {fileID: 2800000, guid: adc1c413cdbe1b04bb8265e1191ebe6f, type: 3}
+        m_Scale: {x: 5, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}

文件差異過大導致無法顯示
+ 269 - 136
Assets/Art/Prefab/Buildings/NanTaoGou_Model/Tree.prefab


文件差異過大導致無法顯示
+ 330 - 124
Assets/Art/Prefab/Buildings/NeiJingHe_Model/Tree.prefab


文件差異過大導致無法顯示
+ 192 - 149
Assets/Art/Prefab/Buildings/TaoKou_ShiNei_Model/Tree.prefab


文件差異過大導致無法顯示
+ 342 - 114
Assets/Art/Prefab/Buildings/XinTanKou_Model/Tree.prefab


文件差異過大導致無法顯示
+ 17910 - 0
Assets/Art/Prefab/Buildings/YaoKou_Model/Tree.prefab


二進制
Assets/Art/Textrue/Buildings/TaoKou/TaoKou_ZhaMen_TaoKou_ZhaMen_BaseMap.png


二進制
Assets/Art/Textrue/Buildings/TaoKou/TaoKou_ZhaMen_TaoKou_ZhaMen_MaskMap.png


二進制
Assets/Art/Textrue/Buildings/TaoKou/TaoKou_ZhaMen_TaoKou_ZhaMen_Normal.png


二進制
Assets/Art/Textrue/Effect/TB1.png


+ 3 - 15
Assets/Art/微信图片_20240611202847.jpg.meta → Assets/Art/Textrue/Effect/TB1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a071d8e1252722245a68a6cbca89b180
+guid: 30be1d0749f521b4a955e5cb51b3eda7
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -51,7 +51,7 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
   textureType: 0
   textureShape: 1
@@ -67,7 +67,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -101,18 +101,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 2048

二進制
Assets/Art/Textrue/Effect/TB2.png


+ 3 - 15
Assets/Art/微信图片_20240611203036.jpg.meta → Assets/Art/Textrue/Effect/TB2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c93e0e6e72668f2488d93b92f51c281c
+guid: 78bc62b3e4d65584eafea92da799c796
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -51,7 +51,7 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
   textureType: 0
   textureShape: 1
@@ -67,7 +67,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -101,18 +101,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 2048

二進制
Assets/Art/微信图片_20240611202847.jpg


二進制
Assets/Art/微信图片_20240611203036.jpg


+ 34 - 3
Assets/Prefabs/MiniMap.prefab

@@ -30,7 +30,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7069582396450853087}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4078470270552625224
 MonoBehaviour:
@@ -259,6 +259,37 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &2353585198443455908
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1217287279818896347}
+  m_Layer: 0
+  m_Name: MovePath1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1217287279818896347
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2353585198443455908}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.5, y: -6.7, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7069582396450853087}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3793048173667531158
 GameObject:
   m_ObjectHideFlags: 0
@@ -653,6 +684,7 @@ Transform:
   - {fileID: 7963525554212561013}
   - {fileID: 1829979977482383576}
   - {fileID: 1216517146}
+  - {fileID: 1217287279818896347}
   - {fileID: 249304408}
   - {fileID: 5621129756599565973}
   m_Father: {fileID: 0}
@@ -693,7 +725,6 @@ MonoBehaviour:
     max_X_Range: {x: 9.541028, y: 13.84961}
     min_Y_Range: {x: 62.98047, y: -67.97656}
     max_Y_Range: {x: 44.17188, y: -39.76172}
-  currentMapIndex: 2
   MapStayList:
   - map: {fileID: 4078470270552625224}
     cameraDistanceMin: 1
@@ -828,7 +859,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5621129755424649727, guid: 466bb753b62a3ff4e984a9a361241e70, type: 3}
       propertyPath: m_RootOrder
-      value: 12
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 5621129755424649727, guid: 466bb753b62a3ff4e984a9a361241e70, type: 3}
       propertyPath: m_LocalScale.x

+ 4 - 4
Assets/Prefabs/UI/XHYZT/FHXS.prefab

@@ -4789,7 +4789,7 @@ RectTransform:
   m_GameObject: {fileID: 1225488485910856125}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4660738517963174404}
@@ -10091,7 +10091,7 @@ RectTransform:
   m_GameObject: {fileID: 2533200232306453812}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5045219858723781012}
@@ -15465,7 +15465,7 @@ RectTransform:
   m_GameObject: {fileID: 3605625873430561057}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1815008929210129967}
@@ -16550,7 +16550,7 @@ RectTransform:
   m_GameObject: {fileID: 3931216135154390575}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4678368563796638687}

文件差異過大導致無法顯示
+ 240 - 240
Assets/Prefabs/UI/XHYZT/YZT.prefab


文件差異過大導致無法顯示
+ 111 - 191
Assets/Scene 1.unity


+ 1 - 1
Assets/Scene 1_Profiles/Camera Profile.asset

@@ -18,7 +18,7 @@ MonoBehaviour:
     value: 1
   intensity:
     overrideState: 1
-    value: 1
+    value: 1.5
   threshold:
     overrideState: 1
     value: 0.9

+ 4 - 4
Assets/Scripts/UI/UIView/FHSS/FHSSLayer.cs

@@ -49,10 +49,10 @@ public class FHSSLayer : YZTRootLayer
     private void LateUpdate()
     {
         if (hotPoints.Length > 3) {
-            hotPoints[0].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[0].transform.position);
-            hotPoints[1].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[1].transform.position);
-            hotPoints[2].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[3].transform.position);
-            hotPoints[3].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[6].transform.position);
+            hotPoints[0].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[0].transform.position) / Screen.width * 1920.0f; ;
+            hotPoints[1].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[1].transform.position) / Screen.width * 1920.0f; ;
+            hotPoints[2].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[3].transform.position) / Screen.width * 1920.0f; ;
+            hotPoints[3].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[6].transform.position) / Screen.width * 1920.0f; ;
         }
     }
 }

+ 3 - 3
Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -769,21 +769,21 @@ public class YZTLayer : YZTRootLayer
         for (int i = 0; i < regionLayerInfo.Length; i++) 
         {
             if (regionLayerInfo[i].gameObject.activeSelf) {
-                regionLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(regionLayerObj[i].transform.position);
+                regionLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(regionLayerObj[i].transform.position) / Screen.width * 1920.0f;
             }
         }
         for (int i = 0; i < riverLayerInfo.Length; i++)
         {
             if (riverLayerInfo[i].gameObject.activeSelf)
             {
-                riverLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(riverLayerObj[i].transform.position);
+                riverLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(riverLayerObj[i].transform.position) / Screen.width * 1920.0f;
             }
         }
         for (int i = 0; i < lakeLayerInfo.Length; i++)
         {
             if (lakeLayerInfo[i].gameObject.activeSelf)
             {
-                lakeLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(lakeLayerObj[i].transform.position);
+                lakeLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(lakeLayerObj[i].transform.position) / Screen.width * 1920.0f;
             }
         }
     }

部分文件因文件數量過多而無法顯示