Skip to content

Commit

Permalink
add end scene; fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
robinbach committed Apr 23, 2015
1 parent 79da956 commit 1bbe159
Show file tree
Hide file tree
Showing 25 changed files with 1,501 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Assets/Resources/Audio/RoundStartSE.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 191488}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 10, z: 0}
m_LocalPosition: {x: 0, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
Expand Down
12 changes: 12 additions & 0 deletions Assets/Resources/Audio/WinningSE.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ GameObject:
- 4: {fileID: 412164}
- 82: {fileID: 8264792}
- 114: {fileID: 11426416}
- 114: {fileID: 11421242}
m_Layer: 0
m_Name: WinningSE
m_TagString: Untagged
Expand Down Expand Up @@ -98,6 +99,17 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &11421242
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 191488}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9fcf34f25691d464fa9ca7c1a0019d19, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &11426416
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Items/IceBurstForTutorial.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2cb80de458607f14ba5ab9cf1bc30722, type: 3}
m_Name:
m_EditorClassIdentifier:
livingTime: 15
livingTime: 150
--- !u!198 &19876660
ParticleSystem:
m_ObjectHideFlags: 1
Expand Down
18 changes: 18 additions & 0 deletions Assets/Resources/StaticPrefabs/GameStatus.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GameObject:
- 114: {fileID: 11416986}
- 81: {fileID: 8164860}
- 114: {fileID: 11414962}
- 114: {fileID: 11491810}
m_Layer: 0
m_Name: GameStatus
m_TagString: Untagged
Expand Down Expand Up @@ -81,6 +82,23 @@ MonoBehaviour:
gameMode: 1
GameTargetRounds: 7
GameMaxTime: 200
--- !u!114 &11491810
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 138034}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3441d3ef5939b49cdbc6636b96554a49, type: 3}
m_Name:
m_EditorClassIdentifier:
Scores: 0000000000000000
Attacks: 0000000000000000
Ults: 0000000000000000
Rates:
-
-
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
Expand Down
151 changes: 151 additions & 0 deletions Assets/Resources/StaticPrefabs/TextBlock.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &195728
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 224: {fileID: 22435552}
- 222: {fileID: 22258136}
- 114: {fileID: 11407034}
- 82: {fileID: 8234414}
m_Layer: 5
m_Name: TextBlock
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &8234414
AudioSource:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 195728}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 6c2359d9ad5a24cf898faa0ecd199e13, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &11407034
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 195728}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: .982961476, b: .845588207, a: 1}
m_FontData:
m_Font: {fileID: 12800000, guid: 0edcb6469eb54458b998201f89ace46e, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: '5

'
--- !u!222 &22258136
CanvasRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 195728}
--- !u!224 &22435552
RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 195728}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_AnchorMin: {x: .5, y: 0}
m_AnchorMax: {x: .5, y: 1}
m_AnchoredPosition: {x: -30, y: -8}
m_SizeDelta: {x: 100, y: 16}
m_Pivot: {x: .5, y: .5}
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 195728}
m_IsPrefabParent: 1
8 changes: 8 additions & 0 deletions Assets/Resources/StaticPrefabs/TextBlock.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1bbe159

Please sign in to comment.