【编队】编队功能补全
chenyuqi
parent
03b274c99f
commit
a84f7b1ff3
|
|
@ -341,6 +341,81 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1858752568180111020
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1893520263844099147}
|
||||
- component: {fileID: 579898957846887868}
|
||||
- component: {fileID: 4603935086395953418}
|
||||
m_Layer: 5
|
||||
m_Name: Image_Fraction07
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1893520263844099147
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1858752568180111020}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4204482891361932937}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -183.1461, y: 132.50037}
|
||||
m_SizeDelta: {x: 50, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &579898957846887868
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1858752568180111020}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &4603935086395953418
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1858752568180111020}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: e0d7e200050717841bcbe05960f0cdaa, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1875136852725978709
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -478,7 +553,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4865821490799521177
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -553,7 +628,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3983301305061135927
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1538,6 +1613,81 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0.006299, y: -80.04846}
|
||||
m_SizeDelta: {x: 1921, y: 862.9272}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5862232987492218395
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5292687000354118176}
|
||||
- component: {fileID: 8402835058397630801}
|
||||
- component: {fileID: 8929010238185397383}
|
||||
m_Layer: 5
|
||||
m_Name: Image_Fraction05
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5292687000354118176
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5862232987492218395}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4204482891361932937}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -311.1461, y: 132.50037}
|
||||
m_SizeDelta: {x: 50, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8402835058397630801
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5862232987492218395}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8929010238185397383
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5862232987492218395}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: e0d7e200050717841bcbe05960f0cdaa, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &6165721152009700768
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1573,6 +1723,10 @@ RectTransform:
|
|||
- {fileID: 4865821490799521177}
|
||||
- {fileID: 9129734954834219579}
|
||||
- {fileID: 3983301305061135927}
|
||||
- {fileID: 6235097813498225866}
|
||||
- {fileID: 5292687000354118176}
|
||||
- {fileID: 681172772597129034}
|
||||
- {fileID: 1893520263844099147}
|
||||
- {fileID: 2526832837051589845}
|
||||
m_Father: {fileID: 4950598648052000355}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -1581,6 +1735,156 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 1.1253, y: 180.5}
|
||||
m_SizeDelta: {x: 1918.8, y: 313}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6894964161099680006
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6235097813498225866}
|
||||
- component: {fileID: 595681953875369187}
|
||||
- component: {fileID: 5842368395478576069}
|
||||
m_Layer: 5
|
||||
m_Name: Image_Fraction04
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6235097813498225866
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6894964161099680006}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4204482891361932937}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -375.1461, y: 132.50037}
|
||||
m_SizeDelta: {x: 50, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &595681953875369187
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6894964161099680006}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5842368395478576069
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6894964161099680006}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: e0d7e200050717841bcbe05960f0cdaa, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &6970679755322975953
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 681172772597129034}
|
||||
- component: {fileID: 1389755254598776156}
|
||||
- component: {fileID: 6544552702962226077}
|
||||
m_Layer: 5
|
||||
m_Name: Image_Fraction06
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &681172772597129034
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6970679755322975953}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4204482891361932937}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -247.1461, y: 132.50037}
|
||||
m_SizeDelta: {x: 50, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1389755254598776156
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6970679755322975953}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6544552702962226077
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6970679755322975953}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: e0d7e200050717841bcbe05960f0cdaa, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &6977235228824984489
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2155,7 +2459,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &9129734954834219579
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ public class TeamEditManager : Singlenton<TeamEditManager>, IInitable
|
|||
private const int MAX_TEAM_COUNT = 10;
|
||||
private List<Team> _teamList;
|
||||
private Team _selectTeam;
|
||||
private int _selectTeamIdx;
|
||||
private TeamPreviewNode _teamPreviewNode;
|
||||
public static readonly List<string> PreviewNodeOpenList = new List<string>();
|
||||
|
||||
|
|
@ -51,7 +52,7 @@ public class TeamEditManager : Singlenton<TeamEditManager>, IInitable
|
|||
DebugUtil.LogError("当前没有任何编队");
|
||||
return null;
|
||||
}
|
||||
_selectTeam = _teamList[0];
|
||||
_selectTeam = _teamList[_selectTeamIdx];
|
||||
return _selectTeam;
|
||||
}
|
||||
|
||||
|
|
@ -114,6 +115,9 @@ public class TeamEditManager : Singlenton<TeamEditManager>, IInitable
|
|||
{
|
||||
DebugUtil.LogError("----- 当前编队列表为空，请检查！！！-----");
|
||||
}
|
||||
|
||||
_selectTeamIdx = (int)idx;
|
||||
|
||||
for (int i = 0; i < _teamList.Count; i++)
|
||||
{
|
||||
if (_teamList[i].TeamIndex == idx)
|
||||
|
|
@ -121,6 +125,10 @@ public class TeamEditManager : Singlenton<TeamEditManager>, IInitable
|
|||
_selectTeam = _teamList[i];
|
||||
}
|
||||
}
|
||||
|
||||
var defaultIdx = StorageMgr.Instance.GetStorage<int>("DefaultTeamIndex");
|
||||
defaultIdx = _selectTeamIdx;
|
||||
StorageMgr.Instance.SyncForce = true;
|
||||
}
|
||||
|
||||
public void SaveTeam(Team team)
|
||||
|
|
@ -231,6 +239,9 @@ public class TeamEditManager : Singlenton<TeamEditManager>, IInitable
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
var storeIdx = StorageMgr.Instance.GetStorage<int>("DefaultTeamIndex");
|
||||
_selectTeamIdx = storeIdx;
|
||||
}
|
||||
|
||||
private void OnTeamUpdate()
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@ using Framework;
|
|||
using PhxhSDK;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using Utils;
|
||||
using Utils.Bounds;
|
||||
using ScrollView = AillieoUtils.ScrollView;
|
||||
using Button = UnityEngine.UI.Button;
|
||||
using Image = UnityEngine.UI.Image;
|
||||
using AillieoUtils;
|
||||
|
||||
public class UI_TeamChooseController : UIWindow
|
||||
{
|
||||
|
|
@ -149,9 +151,28 @@ public class UI_TeamChooseController : UIWindow
|
|||
img.sprite = await AssetManager.Instance.LoadAssetAsync<Sprite>(imgStr);
|
||||
}
|
||||
|
||||
RefreshBounds(go, team);
|
||||
|
||||
ClearBind(button);
|
||||
BindButton(button, OnClickItem, index);
|
||||
}
|
||||
|
||||
void RefreshBounds(GameObject go, Team team)
|
||||
{
|
||||
var triggerBoundsInfo = BoundsManager.instance.GetTeamTriggerBounds(team);
|
||||
int count = triggerBoundsInfo.boundsCountList.Count;
|
||||
|
||||
int i = 1;
|
||||
while (i < 8)
|
||||
{
|
||||
var img = CommonUtils.GetComponent<Image>(go, "Image_Fraction0" + i);
|
||||
if (!img)
|
||||
{
|
||||
break;
|
||||
}
|
||||
img.gameObject.SetActive(i++ <= count);
|
||||
}
|
||||
}
|
||||
|
||||
int GetCountFunc()
|
||||
{
|
||||
|
|
@ -170,6 +191,7 @@ public class UI_TeamChooseController : UIWindow
|
|||
var button = Utils.CommonUtils.GetGameObject(obj, "Button_Edit");
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 监听事件
|
||||
|
|
|
|||
Loading…
Reference in New Issue