rewrite ModelController.cs But may get stuck

This commit is contained in:
Ichirinko
2023-02-19 20:10:57 +08:00
parent b0a695bb3b
commit be507d250e
5 changed files with 347 additions and 1 deletions

View File

@@ -176,7 +176,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320693305}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -234,7 +234,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
<<<<<<< Updated upstream
--- !u!1001 &421937415
=======
--- !u!1001 &404755305
>>>>>>> Stashed changes
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -255,7 +259,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c5470c9a1aff50643b6a9ff0bab4297d, type: 3}
propertyPath: m_LocalPosition.z
<<<<<<< Updated upstream
value: 5
=======
value: 0
>>>>>>> Stashed changes
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c5470c9a1aff50643b6a9ff0bab4297d, type: 3}
propertyPath: m_LocalRotation.w
@@ -285,27 +293,40 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
<<<<<<< Updated upstream
- target: {fileID: -2845779275431937956, guid: c5470c9a1aff50643b6a9ff0bab4297d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
=======
>>>>>>> Stashed changes
- target: {fileID: 919132149155446097, guid: c5470c9a1aff50643b6a9ff0bab4297d, type: 3}
propertyPath: m_Name
value: troop
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c5470c9a1aff50643b6a9ff0bab4297d, type: 3}
<<<<<<< Updated upstream
--- !u!1 &437000000 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c5470c9a1aff50643b6a9ff0bab4297d, type: 3}
m_PrefabInstance: {fileID: 421937415}
m_PrefabAsset: {fileID: 0}
--- !u!114 &437000001
=======
--- !u!1 &404755306 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c5470c9a1aff50643b6a9ff0bab4297d, type: 3}
m_PrefabInstance: {fileID: 404755305}
m_PrefabAsset: {fileID: 0}
--- !u!114 &404755307
>>>>>>> Stashed changes
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
<<<<<<< Updated upstream
m_GameObject: {fileID: 437000000}
m_Enabled: 1
m_EditorHideFlags: 0
@@ -317,6 +338,14 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c5470c9a1aff50643b6a9ff0bab4297d, type: 3}
m_PrefabInstance: {fileID: 421937415}
m_PrefabAsset: {fileID: 0}
=======
m_GameObject: {fileID: 404755306}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a2b30b6aa6e08c4468a02e1fcabcd485, type: 3}
m_Name:
m_EditorClassIdentifier:
>>>>>>> Stashed changes
--- !u!1 &705507993
GameObject:
m_ObjectHideFlags: 0
@@ -489,7 +518,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
<<<<<<< Updated upstream
m_LocalPosition: {x: 0, y: 9.29, z: 20}
=======
m_LocalPosition: {x: 0, y: 7, z: 15}
>>>>>>> Stashed changes
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []