Browse Source

fix particle script error

gsgundam 8 years ago
parent
commit
216638b28c

+ 1 - 1
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -92,7 +92,7 @@
     <P_BtnLab2 desc=""><![CDATA[已购<(已购)>]]></P_BtnLab2>
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
-    <N_Lab desc=""><![CDATA[13级开放试衣间]]></N_Lab>
+    <N_Lab desc=""><![CDATA[去试衣间看看吧!]]></N_Lab>
     <I_Lab desc=""><![CDATA[加载中]]></I_Lab>
   </UI>
   <FlowerName>

+ 1 - 1
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -92,7 +92,7 @@
     <P_BtnLab2 desc=""><![CDATA[已購<(已购)>]]></P_BtnLab2>
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
-    <N_Lab desc=""><![CDATA[13级开放试衣间]]></N_Lab>
+    <N_Lab desc=""><![CDATA[去試衣間看看吧!]]></N_Lab>
     <I_Lab desc=""><![CDATA[加載中]]></I_Lab>
   </UI>
   <FlowerName>

+ 1 - 1
Assets/Resource/XML/lan/English.xml

@@ -92,7 +92,7 @@
     <P_BtnLab2 desc=""><![CDATA[Bought<(已购)>]]></P_BtnLab2>
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
-    <N_Lab desc=""><![CDATA[13级开放试衣间]]></N_Lab>
+    <N_Lab desc=""><![CDATA[Go to your dress room!]]></N_Lab>
     <I_Lab desc=""><![CDATA[Loading]]></I_Lab>
   </UI>
   <FlowerName>

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 2 - 1
Assets/Script/Manage/ManaReso.cs

@@ -811,7 +811,8 @@ public class ManaReso : Regist
 
         ParticleSystem particle = tra.GetComponent<ParticleSystem>();
 
-        particle.Play();
+        if(particle != null)
+            particle.Play();
 
         return particle;
     }

+ 1 - 1
Assets/Script/Object/Effect.cs

@@ -26,7 +26,7 @@ public class Effect : MonoBehaviour
 
     private void Update()
     {
-        if (!ParticleSystem.isPlaying)
+        if (ParticleSystem != null && !ParticleSystem.isPlaying)
         {
             ManaReso.Save(gameObject);
         }