队伍次序交换 数据逻辑层方法完善
This commit is contained in:
@@ -1615,10 +1615,10 @@ RectTransform:
|
|||||||
- {fileID: 960238621}
|
- {fileID: 960238621}
|
||||||
m_Father: {fileID: 1704085229}
|
m_Father: {fileID: 1704085229}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 276, y: -366}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 180, y: 240}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &190161137
|
--- !u!1 &190161137
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -1968,10 +1968,10 @@ RectTransform:
|
|||||||
- {fileID: 1400477542}
|
- {fileID: 1400477542}
|
||||||
m_Father: {fileID: 1704085229}
|
m_Father: {fileID: 1704085229}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 94, y: -366}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 180, y: 240}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &269656317
|
--- !u!1 &269656317
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -2470,10 +2470,10 @@ RectTransform:
|
|||||||
- {fileID: 269656318}
|
- {fileID: 269656318}
|
||||||
m_Father: {fileID: 1704085229}
|
m_Father: {fileID: 1704085229}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 458, y: -124}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 180, y: 240}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &323084114
|
--- !u!1 &323084114
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -6920,6 +6920,8 @@ GameObject:
|
|||||||
- component: {fileID: 758722711}
|
- component: {fileID: 758722711}
|
||||||
- component: {fileID: 758722713}
|
- component: {fileID: 758722713}
|
||||||
- component: {fileID: 758722712}
|
- component: {fileID: 758722712}
|
||||||
|
- component: {fileID: 758722715}
|
||||||
|
- component: {fileID: 758722714}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Fifth
|
m_Name: Fifth
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -6986,6 +6988,78 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 758722710}
|
m_GameObject: {fileID: 758722710}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &758722714
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 758722710}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 758722712}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 758722715}
|
||||||
|
m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
|
||||||
|
m_MethodName: SetSelected
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
--- !u!114 &758722715
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 758722710}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
character: {fileID: 758722710}
|
||||||
|
controlButton: {fileID: 1765070893}
|
||||||
|
isSelected: 0
|
||||||
|
listIndex: 4
|
||||||
--- !u!1 &767757087
|
--- !u!1 &767757087
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -7859,6 +7933,7 @@ GameObject:
|
|||||||
- component: {fileID: 827262132}
|
- component: {fileID: 827262132}
|
||||||
- component: {fileID: 827262131}
|
- component: {fileID: 827262131}
|
||||||
- component: {fileID: 827262133}
|
- component: {fileID: 827262133}
|
||||||
|
- component: {fileID: 827262134}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: GameManager
|
m_Name: GameManager
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -7927,6 +8002,21 @@ MonoBehaviour:
|
|||||||
- {fileID: 918299813}
|
- {fileID: 918299813}
|
||||||
- {fileID: 290113371}
|
- {fileID: 290113371}
|
||||||
- {fileID: 265276638}
|
- {fileID: 265276638}
|
||||||
|
--- !u!114 &827262134
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 827262130}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: debeba9c3c2f7334ab04c769534a1f85, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
teamSettingPanelInstance: {fileID: 0}
|
||||||
|
currentSelectedTeam: 0
|
||||||
|
currentSelectedCharacter: -1
|
||||||
--- !u!1 &827888148
|
--- !u!1 &827888148
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -9336,10 +9426,10 @@ RectTransform:
|
|||||||
- {fileID: 341481672}
|
- {fileID: 341481672}
|
||||||
m_Father: {fileID: 1704085229}
|
m_Father: {fileID: 1704085229}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 276, y: -124}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 180, y: 240}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &928623233
|
--- !u!1 &928623233
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -10297,6 +10387,8 @@ GameObject:
|
|||||||
- component: {fileID: 1035003398}
|
- component: {fileID: 1035003398}
|
||||||
- component: {fileID: 1035003400}
|
- component: {fileID: 1035003400}
|
||||||
- component: {fileID: 1035003399}
|
- component: {fileID: 1035003399}
|
||||||
|
- component: {fileID: 1035003402}
|
||||||
|
- component: {fileID: 1035003401}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Third
|
m_Name: Third
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -10363,6 +10455,78 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1035003397}
|
m_GameObject: {fileID: 1035003397}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1035003401
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1035003397}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 1035003399}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1035003402}
|
||||||
|
m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
|
||||||
|
m_MethodName: SetSelected
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
--- !u!114 &1035003402
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1035003397}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
character: {fileID: 1035003397}
|
||||||
|
controlButton: {fileID: 497519934}
|
||||||
|
isSelected: 0
|
||||||
|
listIndex: 2
|
||||||
--- !u!1 &1039149939
|
--- !u!1 &1039149939
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -13397,10 +13561,10 @@ RectTransform:
|
|||||||
- {fileID: 1224014391}
|
- {fileID: 1224014391}
|
||||||
m_Father: {fileID: 1704085229}
|
m_Father: {fileID: 1704085229}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 458, y: -366}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 180, y: 240}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &1466300096
|
--- !u!1 &1466300096
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -14587,6 +14751,8 @@ GameObject:
|
|||||||
- component: {fileID: 1559911323}
|
- component: {fileID: 1559911323}
|
||||||
- component: {fileID: 1559911325}
|
- component: {fileID: 1559911325}
|
||||||
- component: {fileID: 1559911324}
|
- component: {fileID: 1559911324}
|
||||||
|
- component: {fileID: 1559911327}
|
||||||
|
- component: {fileID: 1559911326}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Second
|
m_Name: Second
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -14653,6 +14819,78 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1559911322}
|
m_GameObject: {fileID: 1559911322}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1559911326
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1559911322}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 1559911324}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1559911327}
|
||||||
|
m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
|
||||||
|
m_MethodName: SetSelected
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
--- !u!114 &1559911327
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1559911322}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
character: {fileID: 1559911322}
|
||||||
|
controlButton: {fileID: 1553367977}
|
||||||
|
isSelected: 0
|
||||||
|
listIndex: 1
|
||||||
--- !u!1 &1579379734
|
--- !u!1 &1579379734
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -16362,6 +16600,8 @@ GameObject:
|
|||||||
- component: {fileID: 1712599087}
|
- component: {fileID: 1712599087}
|
||||||
- component: {fileID: 1712599089}
|
- component: {fileID: 1712599089}
|
||||||
- component: {fileID: 1712599088}
|
- component: {fileID: 1712599088}
|
||||||
|
- component: {fileID: 1712599091}
|
||||||
|
- component: {fileID: 1712599090}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Leader
|
m_Name: Leader
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -16428,6 +16668,78 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1712599086}
|
m_GameObject: {fileID: 1712599086}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1712599090
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1712599086}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 1712599088}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1712599091}
|
||||||
|
m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
|
||||||
|
m_MethodName: SetSelected
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
--- !u!114 &1712599091
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1712599086}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
character: {fileID: 1712599086}
|
||||||
|
controlButton: {fileID: 471720400}
|
||||||
|
isSelected: 0
|
||||||
|
listIndex: 0
|
||||||
--- !u!1 &1731149482
|
--- !u!1 &1731149482
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -16439,6 +16751,8 @@ GameObject:
|
|||||||
- component: {fileID: 1731149483}
|
- component: {fileID: 1731149483}
|
||||||
- component: {fileID: 1731149485}
|
- component: {fileID: 1731149485}
|
||||||
- component: {fileID: 1731149484}
|
- component: {fileID: 1731149484}
|
||||||
|
- component: {fileID: 1731149487}
|
||||||
|
- component: {fileID: 1731149486}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Fourth
|
m_Name: Fourth
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -16505,6 +16819,78 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1731149482}
|
m_GameObject: {fileID: 1731149482}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1731149486
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1731149482}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 1731149484}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1731149487}
|
||||||
|
m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
|
||||||
|
m_MethodName: SetSelected
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
--- !u!114 &1731149487
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1731149482}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
character: {fileID: 1731149482}
|
||||||
|
controlButton: {fileID: 449127338}
|
||||||
|
isSelected: 0
|
||||||
|
listIndex: 3
|
||||||
--- !u!1 &1734497824
|
--- !u!1 &1734497824
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -18552,10 +18938,10 @@ RectTransform:
|
|||||||
- {fileID: 1005912080}
|
- {fileID: 1005912080}
|
||||||
m_Father: {fileID: 1704085229}
|
m_Father: {fileID: 1704085229}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 94, y: -124}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 180, y: 240}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &1987921078
|
--- !u!1 &1987921078
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|||||||
@@ -32,4 +32,23 @@ public class teamCharacterView : MonoBehaviour
|
|||||||
if(TeamManager.Instance.currentSelectedCharacter==this.listIndex)
|
if(TeamManager.Instance.currentSelectedCharacter==this.listIndex)
|
||||||
TeamManager.Instance.setCurrentSelectedCharacterInTeam(-1);
|
TeamManager.Instance.setCurrentSelectedCharacterInTeam(-1);
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 将当前队伍选中角色向下交换位置
|
||||||
|
/// </summary>
|
||||||
|
public void downChangeTeamElementIndex()
|
||||||
|
{
|
||||||
|
if (this.isSelected == false) return;
|
||||||
|
if(this.listIndex == teamSettingPanel.Instance.teamElementsObj.Length-1) return;
|
||||||
|
TeamManager.Instance.swapTeamElements(this.listIndex,this.listIndex+1);
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 将当前队伍选中角色向上交换位置
|
||||||
|
/// </summary>
|
||||||
|
public void upChangeTeamElementIndex()
|
||||||
|
{
|
||||||
|
if (this.isSelected == false) return;
|
||||||
|
if (this.listIndex == 0) return;
|
||||||
|
TeamManager.Instance.swapTeamElements(this.listIndex, this.listIndex - 1);
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,13 +44,7 @@ public class teamSettingPanel : MonoBehaviour
|
|||||||
}
|
}
|
||||||
public void openTeamSettingPanel()
|
public void openTeamSettingPanel()
|
||||||
{
|
{
|
||||||
Debug.Log("打开编队设置面板");
|
updateTeamSettingElements();
|
||||||
//todo:向teamManager拉取已有编队信息,把视图初始化为对应的编队信息
|
|
||||||
List<Character> currentTeam = teamManager.getCurrentTeam();
|
|
||||||
foreach (Character character in currentTeam)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
//根据获取的队伍信息处理ui组件
|
//根据获取的队伍信息处理ui组件
|
||||||
//可在此补充ui动画信息
|
//可在此补充ui动画信息
|
||||||
teamSettingPanelObj.SetActive(true);
|
teamSettingPanelObj.SetActive(true);
|
||||||
@@ -60,6 +54,11 @@ public class teamSettingPanel : MonoBehaviour
|
|||||||
public void updateTeamSettingElements()
|
public void updateTeamSettingElements()
|
||||||
{
|
{
|
||||||
//todo:向保存编队信息的类获取编队信息,然后重新处理teamElementsObj的信息
|
//todo:向保存编队信息的类获取编队信息,然后重新处理teamElementsObj的信息
|
||||||
|
List<Character> currentTeam = teamManager.getCurrentTeam();
|
||||||
|
// foreach (Character character in currentTeam)
|
||||||
|
// {
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -92,5 +91,12 @@ public class teamSettingPanel : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 若玩家更换了team成员或调整了team成员顺序,则使用此方法更新view
|
||||||
|
/// </summary>
|
||||||
|
public void updateTeamStatus()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 34e2f32e0653f2e45b65f7266beb8ec4
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -50,11 +50,19 @@ public class TeamManager : MonoBehaviour
|
|||||||
{
|
{
|
||||||
currentTeamSettings = playerTeamSettings;
|
currentTeamSettings = playerTeamSettings;
|
||||||
}
|
}
|
||||||
public List<Character> getCurrentTeam()
|
/// <summary>
|
||||||
|
/// 依据选定的队伍预设索引来获得队伍信息
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public List<Character> getCurrentSelectedTeam()
|
||||||
{
|
{
|
||||||
return currentTeamSettings[currentSelectedTeam];
|
return currentTeamSettings[currentSelectedTeam];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setCurrentSelectedTeam(List<Character> newTeamData, int teamIndex)
|
||||||
|
{
|
||||||
|
currentTeamSettings[teamIndex] = newTeamData;
|
||||||
|
}
|
||||||
public void setCurrentSelectedCharacterInTeam(int characterIndex)
|
public void setCurrentSelectedCharacterInTeam(int characterIndex)
|
||||||
{
|
{
|
||||||
if (characterIndex != currentSelectedCharacter)
|
if (characterIndex != currentSelectedCharacter)
|
||||||
@@ -63,6 +71,20 @@ public class TeamManager : MonoBehaviour
|
|||||||
OnSelectedCharacterChanged?.Invoke(); // 触发事件
|
OnSelectedCharacterChanged?.Invoke(); // 触发事件
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 交换指定索引中的两个队伍中元素的位置
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="firstIndex"></param>
|
||||||
|
/// <param name="secondIndex"></param>
|
||||||
|
public void swapTeamElements(int firstIndex, int secondIndex)
|
||||||
|
{
|
||||||
|
List<Character> newCurrentTeam = getCurrentSelectedTeam();
|
||||||
|
Character temp = newCurrentTeam[firstIndex];
|
||||||
|
newCurrentTeam[firstIndex] = newCurrentTeam[secondIndex];
|
||||||
|
newCurrentTeam[secondIndex] = temp;
|
||||||
|
currentTeamSettings[currentSelectedTeam] = newCurrentTeam;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update()
|
void Update()
|
||||||
|
|||||||
Reference in New Issue
Block a user