Browse Source

增加评论功能

jet 8 years ago
parent
commit
05e97cbfb9
32 changed files with 1985 additions and 128 deletions
  1. 0 9
      Assets/Editor.meta
  2. 0 9
      Assets/Plugins/metro/UWP.meta
  3. 0 9
      Assets/Plugins/metro/WindowsPhone81.meta
  4. 205 0
      Assets/Resource/Logo.unity
  5. 4 0
      Assets/Resource/Prefab/Object/DebugMode.prefab
  6. 473 0
      Assets/Resource/Prefab/PrefabUI/CommentItem.prefab
  7. 8 0
      Assets/Resource/Prefab/PrefabUI/CommentItem.prefab.meta
  8. 48 14
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  9. 801 27
      Assets/Resource/Prefab/PrefabUI/GroupE.prefab
  10. 3 1
      Assets/Resource/XML/PlayerConfig.xml
  11. 4 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  12. 4 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  13. 4 0
      Assets/Resource/XML/lan/English.xml
  14. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  15. 2 0
      Assets/Script/Manage/Initializer.cs
  16. 8 0
      Assets/Script/Manage/ManaCenter.cs
  17. 21 1
      Assets/Script/Manage/ManaData.cs
  18. 1 1
      Assets/Script/Manage/ManaDebug.cs
  19. 14 0
      Assets/Script/Manage/ManaReso.cs
  20. 46 13
      Assets/Script/Manage/ManaServer.cs
  21. 167 5
      Assets/Script/Manage/ManaSocial.cs
  22. 2 0
      Assets/Script/Manage/ManaTutorial.cs
  23. 34 0
      Assets/Script/Manage/ManaUI.cs
  24. 52 5
      Assets/Script/Manage/ManaVisit.cs
  25. 58 0
      Assets/Script/Object/CommentItem.cs
  26. 12 0
      Assets/Script/Object/CommentItem.cs.meta
  27. 1 1
      Assets/Script/Object/Skill/Ability.cs
  28. 1 0
      Assets/Script/Object/Skill/Pack.cs
  29. 6 27
      Assets/Script/Tool/UI/ScrollRectPlus.cs
  30. 2 2
      Assets/Script/Tool/UI/ScrollRectPlus.cs.meta
  31. 1 1
      ProjectSettings/QualitySettings.asset
  32. 3 3
      ToDoList.txt

+ 0 - 9
Assets/Editor.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 5fcd7f3618d0f154995b49930421ea1b
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/metro/UWP.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: b3a793fc2ce8625488a5576817135789
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/metro/WindowsPhone81.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: ea89367846fcf554188c49cca742be04
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 205 - 0
Assets/Resource/Logo.unity

@@ -155,6 +155,111 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1001 &727505388
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
+--- !u!224 &727505389 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    type: 2}
+  m_PrefabInternal: {fileID: 727505388}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -418,6 +523,106 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &1777559823
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 727505389}
+    m_Modifications:
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 718ebdaed223e93409d6dc7e53a23167, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0

+ 4 - 0
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -120,6 +120,7 @@ MonoBehaviour:
   - {fileID: 21300028, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
   - {fileID: 21300026, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
   - {fileID: 21300024, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 1073147265121344, guid: 100bc0b1747d64e4db7883a2f0d726c5, type: 2}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
@@ -230,6 +231,9 @@ MonoBehaviour:
   - {fileID: 21300014, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
   - {fileID: 1658220073256390, guid: 4211c250985daa64582ec4922f16e3f5, type: 2}
   - {fileID: 21300000, guid: c4fc7aa8356e62948b06cfc31aea088e, type: 3}
+  - {fileID: 1778995246200592, guid: e71b00d758f7c8341ac775c8694a411a, type: 2}
+  - {fileID: 1346530573601956, guid: a10d06e0f5f691943b242f354e65d756, type: 2}
+  - {fileID: 1423747695256464, guid: 8621ee70defbdb049b3c735108378eb1, type: 2}
   ConfigList:
   - {fileID: 4900000, guid: f039d2181a3e9ea418ff5f211730b175, type: 3}
   - {fileID: 4900000, guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a, type: 3}

+ 473 - 0
Assets/Resource/Prefab/PrefabUI/CommentItem.prefab

@@ -0,0 +1,473 @@
+%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: 1073147265121344}
+  m_IsPrefabParent: 1
+--- !u!1 &1073147265121344
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224375092351421506}
+  m_Layer: 5
+  m_Name: CommentItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1235374732147134
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224272859752220610}
+  - component: {fileID: 222463751610676358}
+  - component: {fileID: 114624175340223546}
+  m_Layer: 5
+  m_Name: ContentLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1315465680827384
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224250177737373466}
+  - component: {fileID: 222494234897168520}
+  - component: {fileID: 114750890958896708}
+  m_Layer: 5
+  m_Name: VisitLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1413984168578216
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224194809205400652}
+  - component: {fileID: 222842483776338390}
+  - component: {fileID: 114565490596394912}
+  - component: {fileID: 114620773026811712}
+  m_Layer: 5
+  m_Name: VisitBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1498954497838352
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224985055033363718}
+  - component: {fileID: 222049069938136978}
+  - component: {fileID: 114921447471586180}
+  m_Layer: 5
+  m_Name: Tit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1971581468309438
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224862441668659220}
+  - component: {fileID: 222654799811553232}
+  - component: {fileID: 114871277902962284}
+  m_Layer: 0
+  m_Name: VisitImagePlus
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114565490596394912
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1413984168578216}
+  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: 21300002, guid: 8d5fb26beef3dde488c316021ca5729f, 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 &114620773026811712
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1413984168578216}
+  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: 114565490596394912}
+  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 &114624175340223546
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1235374732147134}
+  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: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
+    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
+    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
+    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
+    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
+    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
+    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED  "
+--- !u!114 &114750890958896708
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1315465680827384}
+  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: 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: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: 5
+  Draw: 0
+  SetY: 0
+  Y: 0
+  LineHeight: 19.896374
+  RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
+  ImageIndex: 00000000
+  RemoveIndex: 0100000002000000030000000400000005000000
+  NewTextIndex: 06000000
+  NewTextPos:
+  - {x: 3.8449154, y: 8.290155, z: 0}
+  - {x: 16.28015, y: 8.290155, z: 0}
+  - {x: 16.28015, y: -9.119171, z: 0}
+  - {x: 16.28015, y: -9.119171, z: 0}
+  - {x: 3.8449154, y: -9.119171, z: 0}
+  - {x: 3.8449154, y: 8.290155, z: 0}
+--- !u!114 &114871277902962284
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1971581468309438}
+  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: 0
+--- !u!114 &114921447471586180
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1498954497838352}
+  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: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: '****1532 : '
+--- !u!222 &222049069938136978
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1498954497838352}
+--- !u!222 &222463751610676358
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1235374732147134}
+--- !u!222 &222494234897168520
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1315465680827384}
+--- !u!222 &222654799811553232
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1971581468309438}
+--- !u!222 &222842483776338390
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1413984168578216}
+--- !u!224 &224194809205400652
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1413984168578216}
+  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: 224250177737373466}
+  m_Father: {fileID: 224375092351421506}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -53.09, y: 41}
+  m_SizeDelta: {x: 84.224, y: 73}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224250177737373466
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1315465680827384}
+  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: 224862441668659220}
+  m_Father: {fileID: 224194809205400652}
+  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.056026, y: 11.01}
+  m_SizeDelta: {x: 84.112, y: 18.6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224272859752220610
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1235374732147134}
+  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: 224375092351421506}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -7.6, y: -0.0000038146973}
+  m_SizeDelta: {x: 477.8, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224375092351421506
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1073147265121344}
+  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: 224985055033363718}
+  - {fileID: 224272859752220610}
+  - {fileID: 224194809205400652}
+  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: 665, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224862441668659220
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1971581468309438}
+  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: 224250177737373466}
+  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 &224985055033363718
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1498954497838352}
+  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: 224375092351421506}
+  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: -284.5, y: 0}
+  m_SizeDelta: {x: 75, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 100bc0b1747d64e4db7883a2f0d726c5
+timeCreated: 1503889863
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

+ 48 - 14
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -248,6 +248,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1091510296079538
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224476342221405536}
+  m_Layer: 5
+  m_Name: C_Group3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1104354879240086
 GameObject:
   m_ObjectHideFlags: 1
@@ -8404,7 +8419,7 @@ RectTransform:
   - {fileID: 224822082479948756}
   - {fileID: 224694890287585666}
   m_Father: {fileID: 224577567281555198}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -8425,7 +8440,7 @@ RectTransform:
   - {fileID: 224773436732538326}
   - {fileID: 224922565756526032}
   m_Father: {fileID: 224577567281555198}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -8682,12 +8697,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224686880427899620}
-  m_RootOrder: 3
+  m_Father: {fileID: 224476342221405536}
+  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: -690.3018, y: 36.909973}
+  m_AnchoredPosition: {x: 29.653198, y: -23.000046}
   m_SizeDelta: {x: 59.3, y: 46.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224166789963831102
@@ -9060,7 +9075,7 @@ RectTransform:
   m_Children:
   - {fileID: 224302023387299144}
   m_Father: {fileID: 224577567281555198}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -9617,6 +9632,26 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224476342221405536
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1091510296079538}
+  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: 224143706629484300}
+  - {fileID: 224517132005796266}
+  m_Father: {fileID: 224577567281555198}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -296.778, y: 201.9}
+  m_SizeDelta: {x: 206.35, y: 46}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224482729533700574
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9722,7 +9757,7 @@ RectTransform:
   m_Children:
   - {fileID: 224337229391098628}
   m_Father: {fileID: 224577567281555198}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -9740,12 +9775,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224106350729927538}
-  m_Father: {fileID: 224686880427899620}
-  m_RootOrder: 4
+  m_Father: {fileID: 224476342221405536}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -609.6, y: 147.9}
+  m_AnchoredPosition: {x: 47.179993, y: 0}
   m_SizeDelta: {x: 112, y: 31.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224519958922616262
@@ -9891,6 +9926,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224686880427899620}
+  - {fileID: 224476342221405536}
   - {fileID: 224027336406255088}
   - {fileID: 224018473661974528}
   - {fileID: 224312533541126630}
@@ -10185,8 +10221,6 @@ RectTransform:
   - {fileID: 224455867312941770}
   - {fileID: 224099416328236884}
   - {fileID: 224402016592928158}
-  - {fileID: 224143706629484300}
-  - {fileID: 224517132005796266}
   - {fileID: 224739630613680282}
   m_Father: {fileID: 224577567281555198}
   m_RootOrder: 0
@@ -10342,7 +10376,7 @@ RectTransform:
   - {fileID: 224713315808876022}
   - {fileID: 224123597743654216}
   m_Father: {fileID: 224686880427899620}
-  m_RootOrder: 5
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -10494,7 +10528,7 @@ RectTransform:
   m_Children:
   - {fileID: 224208024033058762}
   m_Father: {fileID: 224577567281555198}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

File diff suppressed because it is too large
+ 801 - 27
Assets/Resource/Prefab/PrefabUI/GroupE.prefab


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

@@ -1,7 +1,9 @@
 <PlayerConfig>
-  <Version value="0" />
+  <Version value="1" />
 
   <ID value="Default" />
+  <SerialNumber value="Default" />
+  
   <TutorialA value="1" />
   <TutorialB value="1" />
   <TutorialC value="1" />

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

@@ -112,6 +112,10 @@
     <P_Return desc=""><![CDATA[你的当前形象还有没购买的装扮,确定要退出吗?]]></P_Return>
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
+    <Q_Placeholder desc=""><![CDATA[请输入留言内容]]></Q_Placeholder>
+    <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
+    <Q_CloseLab desc=""><![CDATA[关闭]]></Q_CloseLab>
+    <Q_CommentTip desc=""><![CDATA[每条留言发送时间间隔为30秒]]></Q_CommentTip>
     <N_Lab desc=""><![CDATA[去试衣间看看吧!]]></N_Lab>
     <I_Lab desc=""><![CDATA[加载中]]></I_Lab>
     <热卖 desc=""><![CDATA[热卖]]></热卖>

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

@@ -112,6 +112,10 @@
     <P_Return desc=""><![CDATA[妳的當前形象還有沒購買的裝扮,確定要退出嗎?]]></P_Return>
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
+    <Q_Placeholder desc=""><![CDATA[]]></Q_Placeholder>
+    <Q_CommentLab desc=""><![CDATA[]]></Q_CommentLab>
+    <Q_CloseLab desc=""><![CDATA[]]></Q_CloseLab>
+    <Q_CommentTip desc=""><![CDATA[]]></Q_CommentTip>
     <N_Lab desc=""><![CDATA[去試衣間看看吧!]]></N_Lab>
     <I_Lab desc=""><![CDATA[加載中]]></I_Lab>
     <热卖 desc=""><![CDATA[熱賣]]></热卖>

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

@@ -112,6 +112,10 @@ Program 水怪
     <P_Return desc=""><![CDATA[You currently have some close not yet purchased,are you sure you want to leave?]]></P_Return>
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
+    <Q_Placeholder desc=""><![CDATA[]]></Q_Placeholder>
+    <Q_CommentLab desc=""><![CDATA[]]></Q_CommentLab>
+    <Q_CloseLab desc=""><![CDATA[]]></Q_CloseLab>
+    <Q_CommentTip desc=""><![CDATA[]]></Q_CommentTip>
     <N_Lab desc=""><![CDATA[Go to your dress room!]]></N_Lab>
     <I_Lab desc=""><![CDATA[Loading]]></I_Lab>
     <热卖 desc=""><![CDATA[Most Popular]]></热卖>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 2 - 0
Assets/Script/Manage/Initializer.cs

