Skip to content

Commit

Permalink
Merge pull request #4 from finol-digital/local-play
Browse files Browse the repository at this point in the history
Local play
  • Loading branch information
davidmfinol authored Nov 20, 2017
2 parents aa7266c + cdb3b00 commit f7474a8
Show file tree
Hide file tree
Showing 309 changed files with 1,838 additions and 2,158 deletions.
22 changes: 22 additions & 0 deletions Assets/Prefabs/Card Game Manager.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ GameObject:
m_Component:
- component: {fileID: 4566502268858140}
- component: {fileID: 114614180611090904}
- component: {fileID: 114598106250051860}
m_Layer: 0
m_Name: Card Game Manager
m_TagString: CardGameManager
Expand All @@ -40,6 +41,27 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114598106250051860
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1565440365293990}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e21bfc5d90e10d642a004d12853a1010, type: 3}
m_Name:
m_EditorClassIdentifier:
m_BroadcastPort: 47777
m_BroadcastKey: 2222
m_BroadcastVersion: 1
m_BroadcastSubVersion: 1
m_BroadcastInterval: 1000
m_UseNetworkManager: 1
m_BroadcastData: CGS
m_ShowGUI: 0
m_OffsetX: 0
m_OffsetY: 0
--- !u!114 &114614180611090904
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
10 changes: 5 additions & 5 deletions Assets/Prefabs/Card Info Viewer.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -2667,7 +2667,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.325, y: 1}
m_AnchorMax: {x: 0.35, y: 1}
m_AnchoredPosition: {x: 1, y: 0}
m_SizeDelta: {x: -1, y: 0}
m_Pivot: {x: 0, y: 0.5}
Expand Down Expand Up @@ -2931,7 +2931,7 @@ RectTransform:
m_Father: {fileID: 224749199611040918}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.15, y: 0}
m_AnchorMin: {x: 0.13, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
Expand Down Expand Up @@ -3177,9 +3177,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.325, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMax: {x: 0.35, y: 1}
m_AnchoredPosition: {x: 1, y: 0}
m_SizeDelta: {x: -1, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!224 &224714486892200878
RectTransform:
Expand Down
33 changes: 33 additions & 0 deletions Assets/Prefabs/Card Model.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ GameObject:
- component: {fileID: 225568299236548108}
- component: {fileID: 114870730626564982}
- component: {fileID: 114835859699800120}
- component: {fileID: 114658546989800252}
m_Layer: 5
m_Name: Card Model
m_TagString: Untagged
Expand Down Expand Up @@ -58,6 +59,38 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114658546989800252
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1700305412181862}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 372142912, guid: dc443db3e92b4983b9738c1131f555cb, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SceneId:
m_Value: 0
m_AssetId:
i0: 59
i1: 80
i2: 101
i3: 136
i4: 214
i5: 152
i6: 58
i7: 164
i8: 104
i9: 197
i10: 138
i11: 109
i12: 129
i13: 238
i14: 162
i15: 4
m_ServerOnly: 0
m_LocalPlayerAuthority: 1
--- !u!114 &114835859699800120
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
14 changes: 7 additions & 7 deletions Assets/Prefabs/DeckEditor/Deck Load Menu.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -2280,8 +2280,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 114477277995489710}
m_HandleRect: {fileID: 224999266905084260}
m_Direction: 2
m_Value: 1
m_Size: 0.9999999
m_Value: 0
m_Size: 0.99999994
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -3818,7 +3818,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 846.3543, y: -75}
m_AnchoredPosition: {x: 847.07007, y: -75}
m_SizeDelta: {x: 200, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224184534679307318
Expand Down Expand Up @@ -4160,7 +4160,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 282.1181, y: -75}
m_AnchoredPosition: {x: 282.3567, y: -75}
m_SizeDelta: {x: 200, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224412079416292858
Expand Down Expand Up @@ -4428,7 +4428,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.0000010728836}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 150}
m_Pivot: {x: 0.5, y: 1}
--- !u!224 &224646598233720374
Expand Down Expand Up @@ -4696,7 +4696,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1410.5906, y: -75}
m_AnchoredPosition: {x: 1411.7834, y: -75}
m_SizeDelta: {x: 200, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224999266905084260
Expand All @@ -4712,7 +4712,7 @@ RectTransform:
m_Father: {fileID: 224537503106189380}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.00000011920929}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/MainMenu/Game Load Menu.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Enter url of game to download...
m_Text: Enter CGS AutoUpdate URL...
--- !u!114 &114737551533877166
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
86 changes: 86 additions & 0 deletions Assets/Prefabs/PlayMode/NetPlayer.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !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: 1833244134286464}
m_IsPrefabParent: 1
--- !u!1 &1833244134286464
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4493576556417028}
- component: {fileID: 114797580129434228}
- component: {fileID: 114416027808059046}
m_Layer: 0
m_Name: NetPlayer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4493576556417028
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1833244134286464}
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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114416027808059046
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1833244134286464}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6a88bd459dba0be449622f9c07ed8e64, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114797580129434228
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1833244134286464}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 372142912, guid: dc443db3e92b4983b9738c1131f555cb, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SceneId:
m_Value: 0
m_AssetId:
i0: 87
i1: 106
i2: 21
i3: 171
i4: 27
i5: 14
i6: 79
i7: 52
i8: 200
i9: 152
i10: 24
i11: 119
i12: 233
i13: 171
i14: 128
i15: 41
m_ServerOnly: 0
m_LocalPlayerAuthority: 1

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

94 changes: 0 additions & 94 deletions Assets/Prefabs/PlayMode/Play Area.prefab

This file was deleted.

Loading

0 comments on commit f7474a8

Please sign in to comment.