Merge remote-tracking branch 'remotes/origin/master' into yooasset

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -50,6 +50,7 @@ namespace GFGGame
                 GameConfig.InitData(data);
                 //显示登录
                 LoginController.ShowLogin();
+                //ItemCfgArray.Instance.GetAllDataAsync();
             });
         }
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -29,7 +29,6 @@ namespace UI.Card
         public GComponent m_ComLvConsumeGold;
         public GTextField m_txtCurExp;
         public GTextField m_txtMaxExp;
-        public GGraph m_holderbarLv;
         public GGroup m_grpLv;
         public GButton m_btnUpStar;
         public GComponent m_comStarCousumeGold;
@@ -38,7 +37,6 @@ namespace UI.Card
         public GButton m_btnRule;
         public GButton m_btnCheckAuto;
         public UI_ComStarItem m_comStarItem;
-        public GGraph m_holderUpStar;
         public UI_ComDodgeStar m_dodgeStar0;
         public UI_ComDodgeStar m_dodgeStar1;
         public UI_ComDodgeStar m_dodgeStar2;
@@ -53,7 +51,9 @@ namespace UI.Card
         public GButton m_btnSkill;
         public GGroup m_grpTab;
         public GGraph m_holderflower;
+        public GGraph m_holderbarLv;
         public GGraph m_holderTouchFlower;
+        public GGraph m_holderUpStar;
         public GList m_listProperty;
         public GButton m_btnSkill_2;
         public Transition m_starItemAlpha;
@@ -127,7 +127,6 @@ namespace UI.Card
             m_ComLvConsumeGold = (GComponent)comp.GetChild("ComLvConsumeGold");
             m_txtCurExp = (GTextField)comp.GetChild("txtCurExp");
             m_txtMaxExp = (GTextField)comp.GetChild("txtMaxExp");
-            m_holderbarLv = (GGraph)comp.GetChild("holderbarLv");
             m_grpLv = (GGroup)comp.GetChild("grpLv");
             m_btnUpStar = (GButton)comp.GetChild("btnUpStar");
             m_comStarCousumeGold = (GComponent)comp.GetChild("comStarCousumeGold");
@@ -136,7 +135,6 @@ namespace UI.Card
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_btnCheckAuto = (GButton)comp.GetChild("btnCheckAuto");
             m_comStarItem = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem"));
-            m_holderUpStar = (GGraph)comp.GetChild("holderUpStar");
             m_dodgeStar0 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar0"));
             m_dodgeStar1 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar1"));
             m_dodgeStar2 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar2"));
@@ -151,7 +149,9 @@ namespace UI.Card
             m_btnSkill = (GButton)comp.GetChild("btnSkill");
             m_grpTab = (GGroup)comp.GetChild("grpTab");
             m_holderflower = (GGraph)comp.GetChild("holderflower");
+            m_holderbarLv = (GGraph)comp.GetChild("holderbarLv");
             m_holderTouchFlower = (GGraph)comp.GetChild("holderTouchFlower");
+            m_holderUpStar = (GGraph)comp.GetChild("holderUpStar");
             m_listProperty = (GList)comp.GetChild("listProperty");
             m_btnSkill_2 = (GButton)comp.GetChild("btnSkill");
             m_starItemAlpha = comp.GetTransition("starItemAlpha");
@@ -181,7 +181,6 @@ namespace UI.Card
             m_ComLvConsumeGold = null;
             m_txtCurExp = null;
             m_txtMaxExp = null;
-            m_holderbarLv = null;
             m_grpLv = null;
             m_btnUpStar = null;
             m_comStarCousumeGold = null;
@@ -191,7 +190,6 @@ namespace UI.Card
             m_btnCheckAuto = null;
             m_comStarItem.Dispose();
             m_comStarItem = null;
-            m_holderUpStar = null;
             m_dodgeStar0.Dispose();
             m_dodgeStar0 = null;
             m_dodgeStar1.Dispose();
@@ -210,7 +208,9 @@ namespace UI.Card
             m_btnSkill = null;
             m_grpTab = null;
             m_holderflower = null;
+            m_holderbarLv = null;
             m_holderTouchFlower = null;
+            m_holderUpStar = null;
             m_listProperty = null;
             m_btnSkill_2 = null;
             m_starItemAlpha = null;

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -25,7 +25,7 @@ namespace GFGGame
         private const float SHOES_SCALE = 2.5f;
         private const float BODY_SCALE = 1f;
 
-        private const float DURATION = 0.5f;
+        private const float DURATION = 0.6f;
 
         private readonly int[] HEAD_Y_ARR = new int[] { ConstDressUpItemType.TOU_SHI, ConstDressUpItemType.ER_SHI, ConstDressUpItemType.JING_SHI, ConstDressUpItemType.ZHUANG_RONG };
         private readonly int[] FA_XING_Y_ARR = new int[] { ConstDressUpItemType.FA_XING };