ios

.gitignore

@@ -46,3 +46,4 @@
 /GameClient/Assets/StreamingAssets
 GameClient/Assets/Samples/
 GameClient/Assets/Samples.meta
+/StaticRes

GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -67,6 +67,14 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
+      - CollectPath: Assets/ResIn/Material
+        CollectorGUID: 003a7ea568804294c94a860b7ce88416
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
     - GroupName: launcher
       GroupDesc: 
       AssetTags: preload

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -143,6 +143,22 @@ namespace GFGEditor
         public static string LeagueIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/LeagueIcon/";
         public static string LeagueIconMd5FileSaveName = "LeagueIconMd5";
 
+        public static string[] MiniGameFlipPaths { get { return new string[] { ResRootPath + "MiniGame/FlipGame/" }; } }
+        public static string MiniGameFlipTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/FlipGame/";
+        public static string MiniGameFlipMd5FileSaveName = "MiniGameFlipMd5";
+
+        public static string[] MiniGameHRDPaths { get { return new string[] { ResRootPath + "MiniGame/HRDGame/" }; } }
+        public static string MiniGameHRDTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/HRDGame/";
+        public static string MiniGameHRDMd5FileSaveName = "MiniGameHRDMd5";
+
+        public static string[] MiniGameTZFEPaths { get { return new string[] { ResRootPath + "MiniGame/TZFEGame/" }; } }
+        public static string MiniGameTZFETargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/TZFEGame/";
+        public static string MiniGameTZFEMd5FileSaveName = "MiniGameTZFEMd5";
+
+        public static string[] MiniGameMergePaths { get { return new string[] { ResRootPath + "MiniGame/MergeGame/" }; } }
+        public static string MiniGameMergeTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/MergeGame/";
+        public static string MiniGameMergeMd5FileSaveName = "MiniGameMergeMd5";
+
         public static void Import()
         {
             var md5Path = ImportArtResTool.Md5FilePath;
@@ -256,6 +272,19 @@ namespace GFGEditor
                 EditorUtility.DisplayDialog("提示", "有NPC立绘更新，需要设置坐标原点!", "OK", "");
             }
 
+            //小游戏资源
+            EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
+            ImportRes(MiniGameFlipPaths, MiniGameFlipTargetPath, MiniGameFlipMd5FileSaveName);
+
+            EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
+            ImportRes(MiniGameHRDPaths, MiniGameHRDTargetPath, MiniGameHRDMd5FileSaveName);
+
+            EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
+            ImportRes(MiniGameTZFEPaths, MiniGameTZFETargetPath, MiniGameTZFEMd5FileSaveName);
+
+            EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
+            ImportRes(MiniGameMergePaths, MiniGameMergeTargetPath, MiniGameMergeMd5FileSaveName);
+
             EditorUtility.ClearProgressBar();
             AssetDatabase.Refresh();
             Debug.LogWarning("导入美术资源成功!");

GameClient/Assets/Editor/BuildEditor/PresetAssetHelper.cs

@@ -71,11 +71,18 @@ namespace GFGEditor
                     TryAdd(assetPath, manifest, bundles);
                     assetPath = ResPathUtil.GetDressUpLayerAnimationResPath(dressUpCfg, 3);
                     TryAdd(assetPath, manifest, bundles);
-                    assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 1);
+                    assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 1, false);
                     TryAdd(assetPath, manifest, bundles);
-                    assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 2);
+                    assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 2, false);
                     TryAdd(assetPath, manifest, bundles);
-                    assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 3);
+                    assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 3, false);
+                    TryAdd(assetPath, manifest, bundles);
+                    TryAdd(assetPath, manifest, bundles);
+                    assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 1, true);
+                    TryAdd(assetPath, manifest, bundles);
+                    assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 2, true);
+                    TryAdd(assetPath, manifest, bundles);
+                    assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 3, true);
                     TryAdd(assetPath, manifest, bundles);
                 }
             }

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -18,7 +18,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             Dictionary<ItemCfg, List<int>> syntheticSuitDic = new Dictionary<ItemCfg, List<int>>();
             Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic = new Dictionary<SuitCfg, Dictionary<string, string>>();
@@ -283,7 +283,7 @@ namespace GFGEditor
             {
                 if (cfg.itemId == itemId)
                 {
-                    return "FU_ZHUANG_DIAN=" + ConstStoreId.CLOTHING_STORE_ID; ;
+                    return "FU_ZHUANG_DIAN=" + ConstStoreId.CLOTHING_STORE_ID; 
                 }
             }
 
@@ -366,6 +366,21 @@ namespace GFGEditor
         }
 
         /// <summary>
+        /// 尝试获取飞花令产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetArenaApproach(int itemId)
+        {
+            if (itemId == ConstItemID.ARENA_CUR_COST)
+            {
+                return "ARENA";
+            }
+            return null;
+        }
+            
+
+        /// <summary>
         /// 尝试获取剧情关卡产出途径
         /// </summary>
         /// <param name="itemId"></param>
@@ -563,7 +578,7 @@ namespace GFGEditor
             return false;
         }
         /// <summary>
-        /// 检测商城-豆包卡是否产出该物品
+        /// 检测商城-红包卡是否产出该物品
         /// </summary>
         /// <param name="itemId"></param>
         /// <returns></returns>

GameClient/Assets/Editor/ToolsMenu.cs

@@ -28,13 +28,24 @@ namespace GFGEditor
             ImportArtRes,
         }
 
-#if PT_TEMP || PT_DEV
-        
+#if PT_DEV
         [MenuItem("外网/")]
         public static void VersionTag()
         {
             
         }
+#elif PT_QUICK
+        [MenuItem("QUICK/")]
+        public static void VersionTag()
+        {
+            
+        }
+#elif PT_TAPTAP
+        [MenuItem("TAPTAP/")]
+        public static void VersionTag()
+        {
+            
+        }
 #else
 
         [MenuItem("内网/")]

GameClient/Assets/Game/HotUpdate/Assets/FGUICanvas.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace GFGGame
+{
+    /// <summary>
+    /// FGUI中添加UGUI，需要在Canvas上挂载该脚本调整位置
+    /// </summary>
+    public class FGUICanvas : MonoBehaviour
+    {
+        private RectTransform canvasRect;
+
+        private void Start()
+        {
+            // FGUI会自动修改Canvas的参数，需要调整一下位置
+            canvasRect = transform.GetComponent<RectTransform>();
+            canvasRect.pivot = Vector2.one * 0.5f;
+            canvasRect.anchoredPosition = Vector2.zero;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComReward.cs.meta → GameClient/Assets/Game/HotUpdate/Assets/FGUICanvas.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2800476fa08ce9a4c8b6987c2953cf61
+guid: 15a9cc6dd7f4b9547a1b74da745cfd7a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Assets/PrefabManager.cs

@@ -16,7 +16,7 @@ namespace GFGGame
 
         private void Awake()
         {
-            preDrawRoot = new GameObject("PredrawToot");
+            preDrawRoot = new GameObject("PredrawRoot");
             preDrawRoot.transform.position = new Vector3(0, 0, 0);
             preDrawRoot.transform.localScale = Vector3.zero;
         }
@@ -140,5 +140,16 @@ namespace GFGGame
             return null;
         }
 
+        public void CancelPreDraw(string resPath)
+        {
+            preDrawDic.TryGetValue(resPath, out var list);
+            if(list != null && list.Count > 0)
+            {
+                int index = list.Count - 1;
+                var t = list[index];
+                list.RemoveAt(index);
+                Restore(t);
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Assets/PreloadManager.cs

@@ -51,7 +51,7 @@ namespace GFGGame
                 {
                     string assetPath = ResPathUtil.GetDressUpAnimationPath(suitCfg.aniRes);
                     PreloadManager.Instance.TryAdd(assetPath);
-                    assetPath = ResPathUtil.GetDressUpEffectPath(suitCfg.aniRes);
+                    assetPath = ResPathUtil.GetDressUpEffectPath(suitCfg.aniRes, true);
                     PreloadManager.Instance.TryAdd(assetPath);
                 }
             }
@@ -69,6 +69,12 @@ namespace GFGGame
                 PreloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerSpriteResPath(dressUpCfg, 3);
                 PreloadManager.Instance.TryAdd(assetPath);
+                assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 1, false);
+                PreloadManager.Instance.TryAdd(assetPath);
+                assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 2, false);
+                PreloadManager.Instance.TryAdd(assetPath);
+                assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 3, false);
+                PreloadManager.Instance.TryAdd(assetPath);
             }
             if (resType != ResType.Sprite)
             {
@@ -78,11 +84,11 @@ namespace GFGGame
                 PreloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerAnimationResPath(dressUpCfg, 3);
                 PreloadManager.Instance.TryAdd(assetPath);
-                assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 1);
+                assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 1, true);
                 PreloadManager.Instance.TryAdd(assetPath);
-                assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 2);
+                assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 2, true);
                 PreloadManager.Instance.TryAdd(assetPath);
-                assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 3);
+                assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 3, true);
                 PreloadManager.Instance.TryAdd(assetPath);
             }
         }

GameClient/Assets/Game/HotUpdate/Constant/ConstFunctionId.cs

@@ -97,6 +97,9 @@ namespace GFGGame
         ///商城-竞技场
         /// </summary>
         public const string STORE_ARENA = "STORE_ARENA";
-
+        /// <summary>
+        ///飞花令
+        /// </summary>
+        public const string ARENA = "ARENA";
     }
 }

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -25,6 +25,8 @@ namespace GFGGame
         public const string DRESS_FILTER = "DRESS_FILTER";
         public const string DRESS_SEARCH = "DRESS_SEARCH";
         public const string DRESS_FILTER_RESET = "DRESS_FILTER_RESET";
+        public const string DRESS_FILTER_RESET_ALL = "DRESS_FILTER_RESET_ALL";
+
         public const string CARD_CHOOSE = "CARD_CHOOSE";
         public const string CARD_SELECTED = "CARD_SELECTED";
         public const string SHOW_CARD_SKILL_END = "SHOW_CARD_SKILL_END";
@@ -210,5 +212,17 @@ namespace GFGGame
 
         //更新查阅建档数据
         public const string STUDIO_FILING_UPDATE = "STUDIO_FILING_UPDATE";
+
+        //更新游戏界面
+        public const string MINI_GAME_UPDATE = "MINI_GAME_UPDATE";
+
+        // 更新华容道活动界面数据
+        public const string ACTIVITY_HUARONGDAO_UPDATE = "ACTIVITY_HUARONGDAO_UPDATE";
+
+        //更新2048游戏关卡状态
+        public const string TZFE_GAME_UPDATE = "TZFE_GAME_UPDATE";
+        
+        //服务端推送最新排队信息
+        public const string UPDATE_QUEUE = "UPDATE_QUEUE";
     }
 }

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

@@ -7,13 +7,13 @@ namespace GFGGame
     {
         private static BuyTipsView _buyTipsView;
 
-        public static void Show(int itemId, long count, Action onSuccess = null)
+        public static void Show(int itemId, long count, Action onSuccess = null,bool showCheck = false)
         {
             if (_buyTipsView == null)
             {
                 _buyTipsView = new BuyTipsView();
             }
-            _buyTipsView.SetParams(itemId, count, onSuccess);
+            _buyTipsView.SetParams(itemId, count, onSuccess, showCheck);
             _buyTipsView.Show();
         }
 

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

@@ -62,10 +62,10 @@ namespace GFGGame
                 //LogUtil.LogDev("OnTouchBegin 2");
                 if (index == 0)
                 {
-                    Timers.inst.Add(1, 1, OnTimeComplete);
+                    Timers.inst.Add(0.5f, 1, OnTimeComplete);
                 }
                 index++;
-                if (index == 2)
+                if (index == 3)
                 {
                     ShowGmView();
                 }

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

@@ -10,6 +10,7 @@ namespace GFGGame
 
         public static async void Start()
         {
+            QDManager.Init();
             //初始化声音，不可以去掉
             MusicManager.Instance.Stop();
             SoundManager.Instance.Stop();
@@ -227,6 +228,7 @@ namespace GFGGame
 
 
             ItemProxy.GetItemAttributeInfos().Coroutine();
+            ItemProxy.ReqGetItemCollect().Coroutine();
             MainStorySProxy.GetStoryBonusInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
             TaskSProxy.GetTaskInfos();
@@ -236,6 +238,8 @@ namespace GFGGame
             MailSProxy.ReqMailCount().Coroutine();
             FriendSProxy.ReqAllFriendInfos().Coroutine();
             ActivityAfuGiftSProxy.GetAfuGiftInfo().Coroutine();
+            ActivityTeaSProxy.ReqGetNPCVisitInfo().Coroutine();
+            MiniGameProxy.ReqGetChallengeReward().Coroutine();
 
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();
             TravelSProxy.ReqTravelInfo().Coroutine();
@@ -274,6 +278,8 @@ namespace GFGGame
             GameGlobal.AutoSevenDayLoginView = true;
             GameGlobal.AutoDailySignView = true;
             GameGlobal.AutoSpecialOfferGiftBoxView = true;
+            GameGlobal.AutoAcitivtyTipsLoginView = true;
+            GameGlobal.AutoMonthlyCardView = true;
             GameGlobal.AutoShowCompleted = false;
             GameGlobal.PreDataInited = false;
             GameGlobal.AfterDataInited = false;

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

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class MainControllerr : SingletonBase<MainControllerr>
+    {
+        public static bool GotoStoryChapter(bool isOpen = false)
+        {
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
+            if (isOpen) return isOpen;
+            isOpen = true;
+            List<StoryChapterCfg> _chapterCfgs = StoryChapterCfgArray.Instance.GetCfgsBysubType(0);
+            for (int i = 0; i < _chapterCfgs.Count; i++)
+            {
+                StoryChapterCfg chapterCfg = _chapterCfgs[i];
+                if (i == _chapterCfgs.Count - 1 && MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
+                {
+                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
+                    isOpen = false;
+                    return isOpen;
+                }
+                else if (!MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
+                {
+                    StoryChapterCfg chapterTowCfg = _chapterCfgs[Mathf.Max(0, i - 1)];
+                    var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterTowCfg.type, chapterTowCfg.subType, chapterTowCfg.id);
+                    StoryLevelCfg lastLevelCfg = list[list.Count - 1];
+                    //这里是当下一章没解锁，但是上一章的最后一关已经通过了
+                    if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id))//MainStoryDataManager.CheckLevelUnlock(lastLevelCfg.id))
+                    {
+                        ViewManager.Show<StoryChapterListView>(new object[] { 0, Mathf.Max(0, chapterCfg.order - 1) });
+                        isOpen = false;
+                        return isOpen;
+                    }
+                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id - 1, 0 });
+                    isOpen = false;
+                    return isOpen;
+                }
+            }
+            return isOpen;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Controller/MainController.cs.meta

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

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

@@ -8,8 +8,8 @@ namespace GFGGame
 {
     public class PromptController : SingletonBase<PromptController>
     {
-
         private List<GComponent> _uis = new List<GComponent>();
+        private int showCount = 3;  //ÏÔʾ¶àÉÙÌõ
 
         public PromptController()
         {
@@ -69,7 +69,14 @@ namespace GFGGame
                 GComponent preui = _uis[_uis.Count - 1];
                 ui.x = preui.x;
                 ui.y = preui.y + 100;
+                if (_uis.Count >= showCount) {
+                    GComponent uiFirst = _uis[0];
+                    _uis.Remove(uiFirst);
+                    uiFirst.RemoveFromParent();
+                    uiFirst.Dispose();
+                }
             }
+
             ui.data = ET.TimeHelper.ClientNow() + 3000;
             _uis.Add(ui);
         }
@@ -78,7 +85,7 @@ namespace GFGGame
         {
             foreach (GComponent ui in _uis)
             {
-                ui.y -= 50;
+                ui.y -= 100;
             }
         }
     }

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

@@ -0,0 +1,130 @@
+using FairyGUI;
+using GFGGame.Launcher;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ScaleGestureController : SingletonMonoBase<ScaleGestureController>
+    {
+        public Transform target; //目标
+
+        //缩放
+        public bool isScaling;
+        Vector3 touch1, touch2, oriPos, scaleCenter;
+        float scale, disX, disY, oriScale;
+        public float scaleSpeed = 1;
+        public float min = 1f;
+        public float max = 1.7f;
+
+
+        //移动
+        private bool isDraging;
+        private Vector3 offset = Vector3.zero;
+        public Vector2 uiSize;
+
+        private void Update()
+        {
+            if (target == null)
+            {
+                isScaling = false;
+                isDraging = false;
+                return;
+            }
+            if(Input.touchCount != 2)
+            {
+                isScaling = false;
+            }
+            if (isScaling)
+            {
+                //两指缩放比例
+                scale = Vector3.Distance(Camera.main.ScreenToWorldPoint(Input.GetTouch(0).position), Camera.main.ScreenToWorldPoint(Input.GetTouch(1).position)) / Vector3.Distance(touch1, touch2);
+
+                //利用scaleSpeed控制缩放速度
+                scale = (scale - 1) * scaleSpeed;
+                var targetScale = oriScale + scale;
+                //给缩放比例加限制
+                if (targetScale <= min && scale < 0)
+                {
+                    targetScale = min;
+                }
+                if (targetScale >= max && scale > 0)
+                {
+                    targetScale = max;
+                }
+
+                LogUtil.LogDev($"scaling {oriScale} {scale}");
+                //缩放目标大小
+                target.localScale = new Vector3(targetScale, targetScale, 1);
+                //改变目标位置，让位置保持不变
+                target.position = new Vector3(oriPos.x - ((target.localScale.x - oriScale) * disX), oriPos.y - ((target.localScale.y - oriScale) * disY), 0);
+                UpdatePos();
+            }
+            if (Input.touchCount == 2)
+            {
+                //两指点位
+                touch1 = Camera.main.ScreenToWorldPoint(Input.GetTouch(0).position);
+                touch2 = Camera.main.ScreenToWorldPoint(Input.GetTouch(1).position);
+
+                //目标初始点位
+                oriPos = new Vector3(target.position.x, target.position.y, 0);
+
+                //两指中点
+                scaleCenter = new Vector3((Camera.main.ScreenToWorldPoint(Input.GetTouch(0).position).x + Camera.main.ScreenToWorldPoint(Input.GetTouch(1).position).x) / 2, (Camera.main.ScreenToWorldPoint(Input.GetTouch(0).position).y + Camera.main.ScreenToWorldPoint(Input.GetTouch(1).position).y) / 2, 0);
+
+                //两指中点和目标距离
+                disX = scaleCenter.x - oriPos.x;
+                disY = scaleCenter.y - oriPos.y;
+                oriScale = target.localScale.x;
+                LogUtil.LogDev($"start scale {oriPos} {oriScale}");
+
+
+                isScaling = true;
+            }
+
+            if (!Input.GetMouseButton(0) || isScaling)
+            {
+                isDraging = false;
+                return;
+            }
+            if (isDraging)
+            {
+                target.position = Camera.main.ScreenToWorldPoint(Input.mousePosition - offset);
+                UpdatePos();
+            }
+            else if (Input.GetMouseButtonDown(0))
+            {
+                //LogUtil.LogEditor($"DragGestureController {GRoot.inst.touchTarget} {Input.touchCount}");
+                if (GRoot.inst.touchTarget != null && !(GRoot.inst.touchTarget is GGraph)) return;
+                isDraging = true;
+                offset = Input.mousePosition - Camera.main.WorldToScreenPoint(target.position);
+            }
+        }
+
+        public void UpdatePos()
+        {
+            if (target == null) return;
+            Vector2 size = target.Find("Bg").GetComponent<SpriteRenderer>().size * target.localScale.x;
+
+            float deviationWidth = (size.x - uiSize.x / 100) / 2;
+            float deviationHeigh = (size.y - uiSize.y / 100) / 2;
+            Vector2 pos = target.transform.position;
+            if (pos.x <= -deviationWidth)
+            {
+                target.transform.position = new Vector2(-deviationWidth, target.transform.position.y);
+            }
+            if (pos.x >= deviationWidth)
+            {
+                target.transform.position = new Vector2(deviationWidth, target.transform.position.y);
+            }
+            if (pos.y <= -deviationHeigh)
+            {
+                target.transform.position = new Vector2(target.transform.position.x, -deviationHeigh);
+            }
+            if (pos.y >= deviationHeigh)
+            {
+                target.transform.position = new Vector2(target.transform.position.x, deviationHeigh);
+            }
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Controller/ScaleGestureController.cs.meta

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

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

@@ -35,8 +35,8 @@ namespace GFGGame
             return 0;
         }
         /**********************************************************活动弹窗*************************************************/
-        public bool todayActivityTips = true;
-        public bool todayMonthlyCardTips = true;
+        public int todayActivityTips = 0;
+        public int todayMonthlyCardTips = 0;
         /**********************************************************限时累充*************************************************/
         public int lastActLimitChargeId = 0;
         private int _actLimitChargeId = 0;

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

@@ -0,0 +1,52 @@
+using ET;
+using GFGGame;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Assets.Game.HotUpdate.Data
+{
+    public class ActivityTeaDataManager : SingletonBase<ActivityTeaDataManager>
+    {
+        public List<ItemSyntheticProto> ItemSynthetics = new List<ItemSyntheticProto>();
+
+
+        /**********************************************************新春活动*************************************************/
+        public List<NpcVisitProto> NpcInfoList = new List<NpcVisitProto>();
+
+        public bool CheckOpen()
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.TEA);
+            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
+                   activityInfo.EndTime > TimeHelper.ServerNow();
+        }
+
+        public bool CheckOpenOne(int id)
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
+            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
+                   activityInfo.EndTime > TimeHelper.ServerNow();
+        }
+
+        public long GetEndTime(int id)
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
+            return activityInfo.EndTime;
+        }
+
+        public bool GetRewardRed()
+        {
+            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
+           int time = limitData.TotalPlayMax - limitData.PlayTimes;
+
+            foreach (NpcVisitProto t in NpcInfoList)
+            {
+                if (t.RewrdStatus == 1 || (t.UnlockStatus == 1 && time>0 ))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/ActivityTeaDataManager.cs.meta

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

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

@@ -350,6 +350,18 @@ namespace GFGGame
             haveCount = _cardDicByType.ContainsKey(mainScore) ? _cardDicByType[mainScore].Count : 0;
         }
 
-
+        public static int GetNextUpCardNeedRoleLv(int cardLv) { 
+            int roleLv = RoleDataManager.lvl;
+            for (int i = roleLv + 1; i<RoleLevelCfgArray.Instance.dataArray.Length; i++)
+            {
+                int limit = RoleLevelCfgArray.Instance.GetCfg(i).cardLeverLimit;
+                if (cardLv < limit)
+                {
+                    roleLv = i;
+                    break;
+                }
+            }
+            return roleLv;
+        }
     }
 }

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

@@ -98,7 +98,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        posItems[i] = "豆包卡开启";
+                        posItems[i] = "红包卡开启";
                     }
                 }
                 else if (GetPosType(i) == MonthCardType.BlackGold)
@@ -109,7 +109,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        posItems[i] = "阿福卡开启";
+                        posItems[i] = "福气卡开启";
                     }
                 }
             }

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

@@ -14,6 +14,14 @@ namespace GFGGame
         Search,
         Filter
     }
+
+    public enum DressFilterItemType
+    {
+        ALL,
+        DressUpItem,    // 散件
+        Suit            // 套装
+    }
+
     public class DressUpMenuItemDataManager
     {
         public static string dressSearchTxt = "";
@@ -412,7 +420,8 @@ namespace GFGGame
             }
             return filterList;
         }
-        public static List<int> DressSearch(List<int> list)
+
+        public static List<int> DressSearch(List<int> list, DressFilterItemType type = DressFilterItemType.ALL)
         {
             List<int> searchList = new List<int>();
             for (int i = 0; i < list.Count; i++)
@@ -420,7 +429,21 @@ namespace GFGGame
                 bool isSearch = true;
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(list[i]);
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(list[i]);
-                string name = itemCfg != null ? itemCfg.name : suitCfg.name;
+
+                // 散件优先于套装
+                if (type == DressFilterItemType.ALL)
+                {
+                    if (itemCfg == null)
+                    {
+                        type = DressFilterItemType.Suit;
+                    }
+                    else
+                    {
+                        type = DressFilterItemType.DressUpItem;
+                    }
+                }
+
+                string name = (type == DressFilterItemType.DressUpItem) ? itemCfg.name : suitCfg.name;
                 for (int j = 0; j < dressSearchTxt.Length; j++)
                 {
                     if (name.IndexOf(dressSearchTxt[j]) < 0)
@@ -436,20 +459,36 @@ namespace GFGGame
             }
             return searchList;
         }
-        public static List<int> DressFilter(List<int> list)
+
+        public static List<int> DressFilter(List<int> list, DressFilterItemType type = DressFilterItemType.ALL)
         {
             List<int> filterList = new List<int>();
 
             for (int i = 0; i < list.Count; i++)
             {
                 ItemCfg cfg = ItemCfgArray.Instance.GetCfg(list[i]);
-                SuitCfg tzCfg = SuitCfgArray.Instance.GetCfg(list[i]);
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(list[i]);
+
+                // 散件优先于套装
+                if(type == DressFilterItemType.ALL)
+                {
+                    if(cfg == null)
+                    {
+                        type = DressFilterItemType.Suit;
+                    }
+                    else
+                    {
+                        type = DressFilterItemType.DressUpItem;
+                    }
+                }
 
-                bool isRarity = cfg == null ? FilterRarity(tzCfg) : FilterRarity(cfg);
+                ItemCfg suitItemCfg = (suitCfg != null) ? ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[0]) : null;
 
-                bool isScore = cfg == null ? true : FilterScore(cfg);
+                bool isRarity = (type == DressFilterItemType.Suit) ? FilterRarity(suitCfg) : FilterRarity(cfg);
 
-                bool isTag = cfg == null ? true : FilterTag(cfg);
+                bool isScore = FilterScore((type == DressFilterItemType.Suit) ? suitItemCfg : cfg);
+
+                bool isTag = FilterTag((type == DressFilterItemType.Suit) ? suitItemCfg : cfg);
 
                 if (isRarity && isScore && isTag)
                 {
@@ -507,6 +546,7 @@ namespace GFGGame
             }
             return isRarity;
         }
+
         private static bool FilterScore(ItemCfg cfg)
         {
             bool isScore = false;
@@ -531,6 +571,33 @@ namespace GFGGame
             }
             return isScore;
         }
+
+        private static bool FilterScore(SuitCfg suitCfg)
+        {
+            bool isScore = false;
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[0]);
+            if (selectScoreList.Count > 0)
+            {
+                if (cfg != null)
+                {
+                    for (int j = 0; j < selectScoreList.Count; j++)
+                    {
+                        if (cfg.mainScore == selectScoreList[j])
+                        {
+                            isScore = true;
+                            break;
+                        }
+
+                    }
+                }
+            }
+            else
+            {
+                isScore = true;
+            }
+            return isScore;
+        }
+
         private static bool FilterTag(ItemCfg cfg)
         {
             bool isTag = false;

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

@@ -9,6 +9,8 @@ namespace GFGGame
         private static List<int> _suitIDList = new List<int>();
         private static List<int> _actionIDList;//拥有的特殊动作列表列表
         private static List<int> _travelSuitIDList;//拥有的游历套装列表
+        public static int chooseClothing = 0;//服裝合成选择合成第几件衣服
+
         public static List<int> TravelSuitIDList
         {
             get

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

@@ -216,7 +216,7 @@ namespace GFGGame
             {
                 return ClickType.PERFECT_CLICK;
             }
-            if (scale <= 0.38f && scale > 0.27f)
+            if (scale <= 0.55f && scale > 0.45f)
             {
                 clickType = ClickType.PERFECT_CLICK;
             }

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

@@ -367,9 +367,16 @@ namespace GFGGame
         {
 
             var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+            //不需要消耗体力
             if (levelCfg.power == 0)
             {
                 times = GameConst.MAX_COUNT_FIGHT_QUICKLY;
+                //神都宸游
+                if (levelCfg.type == ConstInstanceZonesType.PureFight) {
+                    var activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                    RoleLimitData limitData = RoleLimitDataManager.GetLimitData(activityFightCfg.limit);
+                    times = limitData.TotalPlayMax - limitData.PlayTimes;
+                }
             }
             else
             {

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

@@ -10,6 +10,7 @@ namespace GFGGame
     {
         private static Dictionary<int, ItemData> _dataDic = new Dictionary<int, ItemData>();
         private static Dictionary<int, int> _itemExchangeDic = new Dictionary<int, int>();
+        public static Dictionary<int, int> ItemCollect = new Dictionary<int, int>();
 
         delegate object MemberGetDelegate(ItemCfg p);
 

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

@@ -16,6 +16,8 @@ namespace GFGGame
 
         public const float ANIMATION_TIME = 1.2f; //翻牌获得物品展示时间
 
+        public bool CHECK_TIPS_OPEN = false; //提示弹窗是否打开
+
         private List<ItemData> _rewardsList;//当前奖励，每次抽奖后刷新
         private Dictionary<int, ItemData> _firstRewardsList = new Dictionary<int, ItemData>();//首次获得的奖励
         private Dictionary<int, List<LuckyBoxBonusData>> _dicShowList = new Dictionary<int, List<LuckyBoxBonusData>>();
@@ -242,7 +244,10 @@ namespace GFGGame
             }
             else if (hasNum >= costNum)
             {
-                AlertUI.Show(string.Format("是否花费{0}个{1}摘星{2}次？", costNum, itemCfg.name, times)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(); });
+                if(LuckyBoxDataManager.Instance.CHECK_TIPS_OPEN == false)
+                    AlertUI.Show(string.Format("是否花费{0}个{1}摘星{2}次？", costNum, itemCfg.name, times)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(); }).SetShowCheck(true);
+                else
+                    onSuccess();
             }
             else
             {
@@ -269,9 +274,13 @@ namespace GFGGame
                     {
                         ItemUtil.ExchangeItemById(costId, needNum, false, onSuccess);
                     }
-                    else
-                    {
-                        BuyTipsController.Show(costId, needNum, onSuccess);
+                    else {
+                        if (LuckyBoxDataManager.Instance.CHECK_TIPS_OPEN == false)
+                            BuyTipsController.Show(costId, needNum, onSuccess, true);
+                        else
+                        {
+                            OnBuyItem(costId, needNum, onSuccess);
+                        }
                     }
                 }
                 else//购买消耗品的道具不足，提示购买 购买消耗品的道具
@@ -281,6 +290,13 @@ namespace GFGGame
             }
         }
 
+        private async void OnBuyItem(int itemId, long count, Action onSuccess = null)
+        {
+            var _result = await ItemExchangeSProxy.ItemExchange(itemId, count);
+            if (_result)
+                BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(itemId, count), onSuccess);
+        }
+
         private int GetCostNum(int boxId, int times)
         {
             LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);

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

@@ -0,0 +1,41 @@
+using ET;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class MiniGameDateManager : SingletonBase<MiniGameDateManager>
+    {
+        public List<ItemInfoProto> itemList = new List<ItemInfoProto>();
+        public List<GameInfoProto> gameinfoList = new List<GameInfoProto>();
+
+        //合成游戏
+        public int taskID = 40001;
+
+        public bool GetRewardRot()
+        {
+            foreach(GameInfoProto t in gameinfoList)
+            {
+                if(t.FirstPassRewardStatus == 1)
+                {
+                    return true;
+                }
+                if(t.StarRewardStatus.Count > 0 )
+                {
+                    for(int i = 0; i<t.StarRewardStatus.Count;i++)
+                    {
+                        if(t.StarRewardStatus[i] == 1)
+                        {
+                            return true;
+                        }
+                    }
+                } 
+            }
+            return false;
+        }
+
+    }
+
+}

GameClient/Assets/Game/HotUpdate/Data/MiniGameDateManager.cs.meta

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

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

@@ -0,0 +1,21 @@
+namespace GFGGame
+{
+    public class QueueDataManager : SingletonBase<QueueDataManager>
+    {
+        public int Index { get; private set; }
+
+        public int Count { get; private set; }
+
+        public void UpQueueData(int index, int count)
+        {
+            Index = index;
+            count = count;
+        }
+
+        public void ClaerQueueData()
+        {
+            Index = 0;
+            Count = 0;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/QueueDataManager.cs.meta

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

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

@@ -641,7 +641,7 @@ namespace GFGGame
         }
 
         /// <summary>
-        /// 商城-月卡-豆包卡
+        /// 商城-月卡-红包卡
         /// </summary>
         /// <returns></returns>
         public bool GetGoldCardRewardRed()
@@ -649,7 +649,7 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldReward) <= 0;
         }
         /// <summary>
-        /// 商城-月卡-阿福卡
+        /// 商城-月卡-福气卡
         /// </summary>
         /// <returns></returns>
         public bool GetBlackCardRewardRed()
@@ -657,7 +657,7 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldReward) <= 0;
         }
         /// <summary>
-        /// 商城-月卡-阿福卡-单品奖励
+        /// 商城-月卡-福气卡-单品奖励
         /// </summary>
         /// <returns></returns>
         public bool GetBlackCardClothingRed()
@@ -741,6 +741,12 @@ namespace GFGGame
                 _allPlayTimes = ActivityDataManager.Instance.allTsyPlayTimes;
                 _bonusState = ActivityDataManager.Instance.luckyActTsyBonusState;
             }
+            else if (_typeId == ConstLimitTimeActivityType.ActLimitStlyc)
+            {
+                _activityId = ActivityDataManager.Instance.actLimitStlycId;
+                _allPlayTimes = ActivityDataManager.Instance.allLimitStlycTimes;
+                _bonusState = ActivityDataManager.Instance.limitStlycActBonusState;
+            }
 
             if (_activityId <= 0) return false;
             List<ActivityLuckybonusCfg> _bonueCfgs = ActivityLuckybonusCfgArray.Instance.GetCfgsByid(_activityId);
@@ -770,6 +776,18 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 开服活动（神都宸游）
+        /// </summary>
+        /// <returns></returns>
+        public bool GetOpenServerRed()
+        {
+           if (GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || GetGiftBagRewardRed() || GetMeiRiTeHuiRed())
+                return true;
+
+            return false;
+        }
+
+        /// <summary>
         /// 摘星-每日特惠
         /// </summary>
         /// <returns></returns>

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

@@ -280,11 +280,11 @@ namespace GFGGame
                 }
                 else if (GetPosType(i) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
                 {
-                    posItems[i] = "豆包卡开启";
+                    posItems[i] = "红包卡开启";
                 }
                 else if (GetPosType(i) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
                 {
-                    posItems[i] = "阿福卡开启";
+                    posItems[i] = "福气卡开启";
                 }
             }
             return posItems;

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

@@ -203,7 +203,7 @@ namespace GFGGame
             }
             else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE)
             {
-                return string.Format("开通{0}解锁", shopCfg.lockValue == MonthCardType.Gold ? "豆包卡" : "阿福卡");
+                return string.Format("开通{0}解锁", shopCfg.lockValue == MonthCardType.Gold ? "红包卡" : "福气卡");
             }
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {

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

@@ -23,6 +23,7 @@ namespace GFGGame
         public long WeekContribution;//本周贡献值
         public long AllContribution;//累计贡献值
         public long JoinLeagueTime;//加入联盟时间
+        public long AllCoin;//累计资金
     }
 
     public class LeagueListData

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

@@ -102,6 +102,11 @@ namespace GFGGame
                 {
                     downloaderOperation.CancelDownload();
                 }
+                if(_steps == EDressUpSteps.PreDrawing)
+                {
+                    //取消预渲染
+                    PrefabManager.Instance.CancelPreDraw(resPath);
+                }
                 _steps = EDressUpSteps.Done;
             }
             Status = EOperationStatus.Failed;
@@ -245,11 +250,11 @@ namespace GFGGame
             //LogUtil.LogEditor($"add UpdateLayer {itemCfg.id} layerId {layerId}");
             int sortingOrder = ItemTypeCfgArray.Instance.GetSortingOrder(itemCfg.subType, layerId);
             //清理旧的
-            var spritObjName = string.Format(DressUpUtil.FORMAT_SPRITE_NAME, itemCfg.subType, layerId);
+            var spritObjName = DressUpUtil.GetSpriteName(itemCfg, layerId);
             DressUpUtil.TryRemoveSprite(parentObj, spritObjName);
-            var aniObjName = string.Format(DressUpUtil.FORMAT_ANIMATION_NAME, itemCfg.subType, layerId);
+            var aniObjName = string.Format(DressUpUtil.FORMAT_ANIMATION_NAME, itemCfg.id, layerId);
             DressUpUtil.TryRemoveObj(parentObj, aniObjName);
-            string effectObjName = string.Format(DressUpUtil.FORMAT_EFFECT_OBJ_NAME, itemCfg.subType, layerId);
+            string effectObjName = string.Format(DressUpUtil.FORMAT_EFFECT_OBJ_NAME, itemCfg.id, layerId);
             DressUpUtil.TryRemoveObj(parentObj, effectObjName);
             //添加新的
             if(!string.IsNullOrEmpty(this.resPath))

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

