Temp 6.9

Assets/Extension.meta → Assets/Advertisements/Editor/Resources/Android/builds.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: b948198483a8b93419206e81215060f3
+guid: 8d2d384f78b29a44a9c70c3daf45d1cb
 folderAsset: yes
-timeCreated: 1496150477
+timeCreated: 1494301205
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9cb5c3e4dd0dd574ba655453ad15edfa
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Advertisements/Editor/Resources/iOS.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a5e10dc911691a844b899edb78584282
+folderAsset: yes
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/ShareSDK/iOS.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: db9454787e4284fa9899244d3663dcd4
+folderAsset: yes
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Prefab/PrefabUI/InfoItem.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 290623bdcdeb3b1408050b70ebad1637
+timeCreated: 1496972340
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

Assets/Resource/XML/Config/skill_config.xml

@@ -1,9 +1,9 @@
 <data>
-  <item id="1" name="人潮涌动" class="1" class_id="2" skill_index="1" reduce_cd="1" coin_person="" person="1" coin_once="" diamond_once="" skill_cd="" duration="300" cd="1800" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="5" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="200" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="60" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60]，持续[&amp;duration&amp;/60][lv]分钟" icon="4大技能1" anim="" label="" />
-  <item id="2" name="大亨光临" class="1" class_id="3" skill_index="2" reduce_cd="1" coin_person="" person="" coin_once="20000%" diamond_once="" skill_cd="" duration="" cd="3600" unlock_lv="25" unlock_ahead_cur="2" unlock_ahead_amt="200" unlock_cur="1" unlock_amnt="100" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="5000%" upgrade_duration="" upgrade_cd="" desc="立即获得每人次收入的[&amp;coin_once&amp;][lv]倍" icon="4大技能2" anim="" label="" />
+  <item id="1" name="人潮涌动" class="1" class_id="2" skill_index="1" reduce_cd="1" coin_person="" person="1" coin_once="" diamond_once="" skill_cd="" duration="10" cd="1800" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="5" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="200" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="60" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60]，持续[&amp;duration&amp;/60][lv]分钟" icon="4大技能1" anim="" label="" />
+  <item id="2" name="大亨光临" class="1" class_id="3" skill_index="2" reduce_cd="1" coin_person="" person="" coin_once="50000%" diamond_once="" skill_cd="" duration="" cd="3600" unlock_lv="25" unlock_ahead_cur="2" unlock_ahead_amt="200" unlock_cur="1" unlock_amnt="100" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="5000%" upgrade_duration="" upgrade_cd="" desc="立即获得每人次收入的[&amp;coin_once&amp;][lv]倍" icon="4大技能2" anim="" label="" />
   <item id="3" name="花之祝福" class="1" class_id="4" skill_index="3" reduce_cd="1" coin_person="200%" person="" coin_once="" diamond_once="" skill_cd="" duration="300" cd="3600" unlock_lv="75" unlock_ahead_cur="2" unlock_ahead_amt="300" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="60" upgrade_cd="" desc="所有收入提升[&amp;coin_person&amp;]，持续[&amp;duration&amp;/60][lv]" icon="4大技能3" anim="" label="" />
   <item id="4" name="繁花似锦" class="4" class_id="1" skill_index="" reduce_cd="" coin_person="200%" person="" coin_once="" diamond_once="" skill_cd="" duration="900" cd="900" unlock_lv="40" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="2" use_amnt="150" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="所有金币产出提升[&amp;coin_person&amp;]，持续[&amp;duration&amp;]分钟" icon="绿-繁花似锦" anim="" label="" />
-  <item id="5" name="免费获取金币" class="3" class_id="0" skill_index="" reduce_cd="" coin_person="" person="" coin_once="500%" diamond_once="" skill_cd="" duration="" cd="900" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="5" use_amnt="" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="免费获取金币[&amp;coin_once&amp;]" icon="绿-免费金币" anim="" label="" />
+  <item id="5" name="免费获取金币" class="3" class_id="0" skill_index="" reduce_cd="" coin_person="" person="" coin_once="50000%" diamond_once="" skill_cd="" duration="" cd="900" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="5" use_amnt="" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="免费获取金币[&amp;coin_once&amp;]" icon="绿-免费金币" anim="" label="" />
   <item id="6" name="免费获取钻石" class="4" class_id="0" skill_index="" reduce_cd="" coin_person="" person="" coin_once="" diamond_once="10" skill_cd="" duration="" cd="900" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="5" use_amnt="" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="免费获取金币[&amp;diamond_once&amp;]" icon="蓝-免费钻" anim="" label="" />
   <item id="7" name="技能冷却" class="" class_id="" skill_index="4" reduce_cd="" coin_person="" person="" coin_once="" diamond_once="" skill_cd="100%" duration="" cd="900" unlock_lv="15" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="5" use_amnt="" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="" icon="4大技能4" anim="" label="" />
   <comment>

Assets/Resource/XML/PlayerConfig.xml

@@ -1,10 +1,10 @@
 <PlayerConfig>
-  <Version value="570" />
+  <Version value="611" />
 
   <ID value="Default" />
-////  <TutorialA value="1" />
+////  <TutorialA value="0" />
 ////  <TutorialB value="1" />
-////  <TutorialC value="1" />
+////  <TutorialC value="0" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />
@@ -13,12 +13,12 @@
   <QuitFlag value="0" />
   <QuitTime value="4/23/2017 09:30:00 AM" />
   <SignTime value="4/23/2017 09:30:00 AM" />
-  <Language value="ChineseSimplified" />
+  <Language value="Default" />
   
   <Coin value="0" />
   <Diamond value="0" />
   <SignIndex value="1" />
