合并分支

Assets/Resource/XML/Config/achieve_config.xml

@@ -79,12 +79,12 @@
   <item id="244" index="13" name="花费的钻石-4" desc="" type="13" value="10000" parent="243" del="1" diamond_once="25" coin_person="" person="" icon="蓝-大量钻石" />
   <item id="245" index="13" name="花费的钻石-5" desc="" type="13" value="50000" parent="244" del="1" diamond_once="40" coin_person="" person="" icon="蓝-大量钻石" />
   <item id="246" index="13" name="花费的钻石-6" desc="" type="13" value="500000" parent="245" del="0" diamond_once="50" coin_person="" person="" icon="蓝-大量钻石" />
-  <item id="261" index="14" name="拥有的服装-1" desc="" type="14" value="6" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="262" index="14" name="拥有的服装-2" desc="" type="14" value="9" parent="261" del="1" diamond_once="15" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="263" index="14" name="拥有的服装-3" desc="" type="14" value="15" parent="262" del="1" diamond_once="20" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="264" index="14" name="拥有的服装-4" desc="" type="14" value="30" parent="263" del="1" diamond_once="25" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="265" index="14" name="拥有的服装-5" desc="" type="14" value="60" parent="264" del="1" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="266" index="14" name="拥有的服装-6" desc="" type="14" value="100" parent="265" del="0" diamond_once="50" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="261" index="14" name="拥有的服装-1" desc="" type="14" value="9" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="262" index="14" name="拥有的服装-2" desc="" type="14" value="15" parent="261" del="1" diamond_once="15" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="263" index="14" name="拥有的服装-3" desc="" type="14" value="30" parent="262" del="1" diamond_once="20" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="264" index="14" name="拥有的服装-4" desc="" type="14" value="60" parent="263" del="1" diamond_once="25" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="265" index="14" name="拥有的服装-5" desc="" type="14" value="90" parent="264" del="1" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="266" index="14" name="拥有的服装-6" desc="" type="14" value="120" parent="265" del="0" diamond_once="50" coin_person="" person="" icon="绿-繁花似锦" />
   <comment>
     <id>
 

Assets/Resource/XML/Config/iap_config.xml

@@ -7,6 +7,7 @@
   <item id="6" item_id="com.dashgame.garden.diamond2000" price="68" reward="pack,9" desc="钻石2000 赠送500" skill_id="Pack9" />
   <item id="7" item_id="com.dashgame.garden.diamond6000" price="128" reward="pack,10" desc="钻石6000 赠送600" skill_id="Pack10" />
   <item id="8" item_id="com.dashgame.garden.diamond10000" price="328" reward="pack,11" desc="钻石10000 赠送2000" skill_id="Pack11" />
+  <item id="9" item_id="com.dashgame.garden.packone" price="1" reward="pack,12" desc="一元畅玩包" skill_id="Pack12" />
   <comment>
     <id>
 编号

Assets/Resource/XML/Config/pack_config.xml

@@ -2,14 +2,15 @@
   <item id="1" name="金币大礼包" class="3" class_id="2" coin_person="" person="" skill_cd="" coin="9000*c" diamond="" flower="" use_lv="" use_cur="2" use_amnt="200" desc="立即获得金币 [&amp;coin&amp;]" icon="绿-金币包1" anim="" label="" lock="" />
   <item id="2" name="天赐大礼包" class="3" class_id="3" coin_person="" person="" skill_cd="" coin="36000*c" diamond="" flower="" use_lv="" use_cur="2" use_amnt="400" desc="立即获得金币 [&amp;coin&amp;]" icon="绿-金币包2" anim="" label="" lock="" />
   <item id="3" name="花神大礼包" class="3" class_id="4" coin_person="" person="" skill_cd="" coin="90000*c" diamond="" flower="" use_lv="" use_cur="2" use_amnt="800" desc="立即获得金币 [&amp;coin&amp;]" icon="绿-金币包3" anim="" label="" lock="" />
