1

Assets/Bakery/ftGlobalStorage.asset

@@ -584,7 +584,73 @@ MonoBehaviour:
   - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/HuDongZhenRen/0905_AddBiaoqing/C5_3/S4_C5_3_z_L.fbx
   - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/HuDongZhenRen/0905_AddBiaoqing/C5_3/S4_C5_3_z_Shiyi.fbx
   - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/HuDongZhenRen/0905_AddBiaoqing/C5_2/S4_C5_2_Shiyi.fbx
-  uvOverlapAssetList: 00000000ffffffff01010000000000000000000000000000000000000000000000000000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000000000000000000000000000
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_3_z_rig/C5_3_z_rig02_guijia.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s02_fbx_v001/C_hh_z.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_futou.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia11.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s02_fbx_v001/gou.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z/zhenren_02.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia12.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s03_fbx_v001/C_hh_z.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_3_z/zhengren2_01.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_taishou.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s02_fbx_v001/xwz.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_shaohuo_huobang.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia10.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_1_z/zhengren2_01.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_3_z/zhengren2_01_yizhanbudeguijia.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s02_fbx_v001/C_xn_z.fbx
+  - Assets/Res/Models/Characters/NPC/C9_4_z/C9_4_z_rig.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_shaohuo2_guijia2.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia01.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_taishou_huobang.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_huxi_guijia.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_shaohuo_guijia.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s03_fbx_v001/gou.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_3_z_rig/C5_3_z_rig01_huogun.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_1_z/zhengren2_01_yizhanbudeguijia.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s03_fbx_v001/sc_03_dog.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_1_z/zhengren2_01_mutan.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_3_z_rig/C5_3_z_rig01_guijia.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia04.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia09.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s02_fbx_v001/C_xn_z3.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s01_fbx_v001/niao.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_shaohuo.fbx
+  - Assets/Res/Models/Characters/NPC/C5_3_z/C5_3_z_rig.fbx
+  - Assets/Res/Models/Characters/NPC/C9_1_z/Sa_08.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_3_z/zhengren2_01_mutan.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z/zhenren_02_mutan.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_1_z/guijiagongjiang_01.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_huxi_guijia2.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_shaohuo2_huobang.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_huxi_huobang.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia05.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_3_z_rig/C5_3_z_rig02_huogun.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia08.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia07.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia14.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia06.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s02_fbx_v001/1.fbx
+  - Assets/Res/Models/Characters/NPC/C5_2_z/C5_2_z_rig.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_shaohuo2.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_huxi.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z_rig/C5_2_z_rig_taishou_huobang_guijia.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia13.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_1_z/guijiagongjiang_01_xiaocuodao.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_1_z/guijiagongjiang_01_guijia.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_2_z/zhenren_02_yizhanbuguijia.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s01_fbx_v001/gou.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s02_fbx_v001/niao.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia03.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_3_z_rig/C5_3_z_rig01.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C5_3_z_rig/C5_3_z_rig02.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s02_fbx_v001/C_xn_z1.fbx
+  - Assets/Res/Models/Characters/NPC_Animation/s04_fbx_v001/C6_2_z/guijiagongjiang_01_guijia02.fbx
+  - Assets/timeline_s06_zichan/v022/C_xwz_z.fbx
+  - Assets/timeline_s06_zichan/v015/C_xwz_z/xwz_yupei.fbx
+  uvOverlapAssetList: 00000000ffffffff01010000000000000000000000000000000000000000000000000000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
   xatlasWarningShown: 0
   foundCompatibleSetup: 1
   gpuName: NVIDIA GeForce RTX 3070

Assets/D5VR/Material/SDF.mat

@@ -33,8 +33,8 @@ Material:
         m_Offset: {x: -0.2, y: -0.29}
     - _SDF:
         m_Texture: {fileID: 2800000, guid: c373574b1b1f4a34baa1ea5cec9d37f3, type: 3}
-        m_Scale: {x: 0.9, y: 0.9}
+        m_Scale: {x: 0.8, y: 0.8}
-        m_Offset: {x: 0.07, y: 0.03}
+        m_Offset: {x: 0.04, y: 0.08}
     - _SDF1:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

Assets/D5VR/Material/SDF_3.mat

@@ -0,0 +1,95 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SDF_3
+  m_Shader: {fileID: 4800000, guid: ff8c53f91c55b0f4ab5887c2b8bedbe8, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMao:
+        m_Texture: {fileID: 2800000, guid: e61325766217e3d40b202180b7668c53, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1.34, y: 1.39}
+        m_Offset: {x: -0.2, y: -0.29}
+    - _SDF:
+        m_Texture: {fileID: 2800000, guid: c373574b1b1f4a34baa1ea5cec9d37f3, type: 3}
+        m_Scale: {x: 0.9, y: 0.9}
+        m_Offset: {x: 0.06, y: 0.07}
+    - _SDF1:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Texture0:
+        m_Texture: {fileID: 2800000, guid: e61325766217e3d40b202180b7668c53, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TextureSample0:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1.6, y: 1.6}
+        m_Offset: {x: -0.3, y: -0.37}
+    - _texcoord:
+        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_Ints: []
+    m_Floats:
+    - _AllFrame: 200
+    - _Alpha: 0.308
+    - _AlphaCutoff: 0.5
+    - _CullMode: 2
+    - _DisplayFrame: 50
+    - _EdgeAlphaControl: 0.1
+    - _FallOff: 1
+    - _Float0: 0.02
+    - _Float1: 30
+    - _Float3: 0.6
+    - _Float4: 0.02
+    - _Intensity: 1.8
+    - _Interval: 30
+    - _Offset: -5.49
+    - _Offset1: 0.6
+    - _OutlineWidth: 25
+    - _PBRIntput: 1
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _SDF: 1
+    - _SDF1: 1
+    m_Colors:
+    - _BaseColor: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _OoutlineColor: {r: 0, g: 0, b: 0, a: 0}
+    - _Tilling: {r: 1, g: 1, b: -0.16, a: 0}
+  m_BuildTextureStacks: []

Assets/D5VR/Material/SDF_3.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 57f95a5a306579843b249e3c1cfb242b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/D5VR/Material/SDF_55.mat

@@ -33,8 +33,8 @@ Material:
         m_Offset: {x: -0.19, y: -0.18}
     - _SDF:
         m_Texture: {fileID: 2800000, guid: 0fdf7a1a3e6f6ab44b5047fa574d4356, type: 3}
-        m_Scale: {x: 1, y: 1}
+        m_Scale: {x: 0.9, y: 0.9}
-        m_Offset: {x: 0, y: 0}
+        m_Offset: {x: 0.01, y: 0.052}
     - _SDF1:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -76,6 +76,7 @@ Material:
     - _Float1: 30
     - _Float3: 0.6
     - _Float4: 0.02
+    - _Intensity: 1
     - _Interval: 30
     - _Offset: -5.49
     - _Offset1: 0.6

Assets/D5VR/Material/SDF_55_2.mat

@@ -0,0 +1,95 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SDF_55_2
+  m_Shader: {fileID: 4800000, guid: ff8c53f91c55b0f4ab5887c2b8bedbe8, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMao:
+        m_Texture: {fileID: 2800000, guid: e61325766217e3d40b202180b7668c53, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1.3, y: 1.3}
+        m_Offset: {x: -0.19, y: -0.18}
+    - _SDF:
+        m_Texture: {fileID: 2800000, guid: 0fdf7a1a3e6f6ab44b5047fa574d4356, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SDF1:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Texture0:
+        m_Texture: {fileID: 2800000, guid: e61325766217e3d40b202180b7668c53, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TextureSample0:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1.6, y: 1.6}
+        m_Offset: {x: -0.3, y: -0.37}
+    - _texcoord:
+        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_Ints: []
+    m_Floats:
+    - _AllFrame: 135
+    - _Alpha: 1
+    - _AlphaCutoff: 0.5
+    - _CullMode: 2
+    - _DisplayFrame: 28
+    - _EdgeAlphaControl: 0.1
+    - _FallOff: 1
+    - _Float0: 0.02
+    - _Float1: 30
+    - _Float3: 0.6
+    - _Float4: 0.02
+    - _Intensity: 1
+    - _Interval: 30
+    - _Offset: -5.49
+    - _Offset1: 0.6
+    - _OutlineWidth: 25
+    - _PBRIntput: 1
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _SDF: 1
+    - _SDF1: 1
+    m_Colors:
+    - _BaseColor: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _OoutlineColor: {r: 0, g: 0, b: 0, a: 0}
+    - _Tilling: {r: 1, g: 1, b: -0.16, a: 0}
+  m_BuildTextureStacks: []

Assets/D5VR/Material/SDF_55_2.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 88b17521e99f23e4da7cd01665c55eae
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Animations/UI/ShuiMo/ShuiMoSample_End.anim

@@ -52,7 +52,7 @@ AnimationClip:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
-        time: 0.9166667
+        time: 0.8833333
         value: 1
         inSlope: 0
         outSlope: 0
@@ -208,7 +208,7 @@ AnimationClip:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
-        time: 0.9166667
+        time: 0.8833333
         value: 1
         inSlope: 0
         outSlope: 0

Assets/Res/Prefab/Scene_06/Dynamic.prefab

@@ -57677,7 +57677,7 @@ PrefabInstance:
     - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
         type: 3}
       propertyPath: m_SceneBindings.Array.size
-      value: 83
+      value: 91
       objectReference: {fileID: 0}
     - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
         type: 3}
@@ -57725,6 +57725,54 @@ PrefabInstance:
       value: 
       objectReference: {fileID: -3327833621431791277, guid: 9dc6c63505f50374f963a5cc8288216a,
         type: 2}
+    - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
+        type: 3}
+      propertyPath: m_SceneBindings.Array.data[83].key
+      value: 
+      objectReference: {fileID: 6182017615148236664, guid: 9dc6c63505f50374f963a5cc8288216a,
+        type: 2}
+    - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
+        type: 3}
+      propertyPath: m_SceneBindings.Array.data[84].key
+      value: 
+      objectReference: {fileID: 9090301642572249064, guid: 9dc6c63505f50374f963a5cc8288216a,
+        type: 2}
+    - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
+        type: 3}
+      propertyPath: m_SceneBindings.Array.data[85].key
+      value: 
+      objectReference: {fileID: 6603450736336032879, guid: 9dc6c63505f50374f963a5cc8288216a,
+        type: 2}
+    - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
+        type: 3}
+      propertyPath: m_SceneBindings.Array.data[86].key
+      value: 
+      objectReference: {fileID: 2014780989970467322, guid: 9dc6c63505f50374f963a5cc8288216a,
+        type: 2}
+    - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
+        type: 3}
+      propertyPath: m_SceneBindings.Array.data[87].key
+      value: 
+      objectReference: {fileID: 7790176742069871241, guid: 9dc6c63505f50374f963a5cc8288216a,
+        type: 2}
+    - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
+        type: 3}
+      propertyPath: m_SceneBindings.Array.data[88].key
+      value: 
+      objectReference: {fileID: -7561713182513294662, guid: 9dc6c63505f50374f963a5cc8288216a,
+        type: 2}
+    - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
+        type: 3}
+      propertyPath: m_SceneBindings.Array.data[89].key
+      value: 
+      objectReference: {fileID: -827456353529041356, guid: 9dc6c63505f50374f963a5cc8288216a,
+        type: 2}
+    - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
+        type: 3}
+      propertyPath: m_SceneBindings.Array.data[90].key
+      value: 
+      objectReference: {fileID: -2463769695774858846, guid: 9dc6c63505f50374f963a5cc8288216a,
+        type: 2}
     - target: {fileID: 929757381185250648, guid: 964e80412448c564d8b5f9faebb8d392,
         type: 3}
       propertyPath: m_SceneBindings.Array.data[9].value
