竞技场

FGUIProject/assets/Arena/ArenaResultQuickUI.xml

@@ -9,7 +9,7 @@
     <text id="n17_psph" name="txtTargetName" xy="121,217" pivot="0.5,0" size="142,49" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="36" color="#c09c6d" align="center" letterSpacing="-2" autoClearText="true" text="对手名字"/>
     <component id="n23_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="273,122" pivot="0.5,0.5" group="n29_jcej" scale="0.75,0.75"/>
     <image id="n38_jcej" name="n38" src="jcej2b" fileName="images/kstzjj_txk.png" xy="323,178" group="n29_jcej"/>
-    <text id="n21_psph" name="n21" xy="507,195" size="71,46" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="34" color="#c09c6d" align="right" autoClearText="true" text="排名"/>
+    <text id="n21_psph" name="n21" xy="507,195" size="71,46" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="34" color="#c09c6d" align="right" text="排名"/>
     <text id="n30_jcej" name="txtTargetRank" xy="475,230" pivot="0.5,0" size="138,64" group="n29_jcej" font="ui://eg2y0ldpweoktkb" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" bold="true" autoClearText="true" text="10000"/>
     <text id="n22_psph" name="txtDantitle" xy="687,217" pivot="0.5,0" size="148,49" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="36" color="#cf8b80" align="right" text="段位名称"/>
     <group id="n29_jcej" name="n29" xy="121,122" size="714,230"/>
@@ -18,6 +18,6 @@
       <item/>
       <item/>
     </list>
-    <component id="n39_jcej" name="comResult" src="jcej4m" fileName="components/ComFightResult.xml" xy="170,830"/>
+    <component id="n39_jcej" name="comResult" src="jcej4m" fileName="components/ComAllScoreResult.xml" xy="170,830"/>
   </displayList>
 </component>

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

@@ -244,7 +244,8 @@ namespace GFGGame
             TravelSProxy.ReqTravelInfo().Coroutine();
             TravelSProxy.ReqTravelGuideInfo().Coroutine();
             PoemGallerySProxy.ReqGalleryTheme().Coroutine();
-            ArenaSproxy.GetArenaInfos().Coroutine();
+            ArenaSproxy.ReqArenaInfos().Coroutine();
+            ArenaSproxy.ReqArenaHistory().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -67,8 +67,15 @@ namespace GFGGame
             Targets.Clear();
             RankDatasDic.Clear();
             HistoryDatas.Clear();
-            HistoryDatas = null;
             TextureDic.Clear();
+            myScore.Clear();
+            targetScore.Clear();
+            myFightScore.Clear();
+            targetFightScore.Clear();
+            roundTime.Clear();
+            targetRoundTime.Clear();
+            LastTargetInfo = null;
+            SelfData = null;
         }
         /// <summary>
         /// 是否结算中
@@ -286,6 +293,17 @@ namespace GFGGame
         }
 
         /*********************************************************************************************************************/
+        public void SetMineFightAttr()
+        {
+            for (int i = 0; i < DressupList.Count; i++)
+            {
+                FightData fightData = DressupList[i];
+                fightData.cardScore = ItemDataManager.GetItemAdditionScore(fightData.cardId, ThemeList[i], fightData.tags);
+                fightData.skillLvs = SkillDataManager.Instance.GetSkillLvs(fightData.cardId);
+                FightDataManager.Instance.SetItemScoreList(fightData);
+            }
+        }
+
         /// <summary>
         /// 获取三套服装总战力
         /// </summary>

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

@@ -62,11 +62,11 @@ namespace GFGGame
             item.m_txtMyScore.text = myScore.ToString();
             item.m_txtTargetScore.text = targetScore.ToString();
             ItemCfg cardCfg = ItemCfgArray.Instance.GetCfg(myCardId);
-            item.m_loaMyCard.m_comCardmask.m_loaCard.url = ResPathUtil.GetCardSmallPath(cardCfg.res);
+            item.m_loaMyCard.m_comCardmask.m_loaCard.url = cardCfg == null ? "" : ResPathUtil.GetCardSmallPath(cardCfg.res);
             ItemCfg targetCardCfg = ItemCfgArray.Instance.GetCfg(targetCardId);
-            item.m_loaMyCard.m_comCardmask.m_loaCard.url = ResPathUtil.GetCardSmallPath(targetCardCfg.res);
+            item.m_loaTargetCard.m_comCardmask.m_loaCard.url = targetCardCfg == null ? "" : ResPathUtil.GetCardSmallPath(targetCardCfg.res);
             RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, myHeadId, 0);
-            if (targetCardId > 0)
+            if (targetHeadId > 0)
             {
                 RoleInfoManager.Instance.UpdateHead(item.m_comTargetHead, targetHeadId, 0);
             }

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

@@ -177,5 +177,4 @@ namespace GFGGame
 
         }
     }
-
 }

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -27,7 +27,7 @@ namespace GFGGame
     public static class ArenaSproxy
     {
         //获取竞技场信息
-        public static async ETTask GetArenaInfos()
+        public static async ETTask ReqArenaInfos()
         {
             S2C_GetArenaInfos response = null;
             response = (S2C_GetArenaInfos)await MessageHelper.SendToServer(new C2S_GetArenaInfos());
@@ -48,7 +48,7 @@ namespace GFGGame
                     roleInfo.roleLv = RoleDataManager.lvl;
                     roleInfo.headId = RoleDataManager.headId;
 
-                    ArenaDataManager.Instance.Clear();
+                    // ArenaDataManager.Instance.Clear();
                     for (int i = 0; i < response.ThemeList.Count; i++)
                     {
                         FightData roleData = GetFightRoleData(response.DressupList[i], roleInfo, i);
@@ -98,7 +98,6 @@ namespace GFGGame
                 {
                     ArenaDataManager.Instance.DressupList[index].cardId = cardId;
                     ArenaDataManager.Instance.DressupList[index].itemList = itemList;
-                    PromptController.Instance.ShowFloatTextPrompt("保存成功");
 
                     return true;
                 }
@@ -142,7 +141,7 @@ namespace GFGGame
             });
             if (response != null)
             {
-                if (response.Error != ErrorCode.ERR_Success)
+                if (response.Error == ErrorCode.ERR_Success)
                 {
                     //记录老数据，用于结算展示
                     ArenaDataManager.Instance.LastGrade = ArenaDataManager.Instance.Grade;
@@ -197,7 +196,7 @@ namespace GFGGame
         }
 
         //获取竞技场历史记录
-        public static async ETTask ReqArenaHistory(int rankType, int startIndex, int endIndex)
+        public static async ETTask ReqArenaHistory()
         {
             S2C_ArenaHistory response = null;
             response = (S2C_ArenaHistory)await MessageHelper.SendToServer(new C2S_ArenaHistory() { });
@@ -226,8 +225,14 @@ namespace GFGGame
                     for (int i = 0; i < response.data.Count; i++)
                     {
                         list[i].cardScore = response.data[i].CardScore;
-                        list[i].skillLvs = response.data[i].SkillLevel;
                         list[i].itemScoreList = response.data[i].SuitScore;
+                        List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(response.data[i].CardId);
+
+                        for (int j = 0; j < skillCfgs.Count; j++)
+                        {
+                            int index = response.data[i].SkillId.IndexOf(skillCfgs[j].skillId);
+                            list[i].skillLvs.Add(response.data[i].SkillLevel[index]);
+                        }
                         FightDataManager.Instance.SetItemScoreList(list[i]);
                         ScoreSystemData.Instance.SetEquipScoresWithPartId(list[i]);
                     }
@@ -323,7 +328,7 @@ namespace GFGGame
 
             fightData.type = FightTargetType.ROBOT;
             fightData.res = robotCfg.targetRes;
-            double cardScore = (double)robotCfg.cardScore * (double)robotProto.Random / 10000 * 100;
+            double cardScore = (double)robotCfg.cardScore * (double)robotProto.Random / 10000;
             fightData.cardScore = (int)Math.Ceiling(cardScore);
             fightData.skillLvs.Add(robotCfg.skillLvs);
             fightData.showSuitId = robotProto.SuitList[index];

GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -45,6 +45,7 @@ namespace GFGGame
                     DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
                     SuitFosterProxy.SendGetSuitInfos().Coroutine();
                     FieldSProxy.ReqFieldInstanceInfos().Coroutine();
+                    ArenaSproxy.ReqArenaInfos().Coroutine();
                     PromptController.Instance.ShowFloatTextPrompt("每日次数已重置", MessageType.SUCCESS);
                 }
             }

GameClient/Assets/Game/HotUpdate/ServerProxy/DataChangeUtil.cs

@@ -1,22 +0,0 @@
-using ET;
-
-namespace GFGGame
-{
-    public class DataChangeUtil : SingletonBase<DataChangeUtil>
-    {
-        public OtherRoleInfoData GetOtherRoleInfoData(OtherRoleInfoProto info)
-        {
-            OtherRoleInfoData roleInfoData = new OtherRoleInfoData();
-
-            roleInfoData.roleId = info.RoleId;
-            roleInfoData.roleName = info.RoleName;
-            roleInfoData.roleLv = info.RoleLvl;
-            roleInfoData.offlineTimeSec = info.OfflineTimeSec;
-            roleInfoData.headId = info.HeadItemId;
-            roleInfoData.headBorderId = info.HeadBorderItemId;
-
-            return roleInfoData;
-        }
-
-    }
-}

GameClient/Assets/Game/HotUpdate/ServerProxy/DataChangeUtil.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -64,7 +64,6 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-
         }
         protected override void OnShown()
         {
@@ -120,7 +119,7 @@ namespace GFGGame
         {
             ViewManager.Show<ArenaDressUpFightView>(null, new object[] { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas } }, true);
         }
-        private void OnBtnRecommendClick()
+        private async void OnBtnRecommendClick()
         {
             for (int i = 0; i < ArenaDataManager.Instance.ThemeList.Count; i++)
             {
@@ -134,9 +133,15 @@ namespace GFGGame
                 FightDataManager.Instance.SetItemScoreList(roleData);
                 ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
                 _roleDatas = ArenaDataManager.Instance.DressupList;
-                ArenaSproxy.ReqChangeArenaDressup(i, roleData.cardId, roleData.itemList).Coroutine();
+                bool result = await ArenaSproxy.ReqChangeArenaDressup(i, roleData.cardId, roleData.itemList);
+                if (!result)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("保存失败");
+                    return;
+                }
                 Timers.inst.StartCoroutine(ScreenShotTex(i));
             }
+            PromptController.Instance.ShowFloatTextPrompt("保存成功");
             UpdateView();
         }
         private IEnumerator ScreenShotTex(int index)

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -22,7 +22,7 @@ namespace GFGGame
         {
             if (_sceneObject != null)
             {
-                GameObject.Destroy(_sceneObject);
+                GameObject.Destroy(_scenePrefab);
                 _sceneObject = null;
             }
             if (_valueBarController != null)
@@ -82,7 +82,7 @@ namespace GFGGame
             _targetData = this.viewData == null ? null : this.viewData as ArenaTargetData;
             _arenaCfg = ArenaOpenCfgArray.Instance.GetCfg(_dataManager.SeasonId);
             _valueBarController.OnShown();
-
+            _dataManager.SetMineFightAttr();
             for (int i = 0; i < _dataManager.Targets.Count; i++)
             {
                 ArenaTargetData targetData = _dataManager.Targets[i];
@@ -122,6 +122,12 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
+            _targetDressUpObj.TakeOffAll();
+            // if (_targetDressUpObj != null)
+            // {
+            //     GameObject.Destroy(_sceneObject);
+            //     _sceneObject = null;
+            // }
             _valueBarController.OnHide();
         }
 
@@ -162,6 +168,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("结算中......");
                 return;
             }
+            Debug.Log("ArenaBuyFightTimes:" + RoleDataManager.ArenaBuyFightTimes);
             if (RoleDataManager.ArenaBuyFightTimes == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("今日次数购买已达上限");
@@ -172,6 +179,11 @@ namespace GFGGame
             string.Format("(今天已购买{0}/{1}次)", GlobalCfgArray.globalCfg.limitDailyBuyFightTimes - RoleDataManager.ArenaBuyFightTimes, GlobalCfgArray.globalCfg.limitDailyBuyFightTimes))
             .SetLeftButton(true, "取消").SetRightButton(true, "确定", (object data) =>
             {
+                if (ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.costIdBuyFightTimes) < GlobalCfgArray.globalCfg.costNumBuyFightTimes)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                    return;
+                }
                 ArenaSproxy.ReqBuyArenaFightTimes().Coroutine();
             });
         }
@@ -182,6 +194,14 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("结算中......");
                 return;
             }
+            if (RoleDataManager.ArenaFreshTimes <= 0)
+            {
+                if (ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.costIdBuyFreshTimes) < GlobalCfgArray.globalCfg.costNumBuyFreshTimes)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                    return;
+                }
+            }
             bool result = await ArenaSproxy.ReqRefreshArenaTargets();
             if (result)
             {
@@ -206,12 +226,16 @@ namespace GFGGame
         {
             _targetData = null;
             _ui.m_c1.selectedIndex = 0;
-            GameObject targetSceneObj = _sceneObject.transform.Find("TargetRole").gameObject;
-            targetSceneObj.SetActive(false);
+
+            UpdateRole();
         }
 
         private void OnBtnFightClick()
         {
+            if (RoleDataManager.ArenaFightTimes <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("挑战次数不足");
+            }
             for (int i = 0; i < _dataManager.DressupList.Count; i++)
             {
                 if (!MyDressUpHelper.CheckPutOnFinish(_dataManager.DressupList[i].itemList))
@@ -231,7 +255,7 @@ namespace GFGGame
                 ViewManager.Show<StoryFightTargetView>(null, null, true);
             }
         }
-        private void GetFightResult()
+        private async void GetFightResult()
         {
             _dataManager.myScore.Clear();
             _dataManager.targetScore.Clear();
@@ -255,12 +279,14 @@ namespace GFGGame
 
             _dataManager.myFightScore = _dataManager.GetFightScoreList(_dataManager.DressupList);
             _dataManager.targetFightScore = _dataManager.GetFightScoreList(_targetData.FightDatas);
+            await ArenaSproxy.ReqArenaFight(winCount >= 2, _targetData, _dataManager.myFightScore, _dataManager.targetFightScore, _dataManager.myScore, _dataManager.targetScore);
         }
         private void UpdateView()
         {
             UpdateNormal();
             UpdateValue();
             UpdateTargetList();
+            UpdateRole();
         }
 
         private void UpdateNormal()
@@ -306,18 +332,18 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
+            }
+            GameObject mySceneObj = _sceneObject.transform.Find("MyRole").gameObject;
+            MyDressUpHelper.dressUpObj.setSceneObj(mySceneObj, false, false);
+
+            GameObject targetSceneObj = _sceneObject.transform.Find("targetRole").gameObject;
+            targetSceneObj.SetActive(false);
+            _targetDressUpObj.setSceneObj(targetSceneObj, false, false);
 
-                GameObject mySceneObj = _sceneObject.transform.Find("MyRole").gameObject;
-                MyDressUpHelper.dressUpObj.setSceneObj(mySceneObj, false, false);
 
-                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)
             {
-                GameObject targetSceneObj = _sceneObject.transform.Find("TargetRole").gameObject;
                 targetSceneObj.SetActive(true);
                 if (_targetData.Type == FightTargetType.PLAYER)
                 {

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

@@ -371,7 +371,7 @@ namespace GFGGame
             DressUpFinish();
 
         }
-        private void DressUpFinish()
+        private async void DressUpFinish()
         {
 
             if (CardDataManager.GetCardListByRarity(0).Count > 0)
@@ -380,7 +380,11 @@ namespace GFGGame
             }
             else
             {
-                ArenaSproxy.ReqChangeArenaDressup(_dataManager.SelectThemeIndex, 0, MyDressUpHelper.dressUpObj.itemList).Coroutine();
+                bool result = await ArenaSproxy.ReqChangeArenaDressup(_dataManager.SelectThemeIndex, 0, MyDressUpHelper.dressUpObj.itemList);
+                if (result)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("保存成功");
+                }
             }
         }
         private void OnClickBtnRecommend()

GameClient/Assets/ResIn/Prefab/SceneArena.prefab

@@ -1,5 +1,86 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &409667373392565201
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4648731517489415621}
+  - component: {fileID: 1890748879829597595}
+  m_Layer: 0
+  m_Name: MaskNpc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4648731517489415621
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 409667373392565201}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 5.4, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 369419672786543710}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!331 &1890748879829597595
+SpriteMask:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 409667373392565201}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 8c9de3878d54f0e439f1c5fc0495459e, type: 3}
+  m_MaskAlphaCutoff: 0.2
+  m_FrontSortingLayerID: 1628392575
+  m_BackSortingLayerID: 1628392575
+  m_FrontSortingLayer: 1
+  m_BackSortingLayer: 1
+  m_FrontSortingOrder: 9999
+  m_BackSortingOrder: -998
+  m_IsCustomRangeActive: 1
+  m_SpriteSortPoint: 0
 --- !u!1 &3546098852908447157
 GameObject:
   m_ObjectHideFlags: 0
@@ -112,9 +193,92 @@ Transform:
   - {fileID: 3406092553222842069}
   - {fileID: 1352865593306254017}
   - {fileID: 7512704231378774906}
+  - {fileID: 7144809034428671479}
+  - {fileID: 4648731517489415621}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5276361075639442352
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7144809034428671479}
+  - component: {fileID: 5158743406863661266}
+  m_Layer: 0
+  m_Name: MaskRole
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7144809034428671479
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5276361075639442352}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -5.4, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 369419672786543710}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!331 &5158743406863661266
+SpriteMask:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5276361075639442352}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: d54fd5ac44f2b4f4bb2cb4c7033d0ddd, type: 3}
+  m_MaskAlphaCutoff: 0.2
+  m_FrontSortingLayerID: 0
+  m_BackSortingLayerID: 0
+  m_FrontSortingLayer: 0
+  m_BackSortingLayer: 0
+  m_FrontSortingOrder: 9999
+  m_BackSortingOrder: -998
+  m_IsCustomRangeActive: 1
+  m_SpriteSortPoint: 0
 --- !u!1 &6804152833114416294
 GameObject:
   m_ObjectHideFlags: 0
@@ -156,7 +320,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
@@ -170,7 +334,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7684116393383725891}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4342571773848954758}
@@ -198,7 +362,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -2.49
+      value: -3
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.y
@@ -268,7 +432,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 2.24
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.y