战斗表现

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

@@ -464,7 +464,7 @@ namespace GFGGame
             camera.targetTexture = null;//重置截图相机的targetTexture
             RenderTexture.active = null;//关闭RenderTexture的激活状态
             Object.Destroy(render);//删除RenderTexture对象
-            // camera.gameObject.SetActive(false);
+            camera.gameObject.SetActive(false);
 
             return new NTexture(tex);
 

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelDressupView.cs

@@ -91,7 +91,13 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("行囊已满");
                 return;
             }
-            int travelSuitId = (int)(context.data as GObject).data;
+            GObject obj = context.sender as GObject;
+            if (obj.data == null)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("请选择游历要带的服装");
+                return;
+            }
+            int travelSuitId = (int)obj.data;
             _selectTravelSuitIds.Add(travelSuitId);
 
             UpdateView();
@@ -104,10 +110,10 @@ namespace GFGGame
 
         private void OnComDressClick(EventContext context)
         {
-
-            int travelSuitId = (int)(context.sender as GObject).data;
+            GObject obj = context.sender as GObject;
+            int travelSuitId = (int)obj.data;
             _selectTravelSuitIds.Remove(travelSuitId);
-
+            obj.data = null;
             UpdateView();
         }
 

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -67,7 +67,7 @@ namespace GFGGame
             if (_ui.m_c1.selectedIndex == (int)TravelGuideType.Travel)
             {
                 long endTime = TravelDataManager.Instance.TravelData.CreationTime + TravelDataManager.Instance.TravelData.TravelNeedHour * TimeUtil.SECOND_PER_HOUR;
-                _ui.m_txtTime.text = string.Format("大约{0}后归来", TimeUtil.FormattingTime(TimeHelper.ServerNowSecs), endTime);
+                _ui.m_txtTime.text = string.Format("大约{0}后归来", TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, (int)endTime));
             }
         }
 

GameClient/Assets/ResIn/Prefab/SceneDressUpFight.prefab

@@ -17,7 +17,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4137215948490320690
 Transform:
   m_ObjectHideFlags: 0