Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -95,6 +95,7 @@ namespace GFGGame
             {
                 GuideDataManager.currentGuideId = cfg.id;
                 TryCompleteGuide(guideKey);
+                GRoot.inst.touchable = true;
                 return false;
             }
             bool isRoleLvGuide = cfg.roleLv > 0;

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

@@ -31,6 +31,8 @@ namespace GFGGame
             _fightSpeed = 1;
             _autoPlay = false;
             _storyDialogSpeed = 1;
+            _totalScore = 0;
+            _targetTotalScore = 0;
         }
 
         public int GetScore(FightData roleData)

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

@@ -8,8 +8,10 @@ namespace GFGGame
     {
         public void Clear()
         {
-            _waitPicFade = false;
-            _waitBgChange = false;
+            _waitPicFade = false;          // 等待立绘加载
+            _waitBgChange = false;         // 等待背景更换
+            _dialogShowDelay = 0.0f;      // 对话延迟出现
+            _waiting = false;
         }
 
         private bool _waitPicFade = false;          // 等待立绘加载
@@ -21,9 +23,11 @@ namespace GFGGame
         public bool waitPicFade { get { return _waitPicFade; } set { _waitPicFade = value; } }
         public bool waitBgChange { get { return _waitBgChange; } set { _waitBgChange = value; } }
         public float dialogShowDelay { get { return _dialogShowDelay; } set { _dialogShowDelay = value; } }
-        
+
 
         public bool waiting { get { return _waiting; } set { _waiting = value; } }
+
+
     }
 }
 

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

@@ -214,7 +214,7 @@ namespace GFGGame
                 CheckPreDraw();
                 return;
             }
-            ViewManager.Show<ModalStatusView>("加载中...");
+            ViewManager.Show<ModalStatusView>("资源加载中，请耐心等待...");
             //下载
             _steps = EDressUpSteps.Loading;
             downloaderOperation.BeginDownload();

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

@@ -116,7 +116,7 @@ namespace GFGGame
             return count;
         }
 
-        public static void PutOnRecommendItems2(int id)
+        public static void PutOnRecommendItems2()
         {
             Dictionary<int, List<int>> itemsDic = GetRecommendItems();
             List<int> recommendList = new List<int>();
@@ -125,8 +125,8 @@ namespace GFGGame
                 if (key == ConstDressUpItemType.SHANG_YI || key == ConstDressUpItemType.XIA_ZHUANG || key == ConstDressUpItemType.LIAN_YI_QUN) continue;
                 recommendList.AddRange(itemsDic[key]);
             }
-            //StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(id);
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            //StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(id);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(fightCfg.needSuitId);
             int[] suitParts = suitCfg == null ? new int[] { } : suitCfg.partsArr;
@@ -166,7 +166,7 @@ namespace GFGGame
 
             dressUpObj.PutOnItemList(recommendList);
         }
