Commit 114729d1 authored by 赤子奈落's avatar 赤子奈落

fix card description bug

parent e7e365b3
...@@ -13,6 +13,7 @@ public class PropertyIcons : MonoBehaviour ...@@ -13,6 +13,7 @@ public class PropertyIcons : MonoBehaviour
public Sprite continuous; public Sprite continuous;
public Sprite quick_play; public Sprite quick_play;
public Sprite ritual; public Sprite ritual;
public Sprite nothing;
public Sprite race_01; public Sprite race_01;
public Sprite race_02; public Sprite race_02;
public Sprite race_03; public Sprite race_03;
......
...@@ -1876,7 +1876,7 @@ MonoBehaviour: ...@@ -1876,7 +1876,7 @@ MonoBehaviour:
rightType: 1 rightType: 1
bottomType: 1 bottomType: 1
topType: 1 topType: 1
mSprite: {fileID: 21300000, guid: dc753c068fb311d4ca6a3177d7719571, type: 2} mSprite: {fileID: 21300000, guid: e0abc31613480294e9ed2fb6e2718566, type: 2}
mMat: {fileID: 0} mMat: {fileID: 0}
mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3} mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
mBorder: {x: 0, y: 0, z: 0, w: 0} mBorder: {x: 0, y: 0, z: 0, w: 0}
...@@ -9529,7 +9529,7 @@ GameObject: ...@@ -9529,7 +9529,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &1282667253 --- !u!4 &1282667253
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -9792,6 +9792,7 @@ MonoBehaviour: ...@@ -9792,6 +9792,7 @@ MonoBehaviour:
continuous: {fileID: 21300000, guid: 1320433050c3b8a4487a1499a7e56bea, type: 2} continuous: {fileID: 21300000, guid: 1320433050c3b8a4487a1499a7e56bea, type: 2}
quick_play: {fileID: 21300000, guid: 94a90cc290192b34f96cc594b29fa393, type: 2} quick_play: {fileID: 21300000, guid: 94a90cc290192b34f96cc594b29fa393, type: 2}
ritual: {fileID: 21300000, guid: 2c1623dc9791eb742abe2d2eedc46dbc, type: 2} ritual: {fileID: 21300000, guid: 2c1623dc9791eb742abe2d2eedc46dbc, type: 2}
nothing: {fileID: 21300000, guid: e0abc31613480294e9ed2fb6e2718566, type: 2}
race_01: {fileID: 21300000, guid: 0c0ed83a84ce093419e3afd54ed35d88, type: 2} race_01: {fileID: 21300000, guid: 0c0ed83a84ce093419e3afd54ed35d88, type: 2}
race_02: {fileID: 21300000, guid: 08155e39c6671804580facfc72a54993, type: 2} race_02: {fileID: 21300000, guid: 08155e39c6671804580facfc72a54993, type: 2}
race_03: {fileID: 21300000, guid: 290d377d7eece214f89858b5b127081a, type: 2} race_03: {fileID: 21300000, guid: 290d377d7eece214f89858b5b127081a, type: 2}
......
...@@ -276,7 +276,7 @@ public class CardDescription : Servant ...@@ -276,7 +276,7 @@ public class CardDescription : Servant
SetRaceIcon(property_.transform.Find("race_").GetComponent<UI2DSprite>(), GameStringHelper.race(data.Race)); SetRaceIcon(property_.transform.Find("race_").GetComponent<UI2DSprite>(), GameStringHelper.race(data.Race));
} }
} }
else else if(secondType != "")
{ {
property_ = property.transform.Find("spell_trap").gameObject; property_ = property.transform.Find("spell_trap").gameObject;
UI2DSprite uI2DSprite = property_.transform.Find("type_").GetComponent<UI2DSprite>(); UI2DSprite uI2DSprite = property_.transform.Find("type_").GetComponent<UI2DSprite>();
...@@ -314,7 +314,7 @@ public class CardDescription : Servant ...@@ -314,7 +314,7 @@ public class CardDescription : Servant
else else
{ {
type += "通常"; type += "通常";
uI2DSprite.sprite2D = null; uI2DSprite.sprite2D = pi.nothing;
} }
if (type_name.text.Contains("魔法")) if (type_name.text.Contains("魔法"))
type += "魔法"; type += "魔法";
......
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