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

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

@@ -148,6 +148,8 @@ namespace GFGGame
 
         private void OnClickListCardItem(EventContext context)
         {
+            CardData cardData = (CardData)(context.data as GObject).data;
+            cardData.fromUIType = typeof(CardDetailView).FullName;
             ViewManager.Show<CardFosterView>((context.data as GObject).data, new object[] { typeof(CardDetailView).FullName, _ui.m_listRole.selectedIndex });
             // this.Clear();
 

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

@@ -263,6 +263,7 @@ namespace GFGGame
         private void OnBtnUpCardClikc()
         {
             if (cardList.Count == 0) return;
+            cardList[_ui.m_listCard.selectedIndex].fromUIType = typeof(StoryCardChoose).FullName;
             ViewManager.Show<CardFosterView>(cardList[_ui.m_listCard.selectedIndex],
                 new object[] { typeof(StoryCardChoose).FullName, _scoreType });
             this.Hide();