Skip to content

Commit

Permalink
修正
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fuyan777
Fuyan777 committed Aug 25, 2019
1 parent 92e9248 commit b02e23e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
8 changes: 4 additions & 4 deletions gaya-music.xcodeproj/project.pbxproj
View file
Expand Up @@ -17,7 +17,7 @@
37593CF5231146AB00E734AA /* tugi@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 37593CF3231146AB00E734AA /* tugi@3x.png */; };
37593CF6231146AB00E734AA /* mae@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 37593CF4231146AB00E734AA /* mae@3x.png */; };
37593CFB23114FE800E734AA /* startButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 37593CFA23114FE800E734AA /* startButton@2x.png */; };
37593CFD2311500E00E734AA /* stopButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 37593CFC2311500E00E734AA /* stopButton@2x.png */; };
37593CFD2311500E00E734AA /* stopButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 37593CFC2311500E00E734AA /* stopButton.png */; };
37593CFF231154B500E734AA /* sita.png in Resources */ = {isa = PBXBuildFile; fileRef = 37593CFE231154B500E734AA /* sita.png */; };
37593D032311638000E734AA /* ue.png in Resources */ = {isa = PBXBuildFile; fileRef = 37593D022311638000E734AA /* ue.png */; };
37593D052311641700E734AA /* topButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 37593D042311641700E734AA /* topButton.png */; };
Expand Down Expand Up @@ -49,7 +49,7 @@
37593CF3231146AB00E734AA /* tugi@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tugi@3x.png"; sourceTree = "<group>"; };
37593CF4231146AB00E734AA /* mae@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mae@3x.png"; sourceTree = "<group>"; };
37593CFA23114FE800E734AA /* startButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "startButton@2x.png"; sourceTree = "<group>"; };
37593CFC2311500E00E734AA /* stopButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stopButton@2x.png"; path = "../../../../../Downloads/stopButton@2x.png"; sourceTree = "<group>"; };
37593CFC2311500E00E734AA /* stopButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stopButton.png; path = "../../../../素材/joysounds/stopButton.png"; sourceTree = "<group>"; };
37593CFE231154B500E734AA /* sita.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sita.png; sourceTree = "<group>"; };
37593D022311638000E734AA /* ue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ue.png; sourceTree = "<group>"; };
37593D042311641700E734AA /* topButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = topButton.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -129,7 +129,7 @@
37593D222312178900E734AA /* emoiBack@3x.png */,
37593CF4231146AB00E734AA /* mae@3x.png */,
37593CF3231146AB00E734AA /* tugi@3x.png */,
37593CFC2311500E00E734AA /* stopButton@2x.png */,
37593CFC2311500E00E734AA /* stopButton.png */,
37593CFA23114FE800E734AA /* startButton@2x.png */,
37593CFE231154B500E734AA /* sita.png */,
37593D022311638000E734AA /* ue.png */,
Expand Down Expand Up @@ -210,7 +210,7 @@
37593CDC23111E3A00E734AA /* Main.storyboard in Resources */,
37593D1723120ACF00E734AA /* roop@3x.png in Resources */,
37593D1F2312154200E734AA /* musicImage@3x.png in Resources */,
37593CFD2311500E00E734AA /* stopButton@2x.png in Resources */,
37593CFD2311500E00E734AA /* stopButton.png in Resources */,
37593D1923120BB000E734AA /* shuffle@3x.png in Resources */,
37593D1B23120C5D00E734AA /* backMusic@3x.png in Resources */,
37593D032311638000E734AA /* ue.png in Resources */,
Expand Down
6 changes: 5 additions & 1 deletion gaya-music/Base.lproj/Main.storyboard
View file
Expand Up @@ -55,6 +55,9 @@
<rect key="frame" x="272" y="738" width="36" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="goMusic.png"/>
<connections>
<action selector="nextTap:" destination="vCB-1P-uRM" eventType="touchUpInside" id="nL0-od-FKz"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="obg-px-eJU">
<rect key="frame" x="199" y="89" width="16" height="38"/>
Expand Down Expand Up @@ -122,6 +125,7 @@
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
<exit id="vCB-1P-uRM" userLabel="Exit" sceneMemberID="exit"/>
</objects>
<point key="canvasLocation" x="137.68115942028987" y="129.91071428571428"/>
</scene>
Expand Down Expand Up @@ -204,7 +208,7 @@
<image name="roop.png" width="19" height="15.5"/>
<image name="shuffle.png" width="19" height="15.5"/>
<image name="sita.png" width="16" height="38"/>
<image name="stopButton.png" width="61.333332061767578" height="61.333332061767578"/>
<image name="stopButton.png" width="79" height="79"/>
<image name="topButton.png" width="16" height="38"/>
<image name="ue.png" width="422" height="130"/>
</resources>
Expand Down
Binary file added gaya-music/imageFile/stopButton@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions gaya-music/musicPlayer.swift
View file
Expand Up @@ -20,6 +20,8 @@ class musicPlayer: UIViewController, AVAudioPlayerDelegate {

override func viewDidLoad() {
super.viewDidLoad()
musicLabel.text = "yamaokaya"
musicName.text = "fuya yamada"
self.button.layer.shadowOpacity = 0.3
self.button.layer.shadowRadius = 8
self.button.layer.shadowColor = UIColor.black.cgColor
Expand Down

0 comments on commit b02e23e

Please sign in to comment.