Browse Source

增加好友功能

LiuQilin 7 years ago
parent
commit
3cc472ddee

+ 9 - 0
Assets/Resource/Logo.unity

@@ -330,6 +330,15 @@ Prefab:
       propertyPath: m_Name
       value: Canvas (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 1132125090877062, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224600134575381614, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
   m_IsPrefabParent: 0

File diff suppressed because it is too large
+ 650 - 253
Assets/Resource/Prefab/PrefabUI/Canvas.prefab


+ 4 - 4
Assets/Resource/Prefab/PrefabUI/CommentItem.prefab

@@ -751,9 +751,9 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 332.5, y: -57.249}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 637.4, y: 71}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224043093304935004
@@ -919,6 +919,6 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 541.53, y: -9.019989}
+  m_AnchoredPosition: {x: 541.53, y: -0.000012398}
   m_SizeDelta: {x: 337.72, y: 162}
   m_Pivot: {x: 0.5, y: 0.5}

+ 924 - 0
Assets/Resource/Prefab/PrefabUI/PlazaroomMemberItem.prefab

@@ -0,0 +1,924 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1449331818472170}
+  m_IsPrefabParent: 1
+--- !u!1 &1008531439123092
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224681701184277414}
+  - component: {fileID: 222017485022575988}
+  - component: {fileID: 114023817866583676}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1032030457077272
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224743899786863664}
+  - component: {fileID: 222692436671914416}
+  - component: {fileID: 114839427664403158}
+  m_Layer: 0
+  m_Name: VisitImagePlus
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1203444090000072
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224640505710063096}
+  - component: {fileID: 222252923179524184}
+  - component: {fileID: 114536951835464724}
+  m_Layer: 5
+  m_Name: SendMessageText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1220924759068618
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224193584781236180}
+  - component: {fileID: 222717943091341428}
+  - component: {fileID: 114516121029771106}
+  m_Layer: 5
+  m_Name: VisitButtonTitle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1257794578926374
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224654600504632802}
+  - component: {fileID: 222473322701424668}
+  - component: {fileID: 114638652842943584}
+  m_Layer: 5
+  m_Name: Frame
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1289998545080408
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224537883502344212}
+  - component: {fileID: 222710165308960796}
+  - component: {fileID: 114813224810182174}
+  - component: {fileID: 114992262366024144}
+  m_Layer: 5
+  m_Name: SendMessageButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &1298586777520282
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224458066993200434}
+  - component: {fileID: 222094112129084742}
+  - component: {fileID: 114542266230607004}
+  - component: {fileID: 114464249880688604}
+  m_Layer: 5
+  m_Name: AddFriendButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1449331818472170
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224159096202925886}
+  - component: {fileID: 222244445906366688}
+  m_Layer: 5
+  m_Name: PlazaroomMemberItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1688619800339716
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224802869121780594}
+  - component: {fileID: 222739037506586614}
+  - component: {fileID: 114697597317392062}
+  m_Layer: 5
+  m_Name: Nickname
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1727722946672148
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224238184119217564}
+  - component: {fileID: 222521508563218352}
+  - component: {fileID: 114367503561566060}
+  m_Layer: 5
+  m_Name: AddFriendTitle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1839085535896460
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224370432452511542}
+  - component: {fileID: 222372942313123236}
+  - component: {fileID: 114539644985101854}
+  - component: {fileID: 114579595188340034}
+  m_Layer: 5
+  m_Name: VisitButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114023817866583676
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1008531439123092}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ebaa46003e10d4c459afb999db97c153, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD8\u8981\u52A0\u6CB9\u54DF~!"
+  VerticalMinSize: 1
+  VerticalMaxSize: 20
+--- !u!114 &114367503561566060
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1727722946672148}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.45098042, g: 0.70980394, b: 0.29803923, 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: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u52A0\u4E3A\u597D\u53CB"
+--- !u!114 &114464249880688604
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1298586777520282}
+  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: 114542266230607004}
+  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 &114516121029771106
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1220924759068618}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.8627451}
+  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: 17
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "<(\u91D1\u5E01)>22"
+  Draw: 0
+  SetY: 0
+  Y: 0
+  LineHeight: 16.718914
+  MaxLineHeight: Infinity
+  RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
+  ImageIndex: 00000000
+  RemoveIndex: 0100000002000000030000000400000005000000
+  NewTextIndex: 0600000007000000
+  NewTextPos:
+  - {x: -1.5768986, y: 6.6875653, z: 0}
+  - {x: 9.290394, y: 6.6875653, z: 0}
+  - {x: 9.290394, y: -7.523511, z: 0}
+  - {x: 9.290394, y: -7.523511, z: 0}
+  - {x: -1.5768986, y: -7.523511, z: 0}
+  - {x: -1.5768986, y: 6.6875653, z: 0}
+  - {x: 7.6185036, y: 6.6875653, z: 0}
+  - {x: 18.485798, y: 6.6875653, z: 0}
+  - {x: 18.485798, y: -7.523511, z: 0}
+  - {x: 18.485798, y: -7.523511, z: 0}
+  - {x: 7.6185036, y: -7.523511, z: 0}
+  - {x: 7.6185036, y: 6.6875653, z: 0}
+--- !u!114 &114536951835464724
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1203444090000072}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 80
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u79C1\u4FE1"
+--- !u!114 &114539644985101854
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1839085535896460}
+  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: e5dfd70a17554584ea2919cf341ad979, 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 &114542266230607004
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1298586777520282}
+  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: 3bb1c24c193126c479901843899b8ba3, 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 &114579595188340034
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1839085535896460}
+  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: 114539644985101854}
+  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 &114638652842943584
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1257794578926374}
+  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: 0.9607844, g: 0.9607844, b: 0.9607844, 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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114697597317392062
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688619800339716}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 25
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 123uyl
+--- !u!114 &114813224810182174
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1289998545080408}
+  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: 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_Sprite: {fileID: 21300000, guid: 9bb7920cf00be4a41a9c6ce43b1b258f, 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 &114839427664403158
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1032030457077272}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f7e6e302f395b744be6ac65d53a2240, 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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  Draw: 1
+--- !u!114 &114992262366024144
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1289998545080408}
+  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: 114813224810182174}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!222 &222017485022575988
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1008531439123092}
+--- !u!222 &222094112129084742
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1298586777520282}
+--- !u!222 &222244445906366688
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1449331818472170}
+--- !u!222 &222252923179524184
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1203444090000072}
+--- !u!222 &222372942313123236
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1839085535896460}
+--- !u!222 &222473322701424668
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1257794578926374}
+--- !u!222 &222521508563218352
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1727722946672148}
+--- !u!222 &222692436671914416
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1032030457077272}
+--- !u!222 &222710165308960796
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1289998545080408}
+--- !u!222 &222717943091341428
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1220924759068618}
+--- !u!222 &222739037506586614
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688619800339716}
+--- !u!224 &224159096202925886
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1449331818472170}
+  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: 224802869121780594}
+  - {fileID: 224681701184277414}
+  - {fileID: 224654600504632802}
+  - {fileID: 224370432452511542}
+  - {fileID: 224458066993200434}
+  - {fileID: 224537883502344212}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 637.4, y: 71}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224193584781236180
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1220924759068618}
+  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: 224743899786863664}
+  m_Father: {fileID: 224370432452511542}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0.0029926, y: 10.54}
+  m_SizeDelta: {x: 47.194, y: 17.7}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224238184119217564
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1727722946672148}
+  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: 224458066993200434}
+  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.00008392334, y: 30.14995}
+  m_SizeDelta: {x: 44.605, y: 19.4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224370432452511542
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1839085535896460}
+  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: 224193584781236180}
+  m_Father: {fileID: 224159096202925886}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -43.80008, y: -9.020401}
+  m_SizeDelta: {x: 47.2, y: 40.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224458066993200434
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1298586777520282}
+  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: 224238184119217564}
+  m_Father: {fileID: 224159096202925886}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -92.89003, y: -9.0504}
+  m_SizeDelta: {x: 44.6, y: 40.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224537883502344212
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1289998545080408}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.15000002, y: 0.15000002, z: 1}
+  m_Children:
+  - {fileID: 224640505710063096}
+  m_Father: {fileID: 224159096202925886}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 541.53, y: -0.000012398}
+  m_SizeDelta: {x: 337.72, y: 162}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224640505710063096
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1203444090000072}
+  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: 224537883502344212}
+  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: 0.0000038146973}
+  m_SizeDelta: {x: 220, y: 162}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224654600504632802
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1257794578926374}
+  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: 224159096202925886}
+  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: -1.9029617, y: -34.000397}
+  m_SizeDelta: {x: 633.6, y: 3}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224681701184277414
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1008531439123092}
+  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: 224159096202925886}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 317.40005, y: 2.999588}
+  m_SizeDelta: {x: 397.6, y: 65}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224743899786863664
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1032030457077272}
+  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: 0.82901555}
+  m_Children: []
+  m_Father: {fileID: 224193584781236180}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224802869121780594
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688619800339716}
+  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: 224159096202925886}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 59.286983, y: 2.999588}
+  m_SizeDelta: {x: 118.58, y: 65}
+  m_Pivot: {x: 0.5, y: 0.5}

