Merge branch 'master' of http://git.dashgame.com/gsgundam/garden_client into Stage2

# Conflicts:
#	Assets/Script/Manage/ManaUI.cs

Assets/Resource/Sprite/Garden/蜜蜂技能效果.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: tvOS
     maxTextureSize: 2048
     textureFormat: -1

Assets/Resource/Sprite/Garden/蜜蜂技能效果2.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 2048
     textureFormat: -1

Assets/Resource/Sprite/Garden/蜜蜂技能效果3.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 2048
     textureFormat: -1

Assets/Resource/Sprite/Garden/蜜蜂技能效果4.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 2048
     textureFormat: -1

Assets/Resource/Sprite/Garden/蜜蜂技能效果5.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 2048
     textureFormat: -1

Assets/Resource/Sprite/SpriteUI/商店按钮.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 128
     textureFormat: 47

Assets/Resource/Sprite/SpriteUI/按钮正常花.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 128
     textureFormat: 47

Assets/Resource/Sprite/SpriteUI/特殊花朵.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 128
     textureFormat: 47

Assets/Resource/Sprite/SpriteUI/精灵按钮.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 128
     textureFormat: 47

Assets/Resource/Sprite/SpriteUI/花园按钮.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 128
     textureFormat: 47

Assets/Resource/Sprite/SpriteUI/魔法按钮.png.meta

@@ -68,12 +68,12 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 128
     textureFormat: 47

Assets/Resource/XML/Config/achieve_config.xml

@@ -3,26 +3,26 @@
   <item id="2" index="1" name="美丽花园-2" desc="花园等级达到 50" type="1" value="30" parent="1" del="1" diamond_once="20" coin_person="" person="" icon="红-公园" />
   <item id="3" index="1" name="美丽花园-3" desc="花园等级达到 100" type="1" value="50" parent="2" del="1" diamond_once="35" coin_person="" person="" icon="红-公园" />
   <item id="4" index="1" name="美丽花园-4" desc="花园等级达到 200" type="1" value="100" parent="3" del="1" diamond_once="50" coin_person="" person="" icon="红-公园" />
-  <item id="5" index="1" name="美丽花园-5" desc="花园等级达到 300" type="1" value="200" parent="4" del="1" diamond_once="65" coin_person="" person="" icon="红-公园" />
-  <item id="6" index="1" name="美丽花园-6" desc="花园等级达到 400" type="1" value="300" parent="5" del="0" diamond_once="80" coin_person="" person="" icon="红-公园" />
+  <item id="5" index="1" name="美丽花园-5" desc="花园等级达到 300" type="1" value="250" parent="4" del="1" diamond_once="65" coin_person="" person="" icon="红-公园" />
+  <item id="6" index="1" name="美丽花园-6" desc="花园等级达到 400" type="1" value="400" parent="5" del="0" diamond_once="80" coin_person="" person="" icon="红-公园" />
   <item id="21" index="2" name="鼓鼓的钱包-1" desc="拥有1000金币" type="2" value="3000" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-免费金币" />
-  <item id="22" index="2" name="鼓鼓的钱包-2" desc="拥有2000金币" type="2" value="10000" parent="21" del="1" diamond_once="15" coin_person="" person="" icon="绿-免费金币" />
-  <item id="23" index="2" name="鼓鼓的钱包-3" desc="拥有3000金币" type="2" value="50000" parent="22" del="1" diamond_once="20" coin_person="" person="" icon="绿-免费金币" />
-  <item id="24" index="2" name="鼓鼓的钱包-4" desc="拥有5000金币" type="2" value="150000" parent="23" del="1" diamond_once="25" coin_person="" person="" icon="绿-免费金币" />
-  <item id="25" index="2" name="鼓鼓的钱包-5" desc="拥有8000金币" type="2" value="450000" parent="24" del="1" diamond_once="40" coin_person="" person="" icon="绿-免费金币" />
-  <item id="26" index="2" name="鼓鼓的钱包-6" desc="拥有10000金币" type="2" value="1000000" parent="25" del="0" diamond_once="50" coin_person="" person="" icon="绿-免费金币" />
+  <item id="22" index="2" name="鼓鼓的钱包-2" desc="拥有2000金币" type="2" value="50000" parent="21" del="1" diamond_once="15" coin_person="" person="" icon="绿-免费金币" />
+  <item id="23" index="2" name="鼓鼓的钱包-3" desc="拥有3000金币" type="2" value="150000" parent="22" del="1" diamond_once="20" coin_person="" person="" icon="绿-免费金币" />
+  <item id="24" index="2" name="鼓鼓的钱包-4" desc="拥有5000金币" type="2" value="500000" parent="23" del="1" diamond_once="25" coin_person="" person="" icon="绿-免费金币" />
+  <item id="25" index="2" name="鼓鼓的钱包-5" desc="拥有8000金币" type="2" value="1000000" parent="24" del="1" diamond_once="40" coin_person="" person="" icon="绿-免费金币" />
+  <item id="26" index="2" name="鼓鼓的钱包-6" desc="拥有10000金币" type="2" value="5000000" parent="25" del="0" diamond_once="50" coin_person="" person="" icon="绿-免费金币" />
   <item id="41" index="3" name="精明的商人-1" desc="总共获取3000金币" type="3" value="10000" parent="" del="1" diamond_once="15" coin_person="" person="" icon="4大技能2" />
-  <item id="42" index="3" name="精明的商人-2" desc="总共获取8000金币" type="3" value="100000" parent="41" del="1" diamond_once="20" coin_person="" person="" icon="4大技能2" />
-  <item id="43" index="3" name="精明的商人-3" desc="总共获取15000金币" type="3" value="500000" parent="42" del="1" diamond_once="35" coin_person="" person="" icon="4大技能2" />
-  <item id="44" index="3" name="精明的商人-4" desc="总共获取30000金币" type="3" value="2000000" parent="43" del="1" diamond_once="50" coin_person="" person="" icon="4大技能2" />
-  <item id="45" index="3" name="精明的商人-5" desc="总共获取50000金币" type="3" value="5000000" parent="44" del="1" diamond_once="65" coin_person="" person="" icon="4大技能2" />
-  <item id="46" index="3" name="精明的商人-6" desc="总共获取80000金币" type="3" value="10000000" parent="45" del="0" diamond_once="80" coin_person="" person="" icon="4大技能2" />
+  <item id="42" index="3" name="精明的商人-2" desc="总共获取8000金币" type="3" value="1000000" parent="41" del="1" diamond_once="20" coin_person="" person="" icon="4大技能2" />
+  <item id="43" index="3" name="精明的商人-3" desc="总共获取15000金币" type="3" value="10000000" parent="42" del="1" diamond_once="35" coin_person="" person="" icon="4大技能2" />
+  <item id="44" index="3" name="精明的商人-4" desc="总共获取30000金币" type="3" value="500000000" parent="43" del="1" diamond_once="50" coin_person="" person="" icon="4大技能2" />
+  <item id="45" index="3" name="精明的商人-5" desc="总共获取50000金币" type="3" value="10000000000" parent="44" del="1" diamond_once="65" coin_person="" person="" icon="4大技能2" />
+  <item id="46" index="3" name="精明的商人-6" desc="总共获取80000金币" type="3" value="500000000000" parent="45" del="0" diamond_once="80" coin_person="" person="" icon="4大技能2" />
   <item id="61" index="4" name="花仙子-1" desc="所有精灵等级总和达到10级" type="4" value="10" parent="" del="1" diamond_once="15" coin_person="" person="" icon="蓝-高级包" />
   <item id="62" index="4" name="花仙子-2" desc="所有精灵等级总和达到50级" type="4" value="30" parent="61" del="1" diamond_once="20" coin_person="" person="" icon="蓝-高级包" />
   <item id="63" index="4" name="花仙子-3" desc="所有精灵等级总和达到100级" type="4" value="50" parent="62" del="1" diamond_once="35" coin_person="" person="" icon="蓝-高级包" />
   <item id="64" index="4" name="花仙子-4" desc="所有精灵等级总和达到180级" type="4" value="100" parent="63" del="1" diamond_once="50" coin_person="" person="" icon="蓝-高级包" />
