diff --git a/Assets/Scenes/Songs_Select.unity b/Assets/Scenes/Songs_Select.unity
index 229ddecc..104a8428 100644
--- a/Assets/Scenes/Songs_Select.unity
+++ b/Assets/Scenes/Songs_Select.unity
@@ -441,6 +441,11 @@ MonoBehaviour:
- {fileID: 1221530200}
- {fileID: 826634046}
- {fileID: 973852806}
+ teamSettingButtonStatusObj:
+ - {fileID: 794441818}
+ - {fileID: 1805718612}
+ - {fileID: 2104869984}
+ - {fileID: 663054736}
teamCharacterList: {fileID: 11400000, guid: 74a349c5a048ac54da419a61dabd9ab6, type: 2}
teamCharacterLevelData: {fileID: 11400000, guid: c36bd33a1b5f5f34d9b0d2750119d910, type: 2}
teamCharacterPrefab: {fileID: 2949374534111508497, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3}
@@ -1311,7 +1316,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 164420414}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 1221530203}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: setLeader
+ 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 &164420414
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1592,9 +1609,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: downChangeCharcterIndex
+ - m_Target: {fileID: 1221530203}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: downChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -2197,6 +2214,7 @@ GameObject:
- component: {fileID: 301660373}
- component: {fileID: 301660375}
- component: {fileID: 301660374}
+ - component: {fileID: 301660376}
m_Layer: 5
m_Name: middle
m_TagString: Untagged
@@ -2261,6 +2279,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 301660372}
m_CullTransparentMesh: 1
+--- !u!114 &301660376
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 301660372}
+ 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: 301660374}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 973852809}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: SetUnSelected
+ 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!1 &323084114
GameObject:
m_ObjectHideFlags: 0
@@ -2371,7 +2445,7 @@ RectTransform:
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: 361, y: 152}
+ m_AnchoredPosition: {x: 331, y: -10}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &325740965
@@ -3136,126 +3210,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 430223020}
m_CullTransparentMesh: 1
---- !u!1 &435270332
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 435270333}
- - component: {fileID: 435270336}
- - component: {fileID: 435270335}
- - component: {fileID: 435270334}
- m_Layer: 5
- m_Name: team2
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &435270333
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 435270332}
- 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: 456326458}
- 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: 460, y: 430.75998}
- m_SizeDelta: {x: 59.5739, y: 55.4842}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &435270334
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 435270332}
- 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: 435270335}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &435270335
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 435270332}
- 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: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 315465ee4b6553b40aafdce4955584b2, 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!222 &435270336
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 435270332}
- m_CullTransparentMesh: 1
--- !u!1 &435448797
GameObject:
m_ObjectHideFlags: 0
@@ -3412,7 +3366,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 443831638}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 16906201}
+ m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
+ m_MethodName: leftChangeTeamSettingIndex
+ 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 &443831638
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3556,9 +3522,9 @@ RectTransform:
m_Children:
- {fileID: 443831636}
- {fileID: 794441813}
- - {fileID: 435270333}
- - {fileID: 1579379735}
- - {fileID: 767757088}
+ - {fileID: 1805718608}
+ - {fileID: 2104869980}
+ - {fileID: 663054732}
- {fileID: 1857750211}
m_Father: {fileID: 212928031}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3649,9 +3615,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: upChangeCharcterIndex
+ - m_Target: {fileID: 973852809}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: upChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -3748,6 +3714,7 @@ GameObject:
- component: {fileID: 472917044}
- component: {fileID: 472917046}
- component: {fileID: 472917045}
+ - component: {fileID: 472917047}
m_Layer: 5
m_Name: middle
m_TagString: Untagged
@@ -3812,6 +3779,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 472917043}
m_CullTransparentMesh: 1
+--- !u!114 &472917047
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 472917043}
+ 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: 472917045}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 826634049}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: SetUnSelected
+ 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!1 &481579045
GameObject:
m_ObjectHideFlags: 0
@@ -4032,6 +4055,7 @@ GameObject:
- component: {fileID: 492571257}
- component: {fileID: 492571259}
- component: {fileID: 492571258}
+ - component: {fileID: 492571260}
m_Layer: 5
m_Name: Character
m_TagString: Untagged
@@ -4096,6 +4120,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 492571256}
m_CullTransparentMesh: 1
+--- !u!114 &492571260
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 492571256}
+ 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: 1221530204}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1221530203}
+ 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!1 &495389257
GameObject:
m_ObjectHideFlags: 0
@@ -4926,6 +5006,7 @@ GameObject:
- component: {fileID: 566414044}
- component: {fileID: 566414046}
- component: {fileID: 566414045}
+ - component: {fileID: 566414047}
m_Layer: 5
m_Name: middle
m_TagString: Untagged
@@ -4990,6 +5071,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 566414043}
m_CullTransparentMesh: 1
+--- !u!114 &566414047
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 566414043}
+ 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: 566414045}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 847674721}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: SetUnSelected
+ 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!1 &585142735
GameObject:
m_ObjectHideFlags: 0
@@ -5001,6 +5138,7 @@ GameObject:
- component: {fileID: 585142736}
- component: {fileID: 585142738}
- component: {fileID: 585142737}
+ - component: {fileID: 585142739}
m_Layer: 5
m_Name: Character
m_TagString: Untagged
@@ -5065,6 +5203,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 585142735}
m_CullTransparentMesh: 1
+--- !u!114 &585142739
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 585142735}
+ 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: 826634050}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 826634049}
+ 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!1 &587893952
GameObject:
m_ObjectHideFlags: 0
@@ -5147,9 +5341,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: upChangeCharcterIndex
+ - m_Target: {fileID: 1221530203}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: upChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -5889,6 +6083,155 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
scene_turn_to_previous_scene: selectYourSongFirst
+--- !u!1 &663054731
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 663054732}
+ - component: {fileID: 663054735}
+ - component: {fileID: 663054734}
+ - component: {fileID: 663054733}
+ - component: {fileID: 663054736}
+ m_Layer: 5
+ m_Name: team3
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &663054732
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 663054731}
+ 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:
+ - {fileID: 1879916749}
+ m_Father: {fileID: 456326458}
+ 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: 600, y: 430.75998}
+ m_SizeDelta: {x: 59.5739, y: 55.4842}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &663054733
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 663054731}
+ 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: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 315465ee4b6553b40aafdce4955584b2, 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!114 &663054734
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 663054731}
+ 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: 663054733}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 663054736}
+ m_TargetAssemblyTypeName: TeamIndexSetterView, Assembly-CSharp
+ m_MethodName: setTeamSettingSelect
+ 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!222 &663054735
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 663054731}
+ m_CullTransparentMesh: 1
+--- !u!114 &663054736
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 663054731}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0d151f3d4bd3448bb723df28d9eeb028, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ isSelectedStatus: {fileID: 1879916748}
+ isSelected: 0
+ index: 3
--- !u!1 &673773722
GameObject:
m_ObjectHideFlags: 0
@@ -6890,126 +7233,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 755002826}
m_CullTransparentMesh: 1
---- !u!1 &767757087
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 767757088}
- - component: {fileID: 767757091}
- - component: {fileID: 767757090}
- - component: {fileID: 767757089}
- m_Layer: 5
- m_Name: team4
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &767757088
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 767757087}
- 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: 456326458}
- 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: 600, y: 430.75998}
- m_SizeDelta: {x: 59.5739, y: 55.4842}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &767757089
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 767757087}
- 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: 767757090}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &767757090
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 767757087}
- 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: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 315465ee4b6553b40aafdce4955584b2, 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!222 &767757091
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 767757087}
- m_CullTransparentMesh: 1
--- !u!1 &777622825
GameObject:
m_ObjectHideFlags: 0
@@ -7313,10 +7536,11 @@ GameObject:
m_Component:
- component: {fileID: 794441813}
- component: {fileID: 794441816}
- - component: {fileID: 794441815}
- component: {fileID: 794441814}
+ - component: {fileID: 794441817}
+ - component: {fileID: 794441818}
m_Layer: 5
- m_Name: team1
+ m_Name: team0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -7333,7 +7557,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 1559432153}
m_Father: {fileID: 456326458}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -7381,11 +7606,31 @@ MonoBehaviour:
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
- m_TargetGraphic: {fileID: 794441815}
+ m_TargetGraphic: {fileID: 794441817}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
---- !u!114 &794441815
+ m_Calls:
+ - m_Target: {fileID: 794441818}
+ m_TargetAssemblyTypeName: TeamIndexSetterView, Assembly-CSharp
+ m_MethodName: setTeamSettingSelect
+ 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!222 &794441816
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 794441812}
+ m_CullTransparentMesh: 1
+--- !u!114 &794441817
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -7405,7 +7650,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: ba9489b583d7e7a41bb8183a9d392c3d, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 315465ee4b6553b40aafdce4955584b2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -7415,14 +7660,21 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!222 &794441816
-CanvasRenderer:
+--- !u!114 &794441818
+MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 794441812}
- m_CullTransparentMesh: 1
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0d151f3d4bd3448bb723df28d9eeb028, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ isSelectedStatus: {fileID: 1559432152}
+ isSelected: 0
+ index: 0
--- !u!1 &797414965
GameObject:
m_ObjectHideFlags: 0
@@ -7580,9 +7832,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: upChangeCharcterIndex
+ - m_Target: {fileID: 847674721}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: upChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -7776,7 +8028,6 @@ GameObject:
- component: {fileID: 826634051}
- component: {fileID: 826634050}
- component: {fileID: 826634049}
- - component: {fileID: 826634048}
m_Layer: 5
m_Name: Fourth
m_TagString: Untagged
@@ -7798,9 +8049,9 @@ RectTransform:
m_Children:
- {fileID: 1026893375}
- {fileID: 1243909239}
- - {fileID: 993954738}
- - {fileID: 1607855918}
- {fileID: 585142736}
+ - {fileID: 1607855918}
+ - {fileID: 993954738}
- {fileID: 2087826252}
m_Father: {fileID: 1853914745}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7809,62 +8060,6 @@ RectTransform:
m_AnchoredPosition: {x: 330, y: -206}
m_SizeDelta: {x: 826.6862, y: 157.881}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &826634048
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 826634046}
- 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: 826634050}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 826634049}
- 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 &826634049
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -8244,7 +8439,6 @@ GameObject:
- component: {fileID: 847674723}
- component: {fileID: 847674722}
- component: {fileID: 847674721}
- - component: {fileID: 847674720}
m_Layer: 5
m_Name: Second
m_TagString: Untagged
@@ -8265,9 +8459,9 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 848812487}
- - {fileID: 2044499927}
- - {fileID: 1530573771}
- {fileID: 1800876331}
+ - {fileID: 1530573771}
+ - {fileID: 2044499927}
- {fileID: 839320576}
- {fileID: 1159523089}
m_Father: {fileID: 1853914745}
@@ -8277,62 +8471,6 @@ RectTransform:
m_AnchoredPosition: {x: 390, y: 116}
m_SizeDelta: {x: 826.6862, y: 157.881}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &847674720
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 847674718}
- 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: 847674722}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 847674721}
- 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 &847674721
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -8920,9 +9058,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: downChangeCharcterIndex
+ - m_Target: {fileID: 1712599091}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: downChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -9643,7 +9781,6 @@ GameObject:
- component: {fileID: 973852811}
- component: {fileID: 973852810}
- component: {fileID: 973852809}
- - component: {fileID: 973852808}
m_Layer: 5
m_Name: Fifth
m_TagString: Untagged
@@ -9665,9 +9802,9 @@ RectTransform:
m_Children:
- {fileID: 534532749}
- {fileID: 2082407421}
- - {fileID: 1374386276}
- - {fileID: 1713384186}
- {fileID: 1228437758}
+ - {fileID: 1713384186}
+ - {fileID: 1374386276}
- {fileID: 1184725131}
m_Father: {fileID: 1853914745}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9676,62 +9813,6 @@ RectTransform:
m_AnchoredPosition: {x: 300, y: -370}
m_SizeDelta: {x: 826.6862, y: 157.881}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &973852808
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 973852806}
- 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: 973852810}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 973852809}
- 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 &973852809
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -12332,7 +12413,6 @@ GameObject:
- component: {fileID: 1221530205}
- component: {fileID: 1221530204}
- component: {fileID: 1221530203}
- - component: {fileID: 1221530202}
m_Layer: 5
m_Name: Third
m_TagString: Untagged
@@ -12354,9 +12434,9 @@ RectTransform:
m_Children:
- {fileID: 2061794729}
- {fileID: 1902451276}
- - {fileID: 325740964}
- - {fileID: 164420412}
- {fileID: 492571257}
+ - {fileID: 164420412}
+ - {fileID: 325740964}
- {fileID: 751424666}
m_Father: {fileID: 1853914745}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -12365,62 +12445,6 @@ RectTransform:
m_AnchoredPosition: {x: 360, y: -46}
m_SizeDelta: {x: 826.6862, y: 157.881}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1221530202
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1221530200}
- 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: 1221530204}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 1221530203}
- 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 &1221530203
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -12492,6 +12516,7 @@ GameObject:
- component: {fileID: 1228437758}
- component: {fileID: 1228437760}
- component: {fileID: 1228437759}
+ - component: {fileID: 1228437761}
m_Layer: 5
m_Name: Character
m_TagString: Untagged
@@ -12556,6 +12581,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1228437757}
m_CullTransparentMesh: 1
+--- !u!114 &1228437761
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1228437757}
+ 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: 973852810}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 973852809}
+ 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!1 &1235967462
GameObject:
m_ObjectHideFlags: 0
@@ -13199,9 +13280,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: upChangeCharcterIndex
+ - m_Target: {fileID: 1712599091}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: upChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -13331,9 +13412,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: upChangeCharcterIndex
+ - m_Target: {fileID: 826634049}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: upChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -14275,7 +14356,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1530573770}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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
@@ -14330,7 +14411,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1530573773}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 847674721}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: setLeader
+ 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 &1530573773
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -14589,6 +14682,7 @@ GameObject:
- component: {fileID: 1553631138}
- component: {fileID: 1553631140}
- component: {fileID: 1553631139}
+ - component: {fileID: 1553631141}
m_Layer: 5
m_Name: middle
m_TagString: Untagged
@@ -14653,6 +14747,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1553631137}
m_CullTransparentMesh: 1
+--- !u!114 &1553631141
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1553631137}
+ 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: 1553631139}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1712599091}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: SetUnSelected
+ 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!1 &1554155785
GameObject:
m_ObjectHideFlags: 0
@@ -14787,6 +14937,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1554155785}
m_CullTransparentMesh: 1
+--- !u!1 &1559432152
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1559432153}
+ - component: {fileID: 1559432155}
+ - component: {fileID: 1559432154}
+ m_Layer: 5
+ m_Name: BeSelected
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1559432153
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1559432152}
+ 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: 794441813}
+ 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: -0.00018883, y: 0.0001049}
+ m_SizeDelta: {x: 59.573, y: 55.484}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1559432154
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1559432152}
+ 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: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: ba9489b583d7e7a41bb8183a9d392c3d, 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!222 &1559432155
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1559432152}
+ m_CullTransparentMesh: 1
--- !u!1 &1559516010
GameObject:
m_ObjectHideFlags: 0
@@ -14862,7 +15087,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1559516010}
m_CullTransparentMesh: 1
---- !u!1 &1579379734
+--- !u!1 &1566398228
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -14870,87 +15095,42 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1579379735}
- - component: {fileID: 1579379738}
- - component: {fileID: 1579379737}
- - component: {fileID: 1579379736}
+ - component: {fileID: 1566398229}
+ - component: {fileID: 1566398231}
+ - component: {fileID: 1566398230}
m_Layer: 5
- m_Name: team3
+ m_Name: BeSelected
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1579379735
+ m_IsActive: 0
+--- !u!224 &1566398229
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1579379734}
+ m_GameObject: {fileID: 1566398228}
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: 456326458}
+ m_Father: {fileID: 2104869980}
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: 530, y: 430.75998}
- m_SizeDelta: {x: 59.5739, y: 55.4842}
+ m_AnchoredPosition: {x: -0.00018883, y: 0.0001049}
+ m_SizeDelta: {x: 59.573, y: 55.484}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1579379736
+--- !u!114 &1566398230
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1579379734}
- 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: 1579379737}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &1579379737
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1579379734}
+ m_GameObject: {fileID: 1566398228}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -14964,7 +15144,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 315465ee4b6553b40aafdce4955584b2, type: 3}
+ m_Sprite: {fileID: 21300000, guid: ba9489b583d7e7a41bb8183a9d392c3d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -14974,13 +15154,13 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!222 &1579379738
+--- !u!222 &1566398231
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1579379734}
+ m_GameObject: {fileID: 1566398228}
m_CullTransparentMesh: 1
--- !u!1 &1593528871
GameObject:
@@ -15110,7 +15290,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1607855920}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 826634049}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: setLeader
+ 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 &1607855920
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -15728,6 +15920,7 @@ GameObject:
- component: {fileID: 1668142720}
- component: {fileID: 1668142722}
- component: {fileID: 1668142721}
+ - component: {fileID: 1668142723}
m_Layer: 5
m_Name: middle
m_TagString: Untagged
@@ -15792,6 +15985,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1668142719}
m_CullTransparentMesh: 1
+--- !u!114 &1668142723
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1668142719}
+ 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: 1668142721}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1221530203}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: SetUnSelected
+ 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!1 &1677061991
GameObject:
m_ObjectHideFlags: 0
@@ -16658,7 +16907,6 @@ GameObject:
- component: {fileID: 1712599089}
- component: {fileID: 1712599088}
- component: {fileID: 1712599091}
- - component: {fileID: 1712599090}
m_Layer: 5
m_Name: First
m_TagString: Untagged
@@ -16680,9 +16928,9 @@ RectTransform:
m_Children:
- {fileID: 471720401}
- {fileID: 619102156}
- - {fileID: 12180239}
- - {fileID: 1852342897}
- {fileID: 1974927308}
+ - {fileID: 1852342897}
+ - {fileID: 12180239}
- {fileID: 86375880}
m_Father: {fileID: 1853914745}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -16729,62 +16977,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1712599086}
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
@@ -16888,7 +17080,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1713384188}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 973852809}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: setLeader
+ 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 &1713384188
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -16927,6 +17131,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1713384185}
m_CullTransparentMesh: 1
+--- !u!1 &1734664217
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1734664218}
+ - component: {fileID: 1734664220}
+ - component: {fileID: 1734664219}
+ m_Layer: 5
+ m_Name: BeSelected
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1734664218
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1734664217}
+ 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: 1805718608}
+ 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: -0.00018883, y: 0.0001049}
+ m_SizeDelta: {x: 59.573, y: 55.484}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1734664219
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1734664217}
+ 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: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: ba9489b583d7e7a41bb8183a9d392c3d, 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!222 &1734664220
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1734664217}
+ m_CullTransparentMesh: 1
--- !u!1 &1743298198
GameObject:
m_ObjectHideFlags: 0
@@ -17297,6 +17576,7 @@ GameObject:
- component: {fileID: 1800876331}
- component: {fileID: 1800876333}
- component: {fileID: 1800876332}
+ - component: {fileID: 1800876334}
m_Layer: 5
m_Name: Character
m_TagString: Untagged
@@ -17361,6 +17641,211 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1800876330}
m_CullTransparentMesh: 1
+--- !u!114 &1800876334
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1800876330}
+ 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: 847674722}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 847674721}
+ 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!1 &1805718607
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1805718608}
+ - component: {fileID: 1805718611}
+ - component: {fileID: 1805718610}
+ - component: {fileID: 1805718609}
+ - component: {fileID: 1805718612}
+ m_Layer: 5
+ m_Name: team1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1805718608
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1805718607}
+ 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:
+ - {fileID: 1734664218}
+ m_Father: {fileID: 456326458}
+ 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: 460, y: 430.75998}
+ m_SizeDelta: {x: 59.5739, y: 55.4842}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1805718609
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1805718607}
+ 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: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 315465ee4b6553b40aafdce4955584b2, 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!114 &1805718610
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1805718607}
+ 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: 1805718609}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1805718612}
+ m_TargetAssemblyTypeName: TeamIndexSetterView, Assembly-CSharp
+ m_MethodName: setTeamSettingSelect
+ 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!222 &1805718611
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1805718607}
+ m_CullTransparentMesh: 1
+--- !u!114 &1805718612
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1805718607}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0d151f3d4bd3448bb723df28d9eeb028, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ isSelectedStatus: {fileID: 1734664217}
+ isSelected: 0
+ index: 1
--- !u!1 &1817712226
GameObject:
m_ObjectHideFlags: 0
@@ -17518,9 +18003,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: downChangeCharcterIndex
+ - m_Target: {fileID: 826634049}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: downChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -17586,7 +18071,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1852342897
RectTransform:
m_ObjectHideFlags: 0
@@ -17649,7 +18134,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1852342899}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 1712599091}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: setLeader
+ 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 &1852342899
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -17809,7 +18306,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1857750213}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 16906201}
+ m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
+ m_MethodName: rightChangeTeamSettingIndex
+ 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 &1857750213
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -18030,6 +18539,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1919.6, y: 1079.8}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1879916748
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1879916749}
+ - component: {fileID: 1879916751}
+ - component: {fileID: 1879916750}
+ m_Layer: 5
+ m_Name: BeSelected
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1879916749
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1879916748}
+ 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: 663054732}
+ 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: -0.00018883, y: 0.0001049}
+ m_SizeDelta: {x: 59.573, y: 55.484}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1879916750
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1879916748}
+ 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: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: ba9489b583d7e7a41bb8183a9d392c3d, 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!222 &1879916751
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1879916748}
+ m_CullTransparentMesh: 1
--- !u!1 &1900229336
GameObject:
m_ObjectHideFlags: 0
@@ -18591,9 +19175,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: downChangeCharcterIndex
+ - m_Target: {fileID: 847674721}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: downChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -18833,6 +19417,7 @@ GameObject:
- component: {fileID: 1974927308}
- component: {fileID: 1974927310}
- component: {fileID: 1974927309}
+ - component: {fileID: 1974927311}
m_Layer: 5
m_Name: Character
m_TagString: Untagged
@@ -18897,6 +19482,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1974927307}
m_CullTransparentMesh: 1
+--- !u!114 &1974927311
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1974927307}
+ 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!1 &1975772328
GameObject:
m_ObjectHideFlags: 0
@@ -19165,9 +19806,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp
- m_MethodName: downChangeCharcterIndex
+ - m_Target: {fileID: 973852809}
+ m_TargetAssemblyTypeName: teamCharacterView, Assembly-CSharp
+ m_MethodName: downChangeTeamElementIndex
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -20534,6 +21175,155 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2100028585}
m_CullTransparentMesh: 1
+--- !u!1 &2104869979
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2104869980}
+ - component: {fileID: 2104869983}
+ - component: {fileID: 2104869982}
+ - component: {fileID: 2104869981}
+ - component: {fileID: 2104869984}
+ m_Layer: 5
+ m_Name: team2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2104869980
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2104869979}
+ 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:
+ - {fileID: 1566398229}
+ m_Father: {fileID: 456326458}
+ 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: 530, y: 430.75998}
+ m_SizeDelta: {x: 59.5739, y: 55.4842}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2104869981
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2104869979}
+ 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: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 315465ee4b6553b40aafdce4955584b2, 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!114 &2104869982
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2104869979}
+ 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: 2104869981}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 2104869984}
+ m_TargetAssemblyTypeName: TeamIndexSetterView, Assembly-CSharp
+ m_MethodName: setTeamSettingSelect
+ 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!222 &2104869983
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2104869979}
+ m_CullTransparentMesh: 1
+--- !u!114 &2104869984
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2104869979}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0d151f3d4bd3448bb723df28d9eeb028, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ isSelectedStatus: {fileID: 1566398228}
+ isSelected: 0
+ index: 2
--- !u!1 &2115994377
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/scripts/Team/TeamIndexSetterView.cs b/Assets/scripts/Team/TeamIndexSetterView.cs
new file mode 100644
index 00000000..3d3ddd86
--- /dev/null
+++ b/Assets/scripts/Team/TeamIndexSetterView.cs
@@ -0,0 +1,24 @@
+using System;
+using UnityEngine;
+
+public class TeamIndexSetterView : MonoBehaviour
+{
+ [SerializeField] public GameObject isSelectedStatus;
+ public bool isSelected;
+
+ public int index;
+
+
+
+ public void setTeamSettingSelect()
+ {
+ isSelected = true;
+ isSelectedStatus.SetActive(true);
+ TeamManager.Instance.setCurrentSelectedTeamSetting(index);
+ }
+ public void setUnSelectedTeamSetting()
+ {
+ isSelected = false;
+ isSelectedStatus.SetActive(false);
+ }
+}
diff --git a/Assets/scripts/Team/TeamIndexSetterView.cs.meta b/Assets/scripts/Team/TeamIndexSetterView.cs.meta
new file mode 100644
index 00000000..458de7c3
--- /dev/null
+++ b/Assets/scripts/Team/TeamIndexSetterView.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0d151f3d4bd3448bb723df28d9eeb028
+timeCreated: 1749822972
\ No newline at end of file
diff --git a/Assets/scripts/Team/TeamManager.cs b/Assets/scripts/Team/TeamManager.cs
index 264cd76b..e8b075b7 100644
--- a/Assets/scripts/Team/TeamManager.cs
+++ b/Assets/scripts/Team/TeamManager.cs
@@ -29,7 +29,11 @@ public class TeamManager : MonoBehaviour
/// 在修改被选中的编队中角色的索引时触发
///
public event Action OnSelectedCharacterChanged;
-
+ ///
+ /// 修改选定的预设队伍时触发
+ ///
+ public event Action OnSelectedTeamChanged;
+
void Awake()
{
if (Instance == null)
@@ -55,20 +59,33 @@ public class TeamManager : MonoBehaviour
currentTeamSettings[0].teamIdList.Add(new CharacterView(1001002,"S"));
currentTeamSettings[0].teamIdList.Add(new CharacterView(1001001,"C"));
currentTeamSettings[0].teamIdList.Add( new CharacterView(1001002,"C"));
+ currentTeamSettings[0].teamIdList.Add(new CharacterView(-1,null));
currentTeamSettings.Add(1,new TeamSetting(new List(),1001002));
- currentTeamSettings[0].teamIdList.Add(new CharacterView(1001001,"C"));
- currentTeamSettings[0].teamIdList.Add(new CharacterView(1001002,"B"));
- currentTeamSettings[0].teamIdList.Add(new CharacterView(1001001,"C"));
- currentTeamSettings[0].teamIdList.Add( new CharacterView(1001002,"A"));
- currentTeamSettings[0].teamIdList.Add(new CharacterView(1001002,"A"));
+ currentTeamSettings[1].teamIdList.Add(new CharacterView(1001001,"C"));
+ currentTeamSettings[1].teamIdList.Add(new CharacterView(1001002,"B"));
+ currentTeamSettings[1].teamIdList.Add(new CharacterView(1001001,"C"));
+ currentTeamSettings[1].teamIdList.Add( new CharacterView(1001002,"A"));
+ currentTeamSettings[1].teamIdList.Add(new CharacterView(1001002,"A"));
+
+ currentTeamSettings.Add(2,new TeamSetting(new List(),-1));
+ currentTeamSettings.Add(3,new TeamSetting(new List(),-1));
Debug.Log("testTeamSetting ready");
}
public void openTeamSettingPanel()=> teamSettingPanelInstance.gameObject.SetActive(true);
public void closeTeamSettingPanel()=> teamSettingPanelInstance.gameObject.SetActive(false);
-
+
+ public void setCurrentSelectedTeam(int index)
+ {
+ if (index > 3 || index < 0)
+ {
+ Debug.LogWarning("所选队伍预设索引超出范围");
+ return;
+ }
+ currentSelectedTeam = index;
+ }
void Start()
{
// if(teamSettingPanelInstance == null)
@@ -102,15 +119,26 @@ public class TeamManager : MonoBehaviour
{
if (characterIndex != currentSelectedCharacter)
{
+ Debug.Log($"修改选中对象从{currentSelectedCharacter}到{characterIndex}");
currentSelectedCharacter = characterIndex;
OnSelectedCharacterChanged?.Invoke(); // 触发事件
}
}
+
+ public void setCurrentSelectedTeamSetting(int teamIndex)
+ {
+ if(teamIndex != currentSelectedTeam)
+ {
+ Debug.Log($"修改选中队伍预设从{currentSelectedTeam}到{teamIndex}");
+ currentSelectedTeam = teamIndex;
+ OnSelectedTeamChanged?.Invoke(); // 触发事件
+ }
+ }
///
/// 交换指定索引中的两个队伍中元素的位置
///
- ///
- ///
+ /// 当前元素
+ /// 目标元素位置
public void swapTeamElements(int firstIndex, int secondIndex)
{
List newCurrentTeam = getCurrentSelectedTeam().teamIdList;
@@ -118,12 +146,15 @@ public class TeamManager : MonoBehaviour
newCurrentTeam[firstIndex] = newCurrentTeam[secondIndex];
newCurrentTeam[secondIndex] = temp;
currentTeamSettings[currentSelectedTeam].teamIdList = newCurrentTeam;
+ teamSettingPanelInstance.updateTeamSettingElements();
+ setCurrentSelectedCharacterInTeam(secondIndex);
+ Debug.Log($"swapTeamElements done,当前选中的为{getCurrentSelectedTeam().teamIdList[currentSelectedCharacter].characterId},开始位置是{firstIndex},目标位置是{secondIndex},现在{currentSelectedCharacter}");
}
- // Update is called once per frame
- void Update()
+ public void setTeamLeader(int characterIndex)
{
-
+ getCurrentSelectedTeam().LeaderId = SelectableCharacterList[characterIndex].characterId;
+ teamSettingPanelInstance.updateTeamSettingElements();
}
}
diff --git a/Assets/scripts/Team/TeamSetting.cs b/Assets/scripts/Team/TeamSetting.cs
index ef2c2d2a..a6181f5e 100644
--- a/Assets/scripts/Team/TeamSetting.cs
+++ b/Assets/scripts/Team/TeamSetting.cs
@@ -29,7 +29,7 @@ public class CharacterView
this.characterId = characterId;
this.currentBoundaryLevel = currentBoundaryLevel;
}
-
+ //todo:回头加一个轨道颜色对应
public int characterId{get; set;}
public string currentBoundaryLevel{get; set;}
}
diff --git a/Assets/scripts/Team/teamCharacterView.cs b/Assets/scripts/Team/teamCharacterView.cs
index 6a7d1e0e..b268fee9 100644
--- a/Assets/scripts/Team/teamCharacterView.cs
+++ b/Assets/scripts/Team/teamCharacterView.cs
@@ -65,5 +65,11 @@ public class teamCharacterView : MonoBehaviour
TeamManager.Instance.swapTeamElements(this.listIndex, this.listIndex - 1);
}
+ public void setLeader()
+ {
+ TeamManager.Instance.setTeamLeader(this.listIndex);
+ isLeader.SetActive(true);
+ notLeader.SetActive(false);
+ }
}
diff --git a/Assets/scripts/Team/teamSettingPanel.cs b/Assets/scripts/Team/teamSettingPanel.cs
index 17089372..79dbfb54 100644
--- a/Assets/scripts/Team/teamSettingPanel.cs
+++ b/Assets/scripts/Team/teamSettingPanel.cs
@@ -18,6 +18,10 @@ public class teamSettingPanel : MonoBehaviour
[SerializeField]
public GameObject[] teamElementsObj;
///
+ /// 编队显示上层切换编队预设按钮
+ ///
+ [SerializeField] public TeamIndexSetterView[] teamSettingButtonStatusObj;
+ ///
/// team用角色数据库总表
///
[SerializeField]
@@ -58,6 +62,9 @@ public class teamSettingPanel : MonoBehaviour
if(teamManager!=null)
{
teamManager.OnSelectedCharacterChanged += updateTeamCharacterSelectedStatus;
+
+ teamManager.OnSelectedTeamChanged += updateTeamSettingSelectedStatus;
+ teamManager.OnSelectedTeamChanged += updateTeamSettingElements;
}
updateTeamSettingElements();
updateSelectableCharacterViewList();
@@ -69,48 +76,20 @@ public class teamSettingPanel : MonoBehaviour
if (teamManager != null)
{
teamManager.OnSelectedCharacterChanged -= updateTeamCharacterSelectedStatus;
+
+ teamManager.OnSelectedTeamChanged -= updateTeamSettingSelectedStatus;
+ teamManager.OnSelectedTeamChanged -= updateTeamSettingElements;
}
}
- // public void openTeamSettingPanel()
- // {
- // //根据获取的队伍信息处理ui组件
- // //可在此补充ui动画信息
- // StartCoroutine(UpdateTeamSettingAfterOneFrame());
- // // updateTeamSettingElements();
- // StartCoroutine(UpdateSelectableCharacterAfterOneFrame());
- // teamSettingPanelObj.SetActive(true);
- // // getSelectableCharacterList();
- // }
- // public void closeTeamSettingPanel()
- // {
- // teamSettingPanelObj.SetActive(false);
- // }
- private IEnumerator UpdateTeamSettingAfterOneFrame()
+ ///
+ /// 切换预设编队
+ ///
+ ///
+ public void updateSelectedTeam(int index)
{
- yield return null;
-
+ teamManager.setCurrentSelectedTeam(index);
updateTeamSettingElements();
- foreach (var obj in teamElementsObj)
- {
- if (obj != null)
- {
- var t = obj.GetComponent();
- if (t != null && t.charcterImg != null)
- {
- LayoutRebuilder.ForceRebuildLayoutImmediate(t.charcterImg.rectTransform);
- }
- }
- }
}
- private IEnumerator UpdateSelectableCharacterAfterOneFrame()
- {
- yield return null;
-
- updateSelectableCharacterViewList();
- RectTransform rt = teamCharacterViewContent.GetComponent();
- LayoutRebuilder.ForceRebuildLayoutImmediate(rt);
- }
-
public TeamCharacterDataInfo getCharacterViewInfo(int characterID)
{
if (teamCharacterList == null)
@@ -152,32 +131,76 @@ public class teamSettingPanel : MonoBehaviour
return null;
}
}
-
+ ///
+ /// 把队列恢复到空视图状态
+ ///
+ public void clearTeamSettingElements()
+ {
+ foreach (GameObject gameObject in teamElementsObj)
+ {
+ teamCharacterView t = gameObject.GetComponent();
+ if (t != null)
+ {
+ t.characterID = -1;
+ t.charcterImg.sprite = null;
+ t.charcterImg.color=new Color(t.charcterImg.color.r,t.charcterImg.color.g,t.charcterImg.color.b,0f);
+ t.levelIcon.sprite = null;
+ t.levelIcon.color=new Color(t.levelIcon.color.r,t.levelIcon.color.g,t.levelIcon.color.b,0f);
+ t.skillName.text="";
+ t.isLeader.SetActive(false);
+ t.notLeader.SetActive(true);
+ }
+ }
+ }
public void updateTeamSettingElements()
{
TeamSetting currentSelectedTeam = teamManager.getCurrentSelectedTeam();
List currentTeam = currentSelectedTeam.teamIdList;
+ // if(currentTeam==null||currentTeam.Count==0)
+ // {
+ // clearTeamSettingElements();
+ // return;
+ // }
+ clearTeamSettingElements();
for (int i = 0; i < teamElementsObj.Length && i < currentTeam.Count; i++)
{
if(teamElementsObj[i]!=null && currentTeam[i]!=null)
{
+ //Debug.Log($"当前元素为第{i},当前角色为{currentTeam[i].characterId}");
teamCharacterView t = teamElementsObj[i].GetComponent();
if(t!=null)
{
t.characterID= currentTeam[i].characterId;
TeamCharacterDataInfo tcdi = getCharacterViewInfo(t.characterID);
+ if (tcdi != null)
+ {
+ t.charcterImg.sprite = tcdi.CharacterTeamSprite;
+ t.charcterImg.color=new Color(t.charcterImg.color.r,t.charcterImg.color.g,t.charcterImg.color.b,255f);
- t.charcterImg.sprite = tcdi.CharacterTeamSprite;
- t.charcterImg.color=new Color(t.charcterImg.color.r,t.charcterImg.color.g,t.charcterImg.color.b,255f);
+ t.levelIcon.sprite = getLevelSprite(currentTeam[i].currentBoundaryLevel);
+ t.levelIcon.color=new Color(t.levelIcon.color.r,t.levelIcon.color.g,t.levelIcon.color.b,255f);
+ t.skillName.text = tcdi.CharacterSkillName;
+ }
+ else
+ {
+ t.charcterImg.sprite = null;
+ t.charcterImg.color=new Color(t.charcterImg.color.r,t.charcterImg.color.g,t.charcterImg.color.b,0f);
+ t.levelIcon.sprite = null;
+ t.levelIcon.color=new Color(t.levelIcon.color.r,t.levelIcon.color.g,t.levelIcon.color.b,0f);
+ t.skillName.text="";
+ }
- t.levelIcon.sprite = getLevelSprite(currentTeam[i].currentBoundaryLevel);
- t.levelIcon.color=new Color(t.levelIcon.color.r,t.levelIcon.color.g,t.levelIcon.color.b,255f);
if(currentSelectedTeam.LeaderId==currentTeam[i].characterId)
{
+ Debug.Log($"当前队长为{currentTeam[i].characterId} {currentTeam[i].currentBoundaryLevel}，存档信息为{currentSelectedTeam.LeaderId}");
t.isLeader.SetActive(true);
t.notLeader.SetActive(false);
}
- t.skillName.text = tcdi.CharacterSkillName;
+ else
+ {
+ t.isLeader.SetActive(false);
+ t.notLeader.SetActive(true);
+ }
}
}
}
@@ -205,17 +228,6 @@ public class teamSettingPanel : MonoBehaviour
ccv.occupationIcon.sprite = tcdi.CharacterRoleSprite;
}
}
- }
- ///
- /// 将当前角色向下交换位置
- ///
- public void downChangeCharcterIndex()
- {
-
- }
- public void upChangeCharcterIndex()
- {
-
}
///
/// 用于保证team内对象的选中状态一致
@@ -223,7 +235,7 @@ public class teamSettingPanel : MonoBehaviour
public void updateTeamCharacterSelectedStatus()
{
int currentSelectedCharacter = teamManager.currentSelectedCharacter;
- Debug.Log(currentSelectedCharacter+" "+$"{teamElementsObj.Length}");
+ Debug.Log($"当前选择为{currentSelectedCharacter}");
for (int i = 0; i < teamElementsObj.Length; i++)
{
if (i != currentSelectedCharacter)
@@ -234,6 +246,49 @@ public class teamSettingPanel : MonoBehaviour
teamCharacterView.SetUnSelected();
}
}
+ else
+ {
+ teamCharacterView teamCharacterView = teamElementsObj[i].GetComponent();
+ teamCharacterView.SetSelected();
+ }
+ }
+ }
+ ///
+ /// 右切换编队信息
+ ///
+ public void rightChangeTeamSettingIndex()
+ {
+ int currentSelectedTeam = teamManager.currentSelectedTeam;
+ if (currentSelectedTeam < 4)
+ {
+ teamManager.setCurrentSelectedTeamSetting(currentSelectedTeam + 1);
+ }
+ }
+ ///
+ /// 左切换编队信息
+ ///
+ public void leftChangeTeamSettingIndex()
+ {
+ int currentSelectedTeam = teamManager.currentSelectedTeam;
+ if(currentSelectedTeam>0)
+ {
+ teamManager.setCurrentSelectedTeamSetting(currentSelectedTeam - 1);
+ }
+ }
+ public void updateTeamSettingSelectedStatus()
+ {
+ int currentSelectedTeam = teamManager.currentSelectedTeam;
+ for(int i= 0;i