Browse Source

修改若干细节

liuqilin 7 years ago
parent
commit
f1d51617dc

+ 22 - 0
Assets/Resource/Audio/PartyTheme.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 9d09d7a0612492b4db1eb1c41ebebc72
+timeCreated: 1508816281
+licenseType: Pro
+AudioImporter:
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 65
Assets/Resource/Logo.unity

@@ -155,70 +155,6 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
---- !u!1 &633984190
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 633984192}
-  - component: {fileID: 633984191}
-  m_Layer: 0
-  m_Name: "\u5B9D\u7BB1"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!212 &633984191
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 633984190}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_Materials:
-  - {fileID: 2100000, guid: dc722f3566cbcf440a23d8fe69deef8e, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 1cba5b42a3050e444b67311e94e9d633, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
---- !u!4 &633984192
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 633984190}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -509,7 +445,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
+  DebugMode: 1
   CatchException: 0
   DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
     type: 2}

+ 65 - 0
Assets/Resource/Prefab/Object/ADChest.prefab

@@ -11,6 +11,22 @@ Prefab:
   m_ParentPrefab: {fileID: 0}
   m_RootGameObject: {fileID: 1658220073256390}
   m_IsPrefabParent: 1
+--- !u!1 &1093005704050964
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4142781332173012}
+  - component: {fileID: 212838824554535478}
+  m_Layer: 0
+  m_Name: ChestShadow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1358063845640910
 GameObject:
   m_ObjectHideFlags: 0
@@ -56,9 +72,23 @@ Transform:
   m_LocalScale: {x: 0.6, y: 0.6, z: 1}
   m_Children:
   - {fileID: 4645995457566464}
+  - {fileID: 4142781332173012}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4142781332173012
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1093005704050964}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.09, y: -0.76, z: 0.008249998}
+  m_LocalScale: {x: 1.6666664, y: 1.6666664, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4117775634847816}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4645995457566464
 Transform:
   m_ObjectHideFlags: 1
@@ -158,3 +188,38 @@ SpriteRenderer:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!212 &212838824554535478
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1093005704050964}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: f6baf652ebcd8ed4093bcf36bbc8a007, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0

+ 81 - 0
Assets/Resource/Prefab/Object/Music.prefab

@@ -22,6 +22,7 @@ GameObject:
   - component: {fileID: 82416427389189504}
   - component: {fileID: 82461814161301328}
   - component: {fileID: 82945246320833648}
+  - component: {fileID: 82646044583706182}
   m_Layer: 0
   m_Name: Music
   m_TagString: Untagged
@@ -202,6 +203,86 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 0
+--- !u!82 &82646044583706182
+AudioSource:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1668329280249666}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 9d09d7a0612492b4db1eb1c41ebebc72, type: 3}
+  m_PlayOnAwake: 0
+  m_Volume: 0
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    - serializedVersion: 2
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
 --- !u!82 &82945246320833648
 AudioSource:
   m_ObjectHideFlags: 1

+ 5 - 5
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -9201,7 +9201,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 190, y: -23.000046}
+  m_AnchoredPosition: {x: 185, y: -23.000046}
   m_SizeDelta: {x: 59.3, y: 46.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224166385692002180
@@ -9484,9 +9484,9 @@ RectTransform:
   m_Father: {fileID: 224387604085137002}
   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: 285, y: -36.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 84, y: 72.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224249425076514156
@@ -10414,7 +10414,7 @@ RectTransform:
   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: 200.6, y: -0.050089}
+  m_AnchoredPosition: {x: 185.6, y: -0.050089}
   m_SizeDelta: {x: 112, y: 31.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224519958922616262

+ 8 - 8
Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -3527,10 +3527,10 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 14
+    m_FontSize: 23
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 3
     m_AlignByGeometry: 0
@@ -5152,7 +5152,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 15
+    m_Left: 20
     m_Right: 0
     m_Top: 15
     m_Bottom: 0
@@ -9420,11 +9420,11 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 50
+    m_FontSize: 70
     m_FontStyle: 0
     m_BestFit: 1
-    m_MinSize: 30
-    m_MaxSize: 50
+    m_MinSize: 7
+    m_MaxSize: 70
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -12887,8 +12887,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 411.64996, y: -51}
-  m_SizeDelta: {x: 813.3, y: 51}
+  m_AnchoredPosition: {x: 431, y: -51}
+  m_SizeDelta: {x: 775, y: 82}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224645346995192410
 RectTransform:

+ 91 - 16
Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -452,7 +452,7 @@ GameObject:
   - component: {fileID: 222955361620142790}
   - component: {fileID: 114555098223141448}
   m_Layer: 5
-  m_Name: S_Tit
+  m_Name: Q_Tit
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -992,6 +992,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1417066574456712
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224061458002519324}
+  - component: {fileID: 222820035957585756}
+  - component: {fileID: 114636337561177954}
+  m_Layer: 5
+  m_Name: S_Tit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1425251069232302
 GameObject:
   m_ObjectHideFlags: 1
@@ -5308,7 +5325,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u70B9\u8D5E\u699C"
+  m_Text: "\u7559\u8A00\u677F"
 --- !u!114 &114562620415954596
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5726,6 +5743,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114636337561177954
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1417066574456712}
+  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: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u70B9\u8D5E\u699C"
 --- !u!114 &114641851778971448
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8381,6 +8431,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1821312681770050}
+--- !u!222 &222820035957585756
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1417066574456712}
 --- !u!222 &222828979345550214
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8620,6 +8676,24 @@ RectTransform:
   m_AnchoredPosition: {x: 593.3334, y: -30}
   m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224061458002519324
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1417066574456712}
+  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: 224443708564745286}
+  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: 0.92501, y: 160.6}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224070434139863122
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8789,7 +8863,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0.000013761353, y: 160.43452}
-  m_SizeDelta: {x: 665, y: 105}
+  m_SizeDelta: {x: 665, y: 5}
   m_Pivot: {x: 0.5, y: 0.9999999}
 --- !u!224 &224123173145718798
 RectTransform:
@@ -8915,8 +8989,8 @@ RectTransform:
   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.49997613, y: 136.49998}
-  m_SizeDelta: {x: 633.6, y: 5}
+  m_AnchoredPosition: {x: 0.49997613, y: 134.50002}
+  m_SizeDelta: {x: 633.6, y: 3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224165838830111156
 RectTransform:
@@ -9387,7 +9461,7 @@ RectTransform:
   - {fileID: 224590025111341236}
   - {fileID: 224525130383599340}
   m_Father: {fileID: 224685061251222592}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9411,8 +9485,8 @@ RectTransform:
   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.000020503998, y: -41.999985}
-  m_SizeDelta: {x: 665, y: 268}
+  m_AnchoredPosition: {x: -0.000020503998, y: -40}
+  m_SizeDelta: {x: 665, y: 272}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224313009123998396
 RectTransform:
@@ -9882,7 +9956,7 @@ RectTransform:
   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.000013761353, y: 160.43452}
+  m_AnchoredPosition: {x: 0.000013761353, y: 450.39682}
   m_SizeDelta: {x: 665, y: 5}
   m_Pivot: {x: 0.5, y: 0.9999999}
 --- !u!224 &224438541390721236
@@ -9933,7 +10007,7 @@ RectTransform:
   m_Children:
   - {fileID: 224077811564540468}
   - {fileID: 224240449730771886}
-  - {fileID: 224544596059317450}
+  - {fileID: 224061458002519324}
   m_Father: {fileID: 224463042448387068}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10250,16 +10324,16 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1147826783697610}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 224443708564745286}
-  m_RootOrder: 2
+  m_Father: {fileID: 224685061251222592}
+  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.92501, y: 160.6}
+  m_AnchoredPosition: {x: 0.9250488, y: 160.6}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224549163792536180
@@ -10521,6 +10595,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 224544596059317450}
   - {fileID: 224853605672449656}
   - {fileID: 224721906218477922}
   - {fileID: 224302110129383654}
@@ -10652,7 +10727,7 @@ RectTransform:
   m_Children:
   - {fileID: 224122819838006714}
   m_Father: {fileID: 224685061251222592}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10909,7 +10984,7 @@ RectTransform:
   m_Children:
   - {fileID: 224986817323295536}
   m_Father: {fileID: 224685061251222592}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

+ 2 - 2
Assets/Resource/Prefab/PrefabUI/MessageBox.prefab

@@ -187,8 +187,8 @@ RectTransform:
   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: 8.1, y: -0.0000094988}
-  m_SizeDelta: {x: 144, y: 34.4}
+  m_AnchoredPosition: {x: 8.099998, y: -0.000009536743}
+  m_SizeDelta: {x: 139.9, y: 32.1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224680566000850672
 RectTransform:

+ 11 - 11
Assets/Resource/Prefab/PrefabUI/PlazaRoomItem.prefab

@@ -619,7 +619,7 @@ RectTransform:
   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: 164.16664, y: 2.4998474}
+  m_AnchoredPosition: {x: 164.1667, y: 1.9998627}
   m_SizeDelta: {x: 93.8, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224102115282505490
@@ -655,7 +655,7 @@ RectTransform:
   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: -39.16671, y: 2.4998474}
+  m_AnchoredPosition: {x: -39.166718, y: 1.9998627}
   m_SizeDelta: {x: 93.8, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224319422747277866
@@ -674,7 +674,7 @@ RectTransform:
   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: -282.5, y: 2.4998474}
+  m_AnchoredPosition: {x: -282.50006, y: 1.9998627}
   m_SizeDelta: {x: 40, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224643852233928252
@@ -700,8 +700,8 @@ RectTransform:
   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: 30}
-  m_SizeDelta: {x: 664, y: 60}
+  m_AnchoredPosition: {x: 0, y: 30.5}
+  m_SizeDelta: {x: 664, y: 59}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224666961258069144
 RectTransform:
@@ -719,7 +719,7 @@ RectTransform:
   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: 260.83337, y: 2.4998474}
+  m_AnchoredPosition: {x: 260.83344, y: 1.9998169}
   m_SizeDelta: {x: 328.8, y: 162}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224671486392841548
@@ -755,8 +755,8 @@ RectTransform:
   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.9, y: -27.500217}
-  m_SizeDelta: {x: 633.6, y: 5}
+  m_AnchoredPosition: {x: -1.8999939, y: -28.000168}
+  m_SizeDelta: {x: 633.6, y: 3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224779885025121098
 RectTransform:
@@ -773,7 +773,7 @@ RectTransform:
   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: -165.83328, y: 2.4998474}
+  m_AnchoredPosition: {x: -165.83322, y: 1.9998627}
   m_SizeDelta: {x: 127.2, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224801177984639110
@@ -791,7 +791,7 @@ RectTransform:
   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: -282.5, y: 2.4998474}
+  m_AnchoredPosition: {x: -282.50006, y: 1.9998627}
   m_SizeDelta: {x: 93.8, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224975986003595254
@@ -809,6 +809,6 @@ RectTransform:
   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: 67.49999, y: 2.4998474}
+  m_AnchoredPosition: {x: 67.50009, y: 1.9998627}
   m_SizeDelta: {x: 93.8, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}

+ 2 - 2
Assets/Resource/Prefab/PrefabUI/X_InfoItem.prefab

@@ -80,11 +80,11 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 30
+    m_FontSize: 40
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
-    m_MaxSize: 30
+    m_MaxSize: 40
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1

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

@@ -116,6 +116,7 @@
     <P_Unlock desc=""><![CDATA[未解锁]]></P_Unlock>
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
+    <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[请输入留言内容]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
     <Q_CloseLab desc=""><![CDATA[关闭]]></Q_CloseLab>

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