-  <item id="65" index="4" name="花仙子-5" desc="所有精灵等级总和达到400级" type="4" value="150" parent="64" del="1" diamond_once="65" coin_person="" person="" icon="蓝-高级包" />
-  <item id="66" index="4" name="花仙子-6" desc="所有精灵等级总和达到800级" type="4" value="300" parent="65" del="0" diamond_once="80" coin_person="" person="" icon="蓝-高级包" />
+  <item id="65" index="4" name="花仙子-5" desc="所有精灵等级总和达到400级" type="4" value="300" parent="64" del="1" diamond_once="65" coin_person="" person="" icon="蓝-高级包" />
+  <item id="66" index="4" name="花仙子-6" desc="所有精灵等级总和达到800级" type="4" value="500" parent="65" del="0" diamond_once="80" coin_person="" person="" icon="蓝-高级包" />
   <item id="81" index="5" name="百花争艳-1" desc="花朵数量达到1" type="5" value="1" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="82" index="5" name="百花争艳-2" desc="花朵数量达到3" type="5" value="3" parent="81" del="1" diamond_once="15" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="83" index="5" name="百花争艳-3" desc="花朵数量达到5" type="5" value="5" parent="82" del="1" diamond_once="20" coin_person="" person="" icon="绿-繁花似锦" />
@@ -30,11 +30,11 @@
   <item id="85" index="5" name="百花争艳-5" desc="花朵数量达到20" type="5" value="20" parent="84" del="1" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="86" index="5" name="百花争艳-6" desc="花朵数量达到40" type="5" value="40" parent="85" del="0" diamond_once="50" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="101" index="6" name="人山人海-1" desc="参观人次总数达到500" type="6" value="1000" parent="" del="1" diamond_once="10" coin_person="" person="" icon="4大技能1" />
-  <item id="102" index="6" name="人山人海-2" desc="参观人次总数达到2000" type="6" value="10000" parent="101" del="1" diamond_once="15" coin_person="" person="" icon="4大技能1" />
-  <item id="103" index="6" name="人山人海-3" desc="参观人次总数达到10000" type="6" value="50000" parent="102" del="1" diamond_once="20" coin_person="" person="" icon="4大技能1" />
-  <item id="104" index="6" name="人山人海-4" desc="参观人次总数达到50000" type="6" value="150000" parent="103" del="1" diamond_once="25" coin_person="" person="" icon="4大技能1" />
-  <item id="105" index="6" name="人山人海-5" desc="参观人次总数达到150000" type="6" value="300000" parent="104" del="1" diamond_once="40" coin_person="" person="" icon="4大技能1" />
-  <item id="106" index="6" name="人山人海-6" desc="参观人次总数达到300000" type="6" value="800000" parent="105" del="0" diamond_once="50" coin_person="" person="" icon="4大技能1" />
+  <item id="102" index="6" name="人山人海-2" desc="参观人次总数达到2000" type="6" value="15000" parent="101" del="1" diamond_once="15" coin_person="" person="" icon="4大技能1" />
+  <item id="103" index="6" name="人山人海-3" desc="参观人次总数达到10000" type="6" value="500000" parent="102" del="1" diamond_once="20" coin_person="" person="" icon="4大技能1" />
+  <item id="104" index="6" name="人山人海-4" desc="参观人次总数达到50000" type="6" value="5000000" parent="103" del="1" diamond_once="25" coin_person="" person="" icon="4大技能1" />
+  <item id="105" index="6" name="人山人海-5" desc="参观人次总数达到150000" type="6" value="100000000" parent="104" del="1" diamond_once="40" coin_person="" person="" icon="4大技能1" />
+  <item id="106" index="6" name="人山人海-6" desc="参观人次总数达到300000" type="6" value="5000000000" parent="105" del="0" diamond_once="50" coin_person="" person="" icon="4大技能1" />
   <item id="121" index="7" name="技能大师-1" desc="使用技能5次" type="7" value="5" parent="" del="1" diamond_once="15" coin_person="" person="" icon="红-黄鹂鸟" />
   <item id="122" index="7" name="技能大师-2" desc="使用技能10次" type="7" value="30" parent="121" del="1" diamond_once="20" coin_person="" person="" icon="红-黄鹂鸟" />
   <item id="123" index="7" name="技能大师-3" desc="使用技能20次" type="7" value="80" parent="122" del="1" diamond_once="35" coin_person="" person="" icon="红-黄鹂鸟" />
@@ -72,7 +72,7 @@
   <item id="223" index="12" name="积少成多-3" desc="收集花园里的金币300次" type="12" value="450" parent="222" del="1" diamond_once="20" coin_person="" person="" icon="绿-金币包3" />
   <item id="224" index="12" name="积少成多-4" desc="收集花园里的金币600次" type="12" value="1000" parent="223" del="1" diamond_once="25" coin_person="" person="" icon="绿-金币包3" />
   <item id="225" index="12" name="积少成多-5" desc="收集花园里的金币1000次" type="12" value="2000" parent="224" del="1" diamond_once="40" coin_person="" person="" icon="绿-金币包3" />
