增加冷却小游戏功能

Assets/Resource/Logo.unity

@@ -229,110 +229,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 722194761}
---- !u!1001 &735421865
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_Name
-      value: Canvas (1)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &841147520
 GameObject:
   m_ObjectHideFlags: 0
@@ -689,6 +585,110 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &1721492832
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_Name
+      value: Canvas (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -285,5 +285,6 @@ MonoBehaviour:
   - {fileID: 4900000, guid: 8d5d74d2d26a2be46a1f875c6130a57f, type: 3}
   - {fileID: 4900000, guid: b9413a82e8f919e46b0c37372b491307, type: 3}
   - {fileID: 4900000, guid: ca67a0705396bba4b90fb3fc76541bf7, type: 3}
+  - {fileID: 4900000, guid: 37bda6257ca3a7f4e82ee65e8fde6832, type: 3}
   DiscardList: []
   PlazaRoomList: []

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -3622,7 +3622,7 @@ GameObject:
   - component: {fileID: 222313268370817392}
   - component: {fileID: 114125677296420010}
   m_Layer: 5
-  m_Name: AD_Text
+  m_Name: AD_ConfirmButtonTitle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -5401,7 +5401,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1390427693799442
 GameObject:
   m_ObjectHideFlags: 1
@@ -5986,6 +5986,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1431890993402422
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224275068483267696}
+  - component: {fileID: 222983349788149026}
+  - component: {fileID: 114039014742580070}
+  - component: {fileID: 225927780027440468}
+  m_Layer: 5
+  m_Name: AD_CDMinigameMask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1432125086917630
 GameObject:
   m_ObjectHideFlags: 1
@@ -12172,7 +12190,7 @@ GameObject:
   m_IsActive: 1
 --- !u!1 &1924919224162426
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
@@ -12180,7 +12198,6 @@ GameObject:
   - component: {fileID: 224766578003862604}
   - component: {fileID: 222546947105116690}
   - component: {fileID: 114812741611059908}
-  - component: {fileID: 225842901724114138}
   m_Layer: 5
   m_Name: AD_CDMinigamePanel
   m_TagString: Untagged
@@ -14373,6 +14390,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114039014742580070
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1431890993402422}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
+  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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114040934702661402
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -48258,6 +48302,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1927375137318918}
+--- !u!222 &222983349788149026
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1431890993402422}
 --- !u!222 &222985087918637178
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -51766,7 +51816,7 @@ RectTransform:
   - {fileID: 224216352824261512}
   - {fileID: 224640583794403420}
   - {fileID: 224830653797201576}
-  - {fileID: 224766578003862604}
+  - {fileID: 224275068483267696}
   - {fileID: 224085330785925536}
   - {fileID: 224297559150198766}
   - {fileID: 224852284275629218}
@@ -52627,6 +52677,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -11.001007}
   m_SizeDelta: {x: 454.5, y: 306}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224275068483267696
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1431890993402422}
+  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:
+  - {fileID: 224766578003862604}
+  m_Father: {fileID: 224229560457679016}
+  m_RootOrder: 23
+  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.0000047683716}
+  m_SizeDelta: {x: 0.000061035156, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224276948287916230
 RectTransform:
   m_ObjectHideFlags: 1
@@ -59781,8 +59850,8 @@ RectTransform:
   - {fileID: 224719222753253058}
   - {fileID: 224810945063180440}
   - {fileID: 224065301930171634}
-  m_Father: {fileID: 224229560457679016}
-  m_RootOrder: 23
+  m_Father: {fileID: 224275068483267696}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -63599,17 +63668,6 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
---- !u!225 &225842901724114138
-CanvasGroup:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1924919224162426}
-  m_Enabled: 1
-  m_Alpha: 0
-  m_Interactable: 1
-  m_BlocksRaycasts: 1
-  m_IgnoreParentGroups: 0
 --- !u!225 &225861473553549894
 CanvasGroup:
   m_ObjectHideFlags: 1
