Browse Source

主界面特效

zhaoyang 2 years ago
parent
commit
354f31a120
29 changed files with 441 additions and 254 deletions
  1. 19 30
      FGUIProject/assets/Main/MainUI.xml
  2. 3 3
      FGUIProject/assets/Main/components/ButtonModle1.xml
  3. 7 0
      FGUIProject/assets/Main/components/Component7.xml
  4. 0 0
      FGUIProject/assets/Main/images/zjm_22.png
  5. BIN
      FGUIProject/assets/Main/images/zjm_rk_5.png
  6. 2 1
      FGUIProject/assets/Main/package.xml
  7. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component7.cs
  8. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component7.cs.meta
  9. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  10. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs
  11. 37 24
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  12. 186 0
      GameClient/Assets/ResIn/Prefab/SceneLogin.prefab
  13. 7 0
      GameClient/Assets/ResIn/Prefab/SceneLogin.prefab.meta
  14. 85 2
      GameClient/Assets/ResIn/Prefab/SceneMain.prefab
  15. 1 1
      GameClient/Assets/ResIn/Prefab/SceneMain.prefab.meta
  16. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas_v95qic!a.png
  26. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas_v95qic!a.png.meta
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas_v95qic.png
  28. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas_v95qic.png.meta
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 19 - 30
FGUIProject/assets/Main/MainUI.xml

@@ -8,7 +8,7 @@
     <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="24,305" group="n52_qqat" visible="false">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1618" size="310,274" group="n52_qqat">
+    <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1617" size="310,275" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fm"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhs"/>
@@ -55,17 +55,10 @@
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
     </component>
     <group id="n58_oju1" name="grpRight" xy="1576,621" size="516,1225" group="n59_oju1" advanced="true"/>
-    <image id="n62_v95q" name="n62" src="v95qic" fileName="images/zjm_1.png" xy="956,-240" group="n64_v95q"/>
-    <image id="n63_v95q" name="n63" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1037,1347" pivot="0.5,0.5" anchor="true" group="n64_v95q">
-      <relation target="" sidePair="middle-middle"/>
-    </image>
-    <image id="n65_v95q" name="n65" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1140,1347" pivot="0.5,0.5" anchor="true" group="n64_v95q" scale="-1,1">
-      <relation target="" sidePair="middle-middle"/>
-    </image>
-    <group id="n64_v95q" name="n64" xy="937,-240" size="303,2400" group="n59_oju1" advanced="true">
-      <relation target="" sidePair="middle-middle"/>
-    </group>
-    <group id="n59_oju1" name="grpMove" xy="0,-240" size="2092,2400" advanced="true"/>
+    <component id="n69_weok" name="loaRight" src="weokii" fileName="components/Component7.xml" xy="918,1447" group="n64_v95q"/>
+    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="1140,1565" pivot="0.5,0.5" anchor="true" size="200,234" group="n64_v95q" scale="-1,1"/>
+    <group id="n64_v95q" name="n64" xy="918,1447" size="322,235" group="n59_oju1" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="0,160" size="2092,1760" advanced="true"/>
     <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95"/>
     <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
       <relation target="" sidePair="right-right,top-top"/>
@@ -89,43 +82,39 @@
   <transition name="t1">
     <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
     <item time="0" type="Alpha" target="n58_oju1" value="0"/>
-    <item time="0" type="Visible" target="n63_v95q" value="true"/>
-    <item time="0" type="Visible" target="n65_v95q" value="false"/>
-    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="0,-240" endValue="-1080,-240" duration="24" ease="Circ.InOut"/>
+    <item time="0" type="Visible" target="n69_weok" value="true"/>
+    <item time="0" type="Visible" target="n70_weok" value="false"/>
+    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="0,160" endValue="-1080,160" duration="24" ease="Circ.InOut"/>
     <item time="6" type="Alpha" target="n52_qqat" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
     <item time="6" type="Visible" target="n57_oju1" value="false"/>
-    <item time="12" type="Visible" target="n63_v95q" value="false"/>
+    <item time="12" type="Visible" target="n69_weok" value="false"/>
     <item time="15" type="Alpha" target="n58_oju1" tween="true" startValue="0" endValue="1" duration="7" ease="Linear"/>
-    <item time="24" type="Visible" target="n65_v95q" value="true"/>
+    <item time="24" type="Visible" target="n70_weok" value="true"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Alpha" target="n52_qqat" value="0"/>
     <item time="0" type="Alpha" target="n57_oju1" value="0"/>
-    <item time="0" type="Visible" target="n63_v95q" value="false"/>
-    <item time="0" type="Visible" target="n65_v95q" value="true"/>
-    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="-1080,-240" endValue="0,-240" duration="24" ease="Circ.InOut"/>
+    <item time="0" type="Visible" target="n69_weok" value="false"/>
+    <item time="0" type="Visible" target="n70_weok" value="true"/>
+    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="-1080,160" endValue="0,160" duration="24" ease="Circ.InOut"/>
     <item time="6" type="Alpha" target="n58_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
     <item time="12" type="Alpha" target="n52_qqat" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
-    <item time="12" type="Visible" target="n65_v95q" value="false"/>
+    <item time="12" type="Visible" target="n70_weok" value="false"/>
     <item time="18" type="Alpha" target="n57_oju1" tween="true" startValue="0" endValue="1" duration="5" ease="Linear"/>
     <item time="18" type="Visible" target="n57_oju1" value="true"/>
-    <item time="24" type="Visible" target="n63_v95q" value="true"/>
+    <item time="24" type="Visible" target="n69_weok" value="true"/>
   </transition>
   <transition name="t4">
     <item time="0" type="Visible" target="n57_oju1" value="false"/>
-    <item time="0" type="Visible" target="n63_v95q" value="false"/>
-    <item time="0" type="Visible" target="n65_v95q" value="true"/>
-    <item time="0" type="XY" target="n59_oju1" value="-1080,-240"/>
+    <item time="0" type="Visible" target="n69_weok" value="false"/>
+    <item time="0" type="XY" target="n59_oju1" value="-1080,160"/>
   </transition>
   <transition name="t11">
     <item time="0" type="Alpha" target="n52_qqat" tween="true" startValue="0" endValue="1" duration="1" ease="Linear"/>
     <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="0" endValue="1" duration="1" ease="Linear"/>
     <item time="0" type="Alpha" target="n58_oju1" tween="true" startValue="1" endValue="0" duration="1" ease="Linear"/>
-    <item time="0" type="Visible" target="n63_v95q" value="false"/>
-    <item time="0" type="Visible" target="n65_v95q" value="true"/>
-    <item time="0" type="XY" target="n59_oju1" value="0,-240"/>
+    <item time="0" type="Visible" target="n70_weok" value="false"/>
+    <item time="0" type="XY" target="n59_oju1" value="0,160"/>
     <item time="1" type="Visible" target="n57_oju1" value="true"/>
-    <item time="1" type="Visible" target="n63_v95q" value="true"/>
-    <item time="1" type="Visible" target="n65_v95q" value="false"/>
   </transition>
 </component>

+ 3 - 3
FGUIProject/assets/Main/components/ButtonModle1.xml

@@ -2,12 +2,12 @@
 <component size="158,214" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
+    <graph id="n2_lki4" name="holder" xy="79,107" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
     <loader id="n1_wg7t" name="icon" xy="79,107" pivot="0.5,0.5" anchor="true" size="148,176" url="ui://mfvz4q8kv482fo" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <graph id="n2_lki4" name="holder" xy="127,130" size="0,0" touchable="false">
-      <relation target="" sidePair="height-height"/>
-    </graph>
     <graph id="n4_lki4" name="holder1" xy="127,130" size="0,0" visible="false" touchable="false">
       <relation target="" sidePair="height-height"/>
     </graph>

+ 7 - 0
FGUIProject/assets/Main/components/Component7.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="200,234">
+  <displayList>
+    <loader id="n69_weok" name="loaRight" xy="100,117" pivot="0.5,0.5" anchor="true" size="200,234" url="ui://mfvz4q8kv95qhx" autoSize="true"/>
+    <graph id="n70_weok" name="holder" xy="90,120" size="1,1"/>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/Main/images/zjm_1.png → FGUIProject/assets/Main/images/zjm_22.png


BIN
FGUIProject/assets/Main/images/zjm_rk_5.png


+ 2 - 1
FGUIProject/assets/Main/package.xml

@@ -433,11 +433,12 @@
     <image id="v95qi9" name="zd_jz_1.png" path="/imagesStory/"/>
     <image id="v95qia" name="zd_jz_2.png" path="/imagesStory/"/>
     <image id="v95qib" name="zd_jdbiao.png" path="/imagesStory/"/>
-    <image id="v95qic" name="zjm_1.png" path="/images/" atlas="alone_npot"/>
     <image id="v95qid" name="zd_zdjnsm_1.png" path="/imagesFight/"/>
     <component id="v95qie" name="ComSkillTips.xml" path="/"/>
     <image id="dhoaif" name="zjm_bbbb.png" path="/images/"/>
     <image id="ysx9ig" name="fzl_fzl.png" path="/images/"/>
