From 91801fd08d893b838aad528b01dcbcc243ef9557 Mon Sep 17 00:00:00 2001
From: Tianzhu Zhang <ZentZo@Tianzhus-MacBook-Air.local>
Date: Wed, 9 Oct 2013 19:42:26 -0400
Subject: [PATCH] updated hero prefab with master control

---
 .../Assets/New Terrain 1.asset                | Bin 2473200 -> 2473200 bytes
 .../Assets/New Terrain.asset                  | Bin 1073500 -> 1073500 bytes
 .../Assets/Prefab/Hero.prefab                 |  20 ++-
 .../Assets/Scene_Tianzhu/LVL1.unity           | 137 +++++++++---------
 4 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/Guardian of Silverkeep/Assets/New Terrain 1.asset b/Guardian of Silverkeep/Assets/New Terrain 1.asset
index 0d37b5f7ffc09fc78dbc1ad56a1bfaa76f0f4ce4..adc26d92b03dbb333891aa8f921c12f8ef5c321c 100644
GIT binary patch
delta 127
zcmWN}ITpcC06@|62@)}6LY^^(^tPyYy~<8>_F)@obyD2+cE4BXde1uCA4rga3?-70
xjAbIRBr=s$W-^zBEG3g%3Mr+Mm8@kWwe;0icCwd)9OWd9oaG`{xxHz>pFhPJA<O^(

delta 127
zcmWN}ITpcC06@|62@)}6LY^^(EWi>KuUFZL&OU4-txk&D-tPAbUGG_k`vVCwkfB5}
ylCexAmPDqK%1q|6kfmgjOChCHvXZrIq?W$g%1-ujkfWTWk+WRnDz`W7_wxtEjUmkd

diff --git a/Guardian of Silverkeep/Assets/New Terrain.asset b/Guardian of Silverkeep/Assets/New Terrain.asset
index f174a102e3b1df37205ce780c4104d6fd0282e82..fef26b42c0a15009536843deb11e28dce57c81ed 100644
GIT binary patch
delta 62
zcmV~$IT3&`006-W|4&NJ1r{<WK?=q7n884FL=3wnr;^iqg!4gyR8mVLt#s1MAfrq&
N%Ob06vVX+u{sBjy5N-ef

delta 62
zcmV~$IT3&`006-W|4&Lz1`;wTK?=q7n884FL=3wnr;^iqg!4gyR8mVLt#s1MAfrq&
N%Ob06vVX+u{sBkS5N`kg

diff --git a/Guardian of Silverkeep/Assets/Prefab/Hero.prefab b/Guardian of Silverkeep/Assets/Prefab/Hero.prefab
index 757f72b..7e742bf 100644
--- a/Guardian of Silverkeep/Assets/Prefab/Hero.prefab	
+++ b/Guardian of Silverkeep/Assets/Prefab/Hero.prefab	
@@ -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
@@ -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}
@@ -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: 
@@ -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
diff --git a/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity b/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity
index 2a4502c..f5b18e3 100644
--- a/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity	
+++ b/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity	
@@ -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
@@ -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
@@ -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}
@@ -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}
@@ -3376,7 +3368,7 @@ 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
@@ -3384,7 +3376,7 @@ 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
@@ -3403,7 +3395,7 @@ 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
@@ -3411,7 +3403,7 @@ 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
@@ -3419,7 +3411,7 @@ 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
@@ -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
@@ -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}
@@ -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}
@@ -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
@@ -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
@@ -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}
@@ -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}
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}
@@ -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
@@ -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}