茶话会，剧情展示修改，奖励修改，结算界面修改

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

@@ -423,6 +423,7 @@ namespace GFGGame
                     targetItemList.Add(itemId);
                 }
             }
+
             if (targetDressUpData.bgId > 0 && (excludeType == null || Array.IndexOf(excludeType, ConstDressUpItemType.BEI_JING) < 0))
             {
                 targetItemList.Add(targetDressUpData.bgId);
@@ -434,9 +435,12 @@ namespace GFGGame
         }
 
         //穿戴默认换装数据
-        public void PutOnDefaultDressUpData()
+        public void PutOnDefaultDressUpData(bool bgType = false)
         {
-            PutOnDressUpData(DressUpData.CreateDefault());
+            var dressUpData = DressUpData.CreateDefault();
+            if (bgType)
+                dressUpData.bgId = 180002;
+            PutOnDressUpData(dressUpData);
         }
 
         //穿戴一组散件数据（会脱掉不包含的部分）

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

@@ -97,8 +97,6 @@ namespace GFGGame
                         StoryDialogDataManager.Instance.waitBgChange = false;
                     }
                 }
-
-
             }
         }
 

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

@@ -8,13 +8,14 @@ namespace UI.League
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GList m_ListTeaParty;
         public GButton m_btnBack;
         public GButton m_btnChallenge;
         public GButton m_btnChat;
         public GButton m_btnReward;
         public GButton m_btnRule;
         public GTextField m_txtTeaName;
-        public GList m_ListTeaParty;
+        public GTextField m_txtOverTime;
         public UI_TeaPartyItemTips m_teaPartyItemTips;
         public const string URL = "ui://tw70qm9dchwotpk";
         public const string PACKAGE_NAME = "League";
@@ -64,25 +65,27 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_ListTeaParty = (GList)comp.GetChild("ListTeaParty");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChallenge = (GButton)comp.GetChild("btnChallenge");
             m_btnChat = (GButton)comp.GetChild("btnChat");
             m_btnReward = (GButton)comp.GetChild("btnReward");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
-            m_ListTeaParty = (GList)comp.GetChild("ListTeaParty");
+            m_txtOverTime = (GTextField)comp.GetChild("txtOverTime");
             m_teaPartyItemTips = (UI_TeaPartyItemTips)UI_TeaPartyItemTips.Create(comp.GetChild("teaPartyItemTips"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_ListTeaParty = null;
             m_btnBack = null;
             m_btnChallenge = null;
             m_btnChat = null;
             m_btnReward = null;
             m_btnRule = null;
             m_txtTeaName = null;
-            m_ListTeaParty = null;
+            m_txtOverTime = null;
             m_teaPartyItemTips.Dispose();
             m_teaPartyItemTips = null;
             if(disposeTarget && target != null)

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

@@ -11,6 +11,8 @@ namespace UI.League
         public GTextField m_txtRoleName;
         public GTextField m_txtMaxValue;
         public GImage m_imgChoose;
+        public GTextField m_txtNumber;
+        public GTextField m_txtMaxName;
         public GLoader m_btnDetail;
         public const string URL = "ui://tw70qm9dchwotpl";
         public const string PACKAGE_NAME = "League";
@@ -63,6 +65,8 @@ namespace UI.League
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_txtMaxValue = (GTextField)comp.GetChild("txtMaxValue");
             m_imgChoose = (GImage)comp.GetChild("imgChoose");
+            m_txtNumber = (GTextField)comp.GetChild("txtNumber");
+            m_txtMaxName = (GTextField)comp.GetChild("txtMaxName");
             m_btnDetail = (GLoader)comp.GetChild("btnDetail");
         }
         public void Dispose(bool disposeTarget = false)
@@ -71,6 +75,8 @@ namespace UI.League
             m_txtRoleName = null;
             m_txtMaxValue = null;
             m_imgChoose = null;
+            m_txtNumber = null;
+            m_txtMaxName = null;
             m_btnDetail = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,6 +8,8 @@ namespace UI.League
     {
         public GComponent target;
         public GLoader m_iconRole;
+        public GTextField m_txtRoleName;
+        public GTextField m_txtGuildName;
         public const string URL = "ui://tw70qm9dic4otq5";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "comTeaPartyOverItem";
@@ -56,10 +58,14 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_iconRole = (GLoader)comp.GetChild("iconRole");
+            m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
+            m_txtGuildName = (GTextField)comp.GetChild("txtGuildName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_iconRole = null;
+            m_txtRoleName = null;
+            m_txtGuildName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -150,6 +150,7 @@ namespace GFGGame
             base.OnShown();
 
             var objData = (DressUpFightType)this.viewData;
+
             if (objData.teaPartID > 0)
                 IsTeaPart = true;
 
@@ -229,7 +230,7 @@ namespace GFGGame
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
                 MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
-                MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData();
+                MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData(IsTeaPart);
             }
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
 

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

@@ -10,7 +10,8 @@ namespace GFGGame
     public class LeagueTeaPartyOverView : BaseWindow
     {
         private UI_LeagueTeaPartyOverUI _ui;
-        private List<UI_comTeaPartyItem> teaPartyItemList = new List<UI_comTeaPartyItem>();
+        private List<UI_comTeaPartyOverItem> teaPartyOverItemList = new List<UI_comTeaPartyOverItem>();
+        private List<TeapartyRoleCfg> teapartyRoleCfg;
 
         public override void Dispose()
         {
@@ -30,11 +31,20 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
+            _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnRule.data = 300022;
+
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem1);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem2);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem3);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem4);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem5);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem6);
+
+            teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(1); //LeagueDataManager.Instance.TeaPartyId
         }
 
         protected override void AddEventListener()
