联网对战+弗利萨+悟空

Classes/AppDelegate.cpp

@@ -1,6 +1,8 @@
 #include "AppDelegate.h"
 #include "Scenes/WelcomeScene.h"
 #include "Scenes/ExampleGameScene.h"
+#include "Scenes/OnlineGameScene.h"
+#include "Scenes/SocketServerScene.h"
 
 // #define USE_AUDIO_ENGINE 1
 // #define USE_SIMPLE_AUDIO_ENGINE 1
@@ -95,8 +97,10 @@ bool AppDelegate::applicationDidFinishLaunching() {
     register_all_packages();
 
     // create a scene. it's an autorelease object
-    auto scene = WelcomeScene::createScene();
-
+    auto scene = OnlineGameScene::createScene();
+	//auto scene = SocketServerScene::createScene();
+	//auto scene = ExampleGameScene::createScene();
+
     // run
     director->runWithScene(scene);
 

Classes/GameSettingScene.cpp

@@ -0,0 +1,12 @@
+#include "GameSettingScene.h"
+
+
+
+GameSettingScene::GameSettingScene()
+{
+}
+
+
+GameSettingScene::~GameSettingScene()
+{
+}

Classes/Players/Charactor.cpp

@@ -52,8 +52,67 @@ Charactor::Charactor(string _name) {
 		hitEffectBegin = 53;
 		hitEffectEnd = 60;//��������Ч
 	}
-	else {
+	else if (name == "Goku") {
+		idleNum = 4;
+		runNum = 6;
+		meleeAttack1Num = 4;
+		meleeAttack2Num = 9;
+		meleeAttack3Num = 15;
+		rangedAttackNum = 6;
+		jumpNum = 7;
+		hitNum = 2;
+		deadNum = 5;
+		winNum = 8;
+		hittedAwayNum = 7; //todo
+		dashNum = 2;
+		defendNum = 1;
+		chargeNum = 4;
+		ultimateNum = 10;
+
+		ultimateBallNum = 4;
+		ultimateBallBegin = 11;
+		ultimateBallEnd = 14;//����
+		chargeEffectNum = 11;
+		chargeEffectBegin = 0;
+		chargeEffectEnd = 10;//����
+		rangedBallNumber = 30;//Զ�̹���
+		explosionNum = 17;
+		explosionBegin = 31;
+		explosionEnd = 47;//��ը
+		hitEffectNum = 8;
+		hitEffectBegin = 53;
+		hitEffectEnd = 60;//��������Ч
+	}
+	else if (name == "Frieza") {
+		idleNum = 3;
+		runNum = 8;
+		meleeAttack1Num = 4;
+		meleeAttack2Num = 7;
+		meleeAttack3Num = 11;
+		rangedAttackNum = 6;
+		jumpNum = 7;
+		hitNum = 2;
+		deadNum = 4;
+		winNum = 5;
+		hittedAwayNum = 7;
+		dashNum = 2;
+		defendNum = 1;
+		chargeNum = 4;
+		ultimateNum = 5;
 
+		ultimateBallNum = 4;
+		ultimateBallBegin = 11;
+		ultimateBallEnd = 14;//����
+		chargeEffectNum = 11;
+		chargeEffectBegin = 0;
+		chargeEffectEnd = 10;//����
+		rangedBallNumber = 30;//Զ�̹���
+		explosionNum = 17;
+		explosionBegin = 31;
+		explosionEnd = 47;//��ը
+		hitEffectNum = 8;
+		hitEffectBegin = 53;
+		hitEffectEnd = 60;//��������Ч
 	}
 
 	rangedBallStr = name + "_boom_" + std::to_string(rangedBallNumber) + ".png";

Classes/Players/PlayerSprite.cpp

@@ -207,6 +207,7 @@ void PlayerSprite::moveLeft()
 	if (isRun) {
 		return;
 	}
+	isMove = true;
 	auto animation = Animation::createWithSpriteFrames(runVector, 0.09f);
 	auto animate = Animate::create(animation);
 	auto MoveAnimate = RepeatForever::create(animate);
@@ -229,6 +230,7 @@ void PlayerSprite::moveRight()
 	if (isRun) {
 		return;
 	}
+	isMove = true;
 	auto animation = Animation::createWithSpriteFrames(runVector, 0.09f);
 	auto animate = Animate::create(animation);
 	auto MoveAnimate = RepeatForever::create(animate);
@@ -447,6 +449,7 @@ void PlayerSprite::dashLeft(Vec2 oppoentPosition)
 	if (isRun) {
 		return;
 	}
+	isMove = true;
 	setFlippedX(false);
 	physicPlayer->getPhysicsBody()->setVelocity(Vec2(-800,0));
 	auto animation = Animation::createWithSpriteFrames(dashVector, 0.09f, 0);
@@ -462,6 +465,7 @@ void PlayerSprite::dashRight(Vec2 oppoentPosition)
 	if (isRun) {
 		return;
 	}
+	isMove = true;
 	setFlippedX(true);
 	physicPlayer->getPhysicsBody()->setVelocity(Vec2(800, 0));
 	auto animation = Animation::createWithSpriteFrames(dashVector, 0.09f, 0);
@@ -553,7 +557,7 @@ void PlayerSprite::defend() {
 
 /* ���� */
 void PlayerSprite::charge() {
-	if (isRun) {
+	if (getActionByTag(0) == NULL) {
 		return;
 	}
 	auto end = CallFuncN::create([&](Ref* sender) {

Classes/Players/PlayerSprite.h

@@ -72,6 +72,7 @@ class PlayerSprite : public Sprite
 	bool stopJump = true, stopMeleeAttack = true, stopRangedAttack = true;
 	bool isHitted = false, isHitting = false, isUltimate = false;
 	bool isDead = false, isWin = false;
+	bool isMove = false;
 	int hittedCount = 0;
 	/*���������жϱ���*/
 	bool isDouble = false;