-  <MiniTimer value="180" />
+  <MiniTimer value="0" />
   <SignRound value="1" />
   <CircleTimer value="0" />
   <MiniGameIndex value="0" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -193,6 +193,7 @@
     <Cash desc=""><![CDATA[￥]]></Cash>
     <Person desc=""><![CDATA[参观人次]]></Person>
     <CoinPerson desc=""><![CDATA[每人次金币]]></CoinPerson>
+    <Buff desc=""><![CDATA[(加成中)]]></Buff>
     <ShortCoin desc=""><![CDATA[金币不够]]></ShortCoin>
     <NavigateCoin desc=""><![CDATA[您可以点击确定前往获取金币]]></NavigateCoin>
     <ShortDiamond desc=""><![CDATA[钻石不够]]></ShortDiamond>
@@ -368,10 +369,6 @@
     <PurchaseUnvalid desc=""><![CDATA[没有找到该商品]]></PurchaseUnvalid>
     <TemporarilyUnavailible desc=""><![CDATA[暂时无法使用]]></TemporarilyUnavailible>
   </IAP>
-  <Plural>
-    <Second desc=""><![CDATA[秒]]></Second>
-    <Seconds desc=""><![CDATA[秒]]></Seconds>
-  </Plural>
   <IOS>
     <ShareUrl desc=""><![CDATA[www.dashgame.com]]></ShareUrl>
   </IOS>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -193,6 +193,7 @@
     <Cash desc=""><![CDATA[$]]></Cash>
     <Person desc=""><![CDATA[參觀人次]]></Person>
     <CoinPerson desc=""><![CDATA[每人次金幣]]></CoinPerson>
+    <Buff desc=""><![CDATA[(加成中)]]></Buff>
     <ShortCoin desc=""><![CDATA[金幣不夠]]></ShortCoin>
     <NavigateCoin desc=""><![CDATA[您可以點擊確定前往獲取金幣]]></NavigateCoin>
     <ShortDiamond desc=""><![CDATA[鑽石不夠]]></ShortDiamond>
@@ -368,10 +369,6 @@
     <PurchaseUnvalid desc=""><![CDATA[沒有找到該商品]]></PurchaseUnvalid>
     <TemporarilyUnavailible desc=""><![CDATA[暫時無法使用]]></TemporarilyUnavailible>
   </IAP>
-  <Plural>
-    <Second desc=""><![CDATA[秒]]></Second>
-    <Seconds desc=""><![CDATA[秒]]></Seconds>
-  </Plural>
   <IOS>
     <ShareUrl desc=""><![CDATA[]]></ShareUrl>
   </IOS>

Assets/Resource/XML/lan/English.xml

@@ -193,6 +193,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Cash desc=""><![CDATA[$]]></Cash>
     <Person desc=""><![CDATA[Visitor]]></Person>
     <CoinPerson desc=""><![CDATA[Ticket]]></CoinPerson>
+    <Buff desc=""><![CDATA[(Buff)]]></Buff>
     <ShortCoin desc=""><![CDATA[Not enough Coins]]></ShortCoin>
     <NavigateCoin desc=""><![CDATA[Click confirm to get Coins]]></NavigateCoin>
     <ShortDiamond desc=""><![CDATA[Not enough Diamonds]]></ShortDiamond>
@@ -368,10 +369,6 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <PurchaseUnvalid desc=""><![CDATA[No such product]]></PurchaseUnvalid>
     <TemporarilyUnavailible desc=""><![CDATA[Temporarily unavailible]]></TemporarilyUnavailible>
   </IAP>
-  <Plural>
-    <Second desc=""><![CDATA[ Second]]></Second>
-    <Seconds desc=""><![CDATA[ Seconds]]></Seconds>
-  </Plural>
   <IOS>
     <ShareUrl desc=""><![CDATA[]]></ShareUrl>
   </IOS>

Assets/Script/Manage/ManaAnim.cs