-  <item id="4" name="新手礼包" class="4" class_id="2" coin_person="5%" person="" skill_cd="" coin="" diamond="150" flower="25" use_lv="" use_cur="3" use_amnt="6" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-初级包" anim="" label="" lock="1" />
-  <item id="5" name="中级礼包" class="4" class_id="3" coin_person="5%" person="" skill_cd="" coin="" diamond="500" flower="26" use_lv="" use_cur="3" use_amnt="30" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-中级包" anim="" label="" lock="1" />
-  <item id="6" name="高级礼包" class="4" class_id="4" coin_person="5%" person="" skill_cd="" coin="" diamond="2000" flower="27" use_lv="" use_cur="3" use_amnt="68" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-高级包" anim="" label="" lock="1" />
-  <item id="7" name="钻石100" class="4" class_id="5" coin_person="" person="" skill_cd="" coin="" diamond="100" flower="" use_lv="" use_cur="3" use_amnt="6" desc="购买 [&amp;diamond&amp;]钻石" icon="蓝-免费钻" anim="" label="" lock="" />
-  <item id="8" name="钻石500 赠送50" class="4" class_id="6" coin_person="" person="" skill_cd="" coin="" diamond="550" flower="" use_lv="" use_cur="3" use_amnt="30" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-免费钻" anim="" label="热卖" lock="" />
-  <item id="9" name="钻石2000 赠送500" class="4" class_id="7" coin_person="" person="" skill_cd="" coin="" diamond="2500" flower="" use_lv="" use_cur="3" use_amnt="68" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-小量钻石" anim="" label="超值" lock="" />
-  <item id="10" name="钻石6000 赠送600" class="4" class_id="8" coin_person="" person="" skill_cd="" coin="" diamond="6600" flower="" use_lv="" use_cur="3" use_amnt="128" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-中量钻石" anim="" label="" lock="" />
-  <item id="11" name="钻石10000 赠送2000" class="4" class_id="9" coin_person="" person="" skill_cd="" coin="" diamond="12000" flower="" use_lv="" use_cur="3" use_amnt="328" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-大量钻石" anim="" label="" lock="" />
+  <item id="4" name="新手礼包" class="4" class_id="3" coin_person="5%" person="" skill_cd="" coin="" diamond="150" flower="25" use_lv="" use_cur="3" use_amnt="6" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-初级包" anim="" label="" lock="1" />
+  <item id="5" name="中级礼包" class="4" class_id="4" coin_person="5%" person="" skill_cd="" coin="" diamond="500" flower="26" use_lv="" use_cur="3" use_amnt="30" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-中级包" anim="" label="" lock="1" />
+  <item id="6" name="高级礼包" class="4" class_id="5" coin_person="5%" person="" skill_cd="" coin="" diamond="2000" flower="27" use_lv="" use_cur="3" use_amnt="68" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-高级包" anim="" label="" lock="1" />
+  <item id="7" name="钻石100" class="4" class_id="6" coin_person="" person="" skill_cd="" coin="" diamond="100" flower="" use_lv="" use_cur="3" use_amnt="6" desc="购买 [&amp;diamond&amp;]钻石" icon="蓝-免费钻" anim="" label="" lock="" />
+  <item id="8" name="钻石500 赠送50" class="4" class_id="7" coin_person="" person="" skill_cd="" coin="" diamond="550" flower="" use_lv="" use_cur="3" use_amnt="30" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-免费钻" anim="" label="热卖" lock="" />
+  <item id="9" name="钻石2000 赠送500" class="4" class_id="8" coin_person="" person="" skill_cd="" coin="" diamond="2500" flower="" use_lv="" use_cur="3" use_amnt="68" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-小量钻石" anim="" label="超值" lock="" />
+  <item id="10" name="钻石6000 赠送600" class="4" class_id="9" coin_person="" person="" skill_cd="" coin="" diamond="6600" flower="" use_lv="" use_cur="3" use_amnt="128" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-中量钻石" anim="" label="" lock="" />
+  <item id="11" name="钻石10000 赠送2000" class="4" class_id="10" coin_person="" person="" skill_cd="" coin="" diamond="12000" flower="" use_lv="" use_cur="3" use_amnt="328" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-大量钻石" anim="" label="" lock="" />
+  <item id="12" name="一元畅玩包" class="4" class_id="2" coin_person="1%" person="" skill_cd="" coin="" diamond="100" flower="" use_lv="" use_cur="3" use_amnt="1" desc="获得[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-小量钻石" anim="" label="超值" lock="1" />
   <comment>
     <id>
 id

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="-7" />
+  <Version value="-8" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -56,6 +56,7 @@
     <Skill ID="Pack9" SkillType="Pack" ItemStatus="Lock" Level="0" />
     <Skill ID="Pack10" SkillType="Pack" ItemStatus="Lock" Level="0" />
     <Skill ID="Pack11" SkillType="Pack" ItemStatus="Lock" Level="0" />