@@ -116,6 +116,7 @@
     <P_Unlock desc=""><![CDATA[未解鎖]]></P_Unlock>
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
+    <Q_Tit desc=""><![CDATA[]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[請輸入留言內容]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
     <Q_CloseLab desc=""><![CDATA[關閉]]></Q_CloseLab>

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

@@ -116,6 +116,7 @@ Program 水怪
     <P_Unlock desc=""><![CDATA[Locked]]></P_Unlock>
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
+    <Q_Tit desc=""><![CDATA[]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[Say something]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[Comment]]></Q_CommentLab>
     <Q_CloseLab desc=""><![CDATA[Close]]></Q_CloseLab>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 29 - 0
Assets/Script/Manage/ManaAudio.cs

@@ -24,6 +24,7 @@ public class ManaAudio : Regist
     public static bool Music = true;
     public static Coroutine CoroTheme;
     public static Coroutine CoroMiniGame;
+    public static Coroutine CoroPartyTheme;
     public static ManaAudio Instance;
 
     public static AudioClip BtnClip;
@@ -38,6 +39,7 @@ public class ManaAudio : Regist
     public static AudioSource MusicClip;
     public static AudioSource MusicMini;
     public static AudioSource MusicTheme;
+    public static AudioSource MusicPartyTheme;
 
     public static Dictionary<Clip, AudioClip> ClipDic = new Dictionary<Clip, AudioClip>();
 
@@ -124,6 +126,30 @@ public class ManaAudio : Regist
 
         #endregion
 
+        #region MusicPartyTheme
+
+        tween = MusicPartyTheme.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
+
+        tween.OnForwardStart += () =>
+        {
+            if (Music)
+            {
+                MusicPartyTheme.Play();
+
+                CoroPartyTheme = StartCoroutine(Loop(MusicPartyTheme));
+            }
+        };
+
+        tween.OnBackwardStart += () =>
+        {
+            if (Music)
+            {
+                StopCoroutine(CoroPartyTheme);
+            }
+        };
+
+        #endregion
+
         if (!Music)
         {
             ManaReso.SetActive("L_MusicOn", false);
@@ -144,6 +170,7 @@ public class ManaAudio : Regist
         MusicClip = audioSources[2];
         MusicMini = audioSources[1];
         MusicTheme = audioSources[0];
+        MusicPartyTheme = audioSources[3];
     }
 
 
@@ -184,6 +211,7 @@ public class ManaAudio : Regist
             
             MusicMini.Pause();
             MusicTheme.Pause();
+            MusicPartyTheme.Pause();
 
             PlayerPrefs.SetInt("MusicOn", 0);
         }
@@ -195,6 +223,7 @@ public class ManaAudio : Regist
             ManaReso.SetActive("L_MusicOff", false);
 
             MusicMini.UnPause();
+            MusicPartyTheme.UnPause();
 
             if (MusicTheme.isPlaying)
             {

+ 1 - 1
Assets/Script/Manage/ManaInfoBox.cs

@@ -143,7 +143,7 @@ public class ManaInfoBox : Regist
     #region Config
 
     private const int MaxGardenInfoCount = 4;
-    private const int MaxPlazaRoomCount = 19;
+    private const int MaxPlazaRoomCount = 14;
 
     private static InfoBox GardenInfoBox;
     private static InfoBox PlazaRoomInfoBox;

+ 2 - 2
Assets/Script/Manage/ManaReso.cs

@@ -774,7 +774,7 @@ public class ManaReso : Regist
         return ranktem;
     }
 
-    public static CommentItem GetCommentItem(string serialNumber, string content)
+    public static CommentItem GetCommentItem(string nickname, string serialNumber, string content)
     {
         Transform tra = Get("CommentItem", Folder.UI, false, Get("Q_Grid"), false, ObjType.CommentItem, typeof(CommentItem));
 
@@ -782,7 +782,7 @@ public class ManaReso : Regist
 
         commentItem.RegistImmed();
 
-        commentItem.Reset(serialNumber, content);
+        commentItem.Reset(nickname, serialNumber, content);
 
         return commentItem;
     }

+ 6 - 2
Assets/Script/Manage/ManaServer.cs

@@ -122,6 +122,8 @@ public class ManaServer : Regist
 
     public void Awake()
     {
+        //AddComment("1706277644193291134", "1710065808151506837", "你好啊", CommentType.Garden);
+
         //URLRequestData urlData = new URLRequestData();
 
         //urlData.Add("u", "vn9q1k");
@@ -570,12 +572,14 @@ public class ManaServer : Regist
         }
 
         URLRequestData urlData = new URLRequestData();
-
+        //Debug.LogWarning(id);
+        //Debug.LogWarning(page);
+        //Debug.LogWarning(type.GetHashCode());
         urlData.Add("u", id);
         urlData.Add("p", page);
         urlData.Add("t", type.GetHashCode());
 
