更改种花逻辑

Assets/Resource/Logo.unity

@@ -445,8 +445,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
-  DebugModeGo: {fileID: 0}
+  DebugMode: 1
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/PrefabUI/FlowerItem.prefab

@@ -58,12 +58,12 @@ GameObject:
   - component: {fileID: 222137134951818316}
   - component: {fileID: 114454811348864648}
   m_Layer: 5
-  m_Name: Lab
+  m_Name: AmtLab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1297235920544840
 GameObject:
   m_ObjectHideFlags: 0
@@ -97,6 +97,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1423192301543768
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224202974077853612}
+  - component: {fileID: 222348155467417056}
+  - component: {fileID: 114261472970502356}
+  m_Layer: 5
+  m_Name: Lab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1719458921745704
 GameObject:
   m_ObjectHideFlags: 0
@@ -163,6 +180,39 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
+--- !u!114 &114261472970502356
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1423192301543768}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6, g: 0.10980393, b: 0.10588236, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114271132321568786
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -229,7 +279,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6, g: 0.10980393, b: 0.10588236, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -238,18 +288,18 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 20
+    m_FontSize: 15
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 
+  m_Text: x1
 --- !u!114 &114601564964496668
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2972,6 +3022,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1280215281729340}
+--- !u!222 &222348155467417056
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1423192301543768}
 --- !u!222 &222634578489419708
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -3020,6 +3076,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224202974077853612
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1423192301543768}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224807438414421868}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224205376634027884
 RectTransform:
   m_ObjectHideFlags: 1
@@ -3083,17 +3157,17 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1280215281729340}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224807438414421868}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -11.250002, y: 7.75}
+  m_SizeDelta: {x: 22.5, y: 15.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224807438414421868
 RectTransform:
@@ -3108,13 +3182,14 @@ RectTransform:
   - {fileID: 224347405869314722}
   - {fileID: 224841882690309920}
   - {fileID: 224000242154034976}
+  - {fileID: 224202974077853612}
   - {fileID: 224593165806579476}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 40, y: 40.000015}
   m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224841882690309920

Assets/Resource/XML/Config/award_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" coin="s*0.01*l" diamond="3,15" diamond_drop="0.5/l+l*0.0001" flower_drop="(1/f+l*0.005)*0.95" flower_rate_based="0.05,0.65,0.95" rate="0,400,650" coin_drop="r*l*0.65" flower_coin="l*0.65" star_cd="1" star_time="5,20" star_duration="5" />
+  <item id="1" coin="s*0.01*l" diamond="3,15" diamond_drop="0.5/l+l*0.0001" flower_drop="(1/f+l*0.005)*0.95" flower_rate_based="0.05,0.65,0.95" rate="0,400,650" coin_drop="r*l*0.65" flower_coin="l*0.65" star_cd="1" star_time="5,20" star_duration="5" flowerID_rate_fml="1-i/40" flowerAmt_rate_fml="1-a/10" />
   <comment>
     <id>
 
@@ -38,5 +38,11 @@ s表示score
     <star_duration>
 star最大存在时间
 </star_duration>
+    <flowerID_rate_fml>
+根据花的ID计算掉率
+</flowerID_rate_fml>
+    <flowerAmt_rate_fml>
+根据花的数量计算掉率
+</flowerAmt_rate_fml>
   </comment>
 </data>

Assets/Resource/XML/Config/flower_config.xml

@@ -1,40 +1,40 @@
 <data>
