Skip to content

Commit

Permalink
Merge pull request #12 from finol-digital/development
Browse files Browse the repository at this point in the history
Make opensource
  • Loading branch information
davidmfinol authored Jun 6, 2018
2 parents 6451ecb + 601afba commit 4aefa24
Show file tree
Hide file tree
Showing 26 changed files with 1,040 additions and 534 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ sysinfo.txt
# Builds
*.apk
*.unitypackage
*.keystore

#OS
.DS_Store
15 changes: 15 additions & 0 deletions Assets/Prefabs/Card Game Manager.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ GameObject:
- component: {fileID: 114614180611090904}
- component: {fileID: 114214761007353596}
- component: {fileID: 114208327254760074}
- component: {fileID: 114356562771634316}
m_Layer: 0
m_Name: Card Game Manager
m_TagString: CardGameManager
Expand Down Expand Up @@ -75,6 +76,20 @@ MonoBehaviour:
m_OffsetX: 0
m_OffsetY: 0
lobby: {fileID: 0}
--- !u!114 &114356562771634316
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: 3941f64aa1e57d744bdf4a88d8d70bfe, type: 3}
m_Name:
m_EditorClassIdentifier:
minSwipeLength: 1
triggerSwipeAtMinLength: 1
useEightDirections: 0
--- !u!114 &114614180611090904
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
25 changes: 5 additions & 20 deletions Assets/Scenes/DeckEditor.unity
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ GameObject:
- component: {fileID: 62766699}
- component: {fileID: 62766704}
- component: {fileID: 62766703}
- component: {fileID: 62766705}
m_Layer: 5
m_Name: DeckEditor Canvas
m_TagString: CardCanvas
Expand Down Expand Up @@ -390,20 +389,6 @@ MonoBehaviour:
nameText: {fileID: 779102099}
countText: {fileID: 836546759}
searchResults: {fileID: 62766703}
--- !u!114 &62766705
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 62766698}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3941f64aa1e57d744bdf4a88d8d70bfe, type: 3}
m_Name:
m_EditorClassIdentifier:
minSwipeLength: 0.5
triggerSwipeAtMinLength: 1
useEightDirections: 0
--- !u!1 &64640897
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -644,7 +629,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.000019838804, y: 0}
m_AnchoredPosition: {x: 0.000034322762, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &179835150
Expand Down Expand Up @@ -737,7 +722,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000012209412, y: 0}
m_AnchoredPosition: {x: -0.000045761146, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &196520020
Expand Down Expand Up @@ -2488,7 +2473,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.0000060964912, y: 0}
m_AnchoredPosition: {x: -0.000038166, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &796070842
Expand Down Expand Up @@ -2613,7 +2598,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.0000045800166, y: 0}
m_AnchoredPosition: {x: 0.00003052519, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &836546758
Expand Down Expand Up @@ -2967,7 +2952,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 335690429}
m_Direction: 0
m_Value: 0
m_Size: 0.68935287
m_Size: 0.98539513
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand Down
Loading

0 comments on commit 4aefa24

Please sign in to comment.