Browse Source

增加宝箱功能

LiuQilin 8 years ago
parent
commit
f658a4cbcf
44 changed files with 1323 additions and 194 deletions
  1. 9 0
      Assets/Editor.meta
  2. 9 0
      Assets/Plugins/metro/UWP.meta
  3. 9 0
      Assets/Plugins/metro/WindowsPhone81.meta
  4. 254 0
      Assets/Resource/Animations/Chest.anim
  5. 8 0
      Assets/Resource/Animations/Chest.anim.meta
  6. 149 0
      Assets/Resource/Animations/ChestAC.controller
  7. 8 0
      Assets/Resource/Animations/ChestAC.controller.meta
  8. 160 0
      Assets/Resource/Prefab/Object/Chest.prefab
  9. 8 0
      Assets/Resource/Prefab/Object/Chest.prefab.meta
  10. BIN
      Assets/Resource/Sprite/Garden/宝箱.png
  11. 68 0
      Assets/Resource/Sprite/Garden/宝箱.png.meta
  12. BIN
      Assets/Resource/Sprite/SpriteUI/点赞图标.png
  13. 68 0
      Assets/Resource/Sprite/SpriteUI/点赞图标.png.meta
  14. BIN
      Assets/Resource/Sprite/SpriteUI/点赞图标底板.png
  15. 68 0
      Assets/Resource/Sprite/SpriteUI/点赞图标底板.png.meta
  16. BIN
      Assets/Resource/Sprite/SpriteUI/留言按钮.png
  17. 68 0
      Assets/Resource/Sprite/SpriteUI/留言按钮.png.meta
  18. 2 1
      Assets/Resource/XML/PlayerConfig.xml
  19. 1 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  20. 1 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  21. 1 0
      Assets/Resource/XML/lan/English.xml
  22. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  23. 0 4
      Assets/Script/Manage/Initializer.cs
  24. 5 147
      Assets/Script/Manage/ManaData.cs
  25. 51 10
      Assets/Script/Manage/ManaIAP.cs
  26. 37 0
      Assets/Script/Manage/ManaReso.cs
  27. 70 0
      Assets/Script/Manage/ManaServer.cs
  28. 12 5
      Assets/Script/Manage/ManaSign.cs
  29. 196 0
      Assets/Script/Object/Chest.cs
  30. 12 0
      Assets/Script/Object/Chest.cs.meta
  31. 10 2
      Assets/Script/Tool/Auxiliary.cs
  32. 3 3
      Assets/ShareSDKiOSAutoPackage/Editor.meta
  33. 3 3
      Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter.meta
  34. 3 3
      Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/ManagePlatforms.meta
  35. BIN
      Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/ManagePlatforms/ChosenPlatforms.bin
  36. 8 0
      Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/ManagePlatforms/ChosenPlatforms.bin.meta
  37. BIN
      Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/SDK.zip
  38. 1 1
      Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/SDK.zip.meta
  39. 1 1
      Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/ShareSDKPostProcessBuild.cs
  40. 3 3
      Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/XCodeEditor.meta
  41. 1 1
      Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/XCodeEditor/XCProject.cs
  42. 3 3
      ProjectSettings/GraphicsSettings.asset
  43. 3 3
      ProjectSettings/ProjectSettings.asset
  44. 10 4
      ToDoList.txt

+ 9 - 0
Assets/Editor.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5fcd7f3618d0f154995b49930421ea1b
+folderAsset: yes
+timeCreated: 1501174341
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/metro/UWP.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b3a793fc2ce8625488a5576817135789
+folderAsset: yes
+timeCreated: 1501174341
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/metro/WindowsPhone81.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: ea89367846fcf554188c49cca742be04
+folderAsset: yes
+timeCreated: 1501174341
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 254 - 0
Assets/Resource/Animations/Chest.anim

@@ -0,0 +1,254 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Chest
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 30}
+        tangentMode: 0
+      - serializedVersion: 2
+        time: 0.16666667
+        value: {x: 0, y: 0, z: 5}
+        inSlope: {x: 0, y: 0, z: 30}
+        outSlope: {x: 0, y: 0, z: -30}
+        tangentMode: 0
+      - serializedVersion: 2
+        time: 0.33333334
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: 0, z: -30}
+        outSlope: {x: 0, y: 0, z: -30.000002}
+        tangentMode: 0
+      - serializedVersion: 2
+        time: 0.5
+        value: {x: 0, y: 0, z: -5}
+        inSlope: {x: 0, y: 0, z: -30.000002}
+        outSlope: {x: 0, y: 0, z: 29.999996}
+        tangentMode: 0
+      - serializedVersion: 2
+        time: 0.6666667
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: 0, z: 29.999996}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - path: 0
+      attribute: 4
+      script: {fileID: 0}
+      classID: 4
+      customType: 14
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.6666667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.16666667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.33333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.6666667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.16666667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.33333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.6666667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 30
+        tangentMode: 65
+      - serializedVersion: 2
+        time: 0.16666667
+        value: 5
+        inSlope: 30
+        outSlope: -30
+        tangentMode: 69
+      - serializedVersion: 2
+        time: 0.33333334
+        value: 0
+        inSlope: -30
+        outSlope: -30.000002
+        tangentMode: 69
+      - serializedVersion: 2
+        time: 0.5
+        value: -5
+        inSlope: -30.000002
+        outSlope: 29.999996
+        tangentMode: 69
+      - serializedVersion: 2
+        time: 0.6666667
+        value: 0
+        inSlope: 29.999996
+        outSlope: 0
+        tangentMode: 69
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  m_EulerEditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  m_HasGenericRootTransform: 1
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_IsEmpty: 0
+  m_Events:
+  - time: 0.6666667
+    functionName: OnFinish
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0

+ 8 - 0
Assets/Resource/Animations/Chest.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 236247c1adc1a754589d322d8911c082
+timeCreated: 1503567505
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 149 - 0
Assets/Resource/Animations/ChestAC.controller

@@ -0,0 +1,149 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: ChestAC
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: Count
+    m_Type: 3
+    m_DefaultFloat: 0
+    m_DefaultInt: 2
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1107736430174673590}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1101 &1101723808698206362
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: Count
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102548140933455570}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101877779068882892
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 3
+    m_ConditionEvent: Count
+    m_EventTreshold: 1
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102757702263907482}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.625
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &1102548140933455570
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Chest
+  m_Speed: 2
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101877779068882892}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 236247c1adc1a754589d322d8911c082, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+--- !u!1102 &1102757702263907482
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Empty
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101723808698206362}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+--- !u!1107 &1107736430174673590
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102548140933455570}
+    m_Position: {x: 264, y: 120, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102757702263907482}
+    m_Position: {x: 264, y: 24, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1102757702263907482}

+ 8 - 0
Assets/Resource/Animations/ChestAC.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 40e1259af4314d74d86c9266e5c34184
+timeCreated: 1503567467
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 160 - 0
Assets/Resource/Prefab/Object/Chest.prefab

@@ -0,0 +1,160 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1658220073256390}
+  m_IsPrefabParent: 1
+--- !u!1 &1358063845640910
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4645995457566464}
+  - component: {fileID: 212129287200087826}
+  m_Layer: 0
+  m_Name: Chest
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1658220073256390
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4117775634847816}
+  - component: {fileID: 61756525462351364}
+  - component: {fileID: 50883047937147878}
+  - component: {fileID: 95607773160342560}
+  m_Layer: 0
+  m_Name: Chest
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4117775634847816
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1658220073256390}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -6, y: 0.8, z: -5}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
+  m_Children:
+  - {fileID: 4645995457566464}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4645995457566464
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1358063845640910}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.15, y: 0.36, z: 0}
+  m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
+  m_Children: []
+  m_Father: {fileID: 4117775634847816}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!50 &50883047937147878
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1658220073256390}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 2
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!61 &61756525462351364
+BoxCollider2D:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1658220073256390}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_Offset: {x: 0.11, y: 0.33}
+  serializedVersion: 2
+  m_Size: {x: 3, y: 2.6}
+--- !u!95 &95607773160342560
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1658220073256390}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 40e1259af4314d74d86c9266e5c34184, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+--- !u!212 &212129287200087826
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1358063845640910}
+  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: 21300000, guid: c4fc7aa8356e62948b06cfc31aea088e, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0

+ 8 - 0
Assets/Resource/Prefab/Object/Chest.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4211c250985daa64582ec4922f16e3f5
+timeCreated: 1503566365
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: scene
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Garden/宝箱.png


+ 68 - 0
Assets/Resource/Sprite/Garden/宝箱.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: c4fc7aa8356e62948b06cfc31aea088e
+timeCreated: 1503564181
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/SpriteUI/点赞图标.png


+ 68 - 0
Assets/Resource/Sprite/SpriteUI/点赞图标.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 42b93b138fe7fa84f93b48bfbe62fbd4
+timeCreated: 1503564282
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/SpriteUI/点赞图标底板.png


+ 68 - 0
Assets/Resource/Sprite/SpriteUI/点赞图标底板.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 5fa525a6a115b9842b1b97e1ab81c539
+timeCreated: 1503564282
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/SpriteUI/留言按钮.png


+ 68 - 0
Assets/Resource/Sprite/SpriteUI/留言按钮.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: efe747cf24cc74448aacfbe6e4711ae0
+timeCreated: 1503564282
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 1
Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="-12" />
+  <Version value="0" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -25,6 +25,7 @@
   <MiniTimer value="0" />
   <SignRound value="1" />
   <CircleTimer value="0" />
+  <ADPlayTime value="4/23/2017 09:30:00 AM" />
   <MiniGameIndex value="0" />
   <OneTimeReward value="" />
   

+ 1 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -254,6 +254,7 @@
     <AchieveItem_BtnLab2 desc=""><![CDATA[已完成]]></AchieveItem_BtnLab2>
     <SlotSign desc=""><![CDATA[未开垦]]></SlotSign>
     <Star desc=""><![CDATA[小游戏冷却时间减少]]></Star>
+    <Chest desc=""><![CDATA[观看完广告可以抽奖哦!]]></Chest>
   </Object>
   <Common>
     <Get desc=""><![CDATA[获得]]></Get>

+ 1 - 0
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -254,6 +254,7 @@
     <AchieveItem_BtnLab2 desc=""><![CDATA[已完成]]></AchieveItem_BtnLab2>
     <SlotSign desc=""><![CDATA[未開墾]]></SlotSign>
     <Star desc=""><![CDATA[小遊戲冷卻時間減少]]></Star>
+    <Chest desc=""><![CDATA[觀看完廣告可以抽獎哦!]]></Chest>
   </Object>
   <Common>
     <Get desc=""><![CDATA[觀獲]]></Get>

+ 1 - 0
Assets/Resource/XML/lan/English.xml

@@ -255,6 +255,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <AchieveItem_BtnLab2 desc=""><![CDATA[Completed]]></AchieveItem_BtnLab2>
     <SlotSign desc=""><![CDATA[Locked]]></SlotSign>
     <Star desc=""><![CDATA[Reduce minigame cd ]]></Star>
+    <Chest desc=""><![CDATA[Watch video to get reward!]]></Chest>
   </Object>
   <Common>
     <Get desc=""><![CDATA[Get]]></Get>

BIN
Assets/Resource/Xlsx/language_config.xlsx


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

@@ -89,10 +89,6 @@ public class Initializer : MonoBehaviour
 
     public static void Initialize()
     {
-        ManaIAP.InitializeShare();
-
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : Share";
-
         GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1";
 
         ManaTutorial.TutorialA = ManaData.GetPlayerBool("TutorialA");

+ 5 - 147
Assets/Script/Manage/ManaData.cs

@@ -953,166 +953,24 @@ public class ManaData : Regist
 
     public static XmlDocument MergeXML(int nativeVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        if (nativeVersion < 681)
+        if (nativeVersion < 0)
         {
             Debug.LogWarning("UpdateArchive");
 
-            To681(nativeDoc, defaultDoc);
+            To0(nativeDoc, defaultDoc);
         }
 
         return nativeDoc;
     }
 
-    public static XmlDocument To681(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    public static XmlDocument To0(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        string playerType = "";
-        XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
-        XmlNode xmlNode2 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");
-        XmlNode xmlNode3 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialD");
-        XmlNode xmlNode4 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexD");
-        XmlNode xmlNode5 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player");
-        XmlNode xmlNode6 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialE");
-        XmlNode xmlNode7 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexE");
-        XmlNode xmlNode8 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("AchieveData");
-
-        if (xmlNode1 != null)
-        {
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode1);
-        }
-
-        if (xmlNode2 != null)
-        {
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode2);
-        }
-
-        if (xmlNode3 != null)
-        {
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode3);
-        }
-
-        if (xmlNode4 != null)
-        {
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode4);
-        }
-
-        if (xmlNode5 != null)
-        {
-            playerType = xmlNode5.Attributes[0].Value;
-
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode5);
-        }
-        else
-        {
-            playerType = "PlayerBlond";
-        }
-
-        if (xmlNode6 != null)
-        {
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode6);
-        }
-
-        if (xmlNode7 != null)
-        {
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode7);
-        }
-
-        if (xmlNode8 != null)
-        {
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode8);
-        }
-
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 0.ToString();
 
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 681.ToString();
-
-        xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
-        xmlNode2 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");
-        xmlNode3 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialD");
-        xmlNode4 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexD");
-        xmlNode5 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player");
-        xmlNode6 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialE");
-        xmlNode7 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexE");
-        xmlNode8 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("AchieveData");
-
-        if (playerType == "PlayerBlond")
-        {
-            xmlNode2.Attributes[0].Value = "脑壳1";
-            xmlNode2.Attributes[1].Value = "裙子1";
-            xmlNode2.Attributes[2].Value = "鞋子1";
-            xmlNode2.Attributes[3].Value = "头饰品1";
-            xmlNode2.Attributes[4].Value = "上衣1";
-            xmlNode2.Attributes[5].Value = "眼睛1";
-            xmlNode2.Attributes[6].Value = "嘴巴1";
-            xmlNode2.Attributes[7].Value = "Empty";
-        }
-        else if (playerType == "PlayerBrown")
-        {
-            xmlNode2.Attributes[0].Value = "脑壳2";
-            xmlNode2.Attributes[1].Value = "裙子2";
-            xmlNode2.Attributes[2].Value = "鞋子2";
-            xmlNode2.Attributes[3].Value = "头饰品2";
-            xmlNode2.Attributes[4].Value = "上衣2";
-            xmlNode2.Attributes[5].Value = "眼睛2";
-            xmlNode2.Attributes[6].Value = "嘴巴2";
-            xmlNode2.Attributes[7].Value = "Empty";
-        }
-        else if (playerType == "PlayerPink")
-        {
-            xmlNode2.Attributes[0].Value = "脑壳3";
-            xmlNode2.Attributes[1].Value = "裙子3";
-            xmlNode2.Attributes[2].Value = "鞋子3";
-            xmlNode2.Attributes[3].Value = "头饰品3";
-            xmlNode2.Attributes[4].Value = "上衣3";
-            xmlNode2.Attributes[5].Value = "眼睛3";
-            xmlNode2.Attributes[6].Value = "嘴巴3";
-            xmlNode2.Attributes[7].Value = "Empty";
-        }
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("ADPlayTime");
 
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode2, true));
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode3, true));
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode4, true));
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode5, true));
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode6, true));
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode7, true));
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode8, true));
-
-
-        xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("SkillList");
-        xmlNode2 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("SkillList");
-
-        XmlNodeList xmlNodeList1 = xmlNode1.ChildNodes;
-        XmlNodeList xmlNodeList2 = xmlNode2.ChildNodes;
-
-        for (int i = 0; i < xmlNodeList1.Count; i++)
-        {
-            string id = xmlNodeList1[i].Attributes[0].Value;
-
-            if (id.Contains("Ability"))
-            {
-                int index = int.Parse(id.Replace("Ability", ""));
-
-                if (index >= 15 && index <= 24)
-                {
-                    xmlNode1.RemoveChild(xmlNodeList1[i--]);
-                }
-            }   
-        }
-        
-        for (int i = 0; i < xmlNodeList2.Count; i++)
-        {
-            string id = xmlNodeList2[i].Attributes[0].Value;
 
-            if (id.Contains("Ability"))
-            {
-                int index = int.Parse(id.Replace("Ability", ""));
-
-                if (index >= 15 && index <= 24)
-                {
-                    xmlNode1.AppendChild(nativeDoc.ImportNode(xmlNodeList2[i], true));
-                }
-            }
-        }
-        
         return nativeDoc;
     }
 }

+ 51 - 10
Assets/Script/Manage/ManaIAP.cs

@@ -22,6 +22,11 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 {
     #region 变量
 
+    public static float Timer;
+
+    public static DateTime? ADPlayTime = null;
+    public static List<Chest> ChestList = new List<Chest>();
+
     public static bool UseAlipayOnIOS = false;
     public static bool Complete;
     public static ManaIAP Instance;
@@ -49,22 +54,60 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     public void Awake()
     {
         Instance = this;
+
+        InitializeAD();
+        InitializeShare();
+    }
+
+    public void Update()
+    {
+        if (ChestList.Count > 0)
+            return;
+
+        if (!Advertisement.IsReady())
+        {
+            Timer += Time.deltaTime;
+
+            if (Timer >= 10)
+            {
+                Timer = 0;
+
+                InitializeAD();
+            }
+        }
+        else
+        {
+            if (ADPlayTime == null)
+                return;
+
+            if (ManaServer.Connect && (ManaServer.Time.Subtract((DateTime)ADPlayTime).TotalSeconds > 1200))
+            {
+                if (ManaGarden.MiniLock && !ManaVisit.InVisit && !ManaTutorial.TutorialA)
+                {
+                    ChestList.Add(ManaReso.GetChest());
+                }
+            }
+        }
     }
 
 
     public static void Initialize()
     {
-        InitializeAD();
+        //InitializeAD();
         
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : AD";
+        //GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : AD";
+
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : IAP1";
 
         InitializeIAP();
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : IAP";
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : IAP2";
+
+        ADPlayTime = DateTime.Parse(ManaData.GetPlayerString("ADPlayTime"));
 
         //InitializeShare();
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : Share";
+        //GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : Share";
     }
 
     public static void InitializeAD()
@@ -182,11 +225,6 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         else
         {
             Bubble.Show(null, Language.GetStr("IAP", "LoadAd"));
-
-            if (!Advertisement.isInitialized)
-            {
-                InitializeAD();
-            }
         }
     }
     
@@ -197,6 +235,9 @@ public class ManaIAP : MonoBehaviour, IStoreListener
             AdAction.Invoke();
 
             ManaCenter.AdAmt++;
+
+            ADPlayTime = ManaServer.Time;
+            ManaData.SavePlayerString("ADPlayTime", ADPlayTime.ToString());
         }
         else if (showResult == ShowResult.Skipped)
         {
@@ -293,7 +334,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         ShareContent shareContent = new ShareContent();
 
         shareContent.SetText(Language.GetStr("Common", "ShareContent"));
-        shareContent.SetTitle(Language.GetStr("Common", "ShareTit") + " " + Language.GetShareUrl());
+        shareContent.SetTitle(Language.GetStr("Common", "ShareTit"));
         shareContent.SetTitleUrl(Language.GetShareUrl());
 
         shareContent.SetSite(Language.GetShareUrl());

+ 37 - 0
Assets/Script/Manage/ManaReso.cs

@@ -60,6 +60,7 @@ public enum ObjType
     Music,
 
     Star,
+    Chest,
     DropGold,
     DropDiamond,
 
@@ -592,6 +593,42 @@ public class ManaReso : Regist
         return star;
     }
 
+    public static Chest GetChest()
+    {
+        int slotIndex = Random.Range(0, 9);
+
+        bool forceLeft = slotIndex == 3 || slotIndex == 8;
+        bool forceRight = slotIndex == 0 || slotIndex == 4;
+
+        slotIndex += Garden.CurPage * 9;
+
+
+        Slot slot = ManaGarden.SlotList[slotIndex];
+
+        Vector3 pos = slot.transform.position;
+
+        pos.z = -0.35f + Random.Range(-0.01f, 0.01f);
+
+        Transform tra = Get("Chest", Folder.Scene, false, null, pos, ObjType.Chest);
+
+        Chest chest = tra.GetComponent<Chest>();
+
+        tra.parent = slot.transform;
+
+        if (chest == null)
+        {
+            chest = tra.AddComponent<Chest>();
+
+            chest.Initialize(pos.y, forceLeft, forceRight);
+        }
+        else
+        {
+            chest.Initialize(pos.y, forceLeft, forceRight);
+        }
+
+        return chest;
+    }
+
     public static Drop GetDrop(ObjType objType)
     {
         ManaAudio.PlayClip(Clip.DropClip);

+ 70 - 0
Assets/Script/Manage/ManaServer.cs

@@ -109,6 +109,23 @@ public class ManaServer : Regist
 
     #endregion
 
+    public void Awake()
+    {
+        //Login((data => print(data.ToJson())));
+
+        //Download("ytcy9g",(data)=> { print(data.ToJson()); });
+
+        //Other("1704189794672324513", (data) => { print(data.ToJson()); });
+
+        //AddComment("12a", "12b", "content", "0");
+
+        //GetComment("12b", "0", "0");
+
+        //Praise("123", "321");
+
+        //Target("321", "123");
+    }
+
     public void Update()
     {
         if (!ManaCenter.Complete && !Complete)
@@ -148,6 +165,50 @@ public class ManaServer : Regist
     }
 
 
+    public static void Praise(string sendID, string receiveID)
+    {
+        URLRequestData urlData = new URLRequestData();
+
+        urlData.Add("u", sendID);
+        urlData.Add("t", receiveID);
+
+        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/praise/click", urlData, Debug.Log, URLRequest.Method.POST);
+    }
+
+    public static void Target(string userID, string targetID)
+    {
+        URLRequestData urlData = new URLRequestData();
+
+        urlData.Add("u", userID);
+        urlData.Add("t", targetID);
+
+        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/praise/target", urlData, Debug.Log, URLRequest.Method.POST);
+    }
+
+    public static void AddComment(string sendID, string receiveID, string content, string type)
+    {
+        URLRequestData urlData = new URLRequestData();
+
+        urlData.Add("c", sendID);
+        urlData.Add("u", receiveID);
+        urlData.Add("i", content);
+        urlData.Add("t", type);
+
+        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/comment/comment", urlData, Debug.Log, URLRequest.Method.POST);
+    }
+
+    public static void GetComment(string id, string page, string type)
+    {
+        URLRequestData urlData = new URLRequestData();
+
+        urlData.Add("u", id);
+        urlData.Add("p", page);
+        urlData.Add("t", type);
+
+        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/comment/index", urlData, Debug.Log, URLRequest.Method.POST);
+    }
+
+
     public static void IndexRequest(Action<JsonData> callback)
     {
         URLRequestData urlData = new URLRequestData();
@@ -548,6 +609,15 @@ public class ManaServer : Regist
     }
 
 
+    public static void Other(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
+    {
+        URLRequestData urlData = new URLRequestData();
+
+        urlData.Add("u", id);
+
+        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/user/other", urlData, callback, URLRequest.Method.POST);
+    }
+
     public static void Download(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();

+ 12 - 5
Assets/Script/Manage/ManaSign.cs

@@ -3,9 +3,10 @@ using UnityEngine.UI;
 
 using System;
 using System.Xml;
+using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
+
 using Random = UnityEngine.Random;
 
 public class Sign
@@ -90,7 +91,7 @@ public class Sign
     {
         if (IsLottery)
         {
-            Lottery.EnterAnimation();
+            Lottery.EnterAnimation(true);
 
             return;
         }
@@ -239,6 +240,8 @@ public class Lottery
     public Transform BK;
     public Transform Item;
 
+    public static bool ResetSign = false;
+
     public static List<int> TempTypeList = new List<int>();
     public static List<int> TempValueList = new List<int>();
     public static List<Lottery> TempLotteryList = new List<Lottery>();
@@ -501,8 +504,10 @@ public class Lottery
         return lottery;
     }
 
-    public static void EnterAnimation()
+    public static void EnterAnimation(bool resetSign)
     {
+        ResetSign = resetSign;
+
         ManaReso.Get("Bc_Lottery").TweenForCG();
         ManaReso.Get("Ba_Notice0").TweenBacCG();
 
@@ -644,8 +649,10 @@ public class Lottery
 
     public void GetAward()
     {
-        Sign.ResetSign();
-
+        if (ResetSign)
+        {
+            Sign.ResetSign();
+        }
 
         BK.SetActive(true);
 

+ 196 - 0
Assets/Script/Object/Chest.cs

@@ -0,0 +1,196 @@
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class Chest : MonoBehaviour, IPointerClickHandler
+{
+    #region 变量
+
+    public Animator Animator
+    {
+        get
+        {
+            if (Animator_ == null)
+            {
+                Animator_ = GetComponent<Animator>();
+            }
+
+            return Animator_;
+        }
+        set { Animator_ = value; }
+    }
+    public Rigidbody2D Rigidbody
+    {
+        get
+        {
+            if (Rigidbody_ == null)
+            {
+                Rigidbody_ = GetComponent<Rigidbody2D>();
+            }
+
+            return Rigidbody_;
+        }
+        set { Rigidbody_ = value; }
+    }
+    public BoxCollider2D BoxCollider
+    {
+        get
+        {
+            if (BoxCollider_ == null)
+            {
+                BoxCollider_ = GetComponent<BoxCollider2D>();
+            }
+
+            return BoxCollider_;
+        }
+        set { BoxCollider_ = value; }
+    }
+    public SpriteRenderer SpriteRenderer
+    {
+        get
+        {
+            if (SpriteRenderer_ == null)
+            {
+                SpriteRenderer_ = GetComponentInChildren<SpriteRenderer>();
+
+                SpriteRenderer_.CreateTweenScale(0, 0.75f, 0.25f, false, true, Curve.EaseOutQuad);
+
+
+                TweenRoot tween = SpriteRenderer_.CreateTweenSr(0, 1, 0.25f, true, false, Curve.EaseOutQuad);
+
+                tween.OnBackwardFinish = () =>
+                {
+                    Animator.SetInteger("Count", 2);
+
+                    ManaReso.Save(gameObject, true);
+                };
+            }
+
+            return SpriteRenderer_;
+        }
+        set { SpriteRenderer_ = value; }
+    }
+
+    public Animator Animator_;
+    public Rigidbody2D Rigidbody_;
+    public BoxCollider2D BoxCollider_;
+    public SpriteRenderer SpriteRenderer_;
+
+    public float Timer;
+    public float SpeedY = 6f;
+    public float FreezeY;
+
+
+    public static float Time = 5;
+
+    #endregion
+
+    public void Update()
+    {
+        Timer += UnityEngine.Time.deltaTime;
+
+        if (Timer >= Time)
+        {
+            Timer = 0;
+
+            Animator.SetInteger("Count", 0);
+        }
+
+        if (transform.position.y <= FreezeY - 0.1f)
+        {
+            Rigidbody.velocity = new Vector2();
+
+            Rigidbody.isKinematic = true;
+        }
+    }
+
+
+    public void Initialize(float freezY, bool forceLeft, bool forceRight)
+    {
+        ManaAudio.PlayClip(Clip.BubbleClip);
+
+
+        float speedX = Mathf.Lerp(1.5f, 3f, Random.Range(0f, 1f));
+
+        if (forceLeft)
+        {
+            speedX = -speedX;
+        }
+        else if (forceRight)
+        {
+
+        }
+        else
+        {
+            if (Random.Range(0f, 1f) < 0.5f)
+            {
+                speedX = -speedX;
+            }
+        }
+
+
+        Rigidbody.velocity = new Vector2(speedX, SpeedY);
+
+        Rigidbody.isKinematic = false;
+
+        BoxCollider.enabled = true;
+
+
+        Timer = 0;
+
+        FreezeY = freezY;
+
+        SpriteRenderer.GetTweenSr().InDestination = true;
+
+        SpriteRenderer.GetTweenScale().InOrigin = true;
+
+
+        SpriteRenderer.TweenForScale();
+    }
+
+
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        ManaAudio.PlayClip(Clip.CurrentClip);
+
+
+        Rigidbody.velocity = new Vector2();
+
+        Rigidbody.isKinematic = true;
+
+
+        Bubble.Show
+        (
+            Language.GetStr("Object", "Chest"),
+            null,
+            ManaReso.LoadSprite("宝箱", Folder.Scene),
+            () =>
+            {
+                ManaIAP.PlayAD
+                (
+                    () =>
+                    {
+                        BoxCollider.enabled = false;
+
+                        SpriteRenderer.TweenBacSr();
+
+                        ManaIAP.ChestList.Remove(this);
+
+                        ManaReso.Get("C_Group").TweenBacCG();
+
+                        ManaReso.Get("B_SignIn").TweenForCG();
+
+                        Lottery.EnterAnimation(false);
+                    }
+                );
+            }
+        );
+    }
+
+    public void OnFinish()
+    {
+        Animator.SetInteger("Count", Animator.GetInteger("Count") + 1);
+    }
+}

+ 12 - 0
Assets/Script/Object/Chest.cs.meta

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

+ 10 - 2
Assets/Script/Tool/Auxiliary.cs

@@ -138,9 +138,17 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            //ManaTutorial.EnterD1();
+            //ManaReso.Get("C_Group").TweenBacCG();
 
-            ManaCenter.MiniTimer = 0;
+            //ManaReso.Get("B_SignIn").TweenForCG();
+
+            //Lottery.EnterAnimation(false);
+
+
+            ManaReso.GetChest();
+
+
+            //ManaCenter.MiniTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))

+ 3 - 3
Assets/ShareSDKiOSAutoPackage/Editor.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: ebd6f60758a0cb2468da8d193ec16cba
+guid: 1468914f198f64137adf5de4341ebe53
 folderAsset: yes
-timeCreated: 1494578893
-licenseType: Pro
+timeCreated: 1471246131
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 3 - 3
Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f7fe384bc36a94e4bb12d199f74ceed8
+guid: 31ad3e35a36e74ca29946bc821b85d2b
 folderAsset: yes
-timeCreated: 1494578893
-licenseType: Pro
+timeCreated: 1470294472
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 3 - 3
Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/ManagePlatforms.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f78d97c15f39a3141a29ab6b1aea3930
+guid: d205b8026a3e24b0bb63ce553afcbf15
 folderAsset: yes
-timeCreated: 1494578893
-licenseType: Pro
+timeCreated: 1484553536
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

BIN
Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/ManagePlatforms/ChosenPlatforms.bin


+ 8 - 0
Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/ManagePlatforms/ChosenPlatforms.bin.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b19f6dbf5b7c473dafb167e50bd7d71
+timeCreated: 1502108242
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/SDK.zip


+ 1 - 1
Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/SDK.zip.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 23aeb10c3a0064a629b0c052556ca3b3
-timeCreated: 1495793524
+timeCreated: 1502106916
 licenseType: Free
 DefaultImporter:
   userData: 

+ 1 - 1
Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/ShareSDKPostProcessBuild.cs

@@ -144,7 +144,7 @@ public static class ShareSDKPostProcessBuild
 		 ShareSDKConfig theConfig;
 		 try
 		 {
-		 	string filePath = Application.dataPath + "/Plugins/ShareSDK/ShareSDKConfig.bin";
+		 	string filePath = Application.dataPath + "/Plugins/ShareSDK/Editor/ShareSDKConfig.bin";
 		 	BinaryFormatter formatter = new BinaryFormatter();
 		 	Stream destream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
 		 	ShareSDKConfig config = (ShareSDKConfig)formatter.Deserialize(destream);

+ 3 - 3
Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/XCodeEditor.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 2316ac98eaed72f42be3c898e565ed1f
+guid: 47cfba800344a46e9976cf99c65e928d
 folderAsset: yes
-timeCreated: 1494578893
-licenseType: Pro
+timeCreated: 1471246132
+licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 1 - 1
Assets/ShareSDKiOSAutoPackage/Editor/SDKPorter/XCodeEditor/XCProject.cs

@@ -610,7 +610,7 @@ namespace cn.sharesdk.unity3d.sdkporter
 				DirectoryInfo di = new DirectoryInfo(dirpath + "/__MACOSX");
 				di.Delete(true);
 
-				if (sdkName == "ShareSDK") 
+				if (sdkName == "SDK") 
 				{
 					//根据Editor所勾选执行删除工作
 					DeleteUnnecessaryFile();

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

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

+ 3 - 3
ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.1.2
+  bundleVersion: 1.1.4
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 8
+  AndroidBundleVersionCode: 10
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 2
+  iPhoneBuildNumber: 4
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

+ 10 - 4
ToDoList.txt

@@ -1,10 +1,10 @@
-是否要修改帧率
+图文混排使用网络图片和超链接
 
-ShareSDK初始化很慢
+是否要修改帧率
 
-新浪微博分享的网址
+宝箱 分享按钮需要打入图集
 
-分享按钮需要打入图集
+FlowerHouse动画控制器优化
 
 
 关闭调试模式
@@ -17,8 +17,14 @@ ShareSDK
 
 更新版本号
 
+IOS设置Team
+
 
 图集
 {
   UseSelectedPath自动设置PackName
+  
+  自定义压缩功能
+
+  不同压缩格式对尺寸的要求
 }