Temp-小游戏C

Assets/Resource/Sprite/Garden/FlowerAtlas.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: bd007edf149fd024f99f0c5d743d0d57
-timeCreated: 1498656795
+timeCreated: 1500543803
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:

Assets/Resource/XML/Config/dressRoom_config.xml

@@ -5,13 +5,13 @@
   <item id="4" jump_frequency="" type="1" index="2" bodypart="1" level="" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" spriteName="脑壳1(粉色)" armatureName="脑壳1(粉色)" />
   <item id="5" jump_frequency="" type="1" index="3" bodypart="1" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2(黄色)" armatureName="脑壳2(黄色)" />
   <item id="6" jump_frequency="" type="1" index="4" bodypart="1" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2" armatureName="脑壳2" />
-  <item id="11" jump_frequency="" type="1" index="9" bodypart="1" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上（粉色）,脑壳3+下（粉色）" armatureName="脑壳3" />
-  <item id="12" jump_frequency="" type="1" index="10" bodypart="1" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上（紫色）,脑壳3+下（紫色）" armatureName="脑壳3(紫色)" />
-  <item id="13" jump_frequency="" type="1" index="11" bodypart="1" level="" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上（黄色）,脑壳3+下（黄色）脑壳2——下" armatureName="脑壳3(黄色)" />
   <item id="7" jump_frequency="" type="1" index="5" bodypart="1" level="" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2(粉色)" armatureName="脑壳2(粉色)" />
   <item id="8" jump_frequency="" type="1" index="6" bodypart="1" level="30" buy_currency="2" buy_amt="1000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="15" icon1offset="1.82,-132.79" spriteName="脑壳2(黄色),脑壳3+下（黄色）脑壳2——下" armatureName="脑壳2B(黄色)" />
   <item id="9" jump_frequency="" type="1" index="7" bodypart="1" level="30" buy_currency="2" buy_amt="1000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="15" icon1offset="1.82,-132.79" spriteName="脑壳2,脑壳2+下（棕色）另一种发型" armatureName="脑壳2B(棕色)" />
   <item id="10" jump_frequency="" type="1" index="8" bodypart="1" level="30" buy_currency="2" buy_amt="1000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="15" icon1offset="1.82,-132.79" spriteName="脑壳2(粉色),脑壳2+下（粉色）另一种发型" armatureName="脑壳2B(粉色)" />
+  <item id="11" jump_frequency="" type="1" index="9" bodypart="1" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上（粉色）,脑壳3+下（粉色）" armatureName="脑壳3" />
+  <item id="12" jump_frequency="" type="1" index="10" bodypart="1" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上（紫色）,脑壳3+下（紫色）" armatureName="脑壳3(紫色)" />
+  <item id="13" jump_frequency="" type="1" index="11" bodypart="1" level="" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上（黄色）,脑壳3+下（黄色）脑壳2——下" armatureName="脑壳3(黄色)" />
   <item id="14" jump_frequency="" type="1" index="12" bodypart="1" level="30" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头发4（粉色）" armatureName="头发4（粉色）" />
   <item id="15" jump_frequency="" type="1" index="13" bodypart="1" level="30" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头发4（绿色）" armatureName="头发4（绿色）" />
   <item id="16" jump_frequency="" type="1" index="14" bodypart="1" level="30" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头发4（蓝色）" armatureName="头发4（蓝色）" />

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="679" />
+  <Version value="680" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -28,7 +28,7 @@
 
   <Player value="PlayerBlond" />
   <PlantList value =""/>
-  <DressList value ="2 6 11 31 32 33 34 35 36 37 38 39 40 41 42 92"/>
+  <DressList value ="2 6 11 201 202 203 401 405 408 601 602 603 801 802 803 1001"/>
   <FlowerList value="1" />
   <AchieveList value="" />
   <DressData Head="" Dress="" Shoe="" HeadWear="" Top="" Eye="" Mouse="" Wing="Empty"/>

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -442,69 +442,69 @@
     <Armature28 desc=""><![CDATA[服装的说明]]></Armature28>
     <Armature29 desc=""><![CDATA[服装的说明]]></Armature29>
     <Armature30 desc=""><![CDATA[服装的说明]]></Armature30>
-    <Armature31 desc=""><![CDATA[服装的说明]]></Armature31>
-    <Armature32 desc=""><![CDATA[服装的说明]]></Armature32>
-    <Armature33 desc=""><![CDATA[服装的说明]]></Armature33>
-    <Armature34 desc=""><![CDATA[服装的说明]]></Armature34>
-    <Armature35 desc=""><![CDATA[服装的说明]]></Armature35>
-    <Armature36 desc=""><![CDATA[服装的说明]]></Armature36>
-    <Armature37 desc=""><![CDATA[服装的说明]]></Armature37>
-    <Armature38 desc=""><![CDATA[服装的说明]]></Armature38>
-    <Armature39 desc=""><![CDATA[服装的说明]]></Armature39>
-    <Armature40 desc=""><![CDATA[服装的说明]]></Armature40>
-    <Armature41 desc=""><![CDATA[服装的说明]]></Armature41>
-    <Armature42 desc=""><![CDATA[服装的说明]]></Armature42>
-    <Armature43 desc=""><![CDATA[服装的说明]]></Armature43>
-    <Armature44 desc=""><![CDATA[服装的说明]]></Armature44>
-    <Armature45 desc=""><![CDATA[服装的说明]]></Armature45>
-    <Armature46 desc=""><![CDATA[服装的说明]]></Armature46>
-    <Armature47 desc=""><![CDATA[服装的说明]]></Armature47>
-    <Armature48 desc=""><![CDATA[服装的说明]]></Armature48>
-    <Armature49 desc=""><![CDATA[服装的说明]]></Armature49>
-    <Armature50 desc=""><![CDATA[服装的说明]]></Armature50>
-    <Armature51 desc=""><![CDATA[服装的说明]]></Armature51>
-    <Armature52 desc=""><![CDATA[服装的说明]]></Armature52>
-    <Armature53 desc=""><![CDATA[服装的说明]]></Armature53>
-    <Armature54 desc=""><![CDATA[服装的说明]]></Armature54>
-    <Armature55 desc=""><![CDATA[服装的说明]]></Armature55>
-    <Armature56 desc=""><![CDATA[服装的说明]]></Armature56>
-    <Armature57 desc=""><![CDATA[服装的说明]]></Armature57>
-    <Armature58 desc=""><![CDATA[服装的说明]]></Armature58>
-    <Armature59 desc=""><![CDATA[服装的说明]]></Armature59>
-    <Armature60 desc=""><![CDATA[服装的说明]]></Armature60>
-    <Armature61 desc=""><![CDATA[服装的说明]]></Armature61>
-    <Armature62 desc=""><![CDATA[服装的说明]]></Armature62>
-    <Armature63 desc=""><![CDATA[服装的说明]]></Armature63>
-    <Armature64 desc=""><![CDATA[服装的说明]]></Armature64>
-    <Armature65 desc=""><![CDATA[服装的说明]]></Armature65>
-    <Armature66 desc=""><![CDATA[服装的说明]]></Armature66>
-    <Armature67 desc=""><![CDATA[服装的说明]]></Armature67>
-    <Armature68 desc=""><![CDATA[服装的说明]]></Armature68>
-    <Armature69 desc=""><![CDATA[服装的说明]]></Armature69>
-    <Armature70 desc=""><![CDATA[服装的说明]]></Armature70>
-    <Armature71 desc=""><![CDATA[服装的说明]]></Armature71>
-    <Armature72 desc=""><![CDATA[服装的说明]]></Armature72>
-    <Armature73 desc=""><![CDATA[服装的说明]]></Armature73>
-    <Armature74 desc=""><![CDATA[服装的说明]]></Armature74>
-    <Armature75 desc=""><![CDATA[服装的说明]]></Armature75>
-    <Armature76 desc=""><![CDATA[服装的说明]]></Armature76>
-    <Armature77 desc=""><![CDATA[服装的说明]]></Armature77>
-    <Armature78 desc=""><![CDATA[服装的说明]]></Armature78>
-    <Armature79 desc=""><![CDATA[服装的说明]]></Armature79>
-    <Armature80 desc=""><![CDATA[服装的说明]]></Armature80>
-    <Armature81 desc=""><![CDATA[服装的说明]]></Armature81>
-    <Armature82 desc=""><![CDATA[服装的说明]]></Armature82>
-    <Armature83 desc=""><![CDATA[服装的说明]]></Armature83>
-    <Armature84 desc=""><![CDATA[服装的说明]]></Armature84>
-    <Armature85 desc=""><![CDATA[服装的说明]]></Armature85>
-    <Armature86 desc=""><![CDATA[服装的说明]]></Armature86>
-    <Armature87 desc=""><![CDATA[服装的说明]]></Armature87>
-    <Armature88 desc=""><![CDATA[服装的说明]]></Armature88>
-    <Armature89 desc=""><![CDATA[服装的说明]]></Armature89>
-    <Armature90 desc=""><![CDATA[服装的说明]]></Armature90>
-    <Armature91 desc=""><![CDATA[服装的说明]]></Armature91>
-    <Armature92 desc=""><![CDATA[服装的说明]]></Armature92>
-    <Armature93 desc=""><![CDATA[服装的说明]]></Armature93>
-    <Armature94 desc=""><![CDATA[服装的说明]]></Armature94>
+    <Armature201 desc=""><![CDATA[服装的说明]]></Armature201>
+    <Armature202 desc=""><![CDATA[服装的说明]]></Armature202>
+    <Armature203 desc=""><![CDATA[服装的说明]]></Armature203>
+    <Armature204 desc=""><![CDATA[服装的说明]]></Armature204>
+    <Armature205 desc=""><![CDATA[服装的说明]]></Armature205>
+    <Armature206 desc=""><![CDATA[服装的说明]]></Armature206>
+    <Armature207 desc=""><![CDATA[服装的说明]]></Armature207>
+    <Armature208 desc=""><![CDATA[服装的说明]]></Armature208>
+    <Armature209 desc=""><![CDATA[服装的说明]]></Armature209>
+    <Armature210 desc=""><![CDATA[服装的说明]]></Armature210>
+    <Armature211 desc=""><![CDATA[服装的说明]]></Armature211>
+    <Armature212 desc=""><![CDATA[服装的说明]]></Armature212>
+    <Armature213 desc=""><![CDATA[服装的说明]]></Armature213>
+    <Armature214 desc=""><![CDATA[服装的说明]]></Armature214>
+    <Armature215 desc=""><![CDATA[服装的说明]]></Armature215>
+    <Armature216 desc=""><![CDATA[服装的说明]]></Armature216>
+    <Armature217 desc=""><![CDATA[服装的说明]]></Armature217>
+    <Armature401 desc=""><![CDATA[服装的说明]]></Armature401>
+    <Armature402 desc=""><![CDATA[服装的说明]]></Armature402>
+    <Armature403 desc=""><![CDATA[服装的说明]]></Armature403>
+    <Armature404 desc=""><![CDATA[服装的说明]]></Armature404>
+    <Armature405 desc=""><![CDATA[服装的说明]]></Armature405>
+    <Armature406 desc=""><![CDATA[服装的说明]]></Armature406>
+    <Armature407 desc=""><![CDATA[服装的说明]]></Armature407>
+    <Armature408 desc=""><![CDATA[服装的说明]]></Armature408>
+    <Armature409 desc=""><![CDATA[服装的说明]]></Armature409>
+    <Armature410 desc=""><![CDATA[服装的说明]]></Armature410>
+    <Armature411 desc=""><![CDATA[服装的说明]]></Armature411>
+    <Armature412 desc=""><![CDATA[服装的说明]]></Armature412>
+    <Armature413 desc=""><![CDATA[服装的说明]]></Armature413>
+    <Armature414 desc=""><![CDATA[服装的说明]]></Armature414>
+    <Armature415 desc=""><![CDATA[服装的说明]]></Armature415>
+    <Armature601 desc=""><![CDATA[服装的说明]]></Armature601>
+    <Armature602 desc=""><![CDATA[服装的说明]]></Armature602>
+    <Armature603 desc=""><![CDATA[服装的说明]]></Armature603>
+    <Armature604 desc=""><![CDATA[服装的说明]]></Armature604>
+    <Armature605 desc=""><![CDATA[服装的说明]]></Armature605>
+    <Armature606 desc=""><![CDATA[服装的说明]]></Armature606>
+    <Armature607 desc=""><![CDATA[服装的说明]]></Armature607>
+    <Armature608 desc=""><![CDATA[服装的说明]]></Armature608>
+    <Armature609 desc=""><![CDATA[服装的说明]]></Armature609>
+    <Armature610 desc=""><![CDATA[服装的说明]]></Armature610>
+    <Armature611 desc=""><![CDATA[服装的说明]]></Armature611>
+    <Armature612 desc=""><![CDATA[服装的说明]]></Armature612>
+    <Armature801 desc=""><![CDATA[服装的说明]]></Armature801>
+    <Armature802 desc=""><![CDATA[服装的说明]]></Armature802>
+    <Armature803 desc=""><![CDATA[服装的说明]]></Armature803>
+    <Armature804 desc=""><![CDATA[服装的说明]]></Armature804>
+    <Armature805 desc=""><![CDATA[服装的说明]]></Armature805>
+    <Armature806 desc=""><![CDATA[服装的说明]]></Armature806>
+    <Armature807 desc=""><![CDATA[服装的说明]]></Armature807>
+    <Armature808 desc=""><![CDATA[服装的说明]]></Armature808>
+    <Armature809 desc=""><![CDATA[服装的说明]]></Armature809>
+    <Armature810 desc=""><![CDATA[服装的说明]]></Armature810>
+    <Armature811 desc=""><![CDATA[服装的说明]]></Armature811>
+    <Armature812 desc=""><![CDATA[服装的说明]]></Armature812>
+    <Armature813 desc=""><![CDATA[服装的说明]]></Armature813>
+    <Armature814 desc=""><![CDATA[服装的说明]]></Armature814>
+    <Armature815 desc=""><![CDATA[服装的说明]]></Armature815>
+    <Armature816 desc=""><![CDATA[服装的说明]]></Armature816>
+    <Armature817 desc=""><![CDATA[服装的说明]]></Armature817>
+    <Armature1001 desc=""><![CDATA[服装的说明]]></Armature1001>
+    <Armature1002 desc=""><![CDATA[服装的说明]]></Armature1002>
+    <Armature1003 desc=""><![CDATA[服装的说明]]></Armature1003>
   </DressRoom>
 </lan>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -442,69 +442,69 @@
     <Armature28 desc=""><![CDATA[]]></Armature28>
     <Armature29 desc=""><![CDATA[]]></Armature29>
     <Armature30 desc=""><![CDATA[]]></Armature30>
-    <Armature31 desc=""><![CDATA[]]></Armature31>
-    <Armature32 desc=""><![CDATA[]]></Armature32>
-    <Armature33 desc=""><![CDATA[]]></Armature33>
-    <Armature34 desc=""><![CDATA[]]></Armature34>
-    <Armature35 desc=""><![CDATA[]]></Armature35>
-    <Armature36 desc=""><![CDATA[]]></Armature36>
-    <Armature37 desc=""><![CDATA[]]></Armature37>
-    <Armature38 desc=""><![CDATA[]]></Armature38>
-    <Armature39 desc=""><![CDATA[]]></Armature39>
-    <Armature40 desc=""><![CDATA[]]></Armature40>
-    <Armature41 desc=""><![CDATA[]]></Armature41>
-    <Armature42 desc=""><![CDATA[]]></Armature42>
-    <Armature43 desc=""><![CDATA[]]></Armature43>
-    <Armature44 desc=""><![CDATA[]]></Armature44>
-    <Armature45 desc=""><![CDATA[]]></Armature45>
-    <Armature46 desc=""><![CDATA[]]></Armature46>
-    <Armature47 desc=""><![CDATA[]]></Armature47>
-    <Armature48 desc=""><![CDATA[]]></Armature48>
-    <Armature49 desc=""><![CDATA[]]></Armature49>
-    <Armature50 desc=""><![CDATA[]]></Armature50>
-    <Armature51 desc=""><![CDATA[]]></Armature51>
-    <Armature52 desc=""><![CDATA[]]></Armature52>
-    <Armature53 desc=""><![CDATA[]]></Armature53>
-    <Armature54 desc=""><![CDATA[]]></Armature54>
-    <Armature55 desc=""><![CDATA[]]></Armature55>
-    <Armature56 desc=""><![CDATA[]]></Armature56>
-    <Armature57 desc=""><![CDATA[]]></Armature57>
-    <Armature58 desc=""><![CDATA[]]></Armature58>
-    <Armature59 desc=""><![CDATA[]]></Armature59>
-    <Armature60 desc=""><![CDATA[]]></Armature60>
-    <Armature61 desc=""><![CDATA[]]></Armature61>
-    <Armature62 desc=""><![CDATA[]]></Armature62>
-    <Armature63 desc=""><![CDATA[]]></Armature63>
-    <Armature64 desc=""><![CDATA[]]></Armature64>
-    <Armature65 desc=""><![CDATA[]]></Armature65>
-    <Armature66 desc=""><![CDATA[]]></Armature66>
-    <Armature67 desc=""><![CDATA[]]></Armature67>
-    <Armature68 desc=""><![CDATA[]]></Armature68>
-    <Armature69 desc=""><![CDATA[]]></Armature69>
-    <Armature70 desc=""><![CDATA[]]></Armature70>
-    <Armature71 desc=""><![CDATA[]]></Armature71>
-    <Armature72 desc=""><![CDATA[]]></Armature72>
-    <Armature73 desc=""><![CDATA[]]></Armature73>
-    <Armature74 desc=""><![CDATA[]]></Armature74>
-    <Armature75 desc=""><![CDATA[]]></Armature75>
-    <Armature76 desc=""><![CDATA[]]></Armature76>
-    <Armature77 desc=""><![CDATA[]]></Armature77>
-    <Armature78 desc=""><![CDATA[]]></Armature78>
-    <Armature79 desc=""><![CDATA[]]></Armature79>
-    <Armature80 desc=""><![CDATA[]]></Armature80>
-    <Armature81 desc=""><![CDATA[]]></Armature81>
-    <Armature82 desc=""><![CDATA[]]></Armature82>
-    <Armature83 desc=""><![CDATA[]]></Armature83>
-    <Armature84 desc=""><![CDATA[]]></Armature84>
-    <Armature85 desc=""><![CDATA[]]></Armature85>
-    <Armature86 desc=""><![CDATA[]]></Armature86>
-    <Armature87 desc=""><![CDATA[]]></Armature87>
-    <Armature88 desc=""><![CDATA[]]></Armature88>
-    <Armature89 desc=""><![CDATA[]]></Armature89>
-    <Armature90 desc=""><![CDATA[]]></Armature90>
-    <Armature91 desc=""><![CDATA[]]></Armature91>
-    <Armature92 desc=""><![CDATA[]]></Armature92>
-    <Armature93 desc=""><![CDATA[]]></Armature93>
-    <Armature94 desc=""><![CDATA[]]></Armature94>
+    <Armature201 desc=""><![CDATA[]]></Armature201>
+    <Armature202 desc=""><![CDATA[]]></Armature202>
+    <Armature203 desc=""><![CDATA[]]></Armature203>
+    <Armature204 desc=""><![CDATA[]]></Armature204>
+    <Armature205 desc=""><![CDATA[]]></Armature205>
+    <Armature206 desc=""><![CDATA[]]></Armature206>
+    <Armature207 desc=""><![CDATA[]]></Armature207>
+    <Armature208 desc=""><![CDATA[]]></Armature208>
+    <Armature209 desc=""><![CDATA[]]></Armature209>
+    <Armature210 desc=""><![CDATA[]]></Armature210>
+    <Armature211 desc=""><![CDATA[]]></Armature211>
+    <Armature212 desc=""><![CDATA[]]></Armature212>
+    <Armature213 desc=""><![CDATA[]]></Armature213>
+    <Armature214 desc=""><![CDATA[]]></Armature214>
+    <Armature215 desc=""><![CDATA[]]></Armature215>
+    <Armature216 desc=""><![CDATA[]]></Armature216>
+    <Armature217 desc=""><![CDATA[]]></Armature217>
+    <Armature401 desc=""><![CDATA[]]></Armature401>
+    <Armature402 desc=""><![CDATA[]]></Armature402>
+    <Armature403 desc=""><![CDATA[]]></Armature403>
+    <Armature404 desc=""><![CDATA[]]></Armature404>
+    <Armature405 desc=""><![CDATA[]]></Armature405>
+    <Armature406 desc=""><![CDATA[]]></Armature406>
+    <Armature407 desc=""><![CDATA[]]></Armature407>
+    <Armature408 desc=""><![CDATA[]]></Armature408>
+    <Armature409 desc=""><![CDATA[]]></Armature409>
+    <Armature410 desc=""><![CDATA[]]></Armature410>
+    <Armature411 desc=""><![CDATA[]]></Armature411>
+    <Armature412 desc=""><![CDATA[]]></Armature412>
+    <Armature413 desc=""><![CDATA[]]></Armature413>
+    <Armature414 desc=""><![CDATA[]]></Armature414>
+    <Armature415 desc=""><![CDATA[]]></Armature415>
+    <Armature601 desc=""><![CDATA[]]></Armature601>
+    <Armature602 desc=""><![CDATA[]]></Armature602>
+    <Armature603 desc=""><![CDATA[]]></Armature603>
+    <Armature604 desc=""><![CDATA[]]></Armature604>
+    <Armature605 desc=""><![CDATA[]]></Armature605>
+    <Armature606 desc=""><![CDATA[]]></Armature606>
+    <Armature607 desc=""><![CDATA[]]></Armature607>
+    <Armature608 desc=""><![CDATA[]]></Armature608>
+    <Armature609 desc=""><![CDATA[]]></Armature609>
+    <Armature610 desc=""><![CDATA[]]></Armature610>
+    <Armature611 desc=""><![CDATA[]]></Armature611>
+    <Armature612 desc=""><![CDATA[]]></Armature612>
+    <Armature801 desc=""><![CDATA[]]></Armature801>
+    <Armature802 desc=""><![CDATA[]]></Armature802>
+    <Armature803 desc=""><![CDATA[]]></Armature803>
+    <Armature804 desc=""><![CDATA[]]></Armature804>
+    <Armature805 desc=""><![CDATA[]]></Armature805>
+    <Armature806 desc=""><![CDATA[]]></Armature806>
+    <Armature807 desc=""><![CDATA[]]></Armature807>
+    <Armature808 desc=""><![CDATA[]]></Armature808>
+    <Armature809 desc=""><![CDATA[]]></Armature809>
+    <Armature810 desc=""><![CDATA[]]></Armature810>
+    <Armature811 desc=""><![CDATA[]]></Armature811>
+    <Armature812 desc=""><![CDATA[]]></Armature812>
+    <Armature813 desc=""><![CDATA[]]></Armature813>
+    <Armature814 desc=""><![CDATA[]]></Armature814>
+    <Armature815 desc=""><![CDATA[]]></Armature815>
+    <Armature816 desc=""><![CDATA[]]></Armature816>
+    <Armature817 desc=""><![CDATA[]]></Armature817>
+    <Armature1001 desc=""><![CDATA[]]></Armature1001>
+    <Armature1002 desc=""><![CDATA[]]></Armature1002>
+    <Armature1003 desc=""><![CDATA[]]></Armature1003>
   </DressRoom>
 </lan>