@@ -80505,6 +80553,11 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0.28098303
       objectReference: {fileID: 0}
+    - target: {fileID: 7031116849802301058, guid: 964e80412448c564d8b5f9faebb8d392,
+        type: 3}
+      propertyPath: m_ProbeAnchor
+      value: 
+      objectReference: {fileID: 8754247126453196885}
     - target: {fileID: 7049919721495956959, guid: 964e80412448c564d8b5f9faebb8d392,
         type: 3}
       propertyPath: m_LocalRotation.w
@@ -88341,7 +88394,7 @@ AudioSource:
   Priority: 128
   DopplerLevel: 1
   MinDistance: 1
-  MaxDistance: 20
+  MaxDistance: 10
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0

Assets/Res/Prefab/Scene_06/Static.prefab

@@ -1519,9 +1519,9 @@ AudioSource:
   Priority: 128
   DopplerLevel: 1
   MinDistance: 4
-  MaxDistance: 10
+  MaxDistance: 12
   Pan2D: 0
-  rolloffMode: 1
+  rolloffMode: 2
   BypassEffects: 0
   BypassListenerEffects: 0
   BypassReverbZones: 0
@@ -1539,7 +1539,7 @@ AudioSource:
       outWeight: 0.33333334
     - serializedVersion: 3
       time: 1