-  <item id="1" name="粉色小花" desc="粉色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower1" anim="" />
-  <item id="2" name="紫色小花" desc="紫色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower2" anim="" />
-  <item id="3" name="波斯菊(粉)" desc="波斯菊(粉)的描述" unlock_ahead_cur="1" unlock_ahead="100000" icon="Flower3" anim="" />
-  <item id="4" name="康乃馨(红)" desc="康乃馨(红)的描述" unlock_ahead_cur="1" unlock_ahead="500000" icon="Flower4" anim="" />
-  <item id="5" name="铃兰(白)" desc="铃兰(白)的描述" unlock_ahead_cur="1" unlock_ahead="1000000" icon="Flower5" anim="" />
-  <item id="6" name="马蹄莲(白)" desc="马蹄莲(白)的描述" unlock_ahead_cur="1" unlock_ahead="5000000" icon="Flower6" anim="" />
-  <item id="7" name="蒲公英" desc="蒲公英的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower7" anim="" />
-  <item id="8" name="牵牛花(蓝)" desc="牵牛花(蓝)的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower8" anim="" />
-  <item id="9" name="三色堇(紫)" desc="三色堇(紫)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower9" anim="" />
-  <item id="10" name="三叶草(粉)" desc="三叶草(粉)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower10" anim="" />
-  <item id="11" name="向日葵" desc="向日葵的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower11" anim="" />
-  <item id="12" name="郁金香(粉)" desc="郁金香(粉)的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower12" anim="" />
-  <item id="13" name="百合花(白)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower13" anim="" />
-  <item id="14" name="非洲菊(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower14" anim="" />
-  <item id="15" name="红掌" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower15" anim="" />
-  <item id="16" name="桔梗花" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower16" anim="" />
-  <item id="17" name="康乃馨(白)" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower17" anim="" />
-  <item id="18" name="铃兰(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower18" anim="" />
-  <item id="19" name="曼陀罗(橘)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower19" anim="" />
-  <item id="20" name="曼陀罗（粉）" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower20" anim="" />
-  <item id="21" name="玫瑰花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower21" anim="" />
-  <item id="22" name="玫瑰花（黄）" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower22" anim="" />
-  <item id="23" name="茑萝" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower23" anim="" />
-  <item id="24" name="牵牛花(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower24" anim="" />
-  <item id="25" name="虞美人(红)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower25" anim="" />
-  <item id="26" name="郁金香(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower26" anim="" />
-  <item id="27" name="鸢尾(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower27" anim="" />
-  <item id="28" name="朱槿(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower28" anim="" />
-  <item id="29" name="朱槿(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower29" anim="" />
-  <item id="30" name="满天星（白）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower30" anim="" />
-  <item id="31" name="满天星（粉）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower31" anim="" />
-  <item id="32" name="紫罗兰（白）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower32" anim="" />
-  <item id="33" name="紫罗兰（紫）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower33" anim="" />
-  <item id="34" name="紫罗兰（蓝）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower34" anim="" />
-  <item id="35" name="鸡冠花（红）" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower35" anim="" />
-  <item id="36" name="鸡冠花（黄）" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" />
+  <item id="1" name="粉色小花" desc="粉色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower1" anim="" flower_coin_buff="0.9" />
+  <item id="2" name="紫色小花" desc="紫色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower2" anim="" flower_coin_buff="1" />
+  <item id="3" name="波斯菊(粉)" desc="波斯菊(粉)的描述" unlock_ahead_cur="1" unlock_ahead="100000" icon="Flower3" anim="" flower_coin_buff="1" />
+  <item id="4" name="康乃馨(红)" desc="康乃馨(红)的描述" unlock_ahead_cur="1" unlock_ahead="500000" icon="Flower4" anim="" flower_coin_buff="1" />
+  <item id="5" name="铃兰(白)" desc="铃兰(白)的描述" unlock_ahead_cur="1" unlock_ahead="1000000" icon="Flower5" anim="" flower_coin_buff="1" />
+  <item id="6" name="马蹄莲(白)" desc="马蹄莲(白)的描述" unlock_ahead_cur="1" unlock_ahead="5000000" icon="Flower6" anim="" flower_coin_buff="1" />
+  <item id="7" name="蒲公英" desc="蒲公英的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower7" anim="" flower_coin_buff="1" />
+  <item id="8" name="牵牛花(蓝)" desc="牵牛花(蓝)的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower8" anim="" flower_coin_buff="1" />
+  <item id="9" name="三色堇(紫)" desc="三色堇(紫)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower9" anim="" flower_coin_buff="1" />
+  <item id="10" name="三叶草(粉)" desc="三叶草(粉)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower10" anim="" flower_coin_buff="1" />
+  <item id="11" name="向日葵" desc="向日葵的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower11" anim="" flower_coin_buff="1" />
+  <item id="12" name="郁金香(粉)" desc="郁金香(粉)的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower12" anim="" flower_coin_buff="1" />
+  <item id="13" name="百合花(白)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower13" anim="" flower_coin_buff="1" />
+  <item id="14" name="非洲菊(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower14" anim="" flower_coin_buff="1" />
+  <item id="15" name="红掌" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower15" anim="" flower_coin_buff="1" />
+  <item id="16" name="桔梗花" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower16" anim="" flower_coin_buff="1" />
+  <item id="17" name="康乃馨(白)" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower17" anim="" flower_coin_buff="1" />
+  <item id="18" name="铃兰(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower18" anim="" flower_coin_buff="1" />
+  <item id="19" name="曼陀罗(橘)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower19" anim="" flower_coin_buff="1" />
+  <item id="20" name="曼陀罗（粉）" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower20" anim="" flower_coin_buff="1" />
+  <item id="21" name="玫瑰花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower21" anim="" flower_coin_buff="1" />
+  <item id="22" name="玫瑰花（黄）" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower22" anim="" flower_coin_buff="1" />
+  <item id="23" name="茑萝" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower23" anim="" flower_coin_buff="1" />
+  <item id="24" name="牵牛花(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower24" anim="" flower_coin_buff="1" />
+  <item id="25" name="虞美人(红)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower25" anim="" flower_coin_buff="1" />
+  <item id="26" name="郁金香(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower26" anim="" flower_coin_buff="1" />
+  <item id="27" name="鸢尾(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower27" anim="" flower_coin_buff="1" />
+  <item id="28" name="朱槿(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower28" anim="" flower_coin_buff="1" />
+  <item id="29" name="朱槿(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower29" anim="" flower_coin_buff="1" />
+  <item id="30" name="满天星（白）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower30" anim="" flower_coin_buff="1" />
+  <item id="31" name="满天星（粉）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower31" anim="" flower_coin_buff="1" />
+  <item id="32" name="紫罗兰（白）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower32" anim="" flower_coin_buff="1" />
+  <item id="33" name="紫罗兰（紫）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower33" anim="" flower_coin_buff="1" />
+  <item id="34" name="紫罗兰（蓝）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower34" anim="" flower_coin_buff="1" />
+  <item id="35" name="鸡冠花（红）" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower35" anim="" flower_coin_buff="1" />
+  <item id="36" name="鸡冠花（黄）" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="1" />
   <comment>
     <id>
 id
@@ -58,5 +58,8 @@ id
     <anim>
 场景物件
 </anim>
+    <flower_coin_buff>
+种花金币加成
+</flower_coin_buff>
   </comment>
 </data>

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="6" />
+  <Version value="7" />
 
   <ID value="Default" />
   <SerialNumber value="Default" />
@@ -28,7 +28,7 @@
   <SignRound value="1" />
   <CircleTimer value="0" />
   <ADPlayTime value="4/23/2017 09:30:00 AM" />
-  <NewFlowerFlag value="1" />
+  <NewFlowerFlag value="0" />
   <MiniGameIndex value="0" />
   <NotificationIndex value="-1" />
   <OneTimeReward value="" />
@@ -38,6 +38,7 @@
   <PlantList value =""/>
   <DressList value =""/>
   <FlowerList value="1" />
+  <FlowerAmtList value="1" />
   <AchieveList value="" />
   <DressData Head="" Dress="" Shoe="" HeadWear="" Top="" Eye="" Mouse="" Wing="Empty" LeftLongSleeveSlot="Empty" LeftShortSleeveSlot="Empty" RightLongSleeveSlot="Empty" RightShortSleeveSlot="Empty"/>
   <AchieveData AD="0" Skill="0" Sign="0" Share="0" ElfLevel="0" MiniGame="0" FlowerCoin="0" TotalPerson="0" CostDiamond="0"/>

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -51,6 +51,7 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
+    <G_PlantTip desc=""><![CDATA[点击花朵种到花园里]]></G_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[未解锁]]></H_BtnLab2>
     <H_BtnLab3 desc=""><![CDATA[完成小游戏或购买礼包可以解锁]]></H_BtnLab3>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -51,6 +51,7 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