-        private static Dictionary<int, List<int>> GetRecommendItems()
+        private static Dictionary<int, List<int>> GetRecommendItems( int id = 0)
         {
             GetClassifyDictionaty(out Dictionary<int, List<int>> needListBySubType, out Dictionary<int, List<int>> recommendListBySubType);
             DressUpMenuItemCfg1[] menuCfg1s = DressUpMenuItemCfg1Array.Instance.dataArray;

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

@@ -22,6 +22,7 @@ namespace GFGGame
 
         public static void UpdateDialogBg(string value, GameObject sceneObj)
         {
+            StoryDialogDataManager.Instance.waitBgChange = false;
             Transform bg = sceneObj.transform.Find("Bg");
             Transform bgNext = sceneObj.transform.Find("BgNext");
             SpriteRenderer bgSpr = bg.GetComponent<SpriteRenderer>();
@@ -78,6 +79,7 @@ namespace GFGGame
 
         public static async void UpdateDialogPic(string value, GameObject sceneObj)
         {
+            StoryDialogDataManager.Instance.waitPicFade = false;
             Transform tf = sceneObj.transform.Find("Pic");
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
             if (value == "0")

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

@@ -8,11 +8,13 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_c1;
-        public GTextField m_txtTitle;
+        public GGraph m_bgTouch;
         public GTextField m_txtLast;
         public GTextField m_txtNow;
         public GList m_listProperty;
         public GList m_listLastProperty;
+        public GList m_listCardProperty;
+        public GList m_listLastCardProperty;
         public const string URL = "ui://7l6lvkayjzrr8p";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "CardUpUI";
@@ -61,20 +63,24 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_bgTouch = (GGraph)comp.GetChild("bgTouch");
             m_txtLast = (GTextField)comp.GetChild("txtLast");
             m_txtNow = (GTextField)comp.GetChild("txtNow");
             m_listProperty = (GList)comp.GetChild("listProperty");
             m_listLastProperty = (GList)comp.GetChild("listLastProperty");
+            m_listCardProperty = (GList)comp.GetChild("listCardProperty");
+            m_listLastCardProperty = (GList)comp.GetChild("listLastCardProperty");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_txtTitle = null;
+            m_bgTouch = null;
             m_txtLast = null;
             m_txtNow = null;
             m_listProperty = null;
             m_listLastProperty = null;
+            m_listCardProperty = null;
+            m_listLastCardProperty = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem2.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ListScoreItem2
+    {
+        public GComponent target;
+        public Controller m_ArrowsType;
+        public GTextField m_txtProperty;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://eg2y0ldpt2dztqq";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ListScoreItem2";
+        private static UI_ListScoreItem2 _proxy;
+
+        public static UI_ListScoreItem2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ListScoreItem2();
+            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_ListScoreItem2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListScoreItem2();
+            }
+            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_ArrowsType = comp.GetController("ArrowsType");
+            m_txtProperty = (GTextField)comp.GetChild("txtProperty");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ArrowsType = null;
+            m_txtProperty = null;
+            m_loaIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem2.cs.meta

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

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

@@ -27,6 +27,7 @@ namespace UI.League
         public UI_ButtonModle4 m_btnAnswer;
         public UI_ButtonModle5 m_btnParty;
         public UI_ButtonModle7 m_btnShop;
+        public GGraph m_holderfBgEff;
         public const string URL = "ui://tw70qm9du2u32";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueUI";
@@ -94,6 +95,7 @@ namespace UI.League
             m_btnAnswer = (UI_ButtonModle4)UI_ButtonModle4.Create(comp.GetChild("btnAnswer"));
             m_btnParty = (UI_ButtonModle5)UI_ButtonModle5.Create(comp.GetChild("btnParty"));
             m_btnShop = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btnShop"));
+            m_holderfBgEff = (GGraph)comp.GetChild("holderfBgEff");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -127,6 +129,7 @@ namespace UI.League
             m_btnParty = null;
             m_btnShop.Dispose();
             m_btnShop = null;
+            m_holderfBgEff = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompStoryLevelItem.cs

@@ -19,6 +19,7 @@ namespace UI.Main
         public GLoader m_fightIconB;
         public UI_CompFlower2 m_flower;
         public GGraph m_holder;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8ko4m7fqd";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompStoryLevelItem";
@@ -78,6 +79,7 @@ namespace UI.Main
             m_fightIconB = (GLoader)comp.GetChild("fightIconB");
             m_flower = (UI_CompFlower2)UI_CompFlower2.Create(comp.GetChild("flower"));
             m_holder = (GGraph)comp.GetChild("holder");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -95,6 +97,7 @@ namespace UI.Main
             m_flower.Dispose();
             m_flower = null;
             m_holder = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListChargeItem.cs

@@ -11,6 +11,7 @@ namespace UI.Store
         public GTextField m_txtName;
         public UI_Component2 m_btnBuy;
         public GTextField m_txtDesc;
+        public GGraph m_holderfEff;
         public GGroup m_grpDouble;
         public const string URL = "ui://p9mtgheohhx91i";
         public const string PACKAGE_NAME = "Store";
@@ -63,6 +64,7 @@ namespace UI.Store
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnBuy = (UI_Component2)UI_Component2.Create(comp.GetChild("btnBuy"));
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_holderfEff = (GGraph)comp.GetChild("holderfEff");
             m_grpDouble = (GGroup)comp.GetChild("grpDouble");
         }
         public void Dispose(bool disposeTarget = false)
@@ -72,6 +74,7 @@ namespace UI.Store
             m_btnBuy.Dispose();
             m_btnBuy = null;
             m_txtDesc = null;
+            m_holderfEff = null;
             m_grpDouble = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreBrocadeWeavUI.cs

@@ -18,6 +18,8 @@ namespace UI.Store
         public GButton m_btnGetAll;
         public UI_BrocadeWeavReward m_SpecialReward;
         public GButton m_btnShow;
+        public GGraph m_holderfTitleEff;
+        public GGraph m_holderfButtonEff;
         public const string URL = "ui://p9mtgheoot07tcq";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreBrocadeWeavUI";
@@ -76,6 +78,8 @@ namespace UI.Store
             m_btnGetAll = (GButton)comp.GetChild("btnGetAll");
             m_SpecialReward = (UI_BrocadeWeavReward)UI_BrocadeWeavReward.Create(comp.GetChild("SpecialReward"));
             m_btnShow = (GButton)comp.GetChild("btnShow");
+            m_holderfTitleEff = (GGraph)comp.GetChild("holderfTitleEff");
+            m_holderfButtonEff = (GGraph)comp.GetChild("holderfButtonEff");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -92,6 +96,8 @@ namespace UI.Store
             m_SpecialReward.Dispose();
             m_SpecialReward = null;
             m_btnShow = null;
+            m_holderfTitleEff = null;
+            m_holderfButtonEff = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthUI.cs

@@ -24,6 +24,7 @@ namespace UI.Store
         public GTextField m_txtGiftBag;
         public GList m_list;
         public GButton m_btnBlackReward;
+        public GGraph m_holderfEff;
         public const string URL = "ui://p9mtgheoqik1tc0";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreMonthUI";
@@ -88,6 +89,7 @@ namespace UI.Store
             m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
             m_list = (GList)comp.GetChild("list");
             m_btnBlackReward = (GButton)comp.GetChild("btnBlackReward");
+            m_holderfEff = (GGraph)comp.GetChild("holderfEff");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -109,6 +111,7 @@ namespace UI.Store
             m_txtGiftBag = null;
             m_list = null;
             m_btnBlackReward = null;
+            m_holderfEff = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Card/CardUpView.cs

@@ -29,8 +29,6 @@ namespace GFGGame
                 _ui = null;
             }
             base.Dispose();
-
-
         }
 
         protected override void OnInit()
