Skip to content
This repository has been archived by the owner on Dec 15, 2017. It is now read-only.

Commit

Permalink
Update friend_start project
Browse files Browse the repository at this point in the history
  • Loading branch information
andyborrell committed Mar 26, 2014
1 parent f44a427 commit 005dd78
Show file tree
Hide file tree
Showing 29 changed files with 745 additions and 12 deletions.
15 changes: 10 additions & 5 deletions friendsmash_start/Assets/Scenes/GameStage.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
SceneSettings:
m_ObjectHideFlags: 0
m_PVSData:
m_QueryMode: 1
m_PVSObjectsArray: []
m_PVSPortalsArray: []
m_OcclusionBakeSettings:
viewCellSize: 1
bakeMode: 2
memoryUsage: 10485760
smallestOccluder: 5
smallestHole: .25
backfaceThreshold: 100
--- !u!104 &2
RenderSettings:
m_Fog: 0
Expand All @@ -23,6 +22,7 @@ RenderSettings:
m_SkyboxMaterial: {fileID: 2100000, guid: 0ec5ccd5622fd4cf393e46a7e147e46c, type: 2}
m_HaloStrength: .5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 0}
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -242,6 +242,7 @@ Camera:
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_HDR: 0
m_OcclusionCulling: 1
--- !u!4 &811108337
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -340,7 +341,7 @@ AudioListener:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1242341862}
m_Enabled: 1
m_Enabled: 0
--- !u!92 &1242341864
Behaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -383,6 +384,7 @@ Camera:
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_HDR: 0
m_OcclusionCulling: 1
--- !u!4 &1242341867
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -502,6 +504,9 @@ Renderer:
m_UseLightProbes: 0
m_LightProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: 0
--- !u!65 &1617951230
BoxCollider:
m_ObjectHideFlags: 0
Expand Down
89 changes: 83 additions & 6 deletions friendsmash_start/Assets/Scenes/MainMenu.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
SceneSettings:
m_ObjectHideFlags: 0
m_PVSData:
m_QueryMode: 1
m_PVSObjectsArray: []
m_PVSPortalsArray: []
m_OcclusionBakeSettings:
viewCellSize: 1
bakeMode: 2
memoryUsage: 10485760
smallestOccluder: 5
smallestHole: .25
backfaceThreshold: 100
--- !u!104 &2
RenderSettings:
m_Fog: 0
Expand All @@ -23,6 +22,7 @@ RenderSettings:
m_SkyboxMaterial: {fileID: 2100000, guid: 0ec5ccd5622fd4cf393e46a7e147e46c, type: 2}
m_HaloStrength: .5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 0}
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -142,6 +142,7 @@ Camera:
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_HDR: 0
m_OcclusionCulling: 1
--- !u!4 &491552207
Transform:
m_ObjectHideFlags: 0
Expand All @@ -162,6 +163,7 @@ GameObject:
m_Component:
- 4: {fileID: 2077195018}
- 114: {fileID: 2077195019}
- 114: {fileID: 2077195020}
m_Layer: 0
m_Name: Main Menu
m_TagString: Untagged
Expand Down Expand Up @@ -208,10 +210,85 @@ MonoBehaviour:
width: 200
height: 43
ResourcePos: {x: 162, y: 108}
ButtonStartPos: {x: -94, y: 182}
ButtonStartPos: {x: -94, y: 176.460007}
ButtonScale: .600000024
ButtonYGap: 10
ButtonYGap: 6.69999981
ChallengeDisplayTime: 4
ButtonLogoOffset: {x: 332, y: 0}
TournamentStep: 140
MouseScrollStep: 40
paymentDialog: {fileID: 0}
MenuSkin: {fileID: 11400000, guid: 19ecbe5a38115409985fb91294c4ad4a, type: 2}
CoinBalance: 0
NumLives: 0
NumBombs: 0
--- !u!114 &2077195020
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2077195017}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac28060b00cbb42d4971b589cd515222, type: 3}
m_Name:
m_EditorClassIdentifier:
DialogEnabled: 0
MenuSkin: {fileID: 11400000, guid: 19ecbe5a38115409985fb91294c4ad4a, type: 2}
PanelHeader: {fileID: 2800000, guid: 2bd52729368d545728935c8a9f0a9ecf, type: 3}
PanelBody: {fileID: 2800000, guid: 8a6ba177d2ba145dcb62e1a8c3590f33, type: 3}
PanelFooter: {fileID: 2800000, guid: 727df2ba72bfc48c197c27888acafbec, type: 3}
PanelHeight: 480
CoinsButtonPos: {x: 240, y: 120}
ItemsButtonPos: {x: 60, y: 120}
InitialPriceItemPos: {x: 40.9000015, y: 200}
PriceItemPosDelta: {x: 0, y: 45}
PriceItemSize: {x: 357, y: 40}
PriceItemFirstIconPos: {x: 9, y: 4}
PriceItemSecondIconPos: {x: 182, y: 4}
PriceItemSecondTextPos: 165
PriceItemCoinTexture: {fileID: 2800000, guid: bfacdb82e9b674151a1528500283d3b7,
type: 3}
PriceItemBombTexture: {fileID: 2800000, guid: d7981655a16e64d05aab66a05554b04e,
type: 3}
PriceItemLifeTexture: {fileID: 2800000, guid: 53608e52cc351465bb9c346129107a31,
type: 3}
PayWithMobileTexture: {fileID: 2800000, guid: ae1f79a49d8574c0a90f775b2cfa4d4a,
type: 3}
PayWithMobilePos: {x: 131.399994, y: 400.100006}
PayByMobileTextRect:
serializedVersion: 2
x: 132
y: 414
width: 198
height: 37
PayByMobileRect:
serializedVersion: 2
x: 156
y: 409
width: 165
height: 46
CloseButtonRect:
serializedVersion: 2
x: 420
y: 16
width: 37
height: 37
BombsRect:
serializedVersion: 2
x: 240.630005
y: 80
width: 0
height: 0
LivesRect:
serializedVersion: 2
x: 330.160004
y: 80
width: 0
height: 0
CoinsRect:
serializedVersion: 2
x: 151
y: 80
width: 0
height: 0
176 changes: 175 additions & 1 deletion friendsmash_start/Assets/Textures/GUI/MenuSkin.guiskin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MonoBehaviour:
m_box:
m_Name: box
m_Normal:
m_Background: {fileID: 11001, guid: 0000000000000000e000000000000000, type: 0}
m_Background: {fileID: 2800000, guid: 97d31552243e44b4a906ccf6d2e3e9a1, type: 3}
m_TextColor: {r: .799999952, g: .799999952, b: .799999952, a: 1}
m_Hover:
m_Background: {fileID: 0}
Expand Down Expand Up @@ -2759,6 +2759,180 @@ MonoBehaviour:
m_FixedHeight: 0
m_StretchWidth: 0
m_StretchHeight: 0
- m_Name: price_item
m_Normal:
m_Background: {fileID: 0}
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_Hover:
m_Background: {fileID: 0}
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_Active:
m_Background: {fileID: 2800000, guid: f28b165283f704a29b2992c04262233c, type: 3}
m_TextColor: {r: 1, g: .90196079, b: .90196079, a: 1}
m_Focused:
m_Background: {fileID: 2800000, guid: f28b165283f704a29b2992c04262233c, type: 3}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnNormal:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnHover:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnActive:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnFocused:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_Border:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Margin:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Padding:
m_Left: 37
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Overflow:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Font: {fileID: 0}
m_FontSize: 24
m_FontStyle: 0
m_Alignment: 3
m_WordWrap: 0
m_RichText: 1
m_TextClipping: 0
m_ImagePosition: 3
m_ContentOffset: {x: 21, y: 0}
m_FixedWidth: 0
m_FixedHeight: 0
m_StretchWidth: 0
m_StretchHeight: 0
- m_Name: price_item_hover
m_Normal:
m_Background: {fileID: 0}
m_TextColor: {r: .926470578, g: .79022491, b: .79022491, a: 1}
m_Hover:
m_Background: {fileID: 0}
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_Active:
m_Background: {fileID: 0}
m_TextColor: {r: 1, g: .90196079, b: .90196079, a: 1}
m_Focused:
m_Background: {fileID: 2800000, guid: f28b165283f704a29b2992c04262233c, type: 3}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnNormal:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnHover:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnActive:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnFocused:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_Border:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Margin:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Padding:
m_Left: 37
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Overflow:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Font: {fileID: 0}
m_FontSize: 24
m_FontStyle: 0
m_Alignment: 3
m_WordWrap: 0
m_RichText: 1
m_TextClipping: 0
m_ImagePosition: 3
m_ContentOffset: {x: 21, y: 0}
m_FixedWidth: 0
m_FixedHeight: 0
m_StretchWidth: 0
m_StretchHeight: 0
- m_Name: invisible_button
m_Normal:
m_Background: {fileID: 0}
m_TextColor: {r: .926470578, g: .79022491, b: .79022491, a: 1}
m_Hover:
m_Background: {fileID: 0}
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_Active:
m_Background: {fileID: 0}
m_TextColor: {r: 1, g: .90196079, b: .90196079, a: 1}
m_Focused:
m_Background: {fileID: 2800000, guid: f28b165283f704a29b2992c04262233c, type: 3}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnNormal:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnHover:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnActive:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnFocused:
m_Background: {fileID: 0}
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_Border:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Margin:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Padding:
m_Left: 37
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Overflow:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Font: {fileID: 0}
m_FontSize: 24
m_FontStyle: 0
m_Alignment: 3
m_WordWrap: 0
m_RichText: 1
m_TextClipping: 0
m_ImagePosition: 3
m_ContentOffset: {x: 0, y: 0}
m_FixedWidth: 0
m_FixedHeight: 0
m_StretchWidth: 0
m_StretchHeight: 0
m_Settings:
m_DoubleClickSelectsWord: 1
m_TripleClickSelectsLine: 1
Expand Down
Binary file added friendsmash_start/Assets/Textures/GUI/payment/bomb_32.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 005dd78

Please sign in to comment.