OSDN > Developer >

gecchi > Chamber > MyMain01 > 提交

gecchi

Violet Vreath
Fork

(Original repository, No fork origin)

R/O
HTTP
SSH
HTTPS

提交

Commit MetaInfo

修订版	d0910fe88b2e6cd0d2571c20cc96a43759c2a652 (tree)
时间	2024-12-09 21:29:26
作者	gecchi <gecchi@boch...>
Commiter	gecchi

Log Message

フェードアウトが無音にならないバグ調査中

更改概述

modified: GgafDx/src/jp/ggaf/dx/sound/Bgm.cpp (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/ViewPointGuide.cpp (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001a.cpp (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001b.cpp (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001b.h (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras.cpp (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras.h (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras001.cpp (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras002.cpp (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/scene/Spacetime/World/GameScene.cpp (diff)
modified: VioletVreath/src/jp/gecchi/VioletVreath/scene/Spacetime/World/GameScene/GameMainScene/StageWorld/RankUpStageController.cpp (diff)

差异

--- a/GgafDx/src/jp/ggaf/dx/sound/Bgm.cpp

+++ b/GgafDx/src/jp/ggaf/dx/sound/Bgm.cpp

		@@ -90,6 +90,12 @@ void Bgm::stop() {
90	90	void Bgm::setVolume(int prm_volume) {
91	91	_volume = prm_volume;
92	92	//マスターBGM音量率を考慮
	93	+ if (_volume > GGAF_MAX_VOLUME) {
	94	+ _volume = GGAF_MAX_VOLUME;
	95	+ }
	96	+ if (_volume < GGAF_MIN_VOLUME) {
	97	+ _volume = GGAF_MIN_VOLUME;
	98	+ }
93	99	int v = (int)(_volume * Sound::_pBgmManager->getBgmMasterVolumeRate());
94	100	if (v > GGAF_MAX_VOLUME) {
95	101	v = GGAF_MAX_VOLUME;

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/ViewPointGuide.cpp

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/ViewPointGuide.cpp

		@@ -3,8 +3,6 @@
3	3	#include "jp/ggaf/dx/actor/camera/CameraViewPoint.h"
4	4	#include "jp/gecchi/VioletVreath/Caretaker.h"
5	5
6		-
7		-
8	6	using namespace GgafLib;
9	7	using namespace VioletVreath;
10	8

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001a.cpp

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001a.cpp

		@@ -4,8 +4,6 @@
4	4	#include "jp/gecchi/VioletVreath/Caretaker.h"
5	5	#include "jp/gecchi/VioletVreath/actor/enemy/Ortuna/EnemyOrtuna.h"
6	6
7		-
8		-
9	7	using namespace GgafLib;
10	8	using namespace VioletVreath;
11	9

		@@ -25,9 +23,8 @@ void FormationOrtuna001a::onSummonOrtuna(EnemyOrtuna* prm_pOrtuna, int prm_index
25	23	static coord r = PX_C(200);
26	24	coord ang = UTIL::getAngle2D(z - pMyShip->_z, y - pMyShip->_y);
27	25	prm_pOrtuna->stagnating_pos_.set( x,
28		- y + (ANG_SIN(ang) * r),
29		- z + (ANG_COS(ang) * r));
30		-
	26	+ y + (ANG_SIN(ang) * r),
	27	+ z + (ANG_COS(ang) * r) );
31	28	}
32	29
33	30	FormationOrtuna001a::~FormationOrtuna001a() {

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001b.cpp

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001b.cpp

		@@ -4,8 +4,6 @@
4	4	#include "jp/gecchi/VioletVreath/scene/Spacetime/World/GameScene/MyShipScene.h"
5	5	#include "jp/gecchi/VioletVreath/Caretaker.h"
6	6
7		-
8		-
9	7	using namespace GgafLib;
10	8	using namespace VioletVreath;
11	9

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001b.h

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001b.h

		@@ -2,7 +2,6 @@
2	2	#define FORMATIONORTUNA001B_H_
3	3	#include "jp/gecchi/VioletVreath/VioletVreath.h"
4	4	#include "jp/gecchi/VioletVreath/actor/enemy/Ortuna/FormationOrtuna001.h"
5		-#include "jp/ggaf/dx/util/GeoElem.h"
6	5
7	6	namespace VioletVreath {
8	7

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras.cpp

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras.cpp

		@@ -50,8 +50,8 @@ void FormationThagoras::processBehavior() {
50	50	EnemyThagoras* pThagoras = (EnemyThagoras*)summonMember();
51	51	if (pThagoras) {
52	52	onSummon(pThagoras, cnt_summon_row_, col);
	53	+ pThagoras->setMaterialColor(pXpm->getColor(cnt_summon_row_, col));
53	54	}
54		- pThagoras->setMaterialColor(pXpm->getColor(cnt_summon_row_, col));
55	55	}
56	56	}
57	57	cnt_summon_row_++;

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras.h

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras.h

		@@ -20,9 +20,6 @@ public:
20	20	int cnt_summon_row_;
21	21	frame summon_interval_;
22	22
23		- /** [r]出現座標(シーンが設定) */
24		- GgafDx::GeoElem entry_pos_;
25		-
26	23	GgafDx::Scaler* pScaler4Sc_;
27	24	GgafLib::DefaultGeometricActor* pActor4Sc_;
28	25

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras001.cpp

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras001.cpp

		@@ -31,9 +31,9 @@ void FormationThagoras001::onSummon(GgafDx::FigureActor* prm_pActor, int prm_row
31	31	} else {
32	32	pThagoras->pVehicleLeader_ = pThagoras->createCurveVehicleLeader(papCurveManufConn_[prm_col]->peek());
33	33	}
34		- pThagoras->pVehicleLeader_->setStartPosition(entry_pos_.x ,
35		- entry_pos_.y + (prm_col*PX_C(30)) ,
36		- entry_pos_.z );
	34	+ pThagoras->pVehicleLeader_->setStartPosition(_x ,
	35	+ _y + (prm_col*PX_C(30)) ,
	36	+ _z );
37	37
38	38	pThagoras->setPosition( RND(PX_C(-2600), PX_C(2600)),
39	39	RND(PX_C(-2600), PX_C(2600)),

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras002.cpp

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/enemy/Thagoras/FormationThagoras002.cpp

		@@ -33,9 +33,9 @@ void FormationThagoras002::onSummon(GgafDx::FigureActor* prm_pActor, int prm_row
33	33	} else {
34	34	pThagoras->pVehicleLeader_ = pThagoras->createCurveVehicleLeader(papCurveManufConn_[prm_col]->peek());
35	35	}
36		- pThagoras->pVehicleLeader_->setStartPosition(entry_pos_.x ,
37		- entry_pos_.y + (prm_col*PX_C(30)) ,
38		- entry_pos_.z );
	36	+ pThagoras->pVehicleLeader_->setStartPosition(_x ,
	37	+ _y + (prm_col*PX_C(30)) ,
	38	+ _z );
39	39
40	40	pThagoras->setPosition( RND(PX_C(-2600), PX_C(2600)),
41	41	RND(PX_C(-2600), PX_C(2600)),

--- a/VioletVreath/src/jp/gecchi/VioletVreath/scene/Spacetime/World/GameScene.cpp

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/scene/Spacetime/World/GameScene.cpp

		@@ -19,7 +19,7 @@
19	19	#include "GameScene/GamePreTitleScene.h"
20	20	#include "GameScene/GameTitleScene.h"
21	21	#include "GameScene/MyShipScene.h"
22		-
	22	+#include "GameScene/GameMainScene/StageWorld/RankUpStageController.h"
23	23
24	24	using namespace GgafLib;
25	25	using namespace VioletVreath;

		@@ -275,6 +275,11 @@ void GameScene::processBehavior() {
275	275	pChildScene->inactivateDelay(FADE_FRAMES+10);
276	276	}
277	277	}
	278	+ if (pRANKUP_CONTROLLER->pNowRankUpStage_) {
	279	+ _TRACE_(FUNC_NAME << " pRANKUP_CONTROLLER->sayonaraRankUpStages()");
	280	+ pRANKUP_CONTROLLER->sayonaraRankUpStages();
	281	+ pRANKUP_CONTROLLER->pNowRankUpStage_ = nullptr;
	282	+ }
278	283	}
279	284	if (pPhase->hasArrivedFrameAt(FADE_FRAMES+20)) {
280	285	reset(); //リセット（最初のフェーズに戻る）

--- a/VioletVreath/src/jp/gecchi/VioletVreath/scene/Spacetime/World/GameScene/GameMainScene/StageWorld/RankUpStageController.cpp

+++ b/VioletVreath/src/jp/gecchi/VioletVreath/scene/Spacetime/World/GameScene/GameMainScene/StageWorld/RankUpStageController.cpp

		@@ -144,15 +144,16 @@ void RankUpStageController::onCatchEvent(eventval prm_event_val, void* prm_pSour
144	144
145	145	void RankUpStageController::sayonaraRankUpStages() {
146	146	if (getChildFirst()) {
147		- GgafCore::Scene* pRankUpStage = getChildFirst()->getPrev();//last
	147	+ RankUpStage* pRankUpStage = (RankUpStage*)getChildFirst()->getPrev();//last
148	148	if (pRankUpStage) {
149	149	while (1) {
150	150	_TRACE_(FUNC_NAME<<" pRankUpStage("<<pRankUpStage->getName()<<")->sayonara()");
151		- pRankUpStage->sayonara();
	151	+ pRankUpStage->fadeoutSceneWithBgmTree(10);
	152	+ pRankUpStage->sayonara(10);
152	153	if (pRankUpStage == getChildFirst()) {
153	154	break;
154	155	} else {
155		- pRankUpStage = pRankUpStage->getPrev();
	156	+ pRankUpStage = (RankUpStage*)pRankUpStage->getPrev();
156	157	}
157	158	}
158	159	}

Violet Vreath Fork

提交

标签

Frequently used words (click to add to your profile)

Commit MetaInfo

Log Message

更改概述

差异

Violet Vreath
Fork