ソースを参照

试衣间增加一个返回按钮

jet 8 年 前
コミット
7920e900ec

+ 3 - 2
Assets/Resource/Logo.unity

@@ -445,8 +445,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
-  DebugModeGo: {fileID: 0}
+  DebugMode: 1
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 116 - 5
Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -140,7 +140,7 @@ GameObject:
   - component: {fileID: 114628483575551160}
   - component: {fileID: 114798544481346068}
   m_Layer: 5
-  m_Name: P_Save
+  m_Name: P_Return
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -651,6 +651,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1766607135279202
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224523201006200968}
+  - component: {fileID: 222742105261906608}
+  - component: {fileID: 114655927516320440}
+  - component: {fileID: 114152894146773020}
+  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 &1808383842750954
 GameObject:
   m_ObjectHideFlags: 1
@@ -1348,6 +1366,47 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E0A\u8863"
+--- !u!114 &114152894146773020
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1766607135279202}
+  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: 114655927516320440}
+  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 &114183743212847932
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2091,7 +2150,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: cde66b70acacf1a47b8a81614f11dcfb, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1a54fd35ff8e5224ca011a412abf11b1, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2200,6 +2259,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114655927516320440
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1766607135279202}
+  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: 21300000, guid: cde66b70acacf1a47b8a81614f11dcfb, 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 &114661915387390872
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3022,6 +3108,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1914603065110894}
+--- !u!222 &222742105261906608
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1766607135279202}
 --- !u!222 &222745203875157514
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -3258,12 +3350,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224316464020746548}
-  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}
-  m_AnchoredPosition: {x: 69.14996, y: 0.099975586}
-  m_SizeDelta: {x: 73.2, y: 59.3}
+  m_AnchoredPosition: {x: -114.35005, y: 346.0008}
+  m_SizeDelta: {x: 89.1, y: 65.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224286975738916642
 RectTransform:
@@ -3313,6 +3405,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224398397176885042}
+  - {fileID: 224523201006200968}
   - {fileID: 224277300051533002}
   m_Father: {fileID: 224042092064329274}
   m_RootOrder: 0
@@ -3569,6 +3662,24 @@ RectTransform:
   m_AnchoredPosition: {x: 167.68, y: -450}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.5, y: 0.00000022724271}
+--- !u!224 &224523201006200968
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1766607135279202}
+  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 &224525768392981752
 RectTransform:
   m_ObjectHideFlags: 1

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

@@ -94,6 +94,7 @@
     <P_WingLab desc=""><![CDATA[翅膀]]></P_WingLab>
     <P_BtnLab1 desc=""><![CDATA[购买]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[已购<(已购)>]]></P_BtnLab2>
+    <P_Return desc=""><![CDATA[离开试衣间?]]></P_Return>
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[去试衣间看看吧!]]></N_Lab>

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

@@ -94,6 +94,7 @@
     <P_WingLab desc=""><![CDATA[翅膀]]></P_WingLab>
     <P_BtnLab1 desc=""><![CDATA[購買]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[已購<(已购)>]]></P_BtnLab2>
+    <P_Return desc=""><![CDATA[離開試衣間?]]></P_Return>
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[去試衣間看看吧!]]></N_Lab>

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

@@ -94,6 +94,7 @@
     <P_WingLab desc=""><![CDATA[Wing]]></P_WingLab>
     <P_BtnLab1 desc=""><![CDATA[Buy]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[Bought<(已购)>]]></P_BtnLab2>
+    <P_Return desc=""><![CDATA[Leave dress room?]]></P_Return>
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[Go to your dress room!]]></N_Lab>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 19 - 0
Assets/Script/Manage/ManaUI.cs

@@ -2325,6 +2325,25 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region P_Return
+
+        ManaReso.SetButtonEvent
+            (
+                "P_Return",
+                () => Bubble.Show
+                    (
+                        null, Language.GetStr("UI", "P_Return"),
+                        null,
+                        () =>
+                        {
+                            ManaPlayer.Player.Save();
+                            ManaReso.Get("K_Bubble").GetTweenGra().InOrigin = true;
+                        }
+                    )
+            );
+        
+        #endregion
+
 
         #region Pa_Info
 

+ 2 - 2
ToList.txt

@@ -1,5 +1,3 @@
-试衣间返回按钮
-
 防止删除 删除前事件 HideFlag
 
 
@@ -22,4 +20,6 @@
 //更新版本号
 
 
+移除AnySDK
+
 分享appid申请