Assets/Resource/XML/lan/English.xml

@@ -442,69 +442,69 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Armature28 desc=""><![CDATA[]]></Armature28>
     <Armature29 desc=""><![CDATA[]]></Armature29>
     <Armature30 desc=""><![CDATA[]]></Armature30>
-    <Armature31 desc=""><![CDATA[]]></Armature31>
-    <Armature32 desc=""><![CDATA[]]></Armature32>
-    <Armature33 desc=""><![CDATA[]]></Armature33>
-    <Armature34 desc=""><![CDATA[]]></Armature34>
-    <Armature35 desc=""><![CDATA[]]></Armature35>
-    <Armature36 desc=""><![CDATA[]]></Armature36>
-    <Armature37 desc=""><![CDATA[]]></Armature37>
-    <Armature38 desc=""><![CDATA[]]></Armature38>
-    <Armature39 desc=""><![CDATA[]]></Armature39>
-    <Armature40 desc=""><![CDATA[]]></Armature40>
-    <Armature41 desc=""><![CDATA[]]></Armature41>
-    <Armature42 desc=""><![CDATA[]]></Armature42>
-    <Armature43 desc=""><![CDATA[]]></Armature43>
-    <Armature44 desc=""><![CDATA[]]></Armature44>
-    <Armature45 desc=""><![CDATA[]]></Armature45>
-    <Armature46 desc=""><![CDATA[]]></Armature46>
-    <Armature47 desc=""><![CDATA[]]></Armature47>
-    <Armature48 desc=""><![CDATA[]]></Armature48>
-    <Armature49 desc=""><![CDATA[]]></Armature49>
-    <Armature50 desc=""><![CDATA[]]></Armature50>
-    <Armature51 desc=""><![CDATA[]]></Armature51>
-    <Armature52 desc=""><![CDATA[]]></Armature52>
-    <Armature53 desc=""><![CDATA[]]></Armature53>
-    <Armature54 desc=""><![CDATA[]]></Armature54>
-    <Armature55 desc=""><![CDATA[]]></Armature55>
-    <Armature56 desc=""><![CDATA[]]></Armature56>
-    <Armature57 desc=""><![CDATA[]]></Armature57>
-    <Armature58 desc=""><![CDATA[]]></Armature58>
-    <Armature59 desc=""><![CDATA[]]></Armature59>
-    <Armature60 desc=""><![CDATA[]]></Armature60>
-    <Armature61 desc=""><![CDATA[]]></Armature61>
-    <Armature62 desc=""><![CDATA[]]></Armature62>
-    <Armature63 desc=""><![CDATA[]]></Armature63>
-    <Armature64 desc=""><![CDATA[]]></Armature64>
-    <Armature65 desc=""><![CDATA[]]></Armature65>
-    <Armature66 desc=""><![CDATA[]]></Armature66>
-    <Armature67 desc=""><![CDATA[]]></Armature67>
-    <Armature68 desc=""><![CDATA[]]></Armature68>
-    <Armature69 desc=""><![CDATA[]]></Armature69>
-    <Armature70 desc=""><![CDATA[]]></Armature70>
-    <Armature71 desc=""><![CDATA[]]></Armature71>
-    <Armature72 desc=""><![CDATA[]]></Armature72>
-    <Armature73 desc=""><![CDATA[]]></Armature73>
-    <Armature74 desc=""><![CDATA[]]></Armature74>
-    <Armature75 desc=""><![CDATA[]]></Armature75>
-    <Armature76 desc=""><![CDATA[]]></Armature76>
-    <Armature77 desc=""><![CDATA[]]></Armature77>
-    <Armature78 desc=""><![CDATA[]]></Armature78>
-    <Armature79 desc=""><![CDATA[]]></Armature79>
-    <Armature80 desc=""><![CDATA[]]></Armature80>
-    <Armature81 desc=""><![CDATA[]]></Armature81>
-    <Armature82 desc=""><![CDATA[]]></Armature82>
-    <Armature83 desc=""><![CDATA[]]></Armature83>
-    <Armature84 desc=""><![CDATA[]]></Armature84>
-    <Armature85 desc=""><![CDATA[]]></Armature85>
-    <Armature86 desc=""><![CDATA[]]></Armature86>
-    <Armature87 desc=""><![CDATA[]]></Armature87>
-    <Armature88 desc=""><![CDATA[]]></Armature88>
-    <Armature89 desc=""><![CDATA[]]></Armature89>
-    <Armature90 desc=""><![CDATA[]]></Armature90>
-    <Armature91 desc=""><![CDATA[]]></Armature91>
-    <Armature92 desc=""><![CDATA[]]></Armature92>
-    <Armature93 desc=""><![CDATA[]]></Armature93>
-    <Armature94 desc=""><![CDATA[]]></Armature94>
+    <Armature201 desc=""><![CDATA[]]></Armature201>
+    <Armature202 desc=""><![CDATA[]]></Armature202>
+    <Armature203 desc=""><![CDATA[]]></Armature203>
+    <Armature204 desc=""><![CDATA[]]></Armature204>
+    <Armature205 desc=""><![CDATA[]]></Armature205>
+    <Armature206 desc=""><![CDATA[]]></Armature206>
+    <Armature207 desc=""><![CDATA[]]></Armature207>
+    <Armature208 desc=""><![CDATA[]]></Armature208>
+    <Armature209 desc=""><![CDATA[]]></Armature209>
+    <Armature210 desc=""><![CDATA[]]></Armature210>
+    <Armature211 desc=""><![CDATA[]]></Armature211>
+    <Armature212 desc=""><![CDATA[]]></Armature212>
+    <Armature213 desc=""><![CDATA[]]></Armature213>
+    <Armature214 desc=""><![CDATA[]]></Armature214>
+    <Armature215 desc=""><![CDATA[]]></Armature215>
+    <Armature216 desc=""><![CDATA[]]></Armature216>
+    <Armature217 desc=""><![CDATA[]]></Armature217>
+    <Armature401 desc=""><![CDATA[]]></Armature401>
+    <Armature402 desc=""><![CDATA[]]></Armature402>
+    <Armature403 desc=""><![CDATA[]]></Armature403>
+    <Armature404 desc=""><![CDATA[]]></Armature404>
+    <Armature405 desc=""><![CDATA[]]></Armature405>
+    <Armature406 desc=""><![CDATA[]]></Armature406>
+    <Armature407 desc=""><![CDATA[]]></Armature407>
+    <Armature408 desc=""><![CDATA[]]></Armature408>
+    <Armature409 desc=""><![CDATA[]]></Armature409>
+    <Armature410 desc=""><![CDATA[]]></Armature410>
+    <Armature411 desc=""><![CDATA[]]></Armature411>
+    <Armature412 desc=""><![CDATA[]]></Armature412>
+    <Armature413 desc=""><![CDATA[]]></Armature413>
+    <Armature414 desc=""><![CDATA[]]></Armature414>
+    <Armature415 desc=""><![CDATA[]]></Armature415>
+    <Armature601 desc=""><![CDATA[]]></Armature601>
+    <Armature602 desc=""><![CDATA[]]></Armature602>
+    <Armature603 desc=""><![CDATA[]]></Armature603>
+    <Armature604 desc=""><![CDATA[]]></Armature604>
+    <Armature605 desc=""><![CDATA[]]></Armature605>
+    <Armature606 desc=""><![CDATA[]]></Armature606>
+    <Armature607 desc=""><![CDATA[]]></Armature607>
+    <Armature608 desc=""><![CDATA[]]></Armature608>
+    <Armature609 desc=""><![CDATA[]]></Armature609>
+    <Armature610 desc=""><![CDATA[]]></Armature610>
+    <Armature611 desc=""><![CDATA[]]></Armature611>
+    <Armature612 desc=""><![CDATA[]]></Armature612>
+    <Armature801 desc=""><![CDATA[]]></Armature801>
+    <Armature802 desc=""><![CDATA[]]></Armature802>
+    <Armature803 desc=""><![CDATA[]]></Armature803>
+    <Armature804 desc=""><![CDATA[]]></Armature804>
+    <Armature805 desc=""><![CDATA[]]></Armature805>
+    <Armature806 desc=""><![CDATA[]]></Armature806>
+    <Armature807 desc=""><![CDATA[]]></Armature807>
+    <Armature808 desc=""><![CDATA[]]></Armature808>
+    <Armature809 desc=""><![CDATA[]]></Armature809>
+    <Armature810 desc=""><![CDATA[]]></Armature810>
+    <Armature811 desc=""><![CDATA[]]></Armature811>
+    <Armature812 desc=""><![CDATA[]]></Armature812>
+    <Armature813 desc=""><![CDATA[]]></Armature813>
+    <Armature814 desc=""><![CDATA[]]></Armature814>
+    <Armature815 desc=""><![CDATA[]]></Armature815>
+    <Armature816 desc=""><![CDATA[]]></Armature816>
+    <Armature817 desc=""><![CDATA[]]></Armature817>
+    <Armature1001 desc=""><![CDATA[]]></Armature1001>
+    <Armature1002 desc=""><![CDATA[]]></Armature1002>
+    <Armature1003 desc=""><![CDATA[]]></Armature1003>
   </DressRoom>
 </lan>

