Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/Environment/fukong dao2.prefab

@@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1001 &4539639384097622214
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3.6000004
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 13.400002
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.2571829
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.2571829
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.65867823
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.65867823
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 137.343
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, type: 2}
+    - target: {fileID: -7511558181221131132, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, type: 2}
+    - target: {fileID: 919132149155446097, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_Name
+      value: fukong dao2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ebe13b67332437f478e3ba635a061233, type: 3}

Assets/Art/Environment/fukong dao2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CH1KtX+sBn8Rl0QdxHePgIUpX1Q4qPCU9wWH5GzavFZ0lPy7VjqpF38EaMdY
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Environment/fukong dao3.prefab

@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1001 &4247043276436770419
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.9810997
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.9810997
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.9811
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.8
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 36
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 135.8
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.24617667
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.24617667
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.66287035
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.66287035
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -139.252
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, type: 2}
+    - target: {fileID: 919132149155446097, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_Name
+      value: fukong dao3
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}

Assets/Art/Environment/fukong dao3.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3wXsHmvWn0El149Okgu5KtGEHXcbedoR4NdLk4HObM3RYQX2mzviwyw3bAu
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Environment/fukong dao4.prefab

@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1001 &4586208307775021788
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -18.58
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 81.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, type: 2}
+    - target: {fileID: 919132149155446097, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_Name
+      value: fukong dao4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 63677335207fa85458d422635ffac560, type: 3}

Assets/Art/Environment/fukong dao4.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XC5M5iv4VHlchK8GtXkrANIHUc2mVKDqM3OXXxqGMEPk0se9WXRaoBgRuhpS
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/cs yaodu.scene

@@ -482264,6 +482264,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2093453953714045176, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
     - target: {fileID: 2579613789551132574, guid: e925951f87f5df24392c535f597b31aa, type: 3}
       propertyPath: m_Name
       value: cj03

UserSettings/EditorUserSettings.asset

@@ -42,13 +42,13 @@ EditorUserSettings:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
+      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615