-  <item id="226" index="12" name="积少成多-6" desc="收集花园里的金币2500次" type="12" value="3500" parent="225" del="0" diamond_once="50" coin_person="" person="" icon="绿-金币包3" />
+  <item id="226" index="12" name="积少成多-6" desc="收集花园里的金币2500次" type="12" value="5000" parent="225" del="0" diamond_once="50" coin_person="" person="" icon="绿-金币包3" />
   <comment>
     <id>
 

Assets/Resource/XML/Config/signin_config.xml

@@ -1,25 +1,25 @@
 <data>
   <item id="1" flower="" diamond="" coin="800" rate="1" />
-  <item id="2" flower="" diamond="" coin="1500" rate="1" />
+  <item id="2" flower="" diamond="10" coin="" rate="" />
   <item id="3" flower="" diamond="" coin="1800" rate="1" />
-  <item id="4" flower="" diamond="" coin="2000" rate="1" />
+  <item id="4" flower="" diamond="30" coin="" rate="" />
   <item id="5" flower="" diamond="" coin="2200" rate="1" />
   <item id="6" flower="" diamond="" coin="2500" rate="1" />
-  <item id="7" flower="" diamond="100" coin="" rate="" />
+  <item id="7" flower="" diamond="60" coin="" rate="" />
   <item id="8" flower="" diamond="" coin="2800" rate="1" />
-  <item id="9" flower="" diamond="" coin="3000" rate="1" />
+  <item id="9" flower="" diamond="30" coin="" rate="" />
   <item id="10" flower="" diamond="" coin="3500" rate="1" />
   <item id="11" flower="" diamond="" coin="4000" rate="1" />
-  <item id="12" flower="" diamond="" coin="4500" rate="1" />
+  <item id="12" flower="" diamond="50" coin="" rate="" />
   <item id="13" flower="" diamond="" coin="5000" rate="1" />
-  <item id="14" flower="" diamond="200" coin="" rate="" />
+  <item id="14" flower="" diamond="120" coin="" rate="" />
   <item id="15" flower="" diamond="" coin="5800" rate="1" />
-  <item id="16" flower="" diamond="" coin="6000" rate="1" />
+  <item id="16" flower="" diamond="60" coin="" rate="" />
   <item id="17" flower="" diamond="" coin="6500" rate="1" />
   <item id="18" flower="" diamond="" coin="7000" rate="1" />
-  <item id="19" flower="" diamond="" coin="7500" rate="1" />
+  <item id="19" flower="" diamond="120" coin="" rate="" />
   <item id="20" flower="" diamond="" coin="8000" rate="1" />
-  <item id="21" flower="21,22,23,24,25,26,27" diamond="400" coin="" rate="" />
+  <item id="21" flower="21,22,23,24,25,26,27" diamond="220" coin="" rate="" />
   <comment>
     <id>
 id

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -47,9 +47,10 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
-    <H_RetrieveLab desc=""><![CDATA[收回]]></H_RetrieveLab>
+    <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
+    <H_BtnLab2 desc=""><![CDATA[未解锁]]></H_BtnLab2>
     <Ba_Lab desc=""><![CDATA[离开期间获得]]></Ba_Lab>
-    <Ba_Lab2 desc=""><![CDATA[已达到最大离线收益]]></Ba_Lab2>
+    <Ba_Lab2 desc=""><![CDATA[已达到最大离线收益，记得多上线哦！]]></Ba_Lab2>
     <Ba_ConfirmLab desc=""><![CDATA[确定]]></Ba_ConfirmLab>
     <Bb_GetLab desc=""><![CDATA[收取]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[每日签到]]></Bb_Title>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -47,9 +47,10 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
-    <H_RetrieveLab desc=""><![CDATA[收回]]></H_RetrieveLab>
+    <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
+    <H_BtnLab2 desc=""><![CDATA[未解鎖]]></H_BtnLab2>
     <Ba_Lab desc=""><![CDATA[離開期間獲得]]></Ba_Lab>
-    <Ba_Lab2 desc=""><![CDATA[已達到最大離線收益]]></Ba_Lab2>
+    <Ba_Lab2 desc=""><![CDATA[已達到最大離線收益，記得多上線哦！]]></Ba_Lab2>
     <Ba_ConfirmLab desc=""><![CDATA[確定]]></Ba_ConfirmLab>
     <Bb_GetLab desc=""><![CDATA[收取]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[每日簽到]]></Bb_Title>