Assets/Script/Extension/ExtensionDictionary.cs

@@ -1,23 +1,31 @@
 using UnityEngine;
 
+using System;
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 
 public static class ExtensionDictionary
 {
-    public static T2 Random<T1, T2>(this Dictionary<T1, T2> dic, bool remove = false, ExtList.RandomDelegate<T2> randomDelegate = null)
+    public static T2 Random<T1, T2>(this Dictionary<T1, T2> dic, bool remove = false, Func<T2,bool> func = null)
     {
+        int antiCrush = 0;
+
         while (true)
         {
+            if (antiCrush++>10000)
+            {
+                throw new Exception();
+            }
+
             int index = UnityEngine.Random.Range(0, dic.Count);
 
             T1 resultKey = dic.Keys.ToList()[index];
             T2 resultValue = dic.Values.ToList()[index];
             
-            if (randomDelegate != null)
+            if (func != null)
             {
-                if (!randomDelegate(resultValue))
+                if (!func(resultValue))
                 {
                     continue;
                 }

Assets/Script/Manage/ManaData.cs

@@ -901,17 +901,17 @@ public class ManaData : Regist
 
     public static XmlDocument MergeXML(int nativeVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        if (nativeVersion < 679)
+        if (nativeVersion < 680)
         {
             Debug.LogWarning("UpdateArchive");
 
-            To679(nativeDoc, defaultDoc);
+            To680(nativeDoc, defaultDoc);
         }
 
         return nativeDoc;
     }
 
-    public static XmlDocument To679(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    public static XmlDocument To680(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
         string playerType = "";
         XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
@@ -964,7 +964,7 @@ public class ManaData : Regist
         }
 
 
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 679.ToString();
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 680.ToString();
 
         xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
         xmlNode2 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");

Assets/Script/Manage/ManaGarden.cs

@@ -170,7 +170,7 @@ public class ManaGarden : Regist
 
             if (ElfList.Count > 0 && PlantList.Count > 0)
             {
-                PlantList.Random().Flower.GetElf(ElfList.Random());
+                PlantList.Random()[0].Flower.GetElf(ElfList.Random()[0]);
             }
         }
     }
@@ -212,7 +212,7 @@ public class ManaGarden : Regist
 
                 if (spareList.Count > 0)
                 {
-                    spareList.Random().Award = true;
+                    spareList.Random()[0].Award = true;
                 }
             }
         }

Assets/Script/Manage/ManaMiniGame.cs

@@ -690,14 +690,13 @@ public class ManaMiniGame : Regist
     public static Transform D_Operate3;
 
     public static List<int> IndexList = new List<int>();
+    public static List<int> FlowerIDListC = new List<int>();
     public static List<Drop> DropList = new List<Drop>();
     public static List<Flower> OpList = new List<Flower>();
     public static List<Flower> IdleList = new List<Flower>();
     public static List<Flower> FadeList = new List<Flower>();
-    public static List<Flower> FlowerListC = new List<Flower>();
     public static Dictionary<int, Flower> FlowerDic = new Dictionary<int, Flower>();
 
-    public static int FlowerID;
     public static int MiniGameIndex;
     public static string ScoreLab;
 
@@ -737,6 +736,8 @@ public class ManaMiniGame : Regist
             GameThreadA();
 
             GameThreadB();
+
+            GameThreadC();
         }
 
         if (Prepare)