+ 8 - 0
Assets/Resource/Prefab/PrefabUI/PlazaroomMemberItem.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d30fd90e19065bd4c93efcb54dc8261d
+timeCreated: 1511150614
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="12" />
+  <Version value="13" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />
@@ -22,6 +22,7 @@
   <QuitTime value="4/23/2017 09:30:00 AM" />
   <SignTime value="4/23/2017 09:30:00 AM" />
   <Language value="Default" />
+  <CurrentMinigameType value="0" />
   
   <Coin value="0" />
   <ExtraSlot value="0" />

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

@@ -205,6 +205,9 @@
     <Unnamed desc=""><![CDATA[未命名]]></Unnamed>
     <DontSendAgain desc=""><![CDATA[请勿重复发送]]></DontSendAgain>
     <GetThanksGiftInfoFailed desc=""><![CDATA[获取充值返礼信息失败]]></GetThanksGiftInfoFailed>
+    <AC_Title desc=""><![CDATA[本次小游戏]]></AC_Title>
+    <AC_ChangeButtonTitle desc=""><![CDATA[换一个]]></AC_ChangeButtonTitle>
+    <AC_ConfirmButtonTitle desc=""><![CDATA[立即开始]]></AC_ConfirmButtonTitle>
     <AD_Title desc=""><![CDATA[要减少等待时间吗?]]></AD_Title>
     <AD_CoinCDDescription desc=""><![CDATA[减少[&value&]秒]]></AD_CoinCDDescription>
     <AD_DiamondCDDescription desc=""><![CDATA[减少全部]]></AD_DiamondCDDescription>

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

@@ -205,6 +205,9 @@
     <Unnamed desc=""><![CDATA[未命名]]></Unnamed>
     <DontSendAgain desc=""><![CDATA[請勿重複發送]]></DontSendAgain>
     <GetThanksGiftInfoFailed desc=""><![CDATA[]]></GetThanksGiftInfoFailed>
+    <AC_Title desc=""><![CDATA[]]></AC_Title>
+    <AC_ChangeButtonTitle desc=""><![CDATA[]]></AC_ChangeButtonTitle>
+    <AC_ConfirmButtonTitle desc=""><![CDATA[]]></AC_ConfirmButtonTitle>
     <AD_Title desc=""><![CDATA[]]></AD_Title>
     <AD_CoinCDDescription desc=""><![CDATA[]]></AD_CoinCDDescription>
     <AD_DiamondCDDescription desc=""><![CDATA[]]></AD_DiamondCDDescription>

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

@@ -205,6 +205,9 @@ Program 水怪
     <Unnamed desc=""><![CDATA[Unnamed]]></Unnamed>
     <DontSendAgain desc=""><![CDATA[Do not send again]]></DontSendAgain>
     <GetThanksGiftInfoFailed desc=""><![CDATA[]]></GetThanksGiftInfoFailed>
+    <AC_Title desc=""><![CDATA[]]></AC_Title>
+    <AC_ChangeButtonTitle desc=""><![CDATA[]]></AC_ChangeButtonTitle>
+    <AC_ConfirmButtonTitle desc=""><![CDATA[]]></AC_ConfirmButtonTitle>
     <AD_Title desc=""><![CDATA[]]></AD_Title>
     <AD_CoinCDDescription desc=""><![CDATA[]]></AD_CoinCDDescription>
     <AD_DiamondCDDescription desc=""><![CDATA[]]></AD_DiamondCDDescription>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 3 - 0
Assets/Script/Label/LanguageLabel.cs

@@ -203,6 +203,9 @@ public class LanguageLabel
 	public static string UI__Unnamed = "UI__Unnamed";
 	public static string UI__DontSendAgain = "UI__DontSendAgain";
 	public static string UI__GetThanksGiftInfoFailed = "UI__GetThanksGiftInfoFailed";
+	public static string UI__AC_Title = "UI__AC_Title";
+	public static string UI__AC_ChangeButtonTitle = "UI__AC_ChangeButtonTitle";
+	public static string UI__AC_ConfirmButtonTitle = "UI__AC_ConfirmButtonTitle";
 	public static string UI__AD_Title = "UI__AD_Title";
 	public static string UI__AD_CoinCDDescription = "UI__AD_CoinCDDescription";
 	public static string UI__AD_DiamondCDDescription = "UI__AD_DiamondCDDescription";

+ 6 - 0
Assets/Script/Label/ObjectLabel.cs

@@ -659,6 +659,12 @@ public class ObjectLabel
 	public static string AC_ChangeButtonTitle = "AC_ChangeButtonTitle";
 	public static string AC_CostText = "AC_CostText";
 	public static string AC_CostTextImagePlus = "AC_CostTextImagePlus";
+	public static string AC_Mask = "AC_Mask";
+	public static string AC_ScrollPos0 = "AC_ScrollPos0";
+	public static string AC_ScrollPos1 = "AC_ScrollPos1";
+	public static string AC_ScrollPos2 = "AC_ScrollPos2";
+	public static string AC_GamaTypeText0 = "AC_GamaTypeText0";
+	public static string AC_GamaTypeText1 = "AC_GamaTypeText1";
 	public static string AD_CDMinigameMask = "AD_CDMinigameMask";
 	public static string AD_CDMinigamePanel = "AD_CDMinigamePanel";
 	public static string AD_Title = "AD_Title";

+ 1 - 0
Assets/Script/Label/PlayerConfigLabel.cs

@@ -8,6 +8,7 @@ public class PlayerConfigLabel
     public static string DefaultID = "Default";
     public static string DefaultSerialNumber = "Default";
     
+    public static string CurrentMinigameType = "CurrentMinigameType";
     public static string OneTimeReward = "OneTimeReward";
     public static string PackLock = "PackLock";
     public static string RefundNode = "Refund";

+ 17 - 0
Assets/Script/Manage/ConfigManager.cs

@@ -1287,6 +1287,13 @@ public class ConfigManager : Regist
             ToVersion12(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 13)
+        {
+            Debug.LogWarning("UpdateArchive to 13");
+
+            ToVersion13(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1523,4 +1530,14 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion13(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 13.ToString();
+        XmlNode xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.CurrentMinigameType);
+
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
+
+        return nativeDoc;
+    }
 }

+ 180 - 13
Assets/Script/Manage/EnterMinigamePanelManager.cs

@@ -1,6 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
-
+using System.Xml;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -12,57 +12,224 @@ public class EnterMinigamePanelManager : Regist
     private static Text CostText;
     private static Text ChangeButtonTitle;
     private static Text ConfirmButtonTitle;
+    private static Text MinigameTypeText0;
+    private static Text MinigameTypeText1;
     private static Button ChangeButton;
     private static Button CloseButton;
-    private static Transform Mask;
+    private static Button ConfirmButton;
+    private static Transform PanelMask;
+    private static Transform ScrollPos0;
+    private static Transform ScrollPos1;
+    private static Transform ScrollPos2;
+
+    private static string ChangeGameTypeCostFormula;
+    private static double ChangeGameTypeCost;
+
+    private static bool IsChangingGameType;
+    private static float ScrollTime = 3f;
+    private static float ScrollTimer;
+    private static float CurrentScrollDuration;
+    private static float MaxScrollDecreaseRatio = 0.05f;
+    private static float CurrentScrollDecreaseRatio;
+    private static TweenVec MinigameTypeTextTween0;
+    private static TweenVec MinigameTypeTextTween1;
+    private static MiniGameType ScrollMiniGameType;
+    private static List<MiniGameType> AvailableGameTypes = new List<MiniGameType>();
+
+    public static MiniGameType CurrentMiniGameType;
 
     #endregion
 
