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

GameClient/Assets/Game/HotUpdate/Data/ArenaDataManager.cs

@@ -450,7 +450,7 @@ namespace GFGGame
         private long GetPerfectClickScore(FightData roleData)
         {
             double clickScore = 0;
-            foreach (int key in roleData.pardScoreListDic.Keys)
+            foreach (int key in roleData.partScoreListDic.Keys)
             {
                 double partBaseScore = ScoreSystemData.Instance.GetPartBaseScore(roleData, key);
                 //(部件基础评分+(角色等级分数+角色雅集技能分+词牌对应主题的属性分数)*点击完美附加评分系数0.2) * 点击系数2.22

GameClient/Assets/Game/HotUpdate/Data/Handler/RoleDataHandler.cs

@@ -44,7 +44,7 @@ namespace GFGGame
 
             if (seconds >= TimeUtil.SECOND_PER_MUNITE * 1)
             {
-                ViewManager.CheckDispsoe();
+                ViewManager.CheckDispose();
                 seconds = 0;
             }
             seconds++;

GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -36,19 +36,19 @@ namespace GFGGame
         /// </summary>
         public void SetEquipScoresWithPartId(FightData roleData)
         {
-            roleData.pardScoreListDic.Clear();
-            roleData.pardListDic.Clear();
+            roleData.partScoreListDic.Clear();
+            roleData.partListDic.Clear();
             FightScoreCfg[] typeCfgs = FightScoreCfgArray.Instance.dataArray;
             for (int j = 0; j < typeCfgs.Length; j++)
             {
                 FightScoreCfg cfg = typeCfgs[j];
-                if (roleData.pardScoreListDic.ContainsKey(cfg.id) == false)
+                if (roleData.partScoreListDic.ContainsKey(cfg.id) == false)
                 {
-                    roleData.pardScoreListDic.Add(cfg.id, new List<float>());
+                    roleData.partScoreListDic.Add(cfg.id, new List<float>());
                 }
-                if (roleData.pardListDic.ContainsKey(cfg.id) == false)
+                if (roleData.partListDic.ContainsKey(cfg.id) == false)
                 {
-                    roleData.pardListDic.Add(cfg.id, new List<int>());
+                    roleData.partListDic.Add(cfg.id, new List<int>());
                 }
             }
             for (int i = 0; i < roleData.itemList.Count; i++)
@@ -63,8 +63,8 @@ namespace GFGGame
                         ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(roleData.itemList[i]);
                         if (itemCfg.subType == cfg.subTypesArr[k])
                         {
-                            roleData.pardListDic[cfg.id].Add(roleData.itemList[i]);
-                            roleData.pardScoreListDic[cfg.id].Add(roleData.itemScoreList[i]);
+                            roleData.partListDic[cfg.id].Add(roleData.itemList[i]);
+                            roleData.partScoreListDic[cfg.id].Add(roleData.itemScoreList[i]);
                             isCheckFinish = true;
                             break;
                         }
@@ -172,12 +172,12 @@ namespace GFGGame
             double partScore = 0;
             double tagScore = 0;
             int tagCount = 0;
-            if (!roleData.pardListDic.ContainsKey(partId) || roleData.pardListDic[partId].Count == 0) return partScore;
+            if (!roleData.partListDic.ContainsKey(partId) || roleData.partListDic[partId].Count == 0) return partScore;
 
-            List<int> partList = roleData.pardListDic[partId];
+            List<int> partList = roleData.partListDic[partId];
             for (int i = 0; i < partList.Count; i++)
             {
-                partScore += roleData.pardScoreListDic[partId][i];
+                partScore += roleData.partScoreListDic[partId][i];
                 tagScore += ItemDataManager.GetItemTagScore(partList[i], roleData.tags);
                 // if (ItemDataManager.CheckItemTagsRight(partList[i], roleData.tags)) tagCount++;
             }

GameClient/Assets/Game/HotUpdate/Data/VO/FightData.cs

@@ -20,8 +20,8 @@ namespace GFGGame
 
         public int headId;//头像id
         public int borderId;//头像框id
-        public Dictionary<int, List<int>> pardListDic = new Dictionary<int, List<int>>();//战斗部位，部件列表,战斗开始时更新
-        public Dictionary<int, List<float>> pardScoreListDic = new Dictionary<int, List<float>>();//战斗部位，部件分数列表,战斗开始时更新
+        public Dictionary<int, List<int>> partListDic = new Dictionary<int, List<int>>();//战斗部位，部件列表,战斗开始时更新
+        public Dictionary<int, List<float>> partScoreListDic = new Dictionary<int, List<float>>();//战斗部位，部件分数列表,战斗开始时更新
         public List<int> itemList = new List<int>();
 
         /**********************************************机器人独立数据*****************************************/

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -82,7 +82,7 @@ namespace GFGGame
             _showSceneType = showSceneType;
             _showBg = showBg;
             _roleObj = roleObj;
-            if(_dressUpData.IsNew)
+            if (_dressUpData.IsNew)
             {
                 PutOnDefaultDressUpData();
             }

GameClient/Assets/Game/HotUpdate/Effect/EffectUI.cs

@@ -48,5 +48,10 @@ namespace GFGGame
                 _wrapper.Dispose();
             }
         }
+
+        public GameObject GetObj()
+        {
+            return _gameObject;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_CreateRoleUI.cs

@@ -7,10 +7,7 @@ namespace UI.CreateRole
     public partial class UI_CreateRoleUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
-        public GTextInput m_inputName;
-        public GButton m_btnSure;
-        public GButton m_btnDice;
+        public UI_EnvelopeModel m_envelopeModel;
         public const string URL = "ui://5al8chbdxt5s0";
         public const string PACKAGE_NAME = "CreateRole";
         public const string RES_NAME = "CreateRoleUI";
@@ -58,17 +55,12 @@ namespace UI.CreateRole
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_inputName = (GTextInput)comp.GetChild("inputName");
-            m_btnSure = (GButton)comp.GetChild("btnSure");
-            m_btnDice = (GButton)comp.GetChild("btnDice");
+            m_envelopeModel = (UI_EnvelopeModel)UI_EnvelopeModel.Create(comp.GetChild("envelopeModel"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
-            m_inputName = null;
-            m_btnSure = null;
-            m_btnDice = null;
+            m_envelopeModel.Dispose();
+            m_envelopeModel = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_Envelope.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CreateRole
+{
+    public partial class UI_Envelope
+    {
+        public GComponent target;
+        public Controller m_button;
+        public GGraph m_playerClickTipEffectHolder;
+        public GGraph m_LiuSuEffectHolder;
+        public GGraph m_flowerEffectHolder;
+        public GGraph m_XINFEffectHolder;
+        public const string URL = "ui://5al8chbdsq1qk";
+        public const string PACKAGE_NAME = "CreateRole";
+        public const string RES_NAME = "Envelope";
+        private static UI_Envelope _proxy;
+
+        public static UI_Envelope Create(GObject gObject = null)
+        {
+            var ui = new UI_Envelope();
+            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_Envelope Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Envelope();
+            }
+            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_button = comp.GetController("button");
+            m_playerClickTipEffectHolder = (GGraph)comp.GetChild("playerClickTipEffectHolder");
+            m_LiuSuEffectHolder = (GGraph)comp.GetChild("LiuSuEffectHolder");
+            m_flowerEffectHolder = (GGraph)comp.GetChild("flowerEffectHolder");
+            m_XINFEffectHolder = (GGraph)comp.GetChild("XINFEffectHolder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_button = null;
+            m_playerClickTipEffectHolder = null;
+            m_LiuSuEffectHolder = null;
+            m_flowerEffectHolder = null;
+            m_XINFEffectHolder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_Envelope.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_EnvelopeModel.cs

@@ -0,0 +1,102 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CreateRole
+{
+    public partial class UI_EnvelopeModel
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GGraph m_NiaoEffectHolder;
+        public GButton m_btnSure;
+        public GButton m_btnDice;
+        public GTextInput m_inputName;
+        public GGraph m_ShanZiEffectHolder;
+        public GGraph m_trailEffectHolder;
+        public UI_Envelope m_envelope;
+        public Transition m_t_In;
+        public Transition m_t_Idle;
+        public Transition m_t_Open;
+        public const string URL = "ui://5al8chbdobdno";
+        public const string PACKAGE_NAME = "CreateRole";
+        public const string RES_NAME = "EnvelopeModel";
+        private static UI_EnvelopeModel _proxy;
+
+        public static UI_EnvelopeModel Create(GObject gObject = null)
+        {
+            var ui = new UI_EnvelopeModel();
+            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_EnvelopeModel Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_EnvelopeModel();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_NiaoEffectHolder = (GGraph)comp.GetChild("NiaoEffectHolder");
+            m_btnSure = (GButton)comp.GetChild("btnSure");
+            m_btnDice = (GButton)comp.GetChild("btnDice");
+            m_inputName = (GTextInput)comp.GetChild("inputName");
+            m_ShanZiEffectHolder = (GGraph)comp.GetChild("ShanZiEffectHolder");
+            m_trailEffectHolder = (GGraph)comp.GetChild("trailEffectHolder");
+            m_envelope = (UI_Envelope)UI_Envelope.Create(comp.GetChild("envelope"));
+            m_t_In = comp.GetTransition("t_In");
+            m_t_Idle = comp.GetTransition("t_Idle");
+            m_t_Open = comp.GetTransition("t_Open");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_NiaoEffectHolder = null;
+            m_btnSure = null;
+            m_btnDice = null;
+            m_inputName = null;
+            m_ShanZiEffectHolder = null;
+            m_trailEffectHolder = null;
+            m_envelope.Dispose();
+            m_envelope = null;
+            m_t_In = null;
+            m_t_Idle = null;
+            m_t_Open = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_EnvelopeModel.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueUI.cs

@@ -19,8 +19,8 @@ namespace UI.League
         public GComponent m_comHead;
         public GButton m_btnChangeNotice;
         public GTextField m_txtLeaderName;
-        public GTextField m_txtNotice;
         public GButton m_btnChat;
+        public UI_comTxtNotice m_comtxtNotice;
         public UI_ButtonModle6 m_btnPray;
         public UI_ButtonModle2 m_btnSkill;
         public UI_ButtonModle3 m_btnGift;
@@ -86,8 +86,8 @@ namespace UI.League
             m_comHead = (GComponent)comp.GetChild("comHead");
             m_btnChangeNotice = (GButton)comp.GetChild("btnChangeNotice");
             m_txtLeaderName = (GTextField)comp.GetChild("txtLeaderName");
-            m_txtNotice = (GTextField)comp.GetChild("txtNotice");
             m_btnChat = (GButton)comp.GetChild("btnChat");
+            m_comtxtNotice = (UI_comTxtNotice)UI_comTxtNotice.Create(comp.GetChild("comtxtNotice"));
             m_btnPray = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btnPray"));
             m_btnSkill = (UI_ButtonModle2)UI_ButtonModle2.Create(comp.GetChild("btnSkill"));
             m_btnGift = (UI_ButtonModle3)UI_ButtonModle3.Create(comp.GetChild("btnGift"));
@@ -112,8 +112,9 @@ namespace UI.League
             m_comHead = null;
             m_btnChangeNotice = null;
             m_txtLeaderName = null;
-            m_txtNotice = null;
             m_btnChat = null;
+            m_comtxtNotice.Dispose();
+            m_comtxtNotice = null;
             m_btnPray.Dispose();
             m_btnPray = null;
             m_btnSkill.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTxtNotice.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_comTxtNotice
+    {
+        public GComponent target;
+        public GTextField m_txtNotice;
+        public const string URL = "ui://tw70qm9dgayctpj";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "comTxtNotice";
+        private static UI_comTxtNotice _proxy;
+
+        public static UI_comTxtNotice Create(GObject gObject = null)
+        {
+            var ui = new UI_comTxtNotice();
+            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_comTxtNotice Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comTxtNotice();
+            }
+            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_txtNotice = (GTextField)comp.GetChild("txtNotice");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtNotice = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTxtNotice.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListItem.cs

@@ -12,6 +12,7 @@ namespace UI.Studio
         public GLoader m_loaIcon;
         public GImage m_imgLock;
         public GTextField m_txtTitle;
+        public Transition m_test;
         public const string URL = "ui://xz8kxrecn3xha";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ListItem";
@@ -64,6 +65,7 @@ namespace UI.Studio
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_test = comp.GetTransition("test");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +74,7 @@ namespace UI.Studio
             m_loaIcon = null;
             m_imgLock = null;
             m_txtTitle = null;
+            m_test = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_AchieveItem.cs

@@ -7,6 +7,7 @@ namespace UI.Task
     public partial class UI_AchieveItem
     {
         public GComponent target;
+        public Controller m_AchieveType;
         public GTextField m_txtName;
         public const string URL = "ui://5mpsibzzaignto5";
         public const string PACKAGE_NAME = "Task";
@@ -55,10 +56,12 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
+            m_AchieveType = comp.GetController("AchieveType");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_AchieveType = null;
             m_txtName = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveDetailUI.cs

@@ -7,6 +7,7 @@ namespace UI.Task
     public partial class UI_TaskAchieveDetailUI
     {
         public GComponent target;
+        public Controller m_AchieveType;
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GList m_listAchieveTask;
@@ -57,12 +58,14 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
+            m_AchieveType = comp.GetController("AchieveType");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listAchieveTask = (GList)comp.GetChild("listAchieveTask");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_AchieveType = null;
             m_loaBg = null;
             m_btnBack = null;
             m_listAchieveTask = null;

GameClient/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs

@@ -3,15 +3,33 @@ using UI.CreateRole;
 using System;
 using System.Text.RegularExpressions;
 using ET;
+using System.Collections.Generic;
+using UnityEngine;
 
 namespace GFGGame
 {
     public class CreateRoleView : BaseWindow
     {
+        public enum State
+        {
+            IN,
+            IDLE,
+            OPEN
+        }
+
         private UI_CreateRoleUI _ui;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
 
         public override void Dispose()
         {
+            // Clear Effect
+            foreach(var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            _effectUIDic.Clear();
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -30,19 +48,59 @@ namespace GFGGame
             this.isfullScreen = true;
             this.clickBlankToClose = false;
             this.modal = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_yaoqinghan");
-            _ui.m_btnSure.onClick.Add(OnClickBtnSure);
-            _ui.m_btnDice.onClick.Add(() =>
+
+            _ui.m_envelopeModel.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_yaoqinghan");
+            _ui.m_envelopeModel.m_btnSure.onClick.Add(OnClickBtnSure);
+            _ui.m_envelopeModel.m_btnDice.onClick.Add(() =>
             {
                 RandomRoleName().Coroutine();
             });
         }
 
+        //private bool test = false;
+        private void ChangeAnimationState(State state)
+        {
+            switch (state)
+            {
+                case State.IN:
+                    _effectUIDic.Add("FX_Flower", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_flowerEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_Flower"));
+                    _effectUIDic.Add("FX_LiuSu", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_LiuSuEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_LiuSu"));
+                    _effectUIDic.Add("FX_taril", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_trailEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_taril"));
+
+                    _ui.m_envelopeModel.m_t_In.Play(() =>
+                    {
+                        ChangeAnimationState(State.IDLE);
+                    });
+                    break;
+                case State.IDLE:
+                    _effectUIDic.Add("FX_XINF", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_XINFEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_XINF"));
+                    _effectUIDic.Add("FX_player", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_playerClickTipEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_player"));
+                    _ui.m_envelopeModel.m_envelope.target.onClick.Add(OnClickBtnEnvelope);
+                    _ui.m_envelopeModel.m_t_Idle.Play(-1, 0, null);
+                    break;
+                case State.OPEN:
+                    //_effectUIDic["FX_player"].GetObj().GetComponentInChildren<Animator>().SetTrigger("Close");
+                    EffectUIPool.Recycle(_effectUIDic["FX_player"]);
+                    _effectUIDic.Remove("FX_player");
+                    _effectUIDic.Add("FX_ShanZi", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_ShanZiEffectHolder, "ui_CreateRoleUI/After_Open", "FX_ShanZi"));
+                    _effectUIDic.Add("FX_Niao", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_NiaoEffectHolder, "ui_CreateRoleUI/After_Open", "FX_Niao"));
+                    _ui.m_envelopeModel.m_envelope.target.touchable = false;
+                    _ui.m_envelopeModel.m_t_Idle.Stop();
+                    _ui.m_envelopeModel.m_t_Open.Play();
+                    break;
+            }
+        }
+
+
+
         protected override void OnShown()
         {
             base.OnShown();
             RandomRoleName().Coroutine();
             LogServerHelper.SendNodeLog((int)LogNode.ShowCreateRole);
+
+            ChangeAnimationState(State.IN);
+
         }
 
         protected override void OnHide()
@@ -50,9 +108,10 @@ namespace GFGGame
             base.OnHide();
         }
 
+
         private async void OnClickBtnSure()
         {
-            string roleName = _ui.m_inputName.text;
+            string roleName = _ui.m_envelopeModel.m_inputName.text;
             if (string.IsNullOrEmpty(roleName))
             {
                 PromptController.Instance.ShowFloatTextPrompt("˝ÇÉŤĂű˛ťÄÜÎŞżŐ");
@@ -81,11 +140,15 @@ namespace GFGGame
         private async ETTask RandomRoleName()
         {
             string name = await LoginController.ReqRandomRoleName();
-            if(_ui != null && _ui.m_inputName != null)
+            if (_ui != null && _ui.m_envelopeModel.m_inputName != null)
             {
-                _ui.m_inputName.text = name;
+                _ui.m_envelopeModel.m_inputName.text = name;
             }
         }
 
+        private void OnClickBtnEnvelope()
+        {
+            ChangeAnimationState(State.OPEN);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -96,6 +96,7 @@ namespace GFGGame
             _ui.m_partsList.m_imgTop.visible = false;
 
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -104,6 +105,16 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
+        }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -164,14 +175,7 @@ namespace GFGGame
             _ui.m_comValueInfo.GetController("c2").selectedIndex = 0;
 
         }
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
-            EventAgent.RemoveEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
-        }
+
         private void OnClickBtnBack()
         {
             bool isSave = _itemList.Count == MyDressUpHelper.dressUpObj.itemList.Count;

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -53,9 +53,9 @@ namespace GFGGame
             base.Dispose();
         }
 
-        protected override void Init()
+        protected override void OnInit()
         {
-            base.Init();
+            base.OnInit();
             packageName = UI_DressUpFightUI.PACKAGE_NAME;
             _ui = UI_DressUpFightUI.Create();
             viewCom = _ui.target;
@@ -64,12 +64,6 @@ namespace GFGGame
             _ui.m_btnClose.width = GRoot.inst.width;
             _ui.m_btnClose.height = GRoot.inst.height;
             _ui.m_btnClose.AddRelation(GRoot.inst, RelationType.Size);
-
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
             _ui.m_btnLastStep.visible = true;
             _ui.m_btnNextStep.visible = true;
             _ui.m_btnClose.visible = false;
@@ -119,6 +113,7 @@ namespace GFGGame
             _ui.m_partsList.m_imgTop.visible = false;
 
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -130,6 +125,19 @@ namespace GFGGame
             // EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
 
         }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
+
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
+            // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
+
+        }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -231,28 +239,20 @@ namespace GFGGame
             MyDressUpHelper.ResetMemory();
             Timers.inst.Remove(CheckGuide);
         }
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
 
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
-            // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
-
-        }
         private void OnClickBtnLastStep()
         {
             if (!MyDressUpHelper.OnClickBtnLastStep()) return;
             UpdateStepBtn(false);
         }
+
         private void OnClickBtnNextStep()
         {
             if (!MyDressUpHelper.OnClickBtnNextStep()) return;
             UpdateStepBtn(false);
 
         }
+
         private void OnClickBtnBack()
         {
             AlertUI.Show("是否确定退出？")
@@ -341,6 +341,7 @@ namespace GFGGame
             }
             this.hideListType2();
         }
+
         private void OnClickSearchPartsListItem(EventContext context)
         {
             if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
@@ -367,6 +368,7 @@ namespace GFGGame
 
             UpdateScore();
         }
+
         private void OnClickPartsListItem(EventContext context)
         {
             if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
@@ -403,6 +405,7 @@ namespace GFGGame
             // UpdateListSuitPartsSelected();
             UpdateScore();
         }
+
         private void OnClickSuitPartsListItem(EventContext context)
         {
             if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
@@ -433,6 +436,7 @@ namespace GFGGame
             // UpdateListSuitPartsSelected();
             UpdateScore();
         }
+
         private void UpdateStepBtn(bool isAdd, int suitId = 0)
         {
             if (isAdd)

GameClient/Assets/Game/HotUpdate/Views/League/LeagueChangeNoticeView.cs

@@ -66,11 +66,11 @@ namespace GFGGame
         }
         private async void OnBtnSaveClick()
         {
-            // if (!Regex.IsMatch(_ui.m_txtContent.text, @"^[\u4e00-\u9fa5_0-9]+$"))
-            // {
-            //     PromptController.Instance.ShowFloatTextPrompt("雅集公告仅允许汉字、数字、下划线");
-            //     return;
-            // }
+            //if (!Regex.IsMatch(_ui.m_txtContent.text, @"^[\u4e00-\u9fa5_0-9]+$"))
+            //{
+            //    PromptController.Instance.ShowFloatTextPrompt("雅集公告仅允许汉字、数字、下划线");
+            //    return;
+            //}
             bool result = await LeagueSproxy.ReqChangeLeagueNotice(_ui.m_txtContent.text);
             if (result)
             {

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -149,7 +149,7 @@ namespace GFGGame
             _ui.m_txtUnionName.text = leagueData.Name;
             _ui.m_comLeagueHead.m_loaUnionIcon.url = ResPathUtil.GetLeagueIconPath(leagueData.Icon);
             _ui.m_comLeagueHead.m_txtUnionLv.text = LeagueDataManager.Instance.HallLevel.ToString();
-            _ui.m_txtNotice.text = leagueData.Notice;
+            _ui.m_comtxtNotice.m_txtNotice.text = leagueData.Notice;
             _ui.m_txtLeaderName.text = leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.roleName;
             RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headId, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headBorderId);
         }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -54,7 +54,7 @@ namespace GFGGame
             }
 
             // Clear Effect
-            for (int i = 0; i < _effectUIList.Capacity; i++)
+            for (int i = 0; i < _effectUIList.Count; i++)
             {
                 EffectUIPool.Recycle(_effectUIList[i]);
             }
@@ -179,7 +179,11 @@ namespace GFGGame
         }
         private void ResetDailyData()
         {
-            ViewManager.Show<MainUIView>();
+            //ViewManager.Show<MainUIView>();
+            CheckFunOpen();
+            UpdateRedDot();
+            UpdateHead();
+            UpdateBtnFirstRecharge();
         }
 
         protected override void OnShown()

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs

@@ -8,7 +8,7 @@ namespace GFGGame
     //织物副本
     public class StudioFabricView : StudioBaseView
     {
-
+        private int _time = 0;
         public override void Dispose()
         {
             base.Dispose();
@@ -32,19 +32,38 @@ namespace GFGGame
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this._studioCfg.type, this._studioCfg.subType, this._studioCfg.id);
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
-
             base.OnShown();
 
+            //add by zyq
+            for (int i = 0; i < list.numChildren; i++)
+            {
+                list.GetChildAt(i).visible = false;
+            }
+            _time = 0;
+            Timers.inst.Add(0.2f, list.numChildren, OnTimerUpdate, 1);
+
+           
+
         }
 
         protected override void OnHide()
         {
-            base.OnHide();
+            base.OnHide(); 
+            Timers.inst.Remove(OnTimerUpdate);
         }
 
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(StudioFabricView).FullName);
         }
+
+        private void OnTimerUpdate(object param)
+        {
+            list.GetChildAt(_time).visible = true;
+            UI_ListItem listItem = UI_ListItem.Proxy(list.GetChildAt(_time++));
+            //播放动效
+            listItem.m_test.Play();
+            UI_ListItem.ProxyEnd();
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs

@@ -8,8 +8,9 @@ namespace GFGGame
     public class TaskAchieveDetailView : BaseWindow
     {
         private UI_TaskAchieveDetailUI _ui;
-        private List<TaskCfg> _cfgs;
-        private int funcType = TaskFuncType.BattlePass;
+        private List<TaskCfg> _cfgs = new List<TaskCfg>();
+        private int funcType = TaskFuncType.Achievement;
+        private List<TaskCfg> _cfgsAll = new List<TaskCfg>();
 
         public override void Dispose()
         {
@@ -53,7 +54,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _cfgs = TaskDataManager.Instance.GetTaskCfgs(funcType);
             UpdateTask();
         }
 
@@ -62,9 +62,16 @@ namespace GFGGame
             base.OnHide();
         }
 
-        private void UpdateTask()
+        private void UpdateTask()   
         {
-            _cfgs = TaskDataManager.Instance.GetTaskCfgs(funcType);
+            int taskSubType = (int)this.viewData;
+            _ui.m_AchieveType.selectedIndex = taskSubType;
+            _cfgsAll = TaskDataManager.Instance.GetTaskCfgs(funcType);
+            _cfgs.Clear();
+            foreach (var info in _cfgsAll) {
+                if (info.achievementType == taskSubType+1)
+                    _cfgs.Add(info);
+            }
             _ui.m_listAchieveTask.numItems = _cfgs.Count;
         }
 
@@ -77,15 +84,15 @@ namespace GFGGame
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
             item.m_txtCount.text =
                 $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
-            //if (item.m_GetRewardBt.data == null)
-            //{
-            //    item.m_GetRewardBt.target.onClick.Add(OnBtnGetClick);
-            //}
-            //item.m_GetRewardBt.data = _cfgs[index].id;
-            //if (item.m_ComeBt.data == null)
-            //{
-            //    item.m_ComeBt.target.onClick.Add(OnBtnGoClick);
-            //}
+            if (item.m_GetRewardBt.target.data == null)
+            {
+                item.m_GetRewardBt.target.onClick.Add(OnBtnGetClick);
+            }
+            item.m_GetRewardBt.target.data = _cfgs[index].id;
+            if (item.m_ComeBt.target.data == null)
+            {
+                item.m_ComeBt.target.onClick.Add(OnBtnGoClick);
+            }
             item.m_ComeBt.target.data = _cfgs[index];
             if (item.m_listTaskReward.data == null)
             {
@@ -111,5 +118,26 @@ namespace GFGGame
             item.ChangeTxtCountStyle();
             UI_RewardIconYellow.ProxyEnd();
         }
+        private async void OnBtnGetClick(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
+            if (!result) return;
+            UpdateTask();
+            //LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
+        }
+
+        private void OnBtnGoClick(EventContext context)
+        {
+            if (!(context.sender is GObject { data: TaskCfg taskCfg })) return;
+            //¹¦ÄÜ먦·Å
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(taskCfg.jumpId)) return;
+            var param = new object[taskCfg.jumpParamArr.Length];
+            for (var i = 0; i < taskCfg.jumpParamArr.Length; i++)
+            {
+                param[i] = taskCfg.jumpParamArr[i];
+            }
+            ViewManager.JumpToView(taskCfg.jumpId, param, new object[] { typeof(TaskAchieveDetailView).FullName});
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs

@@ -28,7 +28,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chengjiu_bg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_listAchieveItem.itemRenderer = RenderListAchieveItem;
-            _ui.m_listAchieveItem.onClickItem.Add(OnClickListRarityItem);
+            //_ui.m_listAchieveItem.onClickItem.Add(OnClickListRarityItem);
         }
 
         private void OnBtnBackClick()
@@ -38,7 +38,11 @@ namespace GFGGame
 
         private void OnClickListRarityItem(EventContext context)
         {
-            ViewManager.Show<TaskAchieveDetailView>();
+            int subIndex = (int)(context.sender as GObject).data;
+            if (subIndex > 3)
+                PromptController.Instance.ShowFloatTextPrompt("ÔÝδżŞĆô");
+            else
+                ViewManager.Show<TaskAchieveDetailView>(subIndex);
         }
 
         protected override void AddEventListener()
@@ -54,7 +58,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_listAchieveItem.numItems = 5;
+            _ui.m_listAchieveItem.numItems = 6;
         }
 
         protected override void OnHide()
@@ -65,7 +69,17 @@ namespace GFGGame
         private void RenderListAchieveItem(int index, GObject obj)
         {
             UI_AchieveItem listItem = UI_AchieveItem.Proxy(obj);
-            listItem.m_txtName.text = "ČÎÎń";
+            if(index >= 4)
+                listItem.m_AchieveType.selectedIndex = 4;
+            else
+                listItem.m_AchieveType.selectedIndex = index;
+
+            if (listItem.target.data == null)
+            {
+                listItem.target.onClick.Add(OnClickListRarityItem);
+            }
+            listItem.target.data = index;
+
             UI_AchieveItem.ProxyEnd();
         }
     }

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -353,7 +353,7 @@ namespace GFGGame
             //     }
             // }
         }
-        public static void CheckDispsoe()
+        public static void CheckDispose()
         {
             for (int i = _viewDic.Keys.Count - 1; i >= 0; i--)//不用foreach是因为：循环过程中可能会触发dispose，导致_viewDic.Keys变化，最终报错
             {

GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_1!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: abbc715036de21c44b15b1e32320482e
+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: 

GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: aaf72650c44f0c84b8e02009e6278473
+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: 

GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_2!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 8d9aabfda10d74b48bec36f47048ada3
+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: 

GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 2798b2d840d189a4e88d68e3c3844184
+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: 

GameClient/Assets/ResIn/UI/PopWindow_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 048b2e5c448fa2d4db0311545934f819
+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: 

GameClient/Assets/ResIn/UI/PopWindow_fui.bytes.meta

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