@@ -63687,6 +63745,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225927780027440468
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1431890993402422}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225933322121204792
 CanvasGroup:
   m_ObjectHideFlags: 1

Assets/Resource/XML/Config/minigame_config.xml

@@ -0,0 +1,20 @@
+<data>
+  <item id="1" switch_minigame_cost_fml="i*30" coin_cd_minigame_time="30" coin_cd_minigame_cost_fml="i" diamond_cd_minigame_cost_fml="s*0.5" />
+  <comment>
+    <id>
+
+</id>
+    <switch_minigame_cost_fml>
+切换游戏花费公式 i-每十秒收益
+</switch_minigame_cost_fml>
+    <coin_cd_minigame_time>
+金币减少小游戏冷却时间
+</coin_cd_minigame_time>
+    <coin_cd_minigame_cost_fml>
+金币减少小游戏冷却时间花费公式 i-每十秒收益
+</coin_cd_minigame_cost_fml>
+    <diamond_cd_minigame_cost_fml>
+钻石减少小游戏冷却时间花费公式 s-剩余秒数
+</diamond_cd_minigame_cost_fml>
+  </comment>
+</data>

Assets/Resource/XML/Config/minigame_config.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 37bda6257ca3a7f4e82ee65e8fde6832
+timeCreated: 1510902949
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -205,6 +205,10 @@
     <Unnamed desc=""><![CDATA[未命名]]></Unnamed>
     <DontSendAgain desc=""><![CDATA[请勿重复发送]]></DontSendAgain>
     <GetThanksGiftInfoFailed desc=""><![CDATA[获取充值返礼信息失败]]></GetThanksGiftInfoFailed>
+    <AD_Title desc=""><![CDATA[要减少等待时间吗?]]></AD_Title>
+    <AD_CoinCDDescription desc=""><![CDATA[减少[&value&]秒]]></AD_CoinCDDescription>
+    <AD_DiamondCDDescription desc=""><![CDATA[减少全部]]></AD_DiamondCDDescription>
+    <AD_ComfirmButtonTitle desc=""><![CDATA[减少等待]]></AD_ComfirmButtonTitle>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>
@@ -779,4 +783,9 @@
     <Tip8 desc=""><![CDATA[如果你觉得游戏还不错，请分享给你的朋友吧！还能获得奖励哦！]]></Tip8>
     <Tip9 desc=""><![CDATA[如果发现小游戏里有一朵花被星星笼罩，那么你有机会得到它哦~]]></Tip9>
   </Tip>
+  <MinigameName>
+    <Punch desc=""><![CDATA[打理花园]]></Punch>
+    <Memory desc=""><![CDATA[记顺序]]></Memory>
+    <Find desc=""><![CDATA[找不同]]></Find>
+  </MinigameName>
 </lan>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -205,6 +205,10 @@
     <Unnamed desc=""><![CDATA[未命名]]></Unnamed>
     <DontSendAgain desc=""><![CDATA[請勿重複發送]]></DontSendAgain>
     <GetThanksGiftInfoFailed desc=""><![CDATA[]]></GetThanksGiftInfoFailed>
+    <AD_Title desc=""><![CDATA[]]></AD_Title>
+    <AD_CoinCDDescription desc=""><![CDATA[]]></AD_CoinCDDescription>
+    <AD_DiamondCDDescription desc=""><![CDATA[]]></AD_DiamondCDDescription>
+    <AD_ComfirmButtonTitle desc=""><![CDATA[]]></AD_ComfirmButtonTitle>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>
@@ -779,4 +783,9 @@
     <Tip8 desc=""><![CDATA[如果你覺得遊戲還不錯，請分享給你的朋友吧！還能獲得獎勵哦！]]></Tip8>
     <Tip9 desc=""><![CDATA[如果發現小遊戲裡有一朵花被星星籠罩，那麼你有機會得到它哦~]]></Tip9>
   </Tip>