+    private void Init()
+    {
+        XmlDocument document = ConfigManager.GetXmlDocument(ResourceLabel.MinigameConfig);
+        ChangeGameTypeCostFormula = document.SelectSingleNode(ConfigLabel.RootNode).SelectSingleNode(ConfigLabel.ChildNode).Attributes[1].Value;
+    }
+
     public override void RegistReference()
     {
         Title = ResourceManager.Get<Text>(ObjectLabel.AC_Title);
         CostText = ResourceManager.Get<Text>(ObjectLabel.AC_CostText);
         ChangeButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AC_ChangeButtonTitle);
         ConfirmButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AC_ConfirmButtonTitle);
+        MinigameTypeText0 = ResourceManager.Get<Text>(ObjectLabel.AC_GamaTypeText0);
+        MinigameTypeText1 = ResourceManager.Get<Text>(ObjectLabel.AC_GamaTypeText1);
         ChangeButton = ResourceManager.Get<Button>(ObjectLabel.AC_ChangeButton);
         CloseButton = ResourceManager.Get<Button>(ObjectLabel.AC_CloseButton);
-        Mask = ResourceManager.Get(ObjectLabel.AC_EnterMinigamePanelMask);
+        ConfirmButton = ResourceManager.Get<Button>(ObjectLabel.AC_ConfirmButton);
+        PanelMask = ResourceManager.Get(ObjectLabel.AC_EnterMinigamePanelMask);
+        ScrollPos0 = ResourceManager.Get(ObjectLabel.AC_ScrollPos0);
+        ScrollPos1 = ResourceManager.Get(ObjectLabel.AC_ScrollPos1);
+        ScrollPos2 = ResourceManager.Get(ObjectLabel.AC_ScrollPos2);
+
+        LanguageManager.Add(Title, new MulLanStr(LanguageLabel.UI__AC_Title));
+        LanguageManager.Add(ChangeButtonTitle, new MulLanStr(LanguageLabel.UI__AC_ChangeButtonTitle));
+        LanguageManager.Add(ConfirmButtonTitle, new MulLanStr(LanguageLabel.UI__AC_ConfirmButtonTitle));
+
+        PanelMask.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        CloseButton.onClick.AddListener(ClosePanel);
+        ChangeButton.onClick.AddListener(() => Manager.Pay("", ChangeGameTypeCost, Current.Coin, ChangeGameType, StaticsManager.ItemID.更换小游戏类型, StaticsManager.ConsumeModule.Charge, false));
+        ConfirmButton.onClick.AddListener(EnterGame);
+
+        Init();
+    }
+
+
+    private void Update()
+    {
+        if (!IsChangingGameType)
+        {
+            return;
+        }
+
+        ScrollTimer += Time.deltaTime;
+        CurrentScrollDecreaseRatio = Mathf.Lerp(CurrentScrollDecreaseRatio, MaxScrollDecreaseRatio, Time.deltaTime*3.5f);
+        CurrentScrollDuration += Time.deltaTime * CurrentScrollDecreaseRatio;
+        MinigameTypeTextTween0.Duration = CurrentScrollDuration;
+        MinigameTypeTextTween1.Duration = CurrentScrollDuration;
     }
 
 
     public static void TryOpenPanel()
     {
-        MiniGameType miniGameType;
         if (TutorialManager.NewplayerTutorial)
         {
             MinigameAward.UnlockFlowerID = 1;
             MinigameAward.HaveNewFlowerFlag = true;
-            miniGameType = MiniGameType.Punch;
-            MiniGameManager.GameEnter(miniGameType);
+            CurrentMiniGameType = MiniGameType.Punch;
+            MiniGameManager.GameEnter(CurrentMiniGameType);
         }
         else if (TutorialManager.MemoryMinigameTutorial)
         {
-            miniGameType = MiniGameType.Memory;
-            MiniGameManager.GameEnter(miniGameType);
+            CurrentMiniGameType = MiniGameType.Memory;
+            MiniGameManager.GameEnter(CurrentMiniGameType);
         }
         else if (TutorialManager.FindMinigameTutorial)
         {
-            miniGameType = MiniGameType.Find;
-            MiniGameManager.GameEnter(miniGameType);
+            CurrentMiniGameType = MiniGameType.Find;
+            MiniGameManager.GameEnter(CurrentMiniGameType);
         }
         else
         {
-            miniGameType = MiniGameManager.SelectMinigameType();
+            AvailableGameTypes = new List<MiniGameType>();
+            CurrentMiniGameType = (MiniGameType) ConfigManager.GetIntFormConfig(PlayerConfigLabel.CurrentMinigameType);
+            if (CurrentMiniGameType == MiniGameType.None)
+            {
+                CurrentMiniGameType = MiniGameManager.SelectMinigameType(AvailableGameTypes);
+                ConfigManager.SaveIntToConfig(PlayerConfigLabel.CurrentMinigameType, CurrentMiniGameType.GetHashCode());
+            }
+            else
+            {
+                MiniGameManager.SelectMinigameType(AvailableGameTypes);
+            }
+            if (AvailableGameTypes.Count == 1)
+            {
+                MiniGameManager.GameEnter(CurrentMiniGameType);
+            }
+            else
+            {
+                OpenPanel();
+            }
         }
     }
 
     public static void OpenPanel()
     {
-        Mask.TweenForCG();
+        string languageLabel = LabelUtility.CombineLanguageLabel(LanguageLabel.MinigameName, CurrentMiniGameType.ToString());
+        MinigameTypeText0.text = Language.GetStr(languageLabel);
+        MinigameTypeText1.text = Language.GetStr(languageLabel);
+        ChangeGameTypeCost = Auxiliary.FmlParse(ChangeGameTypeCostFormula, "i", Manager.CircleIncome.ToString());
+        CostText.text = $"{TransferLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(ChangeGameTypeCost)}";
+        PanelMask.TweenForCG();
     }
 
     public static void ClosePanel()
     {
-        Mask.TweenBacCG();
+        AudioManager.PlayClip(ResourceLabel.CloseClip);
+        PanelMask.TweenBacCG();
+    }
+
+    public static void ChangeGameType()
+    {
+        AudioManager.PlayClip(ResourceLabel.BtnClip);
+
+        ResetScrollStatus();
+
+        if (MinigameTypeTextTween0 == null || MinigameTypeTextTween1 == null)
+        {
+            MinigameTypeText0.transform.position = ScrollPos0.position;
+            MinigameTypeTextTween0 = MinigameTypeText0.CreateTweenVec2D(ScrollPos1.position, CurrentScrollDuration, false, true, true, Curve.Linear);
+            MinigameTypeTextTween0.AddEventOnetime(EventType.ForwardFinish, () => OnArriveScrollPos1(MinigameTypeTextTween0));
+
+            MinigameTypeText1.transform.position = ScrollPos1.position;
+            MinigameTypeTextTween1 = MinigameTypeText1.CreateTweenVec2D(ScrollPos2.position, CurrentScrollDuration, false, true, true, Curve.Linear);
+            MinigameTypeTextTween1.AddEventOnetime(EventType.ForwardFinish, () => OnArriveScrollPos2(MinigameTypeTextTween1));
+        }
+
+        MinigameTypeTextTween0.StartForward();
+        MinigameTypeTextTween1.StartForward();
+    }
+
+    private static void ResetScrollStatus()
+    {
+        ScrollTimer = 0;
+        CurrentScrollDuration = 0.1f;
+        CurrentScrollDecreaseRatio = 0;
+        ChangeButton.interactable = false;
+        ConfirmButton.interactable = false;
+        IsChangingGameType = true;
+    }
+
+    private static void OnArriveScrollPos1(TweenVec tween)
+    {
+        tween.Origin = ScrollPos1.position;
+        tween.Destination = ScrollPos2.position;
+        tween.InOrigin = true;
+        tween.AddEventOnetime(EventType.ForwardFinish, () => OnArriveScrollPos2(tween));
+
+        if (ScrollTimer + CurrentScrollDuration >= ScrollTime)
+        {
+            return;
+        }
+        else
+        {
+            tween.StartForward();
+        }
+    }
+
+    private static void OnArriveScrollPos2(TweenVec tween)
+    {
+        tween.Origin = ScrollPos0.position;
+        tween.Destination = ScrollPos1.position;
+        tween.InOrigin = true;
+        tween.AddEventOnetime(EventType.ForwardFinish, () => OnArriveScrollPos1(tween));
+
+        ScrollMiniGameType = AvailableGameTypes.Random()[0];
+        string languageLabel = LabelUtility.CombineLanguageLabel(LanguageLabel.MinigameName, ScrollMiniGameType.ToString());
+        tween.Target.GetComponent<Text>().text = Language.GetStr(languageLabel);
+
+        if (ScrollTimer + CurrentScrollDuration >= ScrollTime)
+        {
+            FinishScroll();
+        }
+        else
+        {
+            tween.StartForward();
+        }
+    }
+
+    private static void FinishScroll()
+    {
+        ChangeButton.interactable = true;
+        ConfirmButton.interactable = true;
+        IsChangingGameType = false;
+        CurrentMiniGameType = ScrollMiniGameType;
+        ConfigManager.SaveIntToConfig(PlayerConfigLabel.CurrentMinigameType, ScrollMiniGameType.GetHashCode());
+    }
+
+    public static void EnterGame()
+    {
+        ClosePanel();
+        MiniGameManager.GameEnter(CurrentMiniGameType);
     }
 }

+ 17 - 6
Assets/Script/Manage/MiniGameManager.cs

@@ -599,6 +599,7 @@ public class MinigameAward
 
 public enum MiniGameType
 {
+    None, //需要重置
     Punch, //打地鼠
     Memory, //记住花的消失顺序
     Find, //找落单的花
@@ -785,7 +786,6 @@ public class MiniGameManager : Regist
 
     public static MiniGameType miniGameType;
 
-
     public static List<Transform> D_MemoryGameBtns = new List<Transform>();
     public static List<Transform> D_MemoryGameIcons = new List<Transform>();
     public static List<Transform> D_MemoryGameTicks = new List<Transform>();
@@ -1082,7 +1082,7 @@ public class MiniGameManager : Regist
         }
     }
 
-    public static MiniGameType SelectMinigameType()
+    public static MiniGameType SelectMinigameType(List<MiniGameType> availableGameTypes)
     {
         PunchGameOperateParent.SetActive(false);
         MemoryGameOperateParent.SetActive(false);
@@ -1090,6 +1090,16 @@ public class MiniGameManager : Regist
 
         bool memoryGameAvailable = Manager.GardenLevel >= TutorialManager.MemoryMinigameTutorialLevel;
         bool findGameAvailable = GardenManager.TotalUnlockFlower >= TutorialManager.MinFlowerForFindGame && Manager.GardenLevel >= TutorialManager.FindMinigameTutorialLevel;
+        availableGameTypes.Add(MiniGameType.Punch);
+        if (memoryGameAvailable)
+        {
+            availableGameTypes.Add(MiniGameType.Memory);
+        }
+        if (findGameAvailable)
+        {
+            availableGameTypes.Add(MiniGameType.Find);
+        }
+
 
         float punchGameThreshold;
         float memoryGameThreshold;
@@ -1276,15 +1286,14 @@ public class MiniGameManager : Regist
     {
         PrepareText.GetStreamScale().InOrigin = true;
 
-        if (Game)
-        {
+        //if (Game)
+        //{
             Manager.MinigameFlag = false;
 
             Manager.MinigameCDTimer = Mathf.Lerp(MinMinigameCD, MaxMinigameCD, Random.Range(0, 1f));
 
             ResetNewFlowerFlag();
-        }
-
+        //}
 
         ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForCG();
 
@@ -1327,6 +1336,8 @@ public class MiniGameManager : Regist
 
         Manager.PlayMinigameAmt++;
 
+        ConfigManager.SaveIntToConfig(PlayerConfigLabel.CurrentMinigameType, MiniGameType.None.GetHashCode());
+
         GameEnd();
     }
 

+ 9 - 0
Assets/Script/Object/PlazaroomMemberPanel.cs

@@ -0,0 +1,9 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class PlazaroomMemberPanel : Regist
+{
+    //Mark
+}

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

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

+ 2 - 1
Assets/Script/ThirdParty/DataEyeStatics/StaticsManager.cs

@@ -239,7 +239,8 @@ public class StaticsManager
         获得小游戏,
         创建派对,
         创建宝箱,
-        冷却小游戏
+        冷却小游戏,
+        更换小游戏类型,
     }
 
     public enum ItemType

+ 1 - 1
Assets/Script/Tool/LabelUtility/SerializeObject.prefab

@@ -51,7 +51,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e4a9dafa00b004e4e94c57cd88b01101, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Script: {fileID: 11500000, guid: 1615e3353e063d443bf237fb8aade024, type: 3}
+  Script: {fileID: 11500000, guid: 3420c8d0e7f483a46942a0adcfbee477, type: 3}
   Languages:
   - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
   Prefabs:

Some files were not shown because too many files changed in this diff