Skip to content

Y
YGOProUnity_V2
Commit 873ec969 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of git.mycard.moe:mycard/YGOProUnity_V2

parents b1cf0b18 695be855
Pipeline #5249 failed
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 33 deletions
Assets/SibylSystem/Servant.cs
View file @ 873ec969
...@@ -444,9 +444,7 @@ public class Servant ...@@ -444,9 +444,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
UIHelper.InterGameObject(currentMSwindow); UIHelper.InterGameObject(currentMSwindow);
UIHelper.trySetLableText(currentMSwindow, "hint_", hint); UIHelper.trySetLableText(currentMSwindow, "hint_", hint);
...@@ -464,9 +462,7 @@ public class Servant ...@@ -464,9 +462,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
UIHelper.InterGameObject(currentMSwindow); UIHelper.InterGameObject(currentMSwindow);
UIHelper.trySetLableText(currentMSwindow, "hint_", hint); UIHelper.trySetLableText(currentMSwindow, "hint_", hint);
...@@ -485,9 +481,7 @@ public class Servant ...@@ -485,9 +481,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
UIHelper.InterGameObject(yesOrNoForce); UIHelper.InterGameObject(yesOrNoForce);
UIHelper.trySetLableText(yesOrNoForce, "hint_", hint); UIHelper.trySetLableText(yesOrNoForce, "hint_", hint);
...@@ -516,9 +510,7 @@ public class Servant ...@@ -516,9 +510,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
UIHelper.InterGameObject(currentMSwindow); UIHelper.InterGameObject(currentMSwindow);
UIHelper.registEvent(currentMSwindow, "yes_", ES_RMSpremono, first); UIHelper.registEvent(currentMSwindow, "yes_", ES_RMSpremono, first);
...@@ -537,9 +529,7 @@ public class Servant ...@@ -537,9 +529,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
UIHelper.InterGameObject(currentMSwindow); UIHelper.InterGameObject(currentMSwindow);
UIHelper.trySetLableText(currentMSwindow, "hint_", hint); UIHelper.trySetLableText(currentMSwindow, "hint_", hint);
...@@ -559,9 +549,7 @@ public class Servant ...@@ -559,9 +549,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
var sp = UIHelper.getByName<UISprite>(currentMSwindow, "under"); var sp = UIHelper.getByName<UISprite>(currentMSwindow, "under");
sp.height = 70 + options.Count * 48; sp.height = 70 + options.Count * 48;
...@@ -600,9 +588,7 @@ public class Servant ...@@ -600,9 +588,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
var sp = UIHelper.getByName<UISprite>(currentMSwindow, "under"); var sp = UIHelper.getByName<UISprite>(currentMSwindow, "under");
sp.height = 70 + UIHelper.get_zonghangshu(options.Count, 5) * 40; sp.height = 70 + UIHelper.get_zonghangshu(options.Count, 5) * 40;
...@@ -639,9 +625,7 @@ public class Servant ...@@ -639,9 +625,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
UIHelper.InterGameObject(currentMSwindow); UIHelper.InterGameObject(currentMSwindow);
UIHelper.registEvent(currentMSwindow, "atk_", ES_RMSpremono, atk); UIHelper.registEvent(currentMSwindow, "atk_", ES_RMSpremono, atk);
...@@ -680,9 +664,7 @@ public class Servant ...@@ -680,9 +664,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
UIHelper.InterGameObject(currentMSwindow); UIHelper.InterGameObject(currentMSwindow);
UIHelper.registEvent(currentMSwindow, "jiandao_", ES_RMSpremono, jiandao); UIHelper.registEvent(currentMSwindow, "jiandao_", ES_RMSpremono, jiandao);
...@@ -701,9 +683,7 @@ public class Servant ...@@ -701,9 +683,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
UIHelper.InterGameObject(currentMSwindow); UIHelper.InterGameObject(currentMSwindow);
UIHelper.trySetLableText(currentMSwindow, "hint_", hint); UIHelper.trySetLableText(currentMSwindow, "hint_", hint);
...@@ -728,9 +708,7 @@ public class Servant ...@@ -728,9 +708,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.I().ui_main_2d, Program.I().ui_main_2d
true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
UIHelper.InterGameObject(currentMSwindow); UIHelper.InterGameObject(currentMSwindow);
UIHelper.getByName<UITexture>(currentMSwindow, "face_").mainTexture = UIHelper.getFace(name); UIHelper.getByName<UITexture>(currentMSwindow, "face_").mainTexture = UIHelper.getFace(name);
......
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