2 Commits 0269073c1d ... 3d5fccda7a

Author SHA1 Message Date
  lxd 3d5fccda7a Merge branch 'feature/lxd' into develop 6 months ago
  lxd 5efbfa0c4f 【+】 6 months ago

+ 8 - 0
CableProducts_2025/Assets/GameAssets/01.Animation.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3f94ebaac6729ef4ebdb2cf92bb338af
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
CableProducts_2025/Assets/GameAssets/01.Animation/02.Prefabs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c5f37cb8580354345acca4ce99d9db3e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
CableProducts_2025/Assets/GameAssets/06.UIPrefabs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e190b64ffee9a09448430017f3f753ff
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
CableProducts_2025/Assets/GameAssets/07.Fonts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e5a2d838bb30424439c3e87155eb381f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
CableProducts_2025/Assets/GameAssets/07.Shader.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 916ecbadfe45f1c478ca891e644727c5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
CableProducts_2025/Assets/GameAssets/09.Animators.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1b436f2efca605d40a1ea8e8f3767638
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
CableProducts_2025/Assets/GameAssets/10.Materials.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bcf0bbbe9b442064ca19f755909fd0c5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
CableProducts_2025/Assets/GameAssets/11.Audios.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b6c406cc7d213ce4fb9dbb6672f0bb0d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 102 - 17
CableProducts_2025/Assets/Scenes/PC_电缆熔接头制作.unity

@@ -604,6 +604,12 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 13037189}
   m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &14035638 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6851963383536603126, guid: 66560d3de3fd0f746b13432217780eb8,
+    type: 3}
+  m_PrefabInstance: {fileID: 1509555626}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &16373567
 GameObject:
   m_ObjectHideFlags: 0
@@ -3640,7 +3646,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 99567153}
   m_LocalRotation: {x: -0.0000000745058, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0.000013930886, y: -0.07862119, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1010854862}
@@ -9512,6 +9518,12 @@ MonoBehaviour:
   aniDescriptioin: "\u64AD\u653E\u52A8\u753B\u7535\u7F06\u4E2D\u95F4\u7194\u63A5\u5934\u7B2C\u4E00\u6BB5/10\u56FA\u5B9A\u6052\u529B\u5F39\u7C27"
   isRegister: 1
   currentAniState: 0
+--- !u!1 &212571103 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6839088621528676283, guid: 66560d3de3fd0f746b13432217780eb8,
+    type: 3}
+  m_PrefabInstance: {fileID: 1509555626}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &214183218
 GameObject:
   m_ObjectHideFlags: 0
@@ -31195,10 +31207,10 @@ MonoBehaviour:
     Description: "\u64AD\u653E\u52A8\u753B\u7535\u7F06\u4E2D\u95F4\u7194\u63A5\u5934\u7B2C\u4E00\u6BB5/69\u6E05\u6D01\u7535\u7F065"
     aniData: {fileID: 1416531593}
   jumpTargetAnimation: "\u7535\u7F06\u4E2D\u95F4\u7194\u63A5\u5934\u7B2C\u4E00\u6BB5/50\u62C6\u9664\u6A21\u5177\u5939"
-  currentAniDataContainer: {fileID: 39570404}
-  currentStepID: 1
-  currentAniClipName: "2\u6E05\u6D01\u7535\u7F06"
-  currentAniDataProcess: 0
+  currentAniDataContainer: {fileID: 1887630731}
+  currentStepID: 2
+  currentAniClipName: "3\u6807\u8BB0\u5F00\u5265\u957F\u5EA6"
+  currentAniDataProcess: 1
   currentAniFrame: 0
 --- !u!1 &867986577
 GameObject:
@@ -33929,7 +33941,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f91d9f4a67de7984c971a448672b9c60, type: 2}
+  - {fileID: 2100000, guid: 3eefb4ef8e63a734bb9d280def8369e6, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -34598,7 +34610,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1010854861}
   m_LocalRotation: {x: -0.4353383, y: 0.5572078, z: 0.4353384, w: 0.55720776}
-  m_LocalPosition: {x: 0.71018773, y: 0.6372876, z: -1.0804139}
+  m_LocalPosition: {x: 0.6339, y: 0.6563, z: -1.0804}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 99567154}
@@ -38280,7 +38292,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1135219038}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -2.3, y: 6.931, z: -2.139}
+  m_LocalPosition: {x: -1.2699972, y: -0.15200005, z: -2.1389985}
   m_LocalScale: {x: 1, y: 4.996474, z: 1}
   m_Children: []
   m_Father: {fileID: 1297346980}