Assets/Resource/XML/lan/English.xml

@@ -47,9 +47,10 @@
     <G_SpecialLab desc=""><![CDATA[Special]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[Normal]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[Take all back]]></G_RetrieveLab>
-    <H_RetrieveLab desc=""><![CDATA[Take back]]></H_RetrieveLab>
+    <H_BtnLab1 desc=""><![CDATA[Take back]]></H_BtnLab1>
+    <H_BtnLab2 desc=""><![CDATA[Locked]]></H_BtnLab2>
     <Ba_Lab desc=""><![CDATA[During absence acquired ]]></Ba_Lab>
-    <Ba_Lab2 desc=""><![CDATA[Reach maximum offline income]]></Ba_Lab2>
+    <Ba_Lab2 desc=""><![CDATA[Offline reward max. Remember to play the game!]]></Ba_Lab2>
     <Ba_ConfirmLab desc=""><![CDATA[Get]]></Ba_ConfirmLab>
     <Bb_GetLab desc=""><![CDATA[Get]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[Sign In]]></Bb_Title>

Assets/Script/Manage/ManaGarden.cs

@@ -343,9 +343,11 @@ public class ManaGarden : Regist
 
         ManaReso.SetText("H_BtnLab", Language.GetStr("UI", "H_BtnLab1"));
 
+        ManaReso.Get<Image>("H_Btn").material = null;
+
         ManaReso.SetButtonEvent
         (
-            "H_Retrieve",
+            "H_Btn",
             () =>
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
@@ -357,6 +359,64 @@ public class ManaGarden : Regist
         );
     }
 
+    public static void ShowUnlockCard(FlowerInfo flowerInfo)
+    {
+        SeleInfo = flowerInfo;
+
+        ManaReso.Get("H_FlowerCard").TweenForCG();
+
+        ManaReso.SetText("H_Lab", flowerInfo.Name);
+
+
+        Image image = ManaReso.Get<Image>("H_Icon2");
+
+        image.material = Shortcut.GrayMat;
+
+        image.sprite = flowerInfo.Icon;
+
+        image.Resize(true, 0.75f, 0.75f);
+
+
+        if (flowerInfo.UnlockCur == Current.Free)
+        {
+            ManaReso.SetText("H_BtnLab", Language.GetStr("UI", "H_BtnLab2"));
+
+            ManaReso.Get<Image>("H_Btn").material = Shortcut.GrayMat;
+
+            ManaReso.SetButtonEvent
+                (
+                    "H_Btn",
+                    () =>
+                    {
+                        //ManaAudio.PlayClip(Clip.BtnClip);
+
+                        //ManaReso.Get("H_FlowerCard").TweenBacCG();
+
+                        //RetriveFlower();
+                    }
+                );
+        }
+        else
+        {
+            ManaReso.SetText("H_BtnLab", Auxiliary.ImageParse(flowerInfo.UnlockCur) + flowerInfo.UnlockAmt);
+
+            ManaReso.Get<Image>("H_Btn").material = null;
+
+            ManaReso.SetButtonEvent
+                (
+                    "H_Btn",
+                    () =>
+                    {
+                        //ManaAudio.PlayClip(Clip.BtnClip);
+
+                        //ManaReso.Get("H_FlowerCard").TweenBacCG();
+
+                        //RetriveFlower();
+                    }
+                );
+        }
+    }
+
 
     public static void RetriveFlower()
     {
@@ -383,36 +443,27 @@ public class ManaGarden : Regist
 
     public static void PlantFlower(FlowerInfo flowerInfo)
     {
-        if (flowerInfo.Plant)
-        {
-            ManaAudio.PlayClip(Clip.BtnClip);
+        Slot slot = null;
 
-            ShowRetrieveCard(flowerInfo);
-        }
-        else
+        for (int i = 0; i < SlotList.Count; i++)
         {
-            Slot slot = null;
-            
-            for (int i = 0; i < SlotList.Count; i++)
+            if (SlotList[i].Available)
             {
-                if (SlotList[i].Available)
-                {
-                    slot = SlotList[i];
+                slot = SlotList[i];
 
-                    break;
-                }
+                break;
             }
+        }
 
-            if (slot == null)
-            {
-                Bubble.Show(null, Language.GetStr("Common", "NoValidSlot"));
-            }
-            else
-            {
-                slot.Plant(flowerInfo, true);
+        if (slot == null)
+        {
+            Bubble.Show(null, Language.GetStr("Common", "NoValidSlot"));
+        }
+        else
+        {
+            slot.Plant(flowerInfo, true);
 
-                ManaAudio.PlayClip(Clip.FlowerClip);
-            }
+            ManaAudio.PlayClip(Clip.FlowerClip);
         }
     }
 }