@@ -42,10 +40,18 @@ namespace GFGGame
             this.modal = true;
 
             //MakeFullScreen(_ui);
-
+            _ui.m_bgTouch.onClick.Add(OnBackClick);
             _ui.m_listProperty.itemRenderer = RenderListPropertyItem;
             _ui.m_listLastProperty.itemRenderer = RenderListLastPropertyItem;
+            _ui.m_listCardProperty.itemRenderer = RenderListCardPropertyItem;
+            _ui.m_listLastCardProperty.itemRenderer = RenderListLastCardPropertyItem;
         }
+
+        private void OnBackClick()
+        {
+            this.Hide();
+        }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -55,8 +61,6 @@ namespace GFGGame
             _curNum = (int)(viewData as object[])[3];
             _cardId = (int)(viewData as object[])[4];
 
-            _ui.m_listProperty.numItems = _scores.Count;
-
             if (_type == "lv")
             {
                 _ui.m_c1.selectedIndex = 0;
@@ -75,6 +79,8 @@ namespace GFGGame
                     _mainScore += cardLvCfg.mainScore;
                     _otherScore += cardLvCfg.otherScore;
                 }
+                _ui.m_listProperty.numItems = _scores.Count;
+                _ui.m_listLastProperty.numItems = _scores.Count;
             }
             else if (_type == "star")
             {
@@ -83,52 +89,90 @@ namespace GFGGame
                 _ui.m_txtNow.text = string.Format("{0}星", _curNum / 5);
                 _cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardId, _lastNum);
                 _cardLvCfg = null;
