-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add multiple troops into one formation group.
- Loading branch information
1 parent
1b73150
commit 9b1d155
Showing
18 changed files
with
312 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
...BattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/EnhancedBattleTestGeneralTroopGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <Prefab> | ||
| <Window> | ||
| <ListPanel WidthSizePolicy="Fixed" SuggestedWidth="585" HeightSizePolicy="CoverChildren" MarginLeft="50" MarginTop="20" LayoutImp.LayoutMethod="VerticalBottomToTop"> | ||
| <Children> | ||
|
|
||
| <PartyHeaderToggleWidget DoNotPassEventsToChildren="true" WidthSizePolicy="StretchToParent" HeightSizePolicy="CoverChildren" HorizontalAlignment="Center" VerticalAlignment="Top" MarginLeft="10" MarginRight="10" CollapseIndicator="Description\CollapseParent\GroupTitle\CollapseIndicator" WidgetToClose="..\TroopsList" ListPanel="..\TroopsList" RenderLate="true" UpdateChildrenStates="true"> | ||
| <Children> | ||
|
|
||
| <ListPanel Id="Description" DoNotAcceptEvents="true" WidthSizePolicy="StretchToParent" HeightSizePolicy="CoverChildren" HorizontalAlignment="Center" VerticalAlignment="Center" LayoutImp.LayoutMethod="HorizontalLeftToRight" UpdateChildrenStates="true"> | ||
| <Children> | ||
|
|
||
| <Widget Id="CollapseParent" WidthSizePolicy="Fixed" HeightSizePolicy="CoverChildren" SuggestedWidth="120" HorizontalAlignment="Center" UpdateChildrenStates="true"> | ||
| <Children> | ||
| <TextWidget Id="GroupTitle" DataSource="{TroopGroupName}" Text="@Text" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" HorizontalAlignment="Right" Brush="SPOptions.GameKeysGroup.Title.Text" ClipContents="false"> | ||
| <Children> | ||
| <BrushWidget Id="CollapseIndicator" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedHeight="19" SuggestedWidth="19" VerticalAlignment="Center" PositionXOffset="-26" PositionYOffset="-3" Brush="SPOptions.GameKeysgroup.ExpandIndicator" OverrideDefaultStateSwitchingEnabled="true" /> | ||
| </Children> | ||
| </TextWidget> | ||
| </Children> | ||
| </Widget> | ||
|
|
||
| <BrushWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="2" VerticalAlignment="Center" MarginLeft="15" Brush="SPOptions.CollapserLine" /> | ||
| </Children> | ||
| </ListPanel> | ||
|
|
||
| </Children> | ||
| </PartyHeaderToggleWidget> | ||
|
|
||
| <ListPanel Id="TroopsList" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" MarginTop="35" LayoutImp.LayoutMethod="VerticalBottomToTop"> | ||
| <Children> | ||
|
|
||
| <EnhancedBattleTestTroopList /> | ||
|
|
||
| <ListPanel IsVisible="@IsGeneralTroopGroup" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" MarginLeft="50" LayoutImp.LayoutMethod="HorizontalLeftToRight"> | ||
| <Children> | ||
| <RichTextWidget DataSource="{..\EnableGeneralText}" Text="@Text" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" HorizontalAlignment="Center" VerticalAlignment="Center" Brush="CustomBattle.Value.Text" /> | ||
| <ButtonWidget DataSource="{..\EnableGeneral}" IsSelected="@Value" ButtonType="Toggle" DoNotPassEventsToChildren="true" ToggleIndicator="ToggleIndicator" HorizontalAlignment="Left" VerticalAlignment="Center" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="50" SuggestedHeight="50" Brush="SPOptions.Checkbox.Empty.Button"> | ||
| <Children> | ||
| <ImageWidget Id="ToggleIndicator" WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" Brush="SPOptions.Checkbox.Full.Button" /> | ||
| </Children> | ||
| </ButtonWidget> | ||
| </Children> | ||
| </ListPanel> | ||
|
|
||
| </Children> | ||
| </ListPanel> | ||
|
|
||
| </Children> | ||
| </ListPanel> | ||
| </Window> | ||
| </Prefab> |
40 changes: 40 additions & 0 deletions
40
...tleTest/Modules/EnhancedBattleTest/GUI/Prefabs/EnhancedBattleTestNonGeneralTroopGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <Prefab> | ||
| <Window> | ||
| <ListPanel WidthSizePolicy="Fixed" SuggestedWidth="585" HeightSizePolicy="CoverChildren" MarginLeft="50" MarginTop="20" LayoutImp.LayoutMethod="VerticalBottomToTop"> | ||
| <Children> | ||
|
|
||
| <PartyHeaderToggleWidget DoNotPassEventsToChildren="true" WidthSizePolicy="StretchToParent" HeightSizePolicy="CoverChildren" HorizontalAlignment="Center" VerticalAlignment="Top" MarginLeft="10" MarginRight="10" CollapseIndicator="Description\CollapseParent\GroupTitle\CollapseIndicator" WidgetToClose="..\TroopsList" ListPanel="..\TroopsList" RenderLate="true" UpdateChildrenStates="true"> | ||
| <Children> | ||
|
|
||
| <ListPanel Id="Description" DoNotAcceptEvents="true" WidthSizePolicy="StretchToParent" HeightSizePolicy="CoverChildren" HorizontalAlignment="Center" VerticalAlignment="Center" LayoutImp.LayoutMethod="HorizontalLeftToRight" UpdateChildrenStates="true"> | ||
| <Children> | ||
|
|
||
| <Widget Id="CollapseParent" WidthSizePolicy="Fixed" HeightSizePolicy="CoverChildren" SuggestedWidth="120" HorizontalAlignment="Center" UpdateChildrenStates="true"> | ||
| <Children> | ||
| <TextWidget Id="GroupTitle" DataSource="{TroopGroupName}" Text="@Text" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" HorizontalAlignment="Right" Brush="SPOptions.GameKeysGroup.Title.Text" ClipContents="false"> | ||
| <Children> | ||
| <BrushWidget Id="CollapseIndicator" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedHeight="19" SuggestedWidth="19" VerticalAlignment="Center" PositionXOffset="-26" PositionYOffset="-3" Brush="SPOptions.GameKeysgroup.ExpandIndicator" OverrideDefaultStateSwitchingEnabled="true" /> | ||
| </Children> | ||
| </TextWidget> | ||
| </Children> | ||
| </Widget> | ||
|
|
||
| <BrushWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="2" VerticalAlignment="Center" MarginLeft="15" Brush="SPOptions.CollapserLine" /> | ||
| </Children> | ||
| </ListPanel> | ||
|
|
||
| </Children> | ||
| </PartyHeaderToggleWidget> | ||
|
|
||
| <ListPanel Id="TroopsList" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" MarginTop="35" LayoutImp.LayoutMethod="VerticalBottomToTop"> | ||
| <Children> | ||
|
|
||
| <EnhancedBattleTestTroopList /> | ||
|
|
||
| </Children> | ||
| </ListPanel> | ||
|
|
||
| </Children> | ||
| </ListPanel> | ||
| </Window> | ||
| </Prefab> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 0 additions & 81 deletions
81
...nhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/EnhancedBattleTestTroopGroup.xml
This file was deleted.
Oops, something went wrong.
50 changes: 50 additions & 0 deletions
50
...EnhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/EnhancedBattleTestTroopList.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <Prefab> | ||
| <Window> | ||
| <ListPanel WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" LayoutImp.LayoutMethod="VerticalBottomToTop"> | ||
| <Children> | ||
| <ListPanel WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" LayoutImp.LayoutMethod="HorizontalLeftToRight"> | ||
| <Children> | ||
| <ButtonWidget DoNotPassEventsToChildren="true" Command.Click="PushTroop" IsEnabled="@PushEnabled" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="80" SuggestedHeight="40" MarginLeft="30" Brush="ButtonBrush2" PositiveBehaviourBrush="ButtonBrush1"> | ||
| <Children> | ||
| <TextWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" Brush="SPOptions.Dropdown.Center.Text" Text="+" /> | ||
| </Children> | ||
| </ButtonWidget> | ||
| <ButtonWidget DoNotPassEventsToChildren="true" Command.Click="PopTroop" IsEnabled="@PopEnabled" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="80" SuggestedHeight="40" MarginLeft="30" Brush="ButtonBrush2" PositiveBehaviourBrush="ButtonBrush1"> | ||
| <Children> | ||
| <TextWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" Brush="SPOptions.Dropdown.Center.Text" Text="-" /> | ||
| </Children> | ||
| </ButtonWidget> | ||
| </Children> | ||
| </ListPanel> | ||
|
|
||
| <ListPanel DataSource="{Troops}" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" LayoutImp.LayoutMethod="VerticalBottomToTop"> | ||
| <ItemTemplate> | ||
| <ListPanel WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" LayoutImp.LayoutMethod="VerticalBottomToTop"> | ||
| <Children> | ||
| <EnhancedBattleTestCharacterButton DataSource="{CharacterButton}" HorizontalAlignment="Left" VerticalAlignment="Center" MarginTop="15" /> | ||
|
|
||
| <ListPanel IsHidden="@IsGeneralTroop" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" LayoutImp.LayoutMethod="HorizontalLeftToRight" HorizontalAlignment="Center" VerticalAlignment="Center" MarginLeft="100" MarginTop="5"> | ||
| <Children> | ||
| <RichTextWidget DataSource="{NumberText}" Text="@Text" WidthSizePolicy="Fixed" SuggestedWidth="100" HeightSizePolicy="CoverChildren" HorizontalAlignment="Left" VerticalAlignment="Center" Brush="CustomBattle.Value.Text" /> | ||
| <EditableTextWidget DataSource="{Number}" Text="@Text" WidthSizePolicy="Fixed" SuggestedWidth="200" HeightSizePolicy="Fixed" SuggestedHeight="30" HorizontalAlignment="Center" VerticalAlignment="Center" /> | ||
| <Widget WidthSizePolicy="Fixed" SuggestedWidth="100" HeightSizePolicy="Fixed" SuggestedHeight="30" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||
| <Children> | ||
| <Widget DataSource="{Number}" IsVisible="@IsIllegal" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||
| <Children> | ||
| <RichTextWidget DataSource="{..\InvalidText}" Text="@Text" WidthSizePolicy="CoverChildren" HeightSizePolicy="CoverChildren" HorizontalAlignment="Center" VerticalAlignment="Center" Brush="CustomBattle.Value.Text" /> | ||
| </Children> | ||
| </Widget> | ||
| </Children> | ||
| </Widget> | ||
| </Children> | ||
| </ListPanel> | ||
|
|
||
| </Children> | ||
| </ListPanel> | ||
| </ItemTemplate> | ||
| </ListPanel> | ||
| </Children> | ||
| </ListPanel> | ||
|
|
||
| </Window> | ||
| </Prefab> |
Oops, something went wrong.