@@ -748,7 +749,7 @@ public class ManaMiniGame : Regist
 
     private void GameThreadA()
     {
-        if (GameB)
+        if (!GameA)
         {
             return;
         }
@@ -791,7 +792,7 @@ public class ManaMiniGame : Regist
 
     private void GameThreadB()
     {
-        if (GameA)
+        if (!GameB)
         {
             return;
         }
@@ -830,6 +831,35 @@ public class ManaMiniGame : Regist
         BonusThread();
     }
 
+    private void GameThreadC()
+    {
+        if (!GameC)
+        {
+            return;
+        }
+
+        GameTimer += Time.fixedDeltaTime;
+
+        if (GameTimer >= GameTime)
+        {
+            GameOver();
+
+            return;
+        }
+
+        if (Panalty)
+        {
+            PanaltyTimer -= Time.fixedDeltaTime;
+
+            if (PanaltyTimer <= 0)
+            {
+                Panalty = false;
+            }
+        }
+
+        BonusThread();
+    }
+
     private void BonusThread()
     {
         GoldTimer -= Time.fixedDeltaTime;
@@ -894,7 +924,46 @@ public class ManaMiniGame : Regist
     }
 
 
-    public static void Operate(int index, int slotIndex)
+    public static void OperateC(int id, int btnIndex)
+    {
+        if (!Game)
+        {
+            return;
+        }
+
+        if (Panalty)
+        {
+            return;
+        }
+
+        if (FlowerIDListC[0] == id)
+        {
+            Flower flower = IdleList.Find(tempFlower => { return tempFlower.ID == id; });
+
+            ManaReso.GetHudText("+50", Color.white, 90, flower.ChildDic["ScorePosTra"], ManaReso.Get("D_HudParent"), true);
+
+            Score += 50;
+
+            flower.PlayParticle();
+
+            ManaAudio.PlayClip(Clip.BtnClip);
+
+            RoundEndC();
+        }
+        else
+        {
+            Panalty = true;
+            PanaltyTimer = PanaltyTime;
+
+            ManaReso.Get("D_FlowerIcon" + btnIndex).TweenForGra();
+
+            ManaReso.Get("D_FlowerBtn" + btnIndex).Shake(0.5f, 3, new Vector3(20f, 0, 0), Curve.EaseOutQuad);
+
+            ManaAudio.PlayClip(Clip.ErrorClip);
+        }
+    }
+
+    public static void OperateB(int index, int slotIndex)
     {
         if (Panalty || !FadeList.Valid())
         {
@@ -961,7 +1030,7 @@ public class ManaMiniGame : Regist
         }
     }
 
-    public static void Operate(OpType opType)
+    public static void OperateA(OpType opType)
     {
         if (Panalty || !OpList.Valid())
         {
@@ -1342,7 +1411,7 @@ public class ManaMiniGame : Regist
 
             idList = new List<int>() {1, 2, 3, 4, 5, 6, 7, 8, 9};
 
-            int special = idList.Random(true);
+            int special = idList.Random(1, true, true)[0];
 
             Flower flower = ManaReso.GetFlower(ManaGarden.FlowerInfoDic[Award.FlowerID], ManaReso.Get("SlotMini" + special));
 
@@ -1422,7 +1491,7 @@ public class ManaMiniGame : Regist
         }
         else
         {
-            int special = idList.Random(true);
+            int special = idList.Random(1, true, true)[0];
 
             flower = ManaReso.GetFlower(ManaGarden.FlowerInfoDic[Award.FlowerID], ManaReso.Get("SlotMini" + special));
 
@@ -1463,41 +1532,17 @@ public class ManaMiniGame : Regist
         ManaReso.SetActive("D_Begin", true);
         ManaReso.SetActive("D_DescB", true);
 
+        ManaReso.SetActive("D_FlowerBtn7", false);
+        ManaReso.SetActive("D_FlowerBtn8", false);
+        ManaReso.SetActive("D_FlowerBtn9", false);
+
         D_Begin.SetParent(D_Operate3);
         D_Timer.SetParent(D_Status3);
         D_Grid.SetParent(D_Status3);
 
         PrepareLab.SetParent(ManaReso.Get("D_PrepareLayout3"));
 
-
-        FlowerListC = new List<Flower>();
-
-        List<int> slotList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-
-        FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic.Random(false, flowerIndo => { return flowerIndo.Unlock; });
-
-        FlowerID = flowerInfo.ID_;
-
-        FlowerListC.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + slotList.Random(true))));
-
-        while (slotList.Count > 0)
-        {
-            flowerInfo = ManaGarden.FlowerInfoDic.Random(false, flowerIndo => { return flowerIndo.Unlock; });
-
-            for (int i = 0; i < Mathf.Min(Random.Range(2, 9), slotList.Count); i++)
-            {
-                FlowerListC.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + slotList.Random(true))));
-            }
-        }
-
-
-        for (int i = 0; i < FlowerListC.Count; i++)
-        {
-            FlowerListC[i].FlowerIcon.CreateTweenSr(1, 0, 0.25f, true, false, Curve.EaseOutQuad, false, true);
-
-            FlowerListC[i].FlowerIcon.GetTweenSr().InDestination = true;
-        }
+        RoundResetC(true);
     }
 
     public static void GameBegin()
@@ -1530,7 +1575,7 @@ public class ManaMiniGame : Regist
 
         if (GameC)
         {
-            RoundBeginC();
+            RoundBeginC(true);
         }
 
         if (Random.Range(5, 9) <= MiniGameIndex)
@@ -1618,7 +1663,7 @@ public class ManaMiniGame : Regist
 
         for (int i = 0; i < randomList.Count; i++)
         {
-            IndexList.Add(randomList.Random(true));
+            IndexList.Add(randomList.Random(1, true, true)[0]);
 
             i--;
         }
@@ -1639,23 +1684,132 @@ public class ManaMiniGame : Regist
 
     public static void RoundEndC()
     {
-        
+        for (int i = 0; i < IdleList.Count; i++)
+        {
+            IdleList[i].FlowerIcon.TweenForSr();
+        }
+
+        ManaReso.Get("D_FlowerBtn7").TweenBacCG();
+        ManaReso.Get("D_FlowerBtn8").TweenBacCG();
+        ManaReso.Get("D_FlowerBtn9").TweenBacCG();
+
+        Auxiliary.Instance.DelayCall
+        (
+            () =>
+            {
+                if (Game)
+                {
+                    RoundResetC();
+
+                    RoundBeginC();
+                }
+            },
+            1.5f
+        );
     }
 