+  <MinigameName>
+    <Punch desc=""><![CDATA[]]></Punch>
+    <Memory desc=""><![CDATA[]]></Memory>
+    <Find desc=""><![CDATA[]]></Find>
+  </MinigameName>
 </lan>

Assets/Resource/XML/lan/English.xml

@@ -205,6 +205,10 @@ Program 水怪
     <Unnamed desc=""><![CDATA[Unnamed]]></Unnamed>
     <DontSendAgain desc=""><![CDATA[Do not send again]]></DontSendAgain>
     <GetThanksGiftInfoFailed desc=""><![CDATA[]]></GetThanksGiftInfoFailed>
+    <AD_Title desc=""><![CDATA[]]></AD_Title>
+    <AD_CoinCDDescription desc=""><![CDATA[]]></AD_CoinCDDescription>
+    <AD_DiamondCDDescription desc=""><![CDATA[]]></AD_DiamondCDDescription>
+    <AD_ComfirmButtonTitle desc=""><![CDATA[]]></AD_ComfirmButtonTitle>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>
@@ -780,4 +784,9 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Tip8 desc=""><![CDATA[Share the game to your friends, and get the rewards!]]></Tip8>
     <Tip9 desc=""><![CDATA[If you find stars hanging over a flower in mini games, don't miss it!]]></Tip9>
   </Tip>
+  <MinigameName>
+    <Punch desc=""><![CDATA[]]></Punch>
+    <Memory desc=""><![CDATA[]]></Memory>
+    <Find desc=""><![CDATA[]]></Find>
+  </MinigameName>
 </lan>

Assets/Script/Label/LanguageLabel.cs

@@ -203,6 +203,10 @@ public class LanguageLabel
 	public static string UI__Unnamed = "UI__Unnamed";
 	public static string UI__DontSendAgain = "UI__DontSendAgain";
 	public static string UI__GetThanksGiftInfoFailed = "UI__GetThanksGiftInfoFailed";
+	public static string UI__AD_Title = "UI__AD_Title";
+	public static string UI__AD_CoinCDDescription = "UI__AD_CoinCDDescription";
+	public static string UI__AD_DiamondCDDescription = "UI__AD_DiamondCDDescription";
+	public static string UI__AD_ComfirmButtonTitle = "UI__AD_ComfirmButtonTitle";
 	
 	public static string FlowerName = "FlowerName";
 	public static string FlowerName__Flower1 = "FlowerName__Flower1";
@@ -773,5 +777,10 @@ public class LanguageLabel
 	public static string Tip__Tip7 = "Tip__Tip7";
 	public static string Tip__Tip8 = "Tip__Tip8";
 	public static string Tip__Tip9 = "Tip__Tip9";
+	
+	public static string MinigameName = "MinigameName";
+	public static string MinigameName__Punch = "MinigameName__Punch";
+	public static string MinigameName__Memory = "MinigameName__Memory";
+	public static string MinigameName__Find = "MinigameName__Find";
 	//Mark
 }

Assets/Script/Label/ObjectLabel.cs

@@ -649,6 +649,31 @@ public class ObjectLabel
 	public static string T_InputField = "T_InputField";
 	public static string T_InputLab = "T_InputLab";
 	public static string T_Random = "T_Random";
+	public static string AC_EnterMinigamePanel = "AC_EnterMinigamePanel";
+	public static string AC_Title = "AC_Title";
+	public static string AC_Description = "AC_Description";
+	public static string AC_CloseButton = "AC_CloseButton";
+	public static string AC_ConfirmButton = "AC_ConfirmButton";
+	public static string Text = "Text";
+	public static string AC_ChangeButton = "AC_ChangeButton";
+	public static string AC_ChangeButtonTitle = "AC_ChangeButtonTitle";
+	public static string AC_CostText = "AC_CostText";
+	public static string AC_CostTextImagePlus = "AC_CostTextImagePlus";
+	public static string AD_CDMinigamePanel = "AD_CDMinigamePanel";
+	public static string AD_Title = "AD_Title";
+	public static string AD_CoinToggle = "AD_CoinToggle";
+	public static string AD_CoinTick = "AD_CoinTick";
+	public static string AD_CoinCostText = "AD_CoinCostText";
+	public static string AD_CoinCostTextImagePlus = "AD_CoinCostTextImagePlus";
+	public static string AD_CoinDescription = "AD_CoinDescription";
+	public static string AD_DiamondToggle = "AD_DiamondToggle";
+	public static string AD_DiamondTick = "AD_DiamondTick";
+	public static string AD_DiamondDescription = "AD_DiamondDescription";
+	public static string AD_DiamondCostText = "AD_DiamondCostText";
+	public static string AD_DiamondCostTextImagePlus = "AD_DiamondCostTextImagePlus";
+	public static string AD_CloseButton = "AD_CloseButton";
+	public static string AD_ConfirmButton = "AD_ConfirmButton";
+	public static string AD_ConfirmButtonTitle = "AD_ConfirmButtonTitle";
 	public static string B_SignIn0 = "B_SignIn0";
 	public static string B_SignIn = "B_SignIn";
 	public static string Bb_SignIn = "Bb_SignIn";
@@ -712,6 +737,18 @@ public class ObjectLabel
 	public static string Bd_Title = "Bd_Title";
 	public static string Bd_ScrollRect = "Bd_ScrollRect";
 	public static string Bd_Grid = "Bd_Grid";
+	public static string AB_RechargeGiftPanel = "AB_RechargeGiftPanel";
+	public static string AB_PanelBK = "AB_PanelBK";
+	public static string AB_Confirm = "AB_Confirm";
+	public static string AB_ConfirmText = "AB_ConfirmText";
+	public static string AB_RotateIcon = "AB_RotateIcon";
+	public static string AB_Title = "AB_Title";
+	public static string AB_Description = "AB_Description";
+	public static string AB_AwardImages = "AB_AwardImages";
+	public static string AB_AwardImage0 = "AB_AwardImage0";
+	public static string AB_AwardImage1 = "AB_AwardImage1";
+	public static string AB_AwardImage2 = "AB_AwardImage2";
+	public static string AB_FlowerAwardImage = "AB_FlowerAwardImage";
 	public static string N_Tutorial = "N_Tutorial";
 	public static string N_Mask = "N_Mask";
 	public static string N_Arrow = "N_Arrow";
@@ -740,17 +777,5 @@ public class ObjectLabel
 	public static string U_Group = "U_Group";
 	public static string U_Icon = "U_Icon";
 	public static string U_Lab = "U_Lab";
-	public static string AB_RechargeGiftPanel = "AB_RechargeGiftPanel";
-	public static string AB_PanelBK = "AB_PanelBK";
-	public static string AB_Confirm = "AB_Confirm";
-	public static string AB_ConfirmText = "AB_ConfirmText";
-	public static string AB_RotateIcon = "AB_RotateIcon";
-	public static string AB_Title = "AB_Title";
-	public static string AB_Description = "AB_Description";
-	public static string AB_AwardImages = "AB_AwardImages";
-	public static string AB_AwardImage0 = "AB_AwardImage0";
-	public static string AB_AwardImage1 = "AB_AwardImage1";
-	public static string AB_AwardImage2 = "AB_AwardImage2";
-	public static string AB_FlowerAwardImage = "AB_FlowerAwardImage";
 	//Mark
 }

Assets/Script/Label/ResourceLabel.cs

@@ -80,6 +80,7 @@ public class ResourceLabel
     public static string ChineseSimplified = "ChineseSimplified";
     public static string ChineseTraditional = "ChineseTraditional";
     public static string DefaultNickName = "DefaultNickName";
+    public static string MinigameConfig = "minigame_config";
     public static string DressroomConfig = "dressRoom_config";
     public static string AchieveConfig = "achieve_config";
     public static string LotteryConfig = "lottery_config";

Assets/Script/Manage/CDMinigamePanelManager.cs

@@ -1,23 +1,178 @@
 using System.Collections;
 using System.Collections.Generic;
-
+using System.Xml;
 using UnityEngine;
+using UnityEngine.UI;
 
-public class CDMinigamePanelManager : MonoBehaviour
+public class CDMinigamePanelManager : Regist
 {
     #region Config
-    
-    
-    
+
+    private static Text Title;
+    private static Text CoinCostText;
+    private static Text DiamondCostText;
+    private static Text ComfirmButtonTitle;
+    private static Text CoinDescriptionText;
+    private static Text DiamondDescriptionText;
+    private static Button CloseButton;
+    private static Button ComfirmButton;
+    private static Toggle CoinToggle;
+    private static Toggle DiamondToggle;
+    private static Transform Mask;
+
+    private static float CoinCDAmount;
+    private static string CoinCostFormula;
+    private static string DiamondCostFormula;
+
+    private static bool IsPanelOpen;
+    private static float RefreshTime = 1f;
+    private static float RefreshTimer;
+    private static double CoinCost;
+    private static double DiamondCost;
+    private static Current CDCurrent = Current.Coin;
+
     #endregion
 
-    public void Start()
+    private void Update()
+    {
+        if (!IsPanelOpen)
+        {
+            return;
+        }
+
+        RefreshTimer += Time.deltaTime;
+        if (RefreshTimer > RefreshTime)
+        {
+            RefreshTimer = 0;
+            RefreshCost();
+        }
+    }
+
+
+    private void Init()
+    {
+        XmlDocument document = ConfigManager.GetXmlDocument(ResourceLabel.MinigameConfig);
+        XmlAttributeCollection attributes = document.SelectSingleNode(ConfigLabel.RootNode).SelectSingleNode(ConfigLabel.ChildNode).Attributes;
+        int index = 2;
+        CoinCDAmount = float.Parse(attributes[index++].Value);
+        CoinCostFormula = attributes[index++].Value;
+        DiamondCostFormula = attributes[index++].Value;
+    }
+
+    public override void RegistReference()
+    {
+        Init();
+
+        Title = ResourceManager.Get<Text>(ObjectLabel.AD_Title);
+        CoinCostText = ResourceManager.Get<Text>(ObjectLabel.AD_CoinCostText);
+        DiamondCostText = ResourceManager.Get<Text>(ObjectLabel.AD_DiamondCostText);
+        ComfirmButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AD_ConfirmButtonTitle);
+        CoinDescriptionText = ResourceManager.Get<Text>(ObjectLabel.AD_CoinDescription);
+        DiamondDescriptionText = ResourceManager.Get<Text>(ObjectLabel.AD_DiamondDescription);
+        Mask = ResourceManager.Get(ObjectLabel.AD_CDMinigamePanel);
+        CoinToggle = ResourceManager.Get<Toggle>(ObjectLabel.AD_CoinToggle);
+        DiamondToggle = ResourceManager.Get<Toggle>(ObjectLabel.AD_DiamondToggle);
+        CloseButton = ResourceManager.Get<Button>(ObjectLabel.AD_CloseButton);
+        ComfirmButton = ResourceManager.Get<Button>(ObjectLabel.AD_ConfirmButton);
+
+        Mask.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        CoinToggle.onValueChanged.AddListener(OnCoinToggleSelect);
+        DiamondToggle.onValueChanged.AddListener(OnDiamondToggleSelect);
+        CloseButton.onClick.AddListener(()=> { AudioManager.PlayClip(ResourceLabel.CloseClip); ClosePanel(); });
+        ComfirmButton.onClick.AddListener(CDMinigame);
+
+        LanguageManager.Add(Title, new MulLanStr(LanguageLabel.UI__AD_Title));
+        LanguageManager.Add(ComfirmButtonTitle, new MulLanStr(LanguageLabel.UI__AD_ComfirmButtonTitle));
+        LanguageManager.Add(DiamondDescriptionText, new MulLanStr(LanguageLabel.UI__AD_DiamondCDDescription));
+        SwitchLanguage();
+    }
+
+    public override void SwitchLanguage()
+    {
+        string description = Language.GetStr(LanguageLabel.UI__AD_CoinCDDescription);
+        description = description.Replace(TransferLabel.Value, CoinCDAmount.ToString("0"));
+        CoinDescriptionText.text = description;
+    }
+
+
+    private static void OnCoinToggleSelect(bool value)
+    {
+        CDCurrent = Current.Coin;
+    }
+
+    private static void OnDiamondToggleSelect(bool value)
     {
+        CDCurrent = Current.Diamond;
+    }
 
