浏览代码

竞技场

zhaoyang 2 年之前
父节点
当前提交
555b228890

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaRankUpUI.cs

@@ -10,6 +10,7 @@ namespace UI.Arena
         public UI_ComDanSimpleInfo m_comTargetHeadInfo;
         public UI_ComDanSimpleInfo m_comMyHeadInfo;
         public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://4lc5fhlbpsph7";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ArenaRankUpUI";
@@ -60,6 +61,7 @@ namespace UI.Arena
             m_comTargetHeadInfo = (UI_ComDanSimpleInfo)UI_ComDanSimpleInfo.Create(comp.GetChild("comTargetHeadInfo"));
             m_comMyHeadInfo = (UI_ComDanSimpleInfo)UI_ComDanSimpleInfo.Create(comp.GetChild("comMyHeadInfo"));
             m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -68,6 +70,7 @@ namespace UI.Arena
             m_comMyHeadInfo.Dispose();
             m_comMyHeadInfo = null;
             m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 5 - 3
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -123,7 +123,7 @@ namespace GFGGame
             }
             sceneCopyObject.SetActive(false);
 
-            UpdateRole();
+            // UpdateRole();
             UpdateNormal();
             UpdateValue();
             UpdateRole();
@@ -356,13 +356,15 @@ namespace GFGGame
 
             GameObject mySceneObj = _sceneObject.transform.Find("MyRole").gameObject;
             MyDressUpHelper.dressUpObj.setSceneObj(mySceneObj, false, false);
+            MyDressUpHelper.dressUpObj.PutOnItemList(_dataManager.DressupList[0].itemList);
+            Vector3 pos = mySceneObj.transform.Find("Role").transform.localPosition;
+            mySceneObj.transform.Find("Role").transform.localPosition = new Vector3(0, pos.y, pos.z);
 
-            GameObject targetSceneObj = _sceneObject.transform.Find("targetRole").gameObject;
+            GameObject targetSceneObj = _sceneObject.transform.Find("TargetRole").gameObject;
             targetSceneObj.SetActive(false);
             _targetDressUpObj.setSceneObj(targetSceneObj, false, false);
 
 
-            MyDressUpHelper.dressUpObj.PutOnItemList(_dataManager.DressupList[0].itemList);
             if (_ui.m_c1.selectedIndex == 1)
             {
                 targetSceneObj.SetActive(true);

+ 3 - 3
GameClient/Assets/ResIn/Prefab/SceneArena.prefab

@@ -401,7 +401,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6804152833114416294}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -3, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4765689914788877876}
@@ -418,7 +418,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7512704231378774906}
   m_Layer: 0
-  m_Name: targetRole
+  m_Name: TargetRole
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -561,7 +561,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -3
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.y

二进制
GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes