Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
updated hero prefab with master control
  • Loading branch information
Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
1 parent afb864d commit 91801fd
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 75 deletions.
Binary file modified Guardian of Silverkeep/Assets/New Terrain 1.asset
View file
Binary file not shown.
Binary file modified Guardian of Silverkeep/Assets/New Terrain.asset
View file
Binary file not shown.
20 changes: 17 additions & 3 deletions Guardian of Silverkeep/Assets/Prefab/Hero.prefab
View file
Expand Up @@ -34,6 +34,7 @@ GameObject:
- 124: {fileID: 12400000}
- 114: {fileID: 11400002}
- 81: {fileID: 8100000}
- 114: {fileID: 11400010}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -80,8 +81,8 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -12.7874565, y: 0, z: -11.8034706}
m_LocalRotation: {x: 0, y: .987104058, z: 0, w: .160079986}
m_LocalPosition: {x: -2.42027354, y: 0, z: 3.56636238}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 400004}
Expand Down Expand Up @@ -263,7 +264,7 @@ MonoBehaviour:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68ec2fe99d1108b9d0006a298d76c639, type: 3}
m_Name:
Expand Down Expand Up @@ -359,6 +360,19 @@ MonoBehaviour:
maximumX: 360
minimumY: 0
maximumY: 0
--- !u!114 &11400010
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5e1f5f091bf954b86ade1fbe198851da, type: 3}
m_Name:
m_EditorClassIdentifier:
Win_Cond: 6
Lose_Cond: 0
--- !u!124 &12400000
Behaviour:
m_ObjectHideFlags: 1
Expand Down
137 changes: 65 additions & 72 deletions Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity
View file
Expand Up @@ -447,54 +447,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 944067170}
m_GameObject: {fileID: 95018709}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &107096183
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalPosition.x
value: -2.42027354
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalPosition.z
value: 3.56636238
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalRotation.y
value: .987104058
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalRotation.w
value: .160079986
objectReference: {fileID: 0}
- target: {fileID: 100000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 11400002, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_RootGameObject: {fileID: 1891145080}
m_IsPrefabParent: 0
m_IsExploded: 1
--- !u!1 &138689570
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -926,6 +878,46 @@ MeshFilter:
m_PrefabInternal: {fileID: 944067170}
m_GameObject: {fileID: 238324340}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &311674300
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalPosition.x
value: -2.42027354
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalPosition.z
value: 3.56636238
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalRotation.y
value: .987104058
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
propertyPath: m_LocalRotation.w
value: .160079986
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_RootGameObject: {fileID: 1891145080}
m_IsPrefabParent: 0
m_IsExploded: 1
--- !u!1 &317238647
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3342,7 +3334,7 @@ Transform:
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 100002, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
serializedVersion: 4
m_Component:
- 4: {fileID: 1139808586}
Expand All @@ -3363,7 +3355,7 @@ GameObject:
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 400002, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1139808585}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: .907083511, z: 0}
Expand All @@ -3376,15 +3368,15 @@ AudioListener:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 8100000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1139808585}
m_Enabled: 1
--- !u!114 &1139808588
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11400002, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1139808585}
m_Enabled: 0
m_EditorHideFlags: 0
Expand All @@ -3403,23 +3395,23 @@ Behaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 12400000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1139808585}
m_Enabled: 1
--- !u!92 &1139808590
Behaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 9200000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1139808585}
m_Enabled: 1
--- !u!20 &1139808591
Camera:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 2000000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1139808585}
m_Enabled: 1
serializedVersion: 2
Expand All @@ -3446,8 +3438,9 @@ Camera:
--- !u!114 &1139808592
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_PrefabParentObject: {fileID: 11400010, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1139808585}
m_Enabled: 1
m_EditorHideFlags: 0
Expand Down Expand Up @@ -4622,7 +4615,7 @@ MonoBehaviour:
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 100004, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
serializedVersion: 4
m_Component:
- 4: {fileID: 1737373807}
Expand All @@ -4639,7 +4632,7 @@ GameObject:
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 400004, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1737373806}
m_LocalRotation: {x: -0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
Expand All @@ -4651,7 +4644,7 @@ Renderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 2300000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1737373806}
m_Enabled: 1
m_CastShadows: 0
Expand All @@ -4670,7 +4663,7 @@ MeshFilter:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 3300000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1737373806}
m_Mesh: {fileID: 10205, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1764801032
Expand Down Expand Up @@ -5075,7 +5068,7 @@ MeshFilter:
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 100000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
serializedVersion: 4
m_Component:
- 4: {fileID: 1891145081}
Expand All @@ -5096,7 +5089,7 @@ GameObject:
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 400000, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1891145080}
m_LocalRotation: {x: 0, y: .987104058, z: 0, w: .160079986}
m_LocalPosition: {x: -2.42027354, y: 0, z: 3.56636238}
Expand All @@ -5110,7 +5103,7 @@ Rigidbody:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 5400000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1891145080}
serializedVersion: 2
m_Mass: 1
Expand All @@ -5126,7 +5119,7 @@ MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11400000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1891145080}
m_Enabled: 1
m_EditorHideFlags: 0
Expand All @@ -5146,7 +5139,7 @@ MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11400004, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1891145080}
m_Enabled: 1
m_EditorHideFlags: 0
Expand All @@ -5158,7 +5151,7 @@ MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11400006, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1891145080}
m_Enabled: 1
m_EditorHideFlags: 0
Expand Down Expand Up @@ -5214,7 +5207,7 @@ MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11400008, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1891145080}
m_Enabled: 1
m_EditorHideFlags: 0
Expand All @@ -5233,7 +5226,7 @@ CharacterController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 14300000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1891145080}
serializedVersion: 2
m_Height: 2
Expand All @@ -5247,7 +5240,7 @@ CharacterController:
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 100006, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
serializedVersion: 4
m_Component:
- 4: {fileID: 1910504914}
Expand All @@ -5264,7 +5257,7 @@ Light:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 10800000, guid: 62a6e0865cec44656be439b399ff7f72,
type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1910504912}
m_Enabled: 1
serializedVersion: 3
Expand Down Expand Up @@ -5299,7 +5292,7 @@ Light:
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 400006, guid: 62a6e0865cec44656be439b399ff7f72, type: 2}
m_PrefabInternal: {fileID: 107096183}
m_PrefabInternal: {fileID: 311674300}
m_GameObject: {fileID: 1910504912}
m_LocalRotation: {x: .421010107, y: -.0789899305, z: .0368336141, w: .902859032}
m_LocalPosition: {x: 0, y: 0, z: 0}
Expand Down

0 comments on commit 91801fd

Please sign in to comment.