+    <G_PlantTip desc=""><![CDATA[]]></G_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[未解鎖]]></H_BtnLab2>
     <H_BtnLab3 desc=""><![CDATA[完成小遊戲或購買禮包可以解鎖]]></H_BtnLab3>

Assets/Resource/XML/lan/English.xml

@@ -51,6 +51,7 @@
     <G_SpecialLab desc=""><![CDATA[Special]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[Normal]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[Take all back]]></G_RetrieveLab>
+    <G_PlantTip desc=""><![CDATA[]]></G_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[Take back]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[Locked]]></H_BtnLab2>
     <H_BtnLab3 desc=""><![CDATA[Play minigame or buy pack to unlock]]></H_BtnLab3>

Assets/Script/Manage/Initializer.cs

@@ -306,6 +306,7 @@ public class Initializer : MonoBehaviour
     private static void ShowLoadingPanel()
     {
         ManaReso.Get("U_Group").TweenForCG();
+        ManaReso.Get<CanvasGroup>("C_Main").alpha = 0;
 
         Auxiliary.Instance.DelayCall(ActivateGame, 3f);
     }
@@ -313,6 +314,8 @@ public class Initializer : MonoBehaviour
     private static void ActivateGame()
     {
         ManaReso.Get("U_LoadingPanel").TweenForCG();
+        ManaReso.Get<CanvasGroup>("C_Main").alpha = 1;
+
         ManaAudio.MusicTheme.TweenForAudio();
     }
 

Assets/Script/Manage/ManaData.cs

@@ -615,6 +615,17 @@ public class ManaData : Regist
     }
 
 