@@ -45,17 +55,35 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+
+            GetRoleContainerInfos();
+            Timers.inst.Add(2, 1, UpdateTime);
         }
+
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(UpdateTime);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
         }
-        
+
+        private async void GetRoleContainerInfos()
+        {
+            bool result = await LeagueSproxy.GetRoleContainerInfos();
+            if (result)
+            {
+                for (int index = 0; index < teaPartyOverItemList.Count; index++)
+                {
+                    teaPartyOverItemList[index].m_txtRoleName.text = teapartyRoleCfg[index].name;
+                    teaPartyOverItemList[index].m_txtGuildName.text = teapartyRoleCfg[index].name;
+                }
+            }
+        }
+
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
@@ -65,5 +93,11 @@ namespace GFGGame
         {
             ViewManager.Show<LeagueTeaPartyRewardView>();
         }
+
+        private void UpdateTime(object param)
+        {
+            OnBtnRewardClick();
+            Timers.inst.Remove(UpdateTime);
+        }
     }
 }

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

@@ -61,7 +61,6 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
         }
 
-
         //½ÇÉ«ÆÀÑ¡½±Àø
         private void SetPersonScoreList()
         {
@@ -88,9 +87,9 @@ namespace GFGGame
                 var itemCfg = ItemCfgArray.Instance.GetCfg(cfgBonusArr[0][0]);
                 item.m_loaIcon.url = string.IsNullOrEmpty(itemCfg.res) ? "" : ResPathUtil.GetIconPath(itemCfg);
                 item.m_Num.text = cfgBonusArr[0][1].ToString();
-                //item.m_c1.selectedIndex = cfg.id == maxCfgID ? 1 : 0;
-                //item.target.data = cfg;
-                //item.target.onClick.Add(OnClickReward);
+                item.m_c1.selectedIndex = cfg.id < maxCfgID ? 1 : 0;
+                item.target.data = cfgBonusArr;
+                item.target.onClick.Add(OnClickReward);
             }
             FreshGetStatus();
         }
@@ -99,17 +98,33 @@ namespace GFGGame
         {
             componentsPerson.ForEach(com =>
             {
-                //var item = UI_ExpProcessItem.Proxy(com);
-                //var cfg = (Activity7DaysCfg)item.target.data;
-                //var cfgID = cfg.id;
+                var item = UI_LinessRewardProcessItemBt.Proxy(com);
+                var cfg = (int[][])item.target.data;
+                var cfgID = cfg[0][0];
+                var itemCfg = ItemCfgArray.Instance.GetCfg(cfgID);
                 //var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
-                //item.m_c2.selectedIndex = state ? 1 : 0;
+                //item.m_c1.selectedIndex = state ? 1 : 0;
                 //RedDotController.Instance.SetComRedDot(item.target,
                 //    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID), "", -90);
-                //UI_ExpProcessItem.ProxyEnd();
+                UI_LinessRewardProcessItemBt.ProxyEnd();
             });
         }
 
+        private async void OnClickReward(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            var activity7DaysCfg = (Activity7DaysCfg)btnGet.data;
+            var id = activity7DaysCfg.id;
+            if (!ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(id))
+            {
+                GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
+                return;
+            }
+            var result = await ActivityDay7SProxy.ReqGetActivityDay7Reward(activity7DaysCfg);
+            if (!result) return;
+            FreshGetStatus();
+        }
+
         //Ñż¯ÆÀÑ¡½±Àø
         private void SetLeagueScoreList()
         {
@@ -136,12 +151,42 @@ namespace GFGGame
                 var itemCfg = ItemCfgArray.Instance.GetCfg(cfgBonusArr[0][0]);
                 item.m_loaIcon.url = string.IsNullOrEmpty(itemCfg.res) ? "" : ResPathUtil.GetIconPath(itemCfg);
                 item.m_Num.text = cfgBonusArr[0][1].ToString();
-                //item.m_c1.selectedIndex = cfg.id == maxCfgID ? 1 : 0;
-                //item.target.data = cfg;
-                //item.target.onClick.Add(OnClickReward);
+                item.m_c1.selectedIndex = cfg.id == maxCfgID ? 1 : 0;
+                item.target.data = cfgBonusArr;
+                item.target.onClick.Add(OnClickLeagueReward);
             }