Assets/Script/Object/Flower.cs

@@ -106,6 +106,9 @@ public class FlowerInfo
 
     public bool Special;
 
+    public int UnlockAmt;
+    public Current UnlockCur;
+
     public Slot Slot;
     public Text Text;
     public Image Image;
@@ -131,6 +134,8 @@ public class FlowerInfo
         ID_ = int.Parse(attribute[0].Value);
         Icon_ = attribute[5].Value;
 
+        UnlockCur = Auxiliary.CurrentParse(attribute[3].Value);
+        UnlockAmt = Auxiliary.IntParse(attribute[4].Value, 0);
 
         Image.sprite = Icon;
 
@@ -140,13 +145,20 @@ public class FlowerInfo
         (
             () =>
             {
-                if (Unlock)
+                if (Plant)
+                {
+                    ManaAudio.PlayClip(Clip.BtnClip);
+
+                    ManaGarden.ShowRetrieveCard(this);
+                }
+                else if (Unlock)
                 {
                     ManaGarden.PlantFlower(this);
                 }
                 else
                 {
-                    Toast.Show(1.5f, Name + " " + Language.GetStr("Common", "Unlock"));
+                    ManaGarden.ShowUnlockCard(this);
+                    //Toast.Show(1.5f, Name + " " + Language.GetStr("Common", "Unlock"));
                 }
             }
         );

Assets/Script/Object/Skill/Ability.cs

@@ -92,13 +92,13 @@ public class Ability : SkillRoot
             {
                 ItemBtn.interactable = true;
 
-                ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab1") + "\n" + ImageParse(UnlockCur) + Auxiliary.ShrinkNumberStr(UnlockAmt);
+                ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab1") + "\n" + Auxiliary.ImageParse(UnlockCur) + Auxiliary.ShrinkNumberStr(UnlockAmt);
             }
             else if (ItemStatus_ == SkillStatus.Upgrade)
             {
                 ItemBtn.interactable = true;
 
-                ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab2") + "\n" + ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab2") + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
             }
         }
     }
@@ -130,9 +130,9 @@ public class Ability : SkillRoot
         SkillTab = SkillClassParse(attribute[2].Value);
         UpgradeAmt = UpgradeAmtParse(attribute[15].Value);
         
-        UnlockCur = CurrentParse(attribute[11].Value);
-        UpgradeCur = CurrentParse(attribute[14].Value);
-        UnlockAheadCur = CurrentParse(attribute[8].Value);
+        UnlockCur = Auxiliary.CurrentParse(attribute[11].Value);
+        UpgradeCur = Auxiliary.CurrentParse(attribute[14].Value);
+        UnlockAheadCur = Auxiliary.CurrentParse(attribute[8].Value);
 
         ValueBuffParse(out Person, out PersonBuff, attribute[5].Value);
         ValueBuffParse(out SkillCD, out SkillCdBuff, attribute[6].Value);
@@ -428,7 +428,7 @@ public class Ability : SkillRoot
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
 
             ManaReso.SetButtonEvent
             (
@@ -446,7 +446,7 @@ public class Ability : SkillRoot
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab1"), ImageParse(UnlockCur), UnlockAmt.ToString("0")));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab1"), Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0")));
             
             ManaReso.SetButtonEvent
             (
@@ -464,7 +464,7 @@ public class Ability : SkillRoot
             ManaReso.SetText("Fe_Lab0", GetDescription(0));
             ManaReso.SetText("Fe_Lab1", GetDescription(1));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
 
             ManaReso.SetButtonEvent
             (
@@ -475,13 +475,13 @@ public class Ability : SkillRoot
 
                     ItemLab.text = GetDescription(0);
 
-                    ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab2") + "\n" + ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                    ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab2") + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
 
                     ManaReso.SetText("Fe_Tit", Name);
                     ManaReso.SetText("Fe_Lab0", GetDescription(0));
                     ManaReso.SetText("Fe_Lab1", GetDescription(1));
 
-                    ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+                    ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
                 }
             );
         }

Assets/Script/Object/Skill/BigSkill.cs

@@ -62,11 +62,11 @@ public class BigSkill : Skill
             }
             else if (ItemStatus_ == SkillStatus.UnLock)
             {
-                ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab1"), "\n", ImageParse(UnlockCur), UnlockAmt.ToString("0"));
+                ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab1"), "\n", Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0"));
             }
             else if (ItemStatus_ == SkillStatus.Upgrade)
             {
-                ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab2"), "\n", ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt));
+                ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab2"), "\n", Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt));
             }
         }
     }
@@ -515,7 +515,7 @@ public class BigSkill : Skill
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
 
             ManaReso.SetButtonEvent
             (
@@ -533,7 +533,7 @@ public class BigSkill : Skill
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab1"), ImageParse(UnlockCur), UnlockAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab1"), Auxiliary.ImageParse(UnlockCur), UnlockAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -551,7 +551,7 @@ public class BigSkill : Skill
             ManaReso.SetText("Fe_Lab0", GetDescription(0));
             ManaReso.SetText("Fe_Lab1", GetDescription(1));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
             
             ManaReso.SetButtonEvent
             (
@@ -562,13 +562,13 @@ public class BigSkill : Skill
 
                     ItemLab.text = GetDescription(0);
 
-                    ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab2") + "\n" + ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                    ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab2") + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
 
                     ManaReso.SetText("Fe_Tit", Name);
                     ManaReso.SetText("Fe_Lab0", GetDescription(0));
                     ManaReso.SetText("Fe_Lab1", GetDescription(1));
 
-                    ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+                    ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
                 }
             );
         }

Assets/Script/Object/Skill/Pack.cs

@@ -70,7 +70,7 @@ public class Pack : SkillRoot
 
                 SkillItem.SetActive(true);
 
-                ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab3"), "\n", ImageParse(BuyCur), UseAmt.ToString("0"));
+                ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
             }
             else if (ItemStatus_ == SkillStatus.Lock)
             {
@@ -98,7 +98,7 @@ public class Pack : SkillRoot
         ItemIndex = Auxiliary.IntParse(attribute[3].Value,0);
         DiamondOnce = Auxiliary.FloatParse(attribute[8].Value,0);
         
-        BuyCur = CurrentParse(attribute[11].Value);
+        BuyCur = Auxiliary.CurrentParse(attribute[11].Value);
         SkillTab = SkillClassParse(attribute[2].Value);
         MinUseLv = MinLevelParse(attribute[10].Value);
         MaxUseLv = MaxLevelParse(attribute[10].Value);
@@ -273,7 +273,7 @@ public class Pack : SkillRoot
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab3"), ImageParse(BuyCur), UseAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab3"), Auxiliary.ImageParse(BuyCur), UseAmt));
 
             ManaReso.SetButtonEvent
             (

Assets/Script/Object/Skill/Skill.cs

@@ -98,7 +98,7 @@ public class Skill : SkillRoot
                 }
                 else
                 {
-                    ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab3"), "\n", ImageParse(BuyCur), UseAmt.ToString("0"));
+                    ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
             }
             else if (ItemStatus_ == SkillStatus.Use)
@@ -152,10 +152,10 @@ public class Skill : SkillRoot
         CoolLock = Auxiliary.BoolParse(attribute[5].Value, false);
         UpgradeAmt = UpgradeAmtParse(attribute[23].Value);
         
-        BuyCur = CurrentParse(attribute[20].Value);
-        UnlockCur = CurrentParse(attribute[17].Value);
-        UpgradeCur = CurrentParse(attribute[22].Value);
-        UnlockAheadCur = CurrentParse(attribute[14].Value);
+        BuyCur = Auxiliary.CurrentParse(attribute[20].Value);
+        UnlockCur = Auxiliary.CurrentParse(attribute[17].Value);
+        UpgradeCur = Auxiliary.CurrentParse(attribute[22].Value);
+        UnlockAheadCur = Auxiliary.CurrentParse(attribute[14].Value);
         
         ValueBuffParse(out Person, out PersonBuff, attribute[7].Value);
         ValueBuffParse(out SkillCD, out SkillCdBuff, attribute[10].Value);
@@ -388,7 +388,7 @@ public class Skill : SkillRoot
                 ManaReso.SetText("Fe_Lab0", "");
                 ManaReso.SetText("Fe_Lab1", GetDescription(0));
 
-                ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab3"), ImageParse(BuyCur), UseAmt));
+                ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab3"), Auxiliary.ImageParse(BuyCur), UseAmt));
 
                 ManaReso.SetButtonEvent
                 (
@@ -414,7 +414,7 @@ public class Skill : SkillRoot
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
 
             ManaReso.SetButtonEvent
             (

Assets/Script/Object/Skill/SkillRoot.cs

@@ -221,63 +221,6 @@ public abstract class SkillRoot
 
     #region 解读器
 
-    protected string ImageParse(Current current)
-    {
-        if (current == Current.Coin)
-        {
-            return "<(金币)>";
-        }
-        else if (current == Current.Diamond)
-        {
-            return "<(钻石)>";
-        }
-        else if (current == Current.Cash)
-        {
-            return Language.GetStr("Common", "Cash");
-        }
-        else
-        {
-            throw new Exception(current.ToString());
-        }
-    }
-
-    protected Current CurrentParse(string str)
-    {
-        if (string.IsNullOrEmpty(str))
-        {
-            return Current.Free;
-        }
-        else
-        {
-            int number = int.Parse(str);
-
-            if (number == 1)
-            {
-                return Current.Coin;
-            }
-            else if (number == 2)
-            {
-                return Current.Diamond;
-            }
-            else if (number == 3)
-            {
-                return Current.Cash;
-            }
-            else if (number == 4)
-            {
-                return Current.Other;
-            }
-            else if (number == 5)
-            {
-                return Current.AD;
-            }
-            else
-            {
-                throw new Exception(number.ToString());
-            }
-        }
-    }
-
     protected SkillTab SkillClassParse(string str)
     {
         if (string.IsNullOrEmpty(str))

Assets/Script/Tool/Auxiliary.cs

@@ -113,7 +113,7 @@ public class Auxiliary : Regist
     {
         Instance = this;
 
-        gameObject.AddComponent<ManaAnim>().RegistImmed();
+        //gameObject.AddComponent<ManaAnim>().RegistImmed();
     }
 
     MaterialUnit materialUnit;
@@ -789,6 +789,64 @@ public class Auxiliary : Regist
     }
 
 
+    public static string ImageParse(Current current)
+    {
+        if (current == Current.Coin)
+        {
+            return "<(金币)>";
+        }
+        else if (current == Current.Diamond)
+        {
+            return "<(钻石)>";
+        }
+        else if (current == Current.Cash)
+        {
+            return Language.GetStr("Common", "Cash");
+        }
+        else
+        {
+            throw new Exception(current.ToString());
+        }
+    }
+
+    public static Current CurrentParse(string str)
+    {
+        if (string.IsNullOrEmpty(str))
+        {
+            return Current.Free;
+        }
+        else
+        {
+            int number = int.Parse(str);
+
+            if (number == 1)
+            {
+                return Current.Coin;
+            }
+            else if (number == 2)
+            {
+                return Current.Diamond;
+            }
+            else if (number == 3)
+            {
+                return Current.Cash;
+            }
+            else if (number == 4)
+            {
+                return Current.Other;
+            }
+            else if (number == 5)
+            {
+                return Current.AD;
+            }
+            else
+            {
+                throw new Exception(number.ToString());
+            }
+        }
+    }
+
+
     public static int IntParse(string str, int defaultValue)
     {
         if (string.IsNullOrEmpty(str))

Assets/Script/Tool/Bundle.cs

@@ -29,7 +29,7 @@ public class Bundle : MonoBehaviour
     public static AssetBundle Discard;
 
     public List<Object> UiList;
-    public List<Object> AtlasList;
+    public List<Sprite> AtlasList;
     public List<Sprite> Atlas2List;
     public List<Object> EffectList;
     public List<Object> AudioList;

ToList.txt

@@ -1,10 +1,8 @@
-从Gray卡到普通 从普通卡到Gray
+从Gray卡到普通 从普通卡到Gray 点击按钮后要停止播放粒子特效
 
 
 分享appid申请
 
-debugmode中的图集
-
 VerticalBestfit计算次数太多时性能低
 
 
@@ -18,11 +16,11 @@ VerticalBestfit
 
 //注意存档覆盖情况
 
-打包时重新导入配置
+//打包时重新导入配置
 
-打包时重新导入Bundle
+//打包时重新导入Bundle
 
-先开启Service再打包
+//先开启Service再打包
 
 //更新版本号