增加截屏分享 修复服装层级

Assets/Editor.meta

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

Assets/Plugins/metro/UWP.meta

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

Assets/Plugins/metro/WindowsPhone81.meta

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

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

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

Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -565,6 +565,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1727929300464162
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224499999181467058}
+  - component: {fileID: 222049723759294452}
+  - component: {fileID: 114432337166083576}
+  - component: {fileID: 114688521016664468}
+  m_Layer: 5
+  m_Name: P_Save
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1730336026802368
 GameObject:
   m_ObjectHideFlags: 0
@@ -662,13 +680,14 @@ GameObject:
   - component: {fileID: 222742105261906608}
   - component: {fileID: 114655927516320440}
   - component: {fileID: 114152894146773020}
+  - component: {fileID: 225979817551163286}
   m_Layer: 5
-  m_Name: P_Save
+  m_Name: P_Share
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1808383842750954
 GameObject:
   m_ObjectHideFlags: 1
@@ -1737,6 +1756,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114432337166083576
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1727929300464162}
+  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: 21300014, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114442196656342814
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2278,7 +2324,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300014, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2367,6 +2413,47 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114688521016664468
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1727929300464162}
+  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: 1, g: 1, b: 1, a: 1}
+    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: 114432337166083576}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114725755240494740
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2948,6 +3035,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1584158739555372}
+--- !u!222 &222049723759294452
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1727929300464162}
 --- !u!222 &222055725491965136
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -3240,6 +3333,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 224523201006200968}
   - {fileID: 224316464020746548}
   - {fileID: 224549163792536180}
   m_Father: {fileID: 224814127152008004}
@@ -3407,10 +3501,10 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224398397176885042}
-  - {fileID: 224523201006200968}
+  - {fileID: 224499999181467058}
   - {fileID: 224277300051533002}
   m_Father: {fileID: 224042092064329274}
-  m_RootOrder: 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}
@@ -3644,6 +3738,24 @@ RectTransform:
   m_AnchoredPosition: {x: 12.7499695, y: 0.0819397}
   m_SizeDelta: {x: -54, y: -306}
   m_Pivot: {x: 0.49999997, y: 0.99999994}
+--- !u!224 &224499999181467058
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1727929300464162}
+  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: 224316464020746548}
+  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: 69.14996, y: 0.099975586}
+  m_SizeDelta: {x: 73.2, y: 59.3}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224506609407849324
 RectTransform:
   m_ObjectHideFlags: 1
@@ -3674,13 +3786,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224316464020746548}
-  m_RootOrder: 1
+  m_Father: {fileID: 224042092064329274}
+  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: 69.14996, y: 0.099975586}
-  m_SizeDelta: {x: 73.2, y: 59.3}
+  m_AnchoredPosition: {x: 125, y: -140}
+  m_SizeDelta: {x: 205, y: 170}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224525768392981752
 RectTransform:
@@ -3717,7 +3829,7 @@ RectTransform:
   - {fileID: 224690639830154392}
   - {fileID: 224383496005212350}
   m_Father: {fileID: 224042092064329274}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4202,6 +4314,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225979817551163286
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1766607135279202}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225992104620846162
 CanvasGroup:
   m_ObjectHideFlags: 1

Assets/Script/Manage/ManaIAP.cs

@@ -38,6 +38,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     #region Share配置
 
     public static string ImageUrl = "http://or5zgoeui.bkt.clouddn.com/game_icon.png";
+    public static string ImagePath;
 
     public static ShareSDK ShareSdk;
 
@@ -287,7 +288,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     }
 
 
-    public static void Share()
+    public static void Share(string imagePath = null)
     {
         ShareContent shareContent = new ShareContent();
 
@@ -295,10 +296,19 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         shareContent.SetTitle(Language.GetStr("Common", "ShareTit"));
 
         shareContent.SetUrl(Language.GetShareUrl());
-        shareContent.SetImageUrl(ImageUrl);
 
         shareContent.SetShareType(ContentType.App);
 
+        if (string.IsNullOrEmpty(imagePath))
+        {
+            shareContent.SetImageUrl(ImageUrl);
+        }
+        else
+        {
+            ImagePath = imagePath;
+            shareContent.SetImagePath(imagePath);
+        }
+
         ShareSdk.ShowPlatformList(null, shareContent, 100, 100);
     }
 
@@ -309,11 +319,21 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 
     public static void ShareCallback(int reqID, ResponseState state, PlatformType type, Hashtable result)
     {
+        ManaDebug.Log("Share " + state + " " + result);
+
         if (state == ResponseState.Success)
         {
             ManaCenter.ShareAmt++;
             
             Bubble.Show(null, Language.GetStr("Common", "ShareSuccess"));
+
+            if (!string.IsNullOrEmpty(ImagePath))
+            {
+                ManaReso.SetActive("P_Open", true);
+                ManaReso.SetActive("P_Share", true);
+
+                ImagePath = null;
+            }
         }
         else if (state == ResponseState.Fail)
         {

Assets/Script/Manage/ManaUI.cs

@@ -2251,10 +2251,20 @@ public class ManaUI : Regist
 
         #region P_SidePanel
 
-        ManaReso.Get("P_SidePanel").CreateTweenVec2D(ManaReso.Get("P_Pos").position, 0.5f, false, true, true, Curve.EaseOutQuad);
+        tweenRoot = ManaReso.Get("P_SidePanel").CreateTweenVec2D(ManaReso.Get("P_Pos").position, 0.5f, false, true, true, Curve.EaseOutQuad);
+
+        tweenRoot.OnForwardFinish += () =>
+        {
+            ManaReso.Get("P_Share").TweenForCG();
+        };
+
+        tweenRoot.OnBackwardStart += () =>
+        {
+            ManaReso.Get("P_Share").TweenBacCG();
+        };
 
         #endregion
-        
+
         #region P_DressRoom
 
         ManaReso.Get("P_DressRoom").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -2502,7 +2512,29 @@ public class ManaUI : Regist
                 ManaPlayer.Player.Return();
             }
         );
-        
+
+        #endregion
+
+        #region P_Share
+
+        ManaReso.Get("P_Share").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        ManaReso.SetButtonEvent
+        (
+            "P_Share",
+            () =>
+            {
+                ManaReso.SetActive("P_Open", false);
+                ManaReso.SetActive("P_Share", false);
+
+                string filePath = Application.persistentDataPath + "/MyLovelyGarden.png";
+
+                Application.CaptureScreenshot(filePath);
+
+                ManaIAP.Share(filePath);
+            }
+        );
+
         #endregion
 
 

Assets/Script/Object/Player.cs

@@ -900,7 +900,8 @@ public class Player : Regist , IPointerClickHandler
         tempTra.SetLZ(-0.002f);
         if (tempTra.childCount > 1)
         {
-            tempTra.GetChild(0).SetLZ(0.001f);
+            tempTra.GetChild(0).SetLZ(0.002f);
+            tempTra.GetChild(1).SetLZ(0f);
         }
 
 

Assets/Script/Tool/Auxiliary.cs

@@ -136,34 +136,34 @@ public class Auxiliary : Regist
 
         //}
 
-        //if (Input.GetKeyDown(KeyCode.Z))
-        //{
-        //    ManaTutorial.EnterD1();
+        if (Input.GetKeyDown(KeyCode.Z))
+        {
+            //ManaTutorial.EnterD1();
 
-        //    ManaCenter.MiniTimer = 0;
-        //}
+            ManaCenter.MiniTimer = 0;
+        }
 
-        //if (Input.GetKeyDown(KeyCode.X))
-        //{
-        //    ManaMiniGame.GameTimer = 45;
+        if (Input.GetKeyDown(KeyCode.X))
+        {
+            ManaMiniGame.GameTimer = 45;
 
-        //    Lottery.TempTypeList = new List<int>();
-        //    Lottery.TempValueList = new List<int>();
-        //    Lottery.TempLotteryList = new List<Lottery>();
+            //Lottery.TempTypeList = new List<int>();
+            //Lottery.TempValueList = new List<int>();
+            //Lottery.TempLotteryList = new List<Lottery>();
 
-        //    Lottery.EnterAnimation();
+            //Lottery.EnterAnimation();
 
-        //    ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
-        //    ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
-        //    ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
-        //}
+            //ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
+            //ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
+            //ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
+        }
 
-        //if (Input.GetKeyDown(KeyCode.C))
-        //{
-        //    ManaMiniGame.Score += 400;
+        if (Input.GetKeyDown(KeyCode.C))
+        {
+            ManaMiniGame.Score += 400;
 
-        //    ManaSign.SignTime = new DateTime(2007, 1, 1);
-        //}
+            //ManaSign.SignTime = new DateTime(2007, 1, 1);
+        }
 
         //if (Input.GetKeyDown(KeyCode.M))
         //{

ProjectSettings/GraphicsSettings.asset

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

ToDoList.txt

@@ -1,3 +1,12 @@
+截屏分享失败也要显示按钮
+
+Facebook 新浪微博不能分享
+
+QQ空间分享成功收不到回调
+
+分享按钮需要打入图集
+
+
 //关闭调试按键和界面
 
 先开启Service再打包