接入微信支付

Assets/PayTest.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+using UnityEngine.UI;
+
+public class PayTest : MonoBehaviour
+{
+    public Text text;
+
+    public void Test()
+    {
+        GetAlipayProductID("com.dashgame.garden.packfresh", (pid) =>
+        {
+            Debug.Log(pid);
+            AliplayManager.Instance.Init();
+            try
+            {
+                AliplayManager.Instance.Pay(pid, "");
+            }
+            catch (Exception e)
+            {
+                text.text = e.ToString();
+            }
+        });
+    }
+
+    public void GetAlipayProductID(string id, URLRequest.URLRequestCallBackDelegate callback)
+    {
+        URLRequestData urlData = new URLRequestData();
+
+        urlData.Add("t", 1);
+        urlData.Add("i", id);
+        urlData.Add("u", "12315646849845648");
+
+        URLRequest.CreateStrURLRequest(true, HttpManager.AlipayIdURL, urlData, callback, URLRequest.Method.POST);
+    }
+}

Assets/PayTest.cs.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: ab25e4e5f334fa444a2666585ba2b17d
+timeCreated: 1524356585
+licenseType: Pro
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PayTest.unity

@@ -0,0 +1,634 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 8
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 11
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_TemporalCoherenceThreshold: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 9
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_TextureWidth: 1024
+    m_TextureHeight: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 0
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVRFilteringMode: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_LightingDataAsset: {fileID: 0}
+  m_UseShadowmask: 1
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &225738353
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 225738354}
+  - component: {fileID: 225738357}
+  - component: {fileID: 225738356}
+  - component: {fileID: 225738355}
+  m_Layer: 5
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &225738354
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 225738353}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 179, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1113686857}
+  m_Father: {fileID: 1409158588}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 179}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &225738355
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 225738353}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 225738356}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1409158589}
+        m_MethodName: Test
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &225738356
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 225738353}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &225738357
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 225738353}
+--- !u!1 &1113686856
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1113686857}
+  - component: {fileID: 1113686859}
+  - component: {fileID: 1113686858}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1113686857
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1113686856}
+  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: 225738354}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1113686858
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1113686856}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Button
+--- !u!222 &1113686859
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1113686856}
+--- !u!1 &1409158584
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1409158588}
+  - component: {fileID: 1409158587}
+  - component: {fileID: 1409158586}
+  - component: {fileID: 1409158585}
+  - component: {fileID: 1409158589}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1409158585
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1409158584}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &1409158586
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1409158584}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &1409158587
+Canvas:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1409158584}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &1409158588
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1409158584}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 488.5, y: 275, z: 0}
+  m_LocalScale: {x: 1.22125, y: 1.22125, z: 1.22125}
+  m_Children:
+  - {fileID: 225738354}
+  - {fileID: 2007292666}
+  m_Father: {fileID: 0}
+  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, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1409158589
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1409158584}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab25e4e5f334fa444a2666585ba2b17d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  text: {fileID: 2007292667}
+--- !u!1 &1630014083
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1630014087}
+  - component: {fileID: 1630014086}
+  - component: {fileID: 1630014085}
+  - component: {fileID: 1630014084}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1630014084
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1630014083}
+  m_Enabled: 1
+--- !u!124 &1630014085
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1630014083}
+  m_Enabled: 1
+--- !u!20 &1630014086
+Camera:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1630014083}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1630014087
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1630014083}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1822719962
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1822719965}
+  - component: {fileID: 1822719964}
+  - component: {fileID: 1822719963}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1822719963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1822719962}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1822719964
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1822719962}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 5
+--- !u!4 &1822719965
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1822719962}
+  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: 0}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2007292665
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 2007292666}
+  - component: {fileID: 2007292668}
+  - component: {fileID: 2007292667}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2007292666
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2007292665}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -3.7999878, y: -22.899994, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1409158588}
+  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: -3.8, y: -22.9}
+  m_SizeDelta: {x: 748, y: 344.6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2007292667
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2007292665}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!222 &2007292668
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2007292665}

Assets/PayTest.unity.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 4877eec806ed9db4a9caa548d65c935c
+timeCreated: 1524356563
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 786969225a8dc4e0eb4e00a91e7e1501
+folderAsset: yes
+timeCreated: 1502698138
+licenseType: Pro
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/AndroidManifest.xml

@@ -61,6 +61,10 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true" />
+      <!-- 微信支付回调 -->
+      <activity android:name=".wxapi.WXPayEntryActivity"
+    android:exported="true"
+    android:launchMode="singleTop"/>
         <!-- 易信分享回调 -->
         <activity
             android:name="com.dashgame.garden.yxapi.YXEntryActivity"

Assets/Plugins/WXAPI.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: e8196c652a3a43a4591a0a4d1bf1a7b8
+folderAsset: yes
+timeCreated: 1524303733
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/WXAPI/AndroidManifest.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.company.product">
+  <application android:icon="@drawable/app_icon" android:label="@string/app_name">
+    <activity android:name="com.unity3d.player.UnityPlayerActivity"
+             android:label="@string/app_name"
+             android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:scheme="wx47450ab76d65a1b3" />
+      </intent-filter>
+    </activity>
+        <activity android:name=".wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:launchMode="singleTop"/>
+  </application>
+</manifest>

Assets/Plugins/WXAPI/AndroidManifest.xml.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: ac9cbd5632dd56546ae6d8b7dee36318
+timeCreated: 1524303750
+licenseType: Pro
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Alipay/Android/unitytool.jar.meta → Assets/Plugins/WXAPI/unitytool(6).jar.meta

@@ -1,21 +1,28 @@
 fileFormatVersion: 2
-guid: 2a994674615364276ab1aa8270a5b837
-timeCreated: 1501233154
+guid: 8df76c67545cddf46ba061c98f33a1e7
+timeCreated: 1524351071
 licenseType: Pro
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 1
       settings: {}
-    Any:
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         DefaultValueInitialized: true

Assets/Plugins/WXAPI/wechat-sdk-android-with-mta-1.3.4.jar.meta

@@ -0,0 +1,31 @@
+fileFormatVersion: 2
+guid: 7fba04d68b9d546498b071193f8d4486
+timeCreated: 1524303750
+licenseType: Pro
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Logo.unity

@@ -341,7 +341,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 841147520}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 432.5, y: 243.5, z: 0}
+  m_LocalPosition: {x: 488.5, y: 275, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 722194762}
@@ -655,7 +655,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   AuditEdition: 0
   DebugMode: 0
-  CatchException: 0
+  CatchException: 1
   DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -51,12 +51,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 93a1da3798d4c6b44a5a139df98a95f3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  NewDressSkeList: []
-  NewDressTexList: []
-  NewDressTexConfigList: []
+  NewDressSkeList:
+  - {fileID: 4900000, guid: d9cae0096b575ad439815b89ff28bbf0, type: 3}
+  NewDressTexList:
+  - {fileID: 2800000, guid: c486bd2e1e577b24a86013546709abda, type: 3}
+  - {fileID: 2800000, guid: c0256ea9e745dc544ae7035b55f87b84, type: 3}
+  NewDressTexConfigList:
+  - {fileID: 4900000, guid: 5dc33eba5b1a31e41b1a4e73bc26f716, type: 3}
+  - {fileID: 4900000, guid: cdbea75251ed3a7429b4644cf8092c72, type: 3}
   NewDressSpriteList: []
-  NewFlowerSpriteList:
-  - {fileID: 21300000, guid: 39300fd0e860ea143850d7c4ec94625d, type: 3}
+  NewFlowerSpriteList: []
   AtlasTexture: {fileID: 2800000, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   ExpressionTexture: {fileID: 2800000, guid: 980c962c52249774e9266e82d2496d13, type: 3}
   DefaultList:
@@ -258,7 +262,6 @@ MonoBehaviour:
   - {fileID: 1649364772911118, guid: 08a1f522944c12245b657272217bf6b7, type: 2}
   - {fileID: 1419661773526862, guid: 034390a4ac0a8aa40863954a4a717afb, type: 2}
   - {fileID: 1766945874161584, guid: 8dca2c526a81c534ab9271aa85c7fe34, type: 2}
-  - {fileID: 2800000, guid: c486bd2e1e577b24a86013546709abda, type: 3}
   - {fileID: 4800000, guid: 62507a9ea3ab77f4db3a493bdcbe5eff, type: 3}
   - {fileID: 2100000, guid: fb2dfea585d68dc47a46204dac2928d9, type: 2}
   - {fileID: 1388920081486088, guid: e7e5120af8916d144931c09850445367, type: 2}
@@ -297,19 +300,16 @@ MonoBehaviour:
   - {fileID: 1422722603004606, guid: f66999d8c3be4ff46b7dbde0417af018, type: 2}
   - {fileID: 1405543926191242, guid: c4b5d8c946975864492b168f89e68abc, type: 2}
   - {fileID: 21300000, guid: 800334d458bc8994eb9936152a80ef43, type: 3}
-  - {fileID: 2800000, guid: c0256ea9e745dc544ae7035b55f87b84, type: 3}
   ConfigList:
   - {fileID: 4900000, guid: f039d2181a3e9ea418ff5f211730b175, type: 3}
   - {fileID: 4900000, guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a, type: 3}
   - {fileID: 4900000, guid: 592b5873809f003499db8a5484f2b765, type: 3}
-  - {fileID: 4900000, guid: 5dc33eba5b1a31e41b1a4e73bc26f716, type: 3}
   - {fileID: 4900000, guid: aed362854a581da4399847ab3c71acce, type: 3}
   - {fileID: 4900000, guid: 5f649838ec2ce1d43b1b0cc6326149b0, type: 3}
   - {fileID: 4900000, guid: 4e6ffe6a76751f64fbe4a8e9187d73d7, type: 3}
   - {fileID: 4900000, guid: bebfbae5c4c7bf2428d24381bef74d56, type: 3}
   - {fileID: 4900000, guid: 16643d19dfc304a41b32298462967d94, type: 3}
   - {fileID: 4900000, guid: d8ed8cd3127330247beb079345e6c151, type: 3}
-  - {fileID: 4900000, guid: d9cae0096b575ad439815b89ff28bbf0, type: 3}
   - {fileID: 4900000, guid: 55c5db2c9a211884895cd4df0dc4dc96, type: 3}
   - {fileID: 4900000, guid: 8f38b94956f16c64f9bd76a51d82dc3f, type: 3}
   - {fileID: 4900000, guid: c73fc4d1ada1ad744ba552dd68b77db2, type: 3}
@@ -325,7 +325,6 @@ MonoBehaviour:
   - {fileID: 4900000, guid: 2a6d8a1acd28b9b40acaa68244594b9d, type: 3}
   - {fileID: 4900000, guid: d9f61a725b556c844a98ee0b486eabe7, type: 3}
   - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
-  - {fileID: 4900000, guid: cdbea75251ed3a7429b4644cf8092c72, type: 3}
   - {fileID: 4900000, guid: 64573e0aae0b5ca45bce73523d4fa971, type: 3}
   DiscardList: []
   PlazaRoomList: []

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -1028,7 +1028,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1053465316034782
 GameObject:
   m_ObjectHideFlags: 1

Assets/Resource/Shader/DragonboneUGUIMat.mat

@@ -8,141 +8,76 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: DragonboneUGUIMat
   m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _EMISSION
+  m_ShaderKeywords: UNITY_UI_CLIP_RECT _EMISSION
   m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
+  disabledShaderPasses: []
   m_SavedProperties:
-    serializedVersion: 2
+    serializedVersion: 3
     m_TexEnvs:
-    - first:
-        name: _BumpMap
-      second:
+    - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _DetailAlbedoMap
-      second:
+    - _DetailAlbedoMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _DetailMask
-      second:
+    - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _DetailNormalMap
-      second:
+    - _DetailNormalMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _EmissionMap
-      second:
+    - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _MainTex
-      second:
+    - _MainTex:
         m_Texture: {fileID: 2800000, guid: c486bd2e1e577b24a86013546709abda, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _MetallicGlossMap
-      second:
+    - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _OcclusionMap
-      second:
+    - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _ParallaxMap
-      second:
+    - _ParallaxMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - first:
-        name: _BumpScale
-      second: 1
-    - first:
-        name: _ColorMask
-      second: 15
-    - first:
-        name: _Cutoff
-      second: 0.5
-    - first:
-        name: _DetailNormalMapScale
-      second: 1
-    - first:
-        name: _DstBlend
-      second: 0
-    - first:
-        name: _GlossMapScale
-      second: 1
-    - first:
-        name: _Glossiness
-      second: 0.5
-    - first:
-        name: _GlossyReflections
-      second: 1
-    - first:
-        name: _Metallic
-      second: 0
-    - first:
-        name: _Mode
-      second: 0
-    - first:
-        name: _OcclusionStrength
-      second: 1
-    - first:
-        name: _Parallax
-      second: 0.02
-    - first:
-        name: _SmoothnessTextureChannel
-      second: 0
-    - first:
-        name: _SpecularHighlights
-      second: 1
-    - first:
-        name: _SrcBlend
-      second: 1
-    - first:
-        name: _Stencil
-      second: 0
-    - first:
-        name: _StencilComp
-      second: 8
-    - first:
-        name: _StencilOp
-      second: 0
-    - first:
-        name: _StencilReadMask
-      second: 255
-    - first:
-        name: _StencilWriteMask
-      second: 255
-    - first:
-        name: _UVSec
-      second: 0
-    - first:
-        name: _UseUIAlphaClip
-      second: 0
-    - first:
-        name: _ZWrite
-      second: 1
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _ZWrite: 1
     m_Colors:
-    - first:
-        name: _Color
-      second: {r: 1, g: 1, b: 1, a: 1}
-    - first:
-        name: _EmissionColor
-      second: {r: 0, g: 0, b: 0, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resource/Shader/GrayMat.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: GrayMat
   m_Shader: {fileID: 4800000, guid: ac390d8200b91bd419e2d7b9e580d07d, type: 3}
-  m_ShaderKeywords: UNITY_UI_CLIP_RECT _EMISSION
+  m_ShaderKeywords: _EMISSION
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

Assets/Resource/Sprite/Editor/HotUpdate/NewFlower.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 46b274c8414a222419da71c9a4da16df
+folderAsset: yes
+timeCreated: 1516869190
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="33" />
+  <Version value="34" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -135,8 +135,7 @@
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
     <Pa_VisitWarning desc=""><![CDATA[即将离开搭配秀访问TA的花园，确定继续？]]></Pa_VisitWarning>
-    <Pg_CrateTimeLimitWarning desc=""><![CDATA[5分钟内只能创建一个搭配秀
-剩余时间%NUM%]]></Pg_CrateTimeLimitWarning>
+    <Pg_CrateTimeLimitWarning desc=""><![CDATA[5分钟内只能创建一个搭配秀]]></Pg_CrateTimeLimitWarning>
     <Pg_Cute desc=""><![CDATA[可爱]]></Pg_Cute>
     <Pg_Grace desc=""><![CDATA[优雅]]></Pg_Grace>
     <Pg_Vivid desc=""><![CDATA[活泼]]></Pg_Vivid>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -135,7 +135,7 @@
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
     <Pa_VisitWarning desc=""><![CDATA[即將離開搭配秀訪問TA的花園，確定繼續？]]></Pa_VisitWarning>
-    <Pg_CrateTimeLimitWarning desc=""><![CDATA[]]></Pg_CrateTimeLimitWarning>
+    <Pg_CrateTimeLimitWarning desc=""><![CDATA[5分鐘內只能創建一個搭配秀]]></Pg_CrateTimeLimitWarning>
     <Pg_Cute desc=""><![CDATA[可愛]]></Pg_Cute>
     <Pg_Grace desc=""><![CDATA[優雅]]></Pg_Grace>
     <Pg_Vivid desc=""><![CDATA[活潑]]></Pg_Vivid>

Assets/Resource/XML/lan/English.xml

@@ -135,7 +135,7 @@ Program 水怪
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
     <Pa_VisitWarning desc=""><![CDATA[Will you leave fashion show to visit his/her garden?]]></Pa_VisitWarning>
-    <Pg_CrateTimeLimitWarning desc=""><![CDATA[]]></Pg_CrateTimeLimitWarning>
+    <Pg_CrateTimeLimitWarning desc=""><![CDATA[Only one Fashion Show can be created in 5 minutes]]></Pg_CrateTimeLimitWarning>
     <Pg_Cute desc=""><![CDATA[Cute]]></Pg_Cute>
     <Pg_Grace desc=""><![CDATA[Graceful]]></Pg_Grace>
     <Pg_Vivid desc=""><![CDATA[Lively]]></Pg_Vivid>

Assets/Script/Manage/ConfigManager.cs

@@ -1519,6 +1519,13 @@ public class ConfigManager : Regist
             ToVersion33(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 34)
+        {
+            Debug.LogWarning("UpdateArchive to 34");
+
+            ToVersion34(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -2002,4 +2009,17 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion34(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 34.ToString();
+
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/HttpManager.cs

@@ -340,10 +340,10 @@ public class HttpManager : Regist
 
     public void Update()
     {
-        //if (Input.GetKeyDown(KeyCode.Space))
-        //{
-        //    GetWXPayProductID("com.dashgame.garden.diamond100", Debug.Log);
-        //}
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            GetAlipayProductID("com.dashgame.garden.packfresh", Debug.Log);
+        }
 
         if (!Manager.Inited && !Inited)
         {
@@ -747,12 +747,12 @@ public class HttpManager : Regist
             {
                 if (data == "{\"error\":0}")
                 {
-                    Bubble.Show(Language.GetStr(LanguageLabel.UI__Q_CommentDone));
+                    Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Q_CommentDone));
                     SocialManager.UpdateCommentPage(false);
                 }
                 else
                 {
-                    Bubble.Show(Language.GetStr(LanguageLabel.UI__Q_CommentFail));
+                    Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Q_CommentFail));
                 }
             },
             URLRequest.Method.POST

Assets/Script/Manage/IAPManager.cs

@@ -148,14 +148,6 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void InitIAP()
     {
-        foreach (var attribute in ConfigManager.GetIAPConfig())
-        {
-            ProductList.Add(attribute[1].Value);
-
-            ProductIdDictionary.Add(attribute[5].Value, attribute[1].Value);
-            PackNameDictionary.Add(attribute[1].Value, attribute[5].Value);
-        }
-
         if (Application.isEditor)
         {
             return;
@@ -182,13 +174,13 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void InitAlipay()
     {
-        //foreach (var attribute in ConfigManager.GetIAPConfig())
-        //{
-        //    ProductList.Add(attribute[1].Value);
+        foreach (var attribute in ConfigManager.GetIAPConfig())
+        {
+            ProductList.Add(attribute[1].Value);
 
-        //    ProductIdDictionary.Add(attribute[5].Value, attribute[1].Value);
-        //    PackNameDictionary.Add(attribute[1].Value, attribute[5].Value);
-        //}
+            ProductIdDictionary.Add(attribute[5].Value, attribute[1].Value);
+            PackNameDictionary.Add(attribute[1].Value, attribute[5].Value);
+        }
 
         AliplayManager.Instance.Init();
     }
@@ -261,21 +253,21 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void TryPurchase(string str)
     {
-        //if (!Inited)
-        //{
-        //    Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
+        if (!Inited)
+        {
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
 
-        //    InitIAP();
+            InitIAP();
 
-        //    return;
-        //}
+            return;
+        }
 
-        //if (!ProductList.Contains(ProductIdDictionary[str]))
-        //{
-        //    Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseUnvalid));
+        if (!ProductList.Contains(ProductIdDictionary[str]))
+        {
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseUnvalid));
 
-        //    return;
-        //}
+            return;
+        }
 
         if (RechargeGiftManager.Inited)
         {
@@ -314,7 +306,8 @@ public class IAPManager : MonoBehaviour, IStoreListener
         {
             HttpManager.GetAlipayProductID
             (
-                ProductIdDictionary[str],
+                //ProductIdDictionary[str],
+                "com.dashgame.garden.test01",
                 data =>
                 {
                     AliplayManager.Instance.Pay(data, str);
@@ -325,10 +318,11 @@ public class IAPManager : MonoBehaviour, IStoreListener
         {
             HttpManager.GetWXPayProductID
             (
-                ProductIdDictionary[str],
+                //ProductIdDictionary[str],
+                "com.dashgame.garden.test01",
                 data =>
                 {
-                    WXPayManager.Pay(data);
+                    WXPayManager.Pay(data, str);
                 }
             );
         }

Assets/Script/Manage/Manager.cs

@@ -1249,11 +1249,13 @@ public class Manager : Regist
                 {
                     Bubble.Show
                     (
-                        Language.GetStr(LanguageLabel.Common__ShortCoin),
+                        null,
                         null,
                         null,
                         Lib.GoldSprite
                     );
+                    Bubble.Lab3.text = Language.GetStr(LanguageLabel.Common__ShortCoin);
+                    Bubble.Lab3.SetActive(true);
                 }
             }
 
@@ -1325,11 +1327,13 @@ public class Manager : Regist
                 {
                     Bubble.Show
                     (
-                        Language.GetStr(LanguageLabel.Common__ShortDiamond),
+                        null,
                         null,
                         null,
                         Lib.DiamondSprite
                     );
+                    Bubble.Lab3.text = Language.GetStr(LanguageLabel.Common__ShortDiamond);
+                    Bubble.Lab3.SetActive(true);
                 }
             }
 

Assets/Script/Manage/PayCard.cs

@@ -28,6 +28,7 @@ public class PayCard
 
     public static void Show(Action callback)
     {
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.AK_PayCard).interactable = true;
         ResourceManager.Get(CanvasLabel.AK_PayCard).TweenForCG();
         onPayChannelSelect += callback;
     }
@@ -41,13 +42,17 @@ public class PayCard
 
     private static void OnAlipayClick()
     {
+        AudioManager.PlayClip(ResourceLabel.BtnClip);
         IAPManager.PayChannel = PayChannel.AliPay;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.AK_PayCard).interactable = false;
         onPayChannelSelect.Invoke();
     }
 
     private static void OnWXPayClick()
     {
+        AudioManager.PlayClip(ResourceLabel.BtnClip);
         IAPManager.PayChannel = PayChannel.WXPay;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.AK_PayCard).interactable = false;
         onPayChannelSelect.Invoke();
     }
 }

Assets/Script/Manage/SocialManager.cs

@@ -140,7 +140,7 @@ public class SocialManager : Regist
     {
         if (string.IsNullOrEmpty(CommentInputField.text))
         {
-            Bubble.Show(Language.GetStr(LanguageLabel.UI__Lb_Send2));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Lb_Send2));
 
             return;
         }
@@ -157,7 +157,7 @@ public class SocialManager : Regist
         }
         else
         {
-            Bubble.Show(Language.GetStr(LanguageLabel.UI__Q_CommentTip));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Q_CommentTip));
         }
     }
 

Assets/Script/Manage/VisitManager.cs

@@ -751,8 +751,8 @@ public class VisitManager : Regist
         //Debug.Log(0);
         Bubble.Show
         (
-            Language.GetStr(LanguageLabel.UI__C_VisitFail),
             null,
+            Language.GetStr(LanguageLabel.UI__C_VisitFail),
             null,
             null,
             () =>

Assets/Script/Object/ADChest.cs

@@ -12,7 +12,7 @@ public class ADChest : Chest, IPointerClickHandler
 
         Bubble.Show
         (
-            Language.GetStr(LanguageLabel.Object__Chest),
+            null,
             null,
             null,
             ResourceManager.LoadSprite(ResourceLabel.Chest, Folder.Scene),
@@ -37,5 +37,7 @@ public class ADChest : Chest, IPointerClickHandler
                 );
             }
         );
+        Bubble.Lab3.text = Language.GetStr(LanguageLabel.Object__Chest);
+        Bubble.Lab3.SetActive(true);
     }
 }

Assets/Script/Object/Player.cs

@@ -514,7 +514,9 @@ public class CloseItem
     {
         if (Manager.Coin < VisitManager.VisitCost)
         {
-            Bubble.Show(Language.GetStr(LanguageLabel.Common__ShortCoin), null, null, Lib.GoldSprite);
+            Bubble.Show(null, null, null, Lib.GoldSprite);
+            Bubble.Lab3.text = Language.GetStr(LanguageLabel.Common__ShortCoin);
+            Bubble.Lab3.SetActive(true);
         }
         else
         {

Assets/Script/SFS/Manager/PlazaRoomController.cs

@@ -764,7 +764,9 @@ public class PlazaRoomController
     {
         if (Manager.Coin < VisitManager.VisitCost)
         {
-            Bubble.Show(Language.GetStr(LanguageLabel.Common__ShortCoin), null, null, Lib.GoldSprite);
+            Bubble.Show(null, null, null, Lib.GoldSprite);
+            Bubble.Lab3.text = Language.GetStr(LanguageLabel.Common__ShortCoin);
+            Bubble.Lab3.SetActive(true);
         }
         else
         {

Assets/Script/ThirdParty/Alipay/AlipayManager.cs

@@ -23,7 +23,7 @@ public class AliplayManager : UnitySingleton<AliplayManager>
 	{
 #if UNITY_ANDROID
         androidUnityTool = new AndroidJavaObject("com.dashgame.unity.UnityTool");
-		androidUnityTool.Call("setResponseGameObject", this.name);
+        androidUnityTool.Call("setResponseGameObject", this.name);
 #elif UNITY_IOS
 
 #endif
@@ -42,10 +42,10 @@ public class AliplayManager : UnitySingleton<AliplayManager>
 
 #if UNITY_ANDROID
 		
-        AndroidJavaClass jc = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
-        AndroidJavaObject currentActivity = jc.GetStatic<AndroidJavaObject>("currentActivity");
+        //AndroidJavaClass jc = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+        //AndroidJavaObject currentActivity = jc.GetStatic<AndroidJavaObject>("currentActivity");
 
-        androidUnityTool.Call("pay", WWW.UnEscapeURL(id), currentActivity);
+        androidUnityTool.Call("pay", WWW.UnEscapeURL(id));
 
 #elif UNITY_IOS
 		//aliPay(WWW.UnEscapeURL(id), this.name);
@@ -82,11 +82,13 @@ public class AliplayManager : UnitySingleton<AliplayManager>
                 PackNameDic.Remove(key);
 
                 IAPManager.BuyProductCallbackDictionary[packName].Invoke();
+                PayCard.Hide();
             }
         }
         else
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
+            ResourceManager.Get<CanvasGroup>(CanvasLabel.AK_PayCard).interactable = true;
         }
     }
 }

Assets/Script/ThirdParty/WXPay/WXPayManager.cs

@@ -1,33 +1,43 @@
-using UnityEngine;
-
-using System.IO;
+using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System.Runtime.InteropServices;
 
-using LitJson;
+using UnityEngine;
+using UnityEngine.UI;
 
-public class WXPayManager
+public class WXPayManager : MonoBehaviour
 {
-    public static void Pay(string id)
+    private static bool inited = false;
+    private static GameObject go;
+
+    private static string packName;
+
+    public static void Pay(string pid, string packName)
+    {
+        if (inited == false)
+        {
+            inited = true;
+            go = new GameObject("WXPayManagerGo");
+            go.AddComponent<WXPayManager>();
+            DontDestroyOnLoad(go);
+        }
+        WXPayManager.packName = packName;
+        AndroidJavaObject androidUnityTool = new AndroidJavaObject("com.dashgame.unity.UnityTool");
+        androidUnityTool.Call("setResponseGameObject", go.name);
+        androidUnityTool.Call("payWX", pid, "wx47450ab76d65a1b3");
+    }
+
+    public void OnPayResult(string result)
     {
-        Debug.Log(id);
-        //string idCppy = id.Replace("{", "").Replace("}", "");
-        //string[] infos = idCppy.Split(',');
-        //string appId;
-        //string partnerId;
-        //string prepayId;
-        //string packageValue;
-        //string nonceStr;
-        //string timeStamp;
-        //string sign;
-        //Debug.Log(appId);
-        //Debug.Log(partnerId);
-        //Debug.Log(prepayId);
-        //Debug.Log(packageValue);
-        //Debug.Log(nonceStr);
-        //Debug.Log(timeStamp);
-        //Debug.Log(sign);
+        if (result == "success")
+        {
+            IAPManager.BuyProductCallbackDictionary[packName].Invoke();
+            PayCard.Hide();
+        }
+        else
+        {
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
+            ResourceManager.Get<CanvasGroup>(CanvasLabel.AK_PayCard).interactable = true;
+        }
     }
 }

Assets/Script/ThirdParty/WXPay/WXPayManager.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 95a376029c0f8e040aa31f949af42cc1
-timeCreated: 1524044078
+guid: fde6bfd28f71b3247a97e6007bfbec19
+timeCreated: 1524303776
 licenseType: Pro
 MonoImporter:
   externalObjects: {}

Assets/Script/Tool/Auxiliary.cs

@@ -155,39 +155,39 @@ public class Auxiliary : Regist
         //    RobotManager.DeactivateAllRobots(false);
         //}
 
-        //if (Input.GetKeyDown(KeyCode.Space))
-        //{
-        //    DebugManager.ResetGardenLevel(100);
-        //    Manager.Coin = 0;
-        //    Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
-        //    GardenManager.CreateElfTimer = 0;
-        //    DebugManager.ResetGardenLevel(50);
-        //    foreach (var skill in Manager.UsingSkillList)
-        //    {
-        //        skill.UseTimer = 0;
-        //    }
-        //    foreach (var skill in Manager.CoolSkillList)
-        //    {
-        //        skill.CoolTimer = 0;
-        //    }
-        //    HttpManager.GetTargetConfig
-        //    (
-        //        "1801134288353834791",
-        //        data =>
-        //        {
-        //            VisitManager.VisiteeSerialNumber = "1801134288353834791";
-        //            VisitManager.SavePulledConfig(data);
-        //        }
-        //    );
-        //    PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
-        //    Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
-        //    RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
-        //    Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
-        //    Debug.Log(screenPosition);
-        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-        //    DebugManager.ResetMemoryGameTutorial();/
-        //    HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        //}
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            //DebugManager.ResetGardenLevel(100);
+            //Manager.Coin = 0;
+            //Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
+            //GardenManager.CreateElfTimer = 0;
+            //DebugManager.ResetGardenLevel(50);
+            //foreach (var skill in Manager.UsingSkillList)
+            //{
+            //    skill.UseTimer = 0;
+            //}
+            //foreach (var skill in Manager.CoolSkillList)
+            //{
+            //    skill.CoolTimer = 0;
+            //}
+            //HttpManager.GetTargetConfig
+            //(
+            //    "1801134288353834791",
+            //    data =>
+            //    {
+            //        VisitManager.VisiteeSerialNumber = "1801134288353834791";
+            //        VisitManager.SavePulledConfig(data);
+            //    }
+            //);
+            PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
+            //Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
+            //RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
+            //Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
+            //Debug.Log(screenPosition);
+            //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+            //DebugManager.ResetMemoryGameTutorial();
+            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        }
 
         //if (Input.GetKeyDown(KeyCode.A))
         //{

ProjectSettings/EditorBuildSettings.asset

@@ -7,9 +7,10 @@ EditorBuildSettings:
   m_Scenes:
   - enabled: 1
     path: Assets/Resource/Logo.unity
+    guid: 4766ae9eee026ee4a9627a27fec7685d
   - enabled: 1
     path: Assets/Resource/Garden.unity
+    guid: 5266d90dfe302254cac43c718f90033d
   - enabled: 0
-    path: Assets/Resource/TextureScaler.unity
-  - enabled: 0
-    path: Assets/ShareSDKTest.unity
+    path: Assets/PayTest.unity
+    guid: 4877eec806ed9db4a9caa548d65c935c

ProjectSettings/GraphicsSettings.asset

@@ -39,6 +39,7 @@ GraphicsSettings:
   - {fileID: 4800000, guid: ac390d8200b91bd419e2d7b9e580d07d, type: 3}
   - {fileID: 4800000, guid: e73e8e8cfe7b2344abcbf572918e22a1, type: 3}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ProjectSettings/ProjectSettings.asset

@@ -7,7 +7,7 @@ PlayerSettings:
   productGUID: 548c8e2bb13123a4c87608ea03ec4bff
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
-  defaultScreenOrientation: 4
+  defaultScreenOrientation: 3
   targetDevice: 0
   useOnDemandResources: 0
   accelerometerFrequency: 60

ProjectSettings/UnityConnectSettings.asset

@@ -31,6 +31,6 @@ UnityConnectSettings:
     m_GameIds:
       AndroidPlayer: 1408493
       iPhonePlayer: 1408492
-    m_GameId: 
+    m_GameId: 1408493
   PerformanceReportingSettings:
     m_Enabled: 0