-            FreshGetStatus();
+            FreshGetLeagueStatus();
+        }
+
+        private void FreshGetLeagueStatus()
+        {
+            componentsPerson.ForEach(com =>
+            {
+                var item = UI_LinessRewardProcessItemBt.Proxy(com);
+                var cfg = (int[][])item.target.data;
+                var cfgID = cfg[0][0];
+                var itemCfg = ItemCfgArray.Instance.GetCfg(cfgID);
+                //var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
+                //item.m_c1.selectedIndex = state ? 1 : 0;
+                //RedDotController.Instance.SetComRedDot(item.target,
+                //    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID), "", -90);
+                UI_LinessRewardProcessItemBt.ProxyEnd();
+            });
         }
 
+        private async void OnClickLeagueReward(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            var activity7DaysCfg = (Activity7DaysCfg)btnGet.data;
+            var id = activity7DaysCfg.id;
+            if (!ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(id))
+            {
+                GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
+                return;
+            }
+            var result = await ActivityDay7SProxy.ReqGetActivityDay7Reward(activity7DaysCfg);
+            if (!result) return;
+            FreshGetStatus();
+        }
     }
 }

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

@@ -11,6 +11,7 @@ namespace GFGGame
     {
         private UI_LeagueTeaPartyUI _ui;
         private List<UI_comTeaPartyItem> teaPartyItemList = new List<UI_comTeaPartyItem>();
+        private List<RoleContainerProto> roleContainerList = new List<RoleContainerProto>();
         private List<TeapartyRoleCfg> teapartyRoleCfg;
         public override void Dispose()
         {
@@ -30,7 +31,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
+            _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
             _ui.m_btnChallenge.onClick.Add(OnBtnChallengeClick);
@@ -47,12 +48,15 @@ namespace GFGGame
         private void ListTeaPartyItemRender(int index, GObject obj)
         {
             UI_comTeaPartyItem itemObj = UI_comTeaPartyItem.Proxy(obj);
-
+            Vector2 localpos = obj.position;//.LocalToGlobal();
+            itemObj.m_btnDetail.data = localpos;
             itemObj.m_btnDetail.onClick.Add(OnBtnDetailClick);
             itemObj.m_iconRole.data = index;
             itemObj.m_iconRole.onClick.Add(OnBtnIconRoleClick);
             itemObj.m_txtRoleName.text = teapartyRoleCfg[index].name;
-
+            //itemObj.m_txtMaxValue.text = roleContainerList[index].MaxScore.ToString();
+            //itemObj.m_txtNumber.text = roleContainerList[index].PerNum.ToString();
+            //itemObj.m_txtMaxName.text = roleContainerList[index].MaxScoreROleName.ToString();
             UI_comTeaPartyItem.ProxyEnd();
         }
 
@@ -64,24 +68,33 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            GetRoleContainerInfos();
             var openCfg = TeapartyOpenCfgArray.Instance.GetCfg(1);//LeagueDataManager.Instance.TeaPartyId
             _ui.m_txtTeaName.text = openCfg.name;
             _ui.m_teaPartyItemTips.target.visible = false;
+            int myPos = LeagueDataManager.Instance.GetMyPos();
+            bool isLeader = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
+            _ui.m_btnChallenge.visible = isLeader;
+
+            UpDataOverTime();
+
+            //GetRoleContainerInfos();
+            roleContainerList = LeagueDataManager.Instance.RoleContainerList;
             _ui.m_ListTeaParty.numItems = 6;
         }
+        private void UpDataOverTime()
+        {
+            //_ui.m_txtOverTime.text = "挑战剩余时间：" + TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+           
+        }
+
 
         private async void GetRoleContainerInfos()
         {
             bool result = await LeagueSproxy.GetRoleContainerInfos();
             if (result)
             {
-                var roleContainerList = LeagueDataManager.Instance.RoleContainerList;
-                for (int index = 0; index < roleContainerList.Count; index++){
-                    teaPartyItemList[index].m_txtMaxValue.text = roleContainerList[index].MaxScore.ToString();
-
-
-                }
+                roleContainerList = LeagueDataManager.Instance.RoleContainerList;
+                _ui.m_ListTeaParty.numItems = 6;
             }
         }
 
@@ -102,8 +115,14 @@ namespace GFGGame
 
         private void OnBtnChallengeClick()
         {
-            PromptController.Instance.ShowFloatTextPrompt("开始挑战");
+            string stroyStartID = "50001";
+            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog),null,true }, null, true);
 