@@ -1657,9 +1657,11 @@ public class ManaAnim : Regist
         {
             Shake shake = ShakeDic[target];
 
+            shake.Pause();
+
             ShakeDic[target] = new Shake(target);
 
-            return shake;
+            return ShakeDic[target];
         }
         else
         {
@@ -1677,9 +1679,11 @@ public class ManaAnim : Regist
         {
             Move2D move2D = MoveDic2D[target];
 
+            move2D.Pause();
+
             MoveDic2D[target] = new Move2D(target);
 
-            return move2D;
+            return MoveDic2D[target];
         }
         else
         {
@@ -1697,9 +1701,11 @@ public class ManaAnim : Regist
         {
             Move3D move3D = MoveDic3D[target];
 
+            move3D.Pause();
+
             MoveDic3D[target] = new Move3D(target);
 
-            return move3D;
+            return MoveDic3D[target];
         }
         else
         {
@@ -1717,9 +1723,11 @@ public class ManaAnim : Regist
         {
             Zoom2D zoom2D = ZoomDic2D[target];
 
+            zoom2D.Pause();
+
             ZoomDic2D[target] = new Zoom2D(target.GetComponent<Camera>());
 
-            return zoom2D;
+            return ZoomDic2D[target];
         }
         else
         {
@@ -1740,9 +1748,11 @@ public class ManaAnim : Regist
         {
             streamScale = StreamScaleDic[target];
 
+            streamScale.Pause();
+
             StreamScaleDic[target] = new StreamScale(target, delayList, durationList, destKvList, originActive, destActive, curve, cg, startActionList, finishActionList);
 
-            return streamScale;
+            return StreamScaleDic[target];
         }
         else
         {
@@ -1762,9 +1772,11 @@ public class ManaAnim : Regist
         {
             streamScale = StreamScaleDic[target];
 
+            streamScale.Pause();
+
             StreamScaleDic[target] = new StreamScale(target, delayList, durationList, destList, originActive, destActive, curve, cg, startActionList, finishActionList);
 
-            return streamScale;
+            return StreamScaleDic[target];
         }
         else
         {
@@ -1792,9 +1804,11 @@ public class ManaAnim : Regist
         {
             tweenSr = TweenSrDic[target];
 
+            tweenSr.Pause();
+
             TweenSrDic[target] = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
 
-            return tweenSr;
+            return TweenSrDic[target];
         }
         else
         {
@@ -1819,9 +1833,11 @@ public class ManaAnim : Regist
         {
             tweenSr = TweenSrDic[target];
 
+            tweenSr.Pause();
+
             TweenSrDic[target] = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
 
-            return tweenSr;
+            return TweenSrDic[target];
         }
         else
         {
@@ -1842,9 +1858,11 @@ public class ManaAnim : Regist
         {
             tweenSr = TweenSrDic[target];
 
+            tweenSr.Pause();
+
             TweenSrDic[target] = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
 
-            return tweenSr;
+            return TweenSrDic[target];
         }
         else
         {
@@ -1865,9 +1883,11 @@ public class ManaAnim : Regist
         {
             tweenSr = TweenSrDic[target];
 
+            tweenSr.Pause();
+
             TweenSrDic[target] = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
 
-            return tweenSr;
+            return TweenSrDic[target];
         }
         else
         {
@@ -1889,9 +1909,11 @@ public class ManaAnim : Regist
         {
             tweenCg = TweenCgDic[target];
 
+            tweenCg.Pause();
+
             TweenCgDic[target] = new TweenCG(cg, origin, destination, duration, originActive, destActive, curve);
 
-            return tweenCg;
+            return TweenCgDic[target];
         }
         else
         {
@@ -1912,9 +1934,11 @@ public class ManaAnim : Regist
         {
             tweenCg = TweenCgDic[target];
 
+            tweenCg.Pause();
+
             TweenCgDic[target] = new TweenCG(cg, cg.alpha, destination, duration, originActive, destActive, curve);
 
-            return tweenCg;
+            return TweenCgDic[target];
         }
         else
         {
@@ -1942,9 +1966,11 @@ public class ManaAnim : Regist
         {
             tweenGra = TweenGraDic[target];
 
+            tweenGra.Pause();
+
             TweenGraDic[target] = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenGra;
+            return TweenGraDic[target];
         }
         else
         {
@@ -1969,9 +1995,11 @@ public class ManaAnim : Regist
         {
             tweenGra = TweenGraDic[target];
 
+            tweenGra.Pause();
+
             TweenGraDic[target] = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenGra;
+            return TweenGraDic[target];
         }
         else
         {
@@ -1992,9 +2020,11 @@ public class ManaAnim : Regist
         {
             tweenGra = TweenGraDic[target];
 
+            tweenGra.Pause();
+
             TweenGraDic[target] = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenGra;
+            return TweenGraDic[target];
         }
         else
         {
@@ -2015,9 +2045,11 @@ public class ManaAnim : Regist
         {
             tweenGra = TweenGraDic[target];
 
+            tweenGra.Pause();
+
             TweenGraDic[target] = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenGra;
+            return TweenGraDic[target];
         }
         else
         {
@@ -2049,9 +2081,11 @@ public class ManaAnim : Regist
         {
             tweenVec2D = TweenVecDic[target];
 
+            tweenVec2D.Pause();
+
             TweenVecDic[target] = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            return tweenVec2D;
+            return TweenVecDic[target];
         }
         else
         {
@@ -2087,9 +2121,11 @@ public class ManaAnim : Regist
         {
             tweenVec2D = TweenVecDic[target];
 
+            tweenVec2D.Pause();
+
             TweenVecDic[target] = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            return tweenVec2D;
+            return TweenVecDic[target];
         }
         else
         {
@@ -2127,9 +2163,11 @@ public class ManaAnim : Regist
         {
             tweenVec2D = TweenVecDic[target];
 
+            tweenVec2D.Pause();
+
             TweenVecDic[target] = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            return tweenVec2D;
+            return TweenVecDic[target];
         }
         else
         {
@@ -2150,9 +2188,11 @@ public class ManaAnim : Regist
         {
             tweenVec3D = TweenVecDic[target];
 
+            tweenVec3D.Pause();
+
             TweenVecDic[target] = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            return tweenVec3D;
+            return TweenVecDic[target];
         }
         else
         {
@@ -2183,9 +2223,11 @@ public class ManaAnim : Regist
         {
             tweenVec3D = TweenVecDic[target];
 
+            tweenVec3D.Pause();
+
             TweenVecDic[target] = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            return tweenVec3D;
+            return TweenVecDic[target];
         }
         else
         {
@@ -2219,9 +2261,11 @@ public class ManaAnim : Regist
         {
             tweenVec3D = TweenVecDic[target];
 
+            tweenVec3D.Pause();
+
             TweenVecDic[target] = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            return tweenVec3D;
+            return TweenVecDic[target];
         }
         else
         {
@@ -2243,9 +2287,11 @@ public class ManaAnim : Regist
         {
             tweenFont = TweenFontDic[target];
 
+            tweenFont.Pause();
+
             TweenFontDic[target] = new TweenFont(text, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenFont;
+            return TweenFontDic[target];
         }
         else
         {
@@ -2266,9 +2312,11 @@ public class ManaAnim : Regist
         {
             tweenFont = TweenFontDic[target];
 
+            tweenFont.Pause();
+
             TweenFontDic[target] = new TweenFont(text, text.fontSize, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenFont;
+            return TweenFontDic[target];
         }
         else
         {
@@ -2290,9 +2338,11 @@ public class ManaAnim : Regist
         {
             tweenRect = TweenRectDic[target];
 
+            tweenRect.Pause();
+
             TweenRectDic[target] = new TweenRect(rectTra, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenRect;
+            return TweenRectDic[target];
         }
         else
         {
@@ -2313,9 +2363,11 @@ public class ManaAnim : Regist
         {
             tweenRect = TweenRectDic[target];
 
+            tweenRect.Pause();
+
             TweenRectDic[target] = new TweenRect(rectTra, rectTra.rect.size, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenRect;
+            return TweenRectDic[target];
         }
         else
         {
@@ -2340,9 +2392,11 @@ public class ManaAnim : Regist
         {
             tweenScale = TweenScaleDic[target];
 
+            tweenScale.Pause();
+
             TweenScaleDic[target] = new TweenScale(target, originScale, destScale, duration, originActive, destActive, curve, cg);
 
-            return tweenScale;
+            return TweenScaleDic[target];
         }
         else
         {
@@ -2365,9 +2419,11 @@ public class ManaAnim : Regist
         {
             tweenScale = TweenScaleDic[target];
 
+            tweenScale.Pause();
+
             TweenScaleDic[target] = new TweenScale(target, target.localScale, destScale, duration, originActive, destActive, curve, cg);
 
-            return tweenScale;
+            return TweenScaleDic[target];
         }
         else
         {
@@ -2387,9 +2443,11 @@ public class ManaAnim : Regist
         {
             tweenScale = TweenScaleDic[target];
 
+            tweenScale.Pause();
+
             TweenScaleDic[target] = new TweenScale(target, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenScale;
+            return TweenScaleDic[target];
         }
         else
         {
@@ -2409,9 +2467,11 @@ public class ManaAnim : Regist
         {
             tweenScale = TweenScaleDic[target];
 
+            tweenScale.Pause();
+
             TweenScaleDic[target] = new TweenScale(target, target.localScale, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenScale;
+            return TweenScaleDic[target];
         }
         else
         {
@@ -2433,9 +2493,11 @@ public class ManaAnim : Regist
         {
             tweenAudio = TweenAudioDic[audio];
 
+            tweenAudio.Pause();
+
             TweenAudioDic[audio] = new TweenAudio(audio, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenAudio;
+            return TweenAudioDic[audio];
         }
         else
         {
@@ -2456,9 +2518,11 @@ public class ManaAnim : Regist
         {
             tweenAudio = TweenAudioDic[audio];
 
+            tweenAudio.Pause();
+
             TweenAudioDic[audio] = new TweenAudio(audio, audio.volume, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenAudio;
+            return TweenAudioDic[audio];
         }
         else
         {
@@ -2478,9 +2542,11 @@ public class ManaAnim : Regist
         {
             tweenAudio = TweenAudioDic[audioSource];
 
+            tweenAudio.Pause();
+
             TweenAudioDic[audioSource] = new TweenAudio(audioSource, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenAudio;
+            return TweenAudioDic[audioSource];
         }
         else
         {
@@ -2500,9 +2566,11 @@ public class ManaAnim : Regist
         {
             tweenAudio = TweenAudioDic[audioSource];
 
+            tweenAudio.Pause();
+
             TweenAudioDic[audioSource] = new TweenAudio(audioSource, audioSource.volume, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenAudio;
+            return TweenAudioDic[audioSource];
         }
         else
         {
@@ -2530,9 +2598,11 @@ public class ManaAnim : Regist
         {
             tweenOutline = TweenOutlineDic[target];
 
+            tweenOutline.Pause();
+
             TweenOutlineDic[target] = new TweenOutline(outline, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenOutline;
+            return TweenOutlineDic[target];
         }
         else
         {
@@ -2557,9 +2627,11 @@ public class ManaAnim : Regist
         {
             tweenOutline = TweenOutlineDic[target];
 
+            tweenOutline.Pause();
+
             TweenOutlineDic[target] = new TweenOutline(graphic, graphic.effectColor, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenOutline;
+            return TweenOutlineDic[target];
         }
         else
         {
@@ -2580,9 +2652,11 @@ public class ManaAnim : Regist
         {
             tweenOutline = TweenOutlineDic[target];
 
+            tweenOutline.Pause();
+
             TweenOutlineDic[target] = new TweenOutline(outline, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenOutline;
+            return TweenOutlineDic[target];
         }
         else
         {
@@ -2603,9 +2677,11 @@ public class ManaAnim : Regist
         {
             tweenOutline = TweenOutlineDic[target];
 
+            tweenOutline.Pause();
+
             TweenOutlineDic[target] = new TweenOutline(graphic, graphic.effectColor, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenOutline;
+            return TweenOutlineDic[target];
         }
         else
         {
@@ -2627,9 +2703,11 @@ public class ManaAnim : Regist
         {
             tweenNumber = TweenNumberDic[target];
 
+            tweenNumber.Pause();
+
             TweenNumberDic[target] = new TweenNumber(text, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tweenNumber;
+            return TweenNumberDic[target];
         }
         else
         {
@@ -2650,9 +2728,11 @@ public class ManaAnim : Regist
         {
             tweenNumber = TweenNumberDic[target];
 
+            tweenNumber.Pause();
+
             TweenNumberDic[target] = new TweenNumber(text, int.Parse(text.text), destination, duration, originActive, destActive, curve, cg);
 
-            return tweenNumber;
+            return TweenNumberDic[target];
         }
         else
         {

Assets/Script/Manage/ManaCenter.cs

@@ -295,6 +295,7 @@ public class ManaCenter : Regist
     public static bool SaveLock;
     public static bool LoginLock;
     public static bool OfflineLock;
+    public static bool ReactiveLock;
 
     public static bool Complete;
     public static bool FirstFrame = true;
@@ -1072,6 +1073,13 @@ public class ManaCenter : Regist
                     return;
                 }
 
+                if (ReactiveLock)
+                {
+                    ReactiveLock = false;
+
+                    return;
+                }
+
                 LoginLock = true;
 
                 ManaServer.Login(LoginCallbackReactive);
@@ -1097,6 +1105,7 @@ public class ManaCenter : Regist
 
 //多次Reload、Reactive后的技能效果(冷却减益)
 
+//技能的存档(各种状态 1级 1+级)
 //技能的效果
 //技能升级后的效果
 //技能结束后的效果

Assets/Script/Manage/ManaIAP.cs

@@ -93,6 +93,8 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     {
         if (Advertisement.IsReady())
         {
+            ManaCenter.ReactiveLock = true;
+
             AdAction = action;
 
             ShowOptions showOptions = new ShowOptions();

Assets/Script/Manage/ManaInfo.cs

@@ -5,30 +5,38 @@ using System.Text;
 using System.Collections;
 using System.Collections.Generic;
 
-public class ManaInfo : Regist 
+public class ManaInfo : Regist
 {
+    public class InfoText
+    {
+        public float Timer;
+
+        public Text Text;
+    }
+
     #region 变量
 
-    public static Text Text
+    public static CanvasGroup CanvasGroup
     {
         get
         {
-            if (Text_ == null)
+            if (CanvasGroup_ == null)
             {
-                Text_ = ManaReso.Get<Text>("J_Info");
+                CanvasGroup_ = ManaReso.Get<CanvasGroup>("J_Info");
             }
 
-            return Text_;
+            return CanvasGroup_;
         }
-        set { Text_ = value; }
+        set { CanvasGroup_ = value; }
     }
 
-    public static Text Text_;
+    public static CanvasGroup CanvasGroup_;
+
 
     public static bool Lock;
     public static float Timer;
 
-    public static List<string> StrList = new List<string>();
+    public static List<InfoText> TextList = new List<InfoText>();
 
     #endregion
 
@@ -40,45 +48,53 @@ public class ManaInfo : Regist
         {
             Lock = false;
 
-            Text.TweenBacCG();
+            CanvasGroup.TweenBacCG();
         }
-    }
 
-
-    public static void Show(string str, float time)
-    {
-        StrList.Insert(0, str);
         
-        if (StrList.Count == 1)
-        {
-            Text.text = str;
-        }
-        else if (StrList.Count == 6)
+        for (int i = 0; i < TextList.Count; i++)
         {
-            StrList.RemoveAt(5);
+            InfoText infoText = TextList[i];
 
-            StringBuilder sb = new StringBuilder();
+            infoText.Timer -= Time.fixedDeltaTime;
 
-            for (int i = 0; i < StrList.Count; i++)
+            if (infoText.Timer < 0)
             {
-                if (i < 4)
-                {
-                    sb.Append(StrList[i] + '\n');
-                }
-                else
-                {
-                    sb.Append(StrList[i]);
-                }
-            }
+                infoText.Text.TweenBacGra();
 
-            Text.text = sb.ToString();
+
+                TextList.RemoveAt(i--);
+            }
         }
-        else
+    }
+
+
+    public static void Show(string str, float time)
+    {
+        CanvasGroup.TweenForCG();
+
+        if (TextList.Count == 5)
         {
-            Text.text = str + "\n" + Text.text;
+            ManaReso.Save(TextList[0].Text);
+
+            TextList.RemoveAt(0);
         }
 
-        Text.TweenForCG();
+
+        Text text = ManaReso.GetInfoItem();
+
+        InfoText infoText = new InfoText();
+
+        text.text = str;
+
+        text.SetAlpha(1);
+
+        infoText.Timer = 45;
+
+        infoText.Text = text;
+
+        TextList.Add(infoText);
+
 
         Lock = true;
         Timer = time;

Assets/Script/Manage/ManaLan.cs

@@ -6,6 +6,8 @@ using System.Collections.Generic;
 
 public enum Lan
 {
+    Default,
+
     English,
     ChineseSimplified,
     ChineseTraditional,

Assets/Script/Manage/ManaReso.cs

@@ -48,6 +48,7 @@ public enum ObjType
     MainCamera,
 
     HudText,
+    InfoItem,
     SkillItem,
     SignItem,
     FlowerItem,
@@ -633,7 +634,25 @@ public class ManaReso : Regist
     }
 
 
-    public static HudText GetHudText(string str, Color color, int size, Transform posTra, Transform parTra, bool scene, float speed = 7.5f, float time = 0.5f)
+    public static Text GetInfoItem()
+    {
+        Transform tra = Get("InfoItem", Folder.UI, false, Get("J_Info"), false, ObjType.InfoItem);
+
+        tra.SetAsFirstSibling();
+
+        Text text = tra.GetComponent<Text>();
+
+        TweenRoot tween = text.CreateTweenGra(0, 1, 0.25f, true, true, Curve.EaseOutQuad);
+
+        tween.OnBackwardFinish = () =>
+        {
+            Save(text);
+        };
+
+        return text;
+    }
+
+    public static HudText GetHudText(string str, Color color, int size, Transform posTra, Transform parTra, bool scene, float speed = 7.5f, float time = 0.5f, float stay = 0.5f)
     {
         Vector3 pos;
 
@@ -650,7 +669,7 @@ public class ManaReso : Regist
 
         HudText hudText = tra.GetComponent<HudText>();
 
-        hudText.Show(str, color, size, speed, time);
+        hudText.Show(str, color, size, speed, time, stay);
 
         return hudText;
     }

Assets/Script/Manage/ManaUI.cs

@@ -1067,7 +1067,14 @@ public class ManaUI : Regist
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
 
-                Bubble.Show(Language.GetStr("UI", "F_PersonBtn0"), Language.GetStr("UI", "F_PersonBtn1"), ManaReso.LoadSprite("4大技能1", Folder.UI));
+                string suffix = "";
+
+                if (!ManaCenter.SkillPerson.Equal(0))
+                {
+                    suffix = Language.GetStr("Common", "Buff");
+                }
+
+                Bubble.Show(Language.GetStr("UI", "F_PersonBtn0") + suffix, Language.GetStr("UI", "F_PersonBtn1"), ManaReso.LoadSprite("4大技能1", Folder.UI));
             }
         );
 
@@ -1090,7 +1097,14 @@ public class ManaUI : Regist
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
 
-                Bubble.Show(Language.GetStr("UI", "F_CoinPersonBtn0"), Language.GetStr("UI", "F_CoinPersonBtn1"), ManaReso.LoadSprite("绿-免费金币", Folder.UI));
+                string suffix = "";
+
+                if (!ManaCenter.SkillCoinPerson.Equal(0))
+                {
+                    suffix = Language.GetStr("Common", "Buff");
+                }
+
+                Bubble.Show(Language.GetStr("UI", "F_CoinPersonBtn0") + suffix, Language.GetStr("UI", "F_CoinPersonBtn1"), ManaReso.LoadSprite("绿-免费金币", Folder.UI));
             }
         );
 
@@ -1792,7 +1806,7 @@ public class ManaUI : Regist
                 {
                     tween.StartForward();
                 }
-                
+
                 return;
             }
         }

Assets/Script/Manage/ManaVisit.cs

@@ -29,12 +29,12 @@ public class ManaVisit
 
 
     public static int CoolTime;
-    public static int AwardMin;
-    public static int AwardMax;
     public static float FancyRate;
     public static float AwardRate;
     public static float CreateRate;
     public static string CostFml;
+    public static string AwardMinFml;
+    public static string AwardMaxFml;
 
     #endregion
 
@@ -67,8 +67,8 @@ public class ManaVisit
         CostFml = attribute[5].Value;
 
         Cost = Mathf.FloorToInt((float)Auxiliary.FmlParse(CostFml, "l", ManaCenter.Level.ToString()));
-        AwardMin = Mathf.CeilToInt((float) Auxiliary.FmlParse(attribute[2].Value, "l", ManaCenter.Level.ToString()));
-        AwardMax = Mathf.CeilToInt((float) Auxiliary.FmlParse(attribute[3].Value, "l", ManaCenter.Level.ToString()));
+        AwardMinFml = attribute[2].Value;
+        AwardMaxFml = attribute[3].Value;
 
         CoolTime = int.Parse(attribute[4].Value);
         FancyRate = float.Parse(attribute[7].Value);

Assets/Script/Object/Flower.cs

@@ -505,7 +505,10 @@ public class Flower : Regist, IPointerClickHandler
 
         if (ManaVisit.InVisit)
         {
-            coin = Mathf.CeilToInt(Mathf.Lerp(ManaVisit.AwardMin, ManaVisit.AwardMax, Random.Range(0f, 1f)));
+            int awardMin = Mathf.CeilToInt((float) Auxiliary.FmlParse(ManaVisit.AwardMinFml, "l", ManaCenter.Level.ToString()));
+            int awardMax = Mathf.CeilToInt((float) Auxiliary.FmlParse(ManaVisit.AwardMaxFml, "l", ManaCenter.Level.ToString()));
+
+            coin = Mathf.CeilToInt(Mathf.Lerp(awardMin, awardMax, Random.Range(0f, 1f)));
 
             ManaCenter.Coin += coin;
         }

Assets/Script/Object/Skill/Ability.cs

@@ -194,8 +194,8 @@ public class Ability : SkillRoot
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString("0.00"));
             }
 
-            UpgradeValue(ref NewPlus, Plus, UpgradePlus, Level - 1);
-            UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, Level - 1);
+            UpgradeValue(ref NewPlus, UpgradePlus, Level - 1);
+            UpgradeValue(ref NewPersonBuff, UpgradePerson, Level - 1);
             UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, Level - 1);
 
             UpgradeValue(ref NewPerson, Person, UpgradePerson, Level - 1);
@@ -492,8 +492,8 @@ public class Ability : SkillRoot
 
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString("0.00"));
                 
-                UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
-                UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
+                UpgradeValue(ref NewPlus, UpgradePlus, 1);
+                UpgradeValue(ref NewPersonBuff, UpgradePerson, 1);
                 UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, 1);
 
                 UpgradeValue(ref NewPerson, Person, UpgradePerson, 1);
@@ -645,7 +645,7 @@ public class Ability : SkillRoot
                 {
                     temp = NewPersonBuff;
 
-                    UpgradeValue(ref temp, PersonBuff, UpgradePerson, offset);
+                    UpgradeValue(ref temp, UpgradePerson, offset);
 
                     stringBuilder.Append(string.Format("{0:0}%", temp * 100));
                 }
@@ -704,7 +704,7 @@ public class Ability : SkillRoot
                 {
                     temp = NewPlus;
 
-                    UpgradeValue(ref temp, Plus, UpgradePlus, offset);
+                    UpgradeValue(ref temp, UpgradePlus, offset);
 
                     stringBuilder.Append(string.Format("{0:0}%", temp * 100));
                 }

Assets/Script/Object/Skill/BigSkill.cs

@@ -109,7 +109,15 @@ public class BigSkill : Skill
 
         TimeSpan timeSpan = new TimeSpan(0, 0, 0, Mathf.CeilToInt(UseTimer));
 
-        BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+        if (timeSpan.Hours >= 1)
+        {
+            BarLab.text = string.Format("{0} : {1}", timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+        }
+        else
+        {
+            BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+        }
+
 
         if (UseTimer <= 0)
         {
@@ -128,8 +136,16 @@ public class BigSkill : Skill
         CoolTimer -= Time.deltaTime;
         
         TimeSpan timeSpan = new TimeSpan(0, 0, 0, Mathf.CeilToInt(CoolTimer));
+        
+        if (timeSpan.Hours >= 1)
+        {
+            BarLab.text = string.Format("{0} : {1}", timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+        }
+        else
+        {
+            BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+        }
 
-        BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
 
         BarBk0.fillAmount = CoolTimer / CD;
 
@@ -204,8 +220,8 @@ public class BigSkill : Skill
 
             if (BarStatus_ == SkillStatus.Upgrade)
             {
-                UpgradeValue(ref NewPlus, Plus, UpgradePlus, Level - 1);
-                UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, Level - 1);
+                UpgradeValue(ref NewPlus, UpgradePlus, Level - 1);
+                UpgradeValue(ref NewPersonBuff, UpgradePerson, Level - 1);
                 UpgradeValue(ref NewCoinOnceBuff, UpgradeCoinOnce, Level - 1);
                 UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, Level - 1);
 
@@ -393,8 +409,8 @@ public class BigSkill : Skill
 
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString("0.00"));
 
-                UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
-                UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
+                UpgradeValue(ref NewPlus, UpgradePlus, 1);
+                UpgradeValue(ref NewPersonBuff, UpgradePerson, 1);
                 UpgradeValue(ref NewCoinOnceBuff, UpgradeCoinOnce, 1);
                 UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, 1);
 
@@ -437,8 +453,6 @@ public class BigSkill : Skill
 
                 UseTimer = NewDuration - 1;
 
-                BarStatus = SkillStatus.Use;
-
                 UseA();
                 UseB();
 
@@ -451,12 +465,14 @@ public class BigSkill : Skill
     {
         BarBtn.interactable = false;
 
-        if (NewDuration.Equal(0))
+        if (UseTimer.Equal(-1))
         {
             AnnulA();
         }
         else
         {
+            BarStatus = SkillStatus.Use;
+
             ManaCenter.UseList.Add(this);
         }
 

Assets/Script/Object/Skill/Skill.cs

@@ -189,10 +189,18 @@ public class Skill : SkillRoot
     public virtual bool DoCool()
     {
         CoolTimer -= Time.fixedDeltaTime;
-
+        
         TimeSpan timeSpan = new TimeSpan(0, 0, Mathf.CeilToInt(CoolTimer));
 
-        ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab6"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+        if (timeSpan.Hours >= 1)
+        {
+            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab6"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+        }
+        else
+        {
+            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab6"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+        }
+
 
         if (CoolTimer <= 0)
         {
@@ -213,7 +221,15 @@ public class Skill : SkillRoot
 
         TimeSpan timeSpan = new TimeSpan(0, 0, Mathf.CeilToInt(UseTimer));
 
-        ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab8"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+        if (timeSpan.Hours >= 1)
+        {
+            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab8"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+        }
+        else
+        {
+            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab8"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+        }
+
 
         if (UseTimer <= 0)
         {
@@ -285,7 +301,16 @@ public class Skill : SkillRoot
 
     protected virtual void UseA()
     {
-        ManaCenter.UseList.Add(this);
+        if (UseTimer.Equal(-1))
+        {
+            AnnulA();
+        }
+        else
+        {
+            ItemStatus = SkillStatus.Use;
+
+            ManaCenter.UseList.Add(this);
+        }
 
         ManaCenter.SkillPlus += NewPlus;
         ManaCenter.SkillPerson += NewPerson;
@@ -327,16 +352,7 @@ public class Skill : SkillRoot
                 }
 
                 UseTimer = NewDuration - 1;
-
-                if (Duration.Equal(0))
-                {
-                    ItemStatus = SkillStatus.Cool;
-                }
-                else
-                {
-                    ItemStatus = SkillStatus.Use;
-                }
-
+                
                 UseA();
                 UseB();
 
@@ -587,7 +603,7 @@ public class Skill : SkillRoot
                 {
                     temp = NewPersonBuff;
 
-                    UpgradeValue(ref temp, PersonBuff, UpgradePerson, offset);
+                    UpgradeValue(ref temp, UpgradePerson, offset);
 
                     stringBuilder.Append(string.Format("{0:0}%", temp * 100));
                 }
@@ -664,7 +680,7 @@ public class Skill : SkillRoot
                 {
                     temp = NewPlus;
 
-                    UpgradeValue(ref temp, Plus, UpgradePlus, offset);
+                    UpgradeValue(ref temp, UpgradePlus, offset);
 
                     stringBuilder.Append(string.Format("{0:0}%", temp * 100));
                 }

Assets/Script/Object/Star.cs

@@ -139,7 +139,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
         BoxCollider.enabled = false;
 
 
-        ManaInfo.Show(Language.GetStr("Object", "Star") + CD.ToString("0") + Language.GetStr("Plural", "Seconds"), 10f);
+        ManaInfo.Show(Language.GetStr("Object", "Star") + CD.ToString("0") + Auxiliary.GetUnit((int)CD, Unit.Second), 10f);
 
         ManaCenter.MiniTimer -= CD;
 

Assets/Script/Tool/Auxiliary.cs

@@ -4,31 +4,31 @@ using DragonBones;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Events;
+using UnityEngine.Advertisements;
 
 using System;
 using System.IO;
+using System.Xml;
 using System.Linq;
 using System.Net.Mail;
+
+using System.Net;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Net;
 using System.Security.Cryptography;
 using System.Runtime.Serialization.Formatters.Binary;
 
 using System.Security;
 using System.Security.Cryptography.Xml;
 
-using System.Xml;
-using UnityEngine.Advertisements;
 using Random = UnityEngine.Random;
 using Transform = UnityEngine.Transform;
 
-//public enum Unit
-//{
-//    Second
-//}
+public enum Unit
+{
+    Second
+}
 
 public class Amount
 {
@@ -119,12 +119,12 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-
+            
         }
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            
+
         }
 
         if (Input.GetKeyDown(KeyCode.X))
@@ -157,8 +157,8 @@ public class Auxiliary : Regist
 
         //if (Input.GetKeyDown(KeyCode.I))
         //{
-        //    ManaData.Coin += 1000;
-        //    ManaData.Diamond += 1000;
+        //    ManaCenter.Coin += 1000;
+        //    ManaCenter.Diamond += 1000;
         //}
 
         //if (Input.GetKeyDown(KeyCode.U))
@@ -335,6 +335,40 @@ public class Auxiliary : Regist
     }
 
 
+    public static string GetUnit(int value, Unit unit)
+    {
+        if (unit == Unit.Second)
+        {
+            if (ManaLan.CurrentLan == Lan.English)
+            {
+                if (value == 0 || value == 1)
+                {
+                    return " Second";
+                }
+                else
+                {
+                    return " Seconds";
+                }
+            }
+            else if (ManaLan.CurrentLan == Lan.ChineseSimplified)
+            {
+                return "秒";
+            }
+            else if (ManaLan.CurrentLan == Lan.ChineseTraditional)
+            {
+                return "秒";
+            }
+            else
+            {
+                throw new Exception();
+            }
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
     public static string GetStreamPath()
     {
         if (Application.isEditor)

Assets/Script/Tool/DashGame/Language.cs

@@ -37,7 +37,24 @@ public class Language
         LanguageDic.Add(Lan.ChineseSimplified, ManaReso.Load<TextAsset>("ChineseSimplified", Folder.Config));
         LanguageDic.Add(Lan.ChineseTraditional, ManaReso.Load<TextAsset>("ChineseTraditional", Folder.Config));
 
-        TextAsset textAsset = LanguageDic[ManaData.GetPlayerString("Language").ToEnum<Lan>()];
+        if (ManaLan.CurrentLan == Lan.Default)
+        {
+            if (Application.systemLanguage == SystemLanguage.ChineseSimplified)
+            {
+                ManaLan.CurrentLan = Lan.ChineseSimplified;
+            }
+            else if (Application.systemLanguage == SystemLanguage.ChineseTraditional)
+            {
+                ManaLan.CurrentLan = Lan.ChineseTraditional;
+            }
+            else
+            {
+                ManaLan.CurrentLan = Lan.English;
+            }
+        }
+
+
+        TextAsset textAsset = LanguageDic[ManaLan.CurrentLan];
 
         xml = new XmlDocument();
         xml.LoadXml(textAsset.text);

Assets/Script/Tool/UI/HudText.cs

@@ -25,6 +25,8 @@ public class HudText : Regist
     public Text Text_;
 
     public float Speed;
+    public float StayTimer;
+    public bool Lock;
 
     #endregion
 
@@ -42,25 +44,39 @@ public class HudText : Regist
 
     private void FixedUpdate()
     {
-        transform.position += new Vector3(0, Speed*Time.fixedDeltaTime, 0);
+        StayTimer -= Time.fixedDeltaTime;
 
-        if (Text.color.a <= 0.05f)
+        if (StayTimer < 0)
         {
-            ManaReso.Save(gameObject);
+            if (!Lock)
+            {
+                Lock = true;
+
+
+                Text.TweenForCG();
+            }
+
+            transform.position += new Vector3(0, Speed * Time.fixedDeltaTime, 0);
+
+            if (Text.color.a <= 0.05f)
+            {
+                ManaReso.Save(gameObject);
+            }
         }
     }
 
-    public void Show(string str, Color color, int size, float speed, float time)
+    public void Show(string str, Color color, int size, float speed, float time, float stay)
     {
         Text.text = str;
         Text.color = color;
         Text.fontSize = size;
 
-        Speed = speed;
 
+        Lock = false;
+        Speed = speed;
+        StayTimer = stay;
 
-        TweenRoot tween = Text.CreateTweenCG(1, 0, time, false, false, Curve.EaseOutQuad);
 
-        tween.StartForward();
+        Text.CreateTweenCG(1, 0, time, false, false, Curve.EaseOutQuad);
     }
 }

MyLovelyGarden.sln

@@ -1,13 +1,13 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Plugins", "MyLovelyGarden.Plugins.csproj", "{6E74E584-9DFC-C050-676F-69A7C37E7E0C}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2008
+
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-firstpass.csproj", "{76439BDA-6081-7FA3-9C3B-368968A7EA5E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor.Plugins", "MyLovelyGarden.Editor.Plugins.csproj", "{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor-firstpass.csproj", "{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,24 +15,27 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal

ToList.txt

@@ -1,6 +1,11 @@
-日志修改
+重新导出配置
 
-单复数修改
+关闭调试界面
 
+恢复PlayerConfig
 
-测试完大亨光临
+
+Hud
+{
+  增加一个滞留功能
+}