修改PlazaRoom

Assets/Resource/Logo.unity

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

Assets/Resource/Prefab/Object/MainCamera.prefab

@@ -1,115 +0,0 @@
-%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: 1424904125323438}
-  m_IsPrefabParent: 1
---- !u!1 &1424904125323438
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4487744099045518}
-  - component: {fileID: 20457551204036610}
-  - component: {fileID: 92123825236469954}
-  - component: {fileID: 124303997679295990}
-  - component: {fileID: 81742010955080160}
-  - component: {fileID: 114707783965843618}
-  m_Layer: 0
-  m_Name: MainCamera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4487744099045518
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1424904125323438}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -30}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!20 &20457551204036610
-Camera:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1424904125323438}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 1
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
---- !u!81 &81742010955080160
-AudioListener:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1424904125323438}
-  m_Enabled: 1
---- !u!92 &92123825236469954
-Behaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1424904125323438}
-  m_Enabled: 1
---- !u!114 &114707783965843618
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1424904125323438}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -1690312454, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EventMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!124 &124303997679295990
-Behaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1424904125323438}
-  m_Enabled: 1

Assets/Resource/Prefab/Object/MainCamera.prefab.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 143de41caa5cb4443b221982d3926f87
-timeCreated: 1486436342
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: ui
-  assetBundleVariant: 

Assets/Resource/Prefab/Object/PlazaRoom.prefab

@@ -21,7 +21,7 @@ GameObject:
   - component: {fileID: 4493473737233732}
   - component: {fileID: 212349030668709546}
   m_Layer: 0
-  m_Name: 006B4
+  m_Name: PlazaRoomSky
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -158,7 +158,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1027038479094960}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 8, y: 0, z: 0}
+  m_LocalPosition: {x: 11.875, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
@@ -171,7 +171,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1761662476474740}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -3}
+  m_LocalPosition: {x: 0, y: 0, z: -6}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
@@ -188,7 +188,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 23.03, y: 0, z: 0}
 --- !u!4 &4436083492004806
 Transform:
@@ -237,14 +237,14 @@ Transform:
   m_GameObject: {fileID: 1888753063508628}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 7.5, y: 0, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.6, y: 1.6, z: 1}
   m_Children:
   - {fileID: 4079838987492840}
   - {fileID: 4436083492004806}
   - {fileID: 4465118849283348}
   - {fileID: 4493473737233732}
-  - {fileID: 4800422243721380}
   - {fileID: 4421693630246596}
+  - {fileID: 4800422243721380}
   - {fileID: 4693788232285786}
   - {fileID: 4053414627786464}
   m_Father: {fileID: 0}
@@ -256,8 +256,8 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1648693794060064}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -7.5, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -11.875, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
@@ -274,7 +274,7 @@ Transform:
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &65286698438109658
 BoxCollider:
@@ -286,7 +286,7 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 27, y: 2.8027709, z: 0.1}
+  m_Size: {x: 33, y: 2.8027709, z: 0.1}
   m_Center: {x: 0, y: -0.09860494, z: -0.00000115484}
 --- !u!212 &212016355275133796
 SpriteRenderer:

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -896,6 +896,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1395063287836276
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224320881754689348}
+  - component: {fileID: 222068256448544528}
+  - component: {fileID: 114907659917974766}
+  m_Layer: 5
+  m_Name: C_EnterPlazaRoomLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1407925660705012
 GameObject:
   m_ObjectHideFlags: 1
@@ -1620,6 +1637,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1635430071254022
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224549513267331424}
+  - component: {fileID: 222688948345845310}
+  - component: {fileID: 114896854376280300}
+  - component: {fileID: 114041620894659974}
+  m_Layer: 5
+  m_Name: C_EnterPlazaRoom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1637078809604382
 GameObject:
   m_ObjectHideFlags: 1
