Commit 9082662d authored by Unicorn369's avatar Unicorn369

Update

parent 8189014a
...@@ -14,7 +14,7 @@ public class LAZYsetting : MonoBehaviour { ...@@ -14,7 +14,7 @@ public class LAZYsetting : MonoBehaviour {
public UIToggle showoff; public UIToggle showoff;
public UIToggle showoffWhenActived; public UIToggle showoffWhenActived;
public UIToggle cloud; public UIToggle cloud;
public UIToggle DownloadImage; public UIToggle autoPicDownload;
public UIToggle Vbattle; public UIToggle Vbattle;
public UIToggle Vmove; public UIToggle Vmove;
public UIToggle Vchain; public UIToggle Vchain;
......
...@@ -120,10 +120,10 @@ public class gameInfo : MonoBehaviour ...@@ -120,10 +120,10 @@ public class gameInfo : MonoBehaviour
opponent.transform.localPosition = new Vector3(Screen.width / 2-14, Screen.height / 2 - 14 - k * (float)(opponent.under.height)); opponent.transform.localPosition = new Vector3(Screen.width / 2-14, Screen.height / 2 - 14 - k * (float)(opponent.under.height));
} }
float height = 132 + 50 * (HashedButtons.Count); float height = 198 + 50 * (HashedButtons.Count);
if (HashedButtons.Count==0) if (HashedButtons.Count == 0)
{ {
height = 116; height = 174;
} }
width = (150 * kb) + 15f; width = (150 * kb) + 15f;
float localPositionPanX = (((float)Screen.width - 150 * kb) / 2) - 15f; float localPositionPanX = (((float)Screen.width - 150 * kb) / 2) - 15f;
......
...@@ -90,7 +90,7 @@ Transform: ...@@ -90,7 +90,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 153646} m_GameObject: {fileID: 153646}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: -75, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 464504} - {fileID: 464504}
...@@ -118,7 +118,7 @@ Transform: ...@@ -118,7 +118,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 175034} m_GameObject: {fileID: 175034}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4498.624, y: -3107.0017, z: 1654.8652} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 432476} - {fileID: 432476}
...@@ -136,7 +136,7 @@ BoxCollider: ...@@ -136,7 +136,7 @@ BoxCollider:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 195, y: 52, z: 0} m_Size: {x: 195, y: 52, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: -75, z: 0}
--- !u!111 &11143220 --- !u!111 &11143220
Animation: Animation:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -50,7 +50,7 @@ public static class UIHelper ...@@ -50,7 +50,7 @@ public static class UIHelper
public static void Flash() public static void Flash()
{ {
FlashWindow(GetProcessWnd(),true); FlashWindow(GetProcessWnd(), true);
} }
public enum RenderingMode public enum RenderingMode
...@@ -104,7 +104,7 @@ public static class UIHelper ...@@ -104,7 +104,7 @@ public static class UIHelper
} }
} }
internal static void registEvent(UIButton btn, Action function) internal static void registEvent(UIButton btn, Action function)
{ {
if (btn != null) if (btn != null)
{ {
...@@ -120,9 +120,9 @@ public static class UIHelper ...@@ -120,9 +120,9 @@ public static class UIHelper
} }
} }
internal static Texture2D[] sliceField(Texture2D textureField_) internal static Texture2D[] sliceField(Texture2D textureField_)
{ {
Texture2D textureField = ScaleTexture(textureField_,1024,819); Texture2D textureField = ScaleTexture(textureField_, 1024, 819);
Texture2D[] returnValue = new Texture2D[3]; Texture2D[] returnValue = new Texture2D[3];
returnValue[0] = new Texture2D(textureField.width, textureField.height); returnValue[0] = new Texture2D(textureField.width, textureField.height);
returnValue[1] = new Texture2D(textureField.width, textureField.height); returnValue[1] = new Texture2D(textureField.width, textureField.height);
...@@ -193,7 +193,7 @@ public static class UIHelper ...@@ -193,7 +193,7 @@ public static class UIHelper
return ptrFileName; return ptrFileName;
} }
public static T getByName<T>(GameObject father,string name) where T:Component public static T getByName<T>(GameObject father, string name) where T : Component
{ {
T return_value = null; T return_value = null;
var all = father.transform.GetComponentsInChildren<T>(); var all = father.transform.GetComponentsInChildren<T>();
...@@ -209,7 +209,7 @@ public static class UIHelper ...@@ -209,7 +209,7 @@ public static class UIHelper
public static void InterGameObject(GameObject father) public static void InterGameObject(GameObject father)
{ {
var all = father.transform.GetComponentsInChildren<UILabel>(); var all = father.transform.GetComponentsInChildren<UILabel>();
for (int i = 0; i < all.Length; i++) for (int i = 0; i < all.Length; i++)
{ {
if ((all[i].name.Length > 1 && all[i].name[0] == '!') || all[i].name == "yes_" || all[i].name == "no_") if ((all[i].name.Length > 1 && all[i].name[0] == '!') || all[i].name == "yes_" || all[i].name == "no_")
...@@ -217,7 +217,7 @@ public static class UIHelper ...@@ -217,7 +217,7 @@ public static class UIHelper
all[i].text = InterString.Get(all[i].text); all[i].text = InterString.Get(all[i].text);
} }
} }
} }
public static GameObject getByName(GameObject father, string name) public static GameObject getByName(GameObject father, string name)
{ {
...@@ -245,7 +245,7 @@ public static class UIHelper ...@@ -245,7 +245,7 @@ public static class UIHelper
var all = father.transform.GetComponentsInChildren<UILabel>(); var all = father.transform.GetComponentsInChildren<UILabel>();
for (int i = 0; i < all.Length; i++) for (int i = 0; i < all.Length; i++)
{ {
if (all[i].name == name if (all[i].name == name
|| ||
(all[i].transform.parent != null && all[i].transform.parent.name == name) (all[i].transform.parent != null && all[i].transform.parent.name == name)
|| ||
...@@ -298,7 +298,7 @@ public static class UIHelper ...@@ -298,7 +298,7 @@ public static class UIHelper
} }
else else
{ {
Program.DEBUGLOG("NO Lable"+ name); Program.DEBUGLOG("NO Lable" + name);
} }
} }
...@@ -313,12 +313,12 @@ public static class UIHelper ...@@ -313,12 +313,12 @@ public static class UIHelper
return ""; return "";
} }
public static string[] Split(this string str,string s) public static string[] Split(this string str, string s)
{ {
return str.Split(new string[] { s }, StringSplitOptions.RemoveEmptyEntries); return str.Split(new string[] { s }, StringSplitOptions.RemoveEmptyEntries);
} }
public static void registEvent(GameObject father, string name, Action<GameObject, Servant.messageSystemValue> function, Servant.messageSystemValue value,string name2="") public static void registEvent(GameObject father, string name, Action<GameObject, Servant.messageSystemValue> function, Servant.messageSystemValue value, string name2 = "")
{ {
UIInput input = getByName<UIInput>(father, name); UIInput input = getByName<UIInput>(father, name);
if (input != null) if (input != null)
...@@ -377,7 +377,7 @@ public static class UIHelper ...@@ -377,7 +377,7 @@ public static class UIHelper
public static void registEvent(GameObject father, string name, Action function) public static void registEvent(GameObject father, string name, Action function)
{ {
UISlider slider = getByName<UISlider>(father, name); UISlider slider = getByName<UISlider>(father, name);
if (slider != null) if (slider != null)
{ {
MonoDelegate d = slider.gameObject.GetComponent<MonoDelegate>(); MonoDelegate d = slider.gameObject.GetComponent<MonoDelegate>();
...@@ -499,7 +499,7 @@ public static class UIHelper ...@@ -499,7 +499,7 @@ public static class UIHelper
internal static Vector2 get_hang_lieArry(int v, int[] hangshu) internal static Vector2 get_hang_lieArry(int v, int[] hangshu)
{ {
Vector2 return_value = Vector2.zero; Vector2 return_value = Vector2.zero;
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
if (v < hangshu[i]) if (v < hangshu[i])
{ {
...@@ -608,7 +608,7 @@ public static class UIHelper ...@@ -608,7 +608,7 @@ public static class UIHelper
{ {
gameObject.GetComponentInChildren<UILabel>().text = p; gameObject.GetComponentInChildren<UILabel>().text = p;
} }
catch (Exception) catch (Exception)
{ {
} }
} }
...@@ -618,7 +618,7 @@ public static class UIHelper ...@@ -618,7 +618,7 @@ public static class UIHelper
registEvent(gameObject, gameObject.name, act); registEvent(gameObject, gameObject.name, act);
} }
internal static void trySetLableTextList(GameObject father,string text) internal static void trySetLableTextList(GameObject father, string text)
{ {
try try
{ {
...@@ -649,7 +649,7 @@ public static class UIHelper ...@@ -649,7 +649,7 @@ public static class UIHelper
internal static void clearITWeen(GameObject gameObject) internal static void clearITWeen(GameObject gameObject)
{ {
iTween[] iTweens = gameObject.GetComponents<iTween>(); iTween[] iTweens = gameObject.GetComponents<iTween>();
for (int i=0;i< iTweens.Length;i++) for (int i = 0; i < iTweens.Length; i++)
{ {
MonoBehaviour.DestroyImmediate(iTweens[i]); MonoBehaviour.DestroyImmediate(iTweens[i]);
} }
...@@ -667,7 +667,7 @@ public static class UIHelper ...@@ -667,7 +667,7 @@ public static class UIHelper
{ {
return_value = left + (right - left) * (float)i / ((float)(count - 1)); return_value = left + (right - left) * (float)i / ((float)(count - 1));
} }
return return_value; return return_value;
} }
internal static float get_left_right_indexZuo(float v1, float v2, int v3, int count, int v4) internal static float get_left_right_indexZuo(float v1, float v2, int v3, int count, int v4)
...@@ -775,9 +775,9 @@ public static class UIHelper ...@@ -775,9 +775,9 @@ public static class UIHelper
return re; return re;
} }
} }
byte[] buffer= System.Text.Encoding.UTF8.GetBytes(name); byte[] buffer = System.Text.Encoding.UTF8.GetBytes(name);
int sum = 0; int sum = 0;
for (int i=0;i< buffer.Length;i++) for (int i = 0; i < buffer.Length; i++)
{ {
sum += buffer[i]; sum += buffer[i];
} }
...@@ -785,7 +785,7 @@ public static class UIHelper ...@@ -785,7 +785,7 @@ public static class UIHelper
return Program.I().face.faces[sum]; return Program.I().face.faces[sum];
} }
public static Texture2D getTexture2D(string path) public static Texture2D getTexture2D(string path)
{ {
Texture2D pic = null; Texture2D pic = null;
try try
...@@ -812,7 +812,7 @@ public static class UIHelper ...@@ -812,7 +812,7 @@ public static class UIHelper
} }
internal static void shiftButton(UIButton btn,bool enabled) internal static void shiftButton(UIButton btn, bool enabled)
{ {
if (enabled) if (enabled)
{ {
...@@ -842,7 +842,7 @@ public static class UIHelper ...@@ -842,7 +842,7 @@ public static class UIHelper
//} //}
} }
internal static void shiftUIToggle(UIToggle tog, bool canClick,bool canChange, string hint) internal static void shiftUIToggle(UIToggle tog, bool canClick, bool canChange, string hint)
{ {
try try
{ {
...@@ -853,7 +853,7 @@ public static class UIHelper ...@@ -853,7 +853,7 @@ public static class UIHelper
boxCollider.enabled = canClick; boxCollider.enabled = canClick;
if (canClick) if (canClick)
{ {
getByName<UISprite>(tog.gameObject, "Background").color= Color.white; getByName<UISprite>(tog.gameObject, "Background").color = Color.white;
//getByName<UISprite>(tog.gameObject, "Checkmark").color = Color.white; //getByName<UISprite>(tog.gameObject, "Checkmark").color = Color.white;
} }
else else
...@@ -870,7 +870,7 @@ public static class UIHelper ...@@ -870,7 +870,7 @@ public static class UIHelper
internal static string getBufferString(byte[] buffer) internal static string getBufferString(byte[] buffer)
{ {
string returnValue = ""; string returnValue = "";
foreach (var item in buffer) foreach (var item in buffer)
{ {
returnValue += ((int)item).ToString() + "."; returnValue += ((int)item).ToString() + ".";
} }
...@@ -886,7 +886,7 @@ public static class UIHelper ...@@ -886,7 +886,7 @@ public static class UIHelper
return s == "1"; return s == "1";
} }
internal static string fromBoolToString(bool s) internal static string fromBoolToString(bool s)
{ {
if (s) if (s)
{ {
...@@ -905,7 +905,7 @@ public static class UIHelper ...@@ -905,7 +905,7 @@ public static class UIHelper
} }
public static int CompareTime(object x, object y) public static int CompareTime(object x, object y)
{ {
if (x == null && y == null) if (x == null && y == null)
{ {
...@@ -924,7 +924,7 @@ public static class UIHelper ...@@ -924,7 +924,7 @@ public static class UIHelper
return yInfo.LastWriteTime.CompareTo(xInfo.LastWriteTime); return yInfo.LastWriteTime.CompareTo(xInfo.LastWriteTime);
} }
public static int CompareName(object x, object y) public static int CompareName(object x, object y)
{ {
if (x == null && y == null) if (x == null && y == null)
{ {
...@@ -943,9 +943,9 @@ public static class UIHelper ...@@ -943,9 +943,9 @@ public static class UIHelper
return xInfo.FullName.CompareTo(yInfo.FullName); return xInfo.FullName.CompareTo(yInfo.FullName);
} }
internal static void playSound(string p, float val) internal static void playSound(string p, float val)
{ {
if (Ocgcore.inSkiping) if (Ocgcore.inSkiping)
{ {
return; return;
} }
...@@ -963,10 +963,10 @@ public static class UIHelper ...@@ -963,10 +963,10 @@ public static class UIHelper
return; return;
} }
path = Environment.CurrentDirectory.Replace("\\", "/") + "/" + path; path = Environment.CurrentDirectory.Replace("\\", "/") + "/" + path;
path = "file:///" + path; path = new Uri(new Uri("file:///"), path).ToString();
GameObject audio_helper = Program.I().ocgcore.create_s(Program.I().mod_audio_effect); GameObject audio_helper = Program.I().ocgcore.create_s(Program.I().mod_audio_effect);
audio_helper.GetComponent<audio_helper>().play(path, Program.I().setting.soundValue()); audio_helper.GetComponent<audio_helper>().play(path, Program.I().setting.soundValue());
Program.I().destroy(audio_helper,5f); Program.I().destroy(audio_helper, 5f);
} }
internal static string getGPSstringLocation(GPS p1) internal static string getGPSstringLocation(GPS p1)
...@@ -1068,24 +1068,24 @@ public static class UIHelper ...@@ -1068,24 +1068,24 @@ public static class UIHelper
return res; return res;
} }
internal static string getSuperName(string name,int code) internal static string getSuperName(string name, int code)
{ {
string res = ""; string res = "";
res = "[url=" + code.ToString() + "][u]" + name + "[/u][/url]"; res = "[url=" + code.ToString() + "][u]" + name + "[/u][/url]";
return res; return res;
} }
internal static string getDName(string name, int code) internal static string getDName(string name, int code)
{ {
string res = ""; string res = "";
res = "「[url=" + code.ToString() + "][u]" + name + "[/u][/url]」"; res = "「[url=" + code.ToString() + "][u]" + name + "[/u][/url]」";
return res; return res;
} }
internal static float getScreenDistance(GameObject a,GameObject b) internal static float getScreenDistance(GameObject a, GameObject b)
{ {
Vector3 sa = Program.camera_game_main.WorldToScreenPoint(a.transform.position);sa.z = 0; Vector3 sa = Program.camera_game_main.WorldToScreenPoint(a.transform.position); sa.z = 0;
Vector3 sb = Program.camera_game_main.WorldToScreenPoint(b.transform.position);sb.z = 0; Vector3 sb = Program.camera_game_main.WorldToScreenPoint(b.transform.position); sb.z = 0;
return Vector3.Distance(sa, sb); return Vector3.Distance(sa, sb);
} }
......
...@@ -15,7 +15,7 @@ public class GameField : OCGobject ...@@ -15,7 +15,7 @@ public class GameField : OCGobject
Transform p_hole_opl = null; Transform p_hole_opl = null;
Transform p_hole_mer = null; Transform p_hole_mer = null;
Transform p_hole_opr = null; Transform p_hole_opr = null;
public phaser Phase = null; public phaser Phase = null;
public bool mePHole = false; public bool mePHole = false;
public bool opPHole = false; public bool opPHole = false;
...@@ -55,8 +55,8 @@ public class GameField : OCGobject ...@@ -55,8 +55,8 @@ public class GameField : OCGobject
Program.I().ocgcore.sendReturn(m.get()); Program.I().ocgcore.sendReturn(m.get());
} }
public int retOfMp = -1; public int retOfMp = -1;
void onMP() void onMP()
{ {
var m = new BinaryMaster(); var m = new BinaryMaster();
m.writer.Write(retOfMp); m.writer.Write(retOfMp);
...@@ -244,8 +244,8 @@ public class GameField : OCGobject ...@@ -244,8 +244,8 @@ public class GameField : OCGobject
public void Update() public void Update()
{ {
delat = ((isLong ? (40f + 60f * ((1.21f - Program.fieldSize) / 0.21f)) :0f))/110f*5f; delat = ((isLong ? (40f + 60f * ((1.21f - Program.fieldSize) / 0.21f)) : 0f)) / 110f * 5f;
fieldSprite_height += ((isLong ? (819f + 40f + 60f * ((1.21f-Program.fieldSize) / 0.21f)) : 819f) - fieldSprite_height) * (Program.deltaTime * 4); fieldSprite_height += ((isLong ? (819f + 40f + 60f * ((1.21f - Program.fieldSize) / 0.21f)) : 819f) - fieldSprite_height) * (Program.deltaTime * 4);
midT.height = (int)fieldSprite_height; midT.height = (int)fieldSprite_height;
Vector3 position = midT.gameObject.transform.localPosition; Vector3 position = midT.gameObject.transform.localPosition;
...@@ -400,7 +400,7 @@ public class GameField : OCGobject ...@@ -400,7 +400,7 @@ public class GameField : OCGobject
} }
private static void relocateTextMesh(TMPro.TextMeshPro obj, uint con, game_location loc,Vector3 poi) private static void relocateTextMesh(TMPro.TextMeshPro obj, uint con, game_location loc, Vector3 poi)
{ {
obj.transform.position = UIHelper.getCamGoodPosition(Program.I().ocgcore.get_point_worldposition(new GPS obj.transform.position = UIHelper.getCamGoodPosition(Program.I().ocgcore.get_point_worldposition(new GPS
{ {
...@@ -422,24 +422,24 @@ public class GameField : OCGobject ...@@ -422,24 +422,24 @@ public class GameField : OCGobject
fieldCode[player] = code; fieldCode[player] = code;
if (code > 0) if (code > 0)
{ {
Texture2D tex; Texture2D tex = null;
if (File.Exists("picture/field/" + code.ToString() + ".png")) if (File.Exists("picture/field/" + code.ToString() + ".png"))
{ {
tex = UIHelper.getTexture2D("picture/field/" + code.ToString() + ".png"); tex = UIHelper.getTexture2D("picture/field/" + code.ToString() + ".png");
} }
else if (File.Exists("expansions/pics/field/" + code.ToString() + ".png")) else if (File.Exists("expansions/pics/field/" + code.ToString() + ".png"))
{ {
tex = UIHelper.getTexture2D("expansions/pics/field/" + code.ToString() + ".png"); tex = UIHelper.getTexture2D("expansions/pics/field/" + code.ToString() + ".png");
} }
else if (File.Exists("pics/field/" + code.ToString() + ".png")) else if (File.Exists("pics/field/" + code.ToString() + ".png"))
{ {
tex = UIHelper.getTexture2D("pics/field/" + code.ToString() + ".png"); tex = UIHelper.getTexture2D("pics/field/" + code.ToString() + ".png");
} }
else if (File.Exists("picture/field/" + code.ToString() + ".jpg")) else if (File.Exists("picture/field/" + code.ToString() + ".jpg"))
{ {
tex = UIHelper.getTexture2D("picture/field/" + code.ToString() + ".jpg"); tex = UIHelper.getTexture2D("picture/field/" + code.ToString() + ".jpg");
} }
else if (File.Exists("expansions/pics/field/" + code.ToString() + ".jpg")) else if (File.Exists("expansions/pics/field/" + code.ToString() + ".jpg"))
{ {
tex = UIHelper.getTexture2D("expansions/pics/field/" + code.ToString() + ".jpg"); tex = UIHelper.getTexture2D("expansions/pics/field/" + code.ToString() + ".jpg");
} }
...@@ -488,7 +488,7 @@ public class GameField : OCGobject ...@@ -488,7 +488,7 @@ public class GameField : OCGobject
} }
} }
public void shiftBlackHole(bool on,Vector3 v=default(Vector3)) public void shiftBlackHole(bool on, Vector3 v = default(Vector3))
{ {
if (on) if (on)
{ {
...@@ -533,17 +533,17 @@ public class GameField : OCGobject ...@@ -533,17 +533,17 @@ public class GameField : OCGobject
} }
GameObject big_string; GameObject big_string;
public void animation_show_big_string(Texture2D tex,bool only=false) public void animation_show_big_string(Texture2D tex, bool only = false)
{ {
if (Ocgcore.inSkiping) if (Ocgcore.inSkiping)
{ {
return; return;
} }
if (only) if (only)
{ {
destroy(big_string); destroy(big_string);
} }
big_string = create(Program.I().New_phase,Program.I().ocgcore.centre(),Vector3.zero,false,Program.ui_main_2d,true,new Vector3(Screen.height / 1000f* Program.fieldSize, Screen.height / 1000f * Program.fieldSize, Screen.height / 1000f * Program.fieldSize)); big_string = create(Program.I().New_phase, Program.I().ocgcore.centre(), Vector3.zero, false, Program.ui_main_2d, true, new Vector3(Screen.height / 1000f * Program.fieldSize, Screen.height / 1000f * Program.fieldSize, Screen.height / 1000f * Program.fieldSize));
big_string.GetComponentInChildren<UITexture>().mainTexture = tex; big_string.GetComponentInChildren<UITexture>().mainTexture = tex;
Program.I().ocgcore.Sleep(40); Program.I().ocgcore.Sleep(40);
big_string.AddComponent<animation_screen_lock2>(); big_string.AddComponent<animation_screen_lock2>();
...@@ -642,7 +642,7 @@ public class GameField : OCGobject ...@@ -642,7 +642,7 @@ public class GameField : OCGobject
{ {
p = gps, p = gps,
position = Program.I().ocgcore.get_point_worldposition(gps) position = Program.I().ocgcore.get_point_worldposition(gps)
}; };
field_disabled_containers.Add(container); field_disabled_containers.Add(container);
} }
...@@ -658,7 +658,7 @@ public class GameField : OCGobject ...@@ -658,7 +658,7 @@ public class GameField : OCGobject
public void realize() public void realize()
{ {
if (Phase.colliderBp.enabled) if (Phase.colliderBp.enabled)
{ {
Phase.labBp.gradientTop = Color.white; Phase.labBp.gradientTop = Color.white;
} }
...@@ -706,13 +706,13 @@ public class GameField : OCGobject ...@@ -706,13 +706,13 @@ public class GameField : OCGobject
Phase.labEp.gradientTop = Color.green; Phase.labEp.gradientTop = Color.green;
break; break;
} }
for (int i = 0; i < field_disabled_containers.Count; i++) for (int i = 0; i < field_disabled_containers.Count; i++)
{ {
if (field_disabled_containers[i].disabled) if (field_disabled_containers[i].disabled)
{ {
if (field_disabled_containers[i].game_object == null) if (field_disabled_containers[i].game_object == null)
{ {
field_disabled_containers[i].game_object = create(Program.I().mod_simple_quad, field_disabled_containers[i].position,new Vector3(90,0,0),false,null,true); field_disabled_containers[i].game_object = create(Program.I().mod_simple_quad, field_disabled_containers[i].position, new Vector3(90, 0, 0), false, null, true);
field_disabled_containers[i].game_object.transform.localScale = Vector3.zero; field_disabled_containers[i].game_object.transform.localScale = Vector3.zero;
iTween.ScaleTo(field_disabled_containers[i].game_object, new Vector3(4, 4, 4), 1f); iTween.ScaleTo(field_disabled_containers[i].game_object, new Vector3(4, 4, 4), 1f);
field_disabled_containers[i].game_object.GetComponent<Renderer>().material.mainTexture = GameTextureManager.negated; field_disabled_containers[i].game_object.GetComponent<Renderer>().material.mainTexture = GameTextureManager.negated;
...@@ -720,7 +720,7 @@ public class GameField : OCGobject ...@@ -720,7 +720,7 @@ public class GameField : OCGobject
} }
else else
{ {
destroy(field_disabled_containers[i].game_object,0.6f,true,true); destroy(field_disabled_containers[i].game_object, 0.6f, true, true);
} }
} }
......
...@@ -288,15 +288,17 @@ public class Program : MonoBehaviour ...@@ -288,15 +288,17 @@ public class Program : MonoBehaviour
#if !UNITY_EDITOR && UNITY_ANDROID #if !UNITY_EDITOR && UNITY_ANDROID
AndroidJavaObject jo = new AndroidJavaObject("cn.unicorn369.library.API"); AndroidJavaObject jo = new AndroidJavaObject("cn.unicorn369.library.API");
#endif #endif
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows #if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
//Environment.CurrentDirectory = System.Windows.Forms.Application.StartupPath; //Environment.CurrentDirectory = System.Windows.Forms.Application.StartupPath;
//System.IO.Directory.SetCurrentDirectory(System.Windows.Forms.Application.StartupPath); //System.IO.Directory.SetCurrentDirectory(System.Windows.Forms.Application.StartupPath);
#elif UNITY_ANDROID //Android #elif UNITY_ANDROID //Android
/* /**
* 部分机型Sdcard目录可能不是:/storage/emulated/0/ * public String GamePath(String path) {
* 可能为:/sdcard/、/mnt/sdcard/、/storage/emulated/legacy/... 等等其他路径 * GAME_DIR = Environment.getExternalStorageDirectory().toString(); + path;
* 推荐使用Java判断: Environment.getExternalStorageDirectory().toString() + path; * return GAME_DIR;
*/ * }
*/
ANDROID_GAME_PATH = jo.Call<string>("GamePath", "/ygopro2/"); ANDROID_GAME_PATH = jo.Call<string>("GamePath", "/ygopro2/");
Screen.sleepTimeout = SleepTimeout.NeverSleep; Screen.sleepTimeout = SleepTimeout.NeverSleep;
...@@ -414,12 +416,20 @@ public class Program : MonoBehaviour ...@@ -414,12 +416,20 @@ public class Program : MonoBehaviour
} }
} }
/* /**
* 使用Termux编译生成的:libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android) * 使用Termux编译生成的:libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android)
* 经测试,只有Android 6.0以上才能正常使用。为了让Android 6.0以下的也能酬和使用立绘效果,需做判断 * 经测试,只有Android 6.0以上才能正常使用。为了让Android 6.0以下的也能酬和使用立绘效果,需做判断
*/ *
//Java: Build.VERSION.SDK_INT >= Build.VERSION_CODES.M * public boolean APIVersion() {
* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
* return true;
* } else {
* return true;
* }
* }
*/
bool API_SUPPORT = jo.Call<bool>("APIVersion"); bool API_SUPPORT = jo.Call<bool>("APIVersion");
if (API_SUPPORT == true) { if (API_SUPPORT == true) {
ANDROID_API_M = true; ANDROID_API_M = true;
} else { } else {
...@@ -1176,7 +1186,7 @@ public class Program : MonoBehaviour ...@@ -1176,7 +1186,7 @@ public class Program : MonoBehaviour
public static bool Running = true; public static bool Running = true;
public static bool MonsterCloud = false; public static bool MonsterCloud = false;
public static bool DownloadImage = false;
public static float fieldSize = 1; public static float fieldSize = 1;
void OnApplicationQuit() void OnApplicationQuit()
......
...@@ -71,7 +71,7 @@ public class Setting : WindowServant2D ...@@ -71,7 +71,7 @@ public class Setting : WindowServant2D
UIHelper.registEvent(setting.mouseEffect.gameObject, onchangeMouse); UIHelper.registEvent(setting.mouseEffect.gameObject, onchangeMouse);
UIHelper.registEvent(setting.closeUp.gameObject, onchangeCloseUp); UIHelper.registEvent(setting.closeUp.gameObject, onchangeCloseUp);
UIHelper.registEvent(setting.cloud.gameObject, onchangeCloud); UIHelper.registEvent(setting.cloud.gameObject, onchangeCloud);
UIHelper.registEvent(setting.DownloadImage.gameObject, onchangeDownload); UIHelper.registEvent(setting.autoPicDownload.gameObject, onchangeDownload);
UIHelper.registEvent(setting.Vpedium.gameObject, onCP); UIHelper.registEvent(setting.Vpedium.gameObject, onCP);
UIHelper.registEvent(setting.Vfield.gameObject, onCP); UIHelper.registEvent(setting.Vfield.gameObject, onCP);
UIHelper.registEvent(setting.Vlink.gameObject, onCP); UIHelper.registEvent(setting.Vlink.gameObject, onCP);
...@@ -113,7 +113,7 @@ public class Setting : WindowServant2D ...@@ -113,7 +113,7 @@ public class Setting : WindowServant2D
public void onchangeDownload() public void onchangeDownload()
{ {
Program.DownloadImage = setting.DownloadImage.value; GameTextureManager.AutoPicDownload = setting.autoPicDownload.value;
} }
public void onchangeMouse() public void onchangeMouse()
......
...@@ -28,7 +28,7 @@ public class UIselectableList : MonoBehaviour { ...@@ -28,7 +28,7 @@ public class UIselectableList : MonoBehaviour {
} }
public Action selectedAction; public Action selectedAction;
UIScrollView uIScrollView; UIScrollView uIScrollView;
float heightOfEach=20; float heightOfEach = 35;
public float preHeight = 0; public float preHeight = 0;
class selection class selection
{ {
......
...@@ -615,7 +615,7 @@ Transform: ...@@ -615,7 +615,7 @@ Transform:
- {fileID: 456580} - {fileID: 456580}
- {fileID: 446170} - {fileID: 446170}
m_Father: {fileID: 423206} m_Father: {fileID: 423206}
m_RootOrder: 10 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &403364 --- !u!4 &403364
Transform: Transform:
...@@ -650,7 +650,7 @@ Transform: ...@@ -650,7 +650,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 182110} m_GameObject: {fileID: 182110}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245.4, y: 80, z: 0} m_LocalPosition: {x: 220, y: 80, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 485952} - {fileID: 485952}
...@@ -678,13 +678,13 @@ Transform: ...@@ -678,13 +678,13 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 180038} m_GameObject: {fileID: 180038}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245.4, y: -160, z: 0} m_LocalPosition: {x: 220, y: -160, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 422874} - {fileID: 422874}
- {fileID: 432856} - {fileID: 432856}
m_Father: {fileID: 423206} m_Father: {fileID: 423206}
m_RootOrder: 8 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &417630 --- !u!4 &417630
Transform: Transform:
...@@ -706,7 +706,7 @@ Transform: ...@@ -706,7 +706,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196772} m_GameObject: {fileID: 196772}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245.4, y: 20, z: 0} m_LocalPosition: {x: 220, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 436002} - {fileID: 436002}
...@@ -757,11 +757,11 @@ Transform: ...@@ -757,11 +757,11 @@ Transform:
- {fileID: 453306} - {fileID: 453306}
- {fileID: 405476} - {fileID: 405476}
- {fileID: 418090} - {fileID: 418090}
- {fileID: 437282}
- {fileID: 445328} - {fileID: 445328}
- {fileID: 416944} - {fileID: 416944}
- {fileID: 454088} - {fileID: 454088}
- {fileID: 402370} - {fileID: 402370}
- {fileID: 437282}
m_Father: {fileID: 460406} m_Father: {fileID: 460406}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -785,7 +785,7 @@ Transform: ...@@ -785,7 +785,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 135414} m_GameObject: {fileID: 135414}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245.4, y: 200, z: 0} m_LocalPosition: {x: 220, y: 200, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 417630} - {fileID: 417630}
...@@ -826,13 +826,13 @@ Transform: ...@@ -826,13 +826,13 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 154106} m_GameObject: {fileID: 154106}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245.4, y: -40, z: 0} m_LocalPosition: {x: 220, y: -40, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 489160} - {fileID: 489160}
- {fileID: 428360} - {fileID: 428360}
m_Father: {fileID: 423206} m_Father: {fileID: 423206}
m_RootOrder: 11 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &439698 --- !u!4 &439698
Transform: Transform:
...@@ -880,13 +880,13 @@ Transform: ...@@ -880,13 +880,13 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 197966} m_GameObject: {fileID: 197966}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245.4, y: -100, z: 0} m_LocalPosition: {x: 220, y: -100, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 404116} - {fileID: 404116}
- {fileID: 491368} - {fileID: 491368}
m_Father: {fileID: 423206} m_Father: {fileID: 423206}
m_RootOrder: 7 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &446170 --- !u!4 &446170
Transform: Transform:
...@@ -908,7 +908,7 @@ Transform: ...@@ -908,7 +908,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 160632} m_GameObject: {fileID: 160632}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245.4, y: 140, z: 0} m_LocalPosition: {x: 220, y: 140, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 488988} - {fileID: 488988}
...@@ -923,13 +923,13 @@ Transform: ...@@ -923,13 +923,13 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 127402} m_GameObject: {fileID: 127402}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245.4, y: -220, z: 0} m_LocalPosition: {x: 220, y: -220, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 444490} - {fileID: 444490}
- {fileID: 406996} - {fileID: 406996}
m_Father: {fileID: 423206} m_Father: {fileID: 423206}
m_RootOrder: 9 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &456580 --- !u!4 &456580
Transform: Transform:
...@@ -966,7 +966,7 @@ Transform: ...@@ -966,7 +966,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 197804} m_GameObject: {fileID: 197804}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3546, y: -1242, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 484960} - {fileID: 484960}
...@@ -1125,7 +1125,7 @@ BoxCollider: ...@@ -1125,7 +1125,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 132, y: 32, z: 0} m_Size: {x: 150, y: 40, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6541832 --- !u!65 &6541832
BoxCollider: BoxCollider:
...@@ -1137,7 +1137,7 @@ BoxCollider: ...@@ -1137,7 +1137,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 132, y: 32, z: 0} m_Size: {x: 150, y: 40, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6542312 --- !u!65 &6542312
BoxCollider: BoxCollider:
...@@ -1149,7 +1149,7 @@ BoxCollider: ...@@ -1149,7 +1149,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 132, y: 32, z: 0} m_Size: {x: 150, y: 40, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6553708 --- !u!65 &6553708
BoxCollider: BoxCollider:
...@@ -1161,7 +1161,7 @@ BoxCollider: ...@@ -1161,7 +1161,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 132, y: 32, z: 0} m_Size: {x: 150, y: 40, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6558604 --- !u!65 &6558604
BoxCollider: BoxCollider:
...@@ -1173,7 +1173,7 @@ BoxCollider: ...@@ -1173,7 +1173,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 132, y: 32, z: 0} m_Size: {x: 150, y: 40, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6569384 --- !u!65 &6569384
BoxCollider: BoxCollider:
...@@ -1185,7 +1185,7 @@ BoxCollider: ...@@ -1185,7 +1185,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 132, y: 32, z: 0} m_Size: {x: 150, y: 40, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6573946 --- !u!65 &6573946
BoxCollider: BoxCollider:
...@@ -1221,7 +1221,7 @@ BoxCollider: ...@@ -1221,7 +1221,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 132, y: 32, z: 0} m_Size: {x: 150, y: 40, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6598738 --- !u!65 &6598738
BoxCollider: BoxCollider:
...@@ -1233,7 +1233,7 @@ BoxCollider: ...@@ -1233,7 +1233,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 132, y: 32, z: 0} m_Size: {x: 150, y: 40, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &11126402 --- !u!111 &11126402
Animation: Animation:
...@@ -1648,13 +1648,13 @@ MonoBehaviour: ...@@ -1648,13 +1648,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 132 mWidth: 150
mHeight: 32 mHeight: 40
mDepth: 8 mDepth: 8
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 4.125 aspectRatio: 3.75
--- !u!114 &11412066 --- !u!114 &11412066
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -1685,13 +1685,13 @@ MonoBehaviour: ...@@ -1685,13 +1685,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 132 mWidth: 150
mHeight: 32 mHeight: 40
mDepth: 8 mDepth: 8
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 4.125 aspectRatio: 3.75
--- !u!114 &11414274 --- !u!114 &11414274
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -1845,13 +1845,13 @@ MonoBehaviour: ...@@ -1845,13 +1845,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 132 mWidth: 150
mHeight: 32 mHeight: 40
mDepth: 8 mDepth: 8
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 4.125 aspectRatio: 3.75
--- !u!114 &11425802 --- !u!114 &11425802
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -2032,13 +2032,13 @@ MonoBehaviour: ...@@ -2032,13 +2032,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 132 mWidth: 150
mHeight: 32 mHeight: 40
mDepth: 8 mDepth: 8
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 4.125 aspectRatio: 3.75
--- !u!114 &11433254 --- !u!114 &11433254
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -2332,7 +2332,7 @@ MonoBehaviour: ...@@ -2332,7 +2332,7 @@ MonoBehaviour:
anchorOffset: 0 anchorOffset: 0
softBorderPadding: 1 softBorderPadding: 1
renderQueue: 0 renderQueue: 0
startingRenderQueue: 3007 startingRenderQueue: 3001
mClipTexture: {fileID: 0} mClipTexture: {fileID: 0}
mAlpha: 1 mAlpha: 1
mClipping: 3 mClipping: 3
...@@ -2569,13 +2569,13 @@ MonoBehaviour: ...@@ -2569,13 +2569,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 132 mWidth: 150
mHeight: 32 mHeight: 40
mDepth: 8 mDepth: 8
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 4.125 aspectRatio: 3.75
--- !u!114 &11454002 --- !u!114 &11454002
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -2942,13 +2942,13 @@ MonoBehaviour: ...@@ -2942,13 +2942,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 132 mWidth: 150
mHeight: 32 mHeight: 40
mDepth: 8 mDepth: 8
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 4.125 aspectRatio: 3.75
--- !u!114 &11474850 --- !u!114 &11474850
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -3201,11 +3201,11 @@ MonoBehaviour: ...@@ -3201,11 +3201,11 @@ MonoBehaviour:
anchorOffset: 0 anchorOffset: 0
softBorderPadding: 1 softBorderPadding: 1
renderQueue: 0 renderQueue: 0
startingRenderQueue: 3012 startingRenderQueue: 3006
mClipTexture: {fileID: 0} mClipTexture: {fileID: 0}
mAlpha: 1 mAlpha: 1
mClipping: 3 mClipping: 3
mClipRange: {x: 0, y: 0.000030517578, z: 436, w: 500.00006} mClipRange: {x: 0, y: 0, z: 436, w: 500}
mClipSoftness: {x: 0, y: 0} mClipSoftness: {x: 0, y: 0}
mDepth: 20 mDepth: 20
mSortingOrder: 0 mSortingOrder: 0
...@@ -3313,13 +3313,13 @@ MonoBehaviour: ...@@ -3313,13 +3313,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 132 mWidth: 150
mHeight: 32 mHeight: 40
mDepth: 8 mDepth: 8
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 4.125 aspectRatio: 3.75
--- !u!114 &11486110 --- !u!114 &11486110
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -3612,13 +3612,13 @@ MonoBehaviour: ...@@ -3612,13 +3612,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 132 mWidth: 150
mHeight: 32 mHeight: 40
mDepth: 8 mDepth: 8
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 4.125 aspectRatio: 3.75
--- !u!114 &11498008 --- !u!114 &11498008
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -9,7 +9,7 @@ GameObject: ...@@ -9,7 +9,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 493318} - component: {fileID: 493318}
- component: {fileID: 11412316} - component: {fileID: 11412316}
m_Layer: 18 m_Layer: 5
m_Name: trans_selection m_Name: trans_selection
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
...@@ -25,7 +25,7 @@ GameObject: ...@@ -25,7 +25,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 449942} - component: {fileID: 449942}
- component: {fileID: 11487194} - component: {fileID: 11487194}
m_Layer: 18 m_Layer: 5
m_Name: selected m_Name: selected
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
...@@ -87,7 +87,7 @@ Transform: ...@@ -87,7 +87,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 120608} m_GameObject: {fileID: 120608}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -994, y: -164, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 439174} - {fileID: 439174}
...@@ -104,7 +104,7 @@ BoxCollider: ...@@ -104,7 +104,7 @@ BoxCollider:
m_IsTrigger: 1 m_IsTrigger: 1
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 200, y: 22, z: 0} m_Size: {x: 200, y: 33, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &11148596 --- !u!111 &11148596
Animation: Animation:
...@@ -204,17 +204,17 @@ MonoBehaviour: ...@@ -204,17 +204,17 @@ MonoBehaviour:
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 200 mWidth: 200
mHeight: 22 mHeight: 33
mDepth: 25 mDepth: 25
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 9.090909 aspectRatio: 6.060606
keepCrispWhenShrunk: 1 keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3} mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0} mFont: {fileID: 0}
mText: "\u8FD9\u662F\u4E00\u4E2A\u5361\u7EC4" mText: "\u8FD9\u662F\u4E00\u4E2A\u5361\u7EC4"
mFontSize: 25 mFontSize: 38
mFontStyle: 0 mFontStyle: 0
mAlignment: 1 mAlignment: 1
mEncoding: 1 mEncoding: 1
......
...@@ -9986,7 +9986,7 @@ MonoBehaviour: ...@@ -9986,7 +9986,7 @@ MonoBehaviour:
showoff: {fileID: 11470560} showoff: {fileID: 11470560}
showoffWhenActived: {fileID: 11452754} showoffWhenActived: {fileID: 11452754}
cloud: {fileID: 114247332317060808} cloud: {fileID: 114247332317060808}
DownloadImage: {fileID: 114654519243977964} autoPicDownload: {fileID: 114654519243977964}
Vbattle: {fileID: 11435302} Vbattle: {fileID: 11435302}
Vmove: {fileID: 11428410} Vmove: {fileID: 11428410}
Vchain: {fileID: 11427298} Vchain: {fileID: 11427298}
...@@ -18216,7 +18216,7 @@ GameObject: ...@@ -18216,7 +18216,7 @@ GameObject:
- component: {fileID: 114462178772296572} - component: {fileID: 114462178772296572}
- component: {fileID: 114658492503328412} - component: {fileID: 114658492503328412}
m_Layer: 5 m_Layer: 5
m_Name: '*DownloadImage' m_Name: '*AutoPicDownload'
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
......
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