diff options
-rwxr-xr-x | Cartographic.xcodeproj/project.pbxproj | 34 | ||||
-rwxr-xr-x | Classes/Cart_CollectAppDelegate.m | 4 | ||||
-rwxr-xr-x | Classes/ClassicGameMode.m | 12 | ||||
-rw-r--r-- | Classes/GameMode.m | 5 | ||||
-rw-r--r-- | Classes/GameModeSelectionLayer.m | 15 | ||||
-rw-r--r-- | Resources/venice.png | bin | 0 -> 1329 bytes | |||
-rwxr-xr-x | libs/cocos2d/CCNotifications.h | 141 | ||||
-rwxr-xr-x | libs/cocos2d/CCNotifications.m | 494 | ||||
-rw-r--r-- | libs/cocos2d/notificationDesign.h | 39 | ||||
-rw-r--r-- | libs/cocos2d/notificationDesign.m | 82 |
10 files changed, 816 insertions, 10 deletions
diff --git a/Cartographic.xcodeproj/project.pbxproj b/Cartographic.xcodeproj/project.pbxproj index 58ab09b..61b9f11 100755 --- a/Cartographic.xcodeproj/project.pbxproj +++ b/Cartographic.xcodeproj/project.pbxproj | |||
@@ -112,16 +112,19 @@ | |||
112 | 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; }; | 112 | 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; }; |
113 | 6C39CFE013FC2708002B21AF /* tutorial.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFDF13FC2708002B21AF /* tutorial.png */; }; | 113 | 6C39CFE013FC2708002B21AF /* tutorial.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFDF13FC2708002B21AF /* tutorial.png */; }; |
114 | 6C39CFE213FC2713002B21AF /* tutorial2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE113FC2713002B21AF /* tutorial2.png */; }; | 114 | 6C39CFE213FC2713002B21AF /* tutorial2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE113FC2713002B21AF /* tutorial2.png */; }; |
115 | 6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFE413FC4635002B21AF /* JumpGameMode.m */; }; | ||
116 | 6C39CFE713FC46CD002B21AF /* water.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE613FC46CD002B21AF /* water.png */; }; | ||
117 | 6C39CFE913FC8AC4002B21AF /* jump2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE813FC8AC4002B21AF /* jump2.png */; }; | ||
118 | 6C39CFEB13FC8ACA002B21AF /* jump.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFEA13FC8ACA002B21AF /* jump.png */; }; | ||
115 | 6C39CFF313FD4F8B002B21AF /* GameModeSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFF213FD4F89002B21AF /* GameModeSelection.m */; }; | 119 | 6C39CFF313FD4F8B002B21AF /* GameModeSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFF213FD4F89002B21AF /* GameModeSelection.m */; }; |
116 | 6C39CFF513FD5526002B21AF /* paintdaubs.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFF413FD5526002B21AF /* paintdaubs.png */; }; | 120 | 6C39CFF513FD5526002B21AF /* paintdaubs.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFF413FD5526002B21AF /* paintdaubs.png */; }; |
117 | 6C39CFF813FD7638002B21AF /* GameModeSelectionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFF713FD7637002B21AF /* GameModeSelectionLayer.m */; }; | 121 | 6C39CFF813FD7638002B21AF /* GameModeSelectionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFF713FD7637002B21AF /* GameModeSelectionLayer.m */; }; |
118 | 6C39D00813FD9037002B21AF /* florence.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39D00713FD9037002B21AF /* florence.png */; }; | 122 | 6C39D00813FD9037002B21AF /* florence.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39D00713FD9037002B21AF /* florence.png */; }; |
119 | 6C39D01213FD9945002B21AF /* paris.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39D01113FD9945002B21AF /* paris.png */; }; | 123 | 6C39D01213FD9945002B21AF /* paris.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39D01113FD9945002B21AF /* paris.png */; }; |
120 | 6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFE413FC4635002B21AF /* JumpGameMode.m */; }; | ||
121 | 6C39CFE713FC46CD002B21AF /* water.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE613FC46CD002B21AF /* water.png */; }; | ||
122 | 6C39CFE913FC8AC4002B21AF /* jump2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE813FC8AC4002B21AF /* jump2.png */; }; | ||
123 | 6C39CFEB13FC8ACA002B21AF /* jump.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFEA13FC8ACA002B21AF /* jump.png */; }; | ||
124 | 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; }; | 124 | 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; }; |
125 | 6C85834014055A44009EF100 /* CCNotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C85833F14055A44009EF100 /* CCNotifications.m */; }; | ||
126 | 6C85834414055B2E009EF100 /* notificationDesign.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C85834314055B2E009EF100 /* notificationDesign.m */; }; | ||
127 | 6C85834614056E57009EF100 /* venice.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C85834514056E57009EF100 /* venice.png */; }; | ||
125 | 6CC89DD913F2F4E6003704F7 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */; }; | 128 | 6CC89DD913F2F4E6003704F7 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */; }; |
126 | 6CC89DDF13F31413003704F7 /* TutorialMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC89DDE13F31413003704F7 /* TutorialMode.m */; }; | 129 | 6CC89DDF13F31413003704F7 /* TutorialMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC89DDE13F31413003704F7 /* TutorialMode.m */; }; |
127 | DC6640030F83B3EA000B3E49 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */; }; | 130 | DC6640030F83B3EA000B3E49 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */; }; |
@@ -439,6 +442,11 @@ | |||
439 | 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; }; | 442 | 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; }; |
440 | 6C39CFDF13FC2708002B21AF /* tutorial.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial.png; sourceTree = "<group>"; }; | 443 | 6C39CFDF13FC2708002B21AF /* tutorial.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial.png; sourceTree = "<group>"; }; |
441 | 6C39CFE113FC2713002B21AF /* tutorial2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial2.png; sourceTree = "<group>"; }; | 444 | 6C39CFE113FC2713002B21AF /* tutorial2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial2.png; sourceTree = "<group>"; }; |
445 | 6C39CFE313FC4635002B21AF /* JumpGameMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JumpGameMode.h; sourceTree = "<group>"; }; | ||
446 | 6C39CFE413FC4635002B21AF /* JumpGameMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JumpGameMode.m; sourceTree = "<group>"; }; | ||
447 | 6C39CFE613FC46CD002B21AF /* water.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = water.png; sourceTree = "<group>"; }; | ||
448 | 6C39CFE813FC8AC4002B21AF /* jump2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jump2.png; sourceTree = "<group>"; }; | ||
449 | 6C39CFEA13FC8ACA002B21AF /* jump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jump.png; sourceTree = "<group>"; }; | ||
442 | 6C39CFF113FD4F87002B21AF /* GameModeSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameModeSelection.h; sourceTree = "<group>"; }; | 450 | 6C39CFF113FD4F87002B21AF /* GameModeSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameModeSelection.h; sourceTree = "<group>"; }; |
443 | 6C39CFF213FD4F89002B21AF /* GameModeSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameModeSelection.m; sourceTree = "<group>"; }; | 451 | 6C39CFF213FD4F89002B21AF /* GameModeSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameModeSelection.m; sourceTree = "<group>"; }; |
444 | 6C39CFF413FD5526002B21AF /* paintdaubs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = paintdaubs.png; sourceTree = "<group>"; }; | 452 | 6C39CFF413FD5526002B21AF /* paintdaubs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = paintdaubs.png; sourceTree = "<group>"; }; |
@@ -446,12 +454,12 @@ | |||
446 | 6C39CFF713FD7637002B21AF /* GameModeSelectionLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameModeSelectionLayer.m; sourceTree = "<group>"; }; | 454 | 6C39CFF713FD7637002B21AF /* GameModeSelectionLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameModeSelectionLayer.m; sourceTree = "<group>"; }; |
447 | 6C39D00713FD9037002B21AF /* florence.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = florence.png; sourceTree = "<group>"; }; | 455 | 6C39D00713FD9037002B21AF /* florence.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = florence.png; sourceTree = "<group>"; }; |
448 | 6C39D01113FD9945002B21AF /* paris.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = paris.png; sourceTree = "<group>"; }; | 456 | 6C39D01113FD9945002B21AF /* paris.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = paris.png; sourceTree = "<group>"; }; |
449 | 6C39CFE313FC4635002B21AF /* JumpGameMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JumpGameMode.h; sourceTree = "<group>"; }; | ||
450 | 6C39CFE413FC4635002B21AF /* JumpGameMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JumpGameMode.m; sourceTree = "<group>"; }; | ||
451 | 6C39CFE613FC46CD002B21AF /* water.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = water.png; sourceTree = "<group>"; }; | ||
452 | 6C39CFE813FC8AC4002B21AF /* jump2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jump2.png; sourceTree = "<group>"; }; | ||
453 | 6C39CFEA13FC8ACA002B21AF /* jump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jump.png; sourceTree = "<group>"; }; | ||
454 | 6C5179C513DF3839006F1F38 /* Morning1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Morning1.png; sourceTree = "<group>"; }; | 457 | 6C5179C513DF3839006F1F38 /* Morning1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Morning1.png; sourceTree = "<group>"; }; |
458 | 6C85833E14055A44009EF100 /* CCNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNotifications.h; sourceTree = "<group>"; }; | ||
459 | 6C85833F14055A44009EF100 /* CCNotifications.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCNotifications.m; sourceTree = "<group>"; }; | ||
460 | 6C85834214055B2D009EF100 /* notificationDesign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = notificationDesign.h; sourceTree = "<group>"; }; | ||
461 | 6C85834314055B2E009EF100 /* notificationDesign.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = notificationDesign.m; sourceTree = "<group>"; }; | ||
462 | 6C85834514056E57009EF100 /* venice.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = venice.png; sourceTree = "<group>"; }; | ||
455 | 6CB532581403BA4F00780A5E /* GameModeSelectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameModeSelectionDelegate.h; sourceTree = "<group>"; }; | 463 | 6CB532581403BA4F00780A5E /* GameModeSelectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameModeSelectionDelegate.h; sourceTree = "<group>"; }; |
456 | 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; }; | 464 | 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; }; |
457 | 6CC89DDD13F31413003704F7 /* TutorialMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialMode.h; sourceTree = "<group>"; }; | 465 | 6CC89DDD13F31413003704F7 /* TutorialMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialMode.h; sourceTree = "<group>"; }; |
@@ -932,6 +940,7 @@ | |||
932 | 6C39D00513FD901A002B21AF /* Icons */ = { | 940 | 6C39D00513FD901A002B21AF /* Icons */ = { |
933 | isa = PBXGroup; | 941 | isa = PBXGroup; |
934 | children = ( | 942 | children = ( |
943 | 6C85834514056E57009EF100 /* venice.png */, | ||
935 | 6C39D01113FD9945002B21AF /* paris.png */, | 944 | 6C39D01113FD9945002B21AF /* paris.png */, |
936 | 6C39D00713FD9037002B21AF /* florence.png */, | 945 | 6C39D00713FD9037002B21AF /* florence.png */, |
937 | ); | 946 | ); |
@@ -983,6 +992,8 @@ | |||
983 | E02BBB19126CC2F5006E46A2 /* cocos2d */ = { | 992 | E02BBB19126CC2F5006E46A2 /* cocos2d */ = { |
984 | isa = PBXGroup; | 993 | isa = PBXGroup; |
985 | children = ( | 994 | children = ( |
995 | 6C85833E14055A44009EF100 /* CCNotifications.h */, | ||
996 | 6C85833F14055A44009EF100 /* CCNotifications.m */, | ||
986 | E02BBB1A126CC2F5006E46A2 /* CCAction.h */, | 997 | E02BBB1A126CC2F5006E46A2 /* CCAction.h */, |
987 | E02BBB1B126CC2F5006E46A2 /* CCAction.m */, | 998 | E02BBB1B126CC2F5006E46A2 /* CCAction.m */, |
988 | E02BBB1C126CC2F5006E46A2 /* CCActionCamera.h */, | 999 | E02BBB1C126CC2F5006E46A2 /* CCActionCamera.h */, |
@@ -1103,6 +1114,8 @@ | |||
1103 | E02BBB93126CC2F6006E46A2 /* cocos2d.m */, | 1114 | E02BBB93126CC2F6006E46A2 /* cocos2d.m */, |
1104 | E02BBB94126CC2F6006E46A2 /* Platforms */, | 1115 | E02BBB94126CC2F6006E46A2 /* Platforms */, |
1105 | E02BBBAD126CC2F6006E46A2 /* Support */, | 1116 | E02BBBAD126CC2F6006E46A2 /* Support */, |
1117 | 6C85834214055B2D009EF100 /* notificationDesign.h */, | ||
1118 | 6C85834314055B2E009EF100 /* notificationDesign.m */, | ||
1106 | ); | 1119 | ); |
1107 | name = cocos2d; | 1120 | name = cocos2d; |
1108 | path = libs/cocos2d; | 1121 | path = libs/cocos2d; |
@@ -1454,6 +1467,7 @@ | |||
1454 | 6C39CFE713FC46CD002B21AF /* water.png in Resources */, | 1467 | 6C39CFE713FC46CD002B21AF /* water.png in Resources */, |
1455 | 6C39CFE913FC8AC4002B21AF /* jump2.png in Resources */, | 1468 | 6C39CFE913FC8AC4002B21AF /* jump2.png in Resources */, |
1456 | 6C39CFEB13FC8ACA002B21AF /* jump.png in Resources */, | 1469 | 6C39CFEB13FC8ACA002B21AF /* jump.png in Resources */, |
1470 | 6C85834614056E57009EF100 /* venice.png in Resources */, | ||
1457 | ); | 1471 | ); |
1458 | runOnlyForDeploymentPostprocessing = 0; | 1472 | runOnlyForDeploymentPostprocessing = 0; |
1459 | }; | 1473 | }; |
@@ -1505,6 +1519,8 @@ | |||
1505 | 6C18C3D314033DC60005AA4C /* NMPanelMenu.m in Sources */, | 1519 | 6C18C3D314033DC60005AA4C /* NMPanelMenu.m in Sources */, |
1506 | 6C18C3D414033DC60005AA4C /* TouchDelegatingView.m in Sources */, | 1520 | 6C18C3D414033DC60005AA4C /* TouchDelegatingView.m in Sources */, |
1507 | 6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */, | 1521 | 6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */, |
1522 | 6C85834014055A44009EF100 /* CCNotifications.m in Sources */, | ||
1523 | 6C85834414055B2E009EF100 /* notificationDesign.m in Sources */, | ||
1508 | ); | 1524 | ); |
1509 | runOnlyForDeploymentPostprocessing = 0; | 1525 | runOnlyForDeploymentPostprocessing = 0; |
1510 | }; | 1526 | }; |
diff --git a/Classes/Cart_CollectAppDelegate.m b/Classes/Cart_CollectAppDelegate.m index ba9d60b..1a6759c 100755 --- a/Classes/Cart_CollectAppDelegate.m +++ b/Classes/Cart_CollectAppDelegate.m | |||
@@ -14,6 +14,8 @@ | |||
14 | #import "RootViewController.h" | 14 | #import "RootViewController.h" |
15 | #import "MainMenuLayer.h" | 15 | #import "MainMenuLayer.h" |
16 | #import "TestFlight.h" | 16 | #import "TestFlight.h" |
17 | #import "CCNotifications.h" | ||
18 | #import "notificationDesign.h" | ||
17 | 19 | ||
18 | @implementation Cart_CollectAppDelegate | 20 | @implementation Cart_CollectAppDelegate |
19 | 21 | ||
@@ -64,6 +66,8 @@ | |||
64 | 66 | ||
65 | 67 | ||
66 | CCDirector *director = [CCDirector sharedDirector]; | 68 | CCDirector *director = [CCDirector sharedDirector]; |
69 | CCNotifications* notifications = [CCNotifications sharedManager]; | ||
70 | [director setNotificationNode:notifications]; | ||
67 | 71 | ||
68 | // Init the View Controller | 72 | // Init the View Controller |
69 | viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; | 73 | viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; |
diff --git a/Classes/ClassicGameMode.m b/Classes/ClassicGameMode.m index 88c52ce..c1d3be7 100755 --- a/Classes/ClassicGameMode.m +++ b/Classes/ClassicGameMode.m | |||
@@ -14,6 +14,7 @@ | |||
14 | #import "Rock.h" | 14 | #import "Rock.h" |
15 | #import "GameOverScene.h" | 15 | #import "GameOverScene.h" |
16 | #import "SimpleAudioEngine.h" | 16 | #import "SimpleAudioEngine.h" |
17 | #import "CCNotifications.h" | ||
17 | 18 | ||
18 | @implementation ClassicGameMode | 19 | @implementation ClassicGameMode |
19 | 20 | ||
@@ -35,6 +36,17 @@ | |||
35 | [self unschedule:@selector(randomlyAddObject:)]; | 36 | [self unschedule:@selector(randomlyAddObject:)]; |
36 | [self schedule:@selector(randomlyAddObject:) interval:0.6f]; | 37 | [self schedule:@selector(randomlyAddObject:) interval:0.6f]; |
37 | addSpeed = 0.6f; | 38 | addSpeed = 0.6f; |
39 | } else if ((lastScore < 5000) && (score >= 5000)) | ||
40 | { | ||
41 | NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; | ||
42 | |||
43 | if (![defaults boolForKey:@"unlockedJumpMode"]) | ||
44 | { | ||
45 | [[CCNotifications sharedManager] addWithTitle:@"Jump" message:@"You've unlocked a new game mode!" image:@"venice.png"]; | ||
46 | |||
47 | [defaults setBool:YES forKey:@"unlockedJumpMode"]; | ||
48 | [defaults synchronize]; | ||
49 | } | ||
38 | } else if ((lastScore < 4500) && (score >= 4500)) | 50 | } else if ((lastScore < 4500) && (score >= 4500)) |
39 | { | 51 | { |
40 | [self unschedule:@selector(randomlyAddObject:)]; | 52 | [self unschedule:@selector(randomlyAddObject:)]; |
diff --git a/Classes/GameMode.m b/Classes/GameMode.m index 8f695d1..af9b3bd 100644 --- a/Classes/GameMode.m +++ b/Classes/GameMode.m | |||
@@ -84,13 +84,16 @@ | |||
84 | { | 84 | { |
85 | [cart tick]; | 85 | [cart tick]; |
86 | 86 | ||
87 | NSMutableSet* discardedObjects = [NSMutableSet set]; | ||
87 | for (FallingObject* object in objects) | 88 | for (FallingObject* object in objects) |
88 | { | 89 | { |
89 | if ([object tick]) | 90 | if ([object tick]) |
90 | { | 91 | { |
91 | [objects removeObject:object]; | 92 | [discardedObjects addObject:object]; |
92 | } | 93 | } |
93 | } | 94 | } |
95 | |||
96 | [objects minusSet:discardedObjects]; | ||
94 | } | 97 | } |
95 | 98 | ||
96 | - (BOOL)canPause | 99 | - (BOOL)canPause |
diff --git a/Classes/GameModeSelectionLayer.m b/Classes/GameModeSelectionLayer.m index db08146..3fbf417 100644 --- a/Classes/GameModeSelectionLayer.m +++ b/Classes/GameModeSelectionLayer.m | |||
@@ -14,6 +14,7 @@ | |||
14 | #import "TutorialMode.h" | 14 | #import "TutorialMode.h" |
15 | #import "ClassicGameMode.h" | 15 | #import "ClassicGameMode.h" |
16 | #import "NMPanelMenu.h" | 16 | #import "NMPanelMenu.h" |
17 | #import "JumpGameMode.h" | ||
17 | 18 | ||
18 | @implementation GameModeSelectionLayer | 19 | @implementation GameModeSelectionLayer |
19 | 20 | ||
@@ -56,6 +57,17 @@ | |||
56 | 57 | ||
57 | [gameModes addObject:collectSelection]; | 58 | [gameModes addObject:collectSelection]; |
58 | 59 | ||
60 | GameModeSelection* jumpSelection; | ||
61 | |||
62 | if ([defaults boolForKey:@"unlockedJumpMode"]) | ||
63 | { | ||
64 | jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlocked:YES]; | ||
65 | } else { | ||
66 | jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlockCondition:@"Get 5000 points in Collect!"]; | ||
67 | } | ||
68 | |||
69 | [gameModes addObject:jumpSelection]; | ||
70 | |||
59 | CCMenu* menu = [CCMenu menuWithItems:nil]; | 71 | CCMenu* menu = [CCMenu menuWithItems:nil]; |
60 | float onePanelWide = 128; | 72 | float onePanelWide = 128; |
61 | float padding = 15; | 73 | float padding = 15; |
@@ -126,6 +138,9 @@ | |||
126 | } else if ([gameMode.name isEqual:@"Collect"]) | 138 | } else if ([gameMode.name isEqual:@"Collect"]) |
127 | { | 139 | { |
128 | [[CCDirector sharedDirector] replaceScene:[ClassicGameMode scene]]; | 140 | [[CCDirector sharedDirector] replaceScene:[ClassicGameMode scene]]; |
141 | } else if ([gameMode.name isEqual:@"Jump"]) | ||
142 | { | ||
143 | [[CCDirector sharedDirector] replaceScene:[JumpGameMode scene]]; | ||
129 | } | 144 | } |
130 | } | 145 | } |
131 | 146 | ||
diff --git a/Resources/venice.png b/Resources/venice.png new file mode 100644 index 0000000..512c2b4 --- /dev/null +++ b/Resources/venice.png | |||
Binary files differ | |||
diff --git a/libs/cocos2d/CCNotifications.h b/libs/cocos2d/CCNotifications.h new file mode 100755 index 0000000..8609801 --- /dev/null +++ b/libs/cocos2d/CCNotifications.h | |||
@@ -0,0 +1,141 @@ | |||
1 | /* | ||
2 | * CCNotifications | ||
3 | * | ||
4 | * Copyright (c) 2010 ForzeField Studios S.L. | ||
5 | * http://forzefield.com | ||
6 | * | ||
7 | * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
8 | * of this software and associated documentation files (the "Software"), to deal | ||
9 | * in the Software without restriction, including without limitation the rights | ||
10 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
11 | * copies of the Software, and to permit persons to whom the Software is | ||
12 | * furnished to do so, subject to the following conditions: | ||
13 | * | ||
14 | * The above copyright notice and this permission notice shall be included in | ||
15 | * all copies or substantial portions of the Software. | ||
16 | * | ||
17 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
18 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
19 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
20 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
21 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
22 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
23 | * THE SOFTWARE. | ||
24 | * | ||
25 | */ | ||
26 | |||
27 | #import <Foundation/Foundation.h> | ||
28 | #import "cocos2d.h" | ||
29 | |||
30 | #define KNOTIFICATIONMIN_SCALE 0.0001f | ||
31 | |||
32 | @interface ccNotificationData : NSObject | ||
33 | { | ||
34 | NSString *title_; | ||
35 | NSString *message_; | ||
36 | id media_; | ||
37 | int mediaType_; | ||
38 | int tag_; | ||
39 | BOOL animated_; | ||
40 | } | ||
41 | @property(nonatomic, retain) NSString *title; | ||
42 | @property(nonatomic, retain) NSString *message; | ||
43 | @property(nonatomic, retain) id media; | ||
44 | @property(nonatomic, readwrite, assign) int mediaType; | ||
45 | @property(nonatomic, readwrite, assign) int tag; | ||
46 | @property(nonatomic, readwrite, assign) BOOL animated; | ||
47 | |||
48 | @end | ||
49 | |||
50 | @protocol CCNotificationsDelegate <NSObject> | ||
51 | @optional | ||
52 | - (void) notification:(ccNotificationData*)notification newState:(char)state; | ||
53 | - (BOOL) touched:(int)tag; | ||
54 | - (void) notificationChangeState:(char)state tag:(int)tag DEPRECATED_ATTRIBUTE; | ||
55 | @end | ||
56 | |||
57 | @protocol CCNotificationDesignProtocol <NSObject> | ||
58 | - (void) setTitle:(NSString*)title message:(NSString*)message texture:(CCTexture2D*)texture; | ||
59 | @end | ||
60 | |||
61 | enum | ||
62 | { | ||
63 | kCCNotificationStateHide, | ||
64 | kCCNotificationStateAnimationOut, | ||
65 | kCCNotificationStateShowing, | ||
66 | kCCNotificationStateAnimationIn, | ||
67 | }; | ||
68 | |||
69 | enum | ||
70 | { | ||
71 | kCCNotificationPositionBottom, | ||
72 | kCCNotificationPositionTop, | ||
73 | }; | ||
74 | |||
75 | enum | ||
76 | { | ||
77 | kCCNotificationAnimationMovement, | ||
78 | kCCNotificationAnimationScale, | ||
79 | }; | ||
80 | |||
81 | enum | ||
82 | { | ||
83 | kCCNotificationMediaPath, | ||
84 | kCCNotificationMediaTexture, | ||
85 | }; | ||
86 | |||
87 | #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED | ||
88 | @interface CCNotifications : NSObject <CCStandardTouchDelegate> | ||
89 | #elif defined(__MAC_OS_X_VERSION_MAX_ALLOWED) | ||
90 | @interface CCNotifications : NSObject | ||
91 | #endif | ||
92 | { | ||
93 | id <CCNotificationsDelegate> delegate_; | ||
94 | CCNode <CCNotificationDesignProtocol> *template_; | ||
95 | char state_; | ||
96 | char position_; | ||
97 | ccTime showingTime_; | ||
98 | ccTime timeAnimationIn_; | ||
99 | ccTime timeAnimationOut_; | ||
100 | char typeAnimationIn_; | ||
101 | char typeAnimationOut_; | ||
102 | |||
103 | //Caching | ||
104 | CCArray *cachedNotifications_; | ||
105 | ccNotificationData *currentNotification_; | ||
106 | |||
107 | CCActionInterval *animationIn_; | ||
108 | CCActionInterval *animationOut_; | ||
109 | } | ||
110 | @property(nonatomic, retain) id <CCNotificationsDelegate> delegate; | ||
111 | @property(nonatomic, retain) CCNode <CCNotificationDesignProtocol> *notificationDesign; | ||
112 | @property(nonatomic, retain) CCActionInterval *animationIn; | ||
113 | @property(nonatomic, retain) CCActionInterval *animationOut; | ||
114 | @property(nonatomic, retain) ccNotificationData *currentNotification; | ||
115 | @property(nonatomic, readwrite, assign) char position; | ||
116 | @property(nonatomic, readwrite, assign) ccTime showingTime; | ||
117 | |||
118 | + (CCNotifications *) sharedManager; | ||
119 | + (void) purgeSharedManager; | ||
120 | + (id) systemWithTemplate:(CCNode <CCNotificationDesignProtocol> *)notifications; | ||
121 | |||
122 | - (id) initWithTemplate:(CCNode <CCNotificationDesignProtocol> *)templates; | ||
123 | - (void) setAnimationIn:(char)type time:(ccTime)time; | ||
124 | - (void) setAnimationOut:(char)type time:(ccTime)time; | ||
125 | - (void) setAnimation:(char)type time:(ccTime)time; | ||
126 | - (void) updateAnimations; | ||
127 | |||
128 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message image:(NSString*)image tag:(int)tag animate:(BOOL)animate waitUntilDone:(BOOL)isCached; | ||
129 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message texture:(CCTexture2D*)texture tag:(int)tag animate:(BOOL)animate waitUntilDone:(BOOL)isCached; | ||
130 | |||
131 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message image:(NSString*)image tag:(int)tag animate:(BOOL)animate; | ||
132 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message texture:(CCTexture2D*)texture tag:(int)tag animate:(BOOL)animate; | ||
133 | |||
134 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message image:(NSString*)image; | ||
135 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message texture:(CCTexture2D*)texture; | ||
136 | |||
137 | - (void) addSafelyWithTitle:(NSString*)title message:(NSString*)message image:(NSString*)image tag:(int)tag animate:(BOOL)animate DEPRECATED_ATTRIBUTE; | ||
138 | |||
139 | |||
140 | - (void) visit; | ||
141 | @end \ No newline at end of file | ||
diff --git a/libs/cocos2d/CCNotifications.m b/libs/cocos2d/CCNotifications.m new file mode 100755 index 0000000..235a6a0 --- /dev/null +++ b/libs/cocos2d/CCNotifications.m | |||
@@ -0,0 +1,494 @@ | |||
1 | /* | ||
2 | * CCNotifications | ||
3 | * | ||
4 | * Copyright (c) 2010 ForzeField Studios S.L. | ||
5 | * http://forzefield.com | ||
6 | * | ||
7 | * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
8 | * of this software and associated documentation files (the "Software"), to deal | ||
9 | * in the Software without restriction, including without limitation the rights | ||
10 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
11 | * copies of the Software, and to permit persons to whom the Software is | ||
12 | * furnished to do so, subject to the following conditions: | ||
13 | * | ||
14 | * The above copyright notice and this permission notice shall be included in | ||
15 | * all copies or substantial portions of the Software. | ||
16 | * | ||
17 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
18 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
19 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
20 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
21 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
22 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
23 | * THE SOFTWARE. | ||
24 | * | ||
25 | */ | ||
26 | |||
27 | |||
28 | #import "CCNotifications.h" | ||
29 | #import "CCArray.h" | ||
30 | #import "notificationDesign.h" | ||
31 | |||
32 | |||
33 | @implementation ccNotificationData | ||
34 | @synthesize title = title_; | ||
35 | @synthesize message = message_; | ||
36 | @synthesize media = media_; | ||
37 | @synthesize mediaType = mediaType_; | ||
38 | @synthesize tag = tag_; | ||
39 | @synthesize animated = animated_; | ||
40 | |||
41 | |||
42 | - (void) dealloc | ||
43 | { | ||
44 | [self setTitle:nil]; | ||
45 | [self setMessage:nil]; | ||
46 | [self setMedia:nil]; | ||
47 | [super dealloc]; | ||
48 | } | ||
49 | |||
50 | |||
51 | @end | ||
52 | |||
53 | @interface CCNotifications (Private) | ||
54 | |||
55 | - (void) _updateAnimationIn; | ||
56 | - (void) _updateAnimationOut; | ||
57 | - (CCActionInterval*) _animation:(char)type time:(ccTime)time; | ||
58 | - (void) _showNotification; | ||
59 | - (void) _addNotificationToArray:(ccNotificationData*)data cached:(BOOL)isCached; | ||
60 | - (void) _startScheduler; | ||
61 | - (void) _hideNotification; | ||
62 | - (void) _hideNotificationScheduler; | ||
63 | - (void) registerWithTouchDispatcher; | ||
64 | - (void) _setState:(char)states; | ||
65 | |||
66 | @end | ||
67 | |||
68 | |||
69 | @implementation CCNotifications | ||
70 | @synthesize position = position_; | ||
71 | @synthesize notificationDesign = template_; | ||
72 | @synthesize animationIn = animationIn_; | ||
73 | @synthesize animationOut = animationOut_; | ||
74 | @synthesize delegate = delegate_; | ||
75 | @synthesize showingTime = showingTime_; | ||
76 | @synthesize currentNotification = currentNotification_; | ||
77 | |||
78 | static CCNotifications *sharedManager; | ||
79 | |||
80 | + (CCNotifications *)sharedManager | ||
81 | { | ||
82 | if (!sharedManager) | ||
83 | sharedManager = [[CCNotifications alloc] init]; | ||
84 | |||
85 | return sharedManager; | ||
86 | } | ||
87 | |||
88 | + (id) alloc | ||
89 | { | ||
90 | NSAssert(sharedManager == nil, @"Attempted to allocate a second instance of a singleton."); | ||
91 | return [super alloc]; | ||
92 | } | ||
93 | |||
94 | + (id) systemWithTemplate:(CCNode <CCNotificationDesignProtocol> *)notifications | ||
95 | { | ||
96 | NSAssert(sharedManager == nil, @"Attempted to allocate a second instance of a singleton. You should use setTemplate"); | ||
97 | sharedManager = [[CCNotifications alloc] initWithTemplate:notifications]; | ||
98 | |||
99 | return sharedManager; | ||
100 | } | ||
101 | |||
102 | + (void) purgeSharedManager | ||
103 | { | ||
104 | [sharedManager release]; | ||
105 | } | ||
106 | |||
107 | - (id) init | ||
108 | { | ||
109 | CCNode <CCNotificationDesignProtocol> *templates = [[[CCNotificationDefaultDesign alloc] init] autorelease]; | ||
110 | self = [self initWithTemplate:templates]; | ||
111 | return self; | ||
112 | } | ||
113 | |||
114 | - (id) initWithTemplate:(CCNode <CCNotificationDesignProtocol> *)templates | ||
115 | { | ||
116 | if( (self = [super init]) ) { | ||
117 | self.notificationDesign = templates; | ||
118 | |||
119 | delegate_ = nil; | ||
120 | state_ = kCCNotificationStateHide; | ||
121 | typeAnimationIn_ = kCCNotificationAnimationMovement; | ||
122 | typeAnimationOut_ = kCCNotificationAnimationMovement; | ||
123 | timeAnimationIn_ = 0.0f; | ||
124 | timeAnimationOut_ = 0.0f; | ||
125 | |||
126 | cachedNotifications_ = [[CCArray alloc] initWithCapacity:4]; | ||
127 | |||
128 | //Default settings | ||
129 | showingTime_ = 4.0f; | ||
130 | position_ = kCCNotificationPositionTop; | ||
131 | |||
132 | [self setAnimation:kCCNotificationAnimationMovement time:0.5f]; | ||
133 | //[self setAnimationIn:kCCNotificationAnimationMovement time:0.5f]; | ||
134 | //[self setAnimationOut:kCCNotificationAnimationScale time:0.5f]; | ||
135 | } | ||
136 | return self; | ||
137 | } | ||
138 | |||
139 | - (void) _setState:(char)states | ||
140 | { | ||
141 | if(state_==states) return; | ||
142 | state_ = states; | ||
143 | |||
144 | if([delegate_ respondsToSelector:@selector(notification:newState:)]) | ||
145 | [delegate_ notification:currentNotification_ newState:state_]; | ||
146 | |||
147 | if([delegate_ respondsToSelector:@selector(notificationChangeState:tag:)]) | ||
148 | [delegate_ notificationChangeState:state_ tag:[currentNotification_ tag]]; | ||
149 | } | ||
150 | |||
151 | - (void) setPosition:(char)positions | ||
152 | { | ||
153 | position_ = positions; | ||
154 | [self updateAnimations]; | ||
155 | } | ||
156 | |||
157 | - (void) setNotificationDesign:(CCNode <CCNotificationDesignProtocol>*) templates | ||
158 | { | ||
159 | if(state_!=kCCNotificationStateHide) | ||
160 | [template_ stopAllActions]; | ||
161 | |||
162 | if(state_==kCCNotificationStateShowing) | ||
163 | { | ||
164 | #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED | ||
165 | [[CCTouchDispatcher sharedDispatcher] removeDelegate:self]; | ||
166 | #endif | ||
167 | [[CCScheduler sharedScheduler] unscheduleSelector:@selector(_hideNotificationScheduler) forTarget:self]; | ||
168 | } | ||
169 | |||
170 | [templates retain]; | ||
171 | [template_ release]; | ||
172 | template_ = templates; | ||
173 | [template_ setVisible:NO]; | ||
174 | [template_ setIsRelativeAnchorPoint:YES]; | ||
175 | |||
176 | [self _setState:kCCNotificationStateHide]; | ||
177 | } | ||
178 | #pragma mark Notification Actions | ||
179 | |||
180 | - (CCActionInterval*) _animation:(char)type time:(ccTime)time | ||
181 | { | ||
182 | CCActionInterval *action = nil; | ||
183 | switch (type){ | ||
184 | case kCCNotificationAnimationMovement: | ||
185 | if(position_==kCCNotificationPositionBottom) | ||
186 | action = [CCMoveBy actionWithDuration:time position:ccp(0, template_.contentSize.height)]; | ||
187 | |||
188 | else if(position_ == kCCNotificationPositionTop) | ||
189 | action = [CCMoveBy actionWithDuration:time position:ccp(0, -template_.contentSize.height)]; | ||
190 | |||
191 | break; | ||
192 | case kCCNotificationAnimationScale: | ||
193 | action = [CCScaleBy actionWithDuration:time scale:(1.0f-KNOTIFICATIONMIN_SCALE)/KNOTIFICATIONMIN_SCALE]; | ||
194 | |||
195 | break; | ||
196 | default: break; | ||
197 | } | ||
198 | return action; | ||
199 | } | ||
200 | |||
201 | - (void) _updateAnimationIn | ||
202 | { | ||
203 | self.animationIn = [CCSequence actionOne:[self _animation:typeAnimationIn_ time:timeAnimationIn_] two:[CCCallFunc actionWithTarget:self selector:@selector(_startScheduler)]]; | ||
204 | } | ||
205 | |||
206 | - (void) _updateAnimationOut | ||
207 | { | ||
208 | CCActionInterval *tempAction = [self _animation:typeAnimationOut_ time:timeAnimationOut_]; | ||
209 | self.animationOut = [CCSequence actionOne:[tempAction reverse] two:[CCCallFunc actionWithTarget:self selector:@selector(_hideNotification)]]; | ||
210 | } | ||
211 | |||
212 | - (void) updateAnimations | ||
213 | { | ||
214 | [self _updateAnimationIn]; | ||
215 | [self _updateAnimationOut]; | ||
216 | } | ||
217 | |||
218 | - (void) setAnimationIn:(char)type time:(ccTime)time | ||
219 | { | ||
220 | typeAnimationIn_ = type; | ||
221 | timeAnimationIn_ = time; | ||
222 | [self _updateAnimationIn]; | ||
223 | } | ||
224 | |||
225 | - (void) setAnimationOut:(char)type time:(ccTime)time | ||
226 | { | ||
227 | typeAnimationOut_ = type; | ||
228 | timeAnimationOut_ = time; | ||
229 | [self _updateAnimationOut]; | ||
230 | } | ||
231 | |||
232 | - (void) setAnimation:(char)type time:(ccTime)time | ||
233 | { | ||
234 | typeAnimationIn_ = typeAnimationOut_ = type; | ||
235 | timeAnimationIn_ = timeAnimationOut_ = time; | ||
236 | [self updateAnimations]; | ||
237 | } | ||
238 | |||
239 | #pragma mark Notification steps | ||
240 | |||
241 | - (void) _startScheduler | ||
242 | { | ||
243 | #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED | ||
244 | [self registerWithTouchDispatcher]; | ||
245 | #endif | ||
246 | [self _setState:kCCNotificationStateShowing]; | ||
247 | [template_ stopAllActions]; | ||
248 | [[CCScheduler sharedScheduler] scheduleSelector:@selector(_hideNotificationScheduler) forTarget:self interval:showingTime_ paused:NO]; | ||
249 | } | ||
250 | |||
251 | - (void) _hideNotification | ||
252 | { | ||
253 | [self _setState:kCCNotificationStateHide]; | ||
254 | [template_ setVisible:NO]; | ||
255 | [template_ stopAllActions]; | ||
256 | [template_ onExit]; | ||
257 | |||
258 | //Release current notification | ||
259 | [cachedNotifications_ removeObject:currentNotification_]; | ||
260 | self.currentNotification = nil; | ||
261 | |||
262 | //Check next notification | ||
263 | [self _showNotification]; | ||
264 | } | ||
265 | |||
266 | - (void) _hideNotificationScheduler | ||
267 | { | ||
268 | #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED | ||
269 | [[CCTouchDispatcher sharedDispatcher] removeDelegate:self]; | ||
270 | #endif | ||
271 | [[CCScheduler sharedScheduler] unscheduleSelector:@selector(_hideNotificationScheduler) forTarget:self]; | ||
272 | if([currentNotification_ animated]) | ||
273 | { | ||
274 | [self _setState:kCCNotificationStateAnimationOut]; | ||
275 | [template_ runAction:animationOut_]; | ||
276 | }else | ||
277 | [self _hideNotification]; | ||
278 | } | ||
279 | |||
280 | #pragma mark Manager Notifications | ||
281 | |||
282 | - (void) _addNotificationToArray:(ccNotificationData*)data cached:(BOOL)isCached | ||
283 | { | ||
284 | if(isCached) | ||
285 | { | ||
286 | [cachedNotifications_ addObject:data]; | ||
287 | if([cachedNotifications_ count]==1) | ||
288 | [self _showNotification]; | ||
289 | }else{ | ||
290 | if(currentNotification_) | ||
291 | { | ||
292 | [cachedNotifications_ removeObject:currentNotification_]; | ||
293 | } | ||
294 | [cachedNotifications_ insertObject:data atIndex:0]; | ||
295 | [self _showNotification]; | ||
296 | } | ||
297 | } | ||
298 | |||
299 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message image:(NSString*)image tag:(int)tag animate:(BOOL)animate waitUntilDone:(BOOL)isCached | ||
300 | { | ||
301 | ccNotificationData *data = [[ccNotificationData alloc] init]; | ||
302 | data.title = title; | ||
303 | data.message = message; | ||
304 | data.media = image; | ||
305 | data.mediaType = kCCNotificationMediaPath; | ||
306 | data.tag = tag; | ||
307 | data.animated = animate; | ||
308 | |||
309 | [self _addNotificationToArray:data cached:isCached]; | ||
310 | [data release]; | ||
311 | return data; | ||
312 | } | ||
313 | |||
314 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message texture:(CCTexture2D*)texture tag:(int)tag animate:(BOOL)animate waitUntilDone:(BOOL)isCached | ||
315 | { | ||
316 | ccNotificationData *data = [[ccNotificationData alloc] init]; | ||
317 | data.title = title; | ||
318 | data.message = message; | ||
319 | data.media = texture; | ||
320 | data.mediaType = kCCNotificationMediaTexture; | ||
321 | data.tag = tag; | ||
322 | data.animated = animate; | ||
323 | |||
324 | [self _addNotificationToArray:data cached:isCached]; | ||
325 | [data release]; | ||
326 | return data; | ||
327 | } | ||
328 | |||
329 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message image:(NSString*)image tag:(int)tag animate:(BOOL)animate | ||
330 | { | ||
331 | return [self addWithTitle:title message:message image:image tag:tag animate:animate waitUntilDone:YES]; | ||
332 | } | ||
333 | |||
334 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message texture:(CCTexture2D*)texture tag:(int)tag animate:(BOOL)animate | ||
335 | { | ||
336 | return [self addWithTitle:title message:message texture:texture tag:tag animate:animate waitUntilDone:YES]; | ||
337 | } | ||
338 | |||
339 | /* Fast methods */ | ||
340 | |||
341 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message image:(NSString*)image | ||
342 | { | ||
343 | return [self addWithTitle:title message:message image:image tag:-1 animate:YES waitUntilDone:YES]; | ||
344 | } | ||
345 | |||
346 | - (ccNotificationData*) addWithTitle:(NSString*)title message:(NSString*)message texture:(CCTexture2D*)texture | ||
347 | { | ||
348 | return [self addWithTitle:title message:message texture:texture tag:-1 animate:YES waitUntilDone:YES]; | ||
349 | } | ||
350 | |||
351 | /* Deprecated */ | ||
352 | - (void) addSafelyWithTitle:(NSString*)title message:(NSString*)message image:(NSString*)image tag:(int)tag animate:(BOOL)animate | ||
353 | { | ||
354 | [self addWithTitle:title message:message image:image tag:tag animate:animate waitUntilDone:YES]; | ||
355 | } | ||
356 | |||
357 | - (void) _showNotification | ||
358 | { | ||
359 | if([cachedNotifications_ count]==0) return; | ||
360 | //Get notification data | ||
361 | self.currentNotification = [cachedNotifications_ objectAtIndex:0]; | ||
362 | |||
363 | //Stop system | ||
364 | if(state_==kCCNotificationStateShowing) | ||
365 | { | ||
366 | #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED | ||
367 | [[CCTouchDispatcher sharedDispatcher] removeDelegate:self]; | ||
368 | #else | ||
369 | [[CCEventDispatcher sharedDispatcher] removeMouseDelegate:self]; | ||
370 | #endif | ||
371 | } | ||
372 | |||
373 | if(state_!=kCCNotificationStateHide) | ||
374 | { | ||
375 | [self _setState:kCCNotificationStateHide]; | ||
376 | |||
377 | [template_ setVisible:NO]; | ||
378 | [template_ stopAllActions]; | ||
379 | [template_ onExit]; | ||
380 | [[CCScheduler sharedScheduler] unscheduleSelector:@selector(_hideNotificationScheduler) forTarget:self]; | ||
381 | } | ||
382 | |||
383 | //Get variables | ||
384 | CCTexture2D *texture = (currentNotification_.media) ? ((currentNotification_.mediaType==kCCNotificationMediaTexture) ? (CCTexture2D*)currentNotification_.media : [[CCTextureCache sharedTextureCache] addImage:(NSString*)currentNotification_.media]) : nil; | ||
385 | |||
386 | //Prepare template | ||
387 | [template_ setVisible:NO]; | ||
388 | [template_ stopAllActions]; | ||
389 | [template_ onExit]; | ||
390 | |||
391 | //Prepare animation | ||
392 | CGSize winSize = CGSizeMake(480,320); | ||
393 | if(currentNotification_.animated) | ||
394 | { | ||
395 | if(position_==kCCNotificationPositionBottom){ | ||
396 | [template_ setAnchorPoint:ccp(0.5f, 0)]; | ||
397 | switch (typeAnimationIn_) { | ||
398 | case kCCNotificationAnimationMovement: | ||
399 | [template_ setScale:1.0f]; | ||
400 | [template_ setPosition:ccp(winSize.width/2.0f, -template_.contentSize.height)]; | ||
401 | |||
402 | break; | ||
403 | case kCCNotificationAnimationScale: | ||
404 | [template_ setScale:KNOTIFICATIONMIN_SCALE]; | ||
405 | [template_ setPosition:ccp(winSize.width/2.0f, 0)]; | ||
406 | |||
407 | break; | ||
408 | default: return; | ||
409 | } | ||
410 | |||
411 | }else if(position_==kCCNotificationPositionTop) | ||
412 | { | ||
413 | [template_ setAnchorPoint:ccp(0.5f, 1)]; | ||
414 | switch (typeAnimationIn_){ | ||
415 | case kCCNotificationAnimationMovement: | ||
416 | [template_ setScale:1.0f]; | ||
417 | [template_ setPosition:ccp(winSize.width/2.0f, winSize.height+template_.contentSize.height)]; | ||
418 | |||
419 | break; | ||
420 | case kCCNotificationAnimationScale: | ||
421 | [template_ setScale:KNOTIFICATIONMIN_SCALE]; | ||
422 | [template_ setPosition:ccp(winSize.width/2.0f, winSize.height)]; | ||
423 | |||
424 | break; | ||
425 | default: return; | ||
426 | } | ||
427 | } | ||
428 | [self _setState:kCCNotificationStateAnimationIn]; | ||
429 | [template_ onEnter]; | ||
430 | [template_ runAction:animationIn_]; | ||
431 | |||
432 | }else{ | ||
433 | if(position_==kCCNotificationPositionBottom) | ||
434 | { | ||
435 | [template_ setAnchorPoint:ccp(0.5f, 0)]; | ||
436 | [template_ setPosition:ccp(winSize.width/2.0f, 0)]; | ||
437 | }else if(position_==kCCNotificationPositionTop) | ||
438 | { | ||
439 | [template_ setAnchorPoint:ccp(0.5f, 1)]; | ||
440 | [template_ setPosition:ccp(winSize.width/2.0f, winSize.height)]; | ||
441 | } | ||
442 | [self _startScheduler]; | ||
443 | } | ||
444 | |||
445 | //Update template | ||
446 | [template_ setTitle:[currentNotification_ title] message:[currentNotification_ message] texture:texture]; | ||
447 | [template_ setVisible:YES]; | ||
448 | } | ||
449 | |||
450 | #pragma mark Touch Events | ||
451 | |||
452 | #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED | ||
453 | - (void) registerWithTouchDispatcher | ||
454 | { | ||
455 | [[CCTouchDispatcher sharedDispatcher] addStandardDelegate:self priority:INT_MIN]; | ||
456 | } | ||
457 | |||
458 | - (void) ccTouchesEnded:(NSSet *)touches withEvent:(UIEvent *)event | ||
459 | { | ||
460 | UITouch *touch = [touches anyObject]; | ||
461 | CGPoint point = [[CCDirector sharedDirector] convertToGL:[touch locationInView:[touch view]]]; | ||
462 | CGRect rect = [template_ boundingBox]; | ||
463 | if(CGRectContainsPoint(rect, point)) | ||
464 | if([delegate_ respondsToSelector:@selector(touched:)] && [delegate_ touched:[currentNotification_ tag]]) | ||
465 | [self _hideNotificationScheduler]; | ||
466 | } | ||
467 | #endif | ||
468 | |||
469 | #pragma mark Other methods | ||
470 | |||
471 | - (void) visit | ||
472 | { | ||
473 | [template_ visit]; | ||
474 | } | ||
475 | |||
476 | - (NSString*) description | ||
477 | { | ||
478 | return [NSString stringWithFormat:@"<%@ = %08X>", [self class], self]; | ||
479 | } | ||
480 | |||
481 | -(void) dealloc | ||
482 | { | ||
483 | CCLOG(@"cocos2d: deallocing %@", self); | ||
484 | |||
485 | sharedManager = nil; | ||
486 | [cachedNotifications_ release]; | ||
487 | [self setCurrentNotification:nil]; | ||
488 | [self setNotificationDesign:nil]; | ||
489 | [self setDelegate:nil]; | ||
490 | [self setAnimationIn:nil]; | ||
491 | [self setAnimationOut:nil]; | ||
492 | [super dealloc]; | ||
493 | } | ||
494 | @end \ No newline at end of file | ||
diff --git a/libs/cocos2d/notificationDesign.h b/libs/cocos2d/notificationDesign.h new file mode 100644 index 0000000..856fb74 --- /dev/null +++ b/libs/cocos2d/notificationDesign.h | |||
@@ -0,0 +1,39 @@ | |||
1 | /* | ||
2 | * CCNotifications | ||
3 | * | ||
4 | * Copyright (c) 2010 ForzeField Studios S.L. | ||
5 | * http://forzefield.com | ||
6 | * | ||
7 | * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
8 | * of this software and associated documentation files (the "Software"), to deal | ||
9 | * in the Software without restriction, including without limitation the rights | ||
10 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
11 | * copies of the Software, and to permit persons to whom the Software is | ||
12 | * furnished to do so, subject to the following conditions: | ||
13 | * | ||
14 | * The above copyright notice and this permission notice shall be included in | ||
15 | * all copies or substantial portions of the Software. | ||
16 | * | ||
17 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
18 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
19 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
20 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
21 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
22 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
23 | * THE SOFTWARE. | ||
24 | * | ||
25 | */ | ||
26 | |||
27 | |||
28 | #import <Foundation/Foundation.h> | ||
29 | #import "CCNotifications.h" | ||
30 | #import "cocos2d.h" | ||
31 | |||
32 | @interface CCNotificationDefaultDesign : CCLayerColor <CCNotificationDesignProtocol> | ||
33 | { | ||
34 | CCLabelTTF *title_; | ||
35 | CCLabelTTF *message_; | ||
36 | CCSprite *image_; | ||
37 | } | ||
38 | |||
39 | @end \ No newline at end of file | ||
diff --git a/libs/cocos2d/notificationDesign.m b/libs/cocos2d/notificationDesign.m new file mode 100644 index 0000000..470d402 --- /dev/null +++ b/libs/cocos2d/notificationDesign.m | |||
@@ -0,0 +1,82 @@ | |||
1 | /* | ||
2 | * CCNotifications | ||
3 | * | ||
4 | * Copyright (c) 2010 ForzeField Studios S.L. | ||
5 | * http://forzefield.com | ||
6 | * | ||
7 | * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
8 | * of this software and associated documentation files (the "Software"), to deal | ||
9 | * in the Software without restriction, including without limitation the rights | ||
10 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
11 | * copies of the Software, and to permit persons to whom the Software is | ||
12 | * furnished to do so, subject to the following conditions: | ||
13 | * | ||
14 | * The above copyright notice and this permission notice shall be included in | ||
15 | * all copies or substantial portions of the Software. | ||
16 | * | ||
17 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
18 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
19 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
20 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
21 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
22 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
23 | * THE SOFTWARE. | ||
24 | * | ||
25 | */ | ||
26 | |||
27 | |||
28 | #import "notificationDesign.h" | ||
29 | |||
30 | @implementation CCNotificationDefaultDesign | ||
31 | |||
32 | - (id) init | ||
33 | { | ||
34 | CGSize size = CGSizeMake(480,320); | ||
35 | self = [self initWithColor:ccc4(42, 68, 148, 180) width:size.width height:38]; | ||
36 | if (self != nil) { | ||
37 | title_ = [CCLabelTTF labelWithString:@" " fontName:@"Arial" fontSize:12]; | ||
38 | [title_ setIsRelativeAnchorPoint:NO]; | ||
39 | [title_ setAnchorPoint:CGPointZero]; | ||
40 | [title_ setPosition:ccp(52, 20)]; | ||
41 | |||
42 | message_ = [CCLabelTTF labelWithString:@" " fontName:@"Arial" fontSize:15]; | ||
43 | [message_ setIsRelativeAnchorPoint:NO]; | ||
44 | [message_ setAnchorPoint:CGPointZero]; | ||
45 | [message_ setPosition:ccp(52, 3)]; | ||
46 | |||
47 | image_ = [CCSprite node]; | ||
48 | [image_ setPosition:ccp(26, 19)]; | ||
49 | |||
50 | [self addChild:title_]; | ||
51 | [self addChild:message_]; | ||
52 | [self addChild:image_]; | ||
53 | } | ||
54 | return self; | ||
55 | } | ||
56 | |||
57 | - (void) setTitle:(NSString*)title message:(NSString*)message texture:(CCTexture2D*)texture{ | ||
58 | [title_ setString:title]; | ||
59 | [message_ setString:message]; | ||
60 | if(texture){ | ||
61 | CGRect rect = CGRectZero; | ||
62 | rect.size = texture.contentSize; | ||
63 | [image_ setTexture:texture]; | ||
64 | [image_ setTextureRect:rect]; | ||
65 | //Same size 32x32 | ||
66 | [image_ setScaleX:32.0f/rect.size.width]; | ||
67 | [image_ setScaleY:32.0f/rect.size.height]; | ||
68 | } | ||
69 | } | ||
70 | |||
71 | - (void) updateColor | ||
72 | { | ||
73 | //Gradient code | ||
74 | ccColor3B colorFinal = ccc3(0, 50, 100); | ||
75 | |||
76 | squareColors_[0] = ccc4(color_.r, color_.g, color_.b, opacity_); | ||
77 | squareColors_[1] = ccc4(color_.r, color_.g, color_.b, opacity_); | ||
78 | squareColors_[2] = ccc4(colorFinal.r, colorFinal.g, colorFinal.b, opacity_); | ||
79 | squareColors_[3] = ccc4(colorFinal.r, colorFinal.g, colorFinal.b, opacity_); | ||
80 | } | ||
81 | |||
82 | @end \ No newline at end of file | ||