+                _ui.m_listCardProperty.numItems = 1;
+                _ui.m_listLastCardProperty.numItems = 1;
             }
             else { 
                 _ui.m_c1.selectedIndex = 2;
                 _cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardId, _lastNum);
                 _cardLvCfg = null;
+                _ui.m_listCardProperty.numItems = 1;
+                _ui.m_listLastCardProperty.numItems = 1;
             }
-            _ui.m_listLastProperty.numItems = _scores.Count;
             Timers.inst.AddUpdate(CheckGuide);
         }
 
-        private void RenderListLastPropertyItem(int index, GObject obj)
+        private void RenderListLastCardPropertyItem(int index, GObject obj)
         {
-            UI_ListScoreItem listItem = UI_ListScoreItem.Proxy(obj);
+            UI_ListScoreItem2 listItem = UI_ListScoreItem2.Proxy(obj);
             int score = 0;
-            if (_cardStarCfg != null)
+            int typeIndex = 0;
+            listItem.m_ArrowsType.selectedIndex = 2;
+            if (_cardStarCfg.score1 > 0) {
+                typeIndex = 1;
+                score = _scores[typeIndex] - _cardStarCfg.score1;
+            }
+            else if (_cardStarCfg.score2 > 0)
             {
-                if (index == 0)
-                    score = _scores[index + 1] - _cardStarCfg.score1;
-                else if (index == 1)
-                    score = _scores[index + 1] - _cardStarCfg.score2;
-                else if (index == 2)
-                    score = _scores[index + 1] - _cardStarCfg.score3;
-                else if (index == 3)
-                    score = _scores[index + 1] - _cardStarCfg.score4;
+                typeIndex = 2;
+                score = _scores[typeIndex] - _cardStarCfg.score2;
             }
-            else {
-                if ((index + 1) == _itemCfgMainScore)
-                    score = _scores[index + 1] - _mainScore;
-                else
-                    score = _scores[index + 1] - _otherScore;
+            else if (_cardStarCfg.score3 > 0)
+            {
+                typeIndex = 3;
+                score = _scores[typeIndex] - _cardStarCfg.score3;
+            }
+            else if (_cardStarCfg.score4 > 0)
+            {
+                typeIndex = 4;
+                score = _scores[typeIndex] - _cardStarCfg.score4;
             }
             listItem.m_txtProperty.text = score.ToString();
+            listItem.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (typeIndex));
+            UI_ListScoreItem2.ProxyEnd();
+        }
+        
+        private void RenderListLastPropertyItem(int index, GObject obj)
+        {
+            UI_ListScoreItem2 listItem = UI_ListScoreItem2.Proxy(obj);
+            int score = 0;
+            listItem.m_ArrowsType.selectedIndex = 1;
+
+            if ((index + 1) == _itemCfgMainScore)
+                score = _scores[index + 1] - _mainScore;
+            else
+                score = _scores[index + 1] - _otherScore;
+            listItem.m_txtProperty.text = score.ToString();
             listItem.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (index + 1));
-            UI_ListScoreItem.ProxyEnd();
+            UI_ListScoreItem2.ProxyEnd();
         }
 
         private void RenderListPropertyItem(int index, GObject obj)
         {
-            UI_ListScoreItem listItem = UI_ListScoreItem.Proxy(obj);
+            UI_ListScoreItem2 listItem = UI_ListScoreItem2.Proxy(obj);
 
             listItem.m_txtProperty.text = _scores[index + 1].ToString();
             listItem.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (index + 1));
-            UI_ListScoreItem.ProxyEnd();
+            UI_ListScoreItem2.ProxyEnd();
+        }
+
+        private void RenderListCardPropertyItem(int index, GObject obj)
+        {
+            UI_ListScoreItem2 listItem = UI_ListScoreItem2.Proxy(obj);
+            int typeIndex = 0;
+            if (_cardStarCfg.score1 > 0)
+                typeIndex = 1;
+            else if (_cardStarCfg.score2 > 0)
+                typeIndex = 2;
+            else if (_cardStarCfg.score3 > 0)
+                typeIndex = 3;
+            else if (_cardStarCfg.score4 > 0)
+                typeIndex = 4;
+            listItem.m_txtProperty.text = _scores[typeIndex].ToString();
+            listItem.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + typeIndex);
+            UI_ListScoreItem2.ProxyEnd();
         }
 
