增加Plaza功能

Assets/Resource/DragonBones/DragonBones/src/DragonBones/animation/Animation.cs

@@ -341,7 +341,7 @@ namespace DragonBones
             {
                 animationConfig.playTimes = (int)animationData.playTimes;
             }
-
+            
             if (animationConfig.fadeInTime < 0.0f || float.IsNaN(animationConfig.fadeInTime))
             {
                 if (_lastAnimationState != null)

Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -235,6 +235,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1144790225777860
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224027571262383294}
+  - component: {fileID: 222510077530869848}
+  - component: {fileID: 114812511406264234}
+  m_Layer: 5
+  m_Name: U_DebugLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1151397088345516
 GameObject:
   m_ObjectHideFlags: 1
@@ -613,6 +630,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1362627184014904
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224345275296035146}
+  - component: {fileID: 225650786271795686}
+  m_Layer: 5
+  m_Name: U_Group
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1362710027354334
 GameObject:
   m_ObjectHideFlags: 1
@@ -836,6 +869,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1554011185540610
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224643075557994172}
+  - component: {fileID: 222373403526626990}
+  - component: {fileID: 114489806976590722}
+  m_Layer: 5
+  m_Name: U_Lab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1560668136581742
 GameObject:
   m_ObjectHideFlags: 1
@@ -1057,7 +1107,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1681976888411520
 GameObject:
   m_ObjectHideFlags: 1
@@ -1076,6 +1126,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1688683450281480
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224484235245061690}
+  - component: {fileID: 222707510684394586}
+  - component: {fileID: 114814729328166558}
+  m_Layer: 5
+  m_Name: U_Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1691143092573140
 GameObject:
   m_ObjectHideFlags: 1
@@ -1153,7 +1220,7 @@ GameObject:
   - component: {fileID: 114309431647996922}
   - component: {fileID: 225217521431195928}
   m_Layer: 5
-  m_Name: U_BlackMask
+  m_Name: V_BlackMask
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1600,6 +1667,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1999869294669664
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224983169175360330}
+  - component: {fileID: 222616904213236340}
+  - component: {fileID: 114309958873337896}
+  - component: {fileID: 225425285044910550}
+  m_Layer: 5
+  m_Name: U_LoadingPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!95 &95158083408686730
 Animator:
   serializedVersion: 3
@@ -2780,6 +2865,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114309958873337896
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1999869294669664}
+  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: 0
+  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: c4458ceb0a162f34fa9943f48b951955, 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 &114310925673211760
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3290,6 +3402,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114489806976590722
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1554011185540610}
+  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: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 29
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Loading...
 --- !u!114 &114493246792620858
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3335,7 +3480,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Loading...
+  m_Text: 
 --- !u!114 &114501286008666716
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4020,6 +4165,66 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6536\u53D6"
+--- !u!114 &114812511406264234
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1144790225777860}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
+  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: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 29
+    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: 1
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!114 &114814729328166558
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688683450281480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 4c5012c05fef95a4b86ad67c23d19c89, 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 &114821402301218020
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4682,6 +4887,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1277350598206914}
+--- !u!222 &222373403526626990
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1554011185540610}
 --- !u!222 &222378764382029106
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4760,6 +4971,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1063816939715054}
+--- !u!222 &222510077530869848
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1144790225777860}
 --- !u!222 &222527569686993514
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4808,6 +5025,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1195978307382430}
+--- !u!222 &222616904213236340
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1999869294669664}
 --- !u!222 &222635822024508072
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4844,6 +5067,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1252837207914498}
+--- !u!222 &222707510684394586
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688683450281480}
 --- !u!222 &222725576527514180
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5026,6 +5255,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224027571262383294
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1144790225777860}
+  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: 224983169175360330}
+  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: -138.7}
+  m_SizeDelta: {x: 746, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224044867189511148
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5519,6 +5766,26 @@ RectTransform:
   m_AnchoredPosition: {x: -0.000015258789, y: 0.000030517578}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224345275296035146
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1362627184014904}
+  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:
+  - {fileID: 224484235245061690}
+  - {fileID: 224643075557994172}
+  m_Father: {fileID: 224983169175360330}
+  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: -61.399994, y: -138.70001}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224358377575468156
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5836,6 +6103,24 @@ RectTransform:
   m_AnchoredPosition: {x: -44.499992, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224484235245061690
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688683450281480}
+  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: 224345275296035146}
+  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.000019073486, y: 0.000045776367}
+  m_SizeDelta: {x: 62.8, y: 61.8}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224488885525570128
 RectTransform:
   m_ObjectHideFlags: 1
@@ -6065,6 +6350,24 @@ RectTransform:
   m_AnchoredPosition: {x: -0.000030517578, y: -6}
   m_SizeDelta: {x: 483, y: 124}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224643075557994172
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1554011185540610}
+  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: 224345275296035146}
+  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: 111.40001, y: 0.00007036954}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224664466603613810
 RectTransform:
   m_ObjectHideFlags: 1
@@ -6288,6 +6591,7 @@ RectTransform:
   - {fileID: 224506676209611818}
   - {fileID: 224691548330788530}
   - {fileID: 224558911611703640}
+  - {fileID: 224983169175360330}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6718,6 +7022,26 @@ RectTransform:
   m_AnchoredPosition: {x: 50.000072, y: -49.999996}
   m_SizeDelta: {x: 125, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224983169175360330
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1999869294669664}
+  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:
+  - {fileID: 224027571262383294}
+  - {fileID: 224345275296035146}
+  m_Father: {fileID: 224734146220428892}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000030517578, y: -0.000015258789}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224986120777054612
 RectTransform:
   m_ObjectHideFlags: 1
@@ -6824,6 +7148,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225425285044910550
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1999869294669664}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225487454376865624
 CanvasGroup:
   m_ObjectHideFlags: 1
@@ -6857,6 +7192,17 @@ CanvasGroup:
   m_Interactable: 0
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225650786271795686
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1362627184014904}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225653718567012824
 CanvasGroup:
   m_ObjectHideFlags: 1
@@ -6864,7 +7210,7 @@ CanvasGroup:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1674459439079112}
   m_Enabled: 1
-  m_Alpha: 1
+  m_Alpha: 0
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0

Assets/Resource/Sprite/Editor/Logo/LOADING旋转花朵.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 4c5012c05fef95a4b86ad67c23d19c89
+timeCreated: 1505894412
+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: 

Assets/Resource/Sprite/Editor/Logo/Loading.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: c4458ceb0a162f34fa9943f48b951955
+timeCreated: 1505894413
+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: 

Assets/Resource/Sprite/Editor/SpriteUI/上衣按钮.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: af8057de509df6b4bb8944fd0deb02aa
+timeCreated: 1505894379
+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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: UI2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/XML/Config/dressRoom_config.xml

@@ -29,21 +29,21 @@
   <item id="28" jump_frequency="" type="1" index="26" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(紫)" spriteAlpha="" armatureName="头发8(紫)" extraBodypart="" extraArmatureName="" />
   <item id="29" jump_frequency="" type="1" index="27" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(绿)" spriteAlpha="" armatureName="头发8(绿)" extraBodypart="" extraArmatureName="" />
   <item id="30" jump_frequency="" type="1" index="28" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(黑)" spriteAlpha="" armatureName="头发8(黑)" extraBodypart="" extraArmatureName="" />
