etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 11:45:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix all merge conflicts

Browse source 
unfortunately we lost a good chunk of git history in the process so that may hurt the ability for this to get merged, may have to consult everyone else for this
This commit is contained in:
minenice55 2022-08-09 11:23:17 -04:00
parent 6ac37d51d4
commit e8975c6dc4
32 changed files with 62 additions and 6938 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

200
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset
View file

File diff suppressed because one or more lines are too long

3519
Assets/Resources/Games/firstContact.prefab
View file

File diff suppressed because it is too large Load diff

1675
Assets/Resources/Sprites/Games/FirstContact/Animations/alien_anim/alien_bad/alien_fail.anim
View file

File diff suppressed because it is too large Load diff

48
Assets/Resources/Sprites/Games/FirstContact/Animations/alien_anim/alien_good/alien_success.anim
View file

@ -109,11 +109,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
<<<<<<< HEAD
value: {x: 2.1041, y: 1.1556, z: 0}
=======
value: {x: 2.0733, y: 1.1556, z: 0}
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -122,26 +118,16 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.033333335
<<<<<<< HEAD
value: {x: 2.099, y: 1.1966, z: 0}
inSlope: {x: -0.23099898, y: 0, z: 0}
outSlope: {x: -0.23099898, y: 0, z: 0}
=======
value: {x: 2.0733, y: 1.1966, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
<<<<<<< HEAD
value: {x: 2.0887, y: 1.1863, z: 0}
=======
value: {x: 2.0733, y: 1.1863, z: 0}
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
inSlope: {x: 0, y: -0.22949876, z: 0}
outSlope: {x: 0, y: -0.22949876, z: 0}
tangentMode: 0
@ -150,11 +136,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.1
<<<<<<< HEAD
value: {x: 2.0989, y: 1.1813, z: 0}
=======
value: {x: 2.0733, y: 1.1813, z: 0}
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -163,15 +145,9 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
<<<<<<< HEAD
value: {x: 2.0938, y: 1.2172, z: 0}
inSlope: {x: -0.20400047, y: 0.20799635, z: 0}
outSlope: {x: -0.20400047, y: 0.20799635, z: 0}
=======
value: {x: 2.0733, y: 1.2172, z: 0}
inSlope: {x: 0, y: 0.20799635, z: 0}
outSlope: {x: 0, y: 0.20799635, z: 0}
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -1012,11 +988,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
<<<<<<< HEAD
value: 2.1041
=======
value: 2.0733
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1025,26 +997,16 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
<<<<<<< HEAD
value: 2.099
inSlope: -0.23099898
outSlope: -0.23099898
=======
value: 2.0733
inSlope: 0
outSlope: 0
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
<<<<<<< HEAD
value: 2.0887
=======
value: 2.0733
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1053,11 +1015,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
<<<<<<< HEAD
value: 2.0989
=======
value: 2.0733
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1066,15 +1024,9 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
<<<<<<< HEAD
value: 2.0938
inSlope: -0.20400047
outSlope: -0.20400047
=======
value: 2.0733
inSlope: 0
outSlope: 0
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334

6
Assets/Resources/Sprites/Games/FirstContact/Animations/alien_anim/alien_talk/Alien.controller
View file

@ -84,12 +84,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1905787699877858001}
m_Position: {x: 480, y: 520, z: 0}
<<<<<<< HEAD
=======
- serializedVersion: 1
m_State: {fileID: 3287431350063787326}
m_Position: {x: 515, y: 585, z: 0}
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -152,8 +149,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
<<<<<<< HEAD
=======
--- !u!1102 &3287431350063787326
AnimatorState:
serializedVersion: 6
@ -180,7 +175,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
--- !u!1102 &3849571775052354061
AnimatorState:
serializedVersion: 6

130
Assets/Resources/Sprites/Games/FirstContact/Animations/liveBar.anim
View file

@ -22,18 +22,6 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
<<<<<<< HEAD
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.016666668
=======
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 1
inSlope: Infinity
outSlope: Infinity
@ -42,11 +30,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
<<<<<<< HEAD
time: 0.13333334
=======
time: 0.2
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 0
inSlope: Infinity
outSlope: Infinity
@ -65,20 +49,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.033333335
=======
time: 0
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 1
inSlope: Infinity
outSlope: Infinity
@ -87,11 +58,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
<<<<<<< HEAD
time: 0.11666667
=======
time: 0.15
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 0
inSlope: Infinity
outSlope: Infinity
@ -110,20 +77,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.05
=======
time: 0
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 1
inSlope: Infinity
outSlope: Infinity
@ -151,20 +105,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.06666667
=======
time: 0
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 1
inSlope: Infinity
outSlope: Infinity
@ -173,11 +114,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
<<<<<<< HEAD
time: 0.083333336
=======
time: 0.05
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 0
inSlope: Infinity
outSlope: Infinity
@ -234,11 +171,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
<<<<<<< HEAD
m_StopTime: 0.13333334
=======
m_StopTime: 0.2
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -259,18 +192,6 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
<<<<<<< HEAD
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.016666668
=======
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 1
inSlope: Infinity
outSlope: Infinity
@ -279,11 +200,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
<<<<<<< HEAD
time: 0.13333334
=======
time: 0.2
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 0
inSlope: Infinity
outSlope: Infinity
@ -302,20 +219,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.033333335
=======
time: 0
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 1
inSlope: Infinity
outSlope: Infinity
@ -324,11 +228,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
<<<<<<< HEAD
time: 0.11666667
=======
time: 0.15
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 0
inSlope: Infinity
outSlope: Infinity
@ -347,20 +247,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.05
=======
time: 0
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 1
inSlope: Infinity
outSlope: Infinity
@ -388,20 +275,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.06666667
=======
time: 0
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 1
inSlope: Infinity
outSlope: Infinity
@ -410,11 +284,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
<<<<<<< HEAD
time: 0.083333336
=======
time: 0.05
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
value: 0
inSlope: Infinity
outSlope: Infinity

10
Assets/Resources/Sprites/Games/FirstContact/interpreterTextboxes.png.meta
View file

@ -5,8 +5,6 @@ TextureImporter:
- first:
213: 484124400209634000
second: interpreterTextboxes_0
<<<<<<< HEAD
=======
- first:
213: -7876428232389808301
second: interpreterTextboxes_1
@ -16,7 +14,6 @@ TextureImporter:
- first:
213: 4953631840317161205
second: interpreterTextboxes_3
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
externalObjects: {}
serializedVersion: 11
mipmaps:
@ -111,11 +108,7 @@ TextureImporter:
serializedVersion: 2
x: 0
y: 513
<<<<<<< HEAD
width: 510
=======
width: 511
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
height: 511
alignment: 0
pivot: {x: 0, y: 0}
@ -130,8 +123,6 @@ TextureImporter:
indices:
edges: []
weights: []
<<<<<<< HEAD
=======
- serializedVersion: 2
name: interpreterTextboxes_1
rect:
@ -174,7 +165,6 @@ TextureImporter:
indices:
edges: []
weights: []
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
outline: []
physicsShape: []
bones: []

27
Assets/Resources/Sprites/Games/Tram&Pauline/Curtains.cs
View file

@ -1,27 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using HeavenStudio.Util;
namespace HeavenStudio.Games.Scripts_TramAndPauline
{
public class Curtains : MonoBehaviour
{
private Animator anim;
private void Awake()
{
}
}
}

11
Assets/Resources/Sprites/Games/Tram&Pauline/Curtains.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: e986f325614dad34f99276dcf3bd61ff
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Resources/Sprites/Games/Tram&Pauline/Effects.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 28f07a0ebcab1ae41998c1053a6de8a8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/Resources/Sprites/Games/Tram&Pauline/Pauline.cs
View file

@ -1,18 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Pauline : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

11
Assets/Resources/Sprites/Games/Tram&Pauline/Pauline.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 0c9740a191998b7429be1f4ebee714f1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Resources/Sprites/Games/Tram&Pauline/Tram-&-Pauline-Curtains.png.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7a0569887502b5a44adcca926552d77e
guid: 547b8f2734fc126419cda39d70a12681
TextureImporter:
internalIDToNameTable:
- first:

2
Assets/Resources/Sprites/Games/Tram&Pauline/Tram-&-Pauline-Sprite-Sheet 1.png.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9b3821ade43d9764db8fd41e79b5ad8d
guid: a36b808292402694198b8ab2889cef0f
TextureImporter:
internalIDToNameTable:
- first:

18
Assets/Resources/Sprites/Games/Tram&Pauline/Tram.cs
View file

@ -1,18 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Tram : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

11
Assets/Resources/Sprites/Games/Tram&Pauline/Tram.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 6d9f0a0c395f5774abebc63146dd3534
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

85
Assets/Resources/Sprites/Games/Tram&Pauline/TramAndPauline.cs
View file

@ -1,85 +0,0 @@
using HeavenStudio.Util;
using System;
using System.Collections.Generic;
using UnityEngine;
namespace HeavenStudio.Games.Loaders
{
using static Minigames;
public static class AgbTramLoader
{
public static Minigame AddGame(EventCaller eventCaller)
{
return new Minigame("tram&Pauline", "Tram&Pauline \n<color=#eb5454>[WIP don't use]</color>", "000000", false, false, new List<GameAction>()
{
new GameAction("curtains", delegate { TramAndPauline.instance.Curtains(eventCaller.currentEntity.beat); }, 0.5f),
new GameAction("SFX", delegate { var e = eventCaller.currentEntity; TramAndPauline.instance.SFX(e.beat, e.toggle); }, 2.5f, false, new List<Param>()
{
new Param("type", TramAndPauline.SoundEffects.henge, "calls", "the sound effects to choose from"),
}),
});
}
}
}
namespace HeavenStudio.Games
{
using Scripts_TramAndPauline;
public class TramAndPauline : Minigame
{
public enum CurtainState
{
Raised_Curtains,
Lower_Curtains
}
public enum SoundEffects
{
henge, //Shapeshift
henshin, //Transform
jump,
seino //One Two Three Go
}
public static TramAndPauline instance;
[Header("Animators")]
public Animator RaiseCurtains;
public Animator LowerCurtains;
private void Awake()
{
instance = this;
}
public void Curtains(float beat)
{
}
public void SFX(float beat, bool playSound)
{
playSound = false;
var sound = new MultiSound.Sound[]
{
new MultiSound.Sound("tram&Pauline/trampoline_unused_henge", beat),
new MultiSound.Sound("tram&Pauline/trampoline_unused_henshin", beat + 1f),
new MultiSound.Sound("tram&Pauline/trampoline_unused_jump" , beat + 2f),
new MultiSound.Sound("tram&Pauline/trampoline_unused_senio" , beat + 3f)
};
}
}
}

11
Assets/Resources/Sprites/Games/Tram&Pauline/TramAndPauline.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 8850749af64f82b44a728e2c273157e1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/Resources/Sprites/Games/Tram&Pauline/Trampoline.cs
View file

@ -1,18 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Trampoline : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

11
Assets/Resources/Sprites/Games/Tram&Pauline/Trampoline.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 4ac862c09eaeaa64083a07ef7ca089f4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Resources/Sprites/Games/Tram&Pauline/Trampolines.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3e6532203160f394e9c3845f8d465884
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

935
Assets/Scenes/Editor.unity
View file

File diff suppressed because it is too large Load diff

113
Assets/Scripts/Games/FirstContact/AlienFirstContact.cs
View file

@ -1,113 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace HeavenStudio.Games.Scripts_FirstContact
{
public class AlienFirstContact : PlayerActionObject
{
public float createBeat;
FirstContact game;
Translator translator;
bool hasSpoke;
public float stateBeat;
public bool prefabHolder;
bool missed;
private void Awake()
{
game = FirstContact.instance;
translator = GameObject.Find("Games/firstContact/Translator").GetComponent<Translator>();
}
private void Start()
{
}
private void Update()
{
if (hasSpoke)
{
return;
}
stateBeat = Conductor.instance.GetPositionFromMargin(createBeat + game.beatInterval, 1f);
StateCheck(stateBeat);
if (PlayerInput.Pressed(true))
{
if (state.eligible())
{
if (!game.hasMissed)
{
Ace();
}
else
{
Eh();
}
}
else if (state.notPerfect() && game.translatorSpeakCount > 0)
{
Eh();
}
//else if (stateBeat > Minigame.LateTime() && game.translatorSpeakCount == 0)
//{
// //Debug.Log("OW");
// Miss();
//}
}
if (stateBeat > Minigame.LateTime())
{
if (!missed)
{
MissNoHit();
}
}
}
public void Ace()
{
translator.successTranslation(true);
game.isCorrect = true;
game.translatorSpeakCount++;
hasSpoke = true;
missed = false;
}
public void Miss()
{
translator.successTranslation(false);
game.isCorrect = false;
hasSpoke = true;
missed = false;
}
public void MissNoHit()
{
game.alienNoHit();
game.isCorrect = false;
missed = true;
game.hasMissed = true;
}
public void Eh()
{
translator.ehTranslation();
hasSpoke = true;
}
public override void OnAce()
{
Ace();
}
}
}

11
Assets/Scripts/Games/FirstContact/AlienFirstContact.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 47ef82bd935047f42b39142f4a1b1d32
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Scripts/Games/FirstContact/WhiteLines.cs
View file

@ -23,11 +23,7 @@ public class WhiteLines : MonoBehaviour
}
}
<<<<<<< HEAD
void Update()
=======
void FixedUpdate()
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
{
if(transform.position.y > endAt && !isRandomLineMiddle)
{

10
Assets/Scripts/Games/Tram&Pauline/Curtains.cs
View file

@ -16,12 +16,4 @@ namespace HeavenStudio.Games.Scripts_TramAndPauline
}
}
}
}