+
+    public static void OpenPanel()
+    {
+        IsPanelOpen = true;
+        RefreshCost();
+        Mask.TweenForCG();
+    }
+
+    public static void ClosePanel()
+    {
+        IsPanelOpen = false;
+        Mask.TweenBacCG();
+        AudioManager.PlayClip(ResourceLabel.CloseClip);
     }
 
-    public void Update()
+    private static void RefreshCost()
     {
+        double coinCost = Auxiliary.FmlParse(CoinCostFormula, "i", Manager.CircleIncome.ToString());
+        CoinCost = Auxiliary.ShrinkNumber(coinCost);
+        CoinCostText.text = TransferLabel.CoinSprite + Auxiliary.ShrinkNumberStr(coinCost);
 
+        double diamondCost = Auxiliary.FmlParse(DiamondCostFormula, "s", Manager.MinigameCDTimer.ToString());
+        DiamondCost = Mathf.CeilToInt((float) diamondCost);
+        DiamondCostText.text = TransferLabel.DiamondSprite + diamondCost.ToString("0");
+    }
+
+    private static void CDMinigame()
+    {
+        if (CDCurrent == Current.Coin)
+        {
+            CoinCDMinigame();
+        }   
+        else if (CDCurrent == Current.Diamond)
+        {
+            DiamondCDMinigame();
+        }
+
+        if (Manager.MinigameCDTimer <= 0)
+        {
+            ClosePanel();
+        }
+    }
+
+    private static void CoinCDMinigame()
+    {
+        Manager.Pay
+        (
+            null,
+            CoinCost,
+            Current.Coin,
+            () => { Manager.MinigameCDTimer -= CoinCDAmount; },
+            StaticsManager.ItemID.冷却小游戏,
+            StaticsManager.ConsumeModule.Charge,
+            false
+        );
+    }
+
+    private static void DiamondCDMinigame()
+    {
+        Manager.Pay
+        (
+            null,
+            DiamondCost,
+            Current.Diamond,
+            () => { Manager.MinigameCDTimer = 0; },
+            StaticsManager.ItemID.冷却小游戏,
+            StaticsManager.ConsumeModule.Charge,
+            false
+        );
     }
