Release version 0.18.0

finol-digital · Feb 9, 2018 · df9fec4 · df9fec4
1 parent 59e59c1
commit df9fec4
Show file tree

Hide file tree

Showing 19 changed files with 465 additions and 220 deletions.
diff --git a/Assets/Editor.meta b/Assets/Editor.meta
diff --git a/Assets/Editor/PassThroughScrollRectEditor.cs b/Assets/Editor/PassThroughScrollRectEditor.cs
@@ -0,0 +1,24 @@
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.UI;
+
+[CustomEditor(typeof(PassThroughScrollRect))]
+public class ScrollRectNestedEditor : ScrollRectEditor
+{
+    SerializedProperty parentScrollRectProp;
+    GUIContent parentScrollRectGUIContent = new GUIContent("Parent ScrollRect");
+
+    protected override void OnEnable()
+    {
+        base.OnEnable();
+        parentScrollRectProp = serializedObject.FindProperty("parentScrollRect");
+    }
+
+    public override void OnInspectorGUI()
+    {
+        base.OnInspectorGUI();
+        serializedObject.Update();
+        EditorGUILayout.PropertyField(parentScrollRectProp, parentScrollRectGUIContent);
+        serializedObject.ApplyModifiedProperties();
+    }
+}
diff --git a/Assets/Editor/PassThroughScrollRectEditor.cs.meta b/Assets/Editor/PassThroughScrollRectEditor.cs.meta
diff --git a/Assets/Prefabs/Card Game Manager.prefab b/Assets/Prefabs/Card Game Manager.prefab
@@ -21,6 +21,7 @@ GameObject:
   - component: {fileID: 4566502268858140}
   - component: {fileID: 114614180611090904}
   - component: {fileID: 114214761007353596}
+  - component: {fileID: 114208327254760074}
   m_Layer: 0
   m_Name: Card Game Manager
   m_TagString: CardGameManager
@@ -41,6 +42,17 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &114208327254760074
+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: 3196a10ecc192d0498acb20855dfbcf4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &114214761007353596
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/Assets/Prefabs/DeckEditor/Card Search Menu.prefab b/Assets/Prefabs/DeckEditor/Card Search Menu.prefab
@@ -105,7 +105,7 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 224455533259717526}
-  - component: {fileID: 114857370907840008}
+  - component: {fileID: 114835729657597548}
   m_Layer: 5
   m_Name: Scroll View
   m_TagString: Untagged
@@ -1040,6 +1040,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   nameInputField: {fileID: 114432526856898742}
+  idInputField: {fileID: 114583128488254470}
+  setCodeInputField: {fileID: 114512750675783502}
   propertyFiltersContent: {fileID: 224318153937612578}
   stringPropertyPanel: {fileID: 114569757667774452}
   integerPropertyPanel: {fileID: 114492265758174768}
@@ -1366,15 +1368,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
-    m_Mode: 3
+    m_Mode: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
     m_DisabledColor: {r: 0.409, g: 0.409, b: 0.434, a: 0.447}
     m_ColorMultiplier: 1
@@ -1537,7 +1539,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 224682449570546798}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99999994
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -2661,7 +2663,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 114126704938545522}
-        m_MethodName: ClearFilters
+        m_MethodName: PromptClearFilters
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -2871,6 +2873,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Enter card name...
+--- !u!114 &114835729657597548
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1087516799333832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c33e2368229eeaa459c196bf17c7e71d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 224559312487078428}
+  m_Horizontal: 1
+  m_Vertical: 0
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 30
+  m_Viewport: {fileID: 224859827954773996}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  parentScrollRect: {fileID: 114565237960133700}
+  routeToParent: 0
 --- !u!114 &114841040392389466
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2931,37 +2966,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: String Property
---- !u!114 &114857370907840008
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1087516799333832}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Content: {fileID: 224559312487078428}
-  m_Horizontal: 1
-  m_Vertical: 0
-  m_MovementType: 1
-  m_Elasticity: 0.1
-  m_Inertia: 1
-  m_DecelerationRate: 0.135
-  m_ScrollSensitivity: 45
-  m_Viewport: {fileID: 224859827954773996}
-  m_HorizontalScrollbar: {fileID: 0}
-  m_VerticalScrollbar: {fileID: 0}
-  m_HorizontalScrollbarVisibility: 2
-  m_VerticalScrollbarVisibility: 2
-  m_HorizontalScrollbarSpacing: -3
-  m_VerticalScrollbarSpacing: -3
-  m_OnValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114865119356969238
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3431,7 +3435,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: 1502.6975, y: -75}
+  m_AnchoredPosition: {x: 1501.5094, y: -75}
   m_SizeDelta: {x: 200, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224051524254763044
@@ -3452,7 +3456,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -450}
-  m_SizeDelta: {x: 980, y: 150}
+  m_SizeDelta: {x: 950, y: 150}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!224 &224110979428933976
 RectTransform:
@@ -3562,7 +3566,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 650, y: 0}
+  m_AnchoredPosition: {x: 625, y: 0}
   m_SizeDelta: {x: 250, y: 75}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224173042166155030
@@ -3617,7 +3621,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: 901.61847, y: -75}
+  m_AnchoredPosition: {x: 900.90564, y: -75}
   m_SizeDelta: {x: 200, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224198085844350976
@@ -3660,7 +3664,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -750}
-  m_SizeDelta: {x: 980, y: 150}
+  m_SizeDelta: {x: 950, y: 150}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!224 &224236657539015784
 RectTransform:
@@ -3678,7 +3682,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 133.04515, y: 47.516125}
+  m_SizeDelta: {x: 133.11533, y: 47.54119}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224249250195301654
 RectTransform:
@@ -3750,7 +3754,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: 300.5395, y: -75}
+  m_AnchoredPosition: {x: 300.30188, y: -75}
   m_SizeDelta: {x: 200, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224318153937612578
@@ -3771,7 +3775,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.000008005919}
+  m_AnchoredPosition: {x: 0, y: -0.000008709343}
   m_SizeDelta: {x: 0, y: 450}
   m_Pivot: {x: 0, y: 1}
 --- !u!224 &224334909741877138
@@ -3793,7 +3797,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -600}
-  m_SizeDelta: {x: 980, y: 150}
+  m_SizeDelta: {x: 950, y: 150}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!224 &224383818070444768
 RectTransform:
@@ -3848,7 +3852,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 250, y: 0}
+  m_AnchoredPosition: {x: 225, y: 0}
   m_SizeDelta: {x: 250, y: 75}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224455533259717526
@@ -3867,8 +3871,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 125, y: 0}
-  m_SizeDelta: {x: -250, y: 0}
+  m_AnchoredPosition: {x: 112.5, y: 0}
+  m_SizeDelta: {x: -225, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224457410146012908
 RectTransform:
@@ -3943,7 +3947,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -0.000031408712, y: 0}
   m_SizeDelta: {x: 1460, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224566002591185584
@@ -4016,7 +4020,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0.99999994}
+  m_AnchorMax: {x: 1, y: 0.9999994}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -4037,8 +4041,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 878.11847, y: -150}
-  m_SizeDelta: {x: 980, y: 150}
+  m_AnchoredPosition: {x: 877.4056, y: -150}
+  m_SizeDelta: {x: 950, y: 150}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!224 &224729768024331750
 RectTransform:
@@ -4057,8 +4061,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 878.11847, y: -300}
-  m_SizeDelta: {x: 980, y: 150}
+  m_AnchoredPosition: {x: 877.4056, y: -300}
+  m_SizeDelta: {x: 950, y: 150}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!224 &224747296365312216
 RectTransform:
@@ -4077,7 +4081,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 250, y: 0}
+  m_AnchoredPosition: {x: 225, y: 0}
   m_SizeDelta: {x: 650, y: 75}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224760115712263306
@@ -4097,8 +4101,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 878.11847, y: 0}
-  m_SizeDelta: {x: 980, y: 150}
+  m_AnchoredPosition: {x: 877.4056, y: 0}
+  m_SizeDelta: {x: 950, y: 150}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!224 &224767118729177316
 RectTransform:
@@ -4190,7 +4194,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 250, y: 0}
+  m_AnchoredPosition: {x: 225, y: 0}
   m_SizeDelta: {x: 650, y: 75}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224859827954773996
@@ -4342,7 +4346,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 250, y: 0}
+  m_AnchoredPosition: {x: 225, y: 0}
   m_SizeDelta: {x: 650, y: 75}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224972423980820094
@@ -4362,7 +4366,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 250, y: 0}
+  m_AnchoredPosition: {x: 225, y: 0}
   m_SizeDelta: {x: 650, y: 75}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224986423223172556