Skip to content

Commit

Permalink
1.3.5
Browse files Browse the repository at this point in the history 
- abstract audio playback back-end
- use liboboe for Android
- add rename button to file manage menu
  • Loading branch information
ZeaS committed Jun 13, 2018
1 parent 0b7e2b5 commit 0f0cbdb
Show file tree
Hide file tree
Showing 24 changed files with 1,049 additions and 975 deletions.
6 changes: 3 additions & 3 deletions cocos/kr2/cocosstudio/ui/FileItem.csd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="255" G="127" B="80" />
</AbstractNodeData>
<AbstractNodeData Name="select_check" ActionTag="-1565335157" Tag="309" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="552.0000" RightMargin="8.0000" TopMargin="8.0000" BottomMargin="8.0000" TouchEnable="True" CheckedState="True" ctype="CheckBoxObjectData">
<AbstractNodeData Name="select_check" ActionTag="-1565335157" Tag="309" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="552.0000" RightMargin="8.0000" TopMargin="8.0000" BottomMargin="8.0000" CheckedState="True" ctype="CheckBoxObjectData">
<Size X="80.0000" Y="80.0000" />
<AnchorPoint ScaleX="1.0000" ScaleY="0.5000" />
<Position X="632.0000" Y="48.0000" />
Expand All @@ -63,7 +63,7 @@
<AbstractNodeData Name="dir_icon" ActionTag="759566553" Tag="62" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="552.0000" RightMargin="8.0000" TopMargin="8.0000" BottomMargin="8.0000" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="80.0000" Y="80.0000" />
<Children>
<AbstractNodeData Name="Panel_2_9_4" ActionTag="303139165" Tag="63" RotationSkewX="-135.0000" RotationSkewY="-135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="30.0000" BottomMargin="40.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<AbstractNodeData Name="Panel_2_9_4" ActionTag="303139165" Tag="63" RotationSkewX="-135.0000" RotationSkewY="-135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="30.0000" BottomMargin="40.0000" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="45.0000" Y="10.0000" />
<AnchorPoint />
<Position X="70.0000" Y="40.0000" />
Expand All @@ -76,7 +76,7 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<AbstractNodeData Name="Panel_2_0_11_6" ActionTag="1575774268" Tag="64" RotationSkewX="135.0006" RotationSkewY="135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="40.0000" BottomMargin="30.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<AbstractNodeData Name="Panel_2_0_11_6" ActionTag="1575774268" Tag="64" RotationSkewX="135.0006" RotationSkewY="135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="40.0000" BottomMargin="30.0000" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="45.0000" Y="10.0000" />
<AnchorPoint ScaleY="1.0000" />
<Position X="70.0000" Y="40.0000" />
Expand Down
137 changes: 75 additions & 62 deletions cocos/kr2/cocosstudio/ui/FileManageMenu.csd
View file

Large diffs are not rendered by default.