-      value: 0
+      value: 0.48623657
       inSlope: 0
       outSlope: 0
       tangentMode: 0
@@ -1647,9 +1647,9 @@ AudioSource:
   Priority: 128
   DopplerLevel: 1
   MinDistance: 4
-  MaxDistance: 10
+  MaxDistance: 12
   Pan2D: 0
-  rolloffMode: 1
+  rolloffMode: 2
   BypassEffects: 0
   BypassListenerEffects: 0
   BypassReverbZones: 0
@@ -1667,7 +1667,7 @@ AudioSource:
       outWeight: 0.33333334
     - serializedVersion: 3
       time: 1
-      value: 0
+      value: 0.5260925
       inSlope: 0
       outSlope: 0
       tangentMode: 0
@@ -2380,9 +2380,9 @@ AudioSource:
   Priority: 128
   DopplerLevel: 1
   MinDistance: 4
-  MaxDistance: 10
+  MaxDistance: 12
   Pan2D: 0
-  rolloffMode: 1
+  rolloffMode: 2
   BypassEffects: 0
   BypassListenerEffects: 0
   BypassReverbZones: 0
@@ -2400,7 +2400,7 @@ AudioSource:
       outWeight: 0.33333334
     - serializedVersion: 3
       time: 1
-      value: 0
+      value: 0.5659485
       inSlope: 0
       outSlope: 0
       tangentMode: 0

Assets/Res/Timelines/03_timeline.playable

@@ -78,7 +78,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 78.83466329994052
+    m_Start: 83.66666666666667
     m_ClipIn: 0.03833333333333329
     m_Asset: {fileID: 2960408018628947574}
     m_Duration: 5.041666666666657
@@ -143,11 +143,11 @@ MonoBehaviour:
     m_Recordable: 0
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 11.225000000000009
+    m_PostExtrapolationTime: 10.308333333333337
-    m_PreExtrapolationTime: 78.83466329994052
+    m_PreExtrapolationTime: 83.66666666666667
     m_DisplayName: ShuiMoSample_55
   - m_Version: 1
-    m_Start: 95.10132996660718
+    m_Start: 99.01666666666667
     m_ClipIn: 0
     m_Asset: {fileID: -821649427392416127}
     m_Duration: 0.9833333333333333
@@ -2338,10 +2338,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 111.37999663327386
+    m_Start: 111.1
     m_ClipIn: 0
     m_Asset: {fileID: 2329239673965431304}
-    m_Duration: 18.21666666666667
+    m_Duration: 19.866666666666674
     m_TimeScale: 1
     m_ParentTrack: {fileID: -5081743982730427072}
     m_EaseInDuration: 0
@@ -2531,7 +2531,7 @@ MonoBehaviour:
     m_Start: 68.5013299666072
     m_ClipIn: 0
     m_Asset: {fileID: -3576427389408190551}
-    m_Duration: 10.333333333333329
+    m_Duration: 15.16533670005947
     m_TimeScale: 1
     m_ParentTrack: {fileID: -4499875491651457226}
     m_EaseInDuration: 0