-        
         protected override void OnHide()
         {
             base.OnHide();

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -69,7 +69,7 @@ namespace GFGGame
             base.OnShown();
 
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_bg1","jpg");
             _activityId = (int)(this.viewData as object[])[0];
             _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);

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

@@ -72,7 +72,11 @@ namespace GFGGame
                 _ui.m_c1.selectedIndex = (int)(this.viewData as object[])[0];
                 // For change m_comSearch.m_c1
                 _ui.m_comSearch.m_c1.selectedIndex = (int)(this.viewData as object[])[1];
-                _IsTeaPart = (int)(this.viewData as object[])[2] == 1;
+                if((this.viewData as object[]).Length > 2)
+                {
+                    _IsTeaPart = (int)(this.viewData as object[])[2] == 1;
+                }
+                
             }
 
             _selectRarityList = DressUpMenuItemDataManager.selectRarityList;// new List<int>();

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

@@ -680,7 +680,8 @@ namespace GFGGame
             }
             InstanceZonesDataManager.usedRecommend = true;
             // MyDressUpHelper.PutOnRecommendItems();
-            MyDressUpHelper.PutOnRecommendItems2(_levelCfg.id);
+            InstanceZonesDataManager.currentLevelCfgId = _levelID;
+            MyDressUpHelper.PutOnRecommendItems2();
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
             UpdateStepBtn(true);
             // UpdateListPartsSelected();

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -214,8 +214,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btn0.target, ConstGuideId.FIELD, 3, "开始考察吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.FIELD, 3);
+            GuideController.TryGuide(_ui.m_btn0.target, ConstGuideId.FIELD, 1, "开始考察吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.FIELD, 1);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -107,17 +107,17 @@ namespace GFGGame
             }
 
             //一些特殊引导
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PORCELAIN);
-            GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_FILING);
-            GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIELD);
-            GuideCfg cfg4 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PROPERTY);
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PORCELAIN);   //作室书简修复
+            GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_FILING);  //引导查阅建档
+            GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIELD);  //田野调查
+            GuideCfg cfg4 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PROPERTY);   //书简修复
             if (guideId == cfg.id && guideIndex == 2 || guideId == cfg1.id && guideIndex == 2 || guideId == cfg2.id && guideIndex == 1 || guideId == cfg4.id && guideIndex == 1)
             {
                 _ui.m_loaMask.visible = false;
                 MainDataManager.Instance.CanSwipe = true;
                 Timers.inst.AddUpdate(UpdateStudioMetalGuide);
             }
-            GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE);
+            GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE); // 引导抽奖连线
             if (guideId == cfg3.id && guideIndex == 1)
             {
                 _ui.m_mask.target.visible = false;

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesUIView.cs

@@ -77,8 +77,8 @@ namespace GFGGame
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0)
+                //|| GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -153,7 +153,7 @@ namespace GFGGame
             //_ui.m_loaGuidestudio.visible = false;
             GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PORCELAIN, 3, "工作室开门啦，进去看看~");
             GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_FILING, 3, "工作室有新的任务啦。");
-            GuideController.TryGuide(_ui.m_btnField.target, ConstGuideId.FIELD, 2, "外出进行历史考察，会有意想不到的收获哦。");
+            //GuideController.TryGuide(_ui.m_btnField.target, ConstGuideId.FIELD, 2, "外出进行历史考察，会有意想不到的收获哦。");
             GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PROPERTY, 2, "");
             GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);

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

@@ -10,9 +10,13 @@ namespace GFGGame
     public class LeagueView : BaseWindow
     {
         private UI_LeagueUI _ui;
+        private EffectUI _effectUI1;
 
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -46,7 +50,10 @@ namespace GFGGame
             _ui.m_comHead.onClick.Add(OnShowOhterInfo);
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnRule.data = 300015;
+
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderfBgEff, "ui_Small_parts", "YaJi_Ui");
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -363,6 +363,7 @@ namespace GFGGame
                         levelItem.target.AddChild(_effFirst);
                         levelItem.m_fightBg.visible = false;
                         levelItem.m_loaDialogBg.visible = false;
+                        levelItem.m_t0.Play();
                         _effFirst.visible = true;
                         //Timers.inst.Add(1.7f, 1, HideEffect, obj);
                     }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -153,6 +153,7 @@ namespace GFGGame
             }
 
             _ui.m_btnBack.visible = InstanceZonesDataManager.CheckLevelPass(100001001);
+            StoryDialogDataManager.Instance.Clear();
 
         }
 
@@ -356,6 +357,7 @@ namespace GFGGame
 
             while (StoryDialogDataManager.Instance.waitBgChange)
             {
+                //Debug.Log("等待背景转换");
                 yield return new WaitForEndOfFrame();
             }
 
@@ -640,6 +642,7 @@ namespace GFGGame
 
             while (StoryDialogDataManager.Instance.waitPicFade || StoryDialogDataManager.Instance.waiting)
             {
+                //Debug.Log("等待立绘/动画结束");
                 yield return new WaitForEndOfFrame();
             }
 

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

@@ -953,7 +953,7 @@ namespace GFGGame
                 || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0
+                //|| GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
@@ -1005,7 +1005,7 @@ namespace GFGGame
                 false, _ui.target.height - 700);
             bool isStudioFilingGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_FILING, 2, "进入副本", -1,
                 false, _ui.target.height - 700);
-            bool isFieldGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
+            //bool isFieldGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
 
             bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
 

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeView.cs

@@ -11,6 +11,7 @@ namespace GFGGame
         private UI_StoreChargeUI _ui;
         private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
+        private List<EffectUI> _effectUIs = new List<EffectUI>();
 
         public override void Dispose()
         {
@@ -55,14 +56,26 @@ namespace GFGGame
             UpdateView();
         }
 
+        private void DestroyEffect()
+        {
+            for (int i = 0; i < _effectUIs.Count; i++)
+            {
+                EffectUIPool.Recycle(_effectUIs[i]);
+                _effectUIs[i] = null;
+            }
+            _effectUIs.Clear();
+        }
+
         private void UpdateView()
         {
+            DestroyEffect();
             _ui.m_list.numItems = _shopCfgs.Count;
             ShopViewManager.Instance.UpdateVipProgressCom(_ui.m_comVipLv.target);
         }
         protected override void OnHide()
         {
             base.OnHide();
+            DestroyEffect();
             _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()
@@ -90,7 +103,10 @@ namespace GFGGame
             item.m_grpDouble.visible = isDouble;
             item.m_txtDesc.visible = isDouble;
             item.m_icon.url = "ui://Store/sc_zizhuan_" + (index + 1);
-
+            if (isDouble) {
+                EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderfEff, "ui_Small_parts", "store_FirstCharge_Double");
+                _effectUIs.Add(_effectUI);
+            }
             UI_ListChargeItem.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs

@@ -13,9 +13,13 @@ namespace GFGGame
         private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
         private int menu2;
+        private EffectUI _effectUI1;
 
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -45,6 +49,7 @@ namespace GFGGame
             _ui.m_btnBuy.target.onClick.Add(OnBtnBuyCardClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
             _ui.m_btnBlackReward.onClick.Add(OnBtnBlackRewardClick);
+            AddEffect();
         }
         protected override void AddEventListener()
         {
@@ -60,6 +65,7 @@ namespace GFGGame
             _valueBarController.OnShown();
             UpdateView();
             UpdateRedDot();
+
         }
 
 
@@ -209,5 +215,10 @@ namespace GFGGame
 
 
         }
+
+        private void AddEffect()
+        {
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderfEff, "ui_Small_parts", "store_monthlycard");
+        }
     }
 }