Merge branch 'develop/fix_bid_data_error_targetrpc'

Assets/Examples/PrefsGUIExample/PrefsGUI - RosettaUI/PrefsGUI - RosettaUI.prefab

@@ -1,10 +1,101 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2331325693719292506
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3617350369278438900}
+  - component: {fileID: 1158614953931690290}
+  m_Layer: 0
+  m_Name: Slider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3617350369278438900
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2331325693719292506}
+  serializedVersion: 2
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8747254707611192352}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1158614953931690290
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2331325693719292506}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b8ca722537374d8dbae702af89ec960f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  primitive: {fileID: 0}
+--- !u!1 &4755230528773982185
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4512470761560304642}
+  - component: {fileID: 3003689320578001802}
+  m_Layer: 0
+  m_Name: MinMaxSlider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4512470761560304642
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4755230528773982185}
+  serializedVersion: 2
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8747254707611192352}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3003689320578001802
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4755230528773982185}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2d093026f77141df9104af271e6ad8c6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  minmax: {fileID: 0}
 --- !u!1001 &7411232724451739856
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 606649722984901848, guid: 4ed1865184a851c448a44589b9f302b9,
@@ -68,6 +159,21 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 2287126204365735152, guid: 4ed1865184a851c448a44589b9f302b9,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 3617350369278438900}
+    - targetCorrespondingSourceObject: {fileID: 2287126204365735152, guid: 4ed1865184a851c448a44589b9f302b9,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4512470761560304642}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 606649722984901848, guid: 4ed1865184a851c448a44589b9f302b9,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1262933857}
   m_SourcePrefab: {fileID: 100100000, guid: 4ed1865184a851c448a44589b9f302b9, type: 3}
 --- !u!1 &7976644945990181896 stripped
 GameObject:
@@ -87,3 +193,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6c505e31293c9064a9ce25e10dd6c5e0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  position: {x: 0, y: 0}
+--- !u!4 &8747254707611192352 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2287126204365735152, guid: 4ed1865184a851c448a44589b9f302b9,
+    type: 3}
+  m_PrefabInstance: {fileID: 7411232724451739856}
+  m_PrefabAsset: {fileID: 0}

Assets/Examples/PrefsGUIExample/PrefsGUI - RosettaUI/PrefsGUIRosettaUIExample.cs

@@ -1,12 +1,9 @@
 using PrefsGUI.Example;
-using UnityEngine;
-#if PrefsGUI_RosettaUI
 using RosettaUI;
-#endif
+using UnityEngine;
 
 namespace PrefsGUI.RosettaUI.Example
 {
-#if PrefsGUI_RosettaUI
     [RequireComponent(typeof(RosettaUIRoot))]
     public class PrefsGUIRosettaUIExample : MonoBehaviour
     {
@@ -18,23 +15,20 @@ private void Start()
             root.Build(CreateElement());
         }
 
-        Element CreateElement()
+        private Element CreateElement()
         {
             return UI.Window(
                 "PrefsGUI - RosettaUI",
-                UI.WindowLauncher<PrefsGUIExample_Part1>("Part1"),
-                UI.WindowLauncher<PrefsGUIExample_Part2>("Part2"),
-                UI.WindowLauncher<PrefsGUIExample_Part3>("Part3"),
+                UI.WindowLauncher<PrefsGUIExample_Primitive>("Primitive"),
+                UI.WindowLauncher<PrefsGUIRosettaUIExample_Slider>("Slider"),
+                UI.WindowLauncher<PrefsGUIRosettaUIExample_MinMaxSlider>("MinMaxSlider"),
+                UI.WindowLauncher<PrefsGUIExample_Dictionary>("Dictionary"),
                 UI.WindowLauncher(UI.Window(nameof(PrefsSearch), PrefsSearch.CreateElement())),
                 UI.Space().SetHeight(15f),
-                UI.Label(() => $"file path: {Kvs.PrefsKvsPathSelector.path}"),
+                UI.Label(() => $"file path: {Kvs.PrefsKvsPathSelector.Path}"),
                 UI.Button(nameof(Prefs.Save), Prefs.Save),
                 UI.Button(nameof(Prefs.DeleteAll), Prefs.DeleteAll)
             ).SetPosition(position);
         }
     }
-#else
-    public class PrefsGUIRosettaUIExample : MonoBehaviour
-    {}
-#endif
 }

Assets/Examples/PrefsGUIExample/PrefsGUI - RosettaUI/PrefsGUIRosettaUIExample_MinMaxSlider.cs

@@ -0,0 +1,24 @@
+using PrefsGUI.Example;
+using RosettaUI;
+using UnityEngine;
+
+namespace PrefsGUI.RosettaUI.Example
+{
+    public class PrefsGUIRosettaUIExample_MinMaxSlider : MonoBehaviour, IElementCreator
+    {
+        public PrefsGUIExample_MinMax minMax;
+
+        public Element CreateElement(LabelElement label)
+        {
+            return UI.Column(
+                minMax.prefsMinMaxInt.CreateMinMaxSlider(),
+                minMax.prefsMinMaxFloat.CreateMinMaxSlider(),
+                minMax.prefsMinMaxVector2.CreateMinMaxSlider(),
+                minMax.prefsMinMaxVector3.CreateMinMaxSlider(),
+                minMax.prefsMinMaxVector4.CreateMinMaxSlider(),
+                minMax.prefsMinMaxVector2Int.CreateMinMaxSlider(),
+                minMax.prefsMinMaxVector3Int.CreateMinMaxSlider()
+            );
+        }
+    }
+}