@@ -4655,7 +4655,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 128.61332996660724
+    m_Start: 129.98333333333335
     m_ClipIn: 0
     m_Asset: {fileID: 8034611744007635134}
     m_Duration: 0.9833333333333333
@@ -4789,7 +4789,7 @@ MonoBehaviour:
     m_Recordable: 0
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 12.423333333333375
+    m_PostExtrapolationTime: 13.793336700059484
     m_PreExtrapolationTime: 111.37999663327386
     m_DisplayName: ShuiMoSample_55
   m_Markers:
@@ -7047,7 +7047,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 96.26999663327386
+    m_Start: 100
     m_ClipIn: 0
     m_Asset: {fileID: -2575960966088384535}
     m_Duration: 5
@@ -7112,11 +7112,11 @@ MonoBehaviour:
     m_Recordable: 0
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 8.766666666666666
+    m_PostExtrapolationTime: 5.666666666666458
-    m_PreExtrapolationTime: 96.26999663327386
+    m_PreExtrapolationTime: 100
     m_DisplayName: ShuiMoSample
   - m_Version: 1
-    m_Start: 110.03666329994053
+    m_Start: 110.66666666666646
     m_ClipIn: 0
     m_Asset: {fileID: 2535315994859772150}
     m_Duration: 1
@@ -8604,10 +8604,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 78.83466329994052
+    m_Start: 82.16666666666667
     m_ClipIn: 0
     m_Asset: {fileID: 5521350365278804767}
-    m_Duration: 17.25
+    m_Duration: 17.83333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 6534141131734362440}
     m_EaseInDuration: 0
@@ -9396,10 +9396,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 96.26999663327386
+    m_Start: 99.83333333333333
     m_ClipIn: 0
     m_Asset: {fileID: -4740446351302593756}
-    m_Duration: 14.766666666666666
+    m_Duration: 11.83333333333313
     m_TimeScale: 1
     m_ParentTrack: {fileID: 6821310262004079175}
     m_EaseInDuration: 0
@@ -9811,11 +9811,11 @@ MonoBehaviour:
     m_Recordable: 0
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 4.339853570765499
+    m_PostExtrapolationTime: 9.171856937491654
     m_PreExtrapolationTime: 68.5013299666072
     m_DisplayName: ShuiMoSample
   - m_Version: 1
-    m_Start: 77.83466329994052
+    m_Start: 82.66666666666667
     m_ClipIn: 0
     m_Asset: {fileID: 5234836759720097871}
     m_Duration: 1

Assets/Scenes/Scene_03.unity

@@ -5527,6 +5527,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4812550483005842283, guid: 6d47fedfa1abfbb48adb49c03ab871b0,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 88b17521e99f23e4da7cd01665c55eae, type: 2}
     - target: {fileID: 6167372864087005594, guid: 6d47fedfa1abfbb48adb49c03ab871b0,
         type: 3}
       propertyPath: m_Name
@@ -5537,6 +5542,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7255802692780908199, guid: 6d47fedfa1abfbb48adb49c03ab871b0,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 57f95a5a306579843b249e3c1cfb242b, type: 2}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Scenes/Scene_05.unity

@@ -15950,7 +15950,8 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 67125806}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
+    m_RemovedGameObjects:
+    - {fileID: 6907888523191871127, guid: 2de3bf9ac390ec74fb7966c1afa122f5, type: 3}
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2de3bf9ac390ec74fb7966c1afa122f5, type: 3}

Assets/Scenes/Scene_06.unity