@@ -165,6 +165,8 @@ public class Initializer : MonoBehaviour
 
         Complete = true;
 
+        ManaServer.GetComment(ManaServer.SerialNumber, "0", CommentType.Garden, data => { ManaSocial.InputCommentData(true, data); });
+
         ManaPlayer.InitializeDressRoom();
 
         GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 7";

+ 8 - 0
Assets/Script/Manage/ManaCenter.cs

@@ -142,6 +142,8 @@ public class ManaCenter : Regist
 
     #endregion
 
+    public static Action OnLevelChange;
+
     public static int Level
     {
         get { return Level_; }
@@ -156,6 +158,11 @@ public class ManaCenter : Regist
 
             ManaVisit.UpdateCost();
 
+            if (OnLevelChange != null)
+            {
+                OnLevelChange.Invoke();
+            }
+
             ManaAchieve.UpdateStatus(AchieveType.GardenLevel, Level_);
             
             for (int i = 0; i < SkillList.Count; i++)
@@ -1059,6 +1066,7 @@ public class ManaCenter : Regist
             ManaReso.SetText("L_UserLab", ManaData.GetPlayerString("ID"));
 
             ManaServer.ID = ManaData.GetPlayerString("ID");
+            ManaServer.SerialNumber = ManaData.GetPlayerString("SerialNumber");
 
 
             Bubble.Show(null, Language.GetStr("UI", "La_Lab0"), null, () => { Application.Quit(); }, null, false);

+ 21 - 1
Assets/Script/Manage/ManaData.cs

@@ -464,6 +464,8 @@ public class ManaData : Regist
         PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value = ManaCenter.CircleTimer.ToString("0");
 
         PlayerNode.SelectSingleNode("ID").Attributes[0].Value = ManaServer.ID;
+        PlayerNode.SelectSingleNode("SerialNumber").Attributes[0].Value = ManaServer.SerialNumber;
+
         PlayerNode.SelectSingleNode("Language").Attributes[0].Value = ManaLan.CurrentLan.ToString();
         PlayerNode.SelectSingleNode("MiniGameIndex").Attributes[0].Value = ManaMiniGame.MiniGameIndex.ToString();
 
@@ -955,11 +957,18 @@ public class ManaData : Regist
     {
         if (nativeVersion < 0)
         {
-            Debug.LogWarning("UpdateArchive");
+            Debug.LogWarning("UpdateArchive to 0");
 
             To0(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 1)
+        {
+            Debug.LogWarning("UpdateArchive to 1");
+
+            To1(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -973,4 +982,15 @@ public class ManaData : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument To1(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 1.ToString();
+
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("SerialNumber");
+
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+
+        return nativeDoc;
+    }
 }

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

@@ -42,7 +42,7 @@ public class ManaDebug : MonoBehaviour
 
         if (Timer >= 1)
         {
-            Log($"当前帧率  {Counter}    目标帧率 {Application.targetFrameRate}");
+            //Log($"当前帧率  {Counter}    目标帧率 {Application.targetFrameRate}");
 
             Timer = 0;
             Counter = 0;

+ 14 - 0
Assets/Script/Manage/ManaReso.cs

@@ -56,6 +56,7 @@ public enum ObjType
     SignItem,
     FlowerItem,
     AchieveItem,
+    CommentItem,
 
     Music,
 
@@ -755,6 +756,19 @@ public class ManaReso : Regist
         return hudText;
     }
 
+    public static CommentItem GetCommentItem(string serialNumber, string content)
+    {
+        Transform tra = Get("CommentItem", Folder.UI, false, Get("Q_Grid"), false, ObjType.CommentItem, typeof(CommentItem));
+
+        CommentItem commentItem = tra.GetComponent<CommentItem>();
+
+        commentItem.RegistImmed();
+
+        commentItem.Reset(serialNumber, content);
+
+        return commentItem;
+    }
+
 
     public static Transform GetElf(Flower flower, Vector4 offset, ElfType elfType)
     {

+ 46 - 13
Assets/Script/Manage/ManaServer.cs

@@ -31,6 +31,11 @@ public class MyCredentials : ICredentialsByHost
     }
 }
 
+public enum CommentType
+{
+    Garden = 0,
+}
+
 public class ManaServer : Regist
 {
     public class MailReward
@@ -94,13 +99,14 @@ public class ManaServer : Regist
     public static bool Connect_;
     public static bool PackLock_;
 
+    public static int PraiseAmt;
     public static int Counter;
     public static float Timer;
     public static bool Complete;
     public static bool FirstConnect = true;
 
     public static string ID = "Default";
-    public static string SerialNumber;
+    public static string SerialNumber = "Default";
     public static string ReportContent;
 
     public static JsonData JsonData;
@@ -140,13 +146,27 @@ public class ManaServer : Regist
 
         //Other("1704189794672324513", (data) => { print(data.ToJson()); });
 
-        //AddComment("12a", "12b", "content", "0");
+        //for (int i = 0; i < 10; i++)
+        //{
+        //    string str = "";
+
+        //    for (int j = 0; j < 80; j++)
+        //    {
+        //        str += Random.Range(0, 100);
+        //    }
 
-        //GetComment("12b", "0", "0");
+        //    AddComment("1704189794672324513", "1706142186026389627", 1, CommentType.Garden);
+        //}
+
+        //GetComment("123", "0", CommentType.Garden);
 
         //Praise("123", "1704189794672324513");
 
-        //Target("", "1704189794672324513");
+        //Target("", "1704189794672324513",null);
+
+        //URLRequestData urlData = new URLRequestData();
+
+        //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/look", urlData, Debug.Log, URLRequest.Method.GET);
     }
 
     public void Update()
@@ -248,45 +268,55 @@ public class ManaServer : Regist
 
     public static void Praise(string sendID, string receiveID)
     {
+        if (receiveID == null)
+        {
+            return;
+        }
+
         URLRequestData urlData = new URLRequestData();
 
         urlData.Add("u", sendID);
         urlData.Add("t", receiveID);
 
-        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/praise/click", urlData, Debug.Log, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/praise/click", urlData, (data)=> {}, URLRequest.Method.POST);
     }
 
-    public static void Target(string userID, string targetID)
+    public static void Target(string userID, string targetID, Action<JsonData> callback)
     {
         URLRequestData urlData = new URLRequestData();
 
         urlData.Add("u", userID);
         urlData.Add("t", targetID);
 
-        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/praise/target", urlData, Debug.Log, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/praise/target", urlData, data => callback(data), URLRequest.Method.POST);
     }
 
-    public static void AddComment(string sendID, string receiveID, string content, string type)
+    public static void AddComment(string sendID, string receiveID, string content, CommentType type)
     {
         URLRequestData urlData = new URLRequestData();
 
         urlData.Add("c", sendID);
         urlData.Add("u", receiveID);
         urlData.Add("i", content);
-        urlData.Add("t", type);
+        urlData.Add("t", type.GetHashCode());
 
-        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/comment/comment", urlData, Debug.Log, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/comment/comment", urlData, (data)=> {}, URLRequest.Method.POST);
     }
 
-    public static void GetComment(string id, string page, string type)
+    public static void GetComment(string id, string page, CommentType type, Action<JsonData> callback)
     {
+        if (string.IsNullOrEmpty(id))
+        {
+            return;
+        }
+
         URLRequestData urlData = new URLRequestData();
 
         urlData.Add("u", id);
         urlData.Add("p", page);
-        urlData.Add("t", type);
+        urlData.Add("t", type.GetHashCode());
 
-        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/comment/index", urlData, Debug.Log, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/comment/index", urlData, data => callback(data), URLRequest.Method.POST);
     }
 
 
@@ -630,17 +660,20 @@ public class ManaServer : Regist
 
             Time = DateUtil.GetTime(jsonData["time"].ToJson());
 
+            PraiseAmt = int.Parse(jsonData["p"].ToJson().Trim('"'));
             SerialNumber = jsonData["i"].ToJson().Trim('"');
 
             if (ManaData.DamageLock)
             {
                 ID = jsonData["o"].ToString();
+                SerialNumber = jsonData["i"].ToString();
             }
             else if (ManaData.PlayerDoc_ != null)
             {
                 if (ManaData.GetPlayerString("ID") == "Default")
                 {
                     ID = jsonData["o"].ToString();
+                    SerialNumber = jsonData["i"].ToString();
 
                     if (Initializer.Complete)
                     {

+ 167 - 5
Assets/Script/Manage/ManaSocial.cs

@@ -1,27 +1,46 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 using UnityEngine.UI;
 
 using System.Collections;
 using System.Collections.Generic;
 
+using LitJson;
+using UnityEngine.EventSystems;
+
 public class ManaSocial : Regist 
 {
     #region Variable
 
+    public static int LastCommentIndex;
+    public static int FirstCommentIndex;
+
     public static Text PraiseText;
     public static Button PraiseBtn;
+    public static ScrollRectPlus ScrollRectPlus;
 
+    public static bool IsPlayer;
     public static float PraiseTimer;
+    public static List<List<string>> PlayerCommentDatas;
+    public static List<List<string>> VisiteeCommentDatas;
 
     #endregion
 
     public void Update()
     {
+        if (ManaVisit.InVisit)
+        {
+            return;
+        }
+
         PraiseTimer += Time.deltaTime;
 
         if (PraiseTimer >= 10)
         {
-            
+            PraiseTimer = 0;
+
+            PraiseText.text = ManaServer.PraiseAmt.ToString();
+            ManaServer.GetComment(ManaServer.SerialNumber, "0", CommentType.Garden, data => { InputCommentData(true, data); });
         }
     }
 
@@ -29,18 +48,161 @@ public class ManaSocial : Regist
     {
         PraiseText = ManaReso.Get<Text>("C_PraiseText");
         PraiseBtn = ManaReso.Get<Button>("C_Praise");
+        ScrollRectPlus = ManaReso.Get<ScrollRectPlus>("Q_ScrollRect");
+
+        ScrollRectPlus.onValueChanged.AddListener(OnScroll);
     }
 
+
     public static void Praise()
     {
         if (ManaVisit.InVisit)
         {
-            
+            PraiseText.text = (int.Parse(PraiseText.text) + 1).ToString();
+
+            ManaServer.Praise(ManaServer.SerialNumber, ManaVisit.VisiteeSerialNumber);
+
+            DisablePraise();
         }
         else
         {
-            PraiseBtn.image.color = Lib.Pink;
-            PraiseBtn.interactable = false;
+            DisablePraise();
+        }
+    }
+
+    public static void EnablePraise()
+    {
+        PraiseBtn.image.color = Color.white;
+        PraiseBtn.interactable = true;
+    }
+
+    public static void DisablePraise()
+    {
+        PraiseBtn.image.color = Lib.Pink;
+        PraiseBtn.interactable = false;
+    }
+
+
+    public static void InputCommentData(bool isPlayer, JsonData jsonData)
+    {
+        if (isPlayer)
+        {
+            PlayerCommentDatas = new List<List<string>>();
+
+            foreach (JsonData commentData in jsonData["l"])
+            {
+                PlayerCommentDatas.Add(new List<string>() { commentData["s"].ToString(), commentData["c"].ToString() });
+            }
+        }
+        else
+        {
+            VisiteeCommentDatas = new List<List<string>>();
+
+            foreach (JsonData commentData in jsonData["l"])
+            {
+                VisiteeCommentDatas.Add(new List<string>() { commentData["s"].ToString(), commentData["c"].ToString() });
+            }
+        }
+    }
+
+    public static void InitializeCommentPanel(bool isPlayer)
+    {
+        for (int i = 0; i < ManaReso.Get("Q_Grid").childCount; i++)
+        {
+            ManaReso.Save(ManaReso.Get("Q_Grid").GetChild(i));
+        }
+
+        if (isPlayer)
+        {
+            IsPlayer = true;
+            GetCommentItem(6, PlayerCommentDatas);
+        }
+        else
+        {
+            IsPlayer = false;
+            GetCommentItem(6, VisiteeCommentDatas);
+        }  
+    }
+
+    public static void UpdateCommentPanel(int direction)
+    {
+        if (IsPlayer)
+        {
+            UpdateCommentItem(direction, PlayerCommentDatas);
         }
+        else
+        {
+            UpdateCommentItem(direction, VisiteeCommentDatas);
+        }
+    }
+
+    public static void GetCommentItem(int amt, List<List<string>> commentDatas)
+    {
+        if (commentDatas == null)
+        {
+            return;
+        }
+
+        for (int i = 0; i < amt; i++)
+        {
+            if (i < PlayerCommentDatas.Count)
+            {
+                FirstCommentIndex = 0;
+                LastCommentIndex = i;
+                ManaReso.GetCommentItem(PlayerCommentDatas[i][0], PlayerCommentDatas[i][1]);
+            }
+        }
+    }
+
+    public static void UpdateCommentItem(int direction, List<List<string>> commentDatas)
+    {
+        if (commentDatas.Count-1 == LastCommentIndex)
+        {
+            return;
+        }
+
+        LastCommentIndex += 1;
+
+        ManaReso.Save(ManaReso.Get("Q_Grid").GetChild(0).gameObject);
+        ManaReso.GetCommentItem(commentDatas[LastCommentIndex][0], commentDatas[LastCommentIndex][1]);
+
+        ScrollRectPlus.AddContentOffset(new Vector2(0, -120));
+    }
+
+    static bool Lock;
+    public static void OnScroll(Vector2 position)
+    {
+        if (Lock)
+        {
+            return;
+        }
+
+        if (position.y < 0.5f)
+        {
+            Lock = true;
+            UpdateCommentPanel(1);
+        }
+    }
+
+
+    public static void OpenCommentPanel()
+    {
+        ManaReso.Get("Q_CommentBK").TweenForCG();
+
+        ManaReso.SetActive("Q_InputBK", ManaVisit.InVisit);
+
+        if (ManaVisit.InVisit)
+        {
+            InitializeCommentPanel(false);    
+        }
+        else
+        {
+            InitializeCommentPanel(true);
+        }
+    }
+
+    public static void CloseCommentPanel()
+    {
+        ManaReso.Get("Q_CommentBK").TweenBacCG();
     }
 }

+ 2 - 0
Assets/Script/Manage/ManaTutorial.cs

@@ -386,6 +386,7 @@ public class ManaTutorial : Regist
 
         ManaReso.SetActive("C_Coin", false);
         ManaReso.SetActive("C_Group1", false);
+        ManaReso.SetActive("C_Group3", false);
         ManaReso.SetActive("N_Tutorial", true);
 
 
@@ -526,6 +527,7 @@ public class ManaTutorial : Regist
 
         ManaReso.SetActive("C_Coin", true);
         ManaReso.SetActive("C_Group1", true);
+        ManaReso.SetActive("C_Group3", true);
 
         ManaReso.SetActive("N_Tutorial", true);
 

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

@@ -537,6 +537,21 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region C_Comment
+
+        ManaReso.SetButtonEvent
+        (
+            "C_Comment",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ManaSocial.OpenCommentPanel();
+            }
+        );
+
+        #endregion
+
         #region C_Return
 
         ManaReso.AddButtonEvent
@@ -2603,6 +2618,25 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region Q
+
+        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"));
+
+        ManaReso.Get("Q_CommentBK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        ManaReso.AddButtonEvent
+            (
+                "Q_Close",
+                () =>
+                {
+                    ManaSocial.CloseCommentPanel();
+                }
+            );
+
+        #endregion
+
         if (!ManaTutorial.TutorialA)
         {
             HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();

+ 52 - 5
Assets/Script/Manage/ManaVisit.cs

@@ -49,6 +49,9 @@ public class ManaVisit
     public static XmlNode Node;
     public static XmlDocument Document;
 
+    public static int VisiteePraise;
+    public static string VisiteeSerialNumber;
+
     public static bool OriginBird;
     public static bool OriginTree;
     public static bool OriginRainbow;
@@ -155,6 +158,7 @@ public class ManaVisit
             );
 			
 		HideTip ();
+        SetPlayerPraise();
 
         ManaReso.SetActive("C_Visit", true);
         ManaReso.SetActive("C_Coin", true);
@@ -287,9 +291,6 @@ public class ManaVisit
 
 		ShowTip ();
 
-        Document = new XmlDocument();
-        Document.LoadXml(XmlStr);
-
         Node = Document.SelectSingleNode("PlayerConfig");
 
         ManaReso.SetActive("C_Coin", false);
@@ -607,6 +608,42 @@ public class ManaVisit
         InVisit = true;
     }
 
+    public static void SetPlayerPraise()
+    {
+        ManaSocial.PraiseText.text = ManaServer.PraiseAmt.ToString();
+    }
+
+    public static void SetVisiteePraise(XmlDocument document)
+    {
+        ManaSocial.PraiseText.text = VisiteePraise.ToString();
+
+        if (document.SelectSingleNode("PlayerConfig").SelectSingleNode("SerialNumber") == null)
+        {
+            ManaSocial.EnablePraise();
+        }
+        else
+        {
+            VisiteeSerialNumber = document.SelectSingleNode("PlayerConfig").SelectSingleNode("SerialNumber").Attributes[0].Value;
+
+            ManaServer.Target
+                (
+                    ManaServer.SerialNumber,
+                    VisiteeSerialNumber,
+                    jsonData =>
+                    {
+                        if (jsonData["i"].ToString() == "0")
+                        {
+                            ManaSocial.EnablePraise();
+                        }
+                        else if (jsonData["i"].ToString() == "1")
+                        {
+                            ManaSocial.DisablePraise();
+                        }
+                    }
+                );
+        }
+    }
+
     public static void UpdateCost()
     {
         if (Complete)
@@ -655,6 +692,8 @@ public class ManaVisit
             LoadComplete = true;
 
             XmlStr = WriteArchive();
+            Document = new XmlDocument();
+            Document.LoadXml(XmlStr);
 
             Enter();
         }
@@ -662,19 +701,27 @@ public class ManaVisit
         {
             ManaServer.RandomLoad
             (
-                (jsonData) =>
+                jsonData =>
                 {
                     LoadComplete = true;
-
+                    
                     if (jsonData.Inst_Object.ContainsKey("l"))
                     {
                         XmlStr = jsonData["l"].ToString();
+                        VisiteePraise = int.Parse(jsonData["p"].ToString());
+
+                        Document = new XmlDocument();
+                        Document.LoadXml(XmlStr);
+
+                        SetVisiteePraise(Document);
                     }
                     else
                     {
                         LoadComplete = true;
 
                         XmlStr = WriteArchive();
+                        Document = new XmlDocument();
+                        Document.LoadXml(XmlStr);
                     }
 
                     Enter();

+ 58 - 0
Assets/Script/Object/CommentItem.cs

@@ -0,0 +1,58 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class CommentItem : Regist
+{
+    public Text Tit;
+    public Text ContentLab;
+    public Text VisitLab;
+    public Button VisitBtn;
+
+    public string Content;
+    public string SerialNumber;
+
+    public override bool RegistImmed()
+    {
+        if (base.RegistImmed())
+        {
+            return true;
+        }
+
+        Dictionary<string, Transform> childDic = new Dictionary<string, Transform>();
+
+        Auxiliary.CompileDic(transform, childDic);
+
+        Tit = childDic["Tit"].GetComponent<Text>();
+        VisitLab = childDic["VisitLab"].GetComponent<Text>();
+        VisitBtn = childDic["VisitBtn"].GetComponent<Button>();
+        ContentLab = childDic["ContentLab"].GetComponent<Text>();
+
+        VisitLab.text = ManaReso.Get<Text>("C_CostLab").text;
+
+        VisitBtn.onClick.AddListener(Visit);
+
+        ManaCenter.OnLevelChange += () =>
+        {
+            VisitLab.text = ManaReso.Get<Text>("C_CostLab").text;
+        };
+
+        return false;
+    }
+
+    public void Visit()
+    {
+        
+    }
+
+    public void Reset(string serialNumber, string content)
+    {
+        Content = content;
+        SerialNumber = serialNumber;
+
+        Tit.text = "****" + serialNumber.Substring(serialNumber.Length-4);
+        ContentLab.text = content;
+    }
+}

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

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

+ 1 - 1
Assets/Script/Object/Skill/Ability.cs

@@ -283,7 +283,7 @@ public class Ability : SkillRoot
 
         ManaCenter.Person += NewPerson;
         ManaCenter.CoinPerson += NewCoinPerson;
-        
+
         ManaCenter.SkillPlus += NewPlus;
         ManaCenter.SkillPersonBuff += NewPersonBuff;
         

+ 1 - 0
Assets/Script/Object/Skill/Pack.cs

@@ -232,6 +232,7 @@ public class Pack : SkillRoot
 
     protected void UseA()
     {
+        Debug.Log(Name + " " + Plus);
         ManaCenter.SkillPlus += Plus;
         ManaCenter.SkillPerson += Person;
         ManaCenter.SkillPersonBuff += PersonBuff;

+ 6 - 27
Assets/Script/Tool/UI/ScrollRectPlus.cs

@@ -1,34 +1,13 @@
 using UnityEngine;
 using UnityEngine.UI;
-using UnityEngine.Events;
-using UnityEngine.EventSystems;
 
-public class ScrollRectPlus : ScrollRect 
-{
-    #region 变量
-
-    public UnityAction<PointerEventData> DragEvent;
-    public UnityAction<PointerEventData> EndDragEvent;
-
-    #endregion
-
-    public override void OnDrag(PointerEventData eventData)
-    {
-        base.OnDrag(eventData);
+using System.Collections;
+using System.Collections.Generic;
 
-        if (DragEvent != null)
-        {
-            DragEvent.Invoke(eventData);
-        }
-    }
-
-    public override void OnEndDrag(PointerEventData eventData)
+public class ScrollRectPlus : ScrollRect
+{
+    public void AddContentOffset(Vector2 offset)
     {
-        base.OnEndDrag(eventData);
-
-        if (EndDragEvent != null)
-        {
-            EndDragEvent.Invoke(eventData);
-        }
+        m_ContentStartPosition += offset;
     }
 }

+ 2 - 2
Assets/Script/Tool/UI/ScrollRectPlus.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 9d084f5edcc42a84f9aeb22f919fc004
-timeCreated: 1489818326
+guid: 235c753c59692334b8eb0ebdbfe0822b
+timeCreated: 1503911219
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

+ 1 - 1
ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 2
+  m_CurrentQuality: 5
   m_QualitySettings:
   - serializedVersion: 2
     name: Fastest

+ 3 - 3
ToDoList.txt

@@ -1,10 +1,10 @@
+VerticalBestfit最大与最小的限制
+
 调整箱子
 
 访问时的箱子
 
-是否要修改帧率
-
-教程中的评论和点赞
+没联网时的社交功能
 
 评论 点赞 宝箱 截图需要打入图集
 

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