Skip to content

Commit

Permalink
Don't Copy arc and arctap on it at the same time
Browse files Browse the repository at this point in the history
  • Loading branch information
yojohanshinwataikei committed Apr 1, 2020
1 parent 5515a58 commit 0fc4880
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Assets/Misc/BuildTimestamp.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
637212485939958171
637213572750332766
9 changes: 7 additions & 2 deletions Assets/Misc/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
欢迎来到 Arcade-plus 的第二个大更新!
本次更新的内容有
- 支持了 singularity vvvip 中出现的 scenecontrol 语句
- 移除了旧的 special 语句支持
- 输出按时间排序时, 相同时间的物件将会按照物件类型排序
- 输出中的 Arctap 会按照时间排序了
- 略微修复了 Timing 编辑不起作用的问题
- 复制粘贴时, 如果同时选中了黑线和其上的 arctap, 那么 arctap 将不会被复制
- 修复了 Timing 编辑不起作用的问题
- 修复了编辑 Timing 时谱面内容和时间网格线不更新的问题
- 可能修复了右键菜单状态错乱的问题
- 修复了分辨率纵横比变化时, 场景布局不更新的问题
- Arc 起点及终点的位置改为仅显示两位小数
- 显示运行日志的功能移动到设置窗口中
- 略微调整了各个按钮的位置
- 修复了又一个与时间、位置有关的 Bug
- 进行了些许的内部代码重构
- 进行了些许的内部代码重构
6 changes: 3 additions & 3 deletions Assets/Prefabs/Player/Arc.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,8 @@ ParticleSystem:
startColor:
serializedVersion: 2
minMaxState: 2
minColor: {r: 0.3, g: 0.1, b: 0.3, a: 0.5}
maxColor: {r: 0.5, g: 0.3, b: 0.5, a: 2}
minColor: {r: 0.3392157, g: 0.5392157, b: 0.79019606, a: 0.5}
maxColor: {r: 0.5392157, g: 0.73921573, b: 0.9901961, a: 2}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
Expand Down Expand Up @@ -1543,7 +1543,7 @@ ParticleSystem:
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 0.4, g: 0.2, b: 0.8, a: 1}
key1: {r: 0.54901963, g: 0.6392157, b: 0.8901961, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
Expand Down
6 changes: 5 additions & 1 deletion Assets/Scripts/Compose/Editing/Operations/AdeCopyPaste.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ public void Copy(ArcNote[] notes)
foreach (var n in notes)
{
ArcEvent ne = n.Clone();
if (ne is ArcArcTap) commands.Add(new AddArcTapCommand((n as ArcArcTap).Arc, ne as ArcArcTap));
if (ne is ArcArcTap) {
if(!notes.Contains((n as ArcArcTap).Arc)){
commands.Add(new AddArcTapCommand((n as ArcArcTap).Arc, ne as ArcArcTap));
}
}
else if (ne is ArcArc)
{
commands.Add(new AddArcEventCommand(ne));
Expand Down
2 changes: 1 addition & 1 deletion ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ PlayerSettings:
16:10: 0
16:9: 1
Others: 0
bundleVersion: 0.0.3
bundleVersion: 0.1.0
preloadedAssets:
- {fileID: 4800000, guid: bb26ede1beb997943a7d6295fbf075d4, type: 3}
- {fileID: 4800000, guid: 1e340182228616b4ca7dad1e80f4d319, type: 3}
Expand Down

0 comments on commit 0fc4880

Please sign in to comment.