-}
+}

Assets/Script/Manage/Initializer.cs

@@ -88,30 +88,31 @@ public class Initializer : MonoBehaviour
 
     private void InitScript()
     {
-        InitScriptProgress = "1";
+        int index = 1;
+        InitScriptProgress = index++.ToString();
         Application.targetFrameRate = 50;
 
-        InitScriptProgress = "2";
+        InitScriptProgress = index++.ToString();
         DontDestroyOnLoad(gameObject);
 
-        InitScriptProgress = "3";
+        InitScriptProgress = index++.ToString();
         HttpManager.Login(Manager.FirstTimeLoginCallback);
 
-        InitScriptProgress = "4";
+        InitScriptProgress = index++.ToString();
         HttpManager.GetMailAwardData();
 
-        InitScriptProgress = "5";
+        InitScriptProgress = index++.ToString();
         HttpManager.GetRankData();
 
-        InitScriptProgress = "6";
+        InitScriptProgress = index++.ToString();
         HttpManager.GetAlipayFlag();
 
-        InitScriptProgress = "7";
+        InitScriptProgress = index++.ToString();
         HttpManager.GetAnnounceData();
 
         Instance = this;
 
-        InitScriptProgress = "8";
+        InitScriptProgress = index++.ToString();
         if (DebugMode)
         {
             Instantiate(DebugModeGo, transform);
@@ -121,85 +122,88 @@ public class Initializer : MonoBehaviour
             gameObject.AddComponent<Bundle>();
         }
 
-        InitScriptProgress = "9";
+        InitScriptProgress = index++.ToString();
         gameObject.AddComponent<IAPManager>();
 
-        InitScriptProgress = "10";
+        InitScriptProgress = index++.ToString();
         gameObject.AddComponent<VisitManager>();
 
-        InitScriptProgress = "11";
+        InitScriptProgress = index++.ToString();
         gameObject.AddComponent<DebugManager>();
 
-        InitScriptProgress = "12";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<Auxiliary>();
 
-        InitScriptProgress = "13";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<ConfigManager>();
 
-        InitScriptProgress = "14";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<ResourceManager>();
 
-        InitScriptProgress = "15";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<TutorialManager>();
 
-        InitScriptProgress = "16";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<LanguageManager>();
 
-        InitScriptProgress = "17";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<AnimManager>();
 
-        InitScriptProgress = "18";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<AudioManager>();
 
-        InitScriptProgress = "19";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<AchieveManager>();
 
-        InitScriptProgress = "20";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<UIManager>();
 
-        InitScriptProgress = "21";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<SignManager>();
 
-        InitScriptProgress = "22";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<Manager>();
 
-        InitScriptProgress = "23";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<GardenManager>();
 
-        InitScriptProgress = "24";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<PlayerManager>();
 
-        InitScriptProgress = "25";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<HttpManager>();
 
-        InitScriptProgress = "26";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<MiniGameManager>();
 
-        InitScriptProgress = "27";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<InfoBoxManager>();
 
-        InitScriptProgress = "28";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<SocialManager>();
 
-        InitScriptProgress = "29";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<NickNameManager>();
 
-        InitScriptProgress = "30";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<SFSManager>();
 
-        InitScriptProgress = "31";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<PlazaRoomManager>();
 
-        InitScriptProgress = "31-1";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<ChestManager>();
 
-        InitScriptProgress = "31-2";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<RobotManager>();
 
-        InitScriptProgress = "32";
+        InitScriptProgress = index++.ToString();
         gameObject.AddScript<FriendManager>();
 
-        InitScriptProgress = "33";
+        InitScriptProgress = index++.ToString();
+        gameObject.AddScript<CDMinigamePanelManager>();
+
+        InitScriptProgress = index++.ToString();
         StartCoroutine(WaitToInit());
     }
 