-  <item id="401" jump_frequency="" type="3" index="0" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子1" spriteAlpha="" armatureName="鞋子1" extraBodypart="" extraArmatureName="" />
-  <item id="402" jump_frequency="" type="3" index="1" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="2" spriteAlpha="" armatureName="鞋子4" extraBodypart="" extraArmatureName="" />
-  <item id="403" jump_frequency="" type="3" index="2" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="3" spriteAlpha="" armatureName="鞋子5" extraBodypart="" extraArmatureName="" />
-  <item id="404" jump_frequency="" type="3" index="3" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="4" spriteAlpha="" armatureName="鞋子6" extraBodypart="" extraArmatureName="" />
-  <item id="405" jump_frequency="" type="3" index="4" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子2" spriteAlpha="" armatureName="鞋子2" extraBodypart="" extraArmatureName="" />
-  <item id="406" jump_frequency="" type="3" index="5" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="12" spriteAlpha="" armatureName="鞋子14" extraBodypart="" extraArmatureName="" />
-  <item id="407" jump_frequency="" type="3" index="6" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="13" spriteAlpha="" armatureName="鞋子15" extraBodypart="" extraArmatureName="" />
-  <item id="408" jump_frequency="" type="3" index="7" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子3" spriteAlpha="" armatureName="鞋子3" extraBodypart="" extraArmatureName="" />
-  <item id="409" jump_frequency="" type="3" index="8" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="11" spriteAlpha="" armatureName="鞋子13" extraBodypart="" extraArmatureName="" />
-  <item id="410" jump_frequency="" type="3" index="9" bodypart="3" level="30" buy_currency="2" buy_amt="80" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="6" spriteAlpha="" armatureName="鞋子8" extraBodypart="" extraArmatureName="" />
-  <item id="411" jump_frequency="" type="3" index="10" bodypart="3" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="5" spriteAlpha="" armatureName="鞋子7" extraBodypart="" extraArmatureName="" />
-  <item id="412" jump_frequency="" type="3" index="11" bodypart="3" level="40" buy_currency="2" buy_amt="150" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="7" spriteAlpha="" armatureName="鞋子9" extraBodypart="" extraArmatureName="" />
-  <item id="413" jump_frequency="" type="3" index="12" bodypart="3" level="40" buy_currency="2" buy_amt="200" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="8" spriteAlpha="" armatureName="鞋子10" extraBodypart="" extraArmatureName="" />
-  <item id="414" jump_frequency="" type="3" index="13" bodypart="3" level="50" buy_currency="2" buy_amt="250" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="9" spriteAlpha="" armatureName="鞋子11" extraBodypart="" extraArmatureName="" />
-  <item id="415" jump_frequency="" type="3" index="14" bodypart="3" level="50" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="10" spriteAlpha="" armatureName="鞋子12" extraBodypart="" extraArmatureName="" />
+  <item id="401" jump_frequency="" type="6" index="0" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子1" spriteAlpha="" armatureName="鞋子1" extraBodypart="" extraArmatureName="" />
+  <item id="402" jump_frequency="" type="6" index="1" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="2" spriteAlpha="" armatureName="鞋子4" extraBodypart="" extraArmatureName="" />
+  <item id="403" jump_frequency="" type="6" index="2" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="3" spriteAlpha="" armatureName="鞋子5" extraBodypart="" extraArmatureName="" />
+  <item id="404" jump_frequency="" type="6" index="3" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="4" spriteAlpha="" armatureName="鞋子6" extraBodypart="" extraArmatureName="" />
+  <item id="405" jump_frequency="" type="6" index="4" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子2" spriteAlpha="" armatureName="鞋子2" extraBodypart="" extraArmatureName="" />
+  <item id="406" jump_frequency="" type="6" index="5" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="12" spriteAlpha="" armatureName="鞋子14" extraBodypart="" extraArmatureName="" />
+  <item id="407" jump_frequency="" type="6" index="6" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="13" spriteAlpha="" armatureName="鞋子15" extraBodypart="" extraArmatureName="" />
+  <item id="408" jump_frequency="" type="6" index="7" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子3" spriteAlpha="" armatureName="鞋子3" extraBodypart="" extraArmatureName="" />
+  <item id="409" jump_frequency="" type="6" index="8" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="11" spriteAlpha="" armatureName="鞋子13" extraBodypart="" extraArmatureName="" />
+  <item id="410" jump_frequency="" type="6" index="9" bodypart="3" level="30" buy_currency="2" buy_amt="80" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="6" spriteAlpha="" armatureName="鞋子8" extraBodypart="" extraArmatureName="" />
+  <item id="411" jump_frequency="" type="6" index="10" bodypart="3" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="5" spriteAlpha="" armatureName="鞋子7" extraBodypart="" extraArmatureName="" />
+  <item id="412" jump_frequency="" type="6" index="11" bodypart="3" level="40" buy_currency="2" buy_amt="150" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="7" spriteAlpha="" armatureName="鞋子9" extraBodypart="" extraArmatureName="" />
+  <item id="413" jump_frequency="" type="6" index="12" bodypart="3" level="40" buy_currency="2" buy_amt="200" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="8" spriteAlpha="" armatureName="鞋子10" extraBodypart="" extraArmatureName="" />
+  <item id="414" jump_frequency="" type="6" index="13" bodypart="3" level="50" buy_currency="2" buy_amt="250" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="9" spriteAlpha="" armatureName="鞋子11" extraBodypart="" extraArmatureName="" />
+  <item id="415" jump_frequency="" type="6" index="14" bodypart="3" level="50" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="10" spriteAlpha="" armatureName="鞋子12" extraBodypart="" extraArmatureName="" />
   <item id="201" jump_frequency="" type="3" index="0" bodypart="2" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子1" spriteAlpha="" armatureName="裙子1" extraBodypart="" extraArmatureName="" />
   <item id="202" jump_frequency="" type="3" index="1" bodypart="2" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子2" spriteAlpha="" armatureName="裙子2" extraBodypart="" extraArmatureName="" />
   <item id="203" jump_frequency="" type="3" index="2" bodypart="2" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子3" spriteAlpha="" armatureName="裙子3" extraBodypart="" extraArmatureName="" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -108,6 +108,7 @@
     <P_DressLab desc=""><![CDATA[下装]]></P_DressLab>
     <P_DecaratorLab desc=""><![CDATA[饰品]]></P_DecaratorLab>
     <P_WingLab desc=""><![CDATA[翅膀]]></P_WingLab>
+    <P_ShoeLab desc=""><![CDATA[鞋子]]></P_ShoeLab>
     <P_BtnLab1 desc=""><![CDATA[购买]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[已购<(已购)>]]></P_BtnLab2>
     <P_Return desc=""><![CDATA[你的当前形象还有没购买的装扮，确定要退出吗？]]></P_Return>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -108,6 +108,7 @@
     <P_DressLab desc=""><![CDATA[下裝]]></P_DressLab>
     <P_DecaratorLab desc=""><![CDATA[飾品]]></P_DecaratorLab>
     <P_WingLab desc=""><![CDATA[翅膀]]></P_WingLab>
+    <P_ShoeLab desc=""><![CDATA[鞋子]]></P_ShoeLab>
     <P_BtnLab1 desc=""><![CDATA[購買]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[已購<(已购)>]]></P_BtnLab2>
     <P_Return desc=""><![CDATA[妳的當前形象還有沒購買的裝扮，確定要退出嗎？]]></P_Return>

Assets/Resource/XML/lan/English.xml

@@ -108,6 +108,7 @@ Program 水怪
     <P_DressLab desc=""><![CDATA[Dress]]></P_DressLab>
     <P_DecaratorLab desc=""><![CDATA[Accessory]]></P_DecaratorLab>
     <P_WingLab desc=""><![CDATA[Wing]]></P_WingLab>
+    <P_ShoeLab desc=""><![CDATA[Shoe]]></P_ShoeLab>
     <P_BtnLab1 desc=""><![CDATA[Buy]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[Bought<(已购)>]]></P_BtnLab2>
     <P_Return desc=""><![CDATA[You currently have some close not yet purchased,are you sure you want to leave?]]></P_Return>

Assets/Script/Manage/Initializer.cs

@@ -26,6 +26,134 @@ public class Initializer : MonoBehaviour
 
     private void Awake()
     {
+        try
+        {
+            InitializeDataEye();
+        }
+        catch (Exception)
+        {
+
+        }
+
+        string progress = "";
+
+        try
+        {
+            progress = "1";
+            Application.targetFrameRate = 50;
+
+            progress = "2";
+            DontDestroyOnLoad(gameObject);
+
+            progress = "3";
+            ManaServer.Login(ManaCenter.LoginCallbackInitial);
+
+            progress = "4";
+            ManaServer.MailRequest();
+
+            progress = "5";
+            ManaServer.RankRequest();
+
+            progress = "6";
+            ManaServer.IOSAlipayRequest();
+
+            progress = "7";
+            ManaServer.NotificationRequest();
+
+            Instance = this;
+            Transform = transform;
+
+            progress = "8";
+            if (DebugMode)
+            {
+                Instantiate(DebugModeGo, transform);
+            }
+            else
+            {
+                gameObject.AddComponent<Bundle>();
+            }
+
+            progress = "9";
+            gameObject.AddComponent<ManaIAP>();
+
+            progress = "10";
+            gameObject.AddComponent<ManaVisit>();
+
+            progress = "11";
+            gameObject.AddComponent<ManaDebug>();
+
+            progress = "12";
+            gameObject.AddScript<Auxiliary>();
+
+            progress = "13";
+            gameObject.AddScript<ManaData>();
+
+            progress = "14";
+            gameObject.AddScript<ManaReso>();
+
+            progress = "15";
+            gameObject.AddScript<ManaTutorial>();
+
+            progress = "16";
+            gameObject.AddScript<ManaLan>();
+
+            progress = "17";
+            gameObject.AddScript<ManaAnim>();
+
+            progress = "18";
+            gameObject.AddScript<ManaAudio>();
+
+            progress = "19";
+            gameObject.AddScript<ManaAchieve>();
+
+            progress = "20";
+            gameObject.AddScript<ManaUI>();
+
+            progress = "21";
+            gameObject.AddScript<ManaSign>();
+
+            progress = "22";
+            gameObject.AddScript<ManaCenter>();
+
+            progress = "23";
+            gameObject.AddScript<ManaGarden>();
+
+            progress = "24";
+            gameObject.AddScript<ManaPlayer>();
+
+            progress = "25";
+            gameObject.AddScript<ManaServer>();
+
+            progress = "26";
+            gameObject.AddScript<ManaMiniGame>();
+
+            progress = "27";
+            gameObject.AddScript<ManaInfo>();
+
+            progress = "28";
+            gameObject.AddScript<ManaSocial>();
+
+            progress = "29";
+            gameObject.AddScript<ManaNickName>();
+
+            progress = "30";
+            gameObject.AddScript<GardenSmartFoxManager>();
+
+            progress = "31";
+            StartCoroutine(IInitialize());
+        }
+        catch (Exception e)
+        {
+            GameObject.Find("Canvas").GetChild(0).SetActive(true);
+            GameObject.Find("Canvas").GetChild(1).SetActive(true);
+            GameObject.Find("Text").GetComponent<Text>().text = progress + "\n" + e;
+
+            throw new Exception();
+        }
+    }
+
+    private void InitializeDataEye()
+    {
         if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
             DataEyeGA.Init("C5790DBD2CFE97BD18C7BE9A95482C05", DataEyeGA.PlatformType.IOS, "Official", "IOS");
@@ -38,138 +166,101 @@ public class Initializer : MonoBehaviour
         {
             DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.WP, "Official", "Windows");
         }
