Skip to content

Y
YGOProUnity_V2
Commit fa1036f1 authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

prepare for upgrade

parent b1f483bd
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 52 deletions
Assets/ArtSystem/arrow/Mega-Fiers/Scripts/MegaGrab/DOFCamera.cs
View file @ fa1036f1
...@@ -9,7 +9,7 @@ public class MGBlendTable ...@@ -9,7 +9,7 @@ public class MGBlendTable
int mTableSzXY; // layer sz int mTableSzXY; // layer sz
int mTotalSz; // all layers int mTotalSz; // all layers
float[] mpTable; // the dither tables float[] mpTable; // the dither tables
Random mRandom; // maxsdk pseudo-random number generator System.Random mRandom; // maxsdk pseudo-random number generator
int LayerIndex(int nImage) int LayerIndex(int nImage)
{ {
......
Assets/old/UiverseAssests/itween/iTween.cs
View file @ fa1036f1
...@@ -699,11 +699,12 @@ public class iTween : MonoBehaviour{ ...@@ -699,11 +699,12 @@ public class iTween : MonoBehaviour{
} }
//set tempColor and base fromColor: //set tempColor and base fromColor:
if(target.GetComponent(typeof(GUITexture))){ // if(target.GetComponent(typeof(GUITexture))){
tempColor=fromColor=target.GetComponent<GUITexture>().color; // tempColor=fromColor=target.GetComponent<GUITexture>().color;
}else if(target.GetComponent(typeof(GUIText))){ // }else if(target.GetComponent(typeof(GUIText))){
tempColor=fromColor=target.GetComponent<GUIText>().material.color; // tempColor=fromColor=target.GetComponent<GUIText>().material.color;
}else if(target.GetComponent<Renderer>()){ // }else
if(target.GetComponent<Renderer>()){
tempColor=fromColor=target.GetComponent<Renderer>().material.color; tempColor=fromColor=target.GetComponent<Renderer>().material.color;
}else if(target.GetComponent<Light>()){ }else if(target.GetComponent<Light>()){
tempColor=fromColor=target.GetComponent<Light>().color; tempColor=fromColor=target.GetComponent<Light>().color;
...@@ -737,11 +738,12 @@ public class iTween : MonoBehaviour{ ...@@ -737,11 +738,12 @@ public class iTween : MonoBehaviour{
} }
//apply fromColor: //apply fromColor:
if(target.GetComponent(typeof(GUITexture))){ // if(target.GetComponent(typeof(GUITexture))){
target.GetComponent<GUITexture>().color=fromColor; // target.GetComponent<GUITexture>().color=fromColor;
}else if(target.GetComponent(typeof(GUIText))){ // }else if(target.GetComponent(typeof(GUIText))){
target.GetComponent<GUIText>().material.color=fromColor; // target.GetComponent<GUIText>().material.color=fromColor;
}else if(target.GetComponent<Renderer>()){ // }else
if(target.GetComponent<Renderer>()){
target.GetComponent<Renderer>().material.color=fromColor; target.GetComponent<Renderer>().material.color=fromColor;
}else if(target.GetComponent<Light>()){ }else if(target.GetComponent<Light>()){
target.GetComponent<Light>().color=fromColor; target.GetComponent<Light>().color=fromColor;
...@@ -3377,13 +3379,14 @@ public class iTween : MonoBehaviour{ ...@@ -3377,13 +3379,14 @@ public class iTween : MonoBehaviour{
//colors = new Color[3]; //colors = new Color[3];
//from and init to values: //from and init to values:
if(GetComponent(typeof(GUITexture))){ // if(GetComponent(typeof(GUITexture))){
colors = new Color[1,3]; // colors = new Color[1,3];
colors[0,0] = colors[0,1] = GetComponent<GUITexture>().color; // colors[0,0] = colors[0,1] = GetComponent<GUITexture>().color;
}else if(GetComponent(typeof(GUIText))){ // }else if(GetComponent(typeof(GUIText))){
colors = new Color[1,3]; // colors = new Color[1,3];
colors[0,0] = colors[0,1] = GetComponent<GUIText>().material.color; // colors[0,0] = colors[0,1] = GetComponent<GUIText>().material.color;
}else if(GetComponent<Renderer>()){ // }else
if(GetComponent<Renderer>()){
colors = new Color[GetComponent<Renderer>().materials.Length,3]; colors = new Color[GetComponent<Renderer>().materials.Length,3];
for (int i = 0; i < GetComponent<Renderer>().materials.Length; i++) { for (int i = 0; i < GetComponent<Renderer>().materials.Length; i++) {
colors[i,0]=GetComponent<Renderer>().materials[i].GetColor(namedcolorvalue.ToString()); colors[i,0]=GetComponent<Renderer>().materials[i].GetColor(namedcolorvalue.ToString());
...@@ -4153,13 +4156,14 @@ public class iTween : MonoBehaviour{ ...@@ -4153,13 +4156,14 @@ public class iTween : MonoBehaviour{
*/ */
//apply: //apply:
if(GetComponent(typeof(GUITexture))){ // if(GetComponent(typeof(GUITexture))){
//guiTexture.color=colors[2]; // //guiTexture.color=colors[2];
GetComponent<GUITexture>().color=colors[0,2]; // GetComponent<GUITexture>().color=colors[0,2];
}else if(GetComponent(typeof(GUIText))){ // }else if(GetComponent(typeof(GUIText))){
//guiText.material.color=colors[2]; // //guiText.material.color=colors[2];
GetComponent<GUIText>().material.color=colors[0,2]; // GetComponent<GUIText>().material.color=colors[0,2];
}else if(GetComponent<Renderer>()){ // }else
if(GetComponent<Renderer>()){
//renderer.material.color=colors[2]; //renderer.material.color=colors[2];
for (int i = 0; i < colors.GetLength(0); i++) { for (int i = 0; i < colors.GetLength(0); i++) {
GetComponent<Renderer>().materials[i].SetColor(namedcolorvalue.ToString(),colors[i,2]); GetComponent<Renderer>().materials[i].SetColor(namedcolorvalue.ToString(),colors[i,2]);
...@@ -4171,13 +4175,14 @@ public class iTween : MonoBehaviour{ ...@@ -4171,13 +4175,14 @@ public class iTween : MonoBehaviour{
//dial in: //dial in:
if(percentage==1){ if(percentage==1){
if(GetComponent(typeof(GUITexture))){ // if(GetComponent(typeof(GUITexture))){
//guiTexture.color=colors[1]; // //guiTexture.color=colors[1];
GetComponent<GUITexture>().color=colors[0,1]; // GetComponent<GUITexture>().color=colors[0,1];
}else if(GetComponent(typeof(GUIText))){ // }else if(GetComponent(typeof(GUIText))){
//guiText.material.color=colors[1]; // //guiText.material.color=colors[1];
GetComponent<GUIText>().material.color=colors[0,1]; // GetComponent<GUIText>().material.color=colors[0,1];
}else if(GetComponent<Renderer>()){ // }else
if(GetComponent<Renderer>()){
//renderer.material.color=colors[1]; //renderer.material.color=colors[1];
for (int i = 0; i < colors.GetLength(0); i++) { for (int i = 0; i < colors.GetLength(0); i++) {
GetComponent<Renderer>().materials[i].SetColor(namedcolorvalue.ToString(),colors[i,1]); GetComponent<Renderer>().materials[i].SetColor(namedcolorvalue.ToString(),colors[i,1]);
...@@ -4907,11 +4912,12 @@ public class iTween : MonoBehaviour{ ...@@ -4907,11 +4912,12 @@ public class iTween : MonoBehaviour{
} }
//init values: //init values:
if(target.GetComponent(typeof(GUITexture))){ // if(target.GetComponent(typeof(GUITexture))){
colors[0] = colors[1] = target.GetComponent<GUITexture>().color; // colors[0] = colors[1] = target.GetComponent<GUITexture>().color;
}else if(target.GetComponent(typeof(GUIText))){ // }else if(target.GetComponent(typeof(GUIText))){
colors[0] = colors[1] = target.GetComponent<GUIText>().material.color; // colors[0] = colors[1] = target.GetComponent<GUIText>().material.color;
}else if(target.GetComponent<Renderer>()){ // }else
if(target.GetComponent<Renderer>()){
colors[0] = colors[1] = target.GetComponent<Renderer>().material.color; colors[0] = colors[1] = target.GetComponent<Renderer>().material.color;
}else if(target.GetComponent<Light>()){ }else if(target.GetComponent<Light>()){
colors[0] = colors[1] = target.GetComponent<Light>().color; colors[0] = colors[1] = target.GetComponent<Light>().color;
...@@ -4942,11 +4948,12 @@ public class iTween : MonoBehaviour{ ...@@ -4942,11 +4948,12 @@ public class iTween : MonoBehaviour{
colors[3].a=Mathf.SmoothDamp(colors[0].a,colors[1].a,ref colors[2].a,time); colors[3].a=Mathf.SmoothDamp(colors[0].a,colors[1].a,ref colors[2].a,time);
//apply: //apply:
if(target.GetComponent(typeof(GUITexture))){ // if(target.GetComponent(typeof(GUITexture))){
target.GetComponent<GUITexture>().color=colors[3]; // target.GetComponent<GUITexture>().color=colors[3];
}else if(target.GetComponent(typeof(GUIText))){ // }else if(target.GetComponent(typeof(GUIText))){
target.GetComponent<GUIText>().material.color=colors[3]; // target.GetComponent<GUIText>().material.color=colors[3];
}else if(target.GetComponent<Renderer>()){ // }else
if(target.GetComponent<Renderer>()){
target.GetComponent<Renderer>().material.color=colors[3]; target.GetComponent<Renderer>().material.color=colors[3];
}else if(target.GetComponent<Light>()){ }else if(target.GetComponent<Light>()){
target.GetComponent<Light>().color=colors[3]; target.GetComponent<Light>().color=colors[3];
...@@ -6071,7 +6078,7 @@ public class iTween : MonoBehaviour{ ...@@ -6071,7 +6078,7 @@ public class iTween : MonoBehaviour{
/// </param> /// </param>
public static void CameraFadeSwap(Texture2D texture){ public static void CameraFadeSwap(Texture2D texture){
if(cameraFade){ if(cameraFade){
cameraFade.GetComponent<GUITexture>().texture=texture; // cameraFade.GetComponent<GUITexture>().texture=texture;
} }
} }
...@@ -6094,9 +6101,9 @@ public class iTween : MonoBehaviour{ ...@@ -6094,9 +6101,9 @@ public class iTween : MonoBehaviour{
//establish colorFade object: //establish colorFade object:
cameraFade = new GameObject("iTween Camera Fade"); cameraFade = new GameObject("iTween Camera Fade");
cameraFade.transform.position= new Vector3(.5f,.5f,depth); cameraFade.transform.position= new Vector3(.5f,.5f,depth);
cameraFade.AddComponent<GUITexture>(); // cameraFade.AddComponent<GUITexture>();
cameraFade.GetComponent<GUITexture>().texture=texture; // cameraFade.GetComponent<GUITexture>().texture=texture;
cameraFade.GetComponent<GUITexture>().color = new Color(.5f,.5f,.5f,0); // cameraFade.GetComponent<GUITexture>().color = new Color(.5f,.5f,.5f,0);
return cameraFade; return cameraFade;
} }
} }
...@@ -6117,9 +6124,9 @@ public class iTween : MonoBehaviour{ ...@@ -6117,9 +6124,9 @@ public class iTween : MonoBehaviour{
//establish colorFade object: //establish colorFade object:
cameraFade = new GameObject("iTween Camera Fade"); cameraFade = new GameObject("iTween Camera Fade");
cameraFade.transform.position= new Vector3(.5f,.5f,Defaults.cameraFadeDepth); cameraFade.transform.position= new Vector3(.5f,.5f,Defaults.cameraFadeDepth);
cameraFade.AddComponent<GUITexture>(); // cameraFade.AddComponent<GUITexture>();
cameraFade.GetComponent<GUITexture>().texture=texture; // cameraFade.GetComponent<GUITexture>().texture=texture;
cameraFade.GetComponent<GUITexture>().color = new Color(.5f,.5f,.5f,0); // cameraFade.GetComponent<GUITexture>().color = new Color(.5f,.5f,.5f,0);
return cameraFade; return cameraFade;
} }
} }
...@@ -6137,9 +6144,9 @@ public class iTween : MonoBehaviour{ ...@@ -6137,9 +6144,9 @@ public class iTween : MonoBehaviour{
//establish colorFade object: //establish colorFade object:
cameraFade = new GameObject("iTween Camera Fade"); cameraFade = new GameObject("iTween Camera Fade");
cameraFade.transform.position= new Vector3(.5f,.5f,Defaults.cameraFadeDepth); cameraFade.transform.position= new Vector3(.5f,.5f,Defaults.cameraFadeDepth);
cameraFade.AddComponent<GUITexture>(); // cameraFade.AddComponent<GUITexture>();
cameraFade.GetComponent<GUITexture>().texture=CameraTexture(Color.black); // cameraFade.GetComponent<GUITexture>().texture=CameraTexture(Color.black);
cameraFade.GetComponent<GUITexture>().color = new Color(.5f,.5f,.5f,0); // cameraFade.GetComponent<GUITexture>().color = new Color(.5f,.5f,.5f,0);
return cameraFade; return cameraFade;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment