Merge branch 'arts' of http://119.45.195.106:15001/UniProject/feilong-client into arts

Assets/Scripts/Business/Framework/FGUI/FguiModule.cs

@@ -132,7 +132,7 @@ namespace XGame.Framework.FGUI
                 _uitree.RemovePanel(uiView.Panel);
                 if (isDestroy)
                 {
-                    DestroyUIView(uiView);
+                    DestroyView(uiView);
                 }
                 else
                 {
@@ -143,7 +143,7 @@ namespace XGame.Framework.FGUI
             if (isDestroy && _closedMap.TryGetValue(key, out uiView))
             {
                 _closedMap.Remove(key);
-                DestroyUIView(uiView);
+                DestroyView(uiView);
             }
         }
         IAsync IUIModule.Preload(UIKey uikey)
@@ -194,12 +194,12 @@ namespace XGame.Framework.FGUI
             _loadingMap.Clear();
             foreach (var uiview in _closedMap.Values)
             {
-                DestroyUIView(uiview);
+                DestroyView(uiview);
             }
             _closedMap.Clear();
             foreach (var uiview in _openedMap.Values)
             {
-                DestroyUIView(uiview);
+                DestroyView(uiview);
             }
             _openedMap.Clear();
             #region 清理FGUI緩存
@@ -305,7 +305,7 @@ namespace XGame.Framework.FGUI
             Log.Error($"UIModuleFGUI object conver type Error. source type:{value.GetType()} name:{value} target:{type}");
             return value;
         }
-        private void DestroyUIView(IUIView view)
+        private void DestroyView(IUIView view)
         {
             var uiPanel = (view.Panel as FguiPanel).Panel;
             (view as IDisposable).Dispose();

fl-fgui-project/assets/MainInterface/Button1.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,20" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <graph id="n0_kasa" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width,height"/>
+    </graph>
+    <graph id="n1_kasa" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
+      <gearDisplay controller="button" pages="2"/>
+      <relation target="" sidePair="width,height"/>
+    </graph>
+    <graph id="n2_kasa" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width,height"/>
+    </graph>
+  </displayList>
+</component>