Merge branch 'master' of http://8.134.150.210:3000/xgan/2025TapTapGameJam

.gitattributes

@@ -1,3 +1,4 @@
 Assets/Art/Model/** filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.fbx filter=lfs diff=lfs merge=lfs -text
+、 filter=lfs diff=lfs merge=lfs -text

Assets/Art/Material/5.mat

@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: 5
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_Parent: {fileID: 0}
+  m_Parent: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
@@ -36,98 +36,10 @@ Material:
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs:
-    - _BaseMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_Lightmaps:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_LightmapsInd:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_ShadowMasks:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+    m_TexEnvs: []
     m_Ints: []
-    m_Floats:
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendModePreserveSpecular: 1
-    - _BumpScale: 1
-    - _ClearCoatMask: 0
-    - _ClearCoatSmoothness: 0
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DetailAlbedoMapScale: 1
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _DstBlendAlpha: 0
-    - _EnvironmentReflections: 1
-    - _GlossMapScale: 0
-    - _Glossiness: 0
-    - _GlossyReflections: 0
-    - _Metallic: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.005
-    - _QueueOffset: 0
-    - _ReceiveShadows: 1
-    - _Smoothness: 0.5
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _SrcBlendAlpha: 1
-    - _Surface: 0
-    - _WorkflowMode: 1
-    - _ZWrite: 1
+    m_Floats: []
     m_Colors:
     - _BaseColor: {r: 0.35220122, g: 0.01661322, b: 0.01661322, a: 1}
     - _Color: {r: 0.3522012, g: 0.01661322, b: 0.01661322, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []

Assets/Art/Material/6.mat

@@ -126,8 +126,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.43921572, g: 0.3019608, b: 0.21960786, a: 1}
-    - _Color: {r: 0.4392157, g: 0.30196077, b: 0.21960783, a: 1}
+    - _BaseColor: {r: 0.8490566, g: 0.69720095, b: 0.6060875, a: 1}
+    - _Color: {r: 0.8490566, g: 0.69720095, b: 0.6060875, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []

Assets/Art/Material/7.mat

@@ -126,8 +126,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColor: {r: 1, g: 0.785729, b: 0.5503144, a: 1}
+    - _Color: {r: 1, g: 0.785729, b: 0.5503144, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []

Assets/Scenes/Level1.unity

@@ -1336,6 +1336,16 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: -9124291533654600946, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: f691ce5718fe42541894930ebc7850e4, type: 2}
+    - target: {fileID: -9073227406854266945, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
     - target: {fileID: -8679921383154817045, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -1349,7 +1359,7 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 371.3
+      value: 370.2
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
@@ -1386,11 +1396,66 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -8448474384237411873, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: -7448630834404527468, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: -7072801432923134911, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: -6662530792555743716, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: f691ce5718fe42541894930ebc7850e4, type: 2}
+    - target: {fileID: -5981951219464909533, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: -5766439221048670543, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 752581dccfbfb1e408bcc26bbb1525d1, type: 2}
+    - target: {fileID: -5677787191364194913, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
     - target: {fileID: -4307811836925984485, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
       propertyPath: m_LocalPosition.x
       value: -290.5
       objectReference: {fileID: 0}
+    - target: {fileID: -4017627904659336708, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: f691ce5718fe42541894930ebc7850e4, type: 2}
+    - target: {fileID: -3998898468969170061, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: -2690783909192870983, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
+    - target: {fileID: -1950875663352359766, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
     - target: {fileID: -1853094968961178454, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
       propertyPath: m_BackGroundColor.a
@@ -1420,32 +1485,137 @@ PrefabInstance:
         type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
     - target: {fileID: -1485260854547788096, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: -1415347444916710713, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: -924060796512375068, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
       objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
+    - target: {fileID: -433781910674660567, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 637745049059373369, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
+    - target: {fileID: 805098333363774982, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
     - target: {fileID: 919132149155446097, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
       propertyPath: m_Name
       value: altar01
       objectReference: {fileID: 0}
+    - target: {fileID: 1030160371140469851, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 1318803543628549196, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: f691ce5718fe42541894930ebc7850e4, type: 2}
+    - target: {fileID: 2015790727093129166, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
+    - target: {fileID: 2588964068670055417, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 2698879697933431527, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 3381527769907432096, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 3822617937624708874, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
     - target: {fileID: 3984391852060624166, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: df1337ac5697afc46abbb66844585d0a, type: 2}
+    - target: {fileID: 4194028432124496311, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 4529020142661663229, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
     - target: {fileID: 4625062493837557154, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
-    - target: {fileID: 6514335277548776967, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 5723623106617691631, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: f691ce5718fe42541894930ebc7850e4, type: 2}
+    - target: {fileID: 6164830759885818331, guid: 14ee4558fe162d74d8c36163d6f5dd20,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 578f4117f17964243857c36b1c567d39, type: 2}
+    - target: {fileID: 6244947914174852855, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: f691ce5718fe42541894930ebc7850e4, type: 2}
+    - target: {fileID: 6470000311311688048, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 6514335277548776967, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 7552352536186366672, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 7622661218638243942, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
+    - target: {fileID: 7765290692726778513, guid: 14ee4558fe162d74d8c36163d6f5dd20,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ebd2a65a98b25c944be2b87eb096f773, type: 2}
     m_RemovedComponents: []
     m_RemovedGameObjects:
     - {fileID: 65702495048144492, guid: 14ee4558fe162d74d8c36163d6f5dd20, type: 3}
@@ -14663,17 +14833,17 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: 77e6c9f193925424888179e8943cef81,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -54.1
+      value: -295.4
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 77e6c9f193925424888179e8943cef81,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -54.1
+      value: -18.6
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 77e6c9f193925424888179e8943cef81,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 274
+      value: 368.8
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 77e6c9f193925424888179e8943cef81,
         type: 3}
@@ -19615,17 +19785,17 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: e9c50d69fbf9a5242aa74a1c1143bcd9,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -54
+      value: -180.1
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: e9c50d69fbf9a5242aa74a1c1143bcd9,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -132.9
+      value: -84.6
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: e9c50d69fbf9a5242aa74a1c1143bcd9,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 266.6
+      value: 158
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: e9c50d69fbf9a5242aa74a1c1143bcd9,
         type: 3}
@@ -19680,7 +19850,7 @@ PrefabInstance:
     - target: {fileID: 6580057188821266974, guid: e9c50d69fbf9a5242aa74a1c1143bcd9,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -5.4
+      value: 0.7
       objectReference: {fileID: 0}
     - target: {fileID: 6580057188821266974, guid: e9c50d69fbf9a5242aa74a1c1143bcd9,
         type: 3}