@@ -2745,6 +2780,47 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114041620894659974
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1635430071254022}
+  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: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    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: 114896854376280300}
+  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 &114057582522700640
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7470,6 +7546,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114896854376280300
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1635430071254022}
+  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114900503690766950
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7536,6 +7639,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: OFF
+--- !u!114 &114907659917974766
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1395063287836276}
+  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: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: EnterPlazaRoom
 --- !u!114 &114908265246923224
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8035,6 +8171,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1359555403264252}
+--- !u!222 &222068256448544528
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1395063287836276}
 --- !u!222 &222070152269201450
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8539,6 +8681,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1673024710915826}
+--- !u!222 &222688948345845310
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1635430071254022}
 --- !u!222 &222696312794164114
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -9465,6 +9613,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224320881754689348
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1395063287836276}
+  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: 224549513267331424}
+  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 &224325760142200524
 RectTransform:
   m_ObjectHideFlags: 1
@@ -10029,6 +10195,7 @@ RectTransform:
   - {fileID: 224517132005796266}
   - {fileID: 224270387276606410}
   - {fileID: 224327389779206034}
+  - {fileID: 224549513267331424}
   m_Father: {fileID: 224577567281555198}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10263,6 +10430,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224549513267331424
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1635430071254022}
+  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: 224320881754689348}
+  m_Father: {fileID: 224476342221405536}
+  m_RootOrder: 5
+  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: -23.175, y: -162}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224565104257182798
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -133,7 +133,9 @@
     <热卖 desc=""><![CDATA[热卖]]></热卖>
     <超值 desc=""><![CDATA[超值]]></超值>
     <加入房间失败 desc=""><![CDATA[无法连接到服务器]]></加入房间失败>
+    <内容不能为空 desc=""><![CDATA[内容不能为空]]></内容不能为空>
     <未命名 desc=""><![CDATA[未命名]]></未命名>
+    <请勿重复发送 desc=""><![CDATA[请勿重复发送]]></请勿重复发送>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -133,7 +133,9 @@
     <热卖 desc=""><![CDATA[熱賣]]></热卖>
     <超值 desc=""><![CDATA[超值]]></超值>
     <加入房间失败 desc=""><![CDATA[]]></加入房间失败>
+    <内容不能为空 desc=""><![CDATA[]]></内容不能为空>
     <未命名 desc=""><![CDATA[]]></未命名>
+    <请勿重复发送 desc=""><![CDATA[]]></请勿重复发送>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

Assets/Resource/XML/lan/English.xml

@@ -133,7 +133,9 @@ Program 水怪
     <热卖 desc=""><![CDATA[Most Popular]]></热卖>
     <超值 desc=""><![CDATA[Highest Value]]></超值>
     <加入房间失败 desc=""><![CDATA[]]></加入房间失败>
+    <内容不能为空 desc=""><![CDATA[]]></内容不能为空>
     <未命名 desc=""><![CDATA[Unnamed]]></未命名>
+    <请勿重复发送 desc=""><![CDATA[]]></请勿重复发送>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>

Assets/Script/Manage/ManaUI.cs

@@ -554,6 +554,21 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region C_EnterPlazaRoom
+
+        ManaReso.SetButtonEvent
+        (
+            "C_EnterPlazaRoom",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
+            }
+        );
+
+        #endregion
+
         #endregion
 
         #region D
@@ -2783,6 +2798,32 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region X
+
+        ManaReso.SetButtonEvent
+        (
+            "X_Quit",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.ExitPlazaRoom();
+            }
+        );
+
+        ManaReso.SetButtonEvent
+        (
+            "X_SendPublicMessage",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendPublicMessage(ManaReso.Get<InputField>("X_InputField").text);
+            }
+        );
+
+        #endregion
+
         if (!ManaTutorial.TutorialA)
         {
             HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();

Assets/Script/Object/PlazaRoom.cs

@@ -1,14 +1,43 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using Debug = UnityEngine.Debug;
 
 public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 {
     public void OnPointerClick(PointerEventData eventData)
     {
-        GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SelfInstance.MoveTo(eventData.pointerCurrentRaycast.worldPosition);
-        
-        GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendSynchronizeDestination(eventData.pointerCurrentRaycast.worldPosition);
+        GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.MoveTo(eventData.pointerCurrentRaycast.worldPosition);
+    }
+
+    public void Update()
+    {
+        foreach (var v in GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.UserInstanceDictionary.Values)
+        {
+            if (v.Player.transform.hasChanged)
+            {
+                ResetDepth();
+
+                break;
+            }
+        }
+    }
+
+    public void ResetDepth()
+    {
+        List<PlazaRoomManager.PlazaRoomPlayer> plazaRoomPlayers = GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.UserInstanceDictionary.Values.ToList();
+
+        plazaRoomPlayers.MySort((player1, player2) => player1.Player.transform.position.z > player2.Player.transform.position.z);
+
+        foreach (var plazaRoomPlayer in plazaRoomPlayers)
+        {
+            plazaRoomPlayer.Player.transform.hasChanged = false;
+
+            plazaRoomPlayer.NickName.SetAsLastSibling();
+            plazaRoomPlayer.MessageBox.SetAsLastSibling();
+        }
     }
 }

Assets/Script/SFS/Manager/BaseConnector.cs

@@ -9,7 +9,8 @@ public abstract class BaseConnector
     public GardenSmartFox GardenSmartFox;
 
     public int TcpPort = 9933;
-    public string Host = "127.0.0.1";
+    public string Host = "121.199.20.79";
+    //public string Host = "127.0.0.1";
 
     public Action<BaseEvent> onConnectSucceed;
     public Action<BaseEvent> onConnectFailed;

Assets/Script/SFS/Manager/BaseLoggor.cs

@@ -8,8 +8,8 @@ public abstract class BaseLoggor
 {
     public GardenSmartFox GardenSmartFox;
 
-    public string UserName = "321";
-    public string Password = "321";
+    public string UserName = "";
+    public string Password = "";
 
     public Action<BaseEvent> onLogin;
     public Action<BaseEvent> onLoginError;

Assets/Script/SFS/Manager/GardenSmartFox.cs

@@ -197,6 +197,8 @@ public class GardenSmartFox
         parameter.PutSFSObject("P", sfsObject);
         parameter.PutInt("U", targetUserID);
 
+        parameter.PutSFSObject("P", sfsObject);
+
         return parameter;
     }
 }

Assets/Script/SFS/Manager/Loggor.cs

@@ -21,7 +21,7 @@ public class Loggor : BaseLoggor
     {
         Debug.Log("Send login request");
 
-        UserName = Random.Range(0f, 100f).ToString("0.0000000");
+        UserName = Random.Range(0f, 100f).ToString();
 
         GardenSmartFox.SmartFox.Send(new LoginRequest(UserName, Password));
     }

Assets/Script/SFS/Manager/PlazaRoomManager.cs

@@ -35,6 +35,7 @@ public class PlazaRoomManager
             }
 
             hudTarget.PosTra = Player.ChildDic["NickName"];
+            hudTarget.SetPosition();
 
             NickName.GetComponent<Text>().text = string.IsNullOrEmpty(nickname) ? Language.GetStr("UI", "未命名") : nickname;
 
@@ -63,12 +64,14 @@ public class PlazaRoomManager
             ManaReso.Save(Player);
             ManaReso.Save(NickName);
             ManaReso.Save(MessageBox);
+
+            Player.PlayAnim(Player.IdleAnimationName);
         }
 
         public bool IsMoving;
         public float Speed = 1f;
         public Vector3 Destination;