+    <Skill ID="Pack12" SkillType="Pack" ItemStatus="Lock" Level="0" />
     
     <Skill ID="Ability1" SkillType="Ability" ItemStatus="Lock" Level="0" />
     <Skill ID="Ability2" SkillType="Ability" ItemStatus="Lock" Level="0" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -167,6 +167,7 @@
     <Pack9 desc=""><![CDATA[钻石2000 赠送500]]></Pack9>
     <Pack10 desc=""><![CDATA[钻石6000 赠送600]]></Pack10>
     <Pack11 desc=""><![CDATA[钻石10000 赠送2000]]></Pack11>
+    <Pack12 desc=""><![CDATA[一元畅玩包]]></Pack12>
     <Ability1 desc=""><![CDATA[花园]]></Ability1>
     <Ability2 desc=""><![CDATA[缤纷彩虹]]></Ability2>
     <Ability3 desc=""><![CDATA[玉树樱花]]></Ability3>
@@ -214,6 +215,7 @@
     <Pack9 desc=""><![CDATA[共计[&diamond&]钻石]]></Pack9>
     <Pack10 desc=""><![CDATA[共计[&diamond&]钻石]]></Pack10>
     <Pack11 desc=""><![CDATA[共计[&diamond&]钻石]]></Pack11>
+    <Pack12 desc=""><![CDATA[获得[&diamond&]钻石 所有金币产出提升[&coin_person&]，永久有效]]></Pack12>
     <Ability1 desc=""><![CDATA[每人次收入金币[&coin_person&][lv]，每分钟来访[&person&*60][lv]人]]></Ability1>
     <Ability2 desc=""><![CDATA[每分钟来访增加[&person&*60][lv]，永久有效]]></Ability2>
     <Ability3 desc=""><![CDATA[每人次收入提升[&coin_person&][lv]，永久有效]]></Ability3>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -167,6 +167,7 @@
     <Pack9 desc=""><![CDATA[鑽石2000 贈送500]]></Pack9>
     <Pack10 desc=""><![CDATA[鑽石6000 贈送600]]></Pack10>
     <Pack11 desc=""><![CDATA[鑽石10000 贈送2000]]></Pack11>
+    <Pack12 desc=""><![CDATA[一元暢玩包]]></Pack12>
     <Ability1 desc=""><![CDATA[花園]]></Ability1>
     <Ability2 desc=""><![CDATA[繽紛彩虹]]></Ability2>
     <Ability3 desc=""><![CDATA[玉樹櫻花]]></Ability3>
@@ -214,6 +215,7 @@
     <Pack9 desc=""><![CDATA[共計[&diamond&]鑽石]]></Pack9>
     <Pack10 desc=""><![CDATA[共計[&diamond&]鑽石]]></Pack10>
     <Pack11 desc=""><![CDATA[共計[&diamond&]鑽石]]></Pack11>
+    <Pack12 desc=""><![CDATA[獲得[&diamond&]鑽石 所有金幣產出提升[&coin_person&]，永久有效]]></Pack12>
     <Ability1 desc=""><![CDATA[每人次收入金幣[&coin_person&][lv]，每分鐘來訪[&person&*60][lv]人]]></Ability1>
     <Ability2 desc=""><![CDATA[每分鐘來訪增加[&person&*60][lv]，永久有效]]></Ability2>
     <Ability3 desc=""><![CDATA[每人次收入提升[&coin_person&][lv]，永久有效]]></Ability3>