@@ -4945,6 +4945,26 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1604254327019570539, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.481951
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604254327019570539, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.5174199
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604254327019570539, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.48195094
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604254327019570539, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.5174199
+      objectReference: {fileID: 0}
     - target: {fileID: 3324862946533436018, guid: 4da8a903a6fadd74982c498aa9331530,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -5005,6 +5025,26 @@ PrefabInstance:
       propertyPath: m_LightProbeUsage
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4465531108088368413, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.481951
+      objectReference: {fileID: 0}
+    - target: {fileID: 4465531108088368413, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.5174199
+      objectReference: {fileID: 0}
+    - target: {fileID: 4465531108088368413, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.48195094
+      objectReference: {fileID: 0}
+    - target: {fileID: 4465531108088368413, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.5174199
+      objectReference: {fileID: 0}
     - target: {fileID: 4496245843547718909, guid: 4da8a903a6fadd74982c498aa9331530,
         type: 3}
       propertyPath: m_Name
@@ -5098,6 +5138,26 @@ PrefabInstance:
       propertyPath: m_SceneBindings.Array.data[65].value
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 8543529261294907857, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97820234
+      objectReference: {fileID: 0}
+    - target: {fileID: 8543529261294907857, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8543529261294907857, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8543529261294907857, guid: 4da8a903a6fadd74982c498aa9331530,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.20765401
+      objectReference: {fileID: 0}
     - target: {fileID: 8749249182067115175, guid: 4da8a903a6fadd74982c498aa9331530,
         type: 3}
       propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value

Assets/Scripts/Scene_05/SingleTouchPlayAnimator.cs

@@ -4,41 +4,41 @@ using UnityEngine;
 
 public class SingleTouchPlayAnimator : MonoBehaviour
 {
-    public GameObject animatorDaoJiu;
+    //public GameObject animatorDaoJiu;
     public GameObject animatorDaoJiuzhu;
     Animator animator;
     Animator animatorpig;
     //<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
-    bool isRun = false;
+    //bool isRun = false;
-    float waitTime = 5f;
+    //float waitTime = 5f;
-    float runTime = 0;
+    //float runTime = 0;
 
     // Start is called before the first frame update
     void Start()
     {
         animator = GetComponent<Animator>();
         animatorpig= animatorDaoJiuzhu.GetComponent<Animator>();
-        if (animatorDaoJiu != null)
+        //if (animatorDaoJiu != null)
-        {
+        //{
-            animatorDaoJiu.SetActive(false);
+        //    animatorDaoJiu.SetActive(false);
-        }
+        //}
     }
 
     private void Update()
     {
-        if (isRun)
+        //if (isRun)
-        {
+        //{
-            runTime += Time.deltaTime;
+        //    runTime += Time.deltaTime;
-            if (runTime > waitTime)
+        //    if (runTime > waitTime)
-            {
+        //    {
-                isRun = false;
+        //        isRun = false;
-                runTime = 0;
+        //        runTime = 0;
-                if (animatorDaoJiu != null)
+                //if (animatorDaoJiu != null)
-                {
+                //{
-                    animatorDaoJiu.SetActive(false);
+                //    animatorDaoJiu.SetActive(false);
-                }
+                //}
-            }
+        //    }
-        }
+        //}
     }
 
     private void OnTriggerEnter(Collider other)
@@ -49,11 +49,11 @@ public class SingleTouchPlayAnimator : MonoBehaviour
             animatorpig.Play("Touch");
         }
 
-        if (animatorDaoJiu != null)
+        //if (animatorDaoJiu != null)
-        {
+        //{
-            animatorDaoJiu.SetActive(true);
+        //    animatorDaoJiu.SetActive(true);
-            animatorDaoJiu.GetComponent<Animator>().Play("Touch");
+        //    animatorDaoJiu.GetComponent<Animator>().Play("Touch");
-            isRun = true;
+        //    isRun = true;
-        }
+        //}
     }
 }

Assets/__Test/Test/testGet.cs

@@ -8,7 +8,7 @@ public class testGet : MonoBehaviour
     void Start()
     {
         //Material met = this.GetComponent<Material>();
-        //met.
+        //met.123
     }
 
     // Update is called once per frame

Assets/代码/网络/VR2.cs

@@ -79,6 +79,7 @@ public class VR2 : MonoBehaviour
         //PicoAPI._Instance.OpenTouPing();
         //PicoAPI._Instance.KillAppsByPidOrPackageName("com.pvr.picocast");
         Initialize();
+        GameTools.CreateDirectory(Config.RootPath);
         Invoke("Init", 0.5f);
 
         GlobalEventMgr.Listen<int>(GameEvent.EventAnimalSend, GameDataManage_EventAnimalSend);

sdcard/王子的荣耀/ipconfig.txt

@@ -1,2 +1,2 @@
-192.168.10.107
+192.168.50.107
 http://124.221.151.193