@@ -42672,8 +42684,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1297346979}
   m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5}
-  m_LocalPosition: {x: 0.81899583, y: 0.6372771, z: -1.0803764}
-  m_LocalScale: {x: 0.03062287, y: 0.057079077, z: 0.03090287}
+  m_LocalPosition: {x: 0.4147047, y: 0.6372771, z: -1.0488348}
+  m_LocalScale: {x: 0.03062287, y: 0.057079073, z: 0.0309029}
   m_Children:
   - {fileID: 1606614301}
   - {fileID: 1135219039}
@@ -48063,7 +48075,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f91d9f4a67de7984c971a448672b9c60, type: 2}
+  - {fileID: 2100000, guid: 3eefb4ef8e63a734bb9d280def8369e6, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -66611,6 +66623,11 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0.068402864
       objectReference: {fileID: 0}
+    - target: {fileID: 604215225732184561, guid: 66560d3de3fd0f746b13432217780eb8,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 605404149750938514, guid: 66560d3de3fd0f746b13432217780eb8,
         type: 3}
       propertyPath: m_LocalRotation.w
@@ -76241,6 +76258,16 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0.022995504
       objectReference: {fileID: 0}
+    - target: {fileID: 6839088621528676283, guid: 66560d3de3fd0f746b13432217780eb8,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6851963383536603126, guid: 66560d3de3fd0f746b13432217780eb8,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6875189320935565154, guid: 66560d3de3fd0f746b13432217780eb8,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -82907,8 +82934,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1606614300}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1.03, y: 7.083, z: -0}
-  m_LocalScale: {x: 1, y: 5.1447945, z: 1.000001}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 5.1447945, z: 1}
   m_Children: []
   m_Father: {fileID: 1297346980}
   m_RootOrder: 0
@@ -90179,8 +90206,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1871444877}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.26, y: 7.17, z: -2.139}
-  m_LocalScale: {x: 1, y: 5.2440143, z: 1}
+  m_LocalPosition: {x: 1.2900025, y: 0.08699986, z: -2.1389985}
+  m_LocalScale: {x: 1, y: 5.2440147, z: 1}
   m_Children: []
   m_Father: {fileID: 1297346980}
   m_RootOrder: 2
@@ -90482,6 +90509,7 @@ MonoBehaviour:
     SerializedBytes: 
     ReferencedUnityObjects:
     - {fileID: 1509555627}
+    - {fileID: 212571103}
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
@@ -90493,7 +90521,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 1
+      Data: 2
     - Name: 
       Entry: 7
       Data: 1|AniDriver_UnityAnimation, Assembly-CSharp
@@ -90512,6 +90540,34 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
+    - Name: 
+      Entry: 7
+      Data: 2|AniDriver_ActiveObjs, Assembly-CSharp
+    - Name: animationSequence
+      Entry: 3
+      Data: 0
+    - Name: objs
+      Entry: 7
+      Data: 3|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+        mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 10
+      Data: 1
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: activeObjs
+      Entry: 5
+      Data: false
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 
@@ -90802,6 +90858,7 @@ MonoBehaviour:
     SerializedBytes: 
     ReferencedUnityObjects:
     - {fileID: 1509555627}
+    - {fileID: 14035638}
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
@@ -90813,7 +90870,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 1
+      Data: 2
     - Name: 
       Entry: 7
       Data: 1|AniDriver_UnityAnimation, Assembly-CSharp
@@ -90832,6 +90889,34 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
+    - Name: 
+      Entry: 7
+      Data: 2|AniDriver_ActiveObjs, Assembly-CSharp
+    - Name: animationSequence
+      Entry: 3
+      Data: 0
+    - Name: objs
+      Entry: 7
+      Data: 3|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+        mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 10
+      Data: 1
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: activeObjs
+      Entry: 5
+      Data: false
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 

BIN
CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV电缆熔接头制作/40.mp3


+ 8 - 0
CableProducts_2025/Assets/StreamingAssets/Config/Pictures.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d1cf8a4752afd494baf7c7e273e24579
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
CableProducts_2025/Assets/StreamingAssets/Config/题库图文图片.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5f16b528a46593a4b9d5060b97fc104c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
CableProducts_2025/Assets/绳子插件/Obi.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5b252cc8dea493b4d8d96b61af541fd5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
CableProducts_2025/Assets/绳子插件/Ultimate Rope Editor v1.18.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 91c801cbed11e984b9bf0a0e35f6ff96
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: