修复精灵动画Bug

Assets/AtlasUtility/SerializeObject.prefab

@@ -60,10 +60,6 @@ MonoBehaviour:
   SlicePath: Assets/AtlasUtility/Slice
   PackName: PanelAtlas
   Atlas: {fileID: 0}
-  Target: {fileID: 2800000, guid: 6d7a9b26c5292f24da196644249fb8b0, type: 3}
-  TextureList:
-  - {fileID: 2800000, guid: 4b2aa598a8b767740afbd328b6a4f6af, type: 3}
-  - {fileID: 2800000, guid: b070139c782da6b4cb35cc70c7d66274, type: 3}
-  - {fileID: 2800000, guid: b53e691e4c8fc5c45b3b5436708d5c4d, type: 3}
-  - {fileID: 2800000, guid: 2304504aea964d54c8d62a15dc5067bf, type: 3}
+  Target: {fileID: 2800000, guid: f6baf652ebcd8ed4093bcf36bbc8a007, type: 3}
+  TextureList: []
   VirtualTextureList: []

Assets/Resource/Logo.unity

@@ -173,7 +173,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!81 &1218118078
 AudioListener:
   m_ObjectHideFlags: 0
@@ -242,6 +242,58 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1407270616
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 212597787890355580, guid: 88b6da1c153074445a6a8f8165071b0e,
+        type: 2}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 16e6ce922a163bb47897b95252dad38e,
+        type: 3}
+    - target: {fileID: 1718165080095612, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_Name
+      value: Flower (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1511433816
 GameObject:
   m_ObjectHideFlags: 0
@@ -260,7 +312,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!95 &1511433817
 Animator:
   serializedVersion: 3
@@ -418,6 +470,54 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &1794925139
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4157267071062646, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 212597787890355580, guid: 88b6da1c153074445a6a8f8165071b0e,
+        type: 2}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300048, guid: 9c73f3cb846e0d74ea3440644afa75b3,
+        type: 3}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0
@@ -433,7 +533,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 4294967295
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1833966244
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/Object/Flower.prefab

@@ -68,7 +68,7 @@ GameObject:
   - component: {fileID: 4432107378253174}
   - component: {fileID: 212559062906635094}
   m_Layer: 0
-  m_Name: FlowerIcon
+  m_Name: FlowerShadow
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -282,6 +282,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1805162491108556
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4845512422489780}
+  - component: {fileID: 212597787890355580}
+  m_Layer: 0
+  m_Name: FlowerIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1813455588127836
 GameObject:
   m_ObjectHideFlags: 1
@@ -450,11 +466,11 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1172671826056066}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.83, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: 0, y: 0.05, z: 0.001}
+  m_LocalScale: {x: 1.0732924, y: 1.0732924, z: 1.0732924}
   m_Children: []
   m_Father: {fileID: 4916747695851704}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4574206532300710
 Transform:
@@ -564,6 +580,19 @@ Transform:
   m_Father: {fileID: 4157267071062646}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!4 &4845512422489780
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1805162491108556}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.83, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4916747695851704}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4916747695851704
 Transform:
   m_ObjectHideFlags: 1
@@ -574,6 +603,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 4845512422489780}
   - {fileID: 4432107378253174}
   m_Father: {fileID: 4157267071062646}
   m_RootOrder: 1
@@ -6112,6 +6142,41 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: f6baf652ebcd8ed4093bcf36bbc8a007, type: 3}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!212 &212597787890355580
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1805162491108556}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
   m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/Resource/Prefab/Object/Player.prefab

@@ -66,6 +66,7 @@ GameObject:
   - component: {fileID: 4072475945792000}
   - component: {fileID: 61739891942898918}
   - component: {fileID: 61000764261009850}
+  - component: {fileID: 212266614054406428}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -273,6 +274,41 @@ BoxCollider2D:
   m_Offset: {x: 0.35000008, y: 2.674964}
   serializedVersion: 2
   m_Size: {x: 5.5, y: 4.1500735}
+--- !u!212 &212266614054406428
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1419661773526862}
+  m_Enabled: 0
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
 --- !u!212 &212671680300845312
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Resource/Prefab/Object/Tutorial.prefab

@@ -163,7 +163,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1565153195114942}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -1, z: -2}
+  m_LocalPosition: {x: 0, y: -1, z: -2.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4598537938384872}
@@ -194,7 +194,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1157987086321942}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -1, z: -2}
+  m_LocalPosition: {x: 0, y: -1, z: -2.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4952097666079734}
@@ -248,7 +248,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1225250209188074}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1, z: -2}
+  m_LocalPosition: {x: 0, y: -1, z: -2.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4623297893201200}

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -313,7 +313,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1122321127892574
 GameObject:
   m_ObjectHideFlags: 1
@@ -4530,7 +4530,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300010, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Resource/Prefab/PrefabUI/GroupB.prefab

@@ -530,21 +530,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1179278819294302
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224040776335846876}
-  m_Layer: 5
-  m_Name: GameObject
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1184395428318734
 GameObject:
   m_ObjectHideFlags: 1
@@ -3204,7 +3189,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 1258b465a9bfc8042822c22571387170, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3727,7 +3712,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: ee6655093ea65d94b8e4e21f6c532fe8, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4578,7 +4563,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300018, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4907,7 +4892,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300010, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4961,7 +4946,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300018, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5517,7 +5502,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300018, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7876,7 +7861,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 5371bd980fad6824f97fe233859670b5, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -10397,24 +10382,6 @@ RectTransform:
   m_AnchoredPosition: {x: 60, y: -20}
   m_SizeDelta: {x: 120, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224040776335846876
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1179278819294302}
-  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: 224154922450331810}
-  m_RootOrder: 1
-  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: 0.000015262, y: -144.53}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: -0.000000049351854}
 --- !u!224 &224044230879103442
 RectTransform:
   m_ObjectHideFlags: 1
@@ -10869,7 +10836,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224248829419020354}
-  - {fileID: 224040776335846876}
   m_Father: {fileID: 224044230879103442}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -1816,7 +1816,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300016, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2519,7 +2519,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300016, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Resource/Sprite/Garden/FlowerAtlas1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 9c73f3cb846e0d74ea3440644afa75b3
-timeCreated: 1502510964
+timeCreated: 1502592283
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -85,6 +85,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -442,5 +466,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: atlas2
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/FlowerAtlas2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e3d95dbc6a535444c898a18f384300ef
-timeCreated: 1502511052
+timeCreated: 1502592305
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -67,6 +67,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -190,5 +214,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: atlas2
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/FlowerItemAtlas1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b355d692dda42ec4c9f8ebd6d9056bbf
-timeCreated: 1502523997
+timeCreated: 1502592286
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -68,6 +68,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -204,5 +228,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: scene
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/GardenAtlas1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 700a246d0e2b9b740a21b1304a4a8d28
-timeCreated: 1502433524
+timeCreated: 1502592246
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -70,6 +70,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

Assets/Resource/Sprite/SpriteUI/Atlas.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 64ace2edec65be1458f4f6c09ae97699
-timeCreated: 1499829151
+timeCreated: 1502583930
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -8,6 +8,7 @@ TextureImporter:
     21300002: "\u94BB\u77F3"
     21300004: "\u82B1\u6735"
     21300006: "\u5DF2\u8D2D"
+    21300008: "\u793C\u5305"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -98,26 +99,39 @@ TextureImporter:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
-      name: "\u82B1\u6735"
+      name: "\u5DF2\u8D2D"
       rect:
         serializedVersion: 2
-        x: 0
-        y: 328
-        width: 196
-        height: 182
+        x: 1
+        y: 375
+        width: 131
+        height: 106
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: 0
     - serializedVersion: 2
-      name: "\u94BB\u77F3"
+      name: "\u793C\u5305"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 231
-        width: 90
-        height: 88
+        x: 7
+        y: 185
+        width: 182
+        height: 176
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u82B1\u6735"
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 1
+        width: 197
+        height: 182
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -127,9 +141,9 @@ TextureImporter:
       name: "\u91D1\u5E01"
       rect:
         serializedVersion: 2
-        x: 101
-        y: 232
-        width: 88
+        x: 199
+        y: 91
+        width: 89
         height: 87
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
@@ -137,13 +151,13 @@ TextureImporter:
       outline: []
       tessellationDetail: 0
     - serializedVersion: 2
-      name: "\u5DF2\u8D2D"
+      name: "\u94BB\u77F3"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 121
-        width: 131
-        height: 106
+        x: 199
+        y: 1
+        width: 90
+        height: 88
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}

Assets/Resource/Sprite/SpriteUI/BtnAtlas1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8d5fb26beef3dde488c316021ca5729f
-timeCreated: 1502443586
+timeCreated: 1502590463
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -63,6 +63,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 512
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 512
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 512
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

Assets/Resource/Sprite/SpriteUI/PanelAtlas1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b4753f945f61e8243ba014be4a705de7
-timeCreated: 1502442658
+timeCreated: 1502592291
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -63,6 +63,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

Assets/Resource/Sprite/SpriteUI/Skill/SkillAtlas.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c8ea69d236ed4014aa4113d71295370f
-timeCreated: 1502528665
+timeCreated: 1502592296
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -98,6 +98,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -624,5 +648,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: atlas2
   assetBundleVariant: 

Assets/Resource/XML/Config/achieve_config.xml

@@ -73,18 +73,18 @@
   <item id="224" index="12" name="积少成多-4" desc="收集花园里的金币600次" type="12" value="1000" parent="223" del="1" diamond_once="25" coin_person="" person="" icon="绿-金币包3" />
   <item id="225" index="12" name="积少成多-5" desc="收集花园里的金币1000次" type="12" value="5000" parent="224" del="1" diamond_once="40" coin_person="" person="" icon="绿-金币包3" />
   <item id="226" index="12" name="积少成多-6" desc="收集花园里的金币2500次" type="12" value="10000" parent="225" del="0" diamond_once="50" coin_person="" person="" icon="绿-金币包3" />
-  <item id="241" index="13" name="花费的钻石-1" desc="" type="13" value="10" parent="" del="1" diamond_once="10" coin_person="" person="" icon="蓝-大量钻石" />
-  <item id="242" index="13" name="花费的钻石-2" desc="" type="13" value="20" parent="241" del="1" diamond_once="15" coin_person="" person="" icon="蓝-大量钻石" />
-  <item id="243" index="13" name="花费的钻石-3" desc="" type="13" value="30" parent="242" del="1" diamond_once="20" coin_person="" person="" icon="蓝-大量钻石" />
-  <item id="244" index="13" name="花费的钻石-4" desc="" type="13" value="2000" parent="243" del="1" diamond_once="25" coin_person="" person="" icon="蓝-大量钻石" />
-  <item id="245" index="13" name="花费的钻石-5" desc="" type="13" value="50" parent="244" del="1" diamond_once="40" coin_person="" person="" icon="蓝-大量钻石" />
-  <item id="246" index="13" name="花费的钻石-6" desc="" type="13" value="60" parent="245" del="0" diamond_once="50" coin_person="" person="" icon="蓝-大量钻石" />
-  <item id="261" index="14" name="拥有的服装-1" desc="" type="14" value="2" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="262" index="14" name="拥有的服装-2" desc="" type="14" value="4" parent="261" del="1" diamond_once="15" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="263" index="14" name="拥有的服装-3" desc="" type="14" value="6" parent="262" del="1" diamond_once="20" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="264" index="14" name="拥有的服装-4" desc="" type="14" value="8" parent="263" del="1" diamond_once="25" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="265" index="14" name="拥有的服装-5" desc="" type="14" value="20" parent="264" del="1" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="266" index="14" name="拥有的服装-6" desc="" type="14" value="30" parent="265" del="0" diamond_once="50" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="241" index="13" name="花费的钻石-1" desc="" type="13" value="500" parent="" del="1" diamond_once="10" coin_person="" person="" icon="蓝-大量钻石" />
+  <item id="242" index="13" name="花费的钻石-2" desc="" type="13" value="1500" parent="241" del="1" diamond_once="15" coin_person="" person="" icon="蓝-大量钻石" />
+  <item id="243" index="13" name="花费的钻石-3" desc="" type="13" value="5000" parent="242" del="1" diamond_once="20" coin_person="" person="" icon="蓝-大量钻石" />
+  <item id="244" index="13" name="花费的钻石-4" desc="" type="13" value="10000" parent="243" del="1" diamond_once="25" coin_person="" person="" icon="蓝-大量钻石" />
+  <item id="245" index="13" name="花费的钻石-5" desc="" type="13" value="50000" parent="244" del="1" diamond_once="40" coin_person="" person="" icon="蓝-大量钻石" />
+  <item id="246" index="13" name="花费的钻石-6" desc="" type="13" value="500000" parent="245" del="0" diamond_once="50" coin_person="" person="" icon="蓝-大量钻石" />
+  <item id="261" index="14" name="拥有的服装-1" desc="" type="14" value="6" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="262" index="14" name="拥有的服装-2" desc="" type="14" value="9" parent="261" del="1" diamond_once="15" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="263" index="14" name="拥有的服装-3" desc="" type="14" value="15" parent="262" del="1" diamond_once="20" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="264" index="14" name="拥有的服装-4" desc="" type="14" value="30" parent="263" del="1" diamond_once="25" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="265" index="14" name="拥有的服装-5" desc="" type="14" value="60" parent="264" del="1" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="266" index="14" name="拥有的服装-6" desc="" type="14" value="100" parent="265" del="0" diamond_once="50" coin_person="" person="" icon="绿-繁花似锦" />
   <comment>
     <id>
 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="-2" />
+  <Version value="-6" />
 
   <ID value="Default" />
   <TutorialA value="1" />

Assets/Script/Extension/ExtensionAnim.cs

@@ -96,6 +96,11 @@ public static class ExtensionAnim
         return ManaAnim.TweenForSr(comp.transform);
     }
 
+    public static TweenRenderer TweenForRenderer(this Renderer comp)
+    {
+        return ManaAnim.TweenForRenderer(comp);
+    }
+
     public static TweenCG TweenForCG(this Component comp)
     {
         return ManaAnim.TweenForCG(comp.transform);
@@ -156,6 +161,16 @@ public static class ExtensionAnim
         return ManaAnim.TweenForMatFloat(materialUnit);
     }
 
+    public static TweenMatColor TweenForMatColor(this MaterialUnit materialUnit)
+    {
+        return ManaAnim.TweenForMatColor(materialUnit);
+    }
+
+
+    public static TweenRenderer TweenBacRenderer(this Renderer comp)
+    {
+        return ManaAnim.TweenBacRenderer(comp);
+    }
 
     public static TweenSr TweenBacSr(this Component comp)
     {
@@ -222,6 +237,16 @@ public static class ExtensionAnim
         return ManaAnim.TweenBacMatFloat(materialUnit);
     }
 
+    public static TweenMatColor TweenBacMatColor(this MaterialUnit materialUnit)
+    {
+        return ManaAnim.TweenBacMatColor(materialUnit);
+    }
+
+
+    public static TweenRenderer TweenReForRenderer(this Renderer comp)
+    {
+        return ManaAnim.TweenReForRenderer(comp);
+    }
 
     public static TweenSr TweenReForSr(this Component comp)
     {
@@ -288,6 +313,16 @@ public static class ExtensionAnim
         return ManaAnim.TweenReForMatFloat(materialUnit);
     }
 
+    public static TweenMatColor TweenReForMatColor(this MaterialUnit materialUnit)
+    {
+        return ManaAnim.TweenReForMatColor(materialUnit);
+    }
+
+
+    public static TweenRenderer TweenReBacRenderer(this Renderer comp)
+    {
+        return ManaAnim.TweenReBacRenderer(comp);
+    }
 
     public static TweenSr TweenReBacSr(this Component comp)
     {
@@ -354,6 +389,16 @@ public static class ExtensionAnim
         return ManaAnim.TweenReBacMatFloat(materialUnit);
     }
 
+    public static TweenMatColor TweenReBacMatColor(this MaterialUnit materialUnit)
+    {
+        return ManaAnim.TweenReBacMatColor(materialUnit);
+    }
+
+
+    public static TweenRenderer GetTweenRenderer(this Renderer comp)
+    {
+        return ManaAnim.GetTweenRenderer(comp);
+    }
 
     public static TweenSr GetTweenSr(this Component comp)
     {
@@ -420,6 +465,32 @@ public static class ExtensionAnim
         return ManaAnim.GetTweenMatFloat(materialUnit);
     }
 
+    public static TweenMatColor GetTweenMatColor(this MaterialUnit materialUnit)
+    {
+        return ManaAnim.GetTweenMatColor(materialUnit);
+    }
+
+
+    public static TweenRenderer CreateTweenRenderer(this Renderer comp, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    {
+        return ManaAnim.CreateTweenRenderer(comp, origin, destination, duration, originActive, destActive, curve, cg, group);
+    }
+
+    public static TweenRenderer CreateTweenRenderer(this Renderer comp, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    {
+        return ManaAnim.CreateTweenRenderer(comp, destination, duration, originActive, destActive, curve, cg, group);
+    }
+
+    public static TweenRenderer CreateTweenRenderer(this Renderer comp, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    {
+        return ManaAnim.CreateTweenRenderer(comp, origin, destination, duration, originActive, destActive, curve, cg, group);
+    }
+
+    public static TweenRenderer CreateTweenRenderer(this Renderer comp, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    {
+        return ManaAnim.CreateTweenRenderer(comp, destination, duration, originActive, destActive, curve, cg, group);
+    }
+
 
     public static TweenSr CreateTweenSr(this Component comp, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
     {
@@ -613,6 +684,16 @@ public static class ExtensionAnim
     }
 
 
+    public static TweenMatColor CreateTweenMatColor(this MaterialUnit materialUnit, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        return ManaAnim.CreateTweenMatColor(materialUnit, origin, destination, duration, originActive, destActive, curve, cg);
+    }
+
+    public static TweenMatColor CreateTweenMatColor(this MaterialUnit materialUnit, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        return ManaAnim.CreateTweenMatColor(materialUnit, destination, duration, originActive, destActive, curve, cg);
+    }
+
     public static TweenMatFloat CreateTweenMatFloat(this MaterialUnit materialUnit, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         return ManaAnim.CreateTweenMatFloat(materialUnit, origin, destination, duration, originActive, destActive, curve, cg);

Assets/Script/Manage/Initializer.cs

@@ -91,20 +91,41 @@ public class Initializer : MonoBehaviour
         GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1";
 
         ManaTutorial.TutorialA = ManaData.GetPlayerBool("TutorialA");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-1";
+
         ManaTutorial.TutorialB_ = ManaData.GetPlayerBool("TutorialB");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-2";
+
         ManaTutorial.TutorialC_ = ManaData.GetPlayerBool("TutorialC");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-3";
+
         ManaTutorial.TutorialD_ = ManaData.GetPlayerBool("TutorialD");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-4";
+
         ManaTutorial.TutorialE_ = ManaData.GetPlayerBool("TutorialE");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-5";
+
         ManaTutorial.TutorialIndexA = ManaData.GetPlayerInt("TutorialIndexA");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-6";
+
         ManaTutorial.TutorialIndexB = ManaData.GetPlayerInt("TutorialIndexB");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-7";
+
         ManaTutorial.TutorialIndexC = ManaData.GetPlayerInt("TutorialIndexC");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-8";
+
         ManaTutorial.TutorialIndexD = ManaData.GetPlayerInt("TutorialIndexD");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-9";
+
         ManaTutorial.TutorialIndexE = ManaData.GetPlayerInt("TutorialIndexE");
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-10";
 
         Bundle.LoadAtlas2Sprite();
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-11";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
+            GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-12-" + RegistList[i].GetType();
             RegistList[i].Instantiate();
         }
 

Assets/Script/Manage/ManaAnim.cs

@@ -61,10 +61,23 @@ public class MaterialUnit
         }
     }
 
+    public void SetColor(Color value)
+    {
+        for (int i = 0; i < PropertyList.Count; i++)
+        {
+            Material.SetColor(PropertyList[i], value);
+        }
+    }
+
     public float GetFloat()
     {
         return Material.GetFloat(PropertyList[0]);
     }
+
+    public Color GetColor()
+    {
+        return Material.GetColor(PropertyList[0]);
+    }
 }
 
 public class ManaAnim : Regist
@@ -99,8 +112,10 @@ public class ManaAnim : Regist
     public static Dictionary<Transform, TweenScale> TweenScaleDic = new Dictionary<Transform, TweenScale>();
     public static Dictionary<Transform, TweenOutline> TweenOutlineDic = new Dictionary<Transform, TweenOutline>();
     public static Dictionary<Transform, TweenNumber> TweenNumberDic = new Dictionary<Transform, TweenNumber>();
+    public static Dictionary<Renderer, TweenRenderer> TweenRendererDic = new Dictionary<Renderer, TweenRenderer>();
     public static Dictionary<AudioSource, TweenAudio> TweenAudioDic = new Dictionary<AudioSource, TweenAudio>();
 
+    public static Dictionary<MaterialUnit, TweenMatColor> TweenMatColorDic = new Dictionary<MaterialUnit, TweenMatColor>();
     public static Dictionary<MaterialUnit, TweenMatFloat> TweenMatFloatDic = new Dictionary<MaterialUnit, TweenMatFloat>();
 
     public static Dictionary<Transform, StreamScale> StreamScaleDic = new Dictionary<Transform, StreamScale>();
@@ -704,6 +719,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenRenderer TweenForRenderer(Renderer target)
+    {
+        TweenRenderer tween;
+
+        if (TweenRendererDic.TryGetValue(target, out tween))
+        {
+            tween.StartForward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
     public static TweenCG TweenForCG(Transform target)
     {
         TweenCG tween;
@@ -897,6 +928,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenMatColor TweenForMatColor(MaterialUnit target)
+    {
+        TweenMatColor tween;
+
+        if (TweenMatColorDic.TryGetValue(target, out tween))
+        {
+            tween.StartForward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
 
     public static TweenSr TweenBacSr(Transform target)
     {
@@ -914,6 +961,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenRenderer TweenBacRenderer(Renderer target)
+    {
+        TweenRenderer tween;
+
+        if (TweenRendererDic.TryGetValue(target, out tween))
+        {
+            tween.StartBackward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
     public static TweenCG TweenBacCG(Transform target)
     {
         TweenCG tween;
@@ -1107,6 +1170,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenMatColor TweenBacMatColor(MaterialUnit target)
+    {
+        TweenMatColor tween;
+
+        if (TweenMatColorDic.TryGetValue(target, out tween))
+        {
+            tween.StartBackward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
 
     public static TweenSr TweenReForSr(Transform target)
     {
@@ -1124,6 +1203,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenRenderer TweenReForRenderer(Renderer target)
+    {
+        TweenRenderer tween;
+
+        if (TweenRendererDic.TryGetValue(target, out tween))
+        {
+            tween.ReForward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
     public static TweenCG TweenReForCG(Transform target)
     {
         TweenCG tween;
@@ -1317,6 +1412,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenMatColor TweenReForMatColor(MaterialUnit target)
+    {
+        TweenMatColor tween;
+
+        if (TweenMatColorDic.TryGetValue(target, out tween))
+        {
+            tween.ReForward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
 
     public static TweenSr TweenReBacSr(Transform target)
     {
@@ -1334,6 +1445,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenRenderer TweenReBacRenderer(Renderer target)
+    {
+        TweenRenderer tween;
+
+        if (TweenRendererDic.TryGetValue(target, out tween))
+        {
+            tween.ReBackward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
     public static TweenCG TweenReBacCG(Transform target)
     {
         TweenCG tween;
@@ -1527,6 +1654,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenMatColor TweenReBacMatColor(MaterialUnit target)
+    {
+        TweenMatColor tween;
+
+        if (TweenMatColorDic.TryGetValue(target, out tween))
+        {
+            tween.ReBackward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
     #endregion
 
     #region 获取动画
@@ -1667,6 +1810,20 @@ public class ManaAnim : Regist
         }
     }
 
+    public static TweenRenderer GetTweenRenderer(Renderer target)
+    {
+        TweenRenderer tween;
+
+        if (TweenRendererDic.TryGetValue(target, out tween))
+        {
+            return tween;
+        }
+        else
+        {
+            return null;
+        }
+    }
+
     public static TweenCG GetTweenCG(Transform target)
     {
         TweenCG tween;
@@ -1836,6 +1993,20 @@ public class ManaAnim : Regist
         }
     }
 
+    public static TweenMatColor GetTweenMatColor(MaterialUnit target)
+    {
+        TweenMatColor tween;
+
+        if (TweenMatColorDic.TryGetValue(target, out tween))
+        {
+            return tween;
+        }
+        else
+        {
+            return null;
+        }
+    }
+
     #endregion
 
     #region 创建动画
@@ -2087,7 +2258,118 @@ public class ManaAnim : Regist
             return tweenSr;
         }
     }
-    
+
+
+    public static TweenRenderer CreateTweenRenderer(Renderer target, float originAlpha, float destAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    {
+        TweenRenderer tweenSr;
+        Renderer sr = target.GetComponent<Renderer>();
+
+        Color origin = sr.material.GetColor("_Color");
+        Color destination = sr.material.GetColor("_Color");
+
+        origin.a = originAlpha;
+        destination.a = destAlpha;
+
+        if (TweenRendererDic.ContainsKey(target))
+        {
+            tweenSr = TweenRendererDic[target];
+
+            tweenSr.Pause();
+
+            TweenRendererDic[target] = new TweenRenderer(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
+
+            return TweenRendererDic[target];
+        }
+        else
+        {
+            tweenSr = new TweenRenderer(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
+
+            TweenRendererDic.Add(target, tweenSr);
+
+            return tweenSr;
+        }
+    }
+
+    public static TweenRenderer CreateTweenRenderer(Renderer target, float destAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    {
+        TweenRenderer tweenSr;
+        Renderer sr = target.GetComponent<Renderer>();
+
+        Color destination = sr.material.GetColor("_Color");
+
+        destination.a = destAlpha;
+
+        if (TweenRendererDic.ContainsKey(target))
+        {
+            tweenSr = TweenRendererDic[target];
+
+            tweenSr.Pause();
+
+            TweenRendererDic[target] = new TweenRenderer(sr, sr.material.GetColor("_Color"), destination, duration, originActive, destActive, curve, cg, group);
+
+            return TweenRendererDic[target];
+        }
+        else
+        {
+            tweenSr = new TweenRenderer(sr, sr.material.GetColor("_Color"), destination, duration, originActive, destActive, curve, cg, group);
+
+            TweenRendererDic.Add(target, tweenSr);
+
+            return tweenSr;
+        }
+    }
+
+    public static TweenRenderer CreateTweenRenderer(Renderer target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    {
+        TweenRenderer tweenSr;
+        Renderer sr = target.GetComponent<Renderer>();
+
+        if (TweenRendererDic.ContainsKey(target))
+        {
+            tweenSr = TweenRendererDic[target];
+
+            tweenSr.Pause();
+
+            TweenRendererDic[target] = new TweenRenderer(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
+
+            return TweenRendererDic[target];
+        }
+        else
+        {
+            tweenSr = new TweenRenderer(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
+
+            TweenRendererDic.Add(target, tweenSr);
+
+            return tweenSr;
+        }
+    }
+
+    public static TweenRenderer CreateTweenRenderer(Renderer target, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    {
+        TweenRenderer tweenSr;
+        Renderer sr = target.GetComponent<Renderer>();
+
+        if (TweenRendererDic.ContainsKey(target))
+        {
+            tweenSr = TweenRendererDic[target];
+
+            tweenSr.Pause();
+
+            TweenRendererDic[target] = new TweenRenderer(sr, sr.material.GetColor("_Color"), destination, duration, originActive, destActive, curve, cg, group);
+
+            return TweenRendererDic[target];
+        }
+        else
+        {
+            tweenSr = new TweenRenderer(sr, sr.material.GetColor("_Color"), destination, duration, originActive, destActive, curve, cg, group);
+
+            TweenRendererDic.Add(target, tweenSr);
+
+            return tweenSr;
+        }
+    }
+
 
     public static TweenCG CreateTweenCG(Transform target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
     {
@@ -2994,6 +3276,54 @@ public class ManaAnim : Regist
     }
 
 
+    public static TweenMatColor CreateTweenMatColor(MaterialUnit target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        TweenMatColor tweenMatColor;
+
+        if (TweenMatColorDic.ContainsKey(target))
+        {
+            tweenMatColor = TweenMatColorDic[target];
+
+            tweenMatColor.Pause();
+
+            TweenMatColorDic[target] = new TweenMatColor(target, origin, destination, duration, originActive, destActive, curve, cg);
+
+            return TweenMatColorDic[target];
+        }
+        else
+        {
+            tweenMatColor = new TweenMatColor(target, origin, destination, duration, originActive, destActive, curve, cg);
+
+            TweenMatColorDic.Add(target, tweenMatColor);
+
+            return tweenMatColor;
+        }
+    }
+
+    public static TweenMatColor CreateTweenMatColor(MaterialUnit target, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        TweenMatColor tweenMatColor;
+
+        if (TweenMatColorDic.ContainsKey(target))
+        {
+            tweenMatColor = TweenMatColorDic[target];
+
+            tweenMatColor.Pause();
+
+            TweenMatColorDic[target] = new TweenMatColor(target, target.GetColor(), destination, duration, originActive, destActive, curve, cg);
+
+            return TweenMatColorDic[target];
+        }
+        else
+        {
+            tweenMatColor = new TweenMatColor(target, target.GetColor(), destination, duration, originActive, destActive, curve, cg);
+
+            TweenMatColorDic.Add(target, tweenMatColor);
+
+            return tweenMatColor;
+        }
+    }
+
     public static TweenMatFloat CreateTweenMatFloat(MaterialUnit target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         TweenMatFloat tweenMatFloat;

Assets/Script/Manage/ManaGarden.cs

@@ -162,6 +162,11 @@ public class ManaGarden : Regist
 
     public void ElfThread()
     {
+        if (!MiniLock)
+        {
+            return;
+        }
+
         ElfTimer -= Time.fixedDeltaTime;
 
         if (ElfTimer < 0)
@@ -326,7 +331,7 @@ public class ManaGarden : Regist
     {
         Transform tra = ManaReso.Get("Page", Folder.Scene, false, ManaReso.Get("GardenPage"), false, ObjType.Page);
         
-        float offset = Page*19.2f;
+        float offset = Page*18.9f;
 
         tra.SetLX(offset);
 

Assets/Script/Manage/ManaReso.cs

@@ -647,6 +647,7 @@ public class ManaReso : Regist
         flower.FlowerInfo = flowerInfo;
         flower.Slot = slot;
 
+        flower.SetShadow();
         flower.SetCollider(collider);
 
         return flower;
@@ -664,6 +665,7 @@ public class ManaReso : Regist
 
         flower.FlowerInfo = flowerInfo;
 
+        flower.SetShadow();
         flower.SetCollider(false);
 
         return flower;

Assets/Script/Manage/ManaServer.cs

@@ -168,7 +168,7 @@ public class ManaServer : Regist
         }
     }
 
-    private static void GetMainReward(MailReward mailReward)
+    public static void GetMainReward(MailReward mailReward)
     {
         ManaData.SavePlayerString("OneTimeReward", $"{ManaData.GetPlayerString("OneTimeReward")} {mailReward.Id}".Trim(' '));
 
@@ -196,7 +196,7 @@ public class ManaServer : Regist
 
                 mailItem.GetChild(2).GetComponent<Text>().text = pack.Name;
 
-                ManaInfo.Show($"{Language.GetStr("Common", "Get")} {pack.Name}", 10);
+                ManaInfo.Show($"{Language.GetStr("Common", "Get")} <(礼包)>{pack.Name}", 10);
             }
             else
             {
@@ -244,7 +244,7 @@ public class ManaServer : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = closeUnit.Name;
 
-                    ManaInfo.Show($"{Language.GetStr("Common", "Get")} {closeUnit.Name}", 10);
+                    ManaInfo.Show($"{Language.GetStr("Common", "Get")} <(花朵)>{closeUnit.Name}", 10);
                 }
                 else
                 {

Assets/Script/Manage/ManaTutorial.cs

@@ -331,6 +331,21 @@ public class ManaTutorial : Regist
                 ManaAudio.PlayClip(Clip.BtnClip);
 
 
+                if (ManaPlayer.PlayerPink != ManaPlayer.SeleTra)
+                {
+                    ManaPlayer.PlayerPink.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
+                }
+
+                if (ManaPlayer.PlayerBlond != ManaPlayer.SeleTra)
+                {
+                    ManaPlayer.PlayerBlond.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
+                }
+
+                if (ManaPlayer.PlayerBrown != ManaPlayer.SeleTra)
+                {
+                    ManaPlayer.PlayerBrown.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
+                }
+
                 ManaReso.Get("PlayerBk1").SetCollider(false);
                 ManaReso.Get("PlayerBk2").SetCollider(false);
                 ManaReso.Get("PlayerBk3").SetCollider(false);

Assets/Script/Manage/ManaUI.cs

@@ -92,6 +92,9 @@ public class ManaUI : Regist
 
         #region B
 
+        ManaReso.SetSprite("Ba_Icon", ManaReso.LoadSprite("大金币图标", Folder.Scene));
+        ManaReso.SetSprite("Bb_IconB", ManaReso.LoadSprite("大金币图标", Folder.Scene));
+
         ManaLan.Add(ManaReso.Get<Text>("Ba_Lab"), new LanStr("UI", "Ba_Lab"));
         ManaLan.Add(ManaReso.Get<Text>("Ba_ConfirmLab"), new LanStr("UI", "Ba_ConfirmLab"));
 
@@ -273,6 +276,8 @@ public class ManaUI : Regist
 
         #region C
 
+        ManaReso.SetSprite("C_Coin", ManaReso.LoadSprite("金币", Folder.Atlas));
+
         ManaLan.Add(ManaReso.Get<Text>("C_MiniGameLab"), new LanStr("UI", "C_MiniGameLab"));
 
         #region C_Main
@@ -535,6 +540,11 @@ public class ManaUI : Regist
         ManaReso.SetSprite("D_Water2", ManaReso.LoadSprite("Water", Folder.Scene));
         ManaReso.SetSprite("D_Fertilize2", ManaReso.LoadSprite("Fertilize", Folder.Scene));
 
+        ManaReso.SetSprite("Da_Coin", ManaReso.LoadSprite("金币", Folder.Atlas));
+        ManaReso.SetSprite("Da_Star1", ManaReso.LoadSprite("游戏等级评分", Folder.Scene));
+        ManaReso.SetSprite("Da_Star2", ManaReso.LoadSprite("游戏等级评分", Folder.Scene));
+        ManaReso.SetSprite("Da_Star3", ManaReso.LoadSprite("游戏等级评分", Folder.Scene));
+
         ManaLan.Add(ManaReso.Get<Text>("D_DescA"), new LanStr("UI", "D_DescA"));
         ManaLan.Add(ManaReso.Get<Text>("D_DescB"), new LanStr("UI", "D_DescB"));
         ManaLan.Add(ManaReso.Get<Text>("D_DescC"), new LanStr("UI", "D_DescC"));
@@ -714,6 +724,11 @@ public class ManaUI : Regist
             ManaAudio.MusicMini.TweenForAudio();
 
             ManaReso.SetActive("GardenNormal", false);
+
+            for (int i = 0; i < ManaGarden.PlantList.Count; i++)
+            {
+                ManaGarden.PlantList[i].Flower.RetrieveElf();
+            }
         };
 
         tween.OnBackwardStart += () =>

Assets/Script/Object/Flower.cs

@@ -250,6 +250,7 @@ public class Flower : Regist, IPointerClickHandler
             FlowerIcon.sprite = FlowerInfo.Icon;
         }
     }
+    public SpriteRenderer ShadowSr;
 
     public bool Award_;
     private FlowerInfo FlowerInfo_;
@@ -292,6 +293,7 @@ public class Flower : Regist, IPointerClickHandler
         OperateIcon = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
         OperateOutline = ChildDic["OperateOutline1"].GetComponent<SpriteRenderer>();
         NewFlowerEffect = ChildDic["NewFlowerEffect"].GetComponent<ParticleSystem>();
+        ShadowSr = ChildDic["FlowerShadow"].GetComponent<SpriteRenderer>();
 
         GoldBk.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
         GoldIcon.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
@@ -541,6 +543,12 @@ public class Flower : Regist, IPointerClickHandler
         NewFlowerEffectMatUnit.TweenBacMatFloat();
     }
 
+    public void SetShadow()
+    {
+        //ShadowSr.transform.SetLX((FlowerIcon.sprite.pivot.x - 0.5f)*FlowerIcon.sprite.rect.width/100);
+        //ShadowSr.transform.SetLY((FlowerIcon.sprite.pivot.y - 0.5f)*FlowerIcon.sprite.rect.height/100);
+    }
+
 
     public void GetAward()
     {

Assets/Script/Object/Skill/Ability.cs

@@ -286,7 +286,7 @@ public class Ability : SkillRoot
         
         ManaCenter.SkillPlus += NewPlus;
         ManaCenter.SkillPersonBuff += NewPersonBuff;
-
+        
         if (!NewSkillCD.Equal(0))
         {
             for (int i = 0; i < ManaCenter.SkillList.Count; i++)

Assets/Script/Object/Skill/SkillRoot.cs

@@ -273,6 +273,11 @@ public abstract class SkillRoot
 
     protected void UpgradeValue(ref float target, string fml, int offset)
     {
+        if (target.Equal(0))
+        {
+            return;
+        }
+
         if (fml.Contains("%"))
         {
             target += (float.Parse(fml.Replace("%", ""))/100)*offset;

Assets/Script/Tool/Anim/TweenMatColor.cs

@@ -0,0 +1,189 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+public class TweenMatColor : TweenRoot
+{
+    #region 变量
+
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Target.GetColor().Equal(Origin))
+            {
+                InOrigin_ = true;
+            }
+            else
+            {
+                InOrigin_ = false;
+            }
+
+            return InOrigin_;
+        }
+        set
+        {
+            InOrigin_ = value;
+
+            InPause = false;
+            InForward = false;
+            InBackward = false;
+
+            if (InOrigin_)
+            {
+                Target.SetColor(Origin);
+
+                BackwardFinish();
+            }
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Target.GetColor().Equal(Destination))
+            {
+                InDestination_ = true;
+            }
+            else
+            {
+                InDestination_ = false;
+            }
+
+            return InDestination_;
+        }
+        set
+        {
+            InDestination_ = value;
+
+            InPause = false;
+            InForward = false;
+            InBackward = false;
+
+            if (InDestination_)
+            {
+                Target.SetColor(Destination);
+
+                ForwardFinish();
+            }
+        }
+    }
+
+    public Color Delta;
+    public Color Origin;
+    public Color Destination;
+
+    public MaterialUnit Target;
+    public CurveFunctionC Func;
+
+    #endregion
+
+    public TweenMatColor(MaterialUnit materialUnit, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false) : base(cg, curve, materialUnit.Transform)
+    {
+        Func = ManaAnim.CurveFuncDicC[curve];
+        Target = materialUnit;
+
+        InForward = false;
+        InBackward = false;
+
+        Delta = destination - origin;
+        Origin = origin;
+        Duration = duration;
+
+        DestActive = destActive;
+        Destination = destination;
+        OriginActive = originActive;
+    }
+
+    public override bool StartForward()
+    {
+        if (base.StartForward())
+        {
+            return true;
+        }
+
+        if (InBackward)
+        {
+            InBackward = false;
+
+            Timer = ManaAnim.GetTimerColor(Target.GetColor(), Duration, Origin, Delta, Curve);
+        }
+
+        return false;
+    }
+
+    public override bool StartBackward()
+    {
+        if (base.StartBackward())
+        {
+            return true;
+        }
+
+        if (InForward)
+        {
+            InForward = false;
+
+            Timer = ManaAnim.GetTimerColor(Target.GetColor(), Duration, Destination, new Color(-Delta.r, -Delta.g, -Delta.b, -Delta.a), Curve);
+        }
+
+        return false;
+    }
+
+    public override bool DoForward()
+    {
+        Timer += Time.fixedDeltaTime;
+
+        if (Timer > Duration)
+        {
+            InDestination = true;
+
+            if (OnForwardFinish != null)
+            {
+                OnForwardFinish.Invoke();
+            }
+
+            SetLoop(EventType.ForwardFinish);
+
+            return true;
+        }
+        else
+        {
+            Color tempColor = Func(Timer, Duration, Origin, Delta);
+
+            Target.SetColor(tempColor);
+
+            return false;
+        }
+    }
+
+    public override bool DoBackward()
+    {
+        Timer += Time.fixedDeltaTime;
+
+        if (Timer > Duration)
+        {
+            InOrigin = true;
+
+            if (OnBackwardFinish != null)
+            {
+                OnBackwardFinish.Invoke();
+            }
+
+            SetLoop(EventType.BackwardFinish);
+
+            return true;
+        }
+        else
+        {
+            Color tempColor = Func(Timer, Duration, Destination, new Color(-Delta.r, -Delta.g, -Delta.b, -Delta.a));
+
+            Target.SetColor(tempColor);
+
+            return false;
+        }
+    }
+}

Assets/Script/Tool/Anim/TweenMatColor.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: c9f9e01769df17d4db8d7269313ef69d
+timeCreated: 1502585784
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Tool/Anim/TweenRenderer.cs

@@ -0,0 +1,346 @@
+using UnityEngine;
+
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+public class TweenRenderer : TweenRoot
+{
+    #region 变量
+
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Target.material.GetColor("_Color").Equal(Origin))
+            {
+                InOrigin_ = true;
+            }
+            else
+            {
+                InOrigin_ = false;
+            }
+
+            return InOrigin_;
+        }
+        set
+        {
+            InOrigin_ = value;
+
+            InPause = false;
+            InForward = false;
+            InBackward = false;
+
+            if (InOrigin_)
+            {
+                Target.material.SetColor("_Color", Origin);
+
+                if (Group)
+                {
+                    for (int i = 0; i < ChildList.Count; i++)
+                    {
+                        if (!ChildList[i].transform.IsChildOf(Target.transform))
+                        {
+                            ChildList.RemoveAt(i--);
+
+                            continue;
+                        }
+
+                        Color selfColor = ColorDic[ChildList[i]];
+
+                        if (AlphaOnly)
+                        {
+                            ChildList[i].material.SetColor("_Color", new Color(selfColor.r, selfColor.g, selfColor.b, selfColor.a * Target.material.GetColor("_Color").a));
+                        }
+                        else
+                        {
+                            ChildList[i].material.SetColor("_Color", selfColor * Target.material.GetColor("_Color"));
+                        }
+                    }
+                }
+
+                BackwardFinish();
+            }
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Target.material.GetColor("_Color").Equal(Destination))
+            {
+                InDestination_ = true;
+            }
+            else
+            {
+                InDestination_ = false;
+            }
+
+            return InDestination_;
+        }
+        set
+        {
+            InDestination_ = value;
+
+            InPause = false;
+            InForward = false;
+            InBackward = false;
+
+            if (InDestination_)
+            {
+                Target.material.SetColor("_Color", Destination);
+
+                if (Group)
+                {
+                    for (int i = 0; i < ChildList.Count; i++)
+                    {
+                        if (!ChildList[i].transform.IsChildOf(Target.transform))
+                        {
+                            ChildList.RemoveAt(i--);
+
+                            continue;
+                        }
+
+                        Color selfColor = ColorDic[ChildList[i]];
+
+                        if (AlphaOnly)
+                        {
+                            ChildList[i].material.SetColor("_Color", new Color(selfColor.r, selfColor.g, selfColor.b, selfColor.a * Target.material.GetColor("_Color").a));
+                        }
+                        else
+                        {
+                            ChildList[i].material.SetColor("_Color", selfColor * Target.material.GetColor("_Color"));
+                        }
+                    }
+                }
+
+                ForwardFinish();
+            }
+        }
+    }
+
+    public bool Group;
+    public bool AlphaOnly;
+
+    public Color Delta;
+    public Color Origin;
+    public Color Destination;
+    public Renderer Target;
+    public CurveFunctionC Func;
+
+    public List<Renderer> ChildList = new List<Renderer>();
+    public Dictionary<Renderer, Color> ColorDic = new Dictionary<Renderer, Color>();
+
+    #endregion
+
+    public TweenRenderer(Renderer target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false) : base(cg, curve, target)
+    {
+        Func = ManaAnim.CurveFuncDicC[curve];
+        Target = target;
+
+        InForward = false;
+        InBackward = false;
+
+        Delta = destination - origin;
+        Origin = origin;
+        Group = group;
+        Duration = duration;
+        DestActive = destActive;
+        Destination = destination;
+        OriginActive = originActive;
+    }
+
+    public override bool StartForward()
+    {
+        if (base.StartForward())
+        {
+            return true;
+        }
+
+        if (Group)
+        {
+            Renderer[] renderers = Target.GetComponentsInChildren<Renderer>();
+
+            ChildList = new List<Renderer>();
+
+            for (int i = 1; i < renderers.Length; i++)
+            {
+                Renderer renderer = renderers[i];
+
+                ChildList.Add(renderer);
+
+                if (!ColorDic.ContainsKey(renderer))
+                {
+                    ColorDic.Add(renderer, renderer.material.GetColor("_Color"));
+                }
+            }
+
+
+            List<Renderer> keyList = ColorDic.Keys.ToList();
+
+            for (int i = 0; i < keyList.Count; i++)
+            {
+                if (!ChildList.Contains(keyList[i]))
+                {
+                    ColorDic.Remove(keyList[i]);
+                }
+            }
+        }
+
+        if (InBackward)
+        {
+            InBackward = false;
+
+            Timer = ManaAnim.GetTimerColor(Target.material.GetColor("_Color"), Duration, Origin, Delta, Curve);
+        }
+
+        return false;
+    }
+
+    public override bool StartBackward()
+    {
+        if (base.StartBackward())
+        {
+            return true;
+        }
+
+        if (Group)
+        {
+            Renderer[] renderers = Target.GetComponentsInChildren<Renderer>();
+
+            ChildList = new List<Renderer>();
+
+            for (int i = 1; i < renderers.Length; i++)
+            {
+                Renderer renderer = renderers[i];
+
+                ChildList.Add(renderer);
+
+                if (!ColorDic.ContainsKey(renderer))
+                {
+                    ColorDic.Add(renderer, renderer.material.GetColor("_Color"));
+                }
+            }
+
+
+            List<Renderer> keyList = ColorDic.Keys.ToList();
+
+            for (int i = 0; i < keyList.Count; i++)
+            {
+                if (!ChildList.Contains(keyList[i]))
+                {
+                    ColorDic.Remove(keyList[i]);
+                }
+            }
+        }
+
+        if (InForward)
+        {
+            InForward = false;
+
+            Timer = ManaAnim.GetTimerColor(Target.material.GetColor("_Color"), Duration, Destination, new Color(-Delta.r, -Delta.g, -Delta.b, -Delta.a), Curve);
+        }
+
+        return false;
+    }
+
+
+    public override bool DoForward()
+    {
+        Timer += Time.fixedDeltaTime;
+
+        if (Timer > Duration)
+        {
+            InDestination = true;
+
+            if (OnForwardFinish != null)
+            {
+                OnForwardFinish.Invoke();
+            }
+
+            SetLoop(EventType.ForwardFinish);
+
+            return true;
+        }
+        else
+        {
+            Target.material.SetColor("_Color", Func(Timer, Duration, Origin, Delta));
+
+            if (Group)
+            {
+                for (int i = 0; i < ChildList.Count; i++)
+                {
+                    if (!ChildList[i].transform.IsChildOf(Target.transform))
+                    {
+                        ChildList.RemoveAt(i--);
+
+                        continue;
+                    }
+
+                    Color selfColor = ColorDic[ChildList[i]];
+
+                    if (AlphaOnly)
+                    {
+                        ChildList[i].material.SetColor("_Color", new Color(selfColor.r, selfColor.g, selfColor.b, selfColor.a * Target.material.GetColor("_Color").a));
+                    }
+                    else
+                    {
+                        ChildList[i].material.SetColor("_Color", selfColor * Target.material.GetColor("_Color"));
+                    }
+                }
+            }
+
+            return false;
+        }
+    }
+
+    public override bool DoBackward()
+    {
+        Timer += Time.fixedDeltaTime;
+
+        if (Timer > Duration)
+        {
+            InOrigin = true;
+
+            if (OnBackwardFinish != null)
+            {
+                OnBackwardFinish.Invoke();
+            }
+
+            SetLoop(EventType.BackwardFinish);
+
+            return true;
+        }
+        else
+        {
+            Target.material.SetColor("_Color", Func(Timer, Duration, Destination, new Color(-Delta.r, -Delta.g, -Delta.b, -Delta.a)));
+
+            if (Group)
+            {
+                for (int i = 0; i < ChildList.Count; i++)
+                {
+                    if (!ChildList[i].transform.IsChildOf(Target.transform))
+                    {
+                        ChildList.RemoveAt(i--);
+
+                        continue;
+                    }
+
+                    Color selfColor = ColorDic[ChildList[i]];
+
+                    if (AlphaOnly)
+                    {
+                        ChildList[i].material.SetColor("_Color", new Color(selfColor.r, selfColor.g, selfColor.b, selfColor.a * Target.material.GetColor("_Color").a));
+                    }
+                    else
+                    {
+                        ChildList[i].material.SetColor("_Color", selfColor * Target.material.GetColor("_Color"));
+                    }
+                }
+            }
+
+            return false;
+        }
+    }
+}

Assets/Script/Tool/Anim/TweenRenderer.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: b0d0251fd0afb8046b62c0c7d5084a33
+timeCreated: 1502587850
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Tool/Anim/TweenSr.cs

@@ -172,7 +172,7 @@ public class TweenSr : TweenRoot
 
                 if (!ColorDic.ContainsKey(renderer))
                 {
-                    ColorDic.Add(renderer, renderer.sharedMaterial.GetColor("_Color"));
+                    ColorDic.Add(renderer, renderer.color);
                 }
             }
 
@@ -219,7 +219,7 @@ public class TweenSr : TweenRoot
 
                 if (!ColorDic.ContainsKey(renderer))
                 {
-                    ColorDic.Add(renderer, renderer.sharedMaterial.GetColor("_Color"));
+                    ColorDic.Add(renderer, renderer.color);
                 }
             }
 

Assets/Script/Tool/Auxiliary.cs

@@ -136,20 +136,20 @@ public class Auxiliary : Regist
         
         if (Input.GetKeyDown(KeyCode.N))
         {
-            ManaCenter.Coin = 0;
-            ManaCenter.Diamond = 0;
-
-            //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
-            //{
-            //    VARIABLE.Value.Unlock = true;
-            //}
+            //ManaCenter.Coin = 0;
+            //ManaCenter.Diamond = 0;
 
             foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
             {
-                VARIABLE.Value.Unlock = false;
+                VARIABLE.Value.Unlock = true;
             }
 
-            ManaGarden.FlowerInfoDic.First().Value.Unlock = true;
+            //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
+            //{
+            //    VARIABLE.Value.Unlock = false;
+            //}
+
+            //ManaGarden.FlowerInfoDic.First().Value.Unlock = true;
         }
 
         if (Input.GetKeyDown(KeyCode.B))
@@ -189,6 +189,12 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.V))
         {
+            //ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
+            //ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
+
+            //ManaServer.GetMainReward(mailReward);
+            //ManaServer.GetMainReward(mailReward1);
+
             ManaGarden.ElfTimer = 0;
 
             //ManaServer.Time = new DateTime(2007,1,1);

Assets/Script/Tool/Bundle.cs

@@ -191,7 +191,6 @@ public class Bundle : MonoBehaviour
 
             for (int i = 0; i < sprites.Length; i++)
             {
-
                 ManaReso.ObjDic.UniqueAdd(sprites[i].name, sprites[i]);
             }
 

ToList.txt

@@ -1,13 +1,3 @@
-语言文档需要更新
-
-
-DragonBone使用散图
-
-DragonBone的透明度变化
-
-ManaInfo中礼包和服装的图标
-
-
 苹果的本地化(在PlayerBuilder中设置)
 
 分享appid