Skip to content

Commit f19f936

Browse files
committed
Setup changes
1 parent 852f67f commit f19f936

File tree

5 files changed

+25
-11
lines changed

5 files changed

+25
-11
lines changed

cocos2d-demo.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
0E11257F1B7CF853005412C8 /* cocos2d_blues.wav in Resources */ = {isa = PBXBuildFile; fileRef = 0E11257E1B7CF853005412C8 /* cocos2d_blues.wav */; };
1011
0E98A8291B70B90800FA7E95 /* demo-1x.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0E98A8231B70B90800FA7E95 /* demo-1x.plist */; };
1112
0E98A82A1B70B90800FA7E95 /* demo-1x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0E98A8241B70B90800FA7E95 /* demo-1x.png */; };
1213
0E98A82B1B70B90800FA7E95 /* demo-2x.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0E98A8251B70B90800FA7E95 /* demo-2x.plist */; };
@@ -231,6 +232,7 @@
231232
/* End PBXBuildFile section */
232233

233234
/* Begin PBXFileReference section */
235+
0E11257E1B7CF853005412C8 /* cocos2d_blues.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = cocos2d_blues.wav; path = "templates/cocos2d iOS demo.xctemplate/Resources/cocos2d_blues.wav"; sourceTree = SOURCE_ROOT; };
234236
0E98A8231B70B90800FA7E95 /* demo-1x.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "demo-1x.plist"; path = "templates/cocos2d iOS demo.xctemplate/Resources/demo-1x.plist"; sourceTree = SOURCE_ROOT; };
235237
0E98A8241B70B90800FA7E95 /* demo-1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "demo-1x.png"; path = "templates/cocos2d iOS demo.xctemplate/Resources/demo-1x.png"; sourceTree = SOURCE_ROOT; };
236238
0E98A8251B70B90800FA7E95 /* demo-2x.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "demo-2x.plist"; path = "templates/cocos2d iOS demo.xctemplate/Resources/demo-2x.plist"; sourceTree = SOURCE_ROOT; };
@@ -1407,6 +1409,7 @@
14071409
0EE55F0E1B5D132100D2F764 /* credits.plist */,
14081410
0EE55EFA1B5D0FCC00D2F764 /* shader.greyscale.fsh */,
14091411
0EE55EFB1B5D0FCC00D2F764 /* shader.greyscale.vsh */,
1412+
0E11257E1B7CF853005412C8 /* cocos2d_blues.wav */,
14101413
);
14111414
name = Credits;
14121415
sourceTree = "<group>";
@@ -1581,6 +1584,7 @@
15811584
0E98A82B1B70B90800FA7E95 /* demo-2x.plist in Resources */,
15821585
0EE55C111B5D0DDF00D2F764 /* Default-Landscape.png in Resources */,
15831586
0E98A8291B70B90800FA7E95 /* demo-1x.plist in Resources */,
1587+
0E11257F1B7CF853005412C8 /* cocos2d_blues.wav in Resources */,
15841588
0EE55F2E1B5D132100D2F764 /* grossini_hi.png in Resources */,
15851589
0E98A82A1B70B90800FA7E95 /* demo-1x.png in Resources */,
15861590
0EE55C191B5D0DDF00D2F764 /* [email protected] in Resources */,

templates/cocos2d iOS demo.xctemplate/Classes/Credits.m

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#import "Credits.h"
1414
#import "CCNode_Private.h"
1515
#import "cocos2d-ui.h"
16+
#import "GameTypes.h"
1617

1718
// -----------------------------------------------------------------------
1819
// The Credits is a small helper class, creating a nice credits scroll
@@ -48,6 +49,7 @@ @implementation Credits
4849
CGPoint _lastPosition;
4950
BOOL _isScrolling;
5051
BOOL _endGame;
52+
float _volume;
5153
}
5254

5355
// -----------------------------------------------------------------------
@@ -123,6 +125,16 @@ - (instancetype)initWithScene:(CCScene *)scene andDictionary:(NSDictionary *)dic
123125

124126
// traverse all nodes, and swap their shaders
125127
if (_useGreyScale) [self replaceShaderWithGreyScaleShader:_scene];
128+
129+
// play credits music
130+
// set music volume
131+
NSUserDefaults *setup = [NSUserDefaults standardUserDefaults];
132+
_volume = [setup floatForKey:kGameKeyMusicVolume];
133+
if ([dict objectForKey:@"music"])
134+
{
135+
[[OALSimpleAudio sharedInstance] setBgVolume:_volume];
136+
[[OALSimpleAudio sharedInstance] playBg:[dict objectForKey:@"music"]];
137+
}
126138

127139
return self;
128140
}
@@ -138,9 +150,7 @@ - (void)onEnter
138150

139151
- (void)onExit
140152
{
141-
// add any exit code here
142-
143-
153+
[[OALSimpleAudio sharedInstance] stopEverything];
144154
[super onExit];
145155
}
146156

@@ -222,12 +232,12 @@ - (void)dealloc
222232
- (void)backPressed:(id)sender
223233
{
224234
[_scrollNode runAction:[CCActionSequence actions:
225-
[CCActionFadeOut actionWithDuration:1.0],
226-
[CCActionCallBlock actionWithBlock:^(void)
227-
{
228-
[self removeFromParentAndCleanup:YES];
229-
}],
230-
nil]];
235+
[CCActionFadeOut actionWithDuration:1.0],
236+
[CCActionCallBlock actionWithBlock:^(void)
237+
{
238+
[self removeFromParentAndCleanup:YES];
239+
}],
240+
nil]];
231241
}
232242

233243
// -----------------------------------------------------------------------
Binary file not shown.

templates/cocos2d iOS demo.xctemplate/Resources/credits.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<key>spacing</key>
1010
<string>0.1</string>
1111
<key>scroll.speed</key>
12-
<string>0.125</string>
13-
<key>music</key>
12+
<string>0.078</string>
13+
<key>_music</key>
1414
<string>cocos2d_blues.wav</string>
1515
<key>section - 1</key>
1616
<dict>

0 commit comments

Comments
 (0)