+    <image id="weokih" name="zjm_22.png" path="/images/"/>
+    <component id="weokii" name="Component7.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component7.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_Component7
+    {
+        public GComponent target;
+        public GLoader m_loaRight;
+        public GGraph m_holder;
+        public const string URL = "ui://mfvz4q8kweokii";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "Component7";
+        private static UI_Component7 _proxy;
+
+        public static UI_Component7 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component7();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component7 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component7();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaRight = (GLoader)comp.GetChild("loaRight");
+            m_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaRight = null;
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component7.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 83c17c8f00753fe408e06f58cff5cd13
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -20,6 +20,8 @@ namespace UI.Main
         public UI_ButtonModle1 m_btnPoem;
         public UI_ButtonModle1 m_btnTravel;
         public GGroup m_grpRight;
+        public UI_Component7 m_loaRight;
+        public UI_Component7 m_loaLeft;
         public GGroup m_grpMove;
         public GComponent m_valueBar;
         public GList m_list;
@@ -90,6 +92,8 @@ namespace UI.Main
             m_btnPoem = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnPoem"));
             m_btnTravel = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnTravel"));
             m_grpRight = (GGroup)comp.GetChild("grpRight");
+            m_loaRight = (UI_Component7)UI_Component7.Create(comp.GetChild("loaRight"));
+            m_loaLeft = (UI_Component7)UI_Component7.Create(comp.GetChild("loaLeft"));
             m_grpMove = (GGroup)comp.GetChild("grpMove");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_list = (GList)comp.GetChild("list");
@@ -127,6 +131,10 @@ namespace UI.Main
             m_btnTravel.Dispose();
             m_btnTravel = null;
             m_grpRight = null;
+            m_loaRight.Dispose();
+            m_loaRight = null;
+            m_loaLeft.Dispose();
+            m_loaLeft = null;
             m_grpMove = null;
             m_valueBar = null;
             m_list = null;

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             _ui = UI_LoginUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneMain"));
+            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneLogin"));
         }
 
         protected override void OnInit()

+ 37 - 24
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -41,6 +41,11 @@ namespace GFGGame
         private GameObject _effectObj5;
         private GoWrapper _wrapper5;
 
+        private GameObject _effectObj6;
+        private GoWrapper _wrapper6;
+        private GameObject _effectObj7;
+        private GoWrapper _wrapper7;
+
         private List<GameObject> _effects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
         private List<GameObject> _effects1 = new List<GameObject>();
@@ -115,7 +120,7 @@ namespace GFGGame
             _btnJInShu.visible = false;
             _btnTianGong.visible = false;
 
-            _btns = new UI_ButtonModle1[] { _ui.m_btnHuanZhuang, _ui.m_btnZhaiXing, _ui.m_btnXiuFang, _ui.m_btnCiPai, _ui.m_btnStudio, _ui.m_btnField };
+            _btns = new UI_ButtonModle1[] { _ui.m_btnHuanZhuang, _ui.m_btnZhaiXing, _ui.m_btnXiuFang, _ui.m_btnCiPai };
             _ui.m_btnMain.target.onClick.Add(OnClickBtnMain);
             _ui.m_btnHuanZhuang.target.onClick.Add(OnClickBtnHuanZhuang);
             _ui.m_btnZhaiXing.target.onClick.Add(OnClickBtnZhaiXing);
@@ -138,19 +143,21 @@ namespace GFGGame
             // _btnField.onClick.Add(OnClickBtnField);
             _btnBag.onClick.Add(OnClickBtnBag);
 
-            _ui.m_btnChange.target.onClick.Add(OnBtnChangClick);
-            // AddEffect();
+            _ui.m_loaRight.target.onClick.Add(MoveLeft);
+            _ui.m_loaLeft.target.onClick.Add(MoveRight);
+
             swipeGesture = new SwipeGesture(_ui.target);
             swipeGesture.onAction.Add(OnSwipe);
             swipeGesture.actionDistance = swipeDistance;
             _ui.m_list.ResizeToFit();
+            _ui.m_btnChange.target.onClick.Add(OnBtnChangClick);
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.target.selected = true;
 
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.OPEN_TAGS);
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 0).Coroutine();
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 1).Coroutine();
-
+            AddEffect();
         }
         protected override void AddEventListener()
         {
@@ -215,28 +222,34 @@ namespace GFGGame
         }
         private void AddEffect()
         {
-            string resPath0 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_xf_tx");
-            string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_dj");
-            for (int i = 0; i < _btns.Length; i++)
-            {
-                GameObject gameObject0;
-                GoWrapper wrapper0;
-                GameObject gameObject1;
-                GoWrapper wrapper1;
-                SceneController.AddObjectToView(null, null, _btns[i].m_holder, resPath0, out gameObject0, out wrapper0);
-                SceneController.AddObjectToView(null, null, _btns[i].m_holder1, resPath3, out gameObject1, out wrapper1);
-                _effects.Add(gameObject0);
-                _wrappers.Add(wrapper0);
-                _effects1.Add(gameObject1);
-                _wrappers1.Add(wrapper1);
-            }
-
-            string resPath1 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zzl_tx");
+            // string resPath0 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_xf_tx");
+            // string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_dj");
+            // for (int i = 0; i < _btns.Length; i++)
+            // {
+            //     GameObject gameObject0;
+            //     GoWrapper wrapper0;
+            //     GameObject gameObject1;
+            //     GoWrapper wrapper1;
+            //     SceneController.AddObjectToView(null, null, _btns[i].m_holder, resPath0, out gameObject0, out wrapper0);
+            //     SceneController.AddObjectToView(null, null, _btns[i].m_holder1, resPath3, out gameObject1, out wrapper1);
+            //     _effects.Add(gameObject0);
+            //     _wrappers.Add(wrapper0);
+            //     _effects1.Add(gameObject1);
+            //     _wrappers1.Add(wrapper1);
+            // }
+
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_zzl");
             SceneController.AddObjectToView(_effectObj4, _wrapper4, _ui.m_btnMain.m_holder, resPath1, out _effectObj4, out _wrapper4);
-            SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3, out _effectObj4_1, out _wrapper4_1);
 