-        URLRequest.CreateURLRequest(BaseURL + "/comment/index", urlData, data => callback(data), URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(BaseURL + "/comment/index", urlData, data => { callback(data);}, URLRequest.Method.POST);
     }
 
 

+ 14 - 10
Assets/Script/Manage/ManaSocial.cs

@@ -40,8 +40,11 @@ public class ManaSocial : Regist
     public static InputField InputField;
     public static ScrollRectPlus ScrollRectPlus;
 
+    public static float RankTime = 5;
     public static float RankTimer = 0;
+    public static float PraiseTime = 10;
     public static float PraiseTimer = 5;
+    public static float CommentTimespan = 60;
     public static float CommentTimer = 0;
     public static List<List<string>> PlayerCommentDatas = new List<List<string>>();
     public static List<List<string>> VisiteeCommentDatas = new List<List<string>>();
@@ -54,7 +57,7 @@ public class ManaSocial : Regist
         {
             RankTimer += Time.deltaTime;
 
-            if (RankTimer >= 5)
+            if (RankTimer >= RankTime)
             {
                 RankTimer = 0;
 
@@ -69,7 +72,7 @@ public class ManaSocial : Regist
 
         CommentTimer += Time.deltaTime;
 
-        if (CommentTimer >= 10)
+        if (CommentTimer >= CommentTimespan)
         {
             CommentTimer = 0;
 
@@ -81,7 +84,7 @@ public class ManaSocial : Regist
 
         PraiseTimer += Time.deltaTime;
 
-        if (PraiseTimer >= 5)
+        if (PraiseTimer >= PraiseTime)
         {
             //index += 1;
             //Debug.Log(index);
@@ -160,7 +163,8 @@ public class ManaSocial : Regist
 
             foreach (JsonData commentData in jsonData["l"])
             {
-                PlayerCommentDatas.Add(new List<string>() { commentData["s"].ToString(), commentData["c"].ToString() });
+                //Debug.Log(commentData["n"].ToString());
+                PlayerCommentDatas.Add(new List<string>() { commentData["s"].ToString(), commentData["c"].ToString(), commentData["n"].ToString() });
             }
         }
         else
@@ -169,7 +173,7 @@ public class ManaSocial : Regist
 
             foreach (JsonData commentData in jsonData["l"])
             {
-                VisiteeCommentDatas.Add(new List<string>() { commentData["s"].ToString(), commentData["c"].ToString() });
+                VisiteeCommentDatas.Add(new List<string>() { commentData["s"].ToString(), commentData["c"].ToString(), commentData["n"].ToString() });
             }
         }
     }
@@ -194,7 +198,7 @@ public class ManaSocial : Regist
 
                 PlayerLastIndex++;
 
-                ManaReso.GetCommentItem(PlayerCommentDatas[PlayerLastIndex][0], PlayerCommentDatas[PlayerLastIndex][1]);
+                ManaReso.GetCommentItem(PlayerCommentDatas[PlayerLastIndex][2], PlayerCommentDatas[PlayerLastIndex][0], PlayerCommentDatas[PlayerLastIndex][1]);
             }
 
             int offset = isDownload ? 1 : 0;
@@ -222,7 +226,7 @@ public class ManaSocial : Regist
 
                 VisiteeLastIndex++;
 
-                ManaReso.GetCommentItem(VisiteeCommentDatas[VisiteeLastIndex][0], VisiteeCommentDatas[VisiteeLastIndex][1]);
+                ManaReso.GetCommentItem(VisiteeCommentDatas[VisiteeLastIndex][2], VisiteeCommentDatas[VisiteeLastIndex][0], VisiteeCommentDatas[VisiteeLastIndex][1]);
             }
 
             int offset = isDownload ? 1 : 0;
@@ -254,7 +258,7 @@ public class ManaSocial : Regist
                 for (int i = 0; i < revertAmt; i++)
                 {
                     ManaReso.Save(ScrollRectPlus.content.GetChild(ScrollRectPlus.content.childCount-1));
-                    CommentItem commentItem = ManaReso.GetCommentItem(PlayerCommentDatas[PlayerFirstIndex - 1][0], PlayerCommentDatas[PlayerFirstIndex - 1][1]);
+                    CommentItem commentItem = ManaReso.GetCommentItem(PlayerCommentDatas[PlayerFirstIndex - 1][2], PlayerCommentDatas[PlayerFirstIndex - 1][0], PlayerCommentDatas[PlayerFirstIndex - 1][1]);
                     commentItem.transform.SetAsFirstSibling();
 
                     PlayerLastIndex--;
@@ -277,7 +281,7 @@ public class ManaSocial : Regist
                 for (int i = 0; i < revertAmt; i++)
                 {
                     ManaReso.Save(ScrollRectPlus.content.GetChild(ScrollRectPlus.content.childCount - 1));
-                    CommentItem commentItem = ManaReso.GetCommentItem(VisiteeCommentDatas[VisiteeFirstIndex - 1][0], VisiteeCommentDatas[VisiteeFirstIndex - 1][1]);
+                    CommentItem commentItem = ManaReso.GetCommentItem(VisiteeCommentDatas[VisiteeFirstIndex - 1][2], VisiteeCommentDatas[VisiteeFirstIndex - 1][0], VisiteeCommentDatas[VisiteeFirstIndex - 1][1]);
                     commentItem.transform.SetAsFirstSibling();
 
                     VisiteeLastIndex--;
@@ -577,7 +581,7 @@ public class ManaSocial : Regist
 
                 PlayerLastIndex++;
 
-                ManaReso.GetCommentItem(PlayerCommentDatas[PlayerLastIndex][0], PlayerCommentDatas[PlayerLastIndex][1]);
+                ManaReso.GetCommentItem(PlayerCommentDatas[PlayerLastIndex][2], PlayerCommentDatas[PlayerLastIndex][0], PlayerCommentDatas[PlayerLastIndex][1]);
             }
 
             ScrollRectPlus.content.transform.position = CommentRecordPosition;

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

@@ -2697,6 +2697,7 @@ public class ManaUI : Regist
 
         #region Q
 
+        ManaLan.Add(ManaReso.Get<Text>("Q_Tit"), new LanStr("UI", "Q_Tit"));
         ManaLan.Add(ManaReso.Get<Text>("Q_Placeholder"), new LanStr("UI", "Q_Placeholder"));
         ManaLan.Add(ManaReso.Get<Text>("Q_CommentLab"), new LanStr("UI", "Q_CommentLab"));
         ManaLan.Add(ManaReso.Get<Text>("Q_CloseLab"), new LanStr("UI", "Q_CloseLab"));
@@ -3232,6 +3233,8 @@ public class ManaUI : Regist
                 ManaAudio.PlayClip(Clip.BtnClip);
 
                 PlazaRoomMge.CreateRoom();
+
+                ManaReso.Get<InputField>("AA_InputField").text = "";
             }
         );
 

+ 1 - 0
Assets/Script/Manage/ManaVisit.cs

@@ -938,6 +938,7 @@ public class ManaVisit : Regist
             () =>
             {
                 ManaReso.Get("I_BlackMask").TweenForCG();
+                ManaReso.SetActive("C_EnterPlazaRoom0", true);
             },
             null,
             false

+ 4 - 1
Assets/Script/Manage/PlazaRoomMge.cs

@@ -422,7 +422,7 @@ public class PlazaRoomMge : Regist
         Debug.Log("create error");
     }
 
-    public static void OnCreateRoomSucceed()
+    public static void OnCreateRoomSucceed(RoomData roomData)
     {
         ManaLan.Add(ManaReso.Get<Text>("AA_Tip"), new LanStr("UI", "AA_CreateSucceed"));
         ManaReso.Get("AA_Tip").TweenBacCG();
@@ -430,6 +430,9 @@ public class PlazaRoomMge : Regist
         DownloadRoomData();
 
         ManaCenter.AddDiamond(-Cost, StaticsManager.ItemID.创建派对, StaticsManager.ConsumeModule.Charge);
+
+        PlazaRoomItem.OnJoinBtn(roomData);
+        CloseCreatePanel();
     }
 
     public static void OnSliderValueChange(float value)

+ 12 - 7
Assets/Script/Object/CommentItem.cs