-    public static void RoundResetC()
+    public static void RoundResetC(bool firstRound = false)
     {
+        ExtList.ForEach(IdleList, flower => { flower.Retrieve(); });
+
+        IdleList = new List<Flower>();
+
+        FlowerIDListC = new List<int>();
 
+        List<int> slotList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+
+
+        FlowerInfo flowerInfo;
+
+        if (firstRound && !Award.FlowerLock)
+        {
+            flowerInfo = ManaGarden.FlowerInfoDic[Award.FlowerID];
+        }
+        else
+        {
+            flowerInfo = ManaGarden.FlowerInfoDic.Random(false, flowerIndo => { return flowerIndo.Unlock; });
+        }
+
+        FlowerIDListC.Add(flowerInfo.ID_);
+
+        IdleList.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + slotList.Random(1, true, true)[0])));
+
+        while (slotList.Count > 0)
+        {
+            flowerInfo = ManaGarden.FlowerInfoDic.Random(false, info => { return info.Unlock && info.ID_ != FlowerIDListC[0]; });
+
+            if (slotList.Count == 1)
+            {
+                if (!FlowerIDListC.Contains(flowerInfo.ID_))
+                {
+                    continue;
+                }
+            }
+            else
+            {
+                FlowerIDListC.UniqueAdd(flowerInfo.ID_);
+            }
+
+            int amt = Mathf.Min(Random.Range(2, 9), slotList.Count);
+
+            for (int i = 0; i < amt; i++)
+            {
+                IdleList.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + slotList.Random(1, true, true)[0])));
+            }
+        }
+
+        for (int i = 0; i < IdleList.Count; i++)
+        {
+            IdleList[i].FlowerIcon.CreateTweenSr(1, 0, 0.25f, true, false, Curve.EaseOutQuad, false, true);
+
+            IdleList[i].FlowerIcon.GetTweenSr().InDestination = true;
+        }
+
+
+        List<int> idList = new List<int>()
+        {
+            FlowerIDListC[0],
+        };
+
+        if (FlowerIDListC.Count == 2)
+        {
+            idList.Add(FlowerIDListC[1]);
+            idList.Add(FlowerIDListC[1]);
+        }
+        else if (FlowerIDListC.Count > 2)
+        {
+            idList.AddRange(FlowerIDListC.Random(2, true, false, id => { return id != idList[0]; }));
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        idList = idList.Disturb();
+
+        ManaReso.SetSprite("D_FlowerIcon7", ManaGarden.FlowerInfoDic[idList[0]].Icon).Resize(true, 1f, 1f);
+        ManaReso.SetSprite("D_FlowerIcon8", ManaGarden.FlowerInfoDic[idList[1]].Icon).Resize(true, 1f, 1f);
+        ManaReso.SetSprite("D_FlowerIcon9", ManaGarden.FlowerInfoDic[idList[2]].Icon).Resize(true, 1f, 1f);
+
+        ManaReso.SetButtonEvent("D_FlowerBtn7", () => { OperateC(idList[0], 7); });
+        ManaReso.SetButtonEvent("D_FlowerBtn8", () => { OperateC(idList[1], 8); });
+        ManaReso.SetButtonEvent("D_FlowerBtn9", () => { OperateC(idList[2], 9); });
     }
 
-    public static void RoundBeginC()
+    public static void RoundBeginC(bool firstRound = false)
     {
+        if (firstRound && !Award.FlowerLock)
+        {
+            IdleList[0].NewFlowerEffect.SetActive(true);
+        }
+
         ManaReso.Get("D_FlowerBtn7").TweenReForCG();
         ManaReso.Get("D_FlowerBtn8").TweenReForCG();
         ManaReso.Get("D_FlowerBtn9").TweenReForCG();
 
-        for (int i = 0; i < FlowerListC.Count; i++)
+        for (int i = 0; i < IdleList.Count; i++)
         {
-            FlowerListC[i].FlowerIcon.TweenBacSr();
+            IdleList[i].FlowerIcon.TweenBacSr();
         }
     }
 
@@ -1706,11 +1860,4 @@ public class ManaMiniGame : Regist
             }
         }
     }
-}
-
-
-#region DebugList
-
-//结束界面的图标能否重复显示
-
-#endregion
+}

Assets/Script/Manage/ManaReso.cs

@@ -598,7 +598,7 @@ public class ManaReso : Regist
         Vector3 leftPos = Get("MiniLeft").position;
         Vector3 rightPos;
 
-        if (ManaMiniGame.GameA)
+        if (ManaMiniGame.GameA || ManaMiniGame.GameC)
         {
             rightPos = Get("MiniRight1").position;
         }

Assets/Script/Manage/ManaUI.cs

@@ -485,7 +485,7 @@ public class ManaUI : Regist
             "D_Rip2",
             () =>
             {
-                ManaMiniGame.Operate(OpType.Rip);
+                ManaMiniGame.OperateA(OpType.Rip);
             }
         );
 
@@ -585,7 +585,7 @@ public class ManaUI : Regist
             "D_Water2",
             () =>
             {
-                ManaMiniGame.Operate(OpType.Water);
+                ManaMiniGame.OperateA(OpType.Water);
             }
         );
 
@@ -606,7 +606,7 @@ public class ManaUI : Regist
 
             () =>
             {
-                ManaMiniGame.Operate(OpType.Fertilize);
+                ManaMiniGame.OperateA(OpType.Fertilize);
             }
         );
 
@@ -661,6 +661,8 @@ public class ManaUI : Regist
 
             ManaGarden.MiniLock = true;
 
+            #region GameA
+
             if (ManaMiniGame.GameA)
             {
                 for (int i = 0; i < ManaMiniGame.OpList.Count; i++)
@@ -669,8 +671,19 @@ public class ManaUI : Regist
 
                     ManaMiniGame.OpList.RemoveAt(i--);
                 }
+
+                for (int i = 0; i < ManaMiniGame.IdleList.Count; i++)
+                {
+                    ManaMiniGame.IdleList[i].Retrieve();
+
+                    ManaMiniGame.IdleList.RemoveAt(i--);
+                }
             }
 
+            #endregion
+
+            #region GameB
+
             if (ManaMiniGame.GameB)
             {
                 for (int i = 0; i < ManaMiniGame.FadeList.Count; i++)
@@ -681,14 +694,34 @@ public class ManaUI : Regist
 
                     ManaMiniGame.FadeList.RemoveAt(i--);
                 }
+
+                for (int i = 0; i < ManaMiniGame.IdleList.Count; i++)
+                {
+                    ManaMiniGame.IdleList[i].Retrieve();
+
+                    ManaMiniGame.IdleList.RemoveAt(i--);
+                }
             }
 
-            for (int i = 0; i < ManaMiniGame.IdleList.Count; i++)
+            #endregion
+
+            #region GameC
+
+            if (ManaMiniGame.GameC)
             {
-                ManaMiniGame.IdleList[i].Retrieve();
+                ManaMiniGame.IdleList.ForEach
+                (
+                    flower =>
+                    {
+                        flower.FlowerIcon.GetTweenSr().InOrigin = true;
 
-                ManaMiniGame.IdleList.RemoveAt(i--);
+                        flower.Retrieve();
+                    },
+                    true
+                );
             }
+
+            #endregion
         };
 
         #endregion
@@ -876,12 +909,12 @@ public class ManaUI : Regist
         };
 
 
-        ManaReso.AddButtonEvent("D_FlowerBtn1", () => { ManaMiniGame.Operate(1,1); });
-        ManaReso.AddButtonEvent("D_FlowerBtn2", () => { ManaMiniGame.Operate(2,2); });
-        ManaReso.AddButtonEvent("D_FlowerBtn3", () => { ManaMiniGame.Operate(3,4); });
-        ManaReso.AddButtonEvent("D_FlowerBtn4", () => { ManaMiniGame.Operate(4,5); });
-        ManaReso.AddButtonEvent("D_FlowerBtn5", () => { ManaMiniGame.Operate(5,7); });
-        ManaReso.AddButtonEvent("D_FlowerBtn6", () => { ManaMiniGame.Operate(6,8); });
+        ManaReso.AddButtonEvent("D_FlowerBtn1", () => { ManaMiniGame.OperateB(1,1); });
+        ManaReso.AddButtonEvent("D_FlowerBtn2", () => { ManaMiniGame.OperateB(2,2); });
+        ManaReso.AddButtonEvent("D_FlowerBtn3", () => { ManaMiniGame.OperateB(3,4); });
+        ManaReso.AddButtonEvent("D_FlowerBtn4", () => { ManaMiniGame.OperateB(4,5); });
+        ManaReso.AddButtonEvent("D_FlowerBtn5", () => { ManaMiniGame.OperateB(5,7); });
+        ManaReso.AddButtonEvent("D_FlowerBtn6", () => { ManaMiniGame.OperateB(6,8); });
 
         #endregion
 