@@ -260,7 +262,7 @@
     <Confirm desc=""><![CDATA[確定]]></Confirm>
     <Cancel desc=""><![CDATA[取消]]></Cancel>
     <AD desc=""><![CDATA[觀看]]></AD>
-    <Cash desc=""><![CDATA[$]]></Cash>
+    <Cash desc=""><![CDATA[CNY]]></Cash>
     <Person desc=""><![CDATA[參觀人次]]></Person>
     <CoinPerson desc=""><![CDATA[每人次金幣]]></CoinPerson>
     <Buff desc=""><![CDATA[(加成中)]]></Buff>

Assets/Resource/XML/lan/English.xml

@@ -114,8 +114,8 @@ Program 水怪
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[Go to your dress room!]]></N_Lab>
     <I_Lab desc=""><![CDATA[Loading]]></I_Lab>
-    <热卖 desc=""><![CDATA[Hot]]></热卖>
-    <超值 desc=""><![CDATA[Bargain]]></超值>
+    <热卖 desc=""><![CDATA[Most Popular]]></热卖>
+    <超值 desc=""><![CDATA[Highest Value]]></超值>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>
@@ -167,6 +167,7 @@ Program 水怪
     <Pack9 desc=""><![CDATA[2000 Diamonds(gains 500 more)]]></Pack9>
     <Pack10 desc=""><![CDATA[6000 Diamonds(gains 600 more)]]></Pack10>
     <Pack11 desc=""><![CDATA[10000 Diamonds(gains 2000 more)]]></Pack11>
+    <Pack12 desc=""><![CDATA[]]></Pack12>
     <Ability1 desc=""><![CDATA[Garden]]></Ability1>
     <Ability2 desc=""><![CDATA[Rainbow]]></Ability2>
     <Ability3 desc=""><![CDATA[Cherry Blossoms]]></Ability3>
@@ -214,6 +215,8 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Pack9 desc=""><![CDATA[Buy [&diamond&] Diamonds]]></Pack9>
     <Pack10 desc=""><![CDATA[Buy [&diamond&] Diamonds]]></Pack10>
     <Pack11 desc=""><![CDATA[Buy [&diamond&] Diamonds]]></Pack11>
+    <Pack12 desc=""><![CDATA[Get [&diamond&] Diamonds
+Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Ability1 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket，[&person&*60][lv] Visitors per minute]]></Ability1>
     <Ability2 desc=""><![CDATA[Increase [&person&*60][lv] Visitors  per minute(permanently)]]></Ability2>
     <Ability3 desc=""><![CDATA[Increase [&coin_person&][lv] Ticket's Coins per Visitor(permanently)]]></Ability3>
@@ -260,7 +263,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Confirm desc=""><![CDATA[Confirm]]></Confirm>
     <Cancel desc=""><![CDATA[Cancel]]></Cancel>
     <AD desc=""><![CDATA[Watch]]></AD>
-    <Cash desc=""><![CDATA[$]]></Cash>
+    <Cash desc=""><![CDATA[CNY]]></Cash>
     <Person desc=""><![CDATA[Visitor]]></Person>
     <CoinPerson desc=""><![CDATA[Ticket]]></CoinPerson>
     <Buff desc=""><![CDATA[(Buff)]]></Buff>

Assets/Script/Object/Skill/Pack.cs

@@ -186,7 +186,7 @@ public class Pack : SkillRoot
         ManaIAP.ProductActionDic.UniqueAdd(ID, PurchaseResult);
 
         ItemStatus = ItemStatus;
-
+        
 
         SetActive(!(Lock && ManaServer.PackLock));
     }

ToList.txt

@@ -1,5 +1,7 @@
 新的抽奖图标和配置
 
+将抽奖图标从Bundle中移除
+
 
 图集有新图片 需要再设置一次引用
 
@@ -8,7 +10,7 @@
 Player的影子只在试衣间中显示
 
 
-画面卡顿的问题
+画面卡顿的问题(开始教程有画面撕裂现象)
 
 花隐形的bug(小游戏C? 小游戏B?)