+            //ViewManager.Show<LeagueTeaPartyOverView>();
+        }
+
+        private static void OnCompletePriorStoryDialog(bool isSkip, object param)
+        {
             ViewManager.Show<LeagueTeaPartyOverView>();
         }
 
@@ -117,11 +136,17 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
         }
 
-        private void OnBtnDetailClick()
+
+        private void OnBtnDetailClick(EventContext context)
         {
+            GObject obj = context.sender as GObject;
+            var pos = (Vector2)obj.data;
+
+            //_ui.m_teaPartyItemTips.m_window.position = pos;
+
             _ui.m_teaPartyItemTips.target.visible = true;
         }
-        
+
         private void OnTeaPartyItemTipsClick()
         {
             _ui.m_teaPartyItemTips.target.visible = false;

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

@@ -50,7 +50,7 @@ namespace GFGGame
                 }
                 //, new object[] { typeof(StoryChapterView).FullName, MainStoryDataManager.currentChapterCfgId }
                 bool skipable = MainStoryDataManager.CheckCurrentLevelPass();
-                ViewManager.Show<StoryDialogView>(new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog) }, gobackparams, true);
+                ViewManager.Show<StoryDialogView>(new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog),null,false }, gobackparams, true);
             }
         }
 

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

@@ -55,7 +55,7 @@ namespace GFGGame
 
         public static void ShowCardStoryDialog(CardStoryCfg cardStoryCfg, CardData cardData)
         {
-            ViewManager.Show<StoryDialogView>(new object[] { cardStoryCfg.storyStartID, true, new OnCompleteStoryDialogCall(OnCompleteCardStoryDialog), cardData }, new object[] { typeof(CardFosterView).FullName, cardData }, true);
+            ViewManager.Show<StoryDialogView>(new object[] { cardStoryCfg.storyStartID, true, new OnCompleteStoryDialogCall(OnCompleteCardStoryDialog), cardData ,false}, new object[] { typeof(CardFosterView).FullName, cardData }, true);
         }
         private static void OnCompleteCardStoryDialog(bool isSkip, object param)
         {
@@ -70,7 +70,7 @@ namespace GFGGame
             InstanceZonesDataManager.currentLevelCfgId = 100001001;
             string stroyStartID = "1";
             // string stroyStartID = MainStoryDataManager.priorId;
-            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog) }, null, true);
+            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog),null,false }, null, true);
         }
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)
@@ -84,7 +84,7 @@ namespace GFGGame
 
             InstanceZonesDataManager.currentLevelCfgId = storyLevelCfg.id;
 
-            ViewManager.Show<StoryDialogView>(new object[] { storyLevelCfg.storyStartID, false, new OnCompleteStoryDialogCall(OnCompleteFilingStoryDialog) }, null, true);
+            ViewManager.Show<StoryDialogView>(new object[] { storyLevelCfg.storyStartID, false, new OnCompleteStoryDialogCall(OnCompleteFilingStoryDialog) ,null,false}, null, true);
 
         }
 

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

@@ -37,6 +37,8 @@ namespace GFGGame
         private string _currentWords;
         private string _storyStartID;
         private string lastTextFieldType;   // 上一段文本框的类型
+        private bool IsTeaParty;    //是否是茶话会里的对话
+
         TypingFadeEffect _typingEffect;
 
 
@@ -126,6 +128,9 @@ namespace GFGGame
             {
                 _onCompleteStoryDialogCallParam = datas[3];
             }
+            if ((bool)datas[4])
+                IsTeaParty = true;
+
             if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {
                 // 临时设置都可以跳过对话
@@ -417,6 +422,10 @@ namespace GFGGame
             {
                 roleName = RoleDataManager.roleName;
             }
+            if (roleName == "")
+            {
+                roleName = RoleDataManager.roleName;
+            }
             //回顾
             if (roleName != null)
             {
@@ -618,6 +627,22 @@ namespace GFGGame
             {
                 SceneController.UpdateDialogPic(value, _sceneObject);
             }
+            else if (IsTeaParty)
+            {
+                UpdateRoleObj();
+            }
+        }
+
+        private void UpdateRoleObj()
+        {
+            var _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUpFight"));
+            var _sceneObject = GameObject.Instantiate(_scenePrefab);
+            if (_sceneObject == null)
+            {
+                _sceneObject = GameObject.Instantiate(_scenePrefab);
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
+                //MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData();
+            }
         }
 
         private void UpdateMusic(string value)