@@ -475,13 +475,36 @@ namespace GFGGame
 
         private void CheckRemoveSameType(int subType)
         {
+            ItemTypeCfg itemTypeCfg = ItemTypeCfgArray.Instance.GetCfg(subType);
             int count = 0;
             int firstTeshuId = 0;
+            int maxNum = 1;
+            if(itemTypeCfg != null && itemTypeCfg.maxNum > 0)
+            {
+                maxNum = itemTypeCfg.maxNum;
+            }
+            else if(subType > ConstDressUpItemType.TE_SHU)
+            {
+                maxNum = 3;
+            }
             for (int i = 0; i < _dressUpData.itemList.Count; i++)
             {
                 int itemID = (int)_dressUpData.itemList[i];
                 int itemSubType = ItemUtilCS.GetItemSubType(itemID);
-                if (itemSubType == subType
+                
+                bool isSameType = false;
+                if(itemTypeCfg != null && itemTypeCfg.maxNum > 0)
+                {
+                    if(itemSubType == subType)
+                    {
+                        isSameType = true;
+                    }
+                }
+                else if (subType > ConstDressUpItemType.TE_SHU && itemSubType > ConstDressUpItemType.TE_SHU)
+                {
+                    isSameType = true;
+                }
+                else if (itemSubType == subType
                     || (subType == ConstDressUpItemType.LIAN_YI_QUN && (itemSubType == ConstDressUpItemType.SHANG_YI || itemSubType == ConstDressUpItemType.XIA_ZHUANG || itemSubType == ConstDressUpItemType.NEI_DA))
                     || (subType == ConstDressUpItemType.SHANG_YI && itemSubType == ConstDressUpItemType.LIAN_YI_QUN)
                     || (subType == ConstDressUpItemType.XIA_ZHUANG && itemSubType == ConstDressUpItemType.LIAN_YI_QUN)
@@ -490,7 +513,7 @@ namespace GFGGame
                     Remove(itemID);
                     i--;
                 }
-                if (itemSubType > ConstDressUpItemType.TE_SHU)
+                if (isSameType)
                 {
                     if (count == 0)
                     {
@@ -499,9 +522,9 @@ namespace GFGGame
                     count++;
                 }
             }
-            if (subType > ConstDressUpItemType.TE_SHU && count >= 3)
+            if (count >= maxNum)
             {
-                //特殊饰品最多穿三件，第四件会自动顶掉第一件
+                //超出允许的件数会顶掉第一件
                 Remove(firstTeshuId);
             }
         }

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

@@ -17,9 +17,9 @@ namespace GFGGame
         public const string BODY_SPRITE_NAME = "Body";
         public const string BODY_ANIMATION_NAME = "Body_a";
         public const string BODY_EFFECT_OBJ_NAME = "Body_eff";
-        public const string FORMAT_SPRITE_NAME = "T{0}_s{1}";
-        public const string FORMAT_ANIMATION_NAME = "T{0}_a{1}";
-        public const string FORMAT_EFFECT_OBJ_NAME = "T{0}_e{1}";
+        public const string FORMAT_SPRITE_NAME = "I_{0}_s{1}";
+        public const string FORMAT_ANIMATION_NAME = "I_{0}_a{1}";
+        public const string FORMAT_EFFECT_OBJ_NAME = "I_{0}_e{1}";
 
         public static List<DressUpLayerOperation> AddItemAsync(int itemID, GameObject sceneObj, bool needSetMask = false, bool showAni = true, GameObject parentObj = null, int resLayer = 0)
         {
@@ -93,6 +93,15 @@ namespace GFGGame
             return null;
         }
 
+        public static string GetSpriteName(ItemCfg itemCfg, int layer)
+        {
+            if(itemCfg.subType == ConstDressUpItemType.BEI_JING)
+            {
+                return "Bg";
+            }
+            return string.Format(FORMAT_SPRITE_NAME, itemCfg.id, layer);
+        }
+
         public static void RemoveItem(int itemID, GameObject parentObj)
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
@@ -102,31 +111,31 @@ namespace GFGGame
             //默认层
             if (!string.IsNullOrEmpty(itemCfg.resLayer1))
             {
-                spritObjName = string.Format(FORMAT_SPRITE_NAME, itemCfg.subType, 1);
+                spritObjName = GetSpriteName(itemCfg, 1);
                 TryRemoveSprite(parentObj, spritObjName);
-                aniObjName = string.Format(FORMAT_ANIMATION_NAME, itemCfg.subType, 1);
+                aniObjName = string.Format(FORMAT_ANIMATION_NAME, itemCfg.id, 1);
                 TryRemoveObj(parentObj, aniObjName);
-                aniObjName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.subType, 1);
+                aniObjName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.id, 1);
                 TryRemoveObj(parentObj, aniObjName);
             }
             //特殊层
             if (!string.IsNullOrEmpty(itemCfg.resLayer2))
             {
-                spritObjName = string.Format(FORMAT_SPRITE_NAME, itemCfg.subType, 2);
+                spritObjName = GetSpriteName(itemCfg, 2);
                 TryRemoveSprite(parentObj, spritObjName);
-                aniObjName = string.Format(FORMAT_ANIMATION_NAME, itemCfg.subType, 2);
+                aniObjName = string.Format(FORMAT_ANIMATION_NAME, itemCfg.id, 2);
                 TryRemoveObj(parentObj, aniObjName);
-                aniObjName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.subType, 2);
+                aniObjName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.id, 2);
                 TryRemoveObj(parentObj, aniObjName);
             }
             //第三层
             if (!string.IsNullOrEmpty(itemCfg.resLayer3))
             {
-                spritObjName = string.Format(FORMAT_SPRITE_NAME, itemCfg.subType, 3);
+                spritObjName = GetSpriteName(itemCfg, 3);
                 TryRemoveSprite(parentObj, spritObjName);
-                aniObjName = string.Format(FORMAT_ANIMATION_NAME, itemCfg.subType, 3);
+                aniObjName = string.Format(FORMAT_ANIMATION_NAME, itemCfg.id, 3);
                 TryRemoveObj(parentObj, aniObjName);
-                aniObjName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.subType, 3);
+                aniObjName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.id, 3);
                 TryRemoveObj(parentObj, aniObjName);
             }
         }
@@ -256,7 +265,7 @@ namespace GFGGame
             }
 
             //特效
-            string effectResPath = ResPathUtil.GetDressUpLayerEffectResPath(itemCfg, layerId);
+            string effectResPath = ResPathUtil.GetDressUpLayerEffectResPath(itemCfg, layerId, showAni);
             if (!YooAssets.CheckResExist(effectResPath))
             {
                 effectResPath = null;
@@ -496,7 +505,12 @@ namespace GFGGame
                     renderer.sortingOrder = sortingOrder;
                 }
             }
-
+            var spritesRenderers = gameObj.transform.GetComponentsInChildren<SpriteRenderer>();
+            for(int i = 0; i < spritesRenderers.Length; i++)
+            {
+                var spriteRender = spritesRenderers[i];
+                spriteRender.sortingOrder = sortingOrder;
+            }
         }
 
         public static List<int> GetSuitItems(int suitId, bool isAction, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true)

GameClient/Assets/Resources/Effect/ui_dljm.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 94d93185a60923641bcfd43f0d205968
+guid: 35165656e770160439d03dbf14c3ad50
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivitySyntheticUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivitySyntheticUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public GTextField m_txtTime;
+        public GList m_listSynthetic;
+        public GTextField m_txtTips;
+        public const string URL = "ui://wpsqkdbzyo402e";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivitySyntheticUI";
+        private static UI_ActivitySyntheticUI _proxy;
+
+        public static UI_ActivitySyntheticUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivitySyntheticUI();
+            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_ActivitySyntheticUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivitySyntheticUI();
+            }
+            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_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_listSynthetic = (GList)comp.GetChild("listSynthetic");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            m_txtTime = null;
+            m_listSynthetic = null;
+            m_txtTips = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivitySyntheticUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaMainUI.cs