-            string resPath2 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_tx");
-            SceneController.AddObjectToView(_effectObj5, _wrapper5, _ui.m_headBar.m_holder, resPath2, out _effectObj5, out _wrapper5);
+            string resPath4 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_jt");
+            SceneController.AddObjectToView(_effectObj6, _wrapper6, _ui.m_loaLeft.m_holder, resPath4, out _effectObj6, out _wrapper6);
+            SceneController.AddObjectToView(_effectObj7, _wrapper7, _ui.m_loaRight.m_holder, resPath4, out _effectObj7, out _wrapper7);
+
+
+            // SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3, out _effectObj4_1, out _wrapper4_1);
+
+            // string resPath2 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_tx");
+            // SceneController.AddObjectToView(_effectObj5, _wrapper5, _ui.m_headBar.m_holder, resPath2, out _effectObj5, out _wrapper5);
         }
 
         private void SetPos()

+ 186 - 0
GameClient/Assets/ResIn/Prefab/SceneLogin.prefab

@@ -0,0 +1,186 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1202262495373414002
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2432797848204161373}
+  - component: {fileID: 726315018073398983}
+  m_Layer: 0
+  m_Name: Bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2432797848204161373
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1202262495373414002}
+  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_Children: []
+  m_Father: {fileID: 8934048990737965464}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &726315018073398983
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1202262495373414002}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: -999
+  m_Sprite: {fileID: 21300000, guid: 1813906bd64fd34458617bdd17d54c02, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10.8046875, y: 24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &8934048990737965465
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8934048990737965464}
+  m_Layer: 0
+  m_Name: SceneLogin
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8934048990737965464
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8934048990737965465}
+  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_Children:
+  - {fileID: 2432797848204161373}
+  - {fileID: 3768987550495608174}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &4837441816534019552
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8934048990737965464}
+    m_Modifications:
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: Role
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645814931756, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Size.x
+      value: 6.17
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645814931756, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Size.y
+      value: 13.35
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+--- !u!4 &3768987550495608174 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+  m_PrefabInstance: {fileID: 4837441816534019552}
+  m_PrefabAsset: {fileID: 0}

+ 7 - 0
GameClient/Assets/ResIn/Prefab/SceneLogin.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b039faa2a4db2ee449781c1a0d4e066d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 85 - 2
GameClient/Assets/ResIn/Prefab/SceneMain.prefab

@@ -24,7 +24,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 846544056943548434}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 10.8, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
@@ -164,6 +164,88 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &6659084238600538392
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3733622001744196029}
+  - component: {fileID: 4719268146684206238}
+  m_Layer: 0
+  m_Name: Bg2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3733622001744196029
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6659084238600538392}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 5.29, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8934048990737965464}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &4719268146684206238
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6659084238600538392}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 944f38800fa9a9a4eacca02ce5d4bfae, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 2.625, y: 24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &8934048990737965465
 GameObject:
   m_ObjectHideFlags: 0
@@ -193,6 +275,7 @@ Transform:
   m_Children:
   - {fileID: 2432797848204161373}
   - {fileID: 2397053893390390833}
+  - {fileID: 3733622001744196029}
   - {fileID: 3768987550495608174}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -206,7 +289,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x

+ 1 - 1
GameClient/Assets/ResIn/Prefab/SceneMain.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b039faa2a4db2ee449781c1a0d4e066d
+guid: d90b0d06c351eca41bd84ee3bca7e45d
 PrefabImporter:
   externalObjects: {}
   userData: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas_v95qic!a.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas_v95qic!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: cf3453460dfc2914eaa221ed76a60b6f
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas_v95qic.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas_v95qic.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: eae61a203797a2d42a85c9f1d91956f5
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes