Commit df3e0620 authored by lllyasviel's avatar lllyasviel

fix

parent 5ae4f260
...@@ -32,7 +32,6 @@ public class CardDescription : Servant ...@@ -32,7 +32,6 @@ public class CardDescription : Servant
picLoader.uiTexture = UIHelper.getByName<UITexture>(gameObject, "pic_"); picLoader.uiTexture = UIHelper.getByName<UITexture>(gameObject, "pic_");
picLoader.loaded_code = -1; picLoader.loaded_code = -1;
resizer = UIHelper.getByName<UIDragResize>(gameObject, "resizer"); resizer = UIHelper.getByName<UIDragResize>(gameObject, "resizer");
resizer.onResize = onResized;
underSprite = UIHelper.getByName<UITexture>(gameObject, "under_"); underSprite = UIHelper.getByName<UITexture>(gameObject, "under_");
description = UIHelper.getByName<UITextList>(gameObject, "description_"); description = UIHelper.getByName<UITextList>(gameObject, "description_");
cardShowerWidget = UIHelper.getByName<UIWidget>(gameObject, "card_shower"); cardShowerWidget = UIHelper.getByName<UIWidget>(gameObject, "card_shower");
...@@ -339,7 +338,7 @@ public class CardDescription : Servant ...@@ -339,7 +338,7 @@ public class CardDescription : Servant
} }
} }
void onResized() public void onResized()
{ {
if (monitor.gameObject.activeInHierarchy) if (monitor.gameObject.activeInHierarchy)
{ {
......
...@@ -168,7 +168,7 @@ public class gameHiddenButton : OCGobject ...@@ -168,7 +168,7 @@ public class gameHiddenButton : OCGobject
} }
} }
} }
Program.I().cardDescription.setData(data, con == 0 ? GameTextureManager.myBack : GameTextureManager.opBack, tailString); Program.I().cardDescription.setData(data, con == 0 ? GameTextureManager.myBack : GameTextureManager.opBack, tailString, data != null);
if (Program.I().ocgcore.condition == Ocgcore.Condition.duel && Program.I().ocgcore.InAI == false && Program.I().room.mode != 2) if (Program.I().ocgcore.condition == Ocgcore.Condition.duel && Program.I().ocgcore.InAI == false && Program.I().room.mode != 2)
{ {
if (player == 0) if (player == 0)
......
...@@ -23,9 +23,11 @@ public class ServantWithCardDescription : Servant ...@@ -23,9 +23,11 @@ public class ServantWithCardDescription : Servant
public override void preFrameFunction() public override void preFrameFunction()
{ {
var des = Program.I().cardDescription;
if (Program.pointedGameObject!= Program.I().cardDescription.description.gameObject) if (Program.pointedGameObject!= Program.I().cardDescription.description.gameObject)
{ {
Program.I().cardDescription.description.OnScroll(Program.wheelValue / 50f); des.description.OnScroll(Program.wheelValue / 50f);
} }
des.onResized();
} }
} }
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