Assets/Script/Manage/LanguageManager.cs

@@ -86,6 +86,11 @@ public class LanguageManager : Regist
 
         Manager.SwitchLanguage();
 
+        foreach (var regist in Initializer.RegistList)
+        {
+            regist.SwitchLanguage();
+        }
+
         foreach (var kv in TextDictionary)
         {
             kv.Key.text = Translate(kv.Value);

Assets/Script/Manage/Manager.cs

@@ -485,6 +485,10 @@ public class Manager : Regist
     public static float IncomeDisplayTime = 60f;
     public static float IncomeCircleTime = 10;
     public static float IncomeCircleTimer;
+    public static float CircleIncome
+    {
+        get { return (CurrentPerson*CurrentCoinPerson*IncomeCircleTime)*(1 + SkillPlus); }
+    }
 
     public static float OfflineTime;
     public static string OfflineIncomeFml;
@@ -641,13 +645,13 @@ public class Manager : Regist
 
             TotalVisitPerson += CurrentPerson * IncomeCircleTime;
 
-            float temp = (CurrentPerson * CurrentCoinPerson * IncomeCircleTime) * (1 + SkillPlus);
+            float circleIncome = CircleIncome;
 
-            AddCoin(temp, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
+            AddCoin(circleIncome, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
 
             ResourceManager.Get(ObjectLabel.C_IncomeLab).TweenReForGra();
             ResourceManager.Get(ObjectLabel.C_IncomeLab).TweenReForVec();
-            ResourceManager.SetText(ObjectLabel.C_IncomeLab, "+" + Auxiliary.ShrinkNumberStr(temp, 0));
+            ResourceManager.SetText(ObjectLabel.C_IncomeLab, "+" + Auxiliary.ShrinkNumberStr(circleIncome, 0));
         }
     }
 
@@ -937,7 +941,7 @@ public class Manager : Regist
         ResourceManager.SetText(ObjectLabel.Ba_IconLab, Auxiliary.ShrinkNumberStr(coin));
     }
 
