summaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
Diffstat (limited to 'Assets')
-rw-r--r--Assets/Art/Shaders/Effects/RimLight 1.shader2
-rw-r--r--Assets/Prefabs/Characters/Saionji_Clone.prefab11
-rw-r--r--Assets/Scenes/Demo/SaionjiShowOff.unity136
-rw-r--r--Assets/Scripts/ApplicationMain.cs3
-rw-r--r--Assets/Scripts/Effects/AfterImage/AfterImage.cs17
-rw-r--r--Assets/Scripts/Effects/AfterImage/AfterImagePool.cs31
6 files changed, 169 insertions, 31 deletions
diff --git a/Assets/Art/Shaders/Effects/RimLight 1.shader b/Assets/Art/Shaders/Effects/RimLight 1.shader
index bcf6609c..86b593bd 100644
--- a/Assets/Art/Shaders/Effects/RimLight 1.shader
+++ b/Assets/Art/Shaders/Effects/RimLight 1.shader
@@ -75,7 +75,7 @@ Shader "ASESampleShaders/RimLight"
fixed4 _Color;
float _Intensity;
fixed4 _MKGlowColor;
- float _MKGlowPower;
+ float _MKGlowPower;
sampler2D _Albedo;
float _CutOff;
diff --git a/Assets/Prefabs/Characters/Saionji_Clone.prefab b/Assets/Prefabs/Characters/Saionji_Clone.prefab
index f5697ebf..fc967870 100644
--- a/Assets/Prefabs/Characters/Saionji_Clone.prefab
+++ b/Assets/Prefabs/Characters/Saionji_Clone.prefab
@@ -4772,13 +4772,16 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
myAnimator: {fileID: 2605466399590836501}
- myRenderer: {fileID: 8204134728969198478}
+ myRenderers:
+ - {fileID: 9150241180084094106}
+ - {fileID: 8204134728969198478}
+ - {fileID: 8191694612211005764}
targetAnimator: {fileID: 0}
targetObject: {fileID: 0}
time: 0
- intensity: 0
- pow: 1
- timeMax: 45
+ intensity: 1
+ pow: 2
+ timeMax: 10
active: 1
--- !u!1 &9031782799931704702
GameObject:
diff --git a/Assets/Scenes/Demo/SaionjiShowOff.unity b/Assets/Scenes/Demo/SaionjiShowOff.unity
index a4b1975b..6118ee23 100644
--- a/Assets/Scenes/Demo/SaionjiShowOff.unity
+++ b/Assets/Scenes/Demo/SaionjiShowOff.unity
@@ -1055,11 +1055,24 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 1429005016}
- {fileID: 9190676758873534539}
- {fileID: 2018047305}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &902182889 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8969987971784487432, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ m_PrefabInstance: {fileID: 8497533681905268391}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &902182892 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ m_PrefabInstance: {fileID: 8497533681905268391}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &906348737 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 126664, guid: 5916f4e1df997364fbae41ecc0eb31c2,
@@ -1664,8 +1677,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
targetObject: {fileID: 3741668519200845149}
targetAnimator: {fileID: 3741668519200845150}
- prefab: {fileID: 8969987971784487432, guid: 2bc84022d3389104b84680ddf3faeeda, type: 3}
- poolSize: 30
+ prefab: {fileID: 902182889}
+ poolSize: 10
afterImages: []
interval: 2
time: 0
@@ -1676,12 +1689,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1429005014}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.42382917, y: 0.98024184, z: -0.15035582}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_Children:
+ - {fileID: 902182892}
+ m_Father: {fileID: 861183510}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1490460890
GameObject:
@@ -1980,7 +1994,7 @@ PrefabInstance:
- target: {fileID: 446448032419714826, guid: 3250b3092f3b858438c6154710d18d3b,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 446448032419714826, guid: 3250b3092f3b858438c6154710d18d3b,
type: 3}
@@ -2069,7 +2083,7 @@ PrefabInstance:
- target: {fileID: 5505303514460593431, guid: 83d445123a203b14298b7a7662a0a470,
type: 3}
propertyPath: m_RootOrder
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5505303514460593431, guid: 83d445123a203b14298b7a7662a0a470,
type: 3}
@@ -2105,6 +2119,110 @@ Animator:
type: 3}
m_PrefabInstance: {fileID: 3741668519200845148}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8497533681905268391
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1429005016}
+ m_Modifications:
+ - target: {fileID: 3674041106879106001, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: time
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3674041106879106001, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: timeMax
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 3674041106879106001, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: pow
+ value: 0.1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3674041106879106001, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: targetAnimator
+ value:
+ objectReference: {fileID: 3741668519200845150}
+ - target: {fileID: 3674041106879106001, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: targetObject
+ value:
+ objectReference: {fileID: 3741668519200845149}
+ - target: {fileID: 3674041106879106001, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: active
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 2.31
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.14593506
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.70710677
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 90.00001
+ objectReference: {fileID: 0}
+ - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8969987971784487432, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_Name
+ value: Saionji_Clone
+ objectReference: {fileID: 0}
+ - target: {fileID: 8969987971784487432, guid: 2bc84022d3389104b84680ddf3faeeda,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 2bc84022d3389104b84680ddf3faeeda, type: 3}
--- !u!4 &9190676758873534539 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5505303514460593431, guid: 83d445123a203b14298b7a7662a0a470,
diff --git a/Assets/Scripts/ApplicationMain.cs b/Assets/Scripts/ApplicationMain.cs
index 99209c50..81ac453c 100644
--- a/Assets/Scripts/ApplicationMain.cs
+++ b/Assets/Scripts/ApplicationMain.cs
@@ -30,5 +30,4 @@ public class ApplicationMain : MonoBehaviour
}
-}
-
+} \ No newline at end of file
diff --git a/Assets/Scripts/Effects/AfterImage/AfterImage.cs b/Assets/Scripts/Effects/AfterImage/AfterImage.cs
index 1e1d0393..b63661df 100644
--- a/Assets/Scripts/Effects/AfterImage/AfterImage.cs
+++ b/Assets/Scripts/Effects/AfterImage/AfterImage.cs
@@ -6,7 +6,7 @@ public class AfterImage : MonoBehaviour
{
public Animator myAnimator;
//public CharacterControl myCharacterControl;
- public Renderer myRenderer;
+ public Renderer[] myRenderers;
public Animator targetAnimator;
public GameObject targetObject;
@@ -38,14 +38,22 @@ public class AfterImage : MonoBehaviour
{
active = false;
intensity = 0;
+ this.transform.gameObject.SetActive(false);
}
}
void UpdateRenderer()
{
- myRenderer.material.SetFloat("_Intensity", intensity);
- myRenderer.material.SetFloat("_MKGlowPower", intensity);
- }
+ foreach(var renderer in myRenderers)
+ {
+ for(int i = 0;i < renderer.materials.Length; ++i)
+ {
+ renderer.materials[i].SetColor("_Color", Color.red);
+ renderer.materials[i].SetFloat("_Intensity", intensity);
+ renderer.materials[i].SetFloat("_MKGlowPower", intensity);
+ }
+ }
+ }
public void Activate()
{
@@ -53,6 +61,7 @@ public class AfterImage : MonoBehaviour
transform.position = targetObject.transform.position;
transform.localScale = targetObject.transform.lossyScale;
transform.rotation = targetObject.transform.rotation;
+ transform.gameObject.SetActive(true);
myAnimator.Play(targetAnimator.GetCurrentAnimatorStateInfo(0).shortNameHash, 0, targetAnimator.GetCurrentAnimatorStateInfo(0).normalizedTime);
//myAnimator.Play(myCharacterControl.animator.GetCurrentAnimatorStateInfo(0).normalizedTime);
diff --git a/Assets/Scripts/Effects/AfterImage/AfterImagePool.cs b/Assets/Scripts/Effects/AfterImage/AfterImagePool.cs
index f9d033fd..8b32fe38 100644
--- a/Assets/Scripts/Effects/AfterImage/AfterImagePool.cs
+++ b/Assets/Scripts/Effects/AfterImage/AfterImagePool.cs
@@ -19,32 +19,41 @@ public class AfterImagePool : MonoBehaviour
// Use this for initialization
void Start()
{
- //myCharacterControl = transform.root.GetComponent<CharacterControl>();
- //Debug.Log("START AFTER IMAGE POOL");
afterImages = new List<AfterImage>(poolSize);
for (int i = 0; i < poolSize; i++)
{
GameObject nextAfterImage = Instantiate(prefab);
- afterImages.Add(nextAfterImage.GetComponent<AfterImage>());
-
- nextAfterImage.GetComponent<AfterImage>().targetObject = targetObject; //Game Object Target
- nextAfterImage.GetComponent<AfterImage>().targetAnimator = targetAnimator; //Animator Target
- }
- }
+ nextAfterImage.transform.SetParent(this.transform);
+
+ nextAfterImage.GetComponent<AfterImage>().targetObject = targetObject; //Game Object Target
+ nextAfterImage.GetComponent<AfterImage>().targetAnimator = targetAnimator; //Animator Target
+
+ nextAfterImage.SetActive(false);
+
+ afterImages.Add(nextAfterImage.GetComponent<AfterImage>());
+ }
+ }
// Update is called once per frame
void Update()
{
- //if (CitadelDeep.hitPause > 0 || CitadelDeep.debugPause) { return; }
time++;
- if (time > interval) { time = 0; AddAfterImage(); }
+ if (time > interval)
+ {
+ time = 0;
+ AddAfterImage();
+ }
}
void AddAfterImage()
{
for (int i = 0; i < poolSize; i++)
{
- if (!afterImages[i].active) { afterImages[i].Activate(); break; }
+ if (!afterImages[i].active)
+ {
+ afterImages[i].Activate();
+ break;
+ }
}
}
} \ No newline at end of file
generated by cgit v1.1-26-g67d0 at 2025-05-28 21:05:45 +0000