@@ -53,20 +53,25 @@ public class CommentItem : Regist
         ManaVisit.Visit(ArchiveSource.SerialNumber, SerialNumber);
     }
 
-    public void Reset(string serialNumber, string content)
+    public void Reset(string nickname, string serialNumber, string content)
     {
         Content = content;
         SerialNumber = serialNumber;
 
-        try
+        if (!string.IsNullOrEmpty(nickname))
         {
-            Tit.text = "****" + serialNumber.Substring(serialNumber.Length - 4);
+            Tit.text = nickname;
         }
-        catch (Exception)
+        else
         {
-            Tit.text = "****" + Random.Range(1000, 10000);
-
-            //Debug.LogWarning("Error " + serialNumber);
+            if (Tit.text.Length >= 4)
+            {
+                Tit.text = "****" + serialNumber.Substring(serialNumber.Length - 4);
+            }
+            else
+            {
+                Tit.text = "****" + Random.Range(1000, 10000);
+            }
         }
 
         ContentLab.text = content;

+ 9 - 3
Assets/Script/Object/PlazaRoomItem.cs

@@ -174,9 +174,7 @@ public class PlazaRoomItem : MonoBehaviour
         (
             () =>
             {
-                ManaAudio.PlayClip(Clip.BtnClip);
-                SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom(roomData);
-                SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.JoinPlazaRoom(roomData.ID);
+                OnJoinBtn(roomData);
             }
         );
 
@@ -211,4 +209,12 @@ public class PlazaRoomItem : MonoBehaviour
             Status.color = Lib.RoomClosing;
         }
     }
+
+
+    public static void OnJoinBtn(RoomData roomData)
+    {
+        ManaAudio.PlayClip(Clip.BtnClip);
+        SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom(roomData);
+        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.JoinPlazaRoom(roomData.ID);
+    }
 }

+ 7 - 0
Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -175,6 +175,8 @@ public class SFSPlazaRoomManager
         IsBlackMaskFinish = false;
         JoinRoomResult = JoinRoomResult.Unknown;
 
+        ManaAudio.MusicTheme.TweenBacAudio();
+
         ManaReso.Get("B_SignIn0").TweenBacCG();
         ManaReso.Get("T_NickName").TweenBacCG();
 
@@ -260,6 +262,8 @@ public class SFSPlazaRoomManager
                 kv.Value.Player.transform.parent = ManaReso.Get("PlazaRoom");
         }
 
+        ManaAudio.MusicPartyTheme.TweenForAudio();
+
         InPlazaRoom = true;
         PlazaRoomMge.ClosePanel();
 
@@ -307,6 +311,8 @@ public class SFSPlazaRoomManager
             {
                 ChestMge.RetrieveAllChest();
 
+                ManaAudio.MusicTheme.TweenForAudio();
+
                 PlazaRoomSky.position = SkyOriginPosition;
                 PlazaRoomCamera.transform.position = CameraOriginPosition;
 
@@ -469,6 +475,7 @@ public class SFSPlazaRoomManager
 
     public void OnExitPlazaRoom()
     {
+        ManaAudio.MusicPartyTheme.TweenBacAudio();
         ExitPlazaRoom();
     }
 

+ 2 - 1
Assets/Script/SFS/SFSEvent/PlazaRoomEvent.cs

@@ -382,7 +382,8 @@ public class PlazaRoomEvent
 
     public void OnCreateRoomSucceed(BaseEvent baseEvent)
     {
-        PlazaRoomMge.OnCreateRoomSucceed();
+        RoomData roomData = new RoomData((baseEvent.Params["params"] as ISFSObject));
+        PlazaRoomMge.OnCreateRoomSucceed(roomData);
     }
 
 

+ 2 - 3
Assets/Script/Tool/Auxiliary.cs

@@ -142,9 +142,8 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            SFSObject arg = new SFSObject();
-            arg.PutInt(Label.CommandID, PlazaRoomReq.KeepAlive.GetHashCode());
-            SFSManager.GardenSmartFox.AddRequest(arg, RequestType.Immediate);
+            ManaServer.AddComment("1708183183139915476", ManaServer.SerialNumber, "新评论", CommentType.Garden);
+
             //Debug.LogWarning(ManaServer.SerialNumber);
             //SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
             //ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();