+    public static List<int> GetIntList(char splitChar, string nodeName, List<int> defaultList)
+    {
+        return Auxiliary.IntListParse(splitChar, PlayerNode.SelectSingleNode(nodeName).Attributes[0].Value, defaultList);
+    }
+
+    public static List<string> GetStringList(char splitChar, string nodeName, List<string> defaultList)
+    {
+        return Auxiliary.StringListParse(splitChar, PlayerNode.SelectSingleNode(nodeName).Attributes[0].Value, defaultList);
+    }
+
+
     public static List<int> GetDressList()
     {
         List<int> list = new List<int>();
@@ -1117,6 +1128,13 @@ public class ManaData : Regist
             To6(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 7)
+        {
+            Debug.LogWarning("UpdateArchive to 7");
+
+            To7(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1272,4 +1290,24 @@ public class ManaData : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument To7(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 7.ToString();
+
+        XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("FlowerList");
+        string[] flowerIDs= xmlNode1.Attributes[0].Value.Split(' ');
+
+        xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("FlowerAmtList");
+        xmlNode1.Attributes[0].Value = "";
+        foreach (var flowerID in flowerIDs)
+        {
+            xmlNode1.Attributes[0].Value += " " + "1";
+        }
+        xmlNode1.Attributes[0].Value = xmlNode1.Attributes[0].Value.TrimStart();
+
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/ManaGarden.cs

@@ -122,6 +122,39 @@ public class ManaGarden : Regist
     private static int TotalFlowerSpec_;
     private static int TotalFlowerRegu_;
 
+    public static int FirstUnlockFlowerID
+    {
+        get
+        {
+            foreach (var kv in FlowerInfoDic)
+            {
+                if (!kv.Value.Unlock)
+                {
+                    return kv.Key;
+                }
+            }
+
+            return -1;
+        }
+    }
+    public static List<int> UnlockedFlowerIDList
+    {
+        get
+        {
+            List<int> unlockedFlowerIDList = new List<int>();
+
+            foreach (var kv in FlowerInfoDic)
+            {
+                if (kv.Value.Unlock)
+                {
+                    unlockedFlowerIDList.Add(kv.Key);
+                }
+            }
+
+            return unlockedFlowerIDList;
+        }
+    }
+
     public static int TotalFlower;
     public static bool MiniLock = true;
 
@@ -267,11 +300,19 @@ public class ManaGarden : Regist
 
         #region 读花朵存档
 
-        List<int> flowerList = ManaData.GetFlowerList();
+        List<int> flowerIDList = ManaData.GetFlowerList();
 
-        for (int i = 0; i < flowerList.Count; i++)
+        for (int i = 0; i < flowerIDList.Count; i++)
         {
-            FlowerInfoDic[flowerList[i]].Unlock = true;
+            FlowerInfoDic[flowerIDList[i]].Unlock = true;
+        }
+
+
+        List<int> flowerAmountList = ManaData.GetIntList(' ', "FlowerAmtList", null);
+
+        for (int i = 0; i < flowerAmountList.Count; i++)
+        {
+            FlowerInfoDic[flowerIDList[i]].Amount = flowerAmountList[i];
         }
 
 
@@ -436,7 +477,7 @@ public class ManaGarden : Regist
                                 () =>
                                 {
                                     flowerInfo.Unlock = true;
-
+                                    ManaServer.Save();
 
                                     Material material = new Material(ManaReso.Get<Image>("H_Icon2").material);
 

Assets/Script/Manage/ManaMiniGame.cs

@@ -36,6 +36,8 @@ public class Award
     public string CoinFml;
     public string FlowerFml;
     public string DiamondFml;
+    public static string FlowerIDRateFml;
+    public static string FlowerAmtRateFml;
 
     public List<float> Odds = new List<float>();
     public List<float> Standard = new List<float>();
@@ -527,7 +529,7 @@ public class Award
 
     public Award(XmlAttributeCollection attribute)
     {
-        Flower.CoinFml = attribute[8].Value;
+        Flower.FlowerCoinFml = attribute[8].Value;
         DropGold.CoinFml = attribute[7].Value;
 
         Star.CD = float.Parse(attribute[9].Value);
@@ -544,7 +546,9 @@ public class Award
         CoinFml = attribute[1].Value;
         FlowerFml = attribute[4].Value;
         DiamondFml = attribute[3].Value;
-        
+        FlowerIDRateFml = attribute[12].Value;
+        FlowerAmtRateFml = attribute[13].Value;
+
         strings = attribute[2].Value.Split(',');
 
         DiamondMin = int.Parse(strings[0]);
@@ -568,6 +572,25 @@ public class Award
             float.Parse(strings[2]),
         };
     }
+
+    public static int SelectAwardFlowerID(List<int> flowerIDs)
+    {
+        for (int i = 0; i < flowerIDs.Count; i++)
+        {
+            FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[flowerIDs[i]];
+            float flowerIDRate = (float)Auxiliary.FmlParse(FlowerIDRateFml, "i", flowerIDs[i].ToString());
+            if (Random.Range(0f, 1f) <= flowerIDRate)
+            {
+                float flowerAmtRate = (float) Auxiliary.FmlParse(FlowerAmtRateFml, "a", flowerInfo.amount.ToString());
+                if (Random.Range(0f, 1f) <= flowerAmtRate)
+                {
+                    return flowerIDs[i];
+                }
+            }
+        }
+
+        return flowerIDs.Random(1)[0];
+    }
 }
 
 public class ManaMiniGame : Regist 
@@ -1246,24 +1269,13 @@ public class ManaMiniGame : Regist
 
         if (newFlowerFlag)
         {
-            if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
-            {
-                foreach (var kv in ManaGarden.FlowerInfoDic)
-                {
-                    if (kv.Value.Unlock == false)
-                    {
-                        Award.FlowerID = kv.Value.ID_;
+            List<int> unlockedFlowerIDList = ManaGarden.UnlockedFlowerIDList;
 
-                        Award.FlowerLock = false;
+            if (ManaGarden.FirstUnlockFlowerID != -1)
+                unlockedFlowerIDList.Add(ManaGarden.FirstUnlockFlowerID);
 
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                Award.FlowerLock = true;
-            }
+            Award.FlowerID = Award.SelectAwardFlowerID(unlockedFlowerIDList);
+            Award.FlowerLock = false;
         }
         else
         {
@@ -1274,7 +1286,7 @@ public class ManaMiniGame : Regist
     public static void ResetNewFlowerStatus()
     {
         float flowerRate = (float)Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
-        
+
         if (Random.Range(0, 1f) <= flowerRate)
         {
             if (ManaGarden.MyFlower < ManaGarden.TotalFlower)

Assets/Script/Manage/ManaNickName.cs

@@ -39,7 +39,6 @@ public class ManaNickName : Regist
 
 	public static void CloseNickNameSettingPanel()
 	{
-        ManaAudio.PlayClip(Clip.CloseClip);
 		ManaReso.Get ("C_Main").TweenForCG ();
 		ManaReso.Get ("T_NickNameBK").TweenBacCG ();
 	}
@@ -61,6 +60,7 @@ public class ManaNickName : Regist
 		}
 		else
 		{
+	    ManaReso.SetText("T_Tit", Language.GetStr("UI", "T_Tit"));
             ManaReso.Get<CanvasGroup>("T_NickNameBK").interactable = true;
         }
 	}
@@ -82,6 +82,8 @@ public class ManaNickName : Regist
 	    ManaReso.Get<CanvasGroup>("T_NickNameBK").interactable = true;
 
         SetNickName(inputField.text);
+
+        ManaAudio.PlayClip(Clip.CloseClip);
         CloseNickNameSettingPanel();
     }
 

Assets/Script/Manage/ManaPlayer.cs

@@ -101,6 +101,7 @@ public class ManaPlayer : Regist
 
         DressRoom = ManaReso.Get("DressRoom", Folder.Discard, true, null, true, ObjType.DressRoom);
         DressRoom.SetActive(false);
+        DontDestroyOnLoad(DressRoom);
 
         List<int> dressList = ManaData.GetDressList();
 

Assets/Script/Manage/ManaSign.cs

@@ -295,59 +295,22 @@ public class Lottery
         {
             #region
 
-            bool allUnlock = true;
+            List<int> flowerIDs = new List<int>();
 
             for (int j = 0; j < LeftBorderDList[type - 1].Count; j++)
             {
                 for (int k = LeftBorderDList[type - 1][j]; k < RightBorderDList[type - 1][j] + 1; k++)
                 {
-                    if (!ManaGarden.FlowerInfoDic[k].Unlock && !TempValueList.Contains(k))
+                    if (!TempValueList.Contains(k))
                     {
-                        allUnlock = false;
-
-                        goto exit;
+                        flowerIDs.Add(k);
                     }
                 }
             }
-            exit :
-
-            if (allUnlock)
-            {
-                int index = Random.Range(0, LeftBorderDList[type - 1].Count);
-
-                lottery.Value = Random.Range(LeftBorderDList[type - 1][index], RightBorderDList[type - 1][index] + 1);
-
-                FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[lottery.Value];
-
-                lottery.Value = flowerInfo.UnlockAmt/5;
-
-                if (flowerInfo.UnlockCur == Current.Coin)
-                {
-                    lottery.Type = 1;
-                }
-                else if (flowerInfo.UnlockCur == Current.Diamond)
-                {
-                    lottery.Type = 2;
-                }
-            }
-            else
-            {
-                int anticrush = 0;
 
-                do
-                {
-                    if (anticrush++ > 10000)
-                    {
-                        throw new Exception();
-                    }
-
-                    int index = Random.Range(0, LeftBorderDList[type - 1].Count);
-
-                    lottery.Value = Random.Range(LeftBorderDList[type - 1][index], RightBorderDList[type - 1][index] + 1);
-                } while (ManaGarden.FlowerInfoDic[lottery.Value].Unlock || TempValueList.Contains(lottery.Value));
+            lottery.Value = Award.SelectAwardFlowerID(flowerIDs);
 
-                TempValueList.Add(lottery.Value);
-            }
+            TempValueList.Add(lottery.Value);
 
             #endregion
         }
@@ -679,7 +642,10 @@ public class Lottery
         }
         else if (Type == 3)
         {
-            ManaGarden.FlowerInfoDic[Value].Unlock = true;
+            if (ManaGarden.FlowerInfoDic[Value].Unlock)
+                ManaGarden.FlowerInfoDic[Value].Amount++;
+            else
+                ManaGarden.FlowerInfoDic[Value].Unlock = true;
 
             ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + " " + ManaGarden.FlowerInfoDic[Value].Name);
         }

Assets/Script/Manage/ManaUI.cs

@@ -2774,6 +2774,7 @@ public class ManaUI : Regist
             "T_Close",
             () =>
             {
+                ManaAudio.PlayClip(Clip.CloseClip);
                 ManaNickName.CloseNickNameSettingPanel();
             }
         );

Assets/Script/Object/Flower.cs

@@ -22,6 +22,20 @@ public class FlowerInfo
 {
     #region 变量
 
+    public int Amount
+    {
+        get { return amount; }
+        set
+        {
+            amount = value;
+
+            AmountLab.SetActive(true);
+
+            AmountLab.text = "X" + amount;
+        }
+    }
+    public int amount;
+
     public bool Plant
     {
         get { return Plant_; }
@@ -70,6 +84,7 @@ public class FlowerInfo
                     ManaGarden.MyFlowerRegu++;
                 }
 
+                Amount = 1;
                 ManaCenter.SkillPlus += 0.1f;
             }
         }
@@ -107,10 +122,12 @@ public class FlowerInfo
     public bool Special;
 
     public int UnlockAmt;
+    public float FlowerCoinBuff;
     public Current UnlockCur;
 
     public Slot Slot;
     public Text Text;
+    public Text AmountLab;
     public Image Image;
     public Button Button;
     public UIPartical UIPartical;
@@ -132,12 +149,14 @@ public class FlowerInfo
         Image = ChildDic["Icon"].GetComponent<Image>();
         Button = ChildDic["FlowerItem"].GetComponent<Button>();
         UIPartical = ChildDic["UIParticle System"].GetComponent<UIPartical>();
+        AmountLab = ChildDic["AmtLab"].GetComponent<Text>();
 
         ID_ = int.Parse(attribute[0].Value);
         Icon_ = attribute[5].Value;
 
         UnlockCur = Auxiliary.CurrentParse(attribute[3].Value);
         UnlockAmt = Auxiliary.IntParse(attribute[4].Value, 0);
+        FlowerCoinBuff = Auxiliary.FloatParse(attribute[7].Value, 1);
 
         Image.sprite = Icon;
 
@@ -272,7 +291,7 @@ public class Flower : Regist, IPointerClickHandler
     public Dictionary<string, Transform> ChildDic = new Dictionary<string, Transform>();
 
 
-    public static string CoinFml;
+    public static string FlowerCoinFml;
 
     #endregion
 
@@ -573,7 +592,7 @@ public class Flower : Regist, IPointerClickHandler
         }
         else
         {
-            coin = Mathf.CeilToInt((float)Auxiliary.FmlParse(CoinFml, "l", Mathf.Clamp(ManaCenter.Level, 1, Mathf.Infinity).ToString()));
+            coin = Mathf.CeilToInt((float)Auxiliary.FmlParse(FlowerCoinFml, "l", Mathf.Clamp(ManaCenter.Level, 1, Mathf.Infinity).ToString())*FlowerInfo.FlowerCoinBuff);
 
             ManaCenter.AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.ClickFlower);
             ManaCenter.FlowerCoin++;

Assets/Script/Tool/Auxiliary.cs

@@ -204,7 +204,13 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.V))
         {
-            ManaPlayer.Player.PlayAnim("newAnimation2");
+            //ManaData.PlayerDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 6.ToString();
+            //ManaData.PlayerNode.RemoveChild(ManaData.PlayerNode.SelectSingleNode("FlowerAmtList"));
+
+            Debug.Log(ManaData.GetPlayerString("FlowerList"));
+            Debug.Log(ManaData.GetPlayerString("FlowerAmtList"));
+
+            //ManaPlayer.Player.PlayAnim("newAnimation2");
 
             //ManaPlayer.Player.Flip(PlayerDirection.Right);
 

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

第三期.txt

@@ -1,8 +1,3 @@
-昵称为空的时候提示有问题
-
-教程中设置昵称时有2个声音
-
-
 服务器新旧版存取档是否兼容
 
 切换到远程服务器