23
Assets/Scripts/Games/Tram&Pauline/Pauline.cs
View file

@ -2,17 +2,20 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Pauline : MonoBehaviour
namespace HeavenStudio.Games.Scripts_TramAndPauline
{
// Start is called before the first frame update
void Start()
public class Pauline : MonoBehaviour
{
}
// Start is called before the first frame update
void Start()
{
// Update is called once per frame
void Update()
{
}
// Update is called once per frame
void Update()
{
}
}
}
}

21
Assets/Scripts/Games/Tram&Pauline/Tram.cs
View file

@ -2,17 +2,20 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Tram : MonoBehaviour
namespace HeavenStudio.Games.Scripts_TramAndPauline
{
// Start is called before the first frame update
void Start()
public class Tram : MonoBehaviour
{
}
// Start is called before the first frame update
void Start()
{
// Update is called once per frame
void Update()
{
}
// Update is called once per frame
void Update()
{
}
}
}

23
Assets/Scripts/Games/Tram&Pauline/Trampoline.cs
View file

@ -2,17 +2,20 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Trampoline : MonoBehaviour
namespace HeavenStudio.Games.Scripts_TramAndPauline
{
// Start is called before the first frame update
void Start()
public class Trampoline : MonoBehaviour
{
}
// Start is called before the first frame update
void Start()
{
// Update is called once per frame
void Update()
{
}
// Update is called once per frame
void Update()
{
}
}
}
}

3
Assets/Scripts/LevelEditor/SettingsDialog/SettingsDialog.cs
View file

@ -10,10 +10,7 @@ namespace HeavenStudio.Editor
public class SettingsDialog : MonoBehaviour
{
[SerializeField] private GameObject settingsMenu;
<<<<<<< HEAD
=======
//this may all be moved to a different script in the future
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
private void Start() {}

10
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View file

@ -610,32 +610,22 @@ namespace HeavenStudio.Editor.Track
return eventObj;
}
<<<<<<< HEAD
public TimelineEventObj CopyEventObject(Beatmap.Entity e)
{
Beatmap.Entity clone = e.DeepCopy();
TimelineEventObj dup = AddEventObject(clone.datamodel, false, new Vector3(clone.beat, -clone.track * Timeline.instance.LayerHeight()), clone, true, RandomID());
=======
private List<TimelineEventObj> duplicatedEventObjs = new List<TimelineEventObj>();
public TimelineEventObj CopyEventObject(TimelineEventObj e)
{
Beatmap.Entity clone = e.entity.DeepCopy();
TimelineEventObj dup = AddEventObject(clone.datamodel, false, new Vector3(clone.beat, -clone.track * Timeline.instance.LayerHeight()), clone, true, RandomID());
duplicatedEventObjs.Add(dup);
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
return dup;
}
<<<<<<< HEAD
=======
public void FinalizeDuplicateEventStack()
{
CommandManager.instance.Execute(new Commands.Duplicate(duplicatedEventObjs));
duplicatedEventObjs = new List<TimelineEventObj>();
}
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
public void DestroyEventObject(Beatmap.Entity entity)
{
if (EventParameterManager.instance.entity == entity)

18
Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs
View file

@ -42,11 +42,6 @@ namespace HeavenStudio.Editor.Track
private bool resizingLeft;
private bool resizingRight;
private bool inResizeRegion;
<<<<<<< HEAD
private bool wasDuplicated;
public Vector2 lastMovePos;
=======
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
public bool isCreating;
public string eventObjID;
@ -64,11 +59,6 @@ namespace HeavenStudio.Editor.Track
Destroy(resizeGraphic.gameObject);
}
<<<<<<< HEAD
lastMovePos = transform.localPosition;
=======
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
// what the fuck????
// moveTemp = new GameObject();
// moveTemp.transform.SetParent(this.transform.parent);
@ -165,13 +155,6 @@ namespace HeavenStudio.Editor.Track
{
if (Timeline.instance.eventObjs.FindAll(c => c.moving).Count > 0 && selected)
{
//duplicate the entity if holding alt or r-click
if ((!wasDuplicated) && (Input.GetKey(KeyCode.LeftAlt) || Input.GetMouseButton(1)))
{
wasDuplicated = true;
var te = Timeline.instance.CopyEventObject(entity);
}
Vector3 mousePos = Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition);
//duplicate the entity if holding alt or m-click
if ((!wasDuplicated) && (Input.GetKey(KeyCode.LeftAlt) || Input.GetMouseButton(2)))
@ -334,7 +317,6 @@ namespace HeavenStudio.Editor.Track
}
moving = false;
wasDuplicated = false;
Cancel();
if (isCreating == true)