53 changes: 53 additions & 0 deletions cocos/kr2/cocosstudio/ui/KeySelect.csd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<GameFile>
<PropertyGroup Name="KeySelect" Type="Layer" ID="18132b85-255a-4049-bb5b-4343880f3a4c" Version="3.10.0.0" />
<Content ctype="GameProjectContent">
<Content>
<Animation Duration="0" Speed="1.0000" />
<ObjectData Name="Layer" Tag="22" ctype="GameLayerObjectData">
<Size X="1280.0000" Y="720.0000" />
<Children>
<AbstractNodeData Name="Panel_1" ActionTag="-457238893" Tag="23" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="389.9991" RightMargin="390.0009" TopMargin="260.0005" BottomMargin="259.9995" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" ctype="PanelObjectData">
<Size X="500.0000" Y="200.0000" />
<Children>
<AbstractNodeData Name="Text_1" ActionTag="-1266043054" Tag="25" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="38.0000" RightMargin="38.0000" BottomMargin="137.0000" FontSize="48" LabelText="press_key_or_select" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="424.0000" Y="63.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="1.0000" />
<Position X="250.0000" Y="200.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="1.0000" />
<PreSize X="0.8480" Y="0.3150" />
<FontResource Type="Normal" Path="DroidSansFallback.ttf" Plist="" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="Panel_2" ActionTag="-2042266371" Tag="24" IconVisible="False" RightMargin="300.0000" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ComboBoxIndex="1" ColorAngle="90.0000" ctype="PanelObjectData">
<Size X="200.0000" Y="200.0000" />
<AnchorPoint />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.4000" Y="1.0000" />
<SingleColor A="255" R="150" G="200" B="255" />
<FirstColor A="255" R="150" G="200" B="255" />
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="639.9991" Y="359.9995" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
<PreSize X="0.3906" Y="0.2778" />
<SingleColor A="255" R="109" G="109" B="109" />
<FirstColor A="255" R="150" G="200" B="255" />
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
</Children>
</ObjectData>
</Content>
</Content>
</GameFile>
34 changes: 24 additions & 10 deletions cocos/kr2/cocosstudio/ui/SelectList.csd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,22 @@
<ObjectData Name="Layer" Tag="29" ctype="GameLayerObjectData">
<Size X="720.0000" Y="480.0000" />
<Children>
<AbstractNodeData Name="Panel_4" ActionTag="1135387664" Tag="52" IconVisible="False" PercentWidthEnable="True" PercentHeightEnable="True" PercentWidthEnabled="True" PercentHeightEnabled="True" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" ctype="PanelObjectData">
<AbstractNodeData Name="Panel_4" ActionTag="1135387664" Tag="52" IconVisible="False" PercentWidthEnable="True" PercentHeightEnable="True" PercentWidthEnabled="True" PercentHeightEnabled="True" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="720.0000" Y="480.0000" />
<Children>
<AbstractNodeData Name="title" ActionTag="1366729226" Tag="43" IconVisible="False" PositionPercentXEnabled="True" VerticalEdge="TopEdge" LeftMargin="314.0000" RightMargin="314.0000" TopMargin="7.0000" BottomMargin="410.0000" FontSize="48" LabelText="Title" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="92.0000" Y="63.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="360.0000" Y="441.5000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.9198" />
<PreSize X="0.1278" Y="0.1312" />
<FontResource Type="Normal" Path="DroidSansFallback.ttf" Plist="" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
</Children>
<AnchorPoint />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
Expand All @@ -19,10 +33,10 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<AbstractNodeData Name="Panel_5" ActionTag="697373835" Tag="53" IconVisible="False" PercentWidthEnable="True" PercentWidthEnabled="True" VerticalEdge="BothEdge" TopMargin="80.0000" TouchEnable="True" StretchHeightEnable="True" ClipAble="True" BackColorAlpha="102" ColorAngle="90.0000" ctype="PanelObjectData">
<AbstractNodeData Name="Panel_5" ActionTag="697373835" Tag="53" IconVisible="False" PercentWidthEnable="True" PercentWidthEnabled="True" VerticalEdge="BothEdge" TopMargin="80.0000" TouchEnable="True" StretchHeightEnable="True" ClipAble="True" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="720.0000" Y="400.0000" />
<Children>
<AbstractNodeData Name="Panel_17" ActionTag="-1215190169" Tag="67" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="BothEdge" LeftMargin="80.0000" RightMargin="80.0000" TopMargin="152.0000" BottomMargin="152.0000" StretchWidthEnable="True" ClipAble="False" BackColorAlpha="38" ComboBoxIndex="1" ColorAngle="90.0000" ctype="PanelObjectData">
<AbstractNodeData Name="Panel_17" ActionTag="-1215190169" Tag="67" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="BothEdge" LeftMargin="80.0000" RightMargin="80.0000" TopMargin="152.0000" BottomMargin="152.0000" StretchWidthEnable="True" ClipAble="False" BackColorAlpha="38" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="560.0000" Y="96.0000" />
<AnchorPoint ScaleY="0.5000" />
<Position X="80.0000" Y="200.0000" />
Expand All @@ -35,14 +49,14 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<AbstractNodeData Name="pageview" ActionTag="-142522138" Tag="60" IconVisible="False" HorizontalEdge="BothEdge" VerticalEdge="BothEdge" LeftMargin="80.0000" RightMargin="80.0000" TouchEnable="True" StretchWidthEnable="True" StretchHeightEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" ctype="PanelObjectData">
<AbstractNodeData Name="pageview" ActionTag="-142522138" Tag="60" IconVisible="False" HorizontalEdge="BothEdge" VerticalEdge="BothEdge" LeftMargin="80.0000" RightMargin="80.0000" TouchEnable="True" StretchWidthEnable="True" StretchHeightEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="560.0000" Y="400.0000" />
<AnchorPoint />
<Position X="80.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.1111" />
<PreSize X="0.7778" Y="0.8333" />
<PreSize X="0.7778" Y="1.0000" />
<SingleColor A="255" R="150" G="200" B="255" />
<FirstColor A="255" R="150" G="200" B="255" />
<EndColor A="255" R="255" G="255" B="255" />
Expand All @@ -51,7 +65,7 @@
<AbstractNodeData Name="dir_icon" ActionTag="1905600206" Tag="54" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="LeftEdge" RightMargin="640.0000" TopMargin="160.0000" BottomMargin="160.0000" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="80.0000" Y="80.0000" />
<Children>
<AbstractNodeData Name="Panel_2_9_8" ActionTag="-1619199232" Tag="55" RotationSkewX="-135.0000" RotationSkewY="-135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="30.0000" BottomMargin="40.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" Rotation="-135.0000" ctype="PanelObjectData">
<AbstractNodeData Name="Panel_2_9_8" ActionTag="-1619199232" Tag="55" RotationSkewX="-135.0000" RotationSkewY="-135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="30.0000" BottomMargin="40.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="45.0000" Y="10.0000" />
<AnchorPoint />
<Position X="70.0000" Y="40.0000" />
Expand All @@ -64,7 +78,7 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<AbstractNodeData Name="Panel_2_0_11_10" ActionTag="413048241" Tag="56" RotationSkewX="135.0006" RotationSkewY="135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="40.0000" BottomMargin="30.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" Rotation="135.0006" ctype="PanelObjectData">
<AbstractNodeData Name="Panel_2_0_11_10" ActionTag="413048241" Tag="56" RotationSkewX="135.0006" RotationSkewY="135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="40.0000" BottomMargin="30.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="45.0000" Y="10.0000" />
<AnchorPoint ScaleY="1.0000" />
<Position X="70.0000" Y="40.0000" />
Expand All @@ -83,7 +97,7 @@
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.1111" Y="0.5000" />
<PreSize X="0.1250" Y="0.8333" />
<PreSize X="0.1111" Y="0.2000" />
<SingleColor A="255" R="150" G="200" B="255" />
<FirstColor A="255" R="150" G="200" B="255" />
<EndColor A="255" R="255" G="255" B="255" />
Expand All @@ -92,7 +106,7 @@
<AbstractNodeData Name="dir_icon_0" ActionTag="214394180" Tag="58" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="640.0000" TopMargin="160.0000" BottomMargin="160.0000" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="80.0000" Y="80.0000" />
<Children>
<AbstractNodeData Name="Panel_2_9_8_13" ActionTag="-112702401" Tag="58" RotationSkewX="-135.0000" RotationSkewY="-135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="30.0000" BottomMargin="40.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" Rotation="-135.0000" ctype="PanelObjectData">
<AbstractNodeData Name="Panel_2_9_8_13" ActionTag="-112702401" Tag="58" RotationSkewX="-135.0000" RotationSkewY="-135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="30.0000" BottomMargin="40.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="45.0000" Y="10.0000" />
<AnchorPoint />
<Position X="70.0000" Y="40.0000" />
Expand All @@ -105,7 +119,7 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<AbstractNodeData Name="Panel_2_0_11_10_15" ActionTag="2004678246" Tag="59" RotationSkewX="135.0006" RotationSkewY="135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="40.0000" BottomMargin="30.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" Rotation="135.0006" ctype="PanelObjectData">
<AbstractNodeData Name="Panel_2_0_11_10_15" ActionTag="2004678246" Tag="59" RotationSkewX="135.0006" RotationSkewY="135.0000" IconVisible="False" PositionPercentYEnabled="True" HorizontalEdge="RightEdge" LeftMargin="70.0000" RightMargin="-35.0000" TopMargin="40.0000" BottomMargin="30.0000" TouchEnable="True" ClipAble="False" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="45.0000" Y="10.0000" />
<AnchorPoint ScaleY="1.0000" />
<Position X="70.0000" Y="40.0000" />
Expand Down
1 change: 1 addition & 0 deletions cocos/kr2/kr2.ccs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<Project Name="FileItem.csd" Type="Layer" />
<Project Name="FileManageMenu.csd" Type="Layer" />
<Project Name="GameMenu.csd" Type="Layer" />
<Project Name="KeySelect.csd" Type="Layer" />
<Project Name="ListItem.csd" Type="Layer" />
<Project Name="ListView.csd" Type="Layer" />
<Project Name="MainFileSelector.csd" Type="Layer" />
Expand Down
Loading

0 comments on commit 0f0cbdb

Please sign in to comment.