Assets/Script/Manage/ManaVisit.cs

@@ -580,7 +580,7 @@ public class ManaVisit
 
             if (ManaGarden.PlantList.Count > 0)
             {
-                ManaGarden.PlantList.Random().Flower.Award = true;
+                ManaGarden.PlantList.Random()[0].Flower.Award = true;
             }
         }
 

Assets/Script/Object/Flower.cs

@@ -261,6 +261,7 @@ public class Flower : Regist, IPointerClickHandler
 
     public Transform GoldBk;
     public Transform GoldIcon;
+    public Transform NewFlowerEffect;
 
     public List<Transform> ElfList = new List<Transform>();
 
@@ -289,7 +290,7 @@ public class Flower : Regist, IPointerClickHandler
         OperateBk = ChildDic["OperateBk"].GetComponent<SpriteRenderer>();
         OperateIcon = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
         OperateOutline = ChildDic["OperateOutline1"].GetComponent<SpriteRenderer>();
-
+        NewFlowerEffect = ChildDic["NewFlowerEffect"];
 
         GoldBk.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
         GoldIcon.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
@@ -489,6 +490,8 @@ public class Flower : Regist, IPointerClickHandler
         FlowerInfo.ChildDic["UIFlash"].SetActive(false);
         FlowerInfo.ChildDic["UIParticle System"].SetActive(false);
 
+        NewFlowerEffect.SetActive(false);
+
         ManaReso.Save(this);
 
         RetrieveElf();

Assets/Script/Object/Skill/Ability.cs

@@ -322,7 +322,7 @@ public class Ability : SkillRoot
 
             ManaGarden.ElfTimer = Random.Range(5f, 30f);
 
-            Flower flower = ManaGarden.PlantList.Random().Flower;
+            Flower flower = ManaGarden.PlantList.Random()[0].Flower;
 
             flower.GetElf(ManaGarden.ElfList.Back(0), 0, 0, 0, 0);
 

Assets/Script/Tool/AtlasUtil/ExtList.cs

@@ -1,20 +1,12 @@
 using UnityEngine;
 using UnityEngine.Events;
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
 
 public static class ExtList
 {
-    public delegate float SumDelegate<T>(T t);
-
-    public delegate float MaxMinDelegate<T>(T t);
-
-    public delegate bool SortDelegate<T>(T t1, T t2);
-
-    public delegate bool RandomDelegate<T>(T t);
-
-
     public static T Prev<T>(this List<T> list, int index)
     {
         return list[(index + list.Count - 1) % list.Count];
@@ -50,17 +42,40 @@ public static class ExtList
         return t;
     }
 
-    public static T Random<T>(this List<T> list, bool remove = false, RandomDelegate<T> randomDelegate = null)
+    public static List<T> Random<T>(this List<T> list, int amt = 1, bool allDifferent = true, bool remove = false, Func<T,bool> func = null)
     {
-        while (true)
+        if (amt > list.Count && allDifferent)
+        {
+            throw new Exception();
+        }
+
+
+        int antiCrush = 0;
+
+        List<T> resultList = new List<T>();
+
+        while (resultList.Count < amt)
         {
+            if (antiCrush++ > 10000)
+            {
+                throw new Exception();
+            }
+
             int index = UnityEngine.Random.Range(0, list.Count);
 
             T result = list[index];
 
-            if (randomDelegate != null)
+            if (func != null)
             {
-                if (!randomDelegate(result))
+                if (!func(result))
+                {
+                    continue;
+                }
+            }
+
+            if (allDifferent)
+            {
+                if (resultList.Contains(result))
                 {
                     continue;
                 }
@@ -70,13 +85,34 @@ public static class ExtList
             {
                 list.RemoveAt(index);
 
-                return result;
+                resultList.Add(result);
             }
             else
             {
-                return result;
+                resultList.Add(result);
             }
         }
+
+        return resultList;
+    }
+
+    public static List<T> Disturb<T>(this List<T> list)
+    {
+        int antiCrush = 0;
+
+        List<T> resultList = new List<T>();
+
+        while (list.Count > 0)
+        {
+            if (antiCrush++ > 10000)
+            {
+                throw new Exception();
+            }
+
+            resultList.Add(list.Random(1, true, true)[0]);
+        }
+
+        return resultList;
     }
 
 
@@ -107,13 +143,26 @@ public static class ExtList
     }
 
 
+    public static void ForEach<T>(this List<T> list, Action<T> action, bool remove = false)
+    {
+        for (int i = 0; i < list.Count; i++)
+        {
+            action(list[i]);
+
+            if (remove)
+            {
+                list.RemoveAt(i--);
+            }
+        }
+    }
+
     public static void BackRemoveAt<T>(this List<T> list, int index)
     {
         list.RemoveAt(list.Count - 1 - index);
     }
 
 
-    public static void MySort<T>(this List<T> list, SortDelegate<T> sortDelegate)
+    public static void MySort<T>(this List<T> list, Func<T, T, bool> func)
     {
         bool finish = false;
 
@@ -123,7 +172,7 @@ public static class ExtList
 
             for (int j = 0; j < list.Count - i - 1; j++)
             {
-                if (sortDelegate(list[j], list[j + 1]))
+                if (func(list[j], list[j + 1]))
                 {
                     finish = false;
 
@@ -141,43 +190,43 @@ public static class ExtList
         }
     }
 
-    public static float MyMin<T>(this List<T> list, MaxMinDelegate<T> maxMinDelegate)
+    public static float MyMin<T>(this List<T> list, Func<T, float> func)
     {
-        float result = maxMinDelegate(list[0]);
+        float result = func(list[0]);
 
         for (int i = 1; i < list.Count; i++)
         {
-            if (result > maxMinDelegate(list[i]))
+            if (result > func(list[i]))
             {
-                result = maxMinDelegate(list[i]);
+                result = func(list[i]);
             }
         }
 
         return result;
     }
 
-    public static float MyMax<T>(this List<T> list, MaxMinDelegate<T> maxMinDelegate)
+    public static float MyMax<T>(this List<T> list, Func<T, float> func)
     {
-        float result = maxMinDelegate(list[0]);
+        float result = func(list[0]);
 
         for (int i = 1; i < list.Count; i++)
         {
-            if (result < maxMinDelegate(list[i]))
+            if (result < func(list[i]))
             {
-                result = maxMinDelegate(list[i]);
+                result = func(list[i]);
             }
         }
 
         return result;
     }
 
-    public static float MySum<T>(this List<T> list, SumDelegate<T> sumDelegate)
+    public static float MySum<T>(this List<T> list, Func<T,float> func)
     {
         float result = 0;
-
+        
         for (int i = 0; i < list.Count; i++)
         {
-            result += sumDelegate(list[i]);
+            result += func(list[i]);
         }
 
         return result;

ToList.txt

@@ -4,13 +4,11 @@
 
 小游戏C的语言（D_D_Operate3）
 
-小游戏C结束时要把花的SR透明度还原 把操作按钮Deactive掉
-
-按钮的事件与动画
-
 测试进游戏的概率
 
-新花特效
+粒子特效的透明度变化
+
+新花特效(3个游戏中的播放与停止播放 Retrieve的时候自动停止)
 
 测试访问时的新精灵