mirror of
https://github.com/RHeavenStudio/HeavenStudio.git
synced 2025-06-12 12:17:37 +02:00
Mass Text Update (#615)
* Air Rally Text Update * Blue Bear Text Update * Board Meeting Text Update * Built To Scale DS Text Update also changed Air Rally's assetbundle tag from "normal" to "keep" * Catchy Tune Text Update also changed some minor wording in Board Meeting and Built To Scale DS * Cheer Readers Text Update * The Clappy Trio Text Update * Coin Toss Text Update * Crop Stomp Text Update * DJ School Text Update * Dog Ninja Text Update * Double Date Text Update * Drumming Practice Text Update * Fan Club Text Update * Fireworks Text Update * Second Contact Text Update * Flipper-Flop Text Update also fix an error in Catchy Tune * Fork Lifter Text Update * Glee Club Text Update * Karate Man Text Update also minor updates to other games * Kitties! Text Update * Launch Party Text Update * Lockstep Text Update * Marching Orders Text Update * Meat Grinder Text Update also fixed an error in Second Contact * Mr. Upbeat Text Update * Munchy Monk Text Update * Octopus Machine Text Update * Pajama Party Text Update * Quiz Show Text Update also changed some wording in meat grinder * Rhythm Rally Text Update * Rhythm Somen Text Update that was easy * Rhythm Tweezers Text Update * Ringside Text Update * Rockers Text Update this sucked * Samurai Slice DS Text Update * See Saw Text Update * Sneaky Spirits Text Update * Spaceball Text Update * Space Dance Text Update * Space Soccer Text Update * Splashdown Text Update * Tambourine Text Update * Tap Trial Text Update * Tap Troupe Text Update * The Dazzles Text Update * Toss Boys Text Update * Tram & Pauline Text Update also added translation for Fireworks * Tunnel Text Update * Wizard's Waltz Text Update * Working Dough Text Update * fix compiler errors * fix editor offset bug(?) * fix missing param in second contact * Ball Redispense text * remove space soccer swing * Trick on the Class Text Update * Non-Game Text Update * fix pre-function sorting * camera shake ease * remove a bunch of prints * rhythm tweezers bug fix * Update Credits.txt * ssds nop samurai bop * swap order of shake properties * Update FirstContact.cs --------- Co-authored-by: minenice55 <star.elementa@gmail.com>
This commit is contained in:
Zeo
@ -338,7 +338,6 @@ namespace HeavenStudio.Editor.Track
|
||||
|
||||
public void CreateWaveform()
|
||||
{
|
||||
Debug.Log("what");
|
||||
// DrawWaveform();
|
||||
// StartCoroutine(DrawWaveformRealtime());
|
||||
}
|
||||
@ -970,119 +969,6 @@ namespace HeavenStudio.Editor.Track
|
||||
CommandManager.Instance.AddCommand(new Commands.Paste(CopiedEntities));
|
||||
}
|
||||
|
||||
/*
|
||||
public TimelineEventObj AddEventObject(string eventName, bool dragNDrop = false, Vector3 pos = new Vector3(), RiqEntity entity = null, bool addEvent = false)
|
||||
{
|
||||
var game = EventCaller.instance.GetMinigame(eventName.Split(0));
|
||||
var action = EventCaller.instance.GetGameAction(game, eventName.Split(1));
|
||||
GameObject g = Instantiate(TimelineEventObjRef.gameObject, TimelineEventObjRef.parent);
|
||||
g.transform.localPosition = pos;
|
||||
|
||||
TimelineEventObj eventObj = g.GetComponent<TimelineEventObj>();
|
||||
eventObj.eventLabel.text = action.displayName;
|
||||
|
||||
if (eventName.Split(1) == "switchGame")
|
||||
eventObj.Icon.sprite = Editor.GameIcon(eventName.Split(2));
|
||||
else
|
||||
eventObj.Icon.sprite = Editor.GameIcon(eventName.Split(0));
|
||||
|
||||
Minigames.GameAction gameAction = EventCaller.instance.GetGameAction(EventCaller.instance.GetMinigame(eventName.Split(0)), eventName.Split(1));
|
||||
|
||||
if (gameAction != null)
|
||||
{
|
||||
if (gameAction.resizable == false)
|
||||
{
|
||||
g.GetComponent<RectTransform>().sizeDelta = new Vector2(gameAction.defaultLength * Timeline.instance.PixelsPerBeat, LayerHeight());
|
||||
float length = gameAction.defaultLength;
|
||||
eventObj.length = length;
|
||||
}
|
||||
else
|
||||
{
|
||||
eventObj.resizable = true;
|
||||
if (entity != null && gameAction.defaultLength != entity.length && dragNDrop == false)
|
||||
{
|
||||
g.GetComponent<RectTransform>().sizeDelta = new Vector2(entity.length * Timeline.instance.PixelsPerBeat, LayerHeight());
|
||||
}
|
||||
else
|
||||
{
|
||||
g.GetComponent<RectTransform>().sizeDelta = new Vector2(gameAction.defaultLength * Timeline.instance.PixelsPerBeat, LayerHeight());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (dragNDrop)
|
||||
{
|
||||
var mousePos = Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition);
|
||||
g.transform.position = new Vector3(mousePos.x, mousePos.y, 0);
|
||||
|
||||
Selections.instance.ClickSelect(eventObj);
|
||||
eventObj.moving = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
entity["track"] = eventObj.GetTrack();
|
||||
}
|
||||
|
||||
if (addEvent)
|
||||
{
|
||||
RiqEntity tempEntity = entity;
|
||||
|
||||
if (entity == null)
|
||||
{
|
||||
RiqEntity en = GameManager.instance.Beatmap.AddNewEntity(eventName, g.transform.localPosition.x, gameAction.defaultLength);
|
||||
|
||||
tempEntity = en;
|
||||
|
||||
// default param values
|
||||
var ep = action.parameters;
|
||||
|
||||
if (ep != null)
|
||||
{
|
||||
for (int i = 0; i < ep.Count; i++)
|
||||
{
|
||||
object returnVal = ep[i].parameter;
|
||||
|
||||
var propertyType = returnVal.GetType();
|
||||
if (propertyType == typeof(EntityTypes.Integer))
|
||||
{
|
||||
returnVal = ((EntityTypes.Integer)ep[i].parameter).val;
|
||||
}
|
||||
else if (propertyType == typeof(EntityTypes.Float))
|
||||
{
|
||||
returnVal = ((EntityTypes.Float)ep[i].parameter).val;
|
||||
}
|
||||
else if (propertyType.IsEnum)
|
||||
{
|
||||
returnVal = (int) ep[i].parameter;
|
||||
}
|
||||
|
||||
//tempEntity[ep[i].propertyName] = returnVal;
|
||||
tempEntity.CreateProperty(ep[i].propertyName, returnVal);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
GameManager.instance.Beatmap.Entities.Add(tempEntity);
|
||||
}
|
||||
|
||||
GameManager.instance.SortEventsList();
|
||||
eventObj.entity = tempEntity;
|
||||
}
|
||||
else
|
||||
{
|
||||
eventObj.entity = entity;
|
||||
}
|
||||
|
||||
eventObjs.Add(eventObj);
|
||||
eventObj.eventObjID = eventObj.entity.uid;
|
||||
|
||||
g.SetActive(true);
|
||||
|
||||
return eventObj;
|
||||
}
|
||||
*/
|
||||
|
||||
private List<TimelineEventObj> duplicatedEventObjs = new List<TimelineEventObj>();
|
||||
public TimelineEventObj CopyEventObject(TimelineEventObj e)
|
||||
{
|
||||
|
||||
@ -60,11 +60,11 @@ namespace HeavenStudio.Editor.Track
|
||||
private bool altWhenClicked = false;
|
||||
private bool dragging = false;
|
||||
|
||||
private float initMoveX = 0.0f;
|
||||
private float initMoveY = 0.0f;
|
||||
private double initMoveX = 0;
|
||||
private float initMoveY = 0;
|
||||
|
||||
private bool movedEntity = false;
|
||||
private float lastBeat = 0.0f;
|
||||
private double lastBeat = 0;
|
||||
private int lastLayer = 0;
|
||||
|
||||
private int lastSiblingIndex;
|
||||
@ -125,6 +125,12 @@ namespace HeavenStudio.Editor.Track
|
||||
SetColor((int)entity["track"]);
|
||||
SetWidthHeight();
|
||||
selectedImage.gameObject.SetActive(false);
|
||||
|
||||
lastBeat = entity.beat;
|
||||
initMoveX = 0.0f;
|
||||
initMoveY = 0.0f;
|
||||
lastResizeBeat = 0;
|
||||
lastResizeLength = 0;
|
||||
}
|
||||
|
||||
public void SetEntity(RiqEntity entity)
|
||||
@ -232,7 +238,7 @@ namespace HeavenStudio.Editor.Track
|
||||
{
|
||||
foreach (var marker in Selections.instance.eventsSelected)
|
||||
{
|
||||
marker.entity.beat = Mathf.Max(Timeline.instance.MousePos2BeatSnap - marker.initMoveX, 0);
|
||||
marker.entity.beat = System.Math.Max(Timeline.instance.MousePos2BeatSnap - marker.initMoveX, 0);
|
||||
marker.entity["track"] = Mathf.Clamp(Timeline.instance.MousePos2Layer - marker.initMoveY, 0, Timeline.instance.LayerCount - 1);
|
||||
marker.SetColor((int)entity["track"]);
|
||||
marker.SetWidthHeight();
|
||||
@ -281,10 +287,10 @@ namespace HeavenStudio.Editor.Track
|
||||
foreach (var marker in Selections.instance.eventsSelected)
|
||||
{
|
||||
if (setMovedEntity) marker.movedEntity = true;
|
||||
marker.lastBeat = (float)marker.entity.beat;
|
||||
marker.lastBeat = marker.entity.beat;
|
||||
marker.lastLayer = (int)marker.entity["track"];
|
||||
|
||||
marker.initMoveX = Timeline.instance.MousePos2BeatSnap - (float)marker.entity.beat;
|
||||
marker.initMoveX = Timeline.instance.MousePos2BeatSnap - marker.entity.beat;
|
||||
marker.initMoveY = Timeline.instance.MousePos2Layer - (int)marker.entity["track"];
|
||||
}
|
||||
}
|
||||
|
||||
@ -44,7 +44,11 @@ namespace HeavenStudio.Editor.Track
|
||||
Vector2 relativeMousePosition;
|
||||
|
||||
var cam = Editor.instance.EditorCamera;
|
||||
if (cam == null) Debug.LogError("Camera not set!");
|
||||
if (cam == null)
|
||||
{
|
||||
Debug.LogError("Camera not set!");
|
||||
return;
|
||||
}
|
||||
RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, Input.mousePosition, cam, out relativeMousePosition);
|
||||
|
||||
if (scrollDeltaY > 0)
|
||||
|
||||
Reference in New Issue
Block a user