-        public TweenRoot MoveTween;
+        public TweenVec MoveTween;
         public void MoveTo(Vector3 destination)
         {
             if (destination.Equal(Player.transform.position))
@@ -137,13 +140,13 @@ public class PlazaRoomManager
 
     public bool EnteringPlazaRoom;
     public bool IsBlackMaskFinish;
-    public RequestStatus JoinRoomStatus;
+    public RequestStatus JoinRoomStatus = RequestStatus.Pending;
 
     public Dictionary<User, PlazaRoomPlayer> UserInstanceDictionary = new Dictionary<User, PlazaRoomPlayer>();
 
     #endregion
 
-    public void OnEnterPlazaButton()
+    public void OnEnterPlazaRoomButton()
     {
         IsBlackMaskFinish = false;
         EnteringPlazaRoom = true;
@@ -165,7 +168,7 @@ public class PlazaRoomManager
                 {
                     if (!succeed)
                     {
-                        JoinRoomStatus = RequestStatus.Failed;
+                        GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
                         TryEnterPlazaRoom();
                     }
                 },
@@ -173,7 +176,7 @@ public class PlazaRoomManager
                 {
                     if (!succeed)
                     {
-                        JoinRoomStatus = RequestStatus.Failed;
+                        GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
                         TryEnterPlazaRoom();
                     }
                     else
@@ -196,6 +199,11 @@ public class PlazaRoomManager
             return;
         }
 
+        if (GardenSmartFox.PlazaRoomManager.JoinRoomStatus == RequestStatus.Pending)
+        {
+            return;
+        }
+
         if (GardenSmartFox.PlazaRoomManager.JoinRoomStatus == RequestStatus.Failed)
         {
             QuitPlazaRoom();
@@ -214,17 +222,18 @@ public class PlazaRoomManager
 
     public void EnterPlazaRoom()
     {
-        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;
-        
+
+        GardenSmartFox.PlazaRoomManager.PlazaRoomCamera.transform.SetX(GardenSmartFox.PlazaRoomManager.CameraLeftBorder);
+
         ManaReso.Get("V_BlackMask").TweenForCG();
 
-        ManaReso.SetActive("C_Main", false);
+        ManaReso.SetActive("C_Main2", false);
         ManaReso.SetActive("Garden", false);
         ManaReso.SetActive("PlazaRoom", true);
         ManaReso.SetActive("W_HudParent", true);
+        ManaReso.SetActive("X_PlazaRoom", true);
     }
 
     public void ExitPlazaRoom()
@@ -238,12 +247,14 @@ public class PlazaRoomManager
                 EventType.BackwardFinish,
                 () =>
                 {
+                    PlazaRoomSky.position = SkyOriginPosition;
                     PlazaRoomCamera.transform.position = CameraOriginPosition;
 
-                    ManaReso.SetActive("C_Main", true);
+                    ManaReso.SetActive("C_Main2", true);
                     ManaReso.SetActive("Garden", true);
                     ManaReso.SetActive("PlazaRoom", false);
                     ManaReso.SetActive("W_HudParent", false);
+                    ManaReso.SetActive("X_PlazaRoom", false);
 
                     ManaReso.Get("V_BlackMask").TweenForCG();
 
@@ -260,6 +271,10 @@ public class PlazaRoomManager
     public void QuitPlazaRoom()
     {
         ManaCenter.SceneSwitchLock = false;
+
+        GardenSmartFox.SmartFox.Send(new LeaveRoomRequest(CurrentPlazaRoom));
+
+        GardenSmartFox.PlazaRoomManager.CurrentPlazaRoom = null;
     }
 
 
@@ -283,6 +298,9 @@ public class PlazaRoomManager
         if (!InPlazaRoom)
             return;
 
+        if (EnteringPlazaRoom)
+            return;
+
         KeepAliveThread();
 
         CameraControllThread();
@@ -318,10 +336,16 @@ public class PlazaRoomManager
         if (SelfInstance.Player.transform.position.x <= CameraLeftBorder)
         {
             x = Mathf.Lerp(PlazaRoomCamera.transform.position.x, CameraLeftBorder, Time.deltaTime);
+
+            if (SkyTween != null)
+                SkyTween.Pause();
         }
         else if (SelfInstance.Player.transform.position.x >= CameraRightBorder)
         {
             x = Mathf.Lerp(PlazaRoomCamera.transform.position.x, CameraRightBorder, Time.deltaTime);
+
+            if (SkyTween != null)
+                SkyTween.Pause();
         }
         else
         {
@@ -331,6 +355,32 @@ public class PlazaRoomManager
         PlazaRoomCamera.transform.SetX(x);
     }
 
+
+    public void MoveTo(Vector3 destination)
+    {
+        GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SelfInstance.MoveTo(destination);
+
+        GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendSynchronizeDestination(destination);
+
+        MoveSky(SelfInstance.MoveTween.Duration, SelfInstance.MoveTween.Delta);
+    }
+
+    private float SkyMoveRatio = 0.2f;
+    private Vector3 SkyOriginPosition;
+    private TweenRoot SkyTween;
+    public Transform PlazaRoomSky;
+    private void MoveSky(float duration, Vector3 offset)
+    {
+        offset *= SkyMoveRatio;
+        offset.y = 0;
+        offset.z = 0;
+
+        SkyTween = PlazaRoomSky.transform.CreateTweenVecOffset2D(offset, duration, false, true, true, Curve.Linear);
+
+        SkyTween.StartForward();
+    }
+
+
     public void OnConectionLost(BaseEvent baseEvent)
     {
         if (InPlazaRoom)
@@ -342,17 +392,23 @@ public class PlazaRoomManager
 
     public void OnExitPlazaRoom()
     {
-        CurrentPlazaRoom = null;
-
         ExitPlazaRoom();
     }
 
+    private Vector3 PlayerDefaultPosition;
     public void OnJoinPlazaRoom(Room room)
     {
-        CurrentPlazaRoom = room;
+        GardenSmartFox.PlazaRoomManager.PlazaRoomSky = ManaReso.Get("PlazaRoomSky");
+        SkyOriginPosition = GardenSmartFox.PlazaRoomManager.PlazaRoomSky.position;
+
+        GardenSmartFox.PlazaRoomManager.PlazaRoomCamera = ManaReso.Get<Camera>("MainCamera");
+        GardenSmartFox.PlazaRoomManager.CameraOriginPosition = GardenSmartFox.PlazaRoomManager.PlazaRoomCamera.transform.position;
+
+        GardenSmartFox.PlazaRoomManager.CurrentPlazaRoom = room;
 
         SelfUser = GardenSmartFox.User;
-        SelfInstance = InstantiatePlayer(SelfUser, ManaNickName.NickName, ManaReso.Get("PlazaRoomDefaultPosition").position, PlayerDirection.Left, ManaData.GetDressDataIDs(ManaPlayer.Player));
+        PlayerDefaultPosition = ManaReso.Get("PlazaRoomDefaultPosition").position;
+        SelfInstance = InstantiatePlayer(SelfUser, ManaNickName.NickName, PlayerDefaultPosition, PlayerDirection.Left, ManaData.GetDressDataIDs(ManaPlayer.Player));
 
         UserInstanceDictionary.Add(SelfUser, SelfInstance);
 
@@ -385,7 +441,7 @@ public class PlazaRoomManager
 
         if (parameter.ContainsKey(DataID.Destination.GetHashString()))
         {
-            Vector3 destination = parameter.GetText(DataID.Destination.GetHashString()).StringToVector();
+            Vector3 destination = parameter.GetUtfString(DataID.Destination.GetHashString()).StringToVector();
 
             SynchronizeDestination(destination, sender);
         }
@@ -431,6 +487,28 @@ public class PlazaRoomManager
     }
 
 
+    private string LastPublicMessage;
+    public void SendPublicMessage(string message)
+    {
+        if (string.IsNullOrEmpty(message))
+        {
+            Bubble.Show(null, Language.GetStr("UI", "内容不能为空"));
+        }
+        else if (LastPublicMessage == message)
+        {
+            Bubble.Show(null, Language.GetStr("UI", "请勿重复发送"));
+        }
+        else
+        {
+            LastPublicMessage = message;
+
+            message = StringFilter.GetFilteredString(message);
+
+            GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage(message);
+        }
+    }
+
+
     public void SendInstantiateRequset(User receiver)
     {
         SendInstantiateRequset(receiver.Id);
@@ -441,9 +519,9 @@ public class PlazaRoomManager
         SFSObject parameter = new SFSObject();
         parameter.PutInt(DataID.SenderID.GetHashString(), GardenSmartFox.User.Id);
         parameter.PutIntArray(DataID.Close.GetHashString(), ManaData.GetDressDataIDs(SelfInstance.Player).ToArray());
-        parameter.PutText(DataID.Position.GetHashString(), SelfInstance.Player.transform.position.VectorToString());
+        parameter.PutUtfString(DataID.Position.GetHashString(), SelfInstance.Player.transform.position.VectorToString());
         parameter.PutInt(DataID.PlayerDirection.GetHashString(), SelfInstance.Player.PlayerDirection.GetHashCode());
-        parameter.PutText(DataID.NickName.GetHashString(), ManaNickName.NickName);
+        parameter.PutUtfString(DataID.NickName.GetHashString(), ManaNickName.NickName);
 
         GardenSmartFox.AddRequest(GardenSmartFox.ConstructCommandParameter(CommandID.Instantiate.GetHashCode(), parameter, receiverID), RequestType.Immediate);
 
@@ -483,7 +561,7 @@ public class PlazaRoomManager
         player.transform.position = position;
         player.Flip(direction);
 
-        tra.localScale = new Vector3(0.5f, 0.5f, 0.5f);
+        tra.localScale = new Vector3(0.3125f, 0.3125f, 0.3125f);
 
         return new PlazaRoomPlayer(player, nickName);
     }
@@ -491,9 +569,9 @@ public class PlazaRoomManager
     public PlazaRoomPlayer InstantiatePlayer(User user, SFSObject parameter)
     {
         List<int> dressDatas = ManaData.GetDressDataIDs(parameter);
-        Vector3 position = parameter.GetText(DataID.Position.GetHashString()).StringToVector();
+        Vector3 position = parameter.GetUtfString(DataID.Position.GetHashString()).StringToVector();
         PlayerDirection direction = (PlayerDirection) parameter.GetInt(DataID.PlayerDirection.GetHashString());
-        string nickName = parameter.GetText(DataID.NickName.GetHashString());
+        string nickName = parameter.GetUtfString(DataID.NickName.GetHashString());
 
         PlazaRoomPlayer plazaRoomPlayer = InstantiatePlayer(user, nickName, position, direction, dressDatas);
 

Assets/Script/SFS/SFSExtension/BaseSFSExtension.cs

@@ -30,6 +30,8 @@ public class BaseSFSExtension
 
     public void OnExtensionResponse(BaseEvent baseEvent)
     {
+        //DebugManager.PrintKeysAndValuesOfBaseEvent("OnExtensionResponse", baseEvent);
+
         int requestID = int.Parse((string)baseEvent.Params["cmd"]);
 
         if (ResponseDictionary.ContainsKey(requestID))

Assets/Script/SFS/SFSExtension/PlazaRoomExtension.cs

@@ -78,7 +78,7 @@ public class PlazaRoomExtension
     {
         SFSObject sfsObject = new SFSObject();
         sfsObject.PutInt(DataID.SenderID.GetHashString(), BaseSFSExtension.GardenSmartFox.User.Id);
-        sfsObject.PutText(DataID.Destination.GetHashString(), destination.VectorToString());
+        sfsObject.PutUtfString(DataID.Destination.GetHashString(), destination.VectorToString());
 
         SFSObject parameter = GardenSmartFox.ConstructCommandParameter(CommandID.Synchronize.GetHashCode(), sfsObject, -1);
 
@@ -100,7 +100,7 @@ public class PlazaRoomExtension
     {
         SFSObject sfsObject = new SFSObject();
         sfsObject.PutInt(DataID.SenderID.GetHashString(), BaseSFSExtension.GardenSmartFox.User.Id);
-        sfsObject.PutText(DataID.Message.GetHashString(), message);
+        sfsObject.PutUtfString(DataID.Message.GetHashString(), message);
 
         SFSObject parameter = GardenSmartFox.ConstructCommandParameter(CommandID.ReceivePublicMessage.GetHashCode(), sfsObject, -1);
 
@@ -143,7 +143,7 @@ public class PlazaRoomExtension
         SFSObject parameter = (SFSObject)baseEvent.Params["params"];
 
         int senderID = parameter.GetInt(DataID.SenderID.GetHashString());
-        string message = parameter.GetText(DataID.Message.GetHashString());
+        string message = parameter.GetUtfString(DataID.Message.GetHashString());
 
         User sender = CurrentPlazaRoom.GetUserById(senderID);
 

Assets/Script/SFS/SmartFox2X.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <doc>
     <assembly>
         <name>SmartFox2X</name>
@@ -1860,7 +1860,7 @@
             The following example shows how to handle this event type:
             <code>
             void SomeMethod() {
-            	SmartFox.AddEventListener(SFSEvent.USER_EXIT_ROOM, OnUserExitRoom);
+            	smartFox.AddEventListener(SFSEvent.USER_EXIT_ROOM, OnUserExitRoom);
             }
             
             void OnUserExitRoom(BaseEvent evt) {
@@ -6690,7 +6690,7 @@
             
             <seealso cref="P:Sfs2X.SmartFox.RoomManager"/>
         </member>
-        <member name="F:Sfs2X.Entities.Managers.SFSRoomManager.SmartFox">
+        <member name="F:Sfs2X.Entities.Managers.SFSRoomManager.smartFox">
             <exclude/>
         </member>
         <member name="P:Sfs2X.Entities.Managers.SFSRoomManager.OwnerZone">
@@ -10918,7 +10918,7 @@
             	settings.variables = roomVars;
             	
             	// Create the game
-            	SmartFox.Send( new CreateSFSGameRequest(settings) );
+            	smartFox.Send( new CreateSFSGameRequest(settings) );
             }
             
             void OnRoomCreated(BaseEvent evt) {

Assets/Script/Tool/Auxiliary.cs

@@ -155,7 +155,7 @@ public class Auxiliary : Regist
 
             //ManaCenter.MiniTimer = 0;
 
-            GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaButton();
+            GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
         }
 
         if (Input.GetKeyDown(KeyCode.X))
@@ -181,6 +181,16 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.C))
         {
+            //SFSObject sfsObject = new SFSObject();
+            //sfsObject.PutInt(DataID.SenderID.GetHashString(), 0);
+            //sfsObject.PutText(DataID.Message.GetHashString(), "123");
+
+            //SFSObject parameter = GardenSmartFox.ConstructCommandParameter(CommandID.ReceivePublicMessage.GetHashCode(), sfsObject, -1);
+
+            //GardenSmartFoxManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
+
+            //GardenSmartFoxManager.GardenSmartFox.SmartFox.Send(new ExtensionRequest("0", sfsObject));
+
             //ManaPlayer.Player.PlayAnim("newAnimation1");
 
             //ManaReso.Get("C_Notify").TweenForCG();

Assets/Script/Tool/UI/HudTarget.cs

@@ -12,6 +12,11 @@ public class HudTarget : MonoBehaviour
 
     private void Update()
     {
+        SetPosition();
+    }
+
+    public void SetPosition()
+    {
         transform.position = Camera.main.WorldToScreenPoint(PosTra.position);
     }
 }

ProjectSettings/GraphicsSettings.asset

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

第三期.txt

@@ -1,6 +1,5 @@
-MessageBox的层级
+翅膀太暗
 
-SFS使用的随机用户名
 
 服务器新旧版存取档兼容
 
@@ -14,6 +13,8 @@ DressRoom
 第二期合并到第三期的时候会出现遮罩Bug?
 
 
+切换到远程服务器
+
 关闭调试模式
 
 关闭多线程渲染