Skip to content
This repository has been archived by the owner on Feb 15, 2025. It is now read-only.

Commit

Permalink
break slide闪烁
Browse files Browse the repository at this point in the history
  • Loading branch information
Moying-moe committed Oct 31, 2022
1 parent 59f9ed9 commit 967da00
Show file tree
Hide file tree
Showing 19 changed files with 413 additions and 3,711 deletions.
2,924 changes: 0 additions & 2,924 deletions Assets/Animation/WifiBreakShine.anim

This file was deleted.

167 changes: 167 additions & 0 deletions Assets/Animation/slideShine.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: slideShine
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 1.3
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.26666668
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._Brightness
path:
classID: 212
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 2100000, guid: 6cea13e5ba8275446be27a38daed20c7, type: 2}
attribute: m_Materials.Array.data[0]
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 2237670731
script: {fileID: 0}
typeID: 212
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 21
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 2100000, guid: 6cea13e5ba8275446be27a38daed20c7, type: 2}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.53333336
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0.9
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 1.3
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.26666668
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._Brightness
path:
classID: 212
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-9101236253444242099
--- !u!1107 &-1840210796515808066
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
Expand All @@ -10,8 +10,8 @@ AnimatorStateMachine:
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -1691503313670253442}
m_Position: {x: 240, y: 230, z: 0}
m_State: {fileID: -1689803391859848882}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand All @@ -21,15 +21,15 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -1691503313670253442}
--- !u!1102 &-1691503313670253442
m_DefaultState: {fileID: -1689803391859848882}
--- !u!1102 &-1689803391859848882
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WifiBreakShine
m_Name: slideShine
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
Expand All @@ -42,7 +42,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 37dd8e1b30016fa4a8a46df1de0c4114, type: 2}
m_Motion: {fileID: 7400000, guid: cfd536ed344002d4c97b1c983b16d3b6, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand All @@ -54,13 +54,13 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Slide_Wifi
m_Name: slideShine
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -9101236253444242099}
m_StateMachine: {fileID: -1840210796515808066}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

86 changes: 86 additions & 0 deletions Assets/ColorAdjustEffect.shader
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
Shader "Custom/ColorAdjustEffect"
{
Properties
{
_MainTex("Albedo (RGB)", 2D) = "white" {}
_Brightness("Brightness", Float) = 1 //调整亮度
_Saturation("Saturation", Float) = 1 //调整饱和度
_Contrast("Contrast", Float) = 1 //调整对比度
}

SubShader
{
Tags
{
"Queue" = "Transparent"
"RenderType" = "Transparent"
}
Pass
{
ZTest Always
Cull Off
ZWrite Off
Blend SrcAlpha OneMinusSrcAlpha
CGPROGRAM
sampler2D _MainTex;
half _Brightness;
half _Saturation;
half _Contrast;

//vert和frag函数
#pragma vertex vert
#pragma fragment frag
#include "Lighting.cginc"


struct appdata_t
{
float4 vertex : POSITION;
half4 color : COLOR;
float2 texcoord : TEXCOORD0;
};
//从vertex shader传入pixel shader的参数
struct v2f
{
float4 pos : SV_POSITION; //顶点位置
half2 uv : TEXCOORD0; //UV坐标
half4 color : COLOR;
};

//vertex shader
v2f vert(appdata_t v)
{
v2f o;
//从自身空间转向投影空间
o.pos = UnityObjectToClipPos(v.vertex);
o.color = v.color;
//uv坐标赋值给output
o.uv = v.texcoord;
return o;
}

//fragment shader
fixed4 frag(v2f i) : COLOR
{
//从_MainTex中根据uv坐标进行采样
fixed4 renderTex = tex2D(_MainTex, i.uv)*i.color;
//brigtness亮度直接乘以一个系数,也就是RGB整体缩放,调整亮度
fixed3 finalColor = renderTex * _Brightness;
//saturation饱和度:首先根据公式计算同等亮度情况下饱和度最低的值:
fixed gray = 0.2125 * renderTex.r + 0.7154 * renderTex.g + 0.0721 * renderTex.b;
fixed3 grayColor = fixed3(gray, gray, gray);
//根据Saturation在饱和度最低的图像和原图之间差值
finalColor = lerp(grayColor, finalColor, _Saturation);
//contrast对比度:首先计算对比度最低的值
fixed3 avgColor = fixed3(0.5, 0.5, 0.5);
//根据Contrast在对比度最低的图像和原图之间差值
finalColor = lerp(avgColor, finalColor, _Contrast);
//返回结果,alpha通道不变
return fixed4(finalColor, renderTex.a);
}
ENDCG
}
}
//防止shader失效的保障措施
FallBack Off
}
10 changes: 10 additions & 0 deletions Assets/ColorAdjustEffect.shader.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/Scenes/SampleScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1022,6 +1022,7 @@ MonoBehaviour:
- {fileID: 796092474901863576, guid: fe567d9733d824344ac702ea96d93a93, type: 3}
- {fileID: 2695972272465249242, guid: 15779da816ed35141891224b0f894832, type: 3}
- {fileID: 3042661451837740866, guid: 266f7f21a3d83ef4593daba2c354d4c5, type: 3}
slideShine: {fileID: 9100000, guid: c28f56116f6dc34408d6f0f544f1e2cc, type: 2}
diffText: {fileID: 295904848}
levelText: {fileID: 1130077457}
titleText: {fileID: 494240256}
Expand Down
2 changes: 2 additions & 0 deletions Assets/Scenes/Server.unity
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ MonoBehaviour:
Tap_Ex: {fileID: 0}
Slide: {fileID: 0}
Slide_Each: {fileID: 0}
Slide_Break: {fileID: 0}
Star: {fileID: 0}
Star_Double: {fileID: 0}
Star_Each: {fileID: 0}
Expand All @@ -366,6 +367,7 @@ MonoBehaviour:
Hold: {fileID: 0}
Hold_Each: {fileID: 0}
Hold_Ex: {fileID: 0}
Hold_Break: {fileID: 0}
Just:
- {fileID: 0}
- {fileID: 0}
Expand Down
3 changes: 3 additions & 0 deletions Assets/Scripts/JsonDataLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class JsonDataLoader : MonoBehaviour
public GameObject notes;
public GameObject star_slidePrefab;
public GameObject[] slidePrefab;
public RuntimeAnimatorController slideShine;

public Text diffText;
public Text levelText;
Expand Down Expand Up @@ -495,6 +496,7 @@ void InstantiateWifi(SimaiTimingPoint timing, SimaiNote note, bool isGroupPart,
WifiCompo.normalStar = customSkin.Star;
WifiCompo.eachStar = customSkin.Star_Each;
WifiCompo.breakStar = customSkin.Star_Break;
WifiCompo.slideShine = slideShine;

if (timing.noteList.Count > 1)
{
Expand Down Expand Up @@ -573,6 +575,7 @@ void InstantiateStar(SimaiTimingPoint timing, SimaiNote note, bool isGroupPart,
SliCompo.spriteNormal = customSkin.Slide;
SliCompo.spriteEach = customSkin.Slide_Each;
SliCompo.spriteBreak = customSkin.Slide_Break;
SliCompo.slideShine = slideShine;

if (timing.noteList.Count > 1)
{
Expand Down
Loading

0 comments on commit 967da00

Please # to comment.