Browse Source

增加选择小游戏功能

LiuQilin 7 years ago
parent
commit
1035d20622

+ 104 - 104
Assets/Resource/Logo.unity

@@ -229,6 +229,110 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 722194761}
+--- !u!1001 &836774355
+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
@@ -585,110 +689,6 @@ 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

+ 125 - 119
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -1646,7 +1646,7 @@ GameObject:
   m_IsActive: 1
 --- !u!1 &1117590707691718
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
@@ -1661,7 +1661,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1118598503509494
 GameObject:
   m_ObjectHideFlags: 1
@@ -8008,23 +8008,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1563596834706856
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224391964974022592}
-  - component: {fileID: 222648148233142450}
-  - component: {fileID: 114246717001531372}
-  m_Layer: 5
-  m_Name: AC_Description
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1564091439659260
 GameObject:
   m_ObjectHideFlags: 1
@@ -8586,7 +8569,7 @@ GameObject:
   - component: {fileID: 222798649864823114}
   - component: {fileID: 114705675699668980}
   m_Layer: 5
-  m_Name: Text
+  m_Name: AC_ConfirmButtonTitle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9203,6 +9186,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1680197964161668
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224392598831522604}
+  - component: {fileID: 222600402636372290}
+  - component: {fileID: 114043198538242156}
+  - component: {fileID: 225371628934360582}
+  m_Layer: 5
+  m_Name: AC_EnterMinigamePanelMask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1684715907662770
 GameObject:
   m_ObjectHideFlags: 1
@@ -14572,6 +14573,33 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!114 &114043198538242156
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1680197964161668}
+  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 &114043487446511542
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -17674,7 +17702,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7C89\u8272\u5C0F\u82B1"
+  m_Text: "\u672C\u6B21\u5C0F\u6E38\u620F"
 --- !u!114 &114144145836108294
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -20342,39 +20370,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 20
---- !u!114 &114246717001531372
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1563596834706856}
-  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.5803922, g: 0.09411766, b: 0.09411766, a: 1}
-  m_RaycastTarget: 0
-  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: 15
-    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 1
-    m_MaxSize: 25
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 0
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u70B9\u51FB\u82B1\u6735\u79CD\u5230\u82B1\u56ED\u91CC"
 --- !u!114 &114254042768240508
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -20527,7 +20522,7 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 25
+    m_FontSize: 80
     m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 2
@@ -20538,7 +20533,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u79C1\u4FE1"
+  m_Text: "\u6362\u4E00\u4E2A"
 --- !u!114 &114263153205687954
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -28882,7 +28877,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.8627451}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -28891,52 +28886,52 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 33
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 1
-    m_MinSize: 2
-    m_MaxSize: 33
+    m_MinSize: 1
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 
+  m_Text: "<(\u91D1\u5E01)>1000"
   Draw: 0
   SetY: 0
   Y: 0
-  LineHeight: 32.264736
+  LineHeight: 19.226751
   MaxLineHeight: Infinity
   RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
   ImageIndex: 00000000
   RemoveIndex: 0100000002000000030000000400000005000000
   NewTextIndex: 06000000070000000800000009000000
   NewTextPos:
-  - {x: -17.60154, y: 12.409513, z: 0}
-  - {x: -1.882824, y: 12.409513, z: 0}
-  - {x: -1.882824, y: -13.2368145, z: 0}
-  - {x: -1.882824, y: -13.2368145, z: 0}
-  - {x: -17.60154, y: -13.2368145, z: 0}
-  - {x: -17.60154, y: 12.409513, z: 0}
-  - {x: -1.0555229, y: 13.2368145, z: 0}
-  - {x: 16.317799, y: 13.2368145, z: 0}
-  - {x: 16.317799, y: -13.2368145, z: 0}
-  - {x: 16.317799, y: -13.2368145, z: 0}
-  - {x: -1.0555229, y: -13.2368145, z: 0}
-  - {x: -1.0555229, y: 13.2368145, z: 0}
-  - {x: 17.1451, y: 13.2368145, z: 0}
-  - {x: 34.518414, y: 13.2368145, z: 0}
-  - {x: 34.518414, y: -14.064116, z: 0}
-  - {x: 34.518414, y: -14.064116, z: 0}
-  - {x: 17.1451, y: -14.064116, z: 0}
-  - {x: 17.1451, y: 13.2368145, z: 0}
-  - {x: 35.345715, y: 6.6184072, z: 0}
-  - {x: 50.237133, y: 6.6184072, z: 0}
-  - {x: 50.237133, y: -14.064116, z: 0}
-  - {x: 50.237133, y: -14.064116, z: 0}
-  - {x: 35.345715, y: -14.064116, z: 0}
-  - {x: 35.345715, y: 6.6184072, z: 0}
+  - {x: -12.0119705, y: 7.523511, z: 0}
+  - {x: -1.1446743, y: 7.523511, z: 0}
+  - {x: -1.1446743, y: -8.359457, z: 0}
+  - {x: -1.1446743, y: -8.359457, z: 0}
+  - {x: -12.0119705, y: -8.359457, z: 0}
+  - {x: -12.0119705, y: 7.523511, z: 0}
+  - {x: -1.1446743, y: 8.359457, z: 0}
+  - {x: 9.722618, y: 8.359457, z: 0}
+  - {x: 9.722618, y: -9.195402, z: 0}
+  - {x: 9.722618, y: -9.195402, z: 0}
+  - {x: -1.1446743, y: -9.195402, z: 0}
+  - {x: -1.1446743, y: 8.359457, z: 0}
+  - {x: 9.722618, y: 8.359457, z: 0}
+  - {x: 20.589912, y: 8.359457, z: 0}
+  - {x: 20.589912, y: -9.195402, z: 0}
+  - {x: 20.589912, y: -9.195402, z: 0}
+  - {x: 9.722618, y: -9.195402, z: 0}
+  - {x: 9.722618, y: 8.359457, z: 0}
+  - {x: 20.589912, y: 8.359457, z: 0}
+  - {x: 31.457207, y: 8.359457, z: 0}
+  - {x: 31.457207, y: -9.195402, z: 0}
+  - {x: 31.457207, y: -9.195402, z: 0}
+  - {x: 20.589912, y: -9.195402, z: 0}
+  - {x: 20.589912, y: 8.359457, z: 0}
 --- !u!114 &114545238939219420
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -46808,6 +46803,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1691455643089594}
+--- !u!222 &222600402636372290
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1680197964161668}
 --- !u!222 &222601496233975314
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -46976,12 +46977,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1700214107745850}
---- !u!222 &222648148233142450
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1563596834706856}
 --- !u!222 &222648185404542392
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -50676,12 +50671,12 @@ RectTransform:
   m_Children:
   - {fileID: 224961851278064326}
   m_Father: {fileID: 224830653797201576}
-  m_RootOrder: 5
+  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: 10.001, y: -47.8}
-  m_SizeDelta: {x: -149.33997, y: -235.9}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 10, y: -43.3}
+  m_SizeDelta: {x: 218.7, y: 27.399994}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224138507206122250
 RectTransform:
@@ -51317,15 +51312,15 @@ RectTransform:
   m_GameObject: {fileID: 1469318421559140}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.15000209, y: 0.15000209, z: 1}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 1}
   m_Children:
   - {fileID: 224615507647107678}
   m_Father: {fileID: 224830653797201576}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 193.65, y: -43.3}
+  m_AnchoredPosition: {x: 193.65, y: -75.5}
   m_SizeDelta: {x: 337.72, y: 162}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224194472856406270
@@ -51701,7 +51696,7 @@ RectTransform:
   m_Children:
   - {fileID: 224466154383344096}
   m_Father: {fileID: 224830653797201576}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -51815,7 +51810,7 @@ RectTransform:
   - {fileID: 224460117936396002}
   - {fileID: 224216352824261512}
   - {fileID: 224640583794403420}
-  - {fileID: 224830653797201576}
+  - {fileID: 224392598831522604}
   - {fileID: 224275068483267696}
   - {fileID: 224085330785925536}
   - {fileID: 224297559150198766}
@@ -53870,7 +53865,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 13.249913, y: 77.20001}
+  m_AnchoredPosition: {x: 13.249913, y: 54.33}
   m_SizeDelta: {x: 285, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224374152425270794
@@ -54108,23 +54103,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 125, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224391964974022592
+--- !u!224 &224392598831522604
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1563596834706856}
+  m_GameObject: {fileID: 1680197964161668}
   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: 224830653797201576}
-  m_RootOrder: 1
+  m_Children:
+  - {fileID: 224830653797201576}
+  m_Father: {fileID: 224229560457679016}
+  m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 13.24991, y: -101.7}
-  m_SizeDelta: {x: 195, y: 36}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000015258789, y: 0.0000076293945}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224394233682693660
 RectTransform:
@@ -54155,7 +54151,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224830653797201576}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -60688,13 +60684,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224373537536499262}
-  - {fileID: 224391964974022592}
   - {fileID: 224394512348100412}
   - {fileID: 224221382250646902}
   - {fileID: 224192583423936246}
   - {fileID: 224137801086604222}
-  m_Father: {fileID: 224229560457679016}
-  m_RootOrder: 22
+  m_Father: {fileID: 224392598831522604}
+  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}
@@ -63305,6 +63300,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225371628934360582
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1680197964161668}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225398734018518532
 CanvasGroup:
   m_ObjectHideFlags: 1
@@ -63675,7 +63681,7 @@ CanvasGroup:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1117590707691718}
   m_Enabled: 1
-  m_Alpha: 0
+  m_Alpha: 1
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0

+ 1 - 1
Assets/Resource/XML/Config/ability_config.xml

@@ -1,7 +1,7 @@
 <data>
   <item id="1" name="花园" class="1" class_id="1" coin_person="5" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="5" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="0.5%" upgrade_person="1.7%" upgrade_cd="" desc="每人次收入 金币[&amp;coin_person&amp;][lv],每分钟来访[&amp;person&amp;*60][lv]人" icon="红-公园" anim="" label="" />
   <item id="2" name="缤纷彩虹" class="1" class_id="5" coin_person="" person="5%" skill_cd="" unlock_lv="5" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="" upgrade_person="5%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观,永久有效" icon="红-彩虹" anim="Item,GardenRainbow" label="" />
-  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv],永久有效" icon="红-樱花树" anim="Item,GardenLeftTree,GardenRightTree" label="" />
+  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv],永久有效" icon="红-樱花树" anim="Item,GardenRightTree,GardenLeftTree" label="" />
   <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="110" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv],永久有效" icon="红-黄鹂鸟" anim="Item,BirdPivot" label="" />
   <item id="5" name="黄色小蜜蜂" class="2" class_id="1" coin_person="2.07" person="" skill_cd="" unlock_lv="2" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄色蜜蜂" anim="Elf,Bee_Yellow" label="" />
   <item id="6" name="紫色小蜜蜂" class="2" class_id="2" coin_person="2.96" person="" skill_cd="" unlock_lv="10" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="1600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫色蜜蜂" anim="Elf,Bee_Purple" label="" />

BIN
Assets/Resource/Xlsx/ability_config.xlsx


+ 3 - 2
Assets/Script/Label/ObjectLabel.cs

@@ -649,16 +649,17 @@ 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_EnterMinigamePanelMask = "AC_EnterMinigamePanelMask";
 	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_ConfirmButtonTitle = "AC_ConfirmButtonTitle";
 	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_CDMinigameMask = "AD_CDMinigameMask";
 	public static string AD_CDMinigamePanel = "AD_CDMinigamePanel";
 	public static string AD_Title = "AD_Title";
 	public static string AD_CoinToggle = "AD_CoinToggle";

+ 3 - 3
Assets/Script/Manage/CDMinigamePanelManager.cs

@@ -69,7 +69,7 @@ public class CDMinigamePanelManager : Regist
         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);
+        Mask = ResourceManager.Get(ObjectLabel.AD_CDMinigameMask);
         CoinToggle = ResourceManager.Get<Toggle>(ObjectLabel.AD_CoinToggle);
         DiamondToggle = ResourceManager.Get<Toggle>(ObjectLabel.AD_DiamondToggle);
         CloseButton = ResourceManager.Get<Button>(ObjectLabel.AD_CloseButton);
@@ -155,7 +155,7 @@ public class CDMinigamePanelManager : Regist
             null,
             CoinCost,
             Current.Coin,
-            () => { Manager.MinigameCDTimer -= CoinCDAmount; },
+            () => { Manager.MinigameCDTimer -= CoinCDAmount; AudioManager.PlayClip(ResourceLabel.CurrentClip); },
             StaticsManager.ItemID.冷却小游戏,
             StaticsManager.ConsumeModule.Charge,
             false
@@ -169,7 +169,7 @@ public class CDMinigamePanelManager : Regist
             null,
             DiamondCost,
             Current.Diamond,
-            () => { Manager.MinigameCDTimer = 0; },
+            () => { Manager.MinigameCDTimer = 0; AudioManager.PlayClip(ResourceLabel.CurrentClip); },
             StaticsManager.ItemID.冷却小游戏,
             StaticsManager.ConsumeModule.Charge,
             false

+ 15 - 0
Assets/Script/Manage/DebugManager.cs

@@ -59,6 +59,21 @@ public class DebugManager : MonoBehaviour
     }
 
 
+    public static void ResetAbilityAnim()
+    {
+        SkillRoot skillRoot = Manager.SkillDictionary["Ability2"];
+        skillRoot.Level = 0;
+        skillRoot.ItemStatus = SkillStatus.Lock;
+
+        skillRoot = Manager.SkillDictionary["Ability3"];
+        skillRoot.Level = 0;
+        skillRoot.ItemStatus = SkillStatus.Lock;
+
+        skillRoot = Manager.SkillDictionary["Ability4"];
+        skillRoot.Level = 0;
+        skillRoot.ItemStatus = SkillStatus.Lock;
+    }
+
     public static void ResetGardenLevel(int level)
     {
         SkillRoot skillRoot = Manager.SkillDictionary["Ability1"];

+ 26 - 7
Assets/Script/Manage/EnterMinigamePanelManager.cs

@@ -2,22 +2,41 @@
 using System.Collections.Generic;
 
 using UnityEngine;
+using UnityEngine.UI;
 
-public class EnterMinigamePanelManager : MonoBehaviour
+public class EnterMinigamePanelManager : Regist
 {
     #region Config
-    
-    
-    
+
+    private static Text Title;
+    private static Text CostText;
+    private static Text ChangeButtonTitle;
+    private static Text ConfirmButtonTitle;
+    private static Button ChangeButton;
+    private static Button CloseButton;
+    private static Transform Mask;
+
     #endregion
 
-    public void Start()
+    public override void RegistReference()
     {
-
+        Title = ResourceManager.Get<Text>(ObjectLabel.AC_Title);
+        CostText = ResourceManager.Get<Text>(ObjectLabel.AC_CostText);
+        ChangeButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AC_ChangeButtonTitle);
+        ConfirmButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AC_ConfirmButtonTitle);
+        ChangeButton = ResourceManager.Get<Button>(ObjectLabel.AC_ChangeButton);
+        CloseButton = ResourceManager.Get<Button>(ObjectLabel.AC_CloseButton);
+        Mask = ResourceManager.Get(ObjectLabel.AC_EnterMinigamePanelMask);
     }
 
-    public void Update()
+
+    public static void OpenPanel()
     {
+        Mask.TweenForCG();
+    }
 
+    public static void ClosePanel()
+    {
+        Mask.TweenBacCG();
     }
 }

+ 3 - 0
Assets/Script/Manage/Initializer.cs

@@ -204,6 +204,9 @@ public class Initializer : MonoBehaviour
         gameObject.AddScript<CDMinigamePanelManager>();
 
         InitScriptProgress = index++.ToString();
+        gameObject.AddScript<EnterMinigamePanelManager>();
+
+        InitScriptProgress = index++.ToString();
         StartCoroutine(WaitToInit());
     }
 

+ 1 - 1
Assets/Script/Tool/Auxiliary.cs

@@ -179,7 +179,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-
+            DebugManager.ResetAbilityAnim();
         }
 
         if (Input.GetKeyDown(KeyCode.V))