@@ -0,0 +1,107 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityTeaMainUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GLoader m_titleBg;
+        public GLoader m_oneTimeIcon;
+        public GButton m_oneViewIcon;
+        public GLoader m_oneNameIcon;
+        public GLoader m_twoTimeIcon;
+        public GButton m_twoViewIcon;
+        public GLoader m_twoNameIcon;
+        public GLoader m_threeTimeIcon;
+        public GButton m_threeViewIcon;
+        public GLoader m_threeNameIcon;
+        public GGraph m_effectBg;
+        public const string URL = "ui://wpsqkdbznjon0";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityTeaMainUI";
+        private static UI_ActivityTeaMainUI _proxy;
+
+        public static UI_ActivityTeaMainUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityTeaMainUI();
+            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_ActivityTeaMainUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityTeaMainUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_titleBg = (GLoader)comp.GetChild("titleBg");
+            m_oneTimeIcon = (GLoader)comp.GetChild("oneTimeIcon");
+            m_oneViewIcon = (GButton)comp.GetChild("oneViewIcon");
+            m_oneNameIcon = (GLoader)comp.GetChild("oneNameIcon");
+            m_twoTimeIcon = (GLoader)comp.GetChild("twoTimeIcon");
+            m_twoViewIcon = (GButton)comp.GetChild("twoViewIcon");
+            m_twoNameIcon = (GLoader)comp.GetChild("twoNameIcon");
+            m_threeTimeIcon = (GLoader)comp.GetChild("threeTimeIcon");
+            m_threeViewIcon = (GButton)comp.GetChild("threeViewIcon");
+            m_threeNameIcon = (GLoader)comp.GetChild("threeNameIcon");
+            m_effectBg = (GGraph)comp.GetChild("effectBg");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_titleBg = null;
+            m_oneTimeIcon = null;
+            m_oneViewIcon = null;
+            m_oneNameIcon = null;
+            m_twoTimeIcon = null;
+            m_twoViewIcon = null;
+            m_twoNameIcon = null;
+            m_threeTimeIcon = null;
+            m_threeViewIcon = null;
+            m_threeNameIcon = null;
+            m_effectBg = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaMainUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaVisitUI.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityTeaVisitUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GGraph m_effectBg;
+        public GButton m_btnBack;
+        public GTextField m_time;
+        public GLoader m_ruleIcon;
+        public GList m_taskList;
+        public GImage m_visitNumTips;
+        public GTextField m_visitNum;
+        public const string URL = "ui://wpsqkdbznjone";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityTeaVisitUI";
+        private static UI_ActivityTeaVisitUI _proxy;
+
+        public static UI_ActivityTeaVisitUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityTeaVisitUI();
+            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_ActivityTeaVisitUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityTeaVisitUI();
+            }
+            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_effectBg = (GGraph)comp.GetChild("effectBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_time = (GTextField)comp.GetChild("time");
+            m_ruleIcon = (GLoader)comp.GetChild("ruleIcon");
+            m_taskList = (GList)comp.GetChild("taskList");
+            m_visitNumTips = (GImage)comp.GetChild("visitNumTips");
+            m_visitNum = (GTextField)comp.GetChild("visitNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_effectBg = null;
+            m_btnBack = null;
+            m_time = null;
+            m_ruleIcon = null;
+            m_taskList = null;
+            m_visitNumTips = null;
+            m_visitNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaVisitUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitItemUI.cs

@@ -0,0 +1,97 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityVIsitItemUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public UI_npcHead m_head;
+        public GLoader m_rewardIcon;
+        public GLoader m_lockIcon;
+        public GTextField m_name;
+        public GTextField m_lockTitle;
+        public UI_Button22 m_visitBtn;
+        public GGroup m_visitG;
+        public GGroup m_unLock;
+        public const string URL = "ui://wpsqkdbznjonl";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityVIsitItemUI";
+        private static UI_ActivityVIsitItemUI _proxy;
+
+        public static UI_ActivityVIsitItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityVIsitItemUI();
+            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_ActivityVIsitItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityVIsitItemUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_head = (UI_npcHead)UI_npcHead.Create(comp.GetChild("head"));
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_lockIcon = (GLoader)comp.GetChild("lockIcon");
+            m_name = (GTextField)comp.GetChild("name");
+            m_lockTitle = (GTextField)comp.GetChild("lockTitle");
+            m_visitBtn = (UI_Button22)UI_Button22.Create(comp.GetChild("visitBtn"));
+            m_visitG = (GGroup)comp.GetChild("visitG");
+            m_unLock = (GGroup)comp.GetChild("unLock");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_head.Dispose();
+            m_head = null;
+            m_rewardIcon = null;
+            m_lockIcon = null;
+            m_name = null;
+            m_lockTitle = null;
+            m_visitBtn.Dispose();
+            m_visitBtn = null;
+            m_visitG = null;
+            m_unLock = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitRewardItemUI.cs

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityVIsitRewardItemUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GTextField m_txtDesc;
+        public GList m_listTaskReward;
+        public GTextField m_txtCount;
+        public UI_Button23 m_ComeBt;
+        public UI_Button23 m_GetRewardBt;
+        public UI_Button23 m_GotBtn;
+        public const string URL = "ui://wpsqkdbznjonk";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityVIsitRewardItemUI";
+        private static UI_ActivityVIsitRewardItemUI _proxy;
+
+        public static UI_ActivityVIsitRewardItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityVIsitRewardItemUI();
+            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_ActivityVIsitRewardItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityVIsitRewardItemUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_listTaskReward = (GList)comp.GetChild("listTaskReward");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_ComeBt = (UI_Button23)UI_Button23.Create(comp.GetChild("ComeBt"));
+            m_GetRewardBt = (UI_Button23)UI_Button23.Create(comp.GetChild("GetRewardBt"));
+            m_GotBtn = (UI_Button23)UI_Button23.Create(comp.GetChild("GotBtn"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_txtDesc = null;
+            m_listTaskReward = null;
+            m_txtCount = null;
+            m_ComeBt.Dispose();
+            m_ComeBt = null;
+            m_GetRewardBt.Dispose();
+            m_GetRewardBt = null;
+            m_GotBtn.Dispose();
+            m_GotBtn = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitRewardItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVisitNPCUI.cs

@@ -0,0 +1,103 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityVisitNPCUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GLoader m_npcIcon;
+        public UI_CompDialogText m_DialogText;
+        public GLoader m_nextChatBtn;
+        public GButton m_btnBack;
+        public GTextField m_name;
+        public GTextField m_titleIcon;
+        public UI_Component2 m_taskIcon;
+        public GLoader m_listBg;
+        public GList m_taskList;
+        public GLoader m_gotReward;
+        public const string URL = "ui://wpsqkdbznjonj";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityVisitNPCUI";
+        private static UI_ActivityVisitNPCUI _proxy;
+
+        public static UI_ActivityVisitNPCUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityVisitNPCUI();
+            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_ActivityVisitNPCUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityVisitNPCUI();
+            }
+            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_npcIcon = (GLoader)comp.GetChild("npcIcon");
+            m_DialogText = (UI_CompDialogText)UI_CompDialogText.Create(comp.GetChild("DialogText"));
+            m_nextChatBtn = (GLoader)comp.GetChild("nextChatBtn");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_name = (GTextField)comp.GetChild("name");
+            m_titleIcon = (GTextField)comp.GetChild("titleIcon");
+            m_taskIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("taskIcon"));
+            m_listBg = (GLoader)comp.GetChild("listBg");
+            m_taskList = (GList)comp.GetChild("taskList");
+            m_gotReward = (GLoader)comp.GetChild("gotReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_npcIcon = null;
+            m_DialogText.Dispose();
+            m_DialogText = null;
+            m_nextChatBtn = null;
+            m_btnBack = null;
+            m_name = null;
+            m_titleIcon = null;
+            m_taskIcon.Dispose();
+            m_taskIcon = null;
+            m_listBg = null;
+            m_taskList = null;
+            m_gotReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVisitNPCUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Button22.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_Button22
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GTextField m_titleLock;
+        public const string URL = "ui://wpsqkdbzqbf42r";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "Button22";
+        private static UI_Button22 _proxy;
+
+        public static UI_Button22 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button22();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button22 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button22();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_c1 = comp.GetController("c1");
+            m_titleLock = (GTextField)comp.GetChild("titleLock");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_titleLock = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Button22.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Button23.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_Button23
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://wpsqkdbzqbf42v";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "Button23";
+        private static UI_Button23 _proxy;
+
+        public static UI_Button23 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button23();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button23 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button23();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Button23.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_CompDialogText.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_CompDialogText
+    {
+        public GComponent target;
+        public Controller m_bgType;
+        public Controller m_showArrow;
+        public GLoader m_bg;
+        public GTextField m_txtContent;
+        public GTextField m_txtName;
+        public Transition m_In;
+        public const string URL = "ui://wpsqkdbznjono";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "CompDialogText";
+        private static UI_CompDialogText _proxy;
+
+        public static UI_CompDialogText Create(GObject gObject = null)
+        {
+            var ui = new UI_CompDialogText();
+            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_CompDialogText Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompDialogText();
+            }
+            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_bgType = comp.GetController("bgType");
+            m_showArrow = comp.GetController("showArrow");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_In = comp.GetTransition("In");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bgType = null;
+            m_showArrow = null;
+            m_bg = null;
+            m_txtContent = null;
+            m_txtName = null;
+            m_In = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_CompDialogText.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Component2.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Component2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardItemUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_RewardItemUI
+    {
+        public GComponent target;
+        public GLoader m_rewardBg;
+        public GLoader m_rewardIcon;
+        public GTextField m_rewardNum;
+        public const string URL = "ui://wpsqkdbznjonm";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "RewardItemUI";
+        private static UI_RewardItemUI _proxy;
+
+        public static UI_RewardItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardItemUI();
+            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_RewardItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardItemUI();
+            }
+            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_rewardBg = (GLoader)comp.GetChild("rewardBg");
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rewardBg = null;
+            m_rewardIcon = null;
+            m_rewardNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardTips.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_RewardTips
+    {
+        public GComponent target;
+        public GLoader m_btnBack;
+        public GTextField m_desc;
+        public GList m_rewardList;
+        public GImage m_back;
+        public GTextField m_name;
+        public GGraph m_effect1;
+        public GGraph m_effect2;
+        public const string URL = "ui://wpsqkdbzqbf41v";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "RewardTips";
+        private static UI_RewardTips _proxy;
+
+        public static UI_RewardTips Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardTips();
+            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_RewardTips Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardTips();
+            }
+            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_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_desc = (GTextField)comp.GetChild("desc");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+            m_back = (GImage)comp.GetChild("back");
+            m_name = (GTextField)comp.GetChild("name");
+            m_effect1 = (GGraph)comp.GetChild("effect1");
+            m_effect2 = (GGraph)comp.GetChild("effect2");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_desc = null;
+            m_rewardList = null;
+            m_back = null;
+            m_name = null;
+            m_effect1 = null;
+            m_effect2 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardTips.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardTipsItemUI.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_RewardTipsItemUI
+    {
+        public GComponent target;
+        public GLoader m_rewardBg;
+        public GLoader m_rewardIcon;
+        public GTextField m_rewardNum;
+        public GTextField m_rewardName;
+        public const string URL = "ui://wpsqkdbzqbf42a";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "RewardTipsItemUI";
+        private static UI_RewardTipsItemUI _proxy;
+
+        public static UI_RewardTipsItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardTipsItemUI();
+            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_RewardTipsItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardTipsItemUI();
+            }
+            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_rewardBg = (GLoader)comp.GetChild("rewardBg");
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+            m_rewardName = (GTextField)comp.GetChild("rewardName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rewardBg = null;
+            m_rewardIcon = null;
+            m_rewardNum = null;
+            m_rewardName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardTipsItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_SyntheticItemUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_SyntheticItemUI
+    {
+        public GComponent target;
+        public Controller m_btnType;
+        public GComponent m_item1;
+        public GComponent m_item2;
+        public GComponent m_item3;
+        public GButton m_btnMake;
+        public GButton m_btnGet;
+        public const string URL = "ui://wpsqkdbzyo402m";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "SyntheticItemUI";
+        private static UI_SyntheticItemUI _proxy;
+
+        public static UI_SyntheticItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SyntheticItemUI();
+            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_SyntheticItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SyntheticItemUI();
+            }
+            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_btnType = comp.GetController("btnType");
+            m_item1 = (GComponent)comp.GetChild("item1");
+            m_item2 = (GComponent)comp.GetChild("item2");
+            m_item3 = (GComponent)comp.GetChild("item3");
+            m_btnMake = (GButton)comp.GetChild("btnMake");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnType = null;
+            m_item1 = null;
+            m_item2 = null;
+            m_item3 = null;
+            m_btnMake = null;
+            m_btnGet = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_SyntheticItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComReward.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_npcHead.cs

@@ -2,22 +2,20 @@
 
 using FairyGUI;
 
-namespace UI.ClothingFoster
+namespace UI.ActivityAfternoonTea
 {
-    public partial class UI_ComReward
+    public partial class UI_npcHead
     {
         public GComponent target;
         public GLoader m_loaIcon;
-        public GImage m_imgGot;
-        public GTextField m_txtNum;
-        public const string URL = "ui://uicwtr5bbd1c24";
-        public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ComReward";
-        private static UI_ComReward _proxy;
+        public const string URL = "ui://wpsqkdbznjon10";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "npcHead";
+        private static UI_npcHead _proxy;
 
-        public static UI_ComReward Create(GObject gObject = null)
+        public static UI_npcHead Create(GObject gObject = null)
         {
-            var ui = new UI_ComReward();
+            var ui = new UI_npcHead();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +24,11 @@ namespace UI.ClothingFoster
             return ui;
         }
 
-        public static UI_ComReward Proxy(GObject gObject = null)
+        public static UI_npcHead Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComReward();
+                _proxy = new UI_npcHead();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -58,14 +56,10 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_imgGot = (GImage)comp.GetChild("imgGot");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
-            m_imgGot = null;
-            m_txtNum = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_npcHead.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoEntryUI.cs

@@ -0,0 +1,99 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_ActivityHuaRongDaoEntryUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnRule;
+        public UI_scrollPane m_scrollPane;
+        public GTextField m_challengeTimes;
+        public GTextField m_curLevel;
+        public GTextField m_txtTime;
+        public GButton m_btnStart;
+        public GButton m_btnBack;
+        public Transition m_hide;
+        public Transition m_show;
+        public const string URL = "ui://wf8geywtltoy4";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "ActivityHuaRongDaoEntryUI";
+        private static UI_ActivityHuaRongDaoEntryUI _proxy;
+
+        public static UI_ActivityHuaRongDaoEntryUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityHuaRongDaoEntryUI();
+            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_ActivityHuaRongDaoEntryUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityHuaRongDaoEntryUI();
+            }
+            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_btnRule = (GButton)comp.GetChild("btnRule");
+            m_scrollPane = (UI_scrollPane)UI_scrollPane.Create(comp.GetChild("scrollPane"));
+            m_challengeTimes = (GTextField)comp.GetChild("challengeTimes");
+            m_curLevel = (GTextField)comp.GetChild("curLevel");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnStart = (GButton)comp.GetChild("btnStart");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_hide = comp.GetTransition("hide");
+            m_show = comp.GetTransition("show");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnRule = null;
+            m_scrollPane.Dispose();
+            m_scrollPane = null;
+            m_challengeTimes = null;
+            m_curLevel = null;
+            m_txtTime = null;
+            m_btnStart = null;
+            m_btnBack = null;
+            m_hide = null;
+            m_show = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoEntryUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoSuccessUI.cs

@@ -0,0 +1,84 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_ActivityHuaRongDaoSuccessUI
+    {
+        public GComponent target;
+        public GList m_listReward;
+        public UI_Again m_againCom;
+        public GButton m_btnExit2;
+        public GComponent m_reward;
+        public GButton m_btnExit;
+        public const string URL = "ui://wf8geywtltoyj";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "ActivityHuaRongDaoSuccessUI";
+        private static UI_ActivityHuaRongDaoSuccessUI _proxy;
+
+        public static UI_ActivityHuaRongDaoSuccessUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityHuaRongDaoSuccessUI();
+            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_ActivityHuaRongDaoSuccessUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityHuaRongDaoSuccessUI();
+            }
+            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_listReward = (GList)comp.GetChild("listReward");
+            m_againCom = (UI_Again)UI_Again.Create(comp.GetChild("againCom"));
+            m_btnExit2 = (GButton)comp.GetChild("btnExit2");
+            m_reward = (GComponent)comp.GetChild("reward");
+            m_btnExit = (GButton)comp.GetChild("btnExit");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listReward = null;
+            m_againCom.Dispose();
+            m_againCom = null;
+            m_btnExit2 = null;
+            m_reward = null;
+            m_btnExit = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoSuccessUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoUI.cs

@@ -7,9 +7,22 @@ namespace UI.ActivityHuaRongDao
     public partial class UI_ActivityHuaRongDaoUI
     {
         public GComponent target;
-        public GButton m_btnClose;
+        public Controller m_state;
+        public GLoader m_loaBg;
         public UI_item m_item;
+        public GTextField m_seconds;
+        public GGroup m_tips;
+        public GButton m_btnLookPic;
+        public GButton m_btnHidePic;
+        public GButton m_btnRefresh;
         public UI_items m_items;
+        public UI_items m_itemsOrigin;
+        public GGraph m_maskTouch;
+        public GGraph m_mask;
+        public GGraph m_maskGlobal;
+        public GButton m_btnBack;
+        public Transition m_showMask;
+        public Transition m_hideMask;
         public const string URL = "ui://wf8geywtnx120";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "ActivityHuaRongDaoUI";
@@ -57,17 +70,44 @@ namespace UI.ActivityHuaRongDao
 
         private void Init(GComponent comp)
         {
-            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_state = comp.GetController("state");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_item = (UI_item)UI_item.Create(comp.GetChild("item"));
+            m_seconds = (GTextField)comp.GetChild("seconds");
+            m_tips = (GGroup)comp.GetChild("tips");
+            m_btnLookPic = (GButton)comp.GetChild("btnLookPic");
+            m_btnHidePic = (GButton)comp.GetChild("btnHidePic");
+            m_btnRefresh = (GButton)comp.GetChild("btnRefresh");
             m_items = (UI_items)UI_items.Create(comp.GetChild("items"));
+            m_itemsOrigin = (UI_items)UI_items.Create(comp.GetChild("itemsOrigin"));
+            m_maskTouch = (GGraph)comp.GetChild("maskTouch");
+            m_mask = (GGraph)comp.GetChild("mask");
+            m_maskGlobal = (GGraph)comp.GetChild("maskGlobal");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_showMask = comp.GetTransition("showMask");
+            m_hideMask = comp.GetTransition("hideMask");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_btnClose = null;
+            m_state = null;
+            m_loaBg = null;
             m_item.Dispose();
             m_item = null;
+            m_seconds = null;
+            m_tips = null;
+            m_btnLookPic = null;
+            m_btnHidePic = null;
+            m_btnRefresh = null;
             m_items.Dispose();
             m_items = null;
+            m_itemsOrigin.Dispose();
+            m_itemsOrigin = null;
+            m_maskTouch = null;
+            m_mask = null;
+            m_maskGlobal = null;
+            m_btnBack = null;
+            m_showMask = null;
+            m_hideMask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_Again.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_Again
+    {
+        public GComponent target;
+        public GLoader m_icon;
+        public GTextField m_num;
+        public GButton m_btnRestart;
+        public const string URL = "ui://wf8geywtltoyk";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "Again";
+        private static UI_Again _proxy;
+
+        public static UI_Again Create(GObject gObject = null)
+        {
+            var ui = new UI_Again();
+            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_Again Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Again();
+            }
+            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_icon = (GLoader)comp.GetChild("icon");
+            m_num = (GTextField)comp.GetChild("num");
+            m_btnRestart = (GButton)comp.GetChild("btnRestart");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_icon = null;
+            m_num = null;
+            m_btnRestart = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_Again.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_item.cs

@@ -7,8 +7,10 @@ namespace UI.ActivityHuaRongDao
     public partial class UI_item
     {
         public GComponent target;
-        public GGraph m_item;
+        public GLoader m_icon;
         public GTextField m_index;
+        public Transition m_show;
+        public Transition m_hide;
         public const string URL = "ui://wf8geywtnx121";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "item";
@@ -56,13 +58,17 @@ namespace UI.ActivityHuaRongDao
 
         private void Init(GComponent comp)
         {
-            m_item = (GGraph)comp.GetChild("item");
+            m_icon = (GLoader)comp.GetChild("icon");
             m_index = (GTextField)comp.GetChild("index");
+            m_show = comp.GetTransition("show");
+            m_hide = comp.GetTransition("hide");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_item = null;
+            m_icon = null;
             m_index = null;
+            m_show = null;
+            m_hide = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_progressBarItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_progressBarItem
+    {
+        public GComponent target;
+        public Controller m_light;
+        public const string URL = "ui://wf8geywtltoye";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "progressBarItem";
+        private static UI_progressBarItem _proxy;
+
+        public static UI_progressBarItem Create(GObject gObject = null)
+        {
+            var ui = new UI_progressBarItem();
+            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_progressBarItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_progressBarItem();
+            }
+            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_light = comp.GetController("light");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_light = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_progressBarItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_progressBgItem.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_progressBgItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_reward.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_reward
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://wf8geywtl5iz1e";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "reward";
+        private static UI_reward _proxy;
+
+        public static UI_reward Create(GObject gObject = null)
+        {
+            var ui = new UI_reward();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_reward Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_reward();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_c1 = comp.GetController("c1");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_reward.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_scrollPane.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_scrollPane
+    {
+        public GComponent target;
+        public GList m_listBg;
+        public GList m_listBar;
+        public GList m_listItems;
+        public const string URL = "ui://wf8geywtltoy7";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "scrollPane";
+        private static UI_scrollPane _proxy;
+
+        public static UI_scrollPane Create(GObject gObject = null)
+        {
+            var ui = new UI_scrollPane();
+            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_scrollPane Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_scrollPane();
+            }
+            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_listBg = (GList)comp.GetChild("listBg");
+            m_listBar = (GList)comp.GetChild("listBar");
+            m_listItems = (GList)comp.GetChild("listItems");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listBg = null;
+            m_listBar = null;
+            m_listItems = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_scrollPane.cs.meta

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

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardDetailList.cs.meta

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

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

@@ -11,7 +11,7 @@ namespace UI.Card
         public GButton m_btnBack;
         public GButton m_btnFilter;
         public GList m_listRole;
-        public GList m_listCard;
+        public UI_CardDetailList m_comListCard;
         public GTextField m_txtTips;
         public Transition m_In;
         public Transition m_Refresh;
@@ -66,7 +66,7 @@ namespace UI.Card
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnFilter = (GButton)comp.GetChild("btnFilter");
             m_listRole = (GList)comp.GetChild("listRole");
-            m_listCard = (GList)comp.GetChild("listCard");
+            m_comListCard = (UI_CardDetailList)UI_CardDetailList.Create(comp.GetChild("comListCard"));
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_In = comp.GetTransition("In");
             m_Refresh = comp.GetTransition("Refresh");
@@ -77,7 +77,8 @@ namespace UI.Card
             m_btnBack = null;
             m_btnFilter = null;
             m_listRole = null;
-            m_listCard = null;
+            m_comListCard.Dispose();
+            m_comListCard = null;
             m_txtTips = null;
             m_In = null;
             m_Refresh = null;

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

@@ -18,6 +18,7 @@ namespace UI.Card
         public GLoader m_loaGuide;
         public GButton m_btnLeft;
         public GButton m_btnRight;
+        public GGraph m_touchLayer;
         public Transition m_t0;
         public Transition m_t1;
         public Transition m_open;
@@ -79,6 +80,7 @@ namespace UI.Card
             m_loaGuide = (GLoader)comp.GetChild("loaGuide");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnRight = (GButton)comp.GetChild("btnRight");
+            m_touchLayer = (GGraph)comp.GetChild("touchLayer");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
             m_open = comp.GetTransition("open");
@@ -100,6 +102,7 @@ namespace UI.Card
             m_loaGuide = null;
             m_btnLeft = null;
             m_btnRight = null;
+            m_touchLayer = null;
             m_t0 = null;
             m_t1 = null;
             m_open = null;

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

@@ -17,6 +17,7 @@ namespace UI.Card
         public GComponent m_comConsume;
         public GButton m_btnUpLv;
         public GGroup m_lvInfo;
+        public GGraph m_holderIcon;
         public const string URL = "ui://7l6lvkayrhha9m";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "CardSkillUI";
@@ -74,6 +75,7 @@ namespace UI.Card
             m_comConsume = (GComponent)comp.GetChild("comConsume");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
             m_lvInfo = (GGroup)comp.GetChild("lvInfo");
+            m_holderIcon = (GGraph)comp.GetChild("holderIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -89,6 +91,7 @@ namespace UI.Card
             m_comConsume = null;
             m_btnUpLv = null;
             m_lvInfo = null;
+            m_holderIcon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,98 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Card
+{
+    public partial class UI_CardUpLevelUI
+    {
+        public GComponent target;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public GList m_list;
+        public GButton m_btnUse;
+        public GTextField m_txtChooseLevel;
+        public GButton m_btnAdd;
+        public GButton m_btnReduce;
+        public GSlider m_slideUpLevel;
+        public GLoader m_loaCost;
+        public GTextField m_txtCost;
+        public const string URL = "ui://7l6lvkaykm99tm5";
+        public const string PACKAGE_NAME = "Card";
+        public const string RES_NAME = "CardUpLevelUI";
+        private static UI_CardUpLevelUI _proxy;
+
+        public static UI_CardUpLevelUI Create(GObject gObject = null)
+        {
+            var ui = new UI_CardUpLevelUI();
+            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_CardUpLevelUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CardUpLevelUI();
+            }
+            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_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+            m_list = (GList)comp.GetChild("list");
+            m_btnUse = (GButton)comp.GetChild("btnUse");
+            m_txtChooseLevel = (GTextField)comp.GetChild("txtChooseLevel");
+            m_btnAdd = (GButton)comp.GetChild("btnAdd");
+            m_btnReduce = (GButton)comp.GetChild("btnReduce");
+            m_slideUpLevel = (GSlider)comp.GetChild("slideUpLevel");
+            m_loaCost = (GLoader)comp.GetChild("loaCost");
+            m_txtCost = (GTextField)comp.GetChild("txtCost");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            m_list = null;
+            m_btnUse = null;
+            m_txtChooseLevel = null;
+            m_btnAdd = null;
+            m_btnReduce = null;
+            m_slideUpLevel = null;
+            m_loaCost = null;
+            m_txtCost = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardUpLevelUI.cs.meta

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

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

@@ -9,6 +9,8 @@ namespace UI.Card
         public GComponent target;
         public Controller m_c1;
         public GGraph m_bgTouch;
+        public GGraph m_holderBgCom;
+        public GGraph m_holderTitle;
         public GTextField m_txtLast;
         public GTextField m_txtNow;
         public GList m_listProperty;
@@ -64,6 +66,8 @@ namespace UI.Card
         {
             m_c1 = comp.GetController("c1");
             m_bgTouch = (GGraph)comp.GetChild("bgTouch");
+            m_holderBgCom = (GGraph)comp.GetChild("holderBgCom");
+            m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_txtLast = (GTextField)comp.GetChild("txtLast");
             m_txtNow = (GTextField)comp.GetChild("txtNow");
             m_listProperty = (GList)comp.GetChild("listProperty");
@@ -75,6 +79,8 @@ namespace UI.Card
         {
             m_c1 = null;
             m_bgTouch = null;
+            m_holderBgCom = null;
+            m_holderTitle = null;
             m_txtLast = null;
             m_txtNow = null;
             m_listProperty = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListRewardItem.cs

@@ -8,7 +8,7 @@ namespace UI.ClothingFoster
     {
         public GComponent target;
         public GTextField m_txtDiscribe;
-        public UI_ComReward m_ComReward;
+        public GComponent m_itemReward;
         public const string URL = "ui://uicwtr5bpy5gw";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "ListRewardItem";
@@ -57,13 +57,12 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
-            m_ComReward = (UI_ComReward)UI_ComReward.Create(comp.GetChild("ComReward"));
+            m_itemReward = (GComponent)comp.GetChild("itemReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtDiscribe = null;
-            m_ComReward.Dispose();
-            m_ComReward = null;
+            m_itemReward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs

@@ -8,10 +8,9 @@ namespace UI.ClothingSynthetic
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GButton m_btnBack;
-        public GButton m_btnHome;
-        public GComponent m_valueBar;
         public UI_Component1WithMask m_compHolder;
+        public GLoader m_loaBg2;
+        public GGraph m_loaBg2Pos;
         public GGraph m_posHelper;
         public UI_CompItemInfo m_compItemInfo;
         public GTextField m_txtSuitName;
@@ -20,6 +19,9 @@ namespace UI.ClothingSynthetic
         public GList m_listClothing;
         public GButton m_btnProduction;
         public GComponent m_comCostCurrency;
+        public GButton m_btnBack;
+        public GButton m_btnHome;
+        public GComponent m_valueBar;
         public Transition m_hide;
         public Transition m_show;
         public const string URL = "ui://4f294tdkj5391";
@@ -70,10 +72,9 @@ namespace UI.ClothingSynthetic
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btnHome = (GButton)comp.GetChild("btnHome");
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_compHolder = (UI_Component1WithMask)UI_Component1WithMask.Create(comp.GetChild("compHolder"));
+            m_loaBg2 = (GLoader)comp.GetChild("loaBg2");
+            m_loaBg2Pos = (GGraph)comp.GetChild("loaBg2Pos");
             m_posHelper = (GGraph)comp.GetChild("posHelper");
             m_compItemInfo = (UI_CompItemInfo)UI_CompItemInfo.Create(comp.GetChild("compItemInfo"));
             m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
@@ -82,17 +83,19 @@ namespace UI.ClothingSynthetic
             m_listClothing = (GList)comp.GetChild("listClothing");
             m_btnProduction = (GButton)comp.GetChild("btnProduction");
             m_comCostCurrency = (GComponent)comp.GetChild("comCostCurrency");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnHome = (GButton)comp.GetChild("btnHome");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_hide = comp.GetTransition("hide");
             m_show = comp.GetTransition("show");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_btnBack = null;
-            m_btnHome = null;
-            m_valueBar = null;
             m_compHolder.Dispose();
             m_compHolder = null;
+            m_loaBg2 = null;
+            m_loaBg2Pos = null;
             m_posHelper = null;
             m_compItemInfo.Dispose();
             m_compItemInfo = null;
@@ -102,6 +105,9 @@ namespace UI.ClothingSynthetic
             m_listClothing = null;
             m_btnProduction = null;
             m_comCostCurrency = null;
+            m_btnBack = null;
+            m_btnHome = null;
+            m_valueBar = null;
             m_hide = null;
             m_show = null;
             if(disposeTarget && target != null)