Merge pull request #16 from finol-digital/development

Release version 1.4.0
finol-digital · Aug 4, 2018 · 4133478 · 4133478
2 parents 72d7d78 + e39be5c
commit 4133478
Show file tree

Hide file tree

Showing 140 changed files with 5,202 additions and 4,946 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,6 +4,5 @@ root = true
 [*.cs]
 indent_style = space
 indent_size = 4
-end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,12 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.cs     text diff=csharp
+*.csproj text merge=union
+*.sln    text merge=union eol=crlf
+
+*.meta text
+*.prefab text
+*.preset text
+*.json text
+*.asset text
diff --git a/Assets/Scripts/Editor/BuildCGS.cs → Assets/Editor/BuildCGS.cs b/Assets/Scripts/Editor/BuildCGS.cs → Assets/Editor/BuildCGS.cs
diff --git a/Assets/Scripts/Editor/BuildCGS.cs.meta → Assets/Editor/BuildCGS.cs.meta b/Assets/Scripts/Editor/BuildCGS.cs.meta → Assets/Editor/BuildCGS.cs.meta
diff --git a/Assets/Prefabs/Card Model.prefab b/Assets/Prefabs/Card Model.prefab
@@ -196,7 +196,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7da0cfd7bd166ba43bf3e99b8d74f2e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  localPosition: {x: 0, y: 0}
+  position: {x: 0, y: 0}
   rotation: {x: 0, y: 0, z: 0, w: 0}
 --- !u!114 &114876689799331718
 MonoBehaviour:

diff --git a/Assets/Prefabs/Menus/Card Search Menu.prefab b/Assets/Prefabs/Menus/Card Search Menu.prefab
@@ -1380,7 +1380,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.88235295, g: 0.42745098, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.4509804, b: 0, a: 1}
     m_PressedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
     m_ColorMultiplier: 1
@@ -1804,7 +1804,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 114126704938545522}
-        m_MethodName: set_NameFilter
+        m_MethodName: SetNameFilter
         m_Mode: 0
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -2022,7 +2022,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 114126704938545522}
-        m_MethodName: set_SetCodeFilter
+        m_MethodName: SetCodeFilter
         m_Mode: 0
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -2344,7 +2344,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 114126704938545522}
-        m_MethodName: set_IdFilter
+        m_MethodName: SetIdFilter
         m_Mode: 0
         m_Arguments:
           m_ObjectArgument: {fileID: 0}

diff --git a/Assets/Prefabs/Menus/Deck Load Menu.prefab b/Assets/Prefabs/Menus/Deck Load Menu.prefab
@@ -983,6 +983,7 @@ MonoBehaviour:
   selectionContent: {fileID: 224937724690924458}
   selectionTemplate: {fileID: 224513094372486550}
   scrollRect: {fileID: 114606226609976292}
+  cancelButton: {fileID: 114440245882454988}
   shareFileButton: {fileID: 114207059650301704}
   deleteFileButton: {fileID: 114582670716232018}
   loadFromFileButton: {fileID: 114827358892291670}
@@ -2206,7 +2207,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 967c7b47090d34cf090c40749e45f0b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 935962ddb1e44499dad00e5ca6b38823, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2253,7 +2254,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 224000485604831812}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99999446
+  m_Size: 0.99998367
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -3027,7 +3028,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.88235295, g: 0.42745098, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.4509804, b: 0, a: 1}
     m_PressedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
     m_ColorMultiplier: 1
@@ -3324,7 +3325,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.99999446}
+  m_AnchorMax: {x: 1, y: 0.99998367}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -4087,7 +4088,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.000012579555}
+  m_AnchoredPosition: {x: 0, y: 0.00006396077}
   m_SizeDelta: {x: 0, y: 150}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!224 &224977536836211226

diff --git a/Assets/Prefabs/Menus/Deck Save Menu.prefab b/Assets/Prefabs/Menus/Deck Save Menu.prefab
@@ -1205,7 +1205,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 967c7b47090d34cf090c40749e45f0b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 935962ddb1e44499dad00e5ca6b38823, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

diff --git a/Assets/Prefabs/Menus/Dice Menu.prefab b/Assets/Prefabs/Menus/Dice Menu.prefab
@@ -703,7 +703,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 967c7b47090d34cf090c40749e45f0b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 935962ddb1e44499dad00e5ca6b38823, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

diff --git a/Assets/Prefabs/Menus/Lobby Menu.prefab b/Assets/Prefabs/Menus/Lobby Menu.prefab
@@ -512,7 +512,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.88235295, g: 0.42745098, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.4509804, b: 0, a: 1}
     m_PressedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
     m_ColorMultiplier: 1

diff --git a/Assets/Prefabs/Menus/Components.meta → Assets/Prefabs/Menus/Widgets.meta b/Assets/Prefabs/Menus/Components.meta → Assets/Prefabs/Menus/Widgets.meta
diff --git a/...Prefabs/Menus/Components/CGSFooter.prefab → ...ts/Prefabs/Menus/Widgets/CGSFooter.prefab b/...Prefabs/Menus/Components/CGSFooter.prefab → ...ts/Prefabs/Menus/Widgets/CGSFooter.prefab
diff --git a/...bs/Menus/Components/CGSFooter.prefab.meta → ...efabs/Menus/Widgets/CGSFooter.prefab.meta b/...bs/Menus/Components/CGSFooter.prefab.meta → ...efabs/Menus/Widgets/CGSFooter.prefab.meta
diff --git a/.../Prefabs/Menus/Components/SFButton.preset → Assets/Prefabs/Menus/Widgets/SFButton.preset b/.../Prefabs/Menus/Components/SFButton.preset → Assets/Prefabs/Menus/Widgets/SFButton.preset
@@ -70,11 +70,11 @@ Preset:
     objectReference: {fileID: 0}
   - target: {fileID: 0}
     propertyPath: m_Colors.m_HighlightedColor.r
-    value: 0.88235295
+    value: 1
     objectReference: {fileID: 0}
   - target: {fileID: 0}
     propertyPath: m_Colors.m_HighlightedColor.g
-    value: 0.42745098
+    value: 0.4509804
     objectReference: {fileID: 0}
   - target: {fileID: 0}
     propertyPath: m_Colors.m_HighlightedColor.b

diff --git a/...abs/Menus/Components/SFButton.preset.meta → ...refabs/Menus/Widgets/SFButton.preset.meta b/...abs/Menus/Components/SFButton.preset.meta → ...refabs/Menus/Widgets/SFButton.preset.meta
diff --git a/.../Prefabs/Menus/Components/SFToggle.preset → Assets/Prefabs/Menus/Widgets/SFToggle.preset b/.../Prefabs/Menus/Components/SFToggle.preset → Assets/Prefabs/Menus/Widgets/SFToggle.preset
@@ -70,11 +70,11 @@ Preset:
     objectReference: {fileID: 0}
   - target: {fileID: 0}
     propertyPath: m_Colors.m_HighlightedColor.r
-    value: 0.88235295
+    value: 1
     objectReference: {fileID: 0}
   - target: {fileID: 0}
     propertyPath: m_Colors.m_HighlightedColor.g
-    value: 0.42745098
+    value: 0.4509804
     objectReference: {fileID: 0}
   - target: {fileID: 0}
     propertyPath: m_Colors.m_HighlightedColor.b

diff --git a/...abs/Menus/Components/SFToggle.preset.meta → ...refabs/Menus/Widgets/SFToggle.preset.meta b/...abs/Menus/Components/SFToggle.preset.meta → ...refabs/Menus/Widgets/SFToggle.preset.meta
diff --git a/Assets/Resources/Game Selection Menu.prefab b/Assets/Resources/Game Selection Menu.prefab
@@ -2322,7 +2322,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.88235295, g: 0.42745098, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.4509804, b: 0, a: 1}
     m_PressedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
     m_ColorMultiplier: 1

diff --git a/Assets/Scenes/DeckEditor.unity b/Assets/Scenes/DeckEditor.unity
@@ -629,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.000034322762, y: 0}
+  m_AnchoredPosition: {x: -0.000022224247, y: 0}
   m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &179835150
@@ -722,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.000045761146, y: 0}
+  m_AnchoredPosition: {x: 0.000002341923, y: 0}
   m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &196520020
@@ -2234,7 +2234,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 62766703}
-        m_MethodName: Search
+        m_MethodName: ClearSearchName
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -2473,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.000038166, y: 0}
+  m_AnchoredPosition: {x: -0.00010915344, y: 0}
   m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &796070842
@@ -2598,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.00003052519, y: 0}
+  m_AnchoredPosition: {x: -0.000022888184, y: 0}
   m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &836546758
@@ -2952,7 +2952,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 335690429}
   m_Direction: 0
   m_Value: 0
-  m_Size: 0.98539513
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -4623,7 +4623,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 62766703}
-        m_MethodName: Search
+        m_MethodName: ClearSearchName
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}

diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
@@ -236,7 +236,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 0}
-    m_HighlightedColor: {r: 0.88235295, g: 0.42745098, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.4509804, b: 0, a: 1}
     m_PressedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
     m_ColorMultiplier: 1
@@ -876,7 +876,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 0, g: 0.54901963, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.88235295, g: 0.42745098, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.4509804, b: 0, a: 1}
     m_PressedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
     m_ColorMultiplier: 1
@@ -1233,7 +1233,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 0, g: 0.54901963, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.88235295, g: 0.42745098, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.4509804, b: 0, a: 1}
     m_PressedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
     m_ColorMultiplier: 1
@@ -1359,7 +1359,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 0, g: 0.54901963, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.88235295, g: 0.42745098, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.4509804, b: 0, a: 1}
     m_PressedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
     m_ColorMultiplier: 1
@@ -1562,7 +1562,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 0, g: 0.54901963, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.88235295, g: 0.42745098, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.4509804, b: 0, a: 1}
     m_PressedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1}
     m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
     m_ColorMultiplier: 1