+    }
 
-        Application.targetFrameRate = 50;
-        
-        DontDestroyOnLoad(gameObject);
-
-        ManaServer.Login(ManaCenter.LoginCallbackInitial);
-
-        ManaServer.MailRequest();
-        ManaServer.RankRequest();
-        ManaServer.IOSAlipayRequest();
-        ManaServer.NotificationRequest();
-        
-        Instance = this;
-        Transform = transform;
 
-        if (DebugMode)
+    public static void InitializeEntrance()
+    {
+        if (Instance.DebugMode)
         {
-            Instantiate(DebugModeGo, transform);
+            Initialize();
         }
         else
         {
-            gameObject.AddComponent<Bundle>();
+            ManaDebug.TryCatch(Initialize, EnableDebugLab);
         }
-
-        gameObject.AddComponent<ManaIAP>();
-        gameObject.AddComponent<ManaVisit>();
-        gameObject.AddComponent<ManaDebug>();
-
-        gameObject.AddScript<Auxiliary>();
-        gameObject.AddScript<ManaData>();
-        gameObject.AddScript<ManaReso>();
-        gameObject.AddScript<ManaTutorial>();
-
-        gameObject.AddScript<ManaLan>();
-        gameObject.AddScript<ManaAnim>();
-        gameObject.AddScript<ManaAudio>();
-        gameObject.AddScript<ManaAchieve>();
-
-        gameObject.AddScript<ManaUI>();
-        gameObject.AddScript<ManaSign>();
-        gameObject.AddScript<ManaCenter>();
-        gameObject.AddScript<ManaGarden>();
-
-        gameObject.AddScript<ManaPlayer>();
-        gameObject.AddScript<ManaServer>();
-        gameObject.AddScript<ManaMiniGame>();
-
-        gameObject.AddScript<ManaInfo>();
-        gameObject.AddScript<ManaSocial>();
-        gameObject.AddScript<ManaNickName>();
-        gameObject.AddScript<GardenSmartFoxManager>();
-
-        StartCoroutine(IInitialize());
     }
 
-
     public static void Initialize()
     {
-        //Debug.Log(Application.persistentDataPath);
+        Text debugLab = GameObject.Find("U_DebugLab").GetComponent<Text>();
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1";
+        debugLab.text = "Error code : 1";
 
         ManaTutorial.TutorialA = ManaData.GetPlayerBool("TutorialA");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-1";
+        debugLab.text = "Error code : 1-1";
 
         ManaTutorial.TutorialB_ = ManaData.GetPlayerBool("TutorialB");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-2";
+        debugLab.text = "Error code : 1-2";
 
         ManaTutorial.TutorialC_ = ManaData.GetPlayerBool("TutorialC");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-3";
+        debugLab.text = "Error code : 1-3";
 
         ManaTutorial.TutorialD_ = ManaData.GetPlayerBool("TutorialD");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-4";
+        debugLab.text = "Error code : 1-4";
 
         ManaTutorial.TutorialE_ = ManaData.GetPlayerBool("TutorialE");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-5";
+        debugLab.text = "Error code : 1-5";
 
         ManaTutorial.TutorialIndexA = ManaData.GetPlayerInt("TutorialIndexA");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-6";
+        debugLab.text = "Error code : 1-6";
 
         ManaTutorial.TutorialIndexB = ManaData.GetPlayerInt("TutorialIndexB");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-7";
+        debugLab.text = "Error code : 1-7";
 
         ManaTutorial.TutorialIndexC = ManaData.GetPlayerInt("TutorialIndexC");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-8";
+        debugLab.text = "Error code : 1-8";
 
         ManaTutorial.TutorialIndexD = ManaData.GetPlayerInt("TutorialIndexD");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-9";
+        debugLab.text = "Error code : 1-9";
 
         ManaTutorial.TutorialIndexE = ManaData.GetPlayerInt("TutorialIndexE");
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-10";
+        debugLab.text = "Error code : 1-10";
 
         Bundle.LoadAtlasSprites();
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-11";
+        debugLab.text = "Error code : 1-11";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
-            GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-12-" + RegistList[i].GetType();
+            debugLab.text = "Error code : 1-12-" + i;
             RegistList[i].Instantiate();
         }
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 2";
+        debugLab.text = "Error code : 2";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
+            debugLab.text = "Error code : 2-" + i;
             RegistList[i].RegistReference();
         }
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 3";
-        
+        debugLab.text = "Error code : 3";
+
         for (int i = 0; i < RegistList.Count; i++)
         {
+            debugLab.text = "Error code : 3-" + i;
             RegistList[i].RegistValueA();
         }
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 4";
+        debugLab.text = "Error code : 4";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
+            debugLab.text = "Error code : 4-" + i;
             RegistList[i].RegistValueB();
         }
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 5";
+        debugLab.text = "Error code : 5";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
+            debugLab.text = "Error code : 5-" + i;
             RegistList[i].RegistValueC();
 
             RegistList[i].enabled = true;
         }
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 6";
+        debugLab.text = "Error code : 6";
 
         Complete = true;
 
@@ -178,29 +269,58 @@ public class Initializer : MonoBehaviour
             ManaReso.Get("C_Notify").TweenForCG();
         }
 
+        debugLab.text = "Error code : 7";
         ManaPlayer.InitializeDressRoom();
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 7";
-
+        debugLab.text = "Error code : 8";
         ManaCenter.LoginCallbackInitial(new JsonData());
 
+        debugLab.text = "Error code : 9";
         GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SyncClose();
 
+        debugLab.text = "Error code : 10";
         StringFilter.Init();
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 8";
-
+        debugLab.text = "Error code : 11";
         ManaIAP.Initialize();
 
+        debugLab.text = "Error code : 12";
         ManaVisit.Initialize();
 
+        debugLab.text = "Error code : 13";
         ManaSocial.InitializeRankPanel();
 
-        ManaReso.Get("I_BlackMask").TweenForCG();
+        debugLab.text = "Error code : 14";
+        ManaReso.Release();
 
-        ManaReso.SetActive("I_Lab", false);
+        if (Instance.DebugMode)
+        {
+            ActivateGame();
+        }
+        else
+        {
+            ShowLoadingPanel();
+        }
+    }
 
-        ManaReso.Release();
+    private static void ShowLoadingPanel()
+    {
+        ManaReso.Get("U_Group").TweenForCG();
+
+        Auxiliary.Instance.DelayCall(ActivateGame, 3f);
+    }
+
+    private static void ActivateGame()
+    {
+        ManaReso.Get("U_LoadingPanel").TweenForCG();
+        ManaAudio.MusicTheme.TweenForAudio();
+    }
+
+    public static void EnableDebugLab()
+    {
+        ManaReso.Get<CanvasGroup>("U_Group").alpha = 0;
+        ManaReso.Get<Text>("U_DebugLab").enabled = true;
+        throw new Exception();
     }
 
 
@@ -221,6 +341,6 @@ public class Initializer : MonoBehaviour
             yield return null;
         }
 
-        Initialize();
+        InitializeEntrance();
     }
 }

Assets/Script/Manage/ManaAudio.cs

@@ -124,8 +124,6 @@ public class ManaAudio : Regist
 
         #endregion
 
-        MusicTheme.TweenForAudio();
-
         if (!Music)
         {
             ManaReso.SetActive("L_MusicOn", false);
@@ -197,7 +195,15 @@ public class ManaAudio : Regist
             ManaReso.SetActive("L_MusicOff", false);
 
             MusicMini.UnPause();
-            MusicTheme.UnPause();
+
+            if (MusicTheme.isPlaying)
+            {
+                MusicTheme.UnPause();
+            }
+            else
+            {
+                MusicTheme.TweenReForAudio();
+            }
 
             PlayerPrefs.SetInt("MusicOn", 1);
         }
@@ -257,14 +263,4 @@ public class ManaAudio : Regist
             audioSource.Play();
         }
     }
-}
-
-#region DebugList
-
-//从花园到小游戏
-//从小游戏到花园
-//从后台恢复
-//循环
-//静音
-
-#endregion
+}

Assets/Script/Manage/ManaDebug.cs

@@ -59,4 +59,16 @@ public class ManaDebug : MonoBehaviour
 
         Lab.text += '\n' + message;
     }
+
+    public static void TryCatch(Action tryAction, Action catchAction)
+    {
+        try
+        {
+            tryAction.Invoke();
+        }
+        catch (Exception)
+        {
+            catchAction.Invoke();
+        }
+    }
 }

Assets/Script/Manage/ManaIAP.cs

@@ -100,14 +100,16 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         
         //GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : AD";
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : IAP1";
+        GameObject.Find("U_DebugLab").GetComponent<Text>().text = "Error Code : I1";
 
         InitializeIAP();
 
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : IAP2";
+        GameObject.Find("U_DebugLab").GetComponent<Text>().text = "Error Code : I2";
 
         ADPlayTime = DateTime.Parse(ManaData.GetPlayerString("ADPlayTime"));
 
+        GameObject.Find("U_DebugLab").GetComponent<Text>().text = "Error Code : I3";
+
         //InitializeShare();
 
         //GameObject.Find("I_Lab").GetComponent<Text>().text = "Error Code : Share";

Assets/Script/Manage/ManaNickName.cs

@@ -13,18 +13,18 @@ public class ManaNickName : Regist
 	public static string NickName;
 	public static InputField inputField;
 
-	public override void RegistValueA ()
+	public override void RegistValueA()
 	{
 		SetNickName (ManaData.GetPlayerString ("NickName"));
 		inputField = ManaReso.Get<InputField> ("T_InputField");
-	}
+    }
 
 	public static bool ShowNickNameSettingPanelFirstTime()
 	{
-		if (!string.IsNullOrEmpty (NickName))
+        if (!string.IsNullOrEmpty (NickName))
 			return false;
 
-		ShowNickNameSettingPanel ();
+        ShowNickNameSettingPanel();
 
 		return true;
 	}
@@ -39,6 +39,7 @@ public class ManaNickName : Regist
 
 	public static void CloseNickNameSettingPanel()
 	{
+        ManaAudio.PlayClip(Clip.CloseClip);
 		ManaReso.Get ("C_Main").TweenForCG ();
 		ManaReso.Get ("T_NickNameBK").TweenBacCG ();
 	}
@@ -58,6 +59,10 @@ public class ManaNickName : Regist
                     ResetFailed
                 );
 		}
+		else
+		{
+            ManaReso.Get<CanvasGroup>("T_NickNameBK").interactable = true;
+        }
 	}
 
     public static void ResetFailed()
@@ -88,29 +93,37 @@ public class ManaNickName : Regist
 		ManaReso.SetText ("C_NickNameLab", nickName);
 	}
 
-	public static bool InputFieldValidate()
-	{
-		inputField.text = inputField.text.Trim ();
-
-		int charCnt = 0;
+    public static bool InputFieldValidate()
+    {
+        inputField.text = inputField.text.Trim();
 
-		for (int i = 0; i < inputField.text.Length; i++) {
-			if (inputField.text [i] <= 127) {
-				charCnt++;
-			} else if (inputField.text [i] > 127) {
-				charCnt += 2;
-			}
-		}
+        int charCnt = 0;
 
-		if (charCnt == 0) {
-			Bubble.Show (null, Language.GetStr("UI", "T_AllWhiteSpace"));
-			return false;
-		} else if (charCnt > 12) {
-			Bubble.Show (null, Language.GetStr("UI", "T_TooLong"));
-			inputField.text = inputField.text.Substring (0, 12);
+        for (int i = 0; i < inputField.text.Length; i++)
+        {
+            if (inputField.text[i] <= 127)
+            {
+                charCnt++;
+            }
+            else if (inputField.text[i] > 127)
+            {
+                charCnt += 2;
+            }
+        }
 
-			return false;
-		} else {
+        if (charCnt == 0)
+        {
+            Bubble.Show(null, Language.GetStr("UI", "T_AllWhiteSpace"));
+            return false;
+        }
+        else if (charCnt > 12)
+        {
+            Bubble.Show(null, Language.GetStr("UI", "T_TooLong"));
+            inputField.text = inputField.text.Substring(0, 12);
+            return false;
+        }
+        else
+        {
             if (StringFilter.ContainSensitiveWord(inputField.text))
             {
                 Bubble.Show(null, Language.GetStr("Common", "ContainSensitiveWord"));
@@ -121,6 +134,6 @@ public class ManaNickName : Regist
                 ManaAudio.PlayClip(Clip.CloseClip);
                 return true;
             }
-		}
-	}
+        }
+    }
 }

Assets/Script/Manage/ManaReso.cs

@@ -212,7 +212,7 @@ public class ManaReso : Regist
 
     public static void Release()
     {
-        Bundle.Discard.Unload(false);
+        //Bundle.Discard.Unload(false);
     }
 
 

Assets/Script/Manage/ManaUI.cs

@@ -2234,6 +2234,7 @@ public class ManaUI : Regist
         ManaLan.Add(ManaReso.Get<Text>("P_DressLab"), new LanStr("UI", "P_DressLab"));
         ManaLan.Add(ManaReso.Get<Text>("P_DecaratorLab"), new LanStr("UI", "P_DecaratorLab"));
         ManaLan.Add(ManaReso.Get<Text>("P_WingLab"), new LanStr("UI", "P_WingLab"));
+        ManaLan.Add(ManaReso.Get<Text>("P_ShoeLab"), new LanStr("UI", "P_ShoeLab"));
 
         ManaLan.Add(ManaReso.Get<Text>("Pa_Tit"), new LanStr("UI", "Pa_Tit"));
 
@@ -2333,6 +2334,7 @@ public class ManaUI : Regist
         ManaReso.Get("P_Dress").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
         ManaReso.Get("P_Decarator").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
         ManaReso.Get("P_Wing").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
+        ManaReso.Get("P_Shoe").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
 
         ManaReso.AddButtonEvent
         (
@@ -2346,30 +2348,35 @@ public class ManaUI : Regist
                 ManaReso.Get("P_Dress").TweenBacScale();
                 ManaReso.Get("P_Decarator").TweenBacScale();
                 ManaReso.Get("P_Wing").TweenBacScale();
+                ManaReso.Get("P_Shoe").TweenBacScale();
 
-                ManaReso.Get("P_Hair").SetAsLastSibling();
+                ManaReso.Get("P_Hair").SetSiblingIndex(5);
                 ManaReso.Get("P_Top").SetSiblingIndex(0);
                 ManaReso.Get("P_Dress").SetSiblingIndex(1);
-                ManaReso.Get("P_Decarator").SetSiblingIndex(2);
-                ManaReso.Get("P_Wing").SetSiblingIndex(3);
+                ManaReso.Get("P_Decarator").SetSiblingIndex(3);
+                ManaReso.Get("P_Wing").SetSiblingIndex(4);
+                ManaReso.Get("P_Shoe").SetSiblingIndex(2);
 
                 ManaReso.Get<Button>("P_Hair").interactable = false;
                 ManaReso.Get<Button>("P_Top").interactable = true;
                 ManaReso.Get<Button>("P_Dress").interactable = true;
                 ManaReso.Get<Button>("P_Decarator").interactable = true;
                 ManaReso.Get<Button>("P_Wing").interactable = true;
+                ManaReso.Get<Button>("P_Shoe").interactable = true;
 
                 ManaReso.SetActive("Pa_HairTab", true);
                 ManaReso.SetActive("Pb_TopTab", false);
                 ManaReso.SetActive("Pc_DressTab", false);
                 ManaReso.SetActive("Pd_DecaratorTab", false);
                 ManaReso.SetActive("Pe_WingTab", false);
+                ManaReso.SetActive("Pf_ShoeTab", false);
 
                 ManaReso.SetActive("P_HairIcon", true);
                 ManaReso.SetActive("P_TopIcon", false);
                 ManaReso.SetActive("P_DressIcon", false);
                 ManaReso.SetActive("P_DecaratorIcon", false);
                 ManaReso.SetActive("P_WingIcon", false);
+                ManaReso.SetActive("P_ShoeIcon", false);
             }
         );
 
@@ -2385,30 +2392,35 @@ public class ManaUI : Regist
                 ManaReso.Get("P_Dress").TweenBacScale();
                 ManaReso.Get("P_Decarator").TweenBacScale();
                 ManaReso.Get("P_Wing").TweenBacScale();
+                ManaReso.Get("P_Shoe").TweenBacScale();
 
                 ManaReso.Get("P_Hair").SetSiblingIndex(0);
-                ManaReso.Get("P_Top").SetAsLastSibling();
+                ManaReso.Get("P_Top").SetSiblingIndex(5);
                 ManaReso.Get("P_Dress").SetSiblingIndex(1);
-                ManaReso.Get("P_Decarator").SetSiblingIndex(2);
-                ManaReso.Get("P_Wing").SetSiblingIndex(3);
+                ManaReso.Get("P_Decarator").SetSiblingIndex(3);
+                ManaReso.Get("P_Wing").SetSiblingIndex(4);
+                ManaReso.Get("P_Shoe").SetSiblingIndex(2);
 
                 ManaReso.Get<Button>("P_Hair").interactable = true;
                 ManaReso.Get<Button>("P_Top").interactable = false;
                 ManaReso.Get<Button>("P_Dress").interactable = true;
                 ManaReso.Get<Button>("P_Decarator").interactable = true;
                 ManaReso.Get<Button>("P_Wing").interactable = true;
+                ManaReso.Get<Button>("P_Shoe").interactable = true;
 
                 ManaReso.SetActive("Pa_HairTab", false);
                 ManaReso.SetActive("Pb_TopTab", true);
                 ManaReso.SetActive("Pc_DressTab", false);
                 ManaReso.SetActive("Pd_DecaratorTab", false);
                 ManaReso.SetActive("Pe_WingTab", false);
+                ManaReso.SetActive("Pf_ShoeTab", false);
 
                 ManaReso.SetActive("P_HairIcon", false);
                 ManaReso.SetActive("P_TopIcon", true);
                 ManaReso.SetActive("P_DressIcon", false);
                 ManaReso.SetActive("P_DecaratorIcon", false);
                 ManaReso.SetActive("P_WingIcon", false);
+                ManaReso.SetActive("P_ShoeIcon", false);
             }
         );
 
@@ -2424,30 +2436,35 @@ public class ManaUI : Regist
                 ManaReso.Get("P_Dress").TweenForScale();
                 ManaReso.Get("P_Decarator").TweenBacScale();
                 ManaReso.Get("P_Wing").TweenBacScale();
+                ManaReso.Get("P_Shoe").TweenBacScale();
 
                 ManaReso.Get("P_Hair").SetSiblingIndex(0);
                 ManaReso.Get("P_Top").SetSiblingIndex(1);
-                ManaReso.Get("P_Dress").SetAsLastSibling();
-                ManaReso.Get("P_Decarator").SetSiblingIndex(2);
-                ManaReso.Get("P_Wing").SetSiblingIndex(3);
+                ManaReso.Get("P_Dress").SetSiblingIndex(6);
+                ManaReso.Get("P_Decarator").SetSiblingIndex(3);
+                ManaReso.Get("P_Wing").SetSiblingIndex(4);
+                ManaReso.Get("P_Shoe").SetSiblingIndex(2);
 
                 ManaReso.Get<Button>("P_Hair").interactable = true;
                 ManaReso.Get<Button>("P_Top").interactable = true;
                 ManaReso.Get<Button>("P_Dress").interactable = false;
                 ManaReso.Get<Button>("P_Decarator").interactable = true;
                 ManaReso.Get<Button>("P_Wing").interactable = true;
+                ManaReso.Get<Button>("P_Shoe").interactable = true;
 
                 ManaReso.SetActive("Pa_HairTab", false);
                 ManaReso.SetActive("Pb_TopTab", false);
                 ManaReso.SetActive("Pc_DressTab", true);
                 ManaReso.SetActive("Pd_DecaratorTab", false);
                 ManaReso.SetActive("Pe_WingTab", false);
+                ManaReso.SetActive("Pf_ShoeTab", false);
 
                 ManaReso.SetActive("P_HairIcon", false);
                 ManaReso.SetActive("P_TopIcon", false);
                 ManaReso.SetActive("P_DressIcon", true);
                 ManaReso.SetActive("P_DecaratorIcon", false);
                 ManaReso.SetActive("P_WingIcon", false);
+                ManaReso.SetActive("P_ShoeIcon", false);
             }
         );
 
@@ -2463,30 +2480,35 @@ public class ManaUI : Regist
                 ManaReso.Get("P_Dress").TweenBacScale();
                 ManaReso.Get("P_Decarator").TweenForScale();
                 ManaReso.Get("P_Wing").TweenBacScale();
+                ManaReso.Get("P_Shoe").TweenBacScale();
 
                 ManaReso.Get("P_Hair").SetSiblingIndex(0);
                 ManaReso.Get("P_Top").SetSiblingIndex(1);
                 ManaReso.Get("P_Dress").SetSiblingIndex(2);
-                ManaReso.Get("P_Decarator").SetAsLastSibling();
-                ManaReso.Get("P_Wing").SetSiblingIndex(3);
+                ManaReso.Get("P_Decarator").SetSiblingIndex(5);
+                ManaReso.Get("P_Wing").SetSiblingIndex(4);
+                ManaReso.Get("P_Shoe").SetSiblingIndex(3);
 
                 ManaReso.Get<Button>("P_Hair").interactable = true;
                 ManaReso.Get<Button>("P_Top").interactable = true;
                 ManaReso.Get<Button>("P_Dress").interactable = true;
                 ManaReso.Get<Button>("P_Decarator").interactable = false;
                 ManaReso.Get<Button>("P_Wing").interactable = true;
+                ManaReso.Get<Button>("P_Shoe").interactable = true;
 
                 ManaReso.SetActive("Pa_HairTab", false);
                 ManaReso.SetActive("Pb_TopTab", false);
                 ManaReso.SetActive("Pc_DressTab", false);
                 ManaReso.SetActive("Pd_DecaratorTab", true);
                 ManaReso.SetActive("Pe_WingTab", false);
+                ManaReso.SetActive("Pf_ShoeTab", false);
 
                 ManaReso.SetActive("P_HairIcon", false);
                 ManaReso.SetActive("P_TopIcon", false);
                 ManaReso.SetActive("P_DressIcon", false);
                 ManaReso.SetActive("P_DecaratorIcon", true);
                 ManaReso.SetActive("P_WingIcon", false);
+                ManaReso.SetActive("P_ShoeIcon", false);
             }
         );
 
@@ -2502,33 +2524,82 @@ public class ManaUI : Regist
                     ManaReso.Get("P_Dress").TweenBacScale();
                     ManaReso.Get("P_Decarator").TweenBacScale();
                     ManaReso.Get("P_Wing").TweenForScale();
+                    ManaReso.Get("P_Shoe").TweenBacScale();
 
                     ManaReso.Get("P_Hair").SetSiblingIndex(0);
                     ManaReso.Get("P_Top").SetSiblingIndex(1);
                     ManaReso.Get("P_Dress").SetSiblingIndex(2);
-                    ManaReso.Get("P_Decarator").SetSiblingIndex(3);
-                    ManaReso.Get("P_Wing").SetAsLastSibling();
+                    ManaReso.Get("P_Decarator").SetSiblingIndex(4);
+                    ManaReso.Get("P_Wing").SetSiblingIndex(5);
+                    ManaReso.Get("P_Shoe").SetSiblingIndex(3);
 
                     ManaReso.Get<Button>("P_Hair").interactable = true;
                     ManaReso.Get<Button>("P_Top").interactable = true;
                     ManaReso.Get<Button>("P_Dress").interactable = true;
                     ManaReso.Get<Button>("P_Decarator").interactable = true;
                     ManaReso.Get<Button>("P_Wing").interactable = false;
+                    ManaReso.Get<Button>("P_Shoe").interactable = true;
 
                     ManaReso.SetActive("Pa_HairTab", false);
                     ManaReso.SetActive("Pb_TopTab", false);
                     ManaReso.SetActive("Pc_DressTab", false);
                     ManaReso.SetActive("Pd_DecaratorTab", false);
                     ManaReso.SetActive("Pe_WingTab", true);
+                    ManaReso.SetActive("Pf_ShoeTab", false);
 
                     ManaReso.SetActive("P_HairIcon", false);
                     ManaReso.SetActive("P_TopIcon", false);
                     ManaReso.SetActive("P_DressIcon", false);
                     ManaReso.SetActive("P_DecaratorIcon", false);
                     ManaReso.SetActive("P_WingIcon", true);
+                    ManaReso.SetActive("P_ShoeIcon", false);
                 }
             );
 
+        ManaReso.AddButtonEvent
+        (
+            "P_Shoe",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ManaReso.Get("P_Hair").TweenBacScale();
+                ManaReso.Get("P_Top").TweenBacScale();
+                ManaReso.Get("P_Dress").TweenBacScale();
+                ManaReso.Get("P_Decarator").TweenBacScale();
+                ManaReso.Get("P_Wing").TweenBacScale();
+                ManaReso.Get("P_Shoe").TweenForScale();
+
+                ManaReso.Get("P_Hair").SetSiblingIndex(0);
+                ManaReso.Get("P_Top").SetSiblingIndex(1);
+                ManaReso.Get("P_Dress").SetSiblingIndex(2);
+                ManaReso.Get("P_Decarator").SetSiblingIndex(3);
+                ManaReso.Get("P_Wing").SetSiblingIndex(4);
+                ManaReso.Get("P_Shoe").SetSiblingIndex(5);
+
+                ManaReso.Get<Button>("P_Hair").interactable = true;
+                ManaReso.Get<Button>("P_Top").interactable = true;
+                ManaReso.Get<Button>("P_Dress").interactable = true;
+                ManaReso.Get<Button>("P_Decarator").interactable = true;
+                ManaReso.Get<Button>("P_Wing").interactable = true;
+                ManaReso.Get<Button>("P_Shoe").interactable = false;
+
+                ManaReso.SetActive("Pa_HairTab", false);
+                ManaReso.SetActive("Pb_TopTab", false);
+                ManaReso.SetActive("Pc_DressTab", false);
+                ManaReso.SetActive("Pd_DecaratorTab", false);
+                ManaReso.SetActive("Pe_WingTab", false);
+                ManaReso.SetActive("Pf_ShoeTab", true);
+
+                ManaReso.SetActive("P_HairIcon", false);
+                ManaReso.SetActive("P_TopIcon", false);
+                ManaReso.SetActive("P_DressIcon", false);
+                ManaReso.SetActive("P_DecaratorIcon", false);
+                ManaReso.SetActive("P_WingIcon", false);
+                ManaReso.SetActive("P_ShoeIcon", true);
+            }
+        );
+
         #endregion
 
         #region P_Return
@@ -2696,7 +2767,19 @@ public class ManaUI : Regist
 
         #region U
 
-        ManaReso.Get("U_BlackMask").CreateTweenCG(1, 0, 0.25f, true, false, Curve.EaseOutQuad);
+        ManaReso.Get("U_LoadingPanel").CreateTweenCG(1, 0, 1f, true, false, Curve.EaseOutQuad);
+
+        ManaReso.Get("U_Group").CreateTweenCG(0, 1f, 0.5f, false, true, Curve.EaseOutQuad);
+
+        tweenRoot = ManaReso.Get("U_Icon").CreateTweenEuler(new Vector3(0, 0, -360), 1.25f, false, true, true, Curve.Linear);
+        tweenRoot.Repeat = true;
+        tweenRoot.StartForward();
+
+        #endregion
+
+        #region V
+
+        ManaReso.Get("V_BlackMask").CreateTweenCG(1, 0, 0.25f, true, false, Curve.EaseOutQuad);
 
         #endregion
 

Assets/Script/Object/Player.cs

@@ -9,7 +9,7 @@ using System.Xml;
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
-
+using Animation = DragonBones.Animation;
 using Slot = DragonBones.Slot;
 using Random = UnityEngine.Random;
 using Transform = UnityEngine.Transform;
@@ -43,10 +43,7 @@ public class CloseUnit
         Wing,
         Dress,
         Decarator,
-        LeftLongSleeve,
-        LeftShortSleeve,
-        RightLongSleeve,
-        RightShortSleeve,
+        Shoe,
     }
 
     #region Var
@@ -141,6 +138,10 @@ public class CloseUnit
         {
             Transform.SetParent(ManaReso.Get("Pd_DecaratorGrid"));
         }
+        else if (Type == CloseType.Shoe)
+        {
+            Transform.SetParent(ManaReso.Get("Pf_ShoeGrid"));
+        }
         else
         {
             throw new Exception();
@@ -166,7 +167,8 @@ public class CloseUnit
 
         if (BuyCurrent != Current.Free)
         {
-            ManaLan.Add(BuyBtnLab, new LanStr("UI", "P_BtnLab1"), Auxiliary.ImageParse(BuyCurrent), Auxiliary.ShrinkNumberStr(BuyAmt));
+            BuyBtnLab.text = Auxiliary.ImageParse(BuyCurrent) + Auxiliary.ShrinkNumberStr(BuyAmt);
+            //ManaLan.Add(BuyBtnLab, new LanStr("UI", "P_BtnLab1"), Auxiliary.ImageParse(BuyCurrent), Auxiliary.ShrinkNumberStr(BuyAmt));
         }
 
         BuyBtn.onClick.AddListener
@@ -324,6 +326,10 @@ public class CloseUnit
         {
             return CloseType.Wing;
         }
+        else if (type == 6)
+        {
+            return CloseType.Shoe;
+        }
         else
         {
             throw new Exception();
@@ -553,7 +559,7 @@ public class Player : Regist , IPointerClickHandler
             {
                 if (!AnimLock1 && !AnimLock2)
                 {
-                    PlayAnim("newAnimation1");
+                    PlayAnim(JumpAnimationName);
                 }
 
                 AnimLock2 = true;
@@ -574,64 +580,9 @@ public class Player : Regist , IPointerClickHandler
         //}
     }
 
-    //public bool IsMoving = false;
-    //public float MoveSpeed = 1;
-    //public float Accuracy = 0.1f;
-    //public Vector3 Destination;
-    public void MoveThread()
-    {
-        //if (!IsMoving)
-        //    return;
-
-        //transform.position = Vector3.Lerp(transform.position, Destination, Time.deltaTime);
-
-        //if (Vector3.Magnitude(Destination - transform.position) < Accuracy)
-        //{
-        //    StopMove();
-        //}
-    }
-
-    public float Speed = 1;
-    public void MoveTo(Vector3 destination)
-    {
-        if (destination.Equal(transform.position))
-        {
-            return;
-        }
-
-        if (destination.x > transform.position.x)
-        {
-            Flip(PlayerDirection.Right);
-        }
-        else
-        {
-            Flip(PlayerDirection.Left);
-        }
-
-        float duration = Mathf.Clamp(Vector3.Magnitude(destination - transform.position)/1.5f, 0.25f, 10f)/Speed;
-
-        TweenRoot tweenRoot = transform.CreateTweenVec3D(destination, duration, false, true, true, Curve.EaseOutQuad);
-
-        tweenRoot.StartForward();
-        tweenRoot.AddEventOnetime(EventType.ForwardFinish, StopMove);
-
-        //IsMoving = true;
-        //Destination = destination;
-
-        PlayAnim("newAnimation2");
-    }
-
-    public void StopMove()
-    {
-        //IsMoving = false;
-
-        PlayAnim("newAnimation");
-    }
-
-
     public void OnStart(string str, EventObject eventObject)
     {
-        if (eventObject.animationState.name == "newAnimation1")
+        if (eventObject.animationState.name == JumpAnimationName)
         {
             ChildDic["Shadow"].StreamReForScale();
 
@@ -641,7 +592,7 @@ public class Player : Regist , IPointerClickHandler
 
             ChangeClose(BodyPart.Eye, "眼睛表情1");
         }
-        else if (eventObject.animationState.name == "newAnimation")
+        else if (eventObject.animationState.name == IdleAnimationName)
         {
             AnimLock1 = false;
 
@@ -661,15 +612,31 @@ public class Player : Regist , IPointerClickHandler
             return;
         }
 
+        if (UAC.anim.lastAnimationName == animName)
+        {
+            return;
+        }
+
         if (GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.InPlazaRoom)
         {
             AnimationDirty = true;
             CurrentAnimationName = animName;
         }
 
-        UAC.anim.Play(animName);
+        UAC.anim.FadeIn(animName, GetFadeInTime(UAC.anim.lastAnimationName, animName));
     }
 
+    public float GetFadeInTime(string lastAnimation, string targetAnimation)
+    {
+        if (lastAnimation == JumpAnimationName && targetAnimation == IdleAnimationName)
+            return -1f;
+        else
+            return 0.1f;
+
+        //throw new Exception();
+    }
+
+
     public void SetAllCollider(bool enable)
     {
         BoxCollider2D[] colliders = GetComponentsInChildren<BoxCollider2D>();
@@ -686,7 +653,7 @@ public class Player : Regist , IPointerClickHandler
 
         ManaNickName.ShowNickNameSettingPanel();
 
-        PlayAnim("newAnimation1");
+        PlayAnim(JumpAnimationName);
     }
 
 
@@ -698,10 +665,12 @@ public class Player : Regist , IPointerClickHandler
         if (direction == PlayerDirection.Left)
         {
             UAC.armature.flipX = false;
+            playerDirection = PlayerDirection.Left;
         }
         else
         {
             UAC.armature.flipX = true;
+            playerDirection = PlayerDirection.Right;
         }
     }
 
@@ -881,7 +850,7 @@ public class Player : Regist , IPointerClickHandler
 
                     JumpTimer = 0;
 
-                    PlayAnim("newAnimation");
+                    PlayAnim(IdleAnimationName);
 
                     ChildDic["Shadow"].GetStreamScale().Pause();
                     ChildDic["Shadow"].GetStreamScale().InOrigin = true;
@@ -996,7 +965,7 @@ public class Player : Regist , IPointerClickHandler
         UAC.transform.localScale = new Vector3(1, 1, 1);
         UAC.transform.localPosition = new Vector3();
 
-        UAC.anim.Play("newAnimation");
+        UAC.anim.Play(IdleAnimationName);
 
         UAC.AddEventListener(EventObject.START, OnStart);
 

Assets/Script/SFS/Manager/PlazaRoomManager.cs

@@ -9,12 +9,67 @@ using Sfs2X.Entities.Variables;
 
 public class PlazaRoomManager 
 {
+    public class PlazaRoomPlayer
+    {
+        public Player Player;
+        public List<TweenRoot> TweenRoots;
+
+        public PlazaRoomPlayer(Player player)
+        {
+            Player = player;
+            TweenRoots = new List<TweenRoot>();
+        }
+
+        public void Save()
+        {
+            foreach (var tweenRoot in TweenRoots)
+            {
+                tweenRoot.Pause();
+            }
+
+            ManaReso.Save(Player);
+        }
+
+        public float Speed = 1;
+        public void MoveTo(Vector3 destination)
+        {
+            if (destination.Equal(Player.transform.position))
+            {
+                return;
+            }
+
+            if (destination.x > Player.transform.position.x)
+            {
+                Player.Flip(PlayerDirection.Right);
+            }
+            else
+            {
+                Player.Flip(PlayerDirection.Left);
+            }
+
+            float duration = Mathf.Clamp(Vector3.Magnitude(destination - Player.transform.position) / 1.5f, 0.25f, 10f) / Speed;
+
+            TweenRoot tweenRoot = Player.transform.CreateTweenVec3D(destination, duration, false, true, true, Curve.EaseOutQuad);
+
+            tweenRoot.StartForward();
+            tweenRoot.AddEventOnetime(EventType.ForwardFinish, StopMove);
+            TweenRoots.Add(tweenRoot);
+
+            Player.PlayAnim(Player.WalkAnimationName);
+        }
+
+        public void StopMove()
+        {
+            Player.PlayAnim(Player.IdleAnimationName);
+        }
+    }
+
     #region Variable
 
     public GardenSmartFox GardenSmartFox;
 
     public User SelfUser;
-    public Player SelfInstance;
+    public PlazaRoomPlayer SelfInstance;
     public Room CurrentPlazaRoom;
 
     public bool InPlazaRoom
@@ -25,7 +80,7 @@ public class PlazaRoomManager
     public bool IsBlackMaskFinish;
     public RequestStatus JoinRoomStatus;
 
-    public Dictionary<User, Player> UserInstanceDictionary = new Dictionary<User, Player>();
+    public Dictionary<User, PlazaRoomPlayer> UserInstanceDictionary = new Dictionary<User, PlazaRoomPlayer>();
 
     #endregion
 
@@ -35,7 +90,7 @@ public class PlazaRoomManager
 
         ManaCenter.SceneSwitchLock = true;
 
-        TweenRoot tweenRoot = ManaReso.Get("U_BlackMask").TweenBacCG();
+        TweenRoot tweenRoot = ManaReso.Get("V_BlackMask").TweenBacCG();
 
         tweenRoot.AddEventOnetime(EventType.BackwardFinish,() =>{IsBlackMaskFinish = true;TryEnterPlazaRoom();});
 
@@ -78,7 +133,7 @@ public class PlazaRoomManager
 
         if (GardenSmartFox.PlazaRoomManager.JoinRoomStatus == RequestStatus.Failed)
         {
-            Bubble.Show(null, Language.GetStr("UI", "加入房间失败"), null, null, () => { ManaReso.Get("U_BlackMask").TweenForCG();},null,false);
+            Bubble.Show(null, Language.GetStr("UI", "加入房间失败"), null, null, () => { ManaReso.Get("V_BlackMask").TweenForCG();},null,false);
         }
         else if (GardenSmartFox.PlazaRoomManager.JoinRoomStatus == RequestStatus.Succeed)
         {
@@ -88,11 +143,12 @@ public class PlazaRoomManager
 
     public void EnterPlazaRoom()
     {
-        CameraOriginPosition = Camera.main.transform.position;
-        CameraLeftBorder = ManaReso.Get("PlazaRoomCameraLeftBorder").position.x;
-        CameraRightBorder = ManaReso.Get("PlazaRoomCameraRightBorder").position.x;
-
-        ManaReso.Get("U_BlackMask").TweenForCG();
+        GardenSmartFox.PlazaRoomManager.PlazaRoomCamera = ManaReso.Get<Camera>("MainCamera");
+        GardenSmartFox.PlazaRoomManager.CameraOriginPosition = PlazaRoomCamera.transform.position;
+        GardenSmartFox.PlazaRoomManager.CameraLeftBorder = ManaReso.Get("PlazaRoomCameraLeftBorder").position.x;
+        GardenSmartFox.PlazaRoomManager.CameraRightBorder = ManaReso.Get("PlazaRoomCameraRightBorder").position.x;
+        
+        ManaReso.Get("V_BlackMask").TweenForCG();
 
         ManaReso.SetActive("C_Main", false);
         ManaReso.SetActive("Garden", false);
@@ -103,26 +159,26 @@ public class PlazaRoomManager
     {
         ManaCenter.SceneSwitchLock = false;
 
-        TweenRoot tweenRoot = ManaReso.Get("U_BlackMask").TweenBacCG();
+        TweenRoot tweenRoot = ManaReso.Get("V_BlackMask").TweenBacCG();
 
         tweenRoot.AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
                 {
-                    Camera.main.transform.position = CameraOriginPosition;
+                    PlazaRoomCamera.transform.position = CameraOriginPosition;
 
                     ManaReso.SetActive("C_Main", true);
                     ManaReso.SetActive("Garden", true);
                     ManaReso.SetActive("PlazaRoom", false);
-                    ManaReso.Get("U_BlackMask").TweenForCG();
+                    ManaReso.Get("V_BlackMask").TweenForCG();
 
                     foreach (var kv in UserInstanceDictionary)
                     {
-                        ManaReso.Save(kv.Value);
+                        kv.Value.Save();
                     }
 
-                    UserInstanceDictionary = new Dictionary<User, Player>();
+                    UserInstanceDictionary = new Dictionary<User, PlazaRoomPlayer>();
                 }
             );
     }
@@ -146,16 +202,16 @@ public class PlazaRoomManager
         if (!InPlazaRoom)
             return;
 
-        if (SelfInstance.transform.hasChanged)
+        if (SelfInstance.Player.transform.hasChanged)
             SyncTransform();
 
         //if (CloseDirty)
         //    SyncClose();
 
-        if (SelfInstance.DirectionDirty)
+        if (SelfInstance.Player.DirectionDirty)
             SyncDirection();
 
-        if (SelfInstance.AnimationDirty)
+        if (SelfInstance.Player.AnimationDirty)
             SyncAnimation();
 
         KeepAliveThread();
@@ -165,23 +221,23 @@ public class PlazaRoomManager
     public void SyncDirection()
     {
         List<UserVariable> userVariables = new List<UserVariable>();
-        userVariables.Add(new SFSUserVariable("direction", $"{SelfInstance.PlayerDirection.ToString()}"));
+        userVariables.Add(new SFSUserVariable("direction", $"{SelfInstance.Player.PlayerDirection.ToString()}"));
         GardenSmartFox.SmartFox.Send(new SetUserVariablesRequest(userVariables));
-        SelfInstance.DirectionDirty = false;
+        SelfInstance.Player.DirectionDirty = false;
     }
     public void SyncTransform()
     {
         List<UserVariable> userVariables = new List<UserVariable>();
-        userVariables.Add(new SFSUserVariable("transform", $"{SelfInstance.transform.position.x} {SelfInstance.transform.position.y} {SelfInstance.transform.position.z} {SelfInstance.transform.eulerAngles.x} {SelfInstance.transform.eulerAngles.y} {SelfInstance.transform.eulerAngles.z}"));
+        userVariables.Add(new SFSUserVariable("transform", $"{SelfInstance.Player.transform.position.x} {SelfInstance.Player.transform.position.y} {SelfInstance.Player.transform.position.z} {SelfInstance.Player.transform.eulerAngles.x} {SelfInstance.Player.transform.eulerAngles.y} {SelfInstance.Player.transform.eulerAngles.z}"));
         GardenSmartFox.SmartFox.Send(new SetUserVariablesRequest(userVariables));
-        SelfInstance.transform.hasChanged = false;
+        SelfInstance.Player.transform.hasChanged = false;
     }
     public void SyncAnimation()
     {
         List<UserVariable> userVariables = new List<UserVariable>();
-        userVariables.Add(new SFSUserVariable("animation", $"{SelfInstance.CurrentAnimationName}"));
+        userVariables.Add(new SFSUserVariable("animation", $"{SelfInstance.Player.CurrentAnimationName}"));
         GardenSmartFox.SmartFox.Send(new SetUserVariablesRequest(userVariables));
-        SelfInstance.AnimationDirty = false;
+        SelfInstance.Player.AnimationDirty = false;
     }
 
     public bool CloseDirty;
@@ -227,35 +283,62 @@ public class PlazaRoomManager
     public float CameraLeftBorder;
     public float CameraRightBorder;
     public Vector3 CameraOriginPosition;
+    public Camera PlazaRoomCamera;
     public void CameraControllThread()
     {
-        if (SelfInstance.transform.position.x <= CameraLeftBorder || SelfInstance.transform.position.x >= CameraRightBorder)
+        if (PlazaRoomCamera == null)
         {
             return;
-        }    
+        }
+
+        float x;
+
+        if (SelfInstance.Player.transform.position.x <= CameraLeftBorder)
+        {
+            x = Mathf.Lerp(PlazaRoomCamera.transform.position.x, CameraLeftBorder, Time.deltaTime);
+        }
+        else if (SelfInstance.Player.transform.position.x >= CameraRightBorder)
+        {
+            x = Mathf.Lerp(PlazaRoomCamera.transform.position.x, CameraRightBorder, Time.deltaTime);
+        }
+        else
+        {
+            x = Mathf.Lerp(PlazaRoomCamera.transform.position.x, SelfInstance.Player.transform.position.x, Time.deltaTime);
+        }
 
-        Camera.main.transform.SetX(SelfInstance.transform.position.x);
+        PlazaRoomCamera.transform.SetX(x);
     }
 
     public void ChangeUserClose(User user, List<string> dressData)
     {
-        ManaPlayer.BuildPlayer(dressData, UserInstanceDictionary[user]);
+        ManaPlayer.BuildPlayer(dressData, UserInstanceDictionary[user].Player);
     }
 
     public void ChangeUserDirection(User user, PlayerDirection direction)
     {
-        UserInstanceDictionary[user].Flip(direction);
+        UserInstanceDictionary[user].Player.Flip(direction);
     }
 
     public void ChangeUserTransform(User user, Vector3 position, Vector3 eulerAngles)
     {
-        UserInstanceDictionary[user].transform.position = position;
-        UserInstanceDictionary[user].transform.eulerAngles = eulerAngles;
+        Player player = UserInstanceDictionary[user].Player;
+
+        TweenRoot tweenPosition = player.CreateTweenVec3D(position, 0.1f, false, true, true, Curve.Linear);
+        TweenRoot tweenEuler = player.CreateTweenEuler(eulerAngles, 0.1f, false, true, true, Curve.Linear);
+
+        tweenPosition.StartForward();
+        tweenEuler.StartForward();
+
+        UserInstanceDictionary[user].TweenRoots.Add(tweenPosition);
+        UserInstanceDictionary[user].TweenRoots.Add(tweenEuler);
+
+        //UserInstanceDictionary[user].transform.position = position;
+        //UserInstanceDictionary[user].transform.eulerAngles = eulerAngles;
     }
 
     public void ChangeUserAnimation(User user, string animationName)
     {
-        UserInstanceDictionary[user].PlayAnim(animationName);
+        UserInstanceDictionary[user].Player.PlayAnim(animationName);
     }
 
 
@@ -274,11 +357,11 @@ public class PlazaRoomManager
 
     public void OnJoinPlazaRoom(Room room)
     {
-        Debug.Log("succeed");
         CurrentPlazaRoom = room;
 
         SelfUser = GardenSmartFox.User;
-        SelfInstance = InstanciatePlayer(SelfUser);
+        Player selfPlayer = InstanciatePlayer(SelfUser);
+        SelfInstance = new PlazaRoomPlayer(selfPlayer);
 
         UserInstanceDictionary.Add(SelfUser, SelfInstance);
 
@@ -288,8 +371,8 @@ public class PlazaRoomManager
             {
                 continue;
             }
-
-            UserInstanceDictionary.Add(CurrentPlazaRoom.UserList[i], InstanciatePlayer(CurrentPlazaRoom.UserList[i]));
+            
+            UserInstanceDictionary.Add(CurrentPlazaRoom.UserList[i], new PlazaRoomPlayer(InstanciatePlayer(CurrentPlazaRoom.UserList[i])));
         }
 
         JoinRoomStatus = RequestStatus.Succeed;
@@ -298,14 +381,14 @@ public class PlazaRoomManager
 
     public void OnUserExitCurrentPlazaRoom(User user)
     {
-        ManaReso.Save(UserInstanceDictionary[user]);
+        UserInstanceDictionary[user].Save();
 
         UserInstanceDictionary.Remove(user);
     }
 
     public void OnUserEnterCurrentPlazaRoom(User user)
     {
-        UserInstanceDictionary.Add(user, InstanciatePlayer(user));
+        UserInstanceDictionary.Add(user, new PlazaRoomPlayer(InstanciatePlayer(user)));
     }
 
 

Assets/Script/Tool/Auxiliary.cs

@@ -158,7 +158,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            //ManaPlayer.Player.PlayAnim("newAnimation2");
+            //ManaPlayer.Player.PlayAnim("newAnimation");
 
             //StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
 
@@ -177,7 +177,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            //ManaPlayer.Player.PlayAnim("newAnimation3");
+            //ManaPlayer.Player.PlayAnim("newAnimation1");
 
             //ManaReso.Get("C_Notify").TweenForCG();
 
@@ -186,15 +186,10 @@ public class Auxiliary : Regist
             //ManaSign.SignTime = new DateTime(2007, 1, 1);
         }
 
-        //if (Input.GetKeyDown(KeyCode.M))
-        //{
-        //    ManaReso.Get("G_Flower").SetActive(false);
-
-        //    Debug.Log(ManaGarden.Slot);
-        //}
-
         if (Input.GetKeyDown(KeyCode.V))
         {
+            ManaPlayer.Player.PlayAnim("newAnimation2");
+
             //ManaPlayer.Player.Flip(PlayerDirection.Right);
 
             //ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
@@ -210,6 +205,8 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.B))
         {
+            //ManaPlayer.Player.PlayAnim("newAnimation3");
+
             //ManaPlayer.Player.Flip(PlayerDirection.Left);
 
             //foreach (var VARIABLE in ManaPlayer.CloseUnitDic)
@@ -218,6 +215,13 @@ public class Auxiliary : Regist
             //}
         }
 
+        //if (Input.GetKeyDown(KeyCode.M))
+        //{
+        //    ManaReso.Get("G_Flower").SetActive(false);
+
+        //    Debug.Log(ManaGarden.Slot);
+        //}
+
         //if (Input.GetKeyDown(KeyCode.N))
         //{
         //    ManaCenter.Coin = 0;

ToDoList.txt

@@ -1,26 +1,17 @@
-第二期合并到第三期的时候会出现遮罩Bug
-
-DataEye使用Trycatch
-
-换一个报错机制
-
-同步位置时要使用插值
-
-同步动画
-
-动画过渡
+SFS使用的随机用户名
 
+服务器新旧版存取档兼容
 
-开一次游戏音乐Bgm都会自动开起来
+访问点赞延迟的情况
 
+在别人花园点击访问时红色桃心马上被刷白了
 
-使用的随机用户名
 
-访问点赞延迟的情况
+有时拉取评论会报错?
 
-在别人花园点击访问时红色桃心马上被刷白了
+DressRoom被Destroy?
 
-服务器新旧版存取档兼容
+第二期合并到第三期的时候会出现遮罩Bug?
 
 
 关闭调试模式
@@ -31,11 +22,15 @@ DataEye使
 
 先开启Service再打包
 
+更新Bundle
+
 更新版本号
 
 IOS设置Team
 
 
-广场背景图片 宝箱 评论 点赞 公告 截图按钮需要打入图集
+广场背景图片 宝箱 评论 点赞 公告 截图按钮 上衣按钮需要打入图集
+
+Drawcall优化
 
-Drawcall优化
+图片尺寸优化(人物 广场背景 新Logo)