-    public static void SwitchLanguage()
+    public new static void SwitchLanguage()
     {
         Coin = Coin;
         AddDiamond(0, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);

Assets/Script/Manage/UIManager.cs

@@ -363,7 +363,7 @@ public class UIManager : Regist
 
             tweenOutline.Target.enabled = false;
 
-            ResourceManager.Get<Button>(ObjectLabel.C_MiniGame).interactable = false;
+            //ResourceManager.Get<Button>(ObjectLabel.C_MiniGame).interactable = false;
         };
 
         tweenRoot.OnBackwardFinish = () =>
@@ -378,7 +378,7 @@ public class UIManager : Regist
 
             LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.C_MiniGameLab), new MulLanStr(LanguageLabel.UI__C_MiniGameLab));
 
-            ResourceManager.Get<Button>(ObjectLabel.C_MiniGame).interactable = true;
+            //ResourceManager.Get<Button>(ObjectLabel.C_MiniGame).interactable = true;
         };
 
 
@@ -396,13 +396,21 @@ public class UIManager : Regist
             ObjectLabel.C_MiniGame,
             () =>
             {
-                ResourceManager.Get(GardenLabel.Minigame).TweenForVec();
+                if (Manager.MinigameCDTimer <= 0)
+                {
+                    ResourceManager.Get(GardenLabel.Minigame).TweenForVec();
 
-                ResourceManager.Get(ObjectLabel.D_MiniGame).TweenForCG();
+                    ResourceManager.Get(ObjectLabel.D_MiniGame).TweenForCG();
 
-                MiniGameManager.GameEnter();
+                    MiniGameManager.GameEnter();
 
-                AudioManager.PlayClip(AudioLabel.Bubble);
+                    AudioManager.PlayClip(AudioLabel.Bubble);
+                }
+                else
+                {
+                    CDMinigamePanelManager.OpenPanel();
+                    AudioManager.PlayClip(AudioLabel.Bubble);
+                }
             }
         );
 

Assets/Script/Root/Regist.cs

@@ -50,6 +50,10 @@ public class Regist : MonoBehaviour
         
     }
 
+    public virtual void SwitchLanguage()
+    {
+
+    }
 
     public virtual void Reactive()
     {

Assets/Script/ThirdParty/DataEyeStatics/StaticsManager.cs

@@ -239,6 +239,7 @@ public class StaticsManager
         获得小游戏,
         创建派对,
         创建宝箱,
+        冷却小游戏
     }
 
     public enum ItemType

Assets/Script/Tool/Auxiliary.cs

@@ -157,12 +157,14 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.S))
         {
-
+            Manager.Coin = 0;
+            Manager.Diamond = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.D))
         {
-
+            Manager.Coin = 100000;
+            Manager.Diamond = 1000;
         }
 
         if (Input.GetKeyDown(KeyCode.Z))

Assets/Script/Tool/LabelUtility/SerializeObject.prefab

@@ -51,7 +51,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e4a9dafa00b004e4e94c57cd88b01101, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Script: {fileID: 11500000, guid: 3420c8d0e7f483a46942a0adcfbee477, type: 3}
+  Script: {fileID: 11500000, guid: 1615e3353e063d443bf237fb8aade024, type: 3}
   Languages:
   - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
   Prefabs: